~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
..	..	@@ -350,7 +382,7 @@
350	382	frame.setMenuBar(menuBar = new MenuBar());
351	383	menuBar.add(fileMenu = new Menu("File"));
352	384	fileMenu.add(newItem = new MenuItem("New"));
353		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
354	386
355	387	//oe.menuBar.add(menu = new Menu("Include"));
356	388	Menu menu = new Menu("Import");
..	..	@@ -382,7 +414,7 @@
382	414	}
383	415
384	416	newItem.addActionListener(this);
385		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
386	418	saveItem.addActionListener(this);
387	419	saveAsItem.addActionListener(this);
388	420	exportAsItem.addActionListener(this);
..	..	@@ -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
..	..	@@ -780,7 +814,7 @@
780	814	// X frame.getContentPane().remove(/"Center",/bigThree);
781	815	// X framePanel.add(bigThree);
782	816	// X frame.getContentPane().add(/"Center",/framePanel);
783		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
784	818
785	819	//frame.setVisible(true);
786	820	radio.layout = keepButton;
..	..	@@ -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,13 +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);
1496		- objectPanel.add(infoPanel);
	1564	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1565	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1566	+
	1567	+ //if (Globals.ADVANCED)
	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");
	1575	+
1497	1576	objectPanel.add(toolboxPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1498	1579
1499	1580	/*
1500	1581	aConstraints.gridx = 0;
..	..	@@ -1515,7 +1596,7 @@
1515	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1516	1597
1517	1598	/JTabbedPane/ scenePanel = new cGridBag();
1518		- scenePanel.preferredWidth = 6;
	1599	+ scenePanel.preferredWidth = 5;
1519	1600
1520	1601	JTabbedPane tabbedPane = new JTabbedPane();
1521	1602	tabbedPane.add(scrollpane);
..	..	@@ -1593,7 +1674,7 @@
1593	1674	bigThree = new cGridBag();
1594	1675	bigThree.addComponent(scenePanel);
1595	1676	bigThree.addComponent(centralPanel);
1596		- bigThree.addComponent(XYZPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
1597	1678
1598	1679	// // SIDE EFFECT!!!
1599	1680	// aConstraints.gridx = 0;
..	..	@@ -1602,9 +1683,9 @@
1602	1683	// aConstraints.gridheight = 1;
1603	1684
1604	1685	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1605		- framePanel.setContinuousLayout(true);
1606		- framePanel.setOneTouchExpandable(true);
1607		- framePanel.setDividerLocation(0.8);
	1686	+ framePanel.setContinuousLayout(false);
	1687	+ framePanel.setOneTouchExpandable(false);
	1688	+ //.setDividerLocation(0.8);
1608	1689	//framePanel.setDividerSize(15);
1609	1690	//framePanel.setResizeWeight(0.15);
1610	1691	framePanel.setName("Frame");
..	..	@@ -1634,7 +1715,6 @@
1634	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1635	1716	frame.addWindowListener(new WindowAdapter()
1636	1717	{
1637		-
1638	1718	public void windowClosing(WindowEvent e)
1639	1719	{
1640	1720	Close();
..	..	@@ -1657,12 +1737,85 @@
1657	1737	ctrlPanel.removeAll();
1658	1738	}
1659	1739
1660		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1661	1741	{
1662		- /*
	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	+ /*
1663	1816	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1664	1817	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- */
	1818	+ */
1666	1819
1667	1820	cGridBag editBar = new cGridBag().setVertical(false);
1668	1821
..	..	@@ -1696,27 +1849,50 @@
1696	1849	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1697	1850
1698	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);
1699	1865
1700	1866	cGridBag color = new cGridBag();
1701		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1702		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703		- 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	+
1704	1872	//colorField.preferredWidth = 200;
1705	1873	colorSection.add(color);
1706	1874
1707	1875	cGridBag modulation = new cGridBag();
1708	1876	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1709	1877	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1710		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1878	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1711	1879	colorSection.add(modulation);
1712	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	+
1713	1889	cGridBag texture = new cGridBag();
1714	1890	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1715	1891	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716	1892	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1717	1893	colorSection.add(texture);
1718	1894
1719		- panel.add(new JSeparator());
	1895	+ panel.add(GetSeparator());
1720	1896
1721	1897	panel.add(colorSection);
1722	1898
..	..	@@ -1772,7 +1948,7 @@
1772	1948	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1773	1949	diffuseSection.add(shadowbias);
1774	1950
1775		- panel.add(new JSeparator());
	1951	+ panel.add(GetSeparator());
1776	1952
1777	1953	panel.add(diffuseSection);
1778	1954
..	..	@@ -1835,7 +2011,7 @@
1835	2011	specularSection.add(anisoV);
1836	2012
1837	2013
1838		- panel.add(new JSeparator());
	2014	+ panel.add(GetSeparator());
1839	2015
1840	2016	panel.add(specularSection);
1841	2017
..	..	@@ -1860,12 +2036,6 @@
1860	2036	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1861	2037	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1862	2038	colorSection.add(backlit);
1863		-
1864		- cGridBag opacity = new cGridBag();
1865		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1866		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1867		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1868		- colorSection.add(opacity);
1869	2039
1870	2040	//panel.add(new JSeparator());
1871	2041
..	..	@@ -1911,7 +2081,7 @@
1911	2081	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1912	2082	textureSection.add(opacityPower);
1913	2083
1914		- panel.add(new JSeparator());
	2084	+ panel.add(GetSeparator());
1915	2085
1916	2086	panel.add(textureSection);
1917	2087
..	..	@@ -1976,8 +2146,9 @@
1976	2146	// 3D models
1977	2147	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1978	2148	{
1979		- lastConverter = new com.jmex.model.converters.MaxToJme();
1980		- LoadFile(filename, lastConverter);
	2149	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2150	+ //LoadFile(filename, lastConverter);
	2151	+ LoadObjFile(filename); // New 3ds loader
1981	2152	continue;
1982	2153	}
1983	2154	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2703,6 +2874,7 @@
2703	2874	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2704	2875	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2705	2876	}
	2877	+
2706	2878	//cJME.count++;
2707	2879	//cJME.count %= 12;
2708	2880	if (gc)
..	..	@@ -2886,6 +3058,7 @@
2886	3058	}
2887	3059	}
2888	3060	}
	3061	+
2889	3062	cFileSystemPane FSPane;
2890	3063
2891	3064	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2895,7 +3068,7 @@
2895	3068
2896	3069	freezematerial = true;
2897	3070	colorField.setFloat(mat.color);
2898		- modulationField.setFloat(mat.modulation);
	3071	+ saturationField.setFloat(mat.modulation);
2899	3072	metalnessField.setFloat(mat.metalness);
2900	3073	diffuseField.setFloat(mat.diffuse);
2901	3074	specularField.setFloat(mat.specular);
..	..	@@ -2939,6 +3112,7 @@
2939	3112	}
2940	3113	}
2941	3114	}
	3115	+
2942	3116	freezematerial = false;
2943	3117	}
2944	3118
..	..	@@ -3205,8 +3379,9 @@
3205	3379	} else if (event.getSource() == liveCB)
3206	3380	{
3207	3381	copy.live ^= true;
	3382	+ objEditor.refreshContents(true); // To show item colors
3208	3383	return;
3209		- } else if (event.getSource() == selectCB)
	3384	+ } else if (event.getSource() == selectableCB)
3210	3385	{
3211	3386	copy.dontselect ^= true;
3212	3387	return;
..	..	@@ -3214,7 +3389,7 @@
3214	3389	{
3215	3390	copy.hide ^= true;
3216	3391	copy.Touch(); // display list issue
3217		- objEditor.refreshContents();
	3392	+ objEditor.refreshContents(true); // To show item colors
3218	3393	return;
3219	3394	} else if (event.getSource() == link2masterCB)
3220	3395	{
..	..	@@ -3391,9 +3566,9 @@
3391	3566	{
3392	3567	Close();
3393	3568	//return true;
3394		- } else if (source == loadItem)
	3569	+ } else if (source == openItem)
3395	3570	{
3396		- load();
	3571	+ Open();
3397	3572	//return true;
3398	3573	} else if (source == newItem)
3399	3574	{
..	..	@@ -3418,6 +3593,10 @@
3418	3593	{
3419	3594	generatePOV();
3420	3595	//return true;
	3596	+ } else if (event.getSource() == archiveItem)
	3597	+ {
	3598	+ cTools.Archive(frame);
	3599	+ return;
3421	3600	} else if (source == zBufferItem)
3422	3601	{
3423	3602	try
..	..	@@ -3466,11 +3645,12 @@
3466	3645
3467	3646	static public byte[] Compress(Object3D o)
3468	3647	{
	3648	+ // Slower to actually compress.
3469	3649	try
3470	3650	{
3471	3651	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3472		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3473		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3652	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3653	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3474	3654
3475	3655	Object3D parent = o.parent;
3476	3656	o.parent = null;
..	..	@@ -3481,10 +3661,14 @@
3481	3661
3482	3662	out.flush();
3483	3663
3484		- zstream.close();
	3664	+ baos //zstream
	3665	+ .close();
3485	3666	out.close();
3486	3667
3487		- return baos.toByteArray();
	3668	+ byte[] bytes = baos.toByteArray();
	3669	+
	3670	+ System.out.println("save #bytes = " + bytes.length);
	3671	+ return bytes;
3488	3672	} catch (Exception e)
3489	3673	{
3490	3674	System.err.println(e);
..	..	@@ -3494,13 +3678,16 @@
3494	3678
3495	3679	static public Object Uncompress(byte[] bytes)
3496	3680	{
3497		- System.out.println("#bytes = " + bytes.length);
	3681	+ System.out.println("restore #bytes = " + bytes.length);
3498	3682	try
3499	3683	{
3500	3684	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3501		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3502		- ObjectInputStream in = new ObjectInputStream(istream);
	3685	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3686	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3503	3687	Object obj = in.readObject();
	3688	+
	3689	+ bais //istream
	3690	+ .close();
3504	3691	in.close();
3505	3692
3506	3693	return obj;
..	..	@@ -3555,34 +3742,86 @@
3555	3742	return null;
3556	3743	}
3557	3744
3558		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3559	3745
3560	3746	public void Save()
3561	3747	{
	3748	+ //Save(true);
	3749	+ Replace();
	3750	+ SetUndoStates();
	3751	+ }
	3752	+
	3753	+ private boolean Equal(byte[] compress, byte[] name)
	3754	+ {
	3755	+ if (compress.length != name.length)
	3756	+ {
	3757	+ return false;
	3758	+ }
	3759	+
	3760	+ for (int i=compress.length; --i>=0;)
	3761	+ {
	3762	+ if (compress[i] != name[i])
	3763	+ return false;
	3764	+ }
	3765	+
	3766	+ return true;
	3767	+ }
	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	+
	3783	+ public boolean Save(boolean user)
	3784	+ {
3562	3785	System.err.println("Save");
	3786	+ //Replace();
3563	3787
3564	3788	cRadio tab = GetCurrentTab();
3565	3789
3566		- boolean temp = CameraPane.SWITCH;
3567		- CameraPane.SWITCH = false;
	3790	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3568	3791
3569		- copy.ExtractBigData(hashtable);
	3792	+ boolean thesame = false;
3570	3793
3571		- byte[] compress = Compress(copy);
	3794	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3795	+// {
	3796	+// thesame = true;
	3797	+// }
3572	3798
3573	3799	//EditorFrame.m_MainFrame.requestFocusInWindow();
3574		- tab.graphs[tab.undoindex++] = compress;
	3800	+ if (!thesame)
	3801	+ {
	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++;
	3814	+ }
3575	3815
3576		- copy.RestoreBigData(hashtable);
	3816	+ //copy.RestoreBigData(versiontable);
3577	3817
3578		- CameraPane.SWITCH = temp;
3579		-
3580	3818	//assert(hashtable.isEmpty());
3581	3819
3582		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3583		- {
3584		- tab.graphs[i] = null;
3585		- }
	3820	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3821	+// {
	3822	+// //tab.user[i] = false;
	3823	+// copy.versionlist[i] = null;
	3824	+// }
3586	3825
3587	3826	SetUndoStates();
3588	3827
..	..	@@ -3591,7 +3830,7 @@
3591	3830	{
3592	3831	try
3593	3832	{
3594		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3833	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3595	3834	ObjectOutputStream p = new ObjectOutputStream(ostream);
3596	3835
3597	3836	p.writeObject(copy);
..	..	@@ -3604,28 +3843,68 @@
3604	3843	e.printStackTrace();
3605	3844	}
3606	3845	}
	3846	+
	3847	+ return !thesame;
	3848	+ }
	3849	+
	3850	+ boolean flashIt = true;
	3851	+
	3852	+ void RefreshSelection()
	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);
3607	3880	}
3608	3881
3609		- void CopyChanged(Object3D obj)
	3882	+ void CopyChanged()
3610	3883	{
	3884	+ Object3D obj = copy.versionlist[copy.versionindex];
	3885	+
3611	3886	SetUndoStates();
3612	3887
3613	3888	boolean temp = CameraPane.SWITCH;
3614	3889	CameraPane.SWITCH = false;
3615	3890
3616		- copy.ExtractBigData(hashtable);
	3891	+ copy.ExtractBigData(versiontable);
3617	3892
3618	3893	copy.clear();
3619	3894
	3895	+ copy.skyboxname = obj.skyboxname;
	3896	+ copy.skyboxext = obj.skyboxext;
	3897	+
3620	3898	for (int i=0; i<obj.Size(); i++)
3621	3899	{
3622	3900	copy.add(obj.get(i));
3623	3901	}
3624	3902
3625		- copy.RestoreBigData(hashtable);
	3903	+ copy.RestoreBigData(versiontable);
3626	3904
3627	3905	CameraPane.SWITCH = temp;
3628	3906
	3907	+ RefreshSelection();
3629	3908	//assert(hashtable.isEmpty());
3630	3909
3631	3910	copy.Touch();
..	..	@@ -3646,56 +3925,139 @@
3646	3925	}
3647	3926	}
3648	3927
3649		- refreshContents();
	3928	+ refreshContents(true);
3650	3929	}
3651	3930
3652		- cButton undoButton;
3653		- cButton redoButton;
	3931	+ cButton previousVersionButton;
	3932	+ cButton restoreButton;
	3933	+ cButton replaceButton;
	3934	+ cButton nextVersionButton;
	3935	+ cButton saveVersionButton;
	3936	+ cButton deleteVersionButton;
3654	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	+
3655	3953	void SetUndoStates()
3656	3954	{
3657	3955	cRadio tab = GetCurrentTab();
3658	3956
3659		- undoButton.setEnabled(tab.undoindex > 0);
3660		- 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;
3661	3970	}
3662	3971
3663		- public void Undo()
	3972	+ public boolean PreviousVersion()
3664	3973	{
	3974	+ // Option?
	3975	+ Replace();
	3976	+
3665	3977	System.err.println("Undo");
3666	3978
3667	3979	cRadio tab = GetCurrentTab();
3668	3980
3669		- if (tab.undoindex == 0)
	3981	+ if (copy.versionindex == 0)
3670	3982	{
3671	3983	java.awt.Toolkit.getDefaultToolkit().beep();
3672		- return;
	3984	+ return false;
3673	3985	}
3674	3986
3675		- if (tab.graphs[tab.undoindex] == null)
3676		- {
3677		- Save();
3678		- tab.undoindex -= 1;
3679		- }
	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	+// }
3680	3999
3681		- tab.undoindex -= 1;
	4000	+ copy.versionindex -= 1;
3682	4001
3683		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4002	+ CopyChanged();
	4003	+
	4004	+ return true;
3684	4005	}
3685	4006
3686		- public void Redo()
	4007	+ public boolean Restore()
3687	4008	{
	4009	+ System.err.println("Restore");
	4010	+
3688	4011	cRadio tab = GetCurrentTab();
3689	4012
3690		- 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)
3691	4050	{
3692	4051	java.awt.Toolkit.getDefaultToolkit().beep();
3693	4052	return;
3694	4053	}
3695	4054
3696		- tab.undoindex += 1;
	4055	+ copy.versionindex += 1;
3697	4056
3698		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4057	+ CopyChanged();
	4058	+
	4059	+ //if (!tab.user[tab.versionindex])
	4060	+ // tab.graphs[tab.versionindex] = null;
3699	4061	}
3700	4062
3701	4063	void ImportGFD()
..	..	@@ -3906,7 +4268,7 @@
3906	4268	//copy.material = new cMaterial(copy.GetMaterial());
3907	4269
3908	4270	current.color = (float) colorField.getFloat();
3909		- current.modulation = (float) modulationField.getFloat();
	4271	+ current.modulation = (float) saturationField.getFloat();
3910	4272	current.metalness = (float) metalnessField.getFloat();
3911	4273	current.diffuse = (float) diffuseField.getFloat();
3912	4274	current.specular = (float) specularField.getFloat();
..	..	@@ -3939,7 +4301,7 @@
3939	4301	cMaterial mat = copy.material;
3940	4302
3941	4303	colorField.SetToolTipValue((mat.color));
3942		- modulationField.SetToolTipValue((mat.modulation));
	4304	+ saturationField.SetToolTipValue((mat.modulation));
3943	4305	metalnessField.SetToolTipValue((mat.metalness));
3944	4306	diffuseField.SetToolTipValue((mat.diffuse));
3945	4307	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3991,9 +4353,26 @@
3991	4353	//copy.Touch();
3992	4354	}
3993	4355
	4356	+ cNumberSlider versionSlider;
	4357	+
3994	4358	public void stateChanged(ChangeEvent e)
3995	4359	{
3996	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	+ }
3997	4376
3998	4377	if (freezematerial)
3999	4378	{
..	..	@@ -4029,6 +4408,12 @@
4029	4408	{
4030	4409	//System.out.println("stateChanged = " + this);
4031	4410	materialtouched = true;
	4411	+
	4412	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4413	+ {
	4414	+ saturationField.setFloat(1);
	4415	+ }
	4416	+
4032	4417	applySelf();
4033	4418	//System.out.println("this = " + this);
4034	4419	//System.out.println("PARENT = " + parent);
..	..	@@ -4328,6 +4713,7 @@
4328	4713	{
4329	4714	if (GetTree() != null)
4330	4715	{
	4716	+ GetTree().revalidate();
4331	4717	GetTree().repaint();
4332	4718	}
4333	4719
..	..	@@ -4336,13 +4722,16 @@
4336	4722	ctrlPanel.validate(); // ? new
4337	4723	ctrlPanel.repaint();
4338	4724	}
	4725	+
	4726	+ if (previousVersionButton != null && copy.versionlist != null)
	4727	+ SetUndoStates();
4339	4728	}
4340	4729
4341	4730	static TweenManager tweenManager = new TweenManager();
4342	4731
4343	4732	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4344	4733	{
4345		- if (Globals.SAVEONMAKE) // && resetmodel)
	4734	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4346	4735	Save();
4347	4736	//Tween.set(thing, 0).target(1).start(tweenManager);
4348	4737	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4584,7 +4973,9 @@
4584	4973	readobj.ResetDisplayList();
4585	4974	} catch (Exception e)
4586	4975	{
4587		- //e.printStackTrace();
	4976	+ if (!e.toString().contains("GZIP"))
	4977	+ e.printStackTrace();
	4978	+
4588	4979	try
4589	4980	{
4590	4981	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4658,12 +5049,14 @@
4658	5049
4659	5050	if (readobj != null)
4660	5051	{
4661		- if (Globals.SAVEONMAKE)
4662		- Save();
	5052	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5053	+ // Save();
4663	5054	try
4664	5055	{
4665	5056	//readobj.deepCopySelf(copy);
4666	5057	copy.clear(); // june 2014
	5058	+ copy.skyboxname = readobj.skyboxname;
	5059	+ copy.skyboxext = readobj.skyboxext;
4667	5060	for (int i = 0; i < readobj.size(); i++)
4668	5061	{
4669	5062	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4704,6 +5097,7 @@
4704	5097	}
4705	5098	} catch (ClassCastException e)
4706	5099	{
	5100	+ e.printStackTrace();
4707	5101	assert (false);
4708	5102	Composite c = (Composite) copy;
4709	5103	c.children.clear();
..	..	@@ -4714,17 +5108,28 @@
4714	5108	c.addChild(csg);
4715	5109	}
4716	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	+
4717	5122	ResetModel();
4718	5123	copy.HardTouch(); // recompile?
4719	5124	refreshContents();
4720	5125	}
4721	5126	}
4722	5127
4723		- void load() // throws ClassNotFoundException
	5128	+ void Open() // throws ClassNotFoundException
4724	5129	{
4725	5130	if (Grafreed.standAlone)
4726	5131	{
4727		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5132	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4728	5133	browser.show();
4729	5134	String filename = browser.getFile();
4730	5135	if (filename != null && filename.length() > 0)
..	..	@@ -4823,6 +5228,7 @@
4823	5228	//ps.print(buffer.toString());
4824	5229	} catch (IOException e)
4825	5230	{
	5231	+ e.printStackTrace();
4826	5232	}
4827	5233	}
4828	5234
..	..	@@ -5005,7 +5411,7 @@
5005	5411	MenuBar menuBar;
5006	5412	Menu fileMenu;
5007	5413	MenuItem newItem;
5008		- MenuItem loadItem;
	5414	+ MenuItem openItem;
5009	5415	MenuItem saveItem;
5010	5416	MenuItem saveAsItem;
5011	5417	MenuItem exportAsItem;
..	..	@@ -5028,6 +5434,7 @@
5028	5434	CheckboxMenuItem toggleSwitchItem;
5029	5435	CheckboxMenuItem toggleRootItem;
5030	5436	CheckboxMenuItem animationItem;
	5437	+ MenuItem archiveItem;
5031	5438	CheckboxMenuItem toggleHandleItem;
5032	5439	CheckboxMenuItem togglePaintItem;
5033	5440	JSplitPane mainPanel;
..	..	@@ -5114,7 +5521,7 @@
5114	5521	JLabel colorLabel;
5115	5522	cNumberSlider colorField;
5116	5523	JLabel modulationLabel;
5117		- cNumberSlider modulationField;
	5524	+ cNumberSlider saturationField;
5118	5525	JLabel metalnessLabel;
5119	5526	cNumberSlider metalnessField;
5120	5527	JLabel diffuseLabel;