~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,14 +476,15 @@
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);
449	483	// TEXTAREA infoarea.setLineWrap(true);
450	484	// TEXTAREA infoarea.setWrapStyleWord(true);
451	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452		- //infoPanel.setPreferredSize(new Dimension(50, 200));
453		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	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		- if (Globals.ADVANCED)
	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,384 @@
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	+
	1744	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1745	+ skin.setToolTipText("Skin");
	1746	+ skin.addMouseListener(new MouseAdapter()
	1747	+ {
	1748	+ public void mouseClicked(MouseEvent e)
	1749	+ {
	1750	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1751	+ cMaterial material = object.material;
	1752	+
	1753	+ // Skin
	1754	+ colorField.setFloat(material.color);
	1755	+ saturationField.setFloat(material.modulation);
	1756	+ subsurfaceField.setFloat(material.subsurface);
	1757	+ selfshadowField.setFloat(material.diffuseness);
	1758	+ diffusenessField.setFloat(material.factor);
	1759	+ shininessField.setFloat(material.shininess);
	1760	+ shadowbiasField.setFloat(material.shadowbias);
	1761	+ diffuseField.setFloat(material.diffuse);
	1762	+ specularField.setFloat(material.specular);
	1763	+
	1764	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1765	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1766	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1767	+
	1768	+ materialtouched = true;
	1769	+ applySelf();
	1770	+ }
	1771	+ });
	1772	+ presetpanel.add(skin);
	1773	+
	1774	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1775	+ lambert.setToolTipText("Diffuse");
	1776	+ lambert.addMouseListener(new MouseAdapter()
	1777	+ {
	1778	+ public void mouseClicked(MouseEvent e)
	1779	+ {
	1780	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1781	+ cMaterial material = object.material;
	1782	+
	1783	+ diffusenessField.setFloat(material.factor);
	1784	+ selfshadowField.setFloat(material.diffuseness);
	1785	+
	1786	+ materialtouched = true;
	1787	+ applySelf();
	1788	+ }
	1789	+ });
	1790	+ presetpanel.add(lambert);
	1791	+
	1792	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1793	+ diffuse2.setToolTipText("Diffuse2");
	1794	+ diffuse2.addMouseListener(new MouseAdapter()
	1795	+ {
	1796	+ public void mouseClicked(MouseEvent e)
	1797	+ {
	1798	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1799	+ cMaterial material = object.material;
	1800	+
	1801	+ diffusenessField.setFloat(material.factor);
	1802	+ selfshadowField.setFloat(material.diffuseness);
	1803	+
	1804	+ materialtouched = true;
	1805	+ applySelf();
	1806	+ }
	1807	+ });
	1808	+ presetpanel.add(diffuse2);
	1809	+
	1810	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1811	+ diffusemoon.setToolTipText("Moon");
	1812	+ diffusemoon.addMouseListener(new MouseAdapter()
	1813	+ {
	1814	+ public void mouseClicked(MouseEvent e)
	1815	+ {
	1816	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1817	+ cMaterial material = object.material;
	1818	+
	1819	+ diffusenessField.setFloat(material.factor);
	1820	+ selfshadowField.setFloat(material.diffuseness);
	1821	+
	1822	+ materialtouched = true;
	1823	+ applySelf();
	1824	+ }
	1825	+ });
	1826	+ presetpanel.add(diffusemoon);
	1827	+
	1828	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1829	+ diffusemoon2.setToolTipText("Moon2");
	1830	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ diffusenessField.setFloat(material.factor);
	1838	+ selfshadowField.setFloat(material.diffuseness);
	1839	+
	1840	+ materialtouched = true;
	1841	+ applySelf();
	1842	+ }
	1843	+ });
	1844	+ presetpanel.add(diffusemoon2);
	1845	+
	1846	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1847	+ diffusemoon3.setToolTipText("Moon3");
	1848	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1849	+ {
	1850	+ public void mouseClicked(MouseEvent e)
	1851	+ {
	1852	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1853	+ cMaterial material = object.material;
	1854	+
	1855	+ diffusenessField.setFloat(material.factor);
	1856	+ selfshadowField.setFloat(material.diffuseness);
	1857	+
	1858	+ materialtouched = true;
	1859	+ applySelf();
	1860	+ }
	1861	+ });
	1862	+ presetpanel.add(diffusemoon3);
	1863	+
	1864	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1865	+ diffusesheen.setToolTipText("Sheen");
	1866	+ diffusesheen.addMouseListener(new MouseAdapter()
	1867	+ {
	1868	+ public void mouseClicked(MouseEvent e)
	1869	+ {
	1870	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1871	+ cMaterial material = object.material;
	1872	+
	1873	+ sheenField.setFloat(material.sheen);
	1874	+
	1875	+ materialtouched = true;
	1876	+ applySelf();
	1877	+ }
	1878	+ });
	1879	+ presetpanel.add(diffusesheen);
	1880	+
	1881	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1882	+ rough.setToolTipText("Rough metal");
	1883	+ rough.addMouseListener(new MouseAdapter()
	1884	+ {
	1885	+ public void mouseClicked(MouseEvent e)
	1886	+ {
	1887	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1888	+ cMaterial material = object.material;
	1889	+
	1890	+ shininessField.setFloat(material.shininess);
	1891	+ velvetField.setFloat(material.velvet);
	1892	+
	1893	+ materialtouched = true;
	1894	+ applySelf();
	1895	+ }
	1896	+ });
	1897	+ presetpanel.add(rough);
	1898	+
	1899	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1900	+ rough2.setToolTipText("Medium metal");
	1901	+ rough2.addMouseListener(new MouseAdapter()
	1902	+ {
	1903	+ public void mouseClicked(MouseEvent e)
	1904	+ {
	1905	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1906	+ cMaterial material = object.material;
	1907	+
	1908	+ shininessField.setFloat(material.shininess);
	1909	+ lightareaField.setFloat(material.lightarea);
	1910	+
	1911	+ materialtouched = true;
	1912	+ applySelf();
	1913	+ }
	1914	+ });
	1915	+ presetpanel.add(rough2);
	1916	+
	1917	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1918	+ shini0.setToolTipText("Shiny");
	1919	+ shini0.addMouseListener(new MouseAdapter()
	1920	+ {
	1921	+ public void mouseClicked(MouseEvent e)
	1922	+ {
	1923	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1924	+ cMaterial material = object.material;
	1925	+
	1926	+ shininessField.setFloat(material.shininess);
	1927	+ lightareaField.setFloat(material.lightarea);
	1928	+
	1929	+ materialtouched = true;
	1930	+ applySelf();
	1931	+ }
	1932	+ });
	1933	+ presetpanel.add(shini0);
	1934	+
	1935	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1936	+ shini1.setToolTipText("Shiny2");
	1937	+ shini1.addMouseListener(new MouseAdapter()
	1938	+ {
	1939	+ public void mouseClicked(MouseEvent e)
	1940	+ {
	1941	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1942	+ cMaterial material = object.material;
	1943	+
	1944	+ shininessField.setFloat(material.shininess);
	1945	+ lightareaField.setFloat(material.lightarea);
	1946	+
	1947	+ materialtouched = true;
	1948	+ applySelf();
	1949	+ }
	1950	+ });
	1951	+ presetpanel.add(shini1);
	1952	+
	1953	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	1954	+ shini2.setToolTipText("Shiny3");
	1955	+ shini2.addMouseListener(new MouseAdapter()
	1956	+ {
	1957	+ public void mouseClicked(MouseEvent e)
	1958	+ {
	1959	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	1960	+ cMaterial material = object.material;
	1961	+
	1962	+ shininessField.setFloat(material.shininess);
	1963	+ lightareaField.setFloat(material.lightarea);
	1964	+
	1965	+ materialtouched = true;
	1966	+ applySelf();
	1967	+ }
	1968	+ });
	1969	+ presetpanel.add(shini2);
	1970	+
	1971	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	1972	+ aniso.setToolTipText("AnisoU");
	1973	+ aniso.addMouseListener(new MouseAdapter()
	1974	+ {
	1975	+ public void mouseClicked(MouseEvent e)
	1976	+ {
	1977	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	1978	+ cMaterial material = object.material;
	1979	+
	1980	+ anisoField.setFloat(material.aniso);
	1981	+ anisoVField.setFloat(material.anisoV);
	1982	+
	1983	+ materialtouched = true;
	1984	+ applySelf();
	1985	+ }
	1986	+ });
	1987	+ presetpanel.add(aniso);
	1988	+
	1989	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	1990	+ aniso2.setToolTipText("AnisoV");
	1991	+ aniso2.addMouseListener(new MouseAdapter()
	1992	+ {
	1993	+ public void mouseClicked(MouseEvent e)
	1994	+ {
	1995	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	1996	+ cMaterial material = object.material;
	1997	+
	1998	+ anisoField.setFloat(material.aniso);
	1999	+ anisoVField.setFloat(material.anisoV);
	2000	+
	2001	+ materialtouched = true;
	2002	+ applySelf();
	2003	+ }
	2004	+ });
	2005	+ presetpanel.add(aniso2);
	2006	+
	2007	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2008	+ aniso3.setToolTipText("AnisoUV");
	2009	+ aniso3.addMouseListener(new MouseAdapter()
	2010	+ {
	2011	+ public void mouseClicked(MouseEvent e)
	2012	+ {
	2013	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2014	+ cMaterial material = object.material;
	2015	+
	2016	+ anisoField.setFloat(material.aniso);
	2017	+ anisoVField.setFloat(material.anisoV);
	2018	+
	2019	+ materialtouched = true;
	2020	+ applySelf();
	2021	+ }
	2022	+ });
	2023	+ presetpanel.add(aniso3);
	2024	+
	2025	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2026	+ velvet0.setToolTipText("Velvet");
	2027	+ velvet0.addMouseListener(new MouseAdapter()
	2028	+ {
	2029	+ public void mouseClicked(MouseEvent e)
	2030	+ {
	2031	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2032	+ cMaterial material = object.material;
	2033	+
	2034	+ diffusenessField.setFloat(material.factor);
	2035	+ selfshadowField.setFloat(material.diffuseness);
	2036	+ sheenField.setFloat(material.sheen);
	2037	+ shininessField.setFloat(material.shininess);
	2038	+ velvetField.setFloat(material.velvet);
	2039	+ shiftField.setFloat(material.shift);
	2040	+
	2041	+ materialtouched = true;
	2042	+ applySelf();
	2043	+ }
	2044	+ });
	2045	+ presetpanel.add(velvet0);
	2046	+
	2047	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2048	+ bump0.setToolTipText("Bump texture");
	2049	+ bump0.addMouseListener(new MouseAdapter()
	2050	+ {
	2051	+ public void mouseClicked(MouseEvent e)
	2052	+ {
	2053	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2054	+ cMaterial material = object.material;
	2055	+
	2056	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2057	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2058	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(bump0);
	2065	+
	2066	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2067	+ halo.setToolTipText("Halo");
	2068	+ halo.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2076	+
	2077	+ materialtouched = true;
	2078	+ applySelf();
	2079	+ }
	2080	+ });
	2081	+ presetpanel.add(halo);
	2082	+
	2083	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2084	+ candle.setToolTipText("Candle");
	2085	+ candle.addMouseListener(new MouseAdapter()
	2086	+ {
	2087	+ public void mouseClicked(MouseEvent e)
	2088	+ {
	2089	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2090	+ cMaterial material = object.material;
	2091	+
	2092	+ subsurfaceField.setFloat(material.subsurface);
	2093	+ shadowbiasField.setFloat(material.shadowbias);
	2094	+ ambientField.setFloat(material.ambient);
	2095	+ specularField.setFloat(material.specular);
	2096	+ lightareaField.setFloat(material.lightarea);
	2097	+ shininessField.setFloat(material.shininess);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(candle);
	2104	+
	2105	+ cGridBag panel = new cGridBag().setVertical(true);
	2106	+
	2107	+ presetpanel.preferredWidth = 1;
	2108	+
	2109	+ materialpanel.add(presetpanel);
	2110	+ materialpanel.add(panel);
	2111	+
	2112	+ panel.preferredWidth = 8;
	2113	+
	2114	+ /*
1666	2115	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1667	2116	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668		- */
	2117	+ */
1669	2118
1670	2119	cGridBag editBar = new cGridBag().setVertical(false);
1671	2120
..	..	@@ -1699,27 +2148,50 @@
1699	2148	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1700	2149
1701	2150	cGridBag colorSection = new cGridBag().setVertical(true);
	2151	+
	2152	+ cGridBag huepanel = new cGridBag();
	2153	+ cGridBag huelabel = new cGridBag();
	2154	+ skin = GetLabel("icons/hue.png", false);
	2155	+ skin.fit = true;
	2156	+ huelabel.add(skin);
	2157	+ huelabel.preferredWidth = 20;
	2158	+ huepanel.add(new cGridBag()); // Label
	2159	+ huepanel.add(huelabel); // Field/slider
	2160	+
	2161	+ huepanel.preferredHeight = 7;
	2162	+
	2163	+ colorSection.add(huepanel);
1702	2164
1703	2165	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);
	2166	+
	2167	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2168	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2169	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2170	+
1707	2171	//colorField.preferredWidth = 200;
1708	2172	colorSection.add(color);
1709	2173
1710	2174	cGridBag modulation = new cGridBag();
1711	2175	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1712	2176	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2177	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1714	2178	colorSection.add(modulation);
1715	2179
	2180	+ cGridBag opacity = new cGridBag();
	2181	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2182	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2183	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2184	+ colorSection.add(opacity);
	2185	+
	2186	+ colorSection.add(GetSeparator());
	2187	+
1716	2188	cGridBag texture = new cGridBag();
1717	2189	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1718	2190	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1719	2191	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1720	2192	colorSection.add(texture);
1721	2193
1722		- panel.add(new JSeparator());
	2194	+ panel.add(GetSeparator());
1723	2195
1724	2196	panel.add(colorSection);
1725	2197
..	..	@@ -1775,7 +2247,7 @@
1775	2247	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1776	2248	diffuseSection.add(shadowbias);
1777	2249
1778		- panel.add(new JSeparator());
	2250	+ panel.add(GetSeparator());
1779	2251
1780	2252	panel.add(diffuseSection);
1781	2253
..	..	@@ -1838,7 +2310,7 @@
1838	2310	specularSection.add(anisoV);
1839	2311
1840	2312
1841		- panel.add(new JSeparator());
	2313	+ panel.add(GetSeparator());
1842	2314
1843	2315	panel.add(specularSection);
1844	2316
..	..	@@ -1863,12 +2335,6 @@
1863	2335	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1864	2336	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1865	2337	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	2338
1873	2339	//panel.add(new JSeparator());
1874	2340
..	..	@@ -1914,7 +2380,7 @@
1914	2380	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1915	2381	textureSection.add(opacityPower);
1916	2382
1917		- panel.add(new JSeparator());
	2383	+ panel.add(GetSeparator());
1918	2384
1919	2385	panel.add(textureSection);
1920	2386
..	..	@@ -1979,8 +2445,9 @@
1979	2445	// 3D models
1980	2446	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1981	2447	{
1982		- lastConverter = new com.jmex.model.converters.MaxToJme();
1983		- LoadFile(filename, lastConverter);
	2448	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2449	+ //LoadFile(filename, lastConverter);
	2450	+ LoadObjFile(filename); // New 3ds loader
1984	2451	continue;
1985	2452	}
1986	2453	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2706,6 +3173,7 @@
2706	3173	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2707	3174	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2708	3175	}
	3176	+
2709	3177	//cJME.count++;
2710	3178	//cJME.count %= 12;
2711	3179	if (gc)
..	..	@@ -2889,6 +3357,7 @@
2889	3357	}
2890	3358	}
2891	3359	}
	3360	+
2892	3361	cFileSystemPane FSPane;
2893	3362
2894	3363	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2898,7 +3367,7 @@
2898	3367
2899	3368	freezematerial = true;
2900	3369	colorField.setFloat(mat.color);
2901		- modulationField.setFloat(mat.modulation);
	3370	+ saturationField.setFloat(mat.modulation);
2902	3371	metalnessField.setFloat(mat.metalness);
2903	3372	diffuseField.setFloat(mat.diffuse);
2904	3373	specularField.setFloat(mat.specular);
..	..	@@ -2942,6 +3411,7 @@
2942	3411	}
2943	3412	}
2944	3413	}
	3414	+
2945	3415	freezematerial = false;
2946	3416	}
2947	3417
..	..	@@ -3201,10 +3671,6 @@
3201	3671	{
3202	3672	ToggleAnimation();
3203	3673	return;
3204		- } else if (event.getSource() == archiveItem)
3205		- {
3206		- cTools.Archive(frame);
3207		- return;
3208	3674	} else if (event.getSource() == flipVCB)
3209	3675	{
3210	3676	copy.flipV ^= true;
..	..	@@ -3212,8 +3678,9 @@
3212	3678	} else if (event.getSource() == liveCB)
3213	3679	{
3214	3680	copy.live ^= true;
	3681	+ objEditor.refreshContents(true); // To show item colors
3215	3682	return;
3216		- } else if (event.getSource() == selectCB)
	3683	+ } else if (event.getSource() == selectableCB)
3217	3684	{
3218	3685	copy.dontselect ^= true;
3219	3686	return;
..	..	@@ -3221,7 +3688,7 @@
3221	3688	{
3222	3689	copy.hide ^= true;
3223	3690	copy.Touch(); // display list issue
3224		- objEditor.refreshContents();
	3691	+ objEditor.refreshContents(true); // To show item colors
3225	3692	return;
3226	3693	} else if (event.getSource() == link2masterCB)
3227	3694	{
..	..	@@ -3425,6 +3892,10 @@
3425	3892	{
3426	3893	generatePOV();
3427	3894	//return true;
	3895	+ } else if (event.getSource() == archiveItem)
	3896	+ {
	3897	+ cTools.Archive(frame);
	3898	+ return;
3428	3899	} else if (source == zBufferItem)
3429	3900	{
3430	3901	try
..	..	@@ -3473,11 +3944,12 @@
3473	3944
3474	3945	static public byte[] Compress(Object3D o)
3475	3946	{
	3947	+ // Slower to actually compress.
3476	3948	try
3477	3949	{
3478	3950	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3479		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3480		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3951	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3952	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3481	3953
3482	3954	Object3D parent = o.parent;
3483	3955	o.parent = null;
..	..	@@ -3488,10 +3960,14 @@
3488	3960
3489	3961	out.flush();
3490	3962
3491		- zstream.close();
	3963	+ baos //zstream
	3964	+ .close();
3492	3965	out.close();
3493	3966
3494		- return baos.toByteArray();
	3967	+ byte[] bytes = baos.toByteArray();
	3968	+
	3969	+ System.out.println("save #bytes = " + bytes.length);
	3970	+ return bytes;
3495	3971	} catch (Exception e)
3496	3972	{
3497	3973	System.err.println(e);
..	..	@@ -3501,13 +3977,16 @@
3501	3977
3502	3978	static public Object Uncompress(byte[] bytes)
3503	3979	{
3504		- System.out.println("#bytes = " + bytes.length);
	3980	+ System.out.println("restore #bytes = " + bytes.length);
3505	3981	try
3506	3982	{
3507	3983	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3508		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3509		- ObjectInputStream in = new ObjectInputStream(istream);
	3984	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3985	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3510	3986	Object obj = in.readObject();
	3987	+
	3988	+ bais //istream
	3989	+ .close();
3511	3990	in.close();
3512	3991
3513	3992	return obj;
..	..	@@ -3562,34 +4041,86 @@
3562	4041	return null;
3563	4042	}
3564	4043
3565		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3566	4044
3567	4045	public void Save()
3568	4046	{
	4047	+ //Save(true);
	4048	+ Replace();
	4049	+ SetUndoStates();
	4050	+ }
	4051	+
	4052	+ private boolean Equal(byte[] compress, byte[] name)
	4053	+ {
	4054	+ if (compress.length != name.length)
	4055	+ {
	4056	+ return false;
	4057	+ }
	4058	+
	4059	+ for (int i=compress.length; --i>=0;)
	4060	+ {
	4061	+ if (compress[i] != name[i])
	4062	+ return false;
	4063	+ }
	4064	+
	4065	+ return true;
	4066	+ }
	4067	+
	4068	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4069	+
	4070	+ void DeleteVersion()
	4071	+ {
	4072	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4073	+ {
	4074	+ copy.versionlist[i] = copy.versionlist[i+1];
	4075	+ }
	4076	+
	4077	+ CopyChanged();
	4078	+
	4079	+ SetUndoStates();
	4080	+ }
	4081	+
	4082	+ public boolean Save(boolean user)
	4083	+ {
3569	4084	System.err.println("Save");
	4085	+ //Replace();
3570	4086
3571	4087	cRadio tab = GetCurrentTab();
3572	4088
3573		- boolean temp = CameraPane.SWITCH;
3574		- CameraPane.SWITCH = false;
	4089	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3575	4090
3576		- copy.ExtractBigData(hashtable);
	4091	+ boolean thesame = false;
3577	4092
3578		- byte[] compress = Compress(copy);
	4093	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4094	+// {
	4095	+// thesame = true;
	4096	+// }
3579	4097
3580	4098	//EditorFrame.m_MainFrame.requestFocusInWindow();
3581		- tab.graphs[tab.undoindex++] = compress;
	4099	+ if (!thesame)
	4100	+ {
	4101	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4102	+ {
	4103	+ copy.versionlist[i] = copy.versionlist[i-1];
	4104	+ }
	4105	+
	4106	+ //tab.user[tab.versionindex] = user;
	4107	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4108	+
	4109	+ copy.versionlist[++copy.versionindex] = compress;
	4110	+
	4111	+ // if (increment)
	4112	+ // tab.versionindex++;
	4113	+ }
3582	4114
3583		- copy.RestoreBigData(hashtable);
	4115	+ //copy.RestoreBigData(versiontable);
3584	4116
3585		- CameraPane.SWITCH = temp;
3586		-
3587	4117	//assert(hashtable.isEmpty());
3588	4118
3589		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3590		- {
3591		- tab.graphs[i] = null;
3592		- }
	4119	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4120	+// {
	4121	+// //tab.user[i] = false;
	4122	+// copy.versionlist[i] = null;
	4123	+// }
3593	4124
3594	4125	SetUndoStates();
3595	4126
..	..	@@ -3598,7 +4129,7 @@
3598	4129	{
3599	4130	try
3600	4131	{
3601		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4132	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3602	4133	ObjectOutputStream p = new ObjectOutputStream(ostream);
3603	4134
3604	4135	p.writeObject(copy);
..	..	@@ -3611,28 +4142,68 @@
3611	4142	e.printStackTrace();
3612	4143	}
3613	4144	}
	4145	+
	4146	+ return !thesame;
	4147	+ }
	4148	+
	4149	+ boolean flashIt = true;
	4150	+
	4151	+ void RefreshSelection()
	4152	+ {
	4153	+ Object3D selection = new Object3D();
	4154	+
	4155	+ for (int i = 0; i < copy.selection.size(); i++)
	4156	+ {
	4157	+ Object3D elem = copy.selection.elementAt(i);
	4158	+
	4159	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4160	+
	4161	+ if (obj == null)
	4162	+ {
	4163	+ copy.selection.remove(i--);
	4164	+ }
	4165	+ else
	4166	+ {
	4167	+ selection.add(obj);
	4168	+ copy.selection.setElementAt(obj, i);
	4169	+ }
	4170	+ }
	4171	+
	4172	+ flashIt = false;
	4173	+ GetTree().clearSelection();
	4174	+ for (int i = 0; i < selection.size(); i++)
	4175	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4176	+ flashIt = true;
	4177	+
	4178	+ //refreshContents(false);
3614	4179	}
3615	4180
3616		- void CopyChanged(Object3D obj)
	4181	+ void CopyChanged()
3617	4182	{
	4183	+ Object3D obj = copy.versionlist[copy.versionindex];
	4184	+
3618	4185	SetUndoStates();
3619	4186
3620	4187	boolean temp = CameraPane.SWITCH;
3621	4188	CameraPane.SWITCH = false;
3622	4189
3623		- copy.ExtractBigData(hashtable);
	4190	+ copy.ExtractBigData(versiontable);
3624	4191
3625	4192	copy.clear();
3626	4193
	4194	+ copy.skyboxname = obj.skyboxname;
	4195	+ copy.skyboxext = obj.skyboxext;
	4196	+
3627	4197	for (int i=0; i<obj.Size(); i++)
3628	4198	{
3629	4199	copy.add(obj.get(i));
3630	4200	}
3631	4201
3632		- copy.RestoreBigData(hashtable);
	4202	+ copy.RestoreBigData(versiontable);
3633	4203
3634	4204	CameraPane.SWITCH = temp;
3635	4205
	4206	+ RefreshSelection();
3636	4207	//assert(hashtable.isEmpty());
3637	4208
3638	4209	copy.Touch();
..	..	@@ -3653,56 +4224,139 @@
3653	4224	}
3654	4225	}
3655	4226
3656		- refreshContents();
	4227	+ refreshContents(true);
3657	4228	}
3658	4229
3659		- cButton undoButton;
3660		- cButton redoButton;
	4230	+ cButton previousVersionButton;
	4231	+ cButton restoreButton;
	4232	+ cButton replaceButton;
	4233	+ cButton nextVersionButton;
	4234	+ cButton saveVersionButton;
	4235	+ cButton deleteVersionButton;
3661	4236
	4237	+ boolean muteSlider;
	4238	+
	4239	+ int VersionCount()
	4240	+ {
	4241	+ int count = 0;
	4242	+
	4243	+ for (int i = copy.versionlist.length; --i >= 0;)
	4244	+ {
	4245	+ if (copy.versionlist[i] != null)
	4246	+ count++;
	4247	+ }
	4248	+
	4249	+ return count;
	4250	+ }
	4251	+
3662	4252	void SetUndoStates()
3663	4253	{
3664	4254	cRadio tab = GetCurrentTab();
3665	4255
3666		- undoButton.setEnabled(tab.undoindex > 0);
3667		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4256	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4257	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4258	+
	4259	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4260	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4261	+
	4262	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4263	+ copy.versionlist[copy.versionindex + 1] != null);
	4264	+
	4265	+ muteSlider = true;
	4266	+ versionSlider.setMaximum(VersionCount() - 1);
	4267	+ versionSlider.setInteger(copy.versionindex);
	4268	+ muteSlider = false;
3668	4269	}
3669	4270
3670		- public void Undo()
	4271	+ public boolean PreviousVersion()
3671	4272	{
	4273	+ // Option?
	4274	+ Replace();
	4275	+
3672	4276	System.err.println("Undo");
3673	4277
3674	4278	cRadio tab = GetCurrentTab();
3675	4279
3676		- if (tab.undoindex == 0)
	4280	+ if (copy.versionindex == 0)
3677	4281	{
3678	4282	java.awt.Toolkit.getDefaultToolkit().beep();
3679		- return;
	4283	+ return false;
3680	4284	}
3681	4285
3682		- if (tab.graphs[tab.undoindex] == null)
3683		- {
3684		- Save();
3685		- tab.undoindex -= 1;
3686		- }
	4286	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4287	+// {
	4288	+// if (Save(false))
	4289	+// tab.versionindex -= 1;
	4290	+// else
	4291	+// {
	4292	+// if (tab.versionindex <= 0)
	4293	+// return false;
	4294	+// else
	4295	+// tab.versionindex -= 1;
	4296	+// }
	4297	+// }
3687	4298
3688		- tab.undoindex -= 1;
	4299	+ copy.versionindex -= 1;
3689	4300
3690		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4301	+ CopyChanged();
	4302	+
	4303	+ return true;
3691	4304	}
3692	4305
3693		- public void Redo()
	4306	+ public boolean Restore()
3694	4307	{
	4308	+ System.err.println("Restore");
	4309	+
3695	4310	cRadio tab = GetCurrentTab();
3696	4311
3697		- if (tab.graphs[tab.undoindex + 1] == null)
	4312	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4313	+ {
	4314	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4315	+ return false;
	4316	+ }
	4317	+
	4318	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4319	+ CopyChanged();
	4320	+
	4321	+ return true;
	4322	+ }
	4323	+
	4324	+ public boolean Replace()
	4325	+ {
	4326	+ System.err.println("Replace");
	4327	+
	4328	+ cRadio tab = GetCurrentTab();
	4329	+
	4330	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4331	+ {
	4332	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4333	+ return false;
	4334	+ }
	4335	+
	4336	+ copy.versionlist[copy.versionindex] = CompressCopy();
	4337	+
	4338	+ return true;
	4339	+ }
	4340	+
	4341	+ public void NextVersion()
	4342	+ {
	4343	+ // Option?
	4344	+ Replace();
	4345	+
	4346	+ cRadio tab = GetCurrentTab();
	4347	+
	4348	+ if (copy.versionlist[copy.versionindex + 1] == null)
3698	4349	{
3699	4350	java.awt.Toolkit.getDefaultToolkit().beep();
3700	4351	return;
3701	4352	}
3702	4353
3703		- tab.undoindex += 1;
	4354	+ copy.versionindex += 1;
3704	4355
3705		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4356	+ CopyChanged();
	4357	+
	4358	+ //if (!tab.user[tab.versionindex])
	4359	+ // tab.graphs[tab.versionindex] = null;
3706	4360	}
3707	4361
3708	4362	void ImportGFD()
..	..	@@ -3913,7 +4567,7 @@
3913	4567	//copy.material = new cMaterial(copy.GetMaterial());
3914	4568
3915	4569	current.color = (float) colorField.getFloat();
3916		- current.modulation = (float) modulationField.getFloat();
	4570	+ current.modulation = (float) saturationField.getFloat();
3917	4571	current.metalness = (float) metalnessField.getFloat();
3918	4572	current.diffuse = (float) diffuseField.getFloat();
3919	4573	current.specular = (float) specularField.getFloat();
..	..	@@ -3946,7 +4600,7 @@
3946	4600	cMaterial mat = copy.material;
3947	4601
3948	4602	colorField.SetToolTipValue((mat.color));
3949		- modulationField.SetToolTipValue((mat.modulation));
	4603	+ saturationField.SetToolTipValue((mat.modulation));
3950	4604	metalnessField.SetToolTipValue((mat.metalness));
3951	4605	diffuseField.SetToolTipValue((mat.diffuse));
3952	4606	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3998,9 +4652,26 @@
3998	4652	//copy.Touch();
3999	4653	}
4000	4654
	4655	+ cNumberSlider versionSlider;
	4656	+
4001	4657	public void stateChanged(ChangeEvent e)
4002	4658	{
4003	4659	// assert(false);
	4660	+ if (e.getSource() == versionSlider)
	4661	+ {
	4662	+ if (muteSlider)
	4663	+ return;
	4664	+
	4665	+ int version = versionSlider.getInteger();
	4666	+
	4667	+ if (copy.versionlist[version] != null)
	4668	+ {
	4669	+ copy.versionindex = version;
	4670	+ CopyChanged();
	4671	+ }
	4672	+
	4673	+ return;
	4674	+ }
4004	4675
4005	4676	if (freezematerial)
4006	4677	{
..	..	@@ -4036,6 +4707,12 @@
4036	4707	{
4037	4708	//System.out.println("stateChanged = " + this);
4038	4709	materialtouched = true;
	4710	+
	4711	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4712	+ {
	4713	+ saturationField.setFloat(1);
	4714	+ }
	4715	+
4039	4716	applySelf();
4040	4717	//System.out.println("this = " + this);
4041	4718	//System.out.println("PARENT = " + parent);
..	..	@@ -4335,6 +5012,7 @@
4335	5012	{
4336	5013	if (GetTree() != null)
4337	5014	{
	5015	+ GetTree().revalidate();
4338	5016	GetTree().repaint();
4339	5017	}
4340	5018
..	..	@@ -4343,13 +5021,16 @@
4343	5021	ctrlPanel.validate(); // ? new
4344	5022	ctrlPanel.repaint();
4345	5023	}
	5024	+
	5025	+ if (previousVersionButton != null && copy.versionlist != null)
	5026	+ SetUndoStates();
4346	5027	}
4347	5028
4348	5029	static TweenManager tweenManager = new TweenManager();
4349	5030
4350	5031	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4351	5032	{
4352		- if (Globals.SAVEONMAKE) // && resetmodel)
	5033	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4353	5034	Save();
4354	5035	//Tween.set(thing, 0).target(1).start(tweenManager);
4355	5036	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4591,7 +5272,9 @@
4591	5272	readobj.ResetDisplayList();
4592	5273	} catch (Exception e)
4593	5274	{
4594		- //e.printStackTrace();
	5275	+ if (!e.toString().contains("GZIP"))
	5276	+ e.printStackTrace();
	5277	+
4595	5278	try
4596	5279	{
4597	5280	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4665,12 +5348,14 @@
4665	5348
4666	5349	if (readobj != null)
4667	5350	{
4668		- if (Globals.SAVEONMAKE)
4669		- Save();
	5351	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5352	+ // Save();
4670	5353	try
4671	5354	{
4672	5355	//readobj.deepCopySelf(copy);
4673	5356	copy.clear(); // june 2014
	5357	+ copy.skyboxname = readobj.skyboxname;
	5358	+ copy.skyboxext = readobj.skyboxext;
4674	5359	for (int i = 0; i < readobj.size(); i++)
4675	5360	{
4676	5361	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4711,6 +5396,7 @@
4711	5396	}
4712	5397	} catch (ClassCastException e)
4713	5398	{
	5399	+ e.printStackTrace();
4714	5400	assert (false);
4715	5401	Composite c = (Composite) copy;
4716	5402	c.children.clear();
..	..	@@ -4721,6 +5407,17 @@
4721	5407	c.addChild(csg);
4722	5408	}
4723	5409
	5410	+ copy.versionlist = readobj.versionlist;
	5411	+ copy.versionindex = readobj.versionindex;
	5412	+
	5413	+ if (copy.versionlist == null)
	5414	+ {
	5415	+ copy.versionlist = new Object3D[100];
	5416	+ copy.versionindex = -1;
	5417	+ }
	5418	+
	5419	+ //? SetUndoStates();
	5420	+
4724	5421	ResetModel();
4725	5422	copy.HardTouch(); // recompile?
4726	5423	refreshContents();
..	..	@@ -4731,7 +5428,7 @@
4731	5428	{
4732	5429	if (Grafreed.standAlone)
4733	5430	{
4734		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5431	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4735	5432	browser.show();
4736	5433	String filename = browser.getFile();
4737	5434	if (filename != null && filename.length() > 0)
..	..	@@ -4830,6 +5527,7 @@
4830	5527	//ps.print(buffer.toString());
4831	5528	} catch (IOException e)
4832	5529	{
	5530	+ e.printStackTrace();
4833	5531	}
4834	5532	}
4835	5533
..	..	@@ -5035,7 +5733,7 @@
5035	5733	CheckboxMenuItem toggleSwitchItem;
5036	5734	CheckboxMenuItem toggleRootItem;
5037	5735	CheckboxMenuItem animationItem;
5038		- CheckboxMenuItem archiveItem;
	5736	+ MenuItem archiveItem;
5039	5737	CheckboxMenuItem toggleHandleItem;
5040	5738	CheckboxMenuItem togglePaintItem;
5041	5739	JSplitPane mainPanel;
..	..	@@ -5122,7 +5820,7 @@
5122	5820	JLabel colorLabel;
5123	5821	cNumberSlider colorField;
5124	5822	JLabel modulationLabel;
5125		- cNumberSlider modulationField;
	5823	+ cNumberSlider saturationField;
5126	5824	JLabel metalnessLabel;
5127	5825	cNumberSlider metalnessField;
5128	5826	JLabel diffuseLabel;