~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -41,64 +41,78 @@
41	41	JFrame frame;
42	42
43	43	static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
44	52
45	53	cButton GetButton(String name, boolean border)
46	54	{
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		- }
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
56	63	}
57	64
58	65	cToggleButton GetToggleButton(String name, boolean border)
59	66	{
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		- }
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
69	69	}
70	70
71	71	cCheckBox GetCheckBox(String name, boolean border)
72	72	{
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
73	79	try
74	80	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
77	97	}
78	98	catch (Exception e)
79	99	{
80		- return new cCheckBox(name, border);
	100	+ return null;
81	101	}
82	102	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	103	+
	104	+ BufferedImage GetImage(String name)
85	105	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	106	+ try
89	107	{
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;
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
98	111	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
102	116	}
103	117
104	118	// SCRIPT
..	..	@@ -282,6 +296,12 @@
282	296	client = inClient;
283	297	copy = client;
284	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
285	305	// "this" is not called: SetupUI2(objEditor);
286	306	}
287	307
..	..	@@ -295,6 +315,12 @@
295	315	client = inClient;
296	316	copy = client;
297	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
298	324	SetupUI2(callee.GetEditor());
299	325	}
300	326
..	..	@@ -327,6 +353,12 @@
327	353	copy = localCopy;
328	354	copy.editWindow = this;
329	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
330	362	SetupMenu();
331	363
332	364	//SetupName(objEditor); // new
..	..	@@ -419,11 +451,12 @@
419	451
420	452	toolbarPanel = new JPanel();
421	453	toolbarPanel.setName("Toolbar");
	454	+
422	455	treePanel = new cGridBag();
423	456	treePanel.setName("Tree");
424	457
425	458	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
427	460
428	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	462
..	..	@@ -431,11 +464,11 @@
431	464	editPanel.add(editCommandsPanel);
432	465	editPanel.add(ctrlPanel);
433	466
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
436	469
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
439	472
440	473	/JTextPane/
441	474	infoarea = createTextPane();
..	..	@@ -443,6 +476,7 @@
443	476
444	477	infoarea.setEditable(true);
445	478	SetText();
	479	+
446	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	481	// infoarea.setOpaque(false);
448	482	// //infoarea.setForeground(textcolor);
..	..	@@ -450,7 +484,7 @@
450	484	// TEXTAREA infoarea.setWrapStyleWord(true);
451	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452	486	infoPanel.setPreferredSize(new Dimension(1, 1));
453		- infoPanel.setName("Info");
	487	+ //infoPanel.setName("Info");
454	488	//infoPanel.setLayout(new BorderLayout());
455	489	//infoPanel.add(createTextPane());
456	490
..	..	@@ -814,7 +848,32 @@
814	848	//frame.setVisible(true);
815	849	}
816	850	frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
817	853	}
	854	+
	855	+ private Object3D CompressCopy()
	856	+ {
	857	+ boolean temp = CameraPane.SWITCH;
	858	+ CameraPane.SWITCH = false;
	859	+
	860	+ copy.ExtractBigData(versiontable);
	861	+ // if (copy == client)
	862	+
	863	+ Object3D versions[] = copy.versionlist;
	864	+ copy.versionlist = null;
	865	+
	866	+ //byte[] compress = Compress(copy);
	867	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	868	+
	869	+ copy.versionlist = versions;
	870	+
	871	+ copy.RestoreBigData(versiontable);
	872	+
	873	+ CameraPane.SWITCH = temp;
	874	+
	875	+ return compress;
	876	+ }
818	877
819	878	private JTextPane createTextPane()
820	879	{
..	..	@@ -937,6 +996,7 @@
937	996	{
938	997	SetupMaterial(materialPanel);
939	998	}
	999	+
940	1000	//SetupName();
941	1001	//SetupViews();
942	1002	}
..	..	@@ -946,7 +1006,7 @@
946	1006	// NumberSlider vDivsField;
947	1007	// JCheckBox endcaps;
948	1008	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1009	+ JCheckBox selectableCB;
950	1010	JCheckBox hideCB;
951	1011	JCheckBox link2masterCB;
952	1012	JCheckBox markCB;
..	..	@@ -1158,13 +1218,16 @@
1158	1218
1159	1219	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1220	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1221	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1222	+ selectableCB.setToolTipText("Make object selectable");
1163	1223	// Return();
	1224	+
1164	1225	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1226	hideCB.setToolTipText("Hide object");
1166	1227	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167	1228	markCB.setToolTipText("As animation target transform");
	1229	+
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1231
1169	1232	setupPanel2 = new cGridBag().setVertical(false);
1170	1233
..	..	@@ -1174,10 +1237,11 @@
1174	1237	randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1175	1238	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1176	1239
	1240	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1241	+ link2masterCB.setToolTipText("Attach to support");
	1242	+
1177	1243	if (Globals.ADVANCED)
1178	1244	{
1179		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180		- link2masterCB.setToolTipText("Attach to support");
1181	1245	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1182	1246	speedupCB.setToolTipText("Option motion capture");
1183	1247	}
..	..	@@ -1451,6 +1515,7 @@
1451	1515	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1452	1516	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1453	1517	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1518	+ //XYZPanel.setName("XYZ");
1454	1519
1455	1520	/*
1456	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1488,16 +1553,29 @@
1488	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1489	1554	//tmp.setName("Edit");
1490	1555	objectPanel.add(materialPanel);
	1556	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
	1558	+
1491	1559	// JPanel north = new JPanel(new BorderLayout());
1492	1560	// north.setName("Edit");
1493	1561	// north.add(ctrlPanel, BorderLayout.NORTH);
1494	1562	// objectPanel.add(north);
1495	1563	objectPanel.add(editPanel);
	1564	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1565	+ objectPanel.setToolTipTextAt(1, "Edit controls");
1496	1566
1497	1567	//if (Globals.ADVANCED)
1498	1568	objectPanel.add(infoPanel);
	1569	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1570	+ objectPanel.setToolTipTextAt(2, "Information");
	1571	+
	1572	+ objectPanel.add(XYZPanel);
	1573	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1574	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1499	1575
1500	1576	objectPanel.add(toolboxPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1501	1579
1502	1580	/*
1503	1581	aConstraints.gridx = 0;
..	..	@@ -1518,7 +1596,7 @@
1518	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1519	1597
1520	1598	/JTabbedPane/ scenePanel = new cGridBag();
1521		- scenePanel.preferredWidth = 6;
	1599	+ scenePanel.preferredWidth = 5;
1522	1600
1523	1601	JTabbedPane tabbedPane = new JTabbedPane();
1524	1602	tabbedPane.add(scrollpane);
..	..	@@ -1596,7 +1674,7 @@
1596	1674	bigThree = new cGridBag();
1597	1675	bigThree.addComponent(scenePanel);
1598	1676	bigThree.addComponent(centralPanel);
1599		- bigThree.addComponent(XYZPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
1600	1678
1601	1679	// // SIDE EFFECT!!!
1602	1680	// aConstraints.gridx = 0;
..	..	@@ -1637,7 +1715,6 @@
1637	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1638	1716	frame.addWindowListener(new WindowAdapter()
1639	1717	{
1640		-
1641	1718	public void windowClosing(WindowEvent e)
1642	1719	{
1643	1720	Close();
..	..	@@ -1660,12 +1737,85 @@
1660	1737	ctrlPanel.removeAll();
1661	1738	}
1662	1739
1663		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1664	1741	{
1665		- /*
	1742	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1743	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1744	+ skin.addMouseListener(new MouseAdapter()
	1745	+ {
	1746	+ public void mouseClicked(MouseEvent e)
	1747	+ {
	1748	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1749	+ cMaterial material = object.material;
	1750	+
	1751	+ // Skin
	1752	+ colorField.setFloat(material.color);
	1753	+ saturationField.setFloat(material.modulation);
	1754	+ subsurfaceField.setFloat(material.subsurface);
	1755	+ selfshadowField.setFloat(material.diffuseness);
	1756	+ diffusenessField.setFloat(material.factor);
	1757	+ shininessField.setFloat(material.shininess);
	1758	+ shadowbiasField.setFloat(material.shadowbias);
	1759	+ diffuseField.setFloat(material.diffuse);
	1760	+ specularField.setFloat(material.specular);
	1761	+
	1762	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1763	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1764	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1765	+
	1766	+ materialtouched = true;
	1767	+ applySelf();
	1768	+ }
	1769	+ });
	1770	+ presetpanel.add(skin);
	1771	+
	1772	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1773	+ rough2.addMouseListener(new MouseAdapter()
	1774	+ {
	1775	+ public void mouseClicked(MouseEvent e)
	1776	+ {
	1777	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1778	+ cMaterial material = object.material;
	1779	+
	1780	+ shininessField.setFloat(material.shininess);
	1781	+ velvetField.setFloat(material.velvet);
	1782	+
	1783	+ materialtouched = true;
	1784	+ applySelf();
	1785	+ }
	1786	+ });
	1787	+ presetpanel.add(rough2);
	1788	+
	1789	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1790	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1791	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1792	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1793	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1794	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1795	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1796	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1797	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1798	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1799	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1800	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1801	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1802	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1803	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1804	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1805	+
	1806	+ cGridBag panel = new cGridBag().setVertical(true);
	1807	+
	1808	+ presetpanel.preferredWidth = 1;
	1809	+
	1810	+ materialpanel.add(panel);
	1811	+ materialpanel.add(presetpanel);
	1812	+
	1813	+ panel.preferredWidth = 8;
	1814	+
	1815	+ /*
1666	1816	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1667	1817	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668		- */
	1818	+ */
1669	1819
1670	1820	cGridBag editBar = new cGridBag().setVertical(false);
1671	1821
..	..	@@ -1699,27 +1849,50 @@
1699	1849	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1700	1850
1701	1851	cGridBag colorSection = new cGridBag().setVertical(true);
	1852	+
	1853	+ cGridBag huepanel = new cGridBag();
	1854	+ cGridBag huelabel = new cGridBag();
	1855	+ skin = GetLabel("icons/hue.png", false);
	1856	+ skin.fit = true;
	1857	+ huelabel.add(skin);
	1858	+ huelabel.preferredWidth = 20;
	1859	+ huepanel.add(new cGridBag()); // Label
	1860	+ huepanel.add(huelabel); // Field/slider
	1861	+
	1862	+ huepanel.preferredHeight = 7;
	1863	+
	1864	+ colorSection.add(huepanel);
1702	1865
1703	1866	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);
	1867	+
	1868	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1869	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1871	+
1707	1872	//colorField.preferredWidth = 200;
1708	1873	colorSection.add(color);
1709	1874
1710	1875	cGridBag modulation = new cGridBag();
1711	1876	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1712	1877	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1878	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1714	1879	colorSection.add(modulation);
1715	1880
	1881	+ cGridBag opacity = new cGridBag();
	1882	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1883	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1884	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1885	+ colorSection.add(opacity);
	1886	+
	1887	+ colorSection.add(GetSeparator());
	1888	+
1716	1889	cGridBag texture = new cGridBag();
1717	1890	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1718	1891	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1719	1892	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1720	1893	colorSection.add(texture);
1721	1894
1722		- panel.add(new JSeparator());
	1895	+ panel.add(GetSeparator());
1723	1896
1724	1897	panel.add(colorSection);
1725	1898
..	..	@@ -1775,7 +1948,7 @@
1775	1948	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1776	1949	diffuseSection.add(shadowbias);
1777	1950
1778		- panel.add(new JSeparator());
	1951	+ panel.add(GetSeparator());
1779	1952
1780	1953	panel.add(diffuseSection);
1781	1954
..	..	@@ -1838,7 +2011,7 @@
1838	2011	specularSection.add(anisoV);
1839	2012
1840	2013
1841		- panel.add(new JSeparator());
	2014	+ panel.add(GetSeparator());
1842	2015
1843	2016	panel.add(specularSection);
1844	2017
..	..	@@ -1863,12 +2036,6 @@
1863	2036	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1864	2037	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1865	2038	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	2039
1873	2040	//panel.add(new JSeparator());
1874	2041
..	..	@@ -1914,7 +2081,7 @@
1914	2081	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1915	2082	textureSection.add(opacityPower);
1916	2083
1917		- panel.add(new JSeparator());
	2084	+ panel.add(GetSeparator());
1918	2085
1919	2086	panel.add(textureSection);
1920	2087
..	..	@@ -2901,7 +3068,7 @@
2901	3068
2902	3069	freezematerial = true;
2903	3070	colorField.setFloat(mat.color);
2904		- modulationField.setFloat(mat.modulation);
	3071	+ saturationField.setFloat(mat.modulation);
2905	3072	metalnessField.setFloat(mat.metalness);
2906	3073	diffuseField.setFloat(mat.diffuse);
2907	3074	specularField.setFloat(mat.specular);
..	..	@@ -3212,8 +3379,9 @@
3212	3379	} else if (event.getSource() == liveCB)
3213	3380	{
3214	3381	copy.live ^= true;
	3382	+ objEditor.refreshContents(true); // To show item colors
3215	3383	return;
3216		- } else if (event.getSource() == selectCB)
	3384	+ } else if (event.getSource() == selectableCB)
3217	3385	{
3218	3386	copy.dontselect ^= true;
3219	3387	return;
..	..	@@ -3221,7 +3389,7 @@
3221	3389	{
3222	3390	copy.hide ^= true;
3223	3391	copy.Touch(); // display list issue
3224		- objEditor.refreshContents();
	3392	+ objEditor.refreshContents(true); // To show item colors
3225	3393	return;
3226	3394	} else if (event.getSource() == link2masterCB)
3227	3395	{
..	..	@@ -3477,11 +3645,12 @@
3477	3645
3478	3646	static public byte[] Compress(Object3D o)
3479	3647	{
	3648	+ // Slower to actually compress.
3480	3649	try
3481	3650	{
3482	3651	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3483		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3484		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3652	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3653	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3485	3654
3486	3655	Object3D parent = o.parent;
3487	3656	o.parent = null;
..	..	@@ -3492,10 +3661,14 @@
3492	3661
3493	3662	out.flush();
3494	3663
3495		- zstream.close();
	3664	+ baos //zstream
	3665	+ .close();
3496	3666	out.close();
3497	3667
3498		- return baos.toByteArray();
	3668	+ byte[] bytes = baos.toByteArray();
	3669	+
	3670	+ System.out.println("save #bytes = " + bytes.length);
	3671	+ return bytes;
3499	3672	} catch (Exception e)
3500	3673	{
3501	3674	System.err.println(e);
..	..	@@ -3505,13 +3678,16 @@
3505	3678
3506	3679	static public Object Uncompress(byte[] bytes)
3507	3680	{
3508		- System.out.println("#bytes = " + bytes.length);
	3681	+ System.out.println("restore #bytes = " + bytes.length);
3509	3682	try
3510	3683	{
3511	3684	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3512		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3513		- ObjectInputStream in = new ObjectInputStream(istream);
	3685	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3686	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3514	3687	Object obj = in.readObject();
	3688	+
	3689	+ bais //istream
	3690	+ .close();
3515	3691	in.close();
3516	3692
3517	3693	return obj;
..	..	@@ -3566,12 +3742,12 @@
3566	3742	return null;
3567	3743	}
3568	3744
3569		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3570	3745
3571	3746	public void Save()
3572	3747	{
3573		- // Default reduces the probability of heuristics errors.
3574		- Save(true);
	3748	+ //Save(true);
	3749	+ Replace();
	3750	+ SetUndoStates();
3575	3751	}
3576	3752
3577	3753	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3590,45 +3766,62 @@
3590	3766	return true;
3591	3767	}
3592	3768
	3769	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3770	+
	3771	+ void DeleteVersion()
	3772	+ {
	3773	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	3774	+ {
	3775	+ copy.versionlist[i] = copy.versionlist[i+1];
	3776	+ }
	3777	+
	3778	+ CopyChanged();
	3779	+
	3780	+ SetUndoStates();
	3781	+ }
	3782	+
3593	3783	public boolean Save(boolean user)
3594	3784	{
3595	3785	System.err.println("Save");
	3786	+ //Replace();
3596	3787
3597	3788	cRadio tab = GetCurrentTab();
3598	3789
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;
	3790	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3607	3791
3608	3792	boolean thesame = false;
3609	3793
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		- }
	3794	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3795	+// {
	3796	+// thesame = true;
	3797	+// }
3615	3798
3616	3799	//EditorFrame.m_MainFrame.requestFocusInWindow();
3617	3800	if (!thesame)
3618	3801	{
3619		- tab.user[tab.undoindex] = user;
3620		- tab.graphs[tab.undoindex++] = compress;
	3802	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	3803	+ {
	3804	+ copy.versionlist[i] = copy.versionlist[i-1];
	3805	+ }
	3806	+
	3807	+ //tab.user[tab.versionindex] = user;
	3808	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3809	+
	3810	+ copy.versionlist[++copy.versionindex] = compress;
	3811	+
	3812	+ // if (increment)
	3813	+ // tab.versionindex++;
3621	3814	}
3622	3815
3623		- copy.RestoreBigData(hashtable);
	3816	+ //copy.RestoreBigData(versiontable);
3624	3817
3625	3818	//assert(hashtable.isEmpty());
3626	3819
3627		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3628		- {
3629		- tab.user[i] = false;
3630		- tab.graphs[i] = null;
3631		- }
	3820	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3821	+// {
	3822	+// //tab.user[i] = false;
	3823	+// copy.versionlist[i] = null;
	3824	+// }
3632	3825
3633	3826	SetUndoStates();
3634	3827
..	..	@@ -3637,7 +3830,7 @@
3637	3830	{
3638	3831	try
3639	3832	{
3640		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3833	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3641	3834	ObjectOutputStream p = new ObjectOutputStream(ostream);
3642	3835
3643	3836	p.writeObject(copy);
..	..	@@ -3653,27 +3846,65 @@
3653	3846
3654	3847	return !thesame;
3655	3848	}
3656		-
3657		- void CopyChanged(Object3D obj)
	3849	+
	3850	+ boolean flashIt = true;
	3851	+
	3852	+ void RefreshSelection()
3658	3853	{
	3854	+ Object3D selection = new Object3D();
	3855	+
	3856	+ for (int i = 0; i < copy.selection.size(); i++)
	3857	+ {
	3858	+ Object3D elem = copy.selection.elementAt(i);
	3859	+
	3860	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3861	+
	3862	+ if (obj == null)
	3863	+ {
	3864	+ copy.selection.remove(i--);
	3865	+ }
	3866	+ else
	3867	+ {
	3868	+ selection.add(obj);
	3869	+ copy.selection.setElementAt(obj, i);
	3870	+ }
	3871	+ }
	3872	+
	3873	+ flashIt = false;
	3874	+ GetTree().clearSelection();
	3875	+ for (int i = 0; i < selection.size(); i++)
	3876	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3877	+ flashIt = true;
	3878	+
	3879	+ //refreshContents(false);
	3880	+ }
	3881	+
	3882	+ void CopyChanged()
	3883	+ {
	3884	+ Object3D obj = copy.versionlist[copy.versionindex];
	3885	+
3659	3886	SetUndoStates();
3660	3887
3661	3888	boolean temp = CameraPane.SWITCH;
3662	3889	CameraPane.SWITCH = false;
3663	3890
3664		- copy.ExtractBigData(hashtable);
	3891	+ copy.ExtractBigData(versiontable);
3665	3892
3666	3893	copy.clear();
3667	3894
	3895	+ copy.skyboxname = obj.skyboxname;
	3896	+ copy.skyboxext = obj.skyboxext;
	3897	+
3668	3898	for (int i=0; i<obj.Size(); i++)
3669	3899	{
3670	3900	copy.add(obj.get(i));
3671	3901	}
3672	3902
3673		- copy.RestoreBigData(hashtable);
	3903	+ copy.RestoreBigData(versiontable);
3674	3904
3675	3905	CameraPane.SWITCH = temp;
3676	3906
	3907	+ RefreshSelection();
3677	3908	//assert(hashtable.isEmpty());
3678	3909
3679	3910	copy.Touch();
..	..	@@ -3694,68 +3925,139 @@
3694	3925	}
3695	3926	}
3696	3927
3697		- refreshContents();
	3928	+ refreshContents(true);
3698	3929	}
3699	3930
3700		- cButton undoButton;
3701		- cButton redoButton;
	3931	+ cButton previousVersionButton;
	3932	+ cButton restoreButton;
	3933	+ cButton replaceButton;
	3934	+ cButton nextVersionButton;
	3935	+ cButton saveVersionButton;
	3936	+ cButton deleteVersionButton;
3702	3937
	3938	+ boolean muteSlider;
	3939	+
	3940	+ int VersionCount()
	3941	+ {
	3942	+ int count = 0;
	3943	+
	3944	+ for (int i = copy.versionlist.length; --i >= 0;)
	3945	+ {
	3946	+ if (copy.versionlist[i] != null)
	3947	+ count++;
	3948	+ }
	3949	+
	3950	+ return count;
	3951	+ }
	3952	+
3703	3953	void SetUndoStates()
3704	3954	{
3705	3955	cRadio tab = GetCurrentTab();
3706	3956
3707		- undoButton.setEnabled(tab.undoindex > 0);
3708		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3957	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	3958	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	3959	+
	3960	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	3961	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3962	+
	3963	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	3964	+ copy.versionlist[copy.versionindex + 1] != null);
	3965	+
	3966	+ muteSlider = true;
	3967	+ versionSlider.setMaximum(VersionCount() - 1);
	3968	+ versionSlider.setInteger(copy.versionindex);
	3969	+ muteSlider = false;
3709	3970	}
3710	3971
3711		- public boolean Undo()
	3972	+ public boolean PreviousVersion()
3712	3973	{
	3974	+ // Option?
	3975	+ Replace();
	3976	+
3713	3977	System.err.println("Undo");
3714	3978
3715	3979	cRadio tab = GetCurrentTab();
3716	3980
3717		- if (tab.undoindex == 0)
	3981	+ if (copy.versionindex == 0)
3718	3982	{
3719	3983	java.awt.Toolkit.getDefaultToolkit().beep();
3720	3984	return false;
3721	3985	}
3722	3986
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		- }
	3987	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3988	+// {
	3989	+// if (Save(false))
	3990	+// tab.versionindex -= 1;
	3991	+// else
	3992	+// {
	3993	+// if (tab.versionindex <= 0)
	3994	+// return false;
	3995	+// else
	3996	+// tab.versionindex -= 1;
	3997	+// }
	3998	+// }
3735	3999
3736		- tab.undoindex -= 1;
	4000	+ copy.versionindex -= 1;
3737	4001
3738		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4002	+ CopyChanged();
3739	4003
3740	4004	return true;
3741	4005	}
3742	4006
3743		- public void Redo()
	4007	+ public boolean Restore()
3744	4008	{
	4009	+ System.err.println("Restore");
	4010	+
3745	4011	cRadio tab = GetCurrentTab();
3746	4012
3747		- if (tab.graphs[tab.undoindex + 1] == null)
	4013	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4014	+ {
	4015	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4016	+ return false;
	4017	+ }
	4018	+
	4019	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4020	+ CopyChanged();
	4021	+
	4022	+ return true;
	4023	+ }
	4024	+
	4025	+ public boolean Replace()
	4026	+ {
	4027	+ System.err.println("Replace");
	4028	+
	4029	+ cRadio tab = GetCurrentTab();
	4030	+
	4031	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4032	+ {
	4033	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4034	+ return false;
	4035	+ }
	4036	+
	4037	+ copy.versionlist[copy.versionindex] = CompressCopy();
	4038	+
	4039	+ return true;
	4040	+ }
	4041	+
	4042	+ public void NextVersion()
	4043	+ {
	4044	+ // Option?
	4045	+ Replace();
	4046	+
	4047	+ cRadio tab = GetCurrentTab();
	4048	+
	4049	+ if (copy.versionlist[copy.versionindex + 1] == null)
3748	4050	{
3749	4051	java.awt.Toolkit.getDefaultToolkit().beep();
3750	4052	return;
3751	4053	}
3752	4054
3753		- tab.undoindex += 1;
	4055	+ copy.versionindex += 1;
3754	4056
3755		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4057	+ CopyChanged();
3756	4058
3757		- if (!tab.user[tab.undoindex])
3758		- tab.graphs[tab.undoindex] = null;
	4059	+ //if (!tab.user[tab.versionindex])
	4060	+ // tab.graphs[tab.versionindex] = null;
3759	4061	}
3760	4062
3761	4063	void ImportGFD()
..	..	@@ -3966,7 +4268,7 @@
3966	4268	//copy.material = new cMaterial(copy.GetMaterial());
3967	4269
3968	4270	current.color = (float) colorField.getFloat();
3969		- current.modulation = (float) modulationField.getFloat();
	4271	+ current.modulation = (float) saturationField.getFloat();
3970	4272	current.metalness = (float) metalnessField.getFloat();
3971	4273	current.diffuse = (float) diffuseField.getFloat();
3972	4274	current.specular = (float) specularField.getFloat();
..	..	@@ -3999,7 +4301,7 @@
3999	4301	cMaterial mat = copy.material;
4000	4302
4001	4303	colorField.SetToolTipValue((mat.color));
4002		- modulationField.SetToolTipValue((mat.modulation));
	4304	+ saturationField.SetToolTipValue((mat.modulation));
4003	4305	metalnessField.SetToolTipValue((mat.metalness));
4004	4306	diffuseField.SetToolTipValue((mat.diffuse));
4005	4307	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4051,9 +4353,26 @@
4051	4353	//copy.Touch();
4052	4354	}
4053	4355
	4356	+ cNumberSlider versionSlider;
	4357	+
4054	4358	public void stateChanged(ChangeEvent e)
4055	4359	{
4056	4360	// assert(false);
	4361	+ if (e.getSource() == versionSlider)
	4362	+ {
	4363	+ if (muteSlider)
	4364	+ return;
	4365	+
	4366	+ int version = versionSlider.getInteger();
	4367	+
	4368	+ if (copy.versionlist[version] != null)
	4369	+ {
	4370	+ copy.versionindex = version;
	4371	+ CopyChanged();
	4372	+ }
	4373	+
	4374	+ return;
	4375	+ }
4057	4376
4058	4377	if (freezematerial)
4059	4378	{
..	..	@@ -4089,6 +4408,12 @@
4089	4408	{
4090	4409	//System.out.println("stateChanged = " + this);
4091	4410	materialtouched = true;
	4411	+
	4412	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4413	+ {
	4414	+ saturationField.setFloat(1);
	4415	+ }
	4416	+
4092	4417	applySelf();
4093	4418	//System.out.println("this = " + this);
4094	4419	//System.out.println("PARENT = " + parent);
..	..	@@ -4388,6 +4713,7 @@
4388	4713	{
4389	4714	if (GetTree() != null)
4390	4715	{
	4716	+ GetTree().revalidate();
4391	4717	GetTree().repaint();
4392	4718	}
4393	4719
..	..	@@ -4396,13 +4722,16 @@
4396	4722	ctrlPanel.validate(); // ? new
4397	4723	ctrlPanel.repaint();
4398	4724	}
	4725	+
	4726	+ if (previousVersionButton != null && copy.versionlist != null)
	4727	+ SetUndoStates();
4399	4728	}
4400	4729
4401	4730	static TweenManager tweenManager = new TweenManager();
4402	4731
4403	4732	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4404	4733	{
4405		- if (Globals.SAVEONMAKE) // && resetmodel)
	4734	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4406	4735	Save();
4407	4736	//Tween.set(thing, 0).target(1).start(tweenManager);
4408	4737	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4644,7 +4973,9 @@
4644	4973	readobj.ResetDisplayList();
4645	4974	} catch (Exception e)
4646	4975	{
4647		- //e.printStackTrace();
	4976	+ if (!e.toString().contains("GZIP"))
	4977	+ e.printStackTrace();
	4978	+
4648	4979	try
4649	4980	{
4650	4981	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4718,12 +5049,14 @@
4718	5049
4719	5050	if (readobj != null)
4720	5051	{
4721		- if (Globals.SAVEONMAKE)
4722		- Save();
	5052	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5053	+ // Save();
4723	5054	try
4724	5055	{
4725	5056	//readobj.deepCopySelf(copy);
4726	5057	copy.clear(); // june 2014
	5058	+ copy.skyboxname = readobj.skyboxname;
	5059	+ copy.skyboxext = readobj.skyboxext;
4727	5060	for (int i = 0; i < readobj.size(); i++)
4728	5061	{
4729	5062	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4764,6 +5097,7 @@
4764	5097	}
4765	5098	} catch (ClassCastException e)
4766	5099	{
	5100	+ e.printStackTrace();
4767	5101	assert (false);
4768	5102	Composite c = (Composite) copy;
4769	5103	c.children.clear();
..	..	@@ -4774,6 +5108,17 @@
4774	5108	c.addChild(csg);
4775	5109	}
4776	5110
	5111	+ copy.versionlist = readobj.versionlist;
	5112	+ copy.versionindex = readobj.versionindex;
	5113	+
	5114	+ if (copy.versionlist == null)
	5115	+ {
	5116	+ copy.versionlist = new Object3D[100];
	5117	+ copy.versionindex = -1;
	5118	+ }
	5119	+
	5120	+ //? SetUndoStates();
	5121	+
4777	5122	ResetModel();
4778	5123	copy.HardTouch(); // recompile?
4779	5124	refreshContents();
..	..	@@ -4784,7 +5129,7 @@
4784	5129	{
4785	5130	if (Grafreed.standAlone)
4786	5131	{
4787		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5132	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4788	5133	browser.show();
4789	5134	String filename = browser.getFile();
4790	5135	if (filename != null && filename.length() > 0)
..	..	@@ -4883,6 +5228,7 @@
4883	5228	//ps.print(buffer.toString());
4884	5229	} catch (IOException e)
4885	5230	{
	5231	+ e.printStackTrace();
4886	5232	}
4887	5233	}
4888	5234
..	..	@@ -5175,7 +5521,7 @@
5175	5521	JLabel colorLabel;
5176	5522	cNumberSlider colorField;
5177	5523	JLabel modulationLabel;
5178		- cNumberSlider modulationField;
	5524	+ cNumberSlider saturationField;
5179	5525	JLabel metalnessLabel;
5180	5526	cNumberSlider metalnessField;
5181	5527	JLabel diffuseLabel;