~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -38,64 +41,78 @@
38	41	JFrame frame;
39	42
40	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	+ }
41	52
42	53	cButton GetButton(String name, boolean border)
43	54	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	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);
53	63	}
54	64
55	65	cToggleButton GetToggleButton(String name, boolean border)
56	66	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
66	69	}
67	70
68	71	cCheckBox GetCheckBox(String name, boolean border)
69	72	{
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
70	79	try
71	80	{
72		- ImageIcon icon = GetIcon(name);
73		- 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;
74	97	}
75	98	catch (Exception e)
76	99	{
77		- return new cCheckBox(name, border);
	100	+ return null;
78	101	}
79	102	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	103	+
	104	+ BufferedImage GetImage(String name)
82	105	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	106	+ try
86	107	{
87		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88		- Graphics2D g = resized.createGraphics();
89		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92		- g.dispose();
93		-
94		- image = resized;
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
95	111	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
99	116	}
100	117
101	118	// SCRIPT
..	..	@@ -279,6 +296,12 @@
279	296	client = inClient;
280	297	copy = client;
281	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
282	305	// "this" is not called: SetupUI2(objEditor);
283	306	}
284	307
..	..	@@ -292,6 +315,12 @@
292	315	client = inClient;
293	316	copy = client;
294	317
	318	+ if (copy.versions == null)
	319	+ {
	320	+ copy.versions = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
295	324	SetupUI2(callee.GetEditor());
296	325	}
297	326
..	..	@@ -306,7 +335,7 @@
306	335	//localCopy.parent = null;
307	336
308	337	frame = new JFrame();
309		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
310	339	objEditor = this;
311	340	this.callee = callee;
312	341
..	..	@@ -324,6 +353,12 @@
324	353	copy = localCopy;
325	354	copy.editWindow = this;
326	355
	356	+ if (copy.versions == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
327	362	SetupMenu();
328	363
329	364	//SetupName(objEditor); // new
..	..	@@ -347,7 +382,7 @@
347	382	frame.setMenuBar(menuBar = new MenuBar());
348	383	menuBar.add(fileMenu = new Menu("File"));
349	384	fileMenu.add(newItem = new MenuItem("New"));
350		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
351	386
352	387	//oe.menuBar.add(menu = new Menu("Include"));
353	388	Menu menu = new Menu("Import");
..	..	@@ -379,7 +414,7 @@
379	414	}
380	415
381	416	newItem.addActionListener(this);
382		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
383	418	saveItem.addActionListener(this);
384	419	saveAsItem.addActionListener(this);
385	420	exportAsItem.addActionListener(this);
..	..	@@ -416,11 +451,12 @@
416	451
417	452	toolbarPanel = new JPanel();
418	453	toolbarPanel.setName("Toolbar");
	454	+
419	455	treePanel = new cGridBag();
420	456	treePanel.setName("Tree");
421	457
422	458	editPanel = new cGridBag().setVertical(true);
423		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
424	460
425	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
426	462
..	..	@@ -428,11 +464,11 @@
428	464	editPanel.add(editCommandsPanel);
429	465	editPanel.add(ctrlPanel);
430	466
431		- toolboxPanel = new cGridBag().setVertical(false);
432		- toolboxPanel.setName("Toolbox");
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
433	469
434	470	materialPanel = new cGridBag().setVertical(true);
435		- materialPanel.setName("Material");
	471	+ //materialPanel.setName("Material");
436	472
437	473	/JTextPane/
438	474	infoarea = createTextPane();
..	..	@@ -440,14 +476,15 @@
440	476
441	477	infoarea.setEditable(true);
442	478	SetText();
	479	+
443	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
444	481	// infoarea.setOpaque(false);
445	482	// //infoarea.setForeground(textcolor);
446	483	// TEXTAREA infoarea.setLineWrap(true);
447	484	// TEXTAREA infoarea.setWrapStyleWord(true);
448	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
449		- infoPanel.setPreferredSize(new Dimension(50, 200));
450		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
451	488	//infoPanel.setLayout(new BorderLayout());
452	489	//infoPanel.add(createTextPane());
453	490
..	..	@@ -458,7 +495,14 @@
458	495	mainPanel.setDividerSize(9);
459	496	mainPanel.setDividerLocation(0.5); //1.0);
460	497	mainPanel.setResizeWeight(0.5);
461		-
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
462	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
463	507	//mainPanel.setLayout(new GridBagLayout());
464	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -689,8 +733,8 @@
689	733	}
690	734	}
691	735
692		-static GraphicsDevice device = GraphicsEnvironment
693		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
694	738
695	739	Rectangle keeprect;
696	740	cRadio radio;
..	..	@@ -711,10 +755,19 @@
711	755	void Minimize()
712	756	{
713	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
714	759	}
715	760
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
716	764	void Maximize()
717	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
718	771	if (maximized)
719	772	{
720	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -722,22 +775,36 @@
722	775	else
723	776	{
724	777	keeprect = frame.getBounds();
725		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
726		- Dimension rect2 = frame.getToolkit().getScreenSize();
727		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
728	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
729	783	}
730	784
731	785	maximized ^= true;
	786	+
	787	+ frame.validate();
732	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
733	793
734	794	void ToggleFullScreen()
735	795	{
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
736	798	cameraView.ToggleFullScreen();
737	799
738	800	if (!CameraPane.FULLSCREEN)
739	801	{
740	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
741	808	//frame.setVisible(false);
742	809	// frame.removeNotify();
743	810	// frame.setUndecorated(false);
..	..	@@ -747,7 +814,7 @@
747	814	// X frame.getContentPane().remove(/"Center",/bigThree);
748	815	// X framePanel.add(bigThree);
749	816	// X frame.getContentPane().add(/"Center",/framePanel);
750		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
751	818
752	819	//frame.setVisible(true);
753	820	radio.layout = keepButton;
..	..	@@ -762,7 +829,12 @@
762	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
763	830	// frame.getToolkit().getScreenSize().height);
764	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
765	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
766	838	// frame.removeNotify();
767	839	// frame.setUndecorated(true);
768	840	// frame.addNotify();
..	..	@@ -775,7 +847,31 @@
775	847	radio.layout.doClick();
776	848	//frame.setVisible(true);
777	849	}
	850	+ frame.validate();
778	851	}
	852	+
	853	+ private Object3D CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versions;
	862	+ copy.versions = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versions = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
779	875
780	876	private JTextPane createTextPane()
781	877	{
..	..	@@ -907,7 +1003,7 @@
907	1003	// NumberSlider vDivsField;
908	1004	// JCheckBox endcaps;
909	1005	JCheckBox liveCB;
910		- JCheckBox selectCB;
	1006	+ JCheckBox selectableCB;
911	1007	JCheckBox hideCB;
912	1008	JCheckBox link2masterCB;
913	1009	JCheckBox markCB;
..	..	@@ -1107,7 +1203,7 @@
1107	1203	namePanel = new cGridBag();
1108	1204
1109	1205	nameField = AddText(namePanel, copy.GetName());
1110		- namePanel.add(nameField);
	1206	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1111	1207	oe.ctrlPanel.add(namePanel);
1112	1208
1113	1209	oe.ctrlPanel.Return();
..	..	@@ -1119,26 +1215,30 @@
1119	1215
1120	1216	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1121	1217	liveCB.setToolTipText("Animate object");
1122		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1123		- selectCB.setToolTipText("Make object selectable");
	1218	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1219	+ selectableCB.setToolTipText("Make object selectable");
1124	1220	// Return();
	1221	+
1125	1222	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1126	1223	hideCB.setToolTipText("Hide object");
1127	1224	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1128		- markCB.setToolTipText("Set the animation target transform");
	1225	+ markCB.setToolTipText("As animation target transform");
	1226	+
	1227	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1129	1228
1130	1229	setupPanel2 = new cGridBag().setVertical(false);
1131	1230
1132	1231	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1133	1232	rewindCB.setToolTipText("Rewind animation");
1134	1233
1135		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1136		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1234	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1235	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1137	1236
	1237	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1238	+ link2masterCB.setToolTipText("Attach to support");
	1239	+
1138	1240	if (Globals.ADVANCED)
1139	1241	{
1140		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1141		- link2masterCB.setToolTipText("Attach to support");
1142	1242	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1143	1243	speedupCB.setToolTipText("Option motion capture");
1144	1244	}
..	..	@@ -1412,6 +1512,7 @@
1412	1512	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1413	1513	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1414	1514	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1515	+ //XYZPanel.setName("XYZ");
1415	1516
1416	1517	/*
1417	1518	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1449,13 +1550,29 @@
1449	1550	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1450	1551	//tmp.setName("Edit");
1451	1552	objectPanel.add(materialPanel);
	1553	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1554	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1555	+
1452	1556	// JPanel north = new JPanel(new BorderLayout());
1453	1557	// north.setName("Edit");
1454	1558	// north.add(ctrlPanel, BorderLayout.NORTH);
1455	1559	// objectPanel.add(north);
1456	1560	objectPanel.add(editPanel);
1457		- objectPanel.add(infoPanel);
	1561	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1562	+ objectPanel.setToolTipTextAt(1, "Edit panel");
	1563	+
	1564	+ //if (Globals.ADVANCED)
	1565	+ objectPanel.add(infoPanel);
	1566	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1567	+ objectPanel.setToolTipTextAt(2, "Info panel");
	1568	+
	1569	+ objectPanel.add(XYZPanel);
	1570	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1571	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1572	+
1458	1573	objectPanel.add(toolboxPanel);
	1574	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1575	+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1459	1576
1460	1577	/*
1461	1578	aConstraints.gridx = 0;
..	..	@@ -1476,7 +1593,7 @@
1476	1593	scrollpane.addMouseWheelListener(this); // Default not fast enough
1477	1594
1478	1595	/JTabbedPane/ scenePanel = new cGridBag();
1479		- scenePanel.preferredWidth = 6;
	1596	+ scenePanel.preferredWidth = 5;
1480	1597
1481	1598	JTabbedPane tabbedPane = new JTabbedPane();
1482	1599	tabbedPane.add(scrollpane);
..	..	@@ -1554,7 +1671,7 @@
1554	1671	bigThree = new cGridBag();
1555	1672	bigThree.addComponent(scenePanel);
1556	1673	bigThree.addComponent(centralPanel);
1557		- bigThree.addComponent(XYZPanel);
	1674	+ //bigThree.addComponent(XYZPanel);
1558	1675
1559	1676	// // SIDE EFFECT!!!
1560	1677	// aConstraints.gridx = 0;
..	..	@@ -1563,9 +1680,9 @@
1563	1680	// aConstraints.gridheight = 1;
1564	1681
1565	1682	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1566		- framePanel.setContinuousLayout(true);
1567		- framePanel.setOneTouchExpandable(true);
1568		- framePanel.setDividerLocation(0.8);
	1683	+ framePanel.setContinuousLayout(false);
	1684	+ framePanel.setOneTouchExpandable(false);
	1685	+ //.setDividerLocation(0.8);
1569	1686	//framePanel.setDividerSize(15);
1570	1687	//framePanel.setResizeWeight(0.15);
1571	1688	framePanel.setName("Frame");
..	..	@@ -1584,17 +1701,17 @@
1584	1701
1585	1702	frame.setSize(1280, 860);
1586	1703
1587		- frame.validate();
1588		- frame.setVisible(true);
1589		-
1590	1704	cameraView.requestFocusInWindow();
1591	1705
1592	1706	gridPanel.setDividerLocation(1.0);
	1707	+
	1708	+ frame.validate();
	1709	+
	1710	+ frame.setVisible(true);
1593	1711
1594	1712	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1595	1713	frame.addWindowListener(new WindowAdapter()
1596	1714	{
1597		-
1598	1715	public void windowClosing(WindowEvent e)
1599	1716	{
1600	1717	Close();
..	..	@@ -1656,45 +1773,48 @@
1656	1773	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1657	1774
1658	1775	cGridBag colorSection = new cGridBag().setVertical(true);
	1776	+
	1777	+ cGridBag huepanel = new cGridBag();
	1778	+ cGridBag huelabel = new cGridBag();
	1779	+ huelabel.add(GetLabel("icons/hue.png", false));
	1780	+ huelabel.preferredWidth = 20;
	1781	+ huepanel.add(new cGridBag()); // Label
	1782	+ huepanel.add(huelabel); // Field/slider
	1783	+
	1784	+ huepanel.preferredHeight = 7;
	1785	+
	1786	+ colorSection.add(huepanel);
1659	1787
1660	1788	cGridBag color = new cGridBag();
1661		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1662		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1789	+
	1790	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1791	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1792	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1793	+
1664	1794	//colorField.preferredWidth = 200;
1665	1795	colorSection.add(color);
1666	1796
1667	1797	cGridBag modulation = new cGridBag();
1668	1798	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1669	1799	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1800	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1671	1801	colorSection.add(modulation);
1672	1802
	1803	+ cGridBag opacity = new cGridBag();
	1804	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1805	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1806	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1807	+ colorSection.add(opacity);
	1808	+
	1809	+ colorSection.add(GetSeparator());
	1810	+
1673	1811	cGridBag texture = new cGridBag();
1674	1812	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1675	1813	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1676	1814	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1677	1815	colorSection.add(texture);
1678	1816
1679		- cGridBag anisoU = new cGridBag();
1680		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1681		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1683		- colorSection.add(anisoU);
1684		-
1685		- cGridBag anisoV = new cGridBag();
1686		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1687		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1689		- colorSection.add(anisoV);
1690		-
1691		- cGridBag shadowbias = new cGridBag();
1692		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1693		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1694		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1695		- colorSection.add(shadowbias);
1696		-
1697		- panel.add(new JSeparator());
	1817	+ panel.add(GetSeparator());
1698	1818
1699	1819	panel.add(colorSection);
1700	1820
..	..	@@ -1744,7 +1864,13 @@
1744	1864	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1745	1865	diffuseSection.add(fakedepth);
1746	1866
1747		- panel.add(new JSeparator());
	1867	+ cGridBag shadowbias = new cGridBag();
	1868	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1869	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1871	+ diffuseSection.add(shadowbias);
	1872	+
	1873	+ panel.add(GetSeparator());
1748	1874
1749	1875	panel.add(diffuseSection);
1750	1876
..	..	@@ -1794,42 +1920,48 @@
1794	1920	// aConstraints.gridy += 1;
1795	1921	// aConstraints.gridwidth = 1;
1796	1922
	1923	+ cGridBag anisoU = new cGridBag();
	1924	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1925	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1926	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1927	+ specularSection.add(anisoU);
1797	1928
1798		- panel.add(new JSeparator());
	1929	+ cGridBag anisoV = new cGridBag();
	1930	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1931	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1932	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1933	+ specularSection.add(anisoV);
	1934	+
	1935	+
	1936	+ panel.add(GetSeparator());
1799	1937
1800	1938	panel.add(specularSection);
1801	1939
1802	1940	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1803	1941
1804		- cGridBag globalSection = new cGridBag().setVertical(true);
	1942	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1805	1943
1806	1944	cGridBag camera = new cGridBag();
1807	1945	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1808	1946	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1809	1947	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1810		- globalSection.add(camera);
	1948	+ colorSection.add(camera);
1811	1949
1812	1950	cGridBag ambient = new cGridBag();
1813	1951	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1814	1952	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1815	1953	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816		- globalSection.add(ambient);
	1954	+ colorSection.add(ambient);
1817	1955
1818	1956	cGridBag backlit = new cGridBag();
1819	1957	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1820	1958	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1821	1959	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1822		- globalSection.add(backlit);
	1960	+ colorSection.add(backlit);
1823	1961
1824		- cGridBag opacity = new cGridBag();
1825		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1826		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1827		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1828		- globalSection.add(opacity);
1829		-
1830		- panel.add(new JSeparator());
	1962	+ //panel.add(new JSeparator());
1831	1963
1832		- panel.add(globalSection);
	1964	+ //panel.add(globalSection);
1833	1965
1834	1966	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1835	1967
..	..	@@ -1871,7 +2003,7 @@
1871	2003	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1872	2004	textureSection.add(opacityPower);
1873	2005
1874		- panel.add(new JSeparator());
	2006	+ panel.add(GetSeparator());
1875	2007
1876	2008	panel.add(textureSection);
1877	2009
..	..	@@ -1936,8 +2068,9 @@
1936	2068	// 3D models
1937	2069	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1938	2070	{
1939		- lastConverter = new com.jmex.model.converters.MaxToJme();
1940		- LoadFile(filename, lastConverter);
	2071	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2072	+ //LoadFile(filename, lastConverter);
	2073	+ LoadObjFile(filename); // New 3ds loader
1941	2074	continue;
1942	2075	}
1943	2076	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2663,6 +2796,7 @@
2663	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2664	2797	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2665	2798	}
	2799	+
2666	2800	//cJME.count++;
2667	2801	//cJME.count %= 12;
2668	2802	if (gc)
..	..	@@ -2846,6 +2980,7 @@
2846	2980	}
2847	2981	}
2848	2982	}
	2983	+
2849	2984	cFileSystemPane FSPane;
2850	2985
2851	2986	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2899,6 +3034,7 @@
2899	3034	}
2900	3035	}
2901	3036	}
	3037	+
2902	3038	freezematerial = false;
2903	3039	}
2904	3040
..	..	@@ -3017,12 +3153,17 @@
3017	3153	// }
3018	3154
3019	3155	/**/
3020		- if (deselect)
	3156	+ if (deselect \|\| child == null)
3021	3157	{
3022	3158	//group.deselectAll();
3023	3159	//freeze = true;
3024	3160	GetTree().clearSelection();
3025	3161	//freeze = false;
	3162	+
	3163	+ if (child == null)
	3164	+ {
	3165	+ return;
	3166	+ }
3026	3167	}
3027	3168
3028	3169	//group.addSelectee(child);
..	..	@@ -3161,7 +3302,7 @@
3161	3302	{
3162	3303	copy.live ^= true;
3163	3304	return;
3164		- } else if (event.getSource() == selectCB)
	3305	+ } else if (event.getSource() == selectableCB)
3165	3306	{
3166	3307	copy.dontselect ^= true;
3167	3308	return;
..	..	@@ -3346,9 +3487,9 @@
3346	3487	{
3347	3488	Close();
3348	3489	//return true;
3349		- } else if (source == loadItem)
	3490	+ } else if (source == openItem)
3350	3491	{
3351		- load();
	3492	+ Open();
3352	3493	//return true;
3353	3494	} else if (source == newItem)
3354	3495	{
..	..	@@ -3373,6 +3514,10 @@
3373	3514	{
3374	3515	generatePOV();
3375	3516	//return true;
	3517	+ } else if (event.getSource() == archiveItem)
	3518	+ {
	3519	+ cTools.Archive(frame);
	3520	+ return;
3376	3521	} else if (source == zBufferItem)
3377	3522	{
3378	3523	try
..	..	@@ -3421,11 +3566,12 @@
3421	3566
3422	3567	static public byte[] Compress(Object3D o)
3423	3568	{
	3569	+ // Slower to actually compress.
3424	3570	try
3425	3571	{
3426	3572	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3427		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3428		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3573	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3574	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3429	3575
3430	3576	Object3D parent = o.parent;
3431	3577	o.parent = null;
..	..	@@ -3436,10 +3582,14 @@
3436	3582
3437	3583	out.flush();
3438	3584
3439		- zstream.close();
	3585	+ baos //zstream
	3586	+ .close();
3440	3587	out.close();
3441	3588
3442		- return baos.toByteArray();
	3589	+ byte[] bytes = baos.toByteArray();
	3590	+
	3591	+ System.out.println("save #bytes = " + bytes.length);
	3592	+ return bytes;
3443	3593	} catch (Exception e)
3444	3594	{
3445	3595	System.err.println(e);
..	..	@@ -3449,13 +3599,16 @@
3449	3599
3450	3600	static public Object Uncompress(byte[] bytes)
3451	3601	{
3452		- System.out.println("#bytes = " + bytes.length);
	3602	+ System.out.println("restore #bytes = " + bytes.length);
3453	3603	try
3454	3604	{
3455	3605	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3456		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3457		- ObjectInputStream in = new ObjectInputStream(istream);
	3606	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3607	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3458	3608	Object obj = in.readObject();
	3609	+
	3610	+ bais //istream
	3611	+ .close();
3459	3612	in.close();
3460	3613
3461	3614	return obj;
..	..	@@ -3510,31 +3663,66 @@
3510	3663	return null;
3511	3664	}
3512	3665
3513		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3514	3666
3515	3667	public void Save()
	3668	+ {
	3669	+ //Save(true);
	3670	+ Replace();
	3671	+ }
	3672	+
	3673	+ private boolean Equal(byte[] compress, byte[] name)
	3674	+ {
	3675	+ if (compress.length != name.length)
	3676	+ {
	3677	+ return false;
	3678	+ }
	3679	+
	3680	+ for (int i=compress.length; --i>=0;)
	3681	+ {
	3682	+ if (compress[i] != name[i])
	3683	+ return false;
	3684	+ }
	3685	+
	3686	+ return true;
	3687	+ }
	3688	+
	3689	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3690	+
	3691	+ public boolean Save(boolean user)
3516	3692	{
3517	3693	System.err.println("Save");
3518	3694
3519	3695	cRadio tab = GetCurrentTab();
3520	3696
3521		- boolean temp = CameraPane.SWITCH;
3522		- CameraPane.SWITCH = false;
	3697	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
3523	3698
3524		- copy.ExtractBigData(hashtable);
	3699	+ boolean thesame = false;
	3700	+
	3701	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3702	+// {
	3703	+// thesame = true;
	3704	+// }
3525	3705
3526	3706	//EditorFrame.m_MainFrame.requestFocusInWindow();
3527		- tab.graphs[tab.undoindex++] = Compress(copy);
	3707	+ if (!thesame)
	3708	+ {
	3709	+ //tab.user[tab.versionindex] = user;
	3710	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3711	+
	3712	+ copy.versions[++copy.versionindex] = compress;
	3713	+
	3714	+ // if (increment)
	3715	+ // tab.versionindex++;
	3716	+ }
3528	3717
3529		- copy.RestoreBigData(hashtable);
	3718	+ //copy.RestoreBigData(versiontable);
3530	3719
3531		- CameraPane.SWITCH = temp;
3532		-
3533	3720	//assert(hashtable.isEmpty());
3534	3721
3535		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3722	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3536	3723	{
3537		- tab.graphs[i] = null;
	3724	+ //tab.user[i] = false;
	3725	+ copy.versions[i] = null;
3538	3726	}
3539	3727
3540	3728	SetUndoStates();
..	..	@@ -3544,7 +3732,7 @@
3544	3732	{
3545	3733	try
3546	3734	{
3547		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3735	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3548	3736	ObjectOutputStream p = new ObjectOutputStream(ostream);
3549	3737
3550	3738	p.writeObject(copy);
..	..	@@ -3557,6 +3745,8 @@
3557	3745	e.printStackTrace();
3558	3746	}
3559	3747	}
	3748	+
	3749	+ return !thesame;
3560	3750	}
3561	3751
3562	3752	void CopyChanged(Object3D obj)
..	..	@@ -3566,16 +3756,19 @@
3566	3756	boolean temp = CameraPane.SWITCH;
3567	3757	CameraPane.SWITCH = false;
3568	3758
3569		- copy.ExtractBigData(hashtable);
	3759	+ copy.ExtractBigData(versiontable);
3570	3760
3571	3761	copy.clear();
3572	3762
	3763	+ copy.skyboxname = obj.skyboxname;
	3764	+ copy.skyboxext = obj.skyboxext;
	3765	+
3573	3766	for (int i=0; i<obj.Size(); i++)
3574	3767	{
3575	3768	copy.add(obj.get(i));
3576	3769	}
3577	3770
3578		- copy.RestoreBigData(hashtable);
	3771	+ copy.RestoreBigData(versiontable);
3579	3772
3580	3773	CameraPane.SWITCH = temp;
3581	3774
..	..	@@ -3603,52 +3796,130 @@
3603	3796	}
3604	3797
3605	3798	cButton undoButton;
	3799	+ cButton restoreButton;
	3800	+ cButton replaceButton;
3606	3801	cButton redoButton;
3607	3802
	3803	+ boolean muteSlider;
	3804	+
	3805	+ int VersionCount()
	3806	+ {
	3807	+ int count = 0;
	3808	+
	3809	+ for (int i = copy.versions.length; --i >= 0;)
	3810	+ {
	3811	+ if (copy.versions[i] != null)
	3812	+ count++;
	3813	+ }
	3814	+
	3815	+ return count;
	3816	+ }
	3817	+
3608	3818	void SetUndoStates()
3609	3819	{
3610	3820	cRadio tab = GetCurrentTab();
3611	3821
3612		- undoButton.setEnabled(tab.undoindex > 0);
3613		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3822	+ restoreButton.setEnabled(copy.versionindex != -1);
	3823	+ replaceButton.setEnabled(copy.versionindex != -1);
	3824	+
	3825	+ undoButton.setEnabled(copy.versionindex > 0);
	3826	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3827	+
	3828	+ muteSlider = true;
	3829	+ versionSlider.setMaximum(VersionCount() - 1);
	3830	+ versionSlider.setInteger(copy.versionindex);
	3831	+ muteSlider = false;
3614	3832	}
3615	3833
3616		- public void Undo()
	3834	+ public boolean Undo()
3617	3835	{
	3836	+ // Option?
	3837	+ Replace();
	3838	+
3618	3839	System.err.println("Undo");
3619	3840
3620	3841	cRadio tab = GetCurrentTab();
3621	3842
3622		- if (tab.undoindex == 0)
	3843	+ if (copy.versionindex == 0)
3623	3844	{
3624	3845	java.awt.Toolkit.getDefaultToolkit().beep();
3625		- return;
	3846	+ return false;
3626	3847	}
3627	3848
3628		- if (tab.graphs[tab.undoindex] == null)
	3849	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3850	+// {
	3851	+// if (Save(false))
	3852	+// tab.versionindex -= 1;
	3853	+// else
	3854	+// {
	3855	+// if (tab.versionindex <= 0)
	3856	+// return false;
	3857	+// else
	3858	+// tab.versionindex -= 1;
	3859	+// }
	3860	+// }
	3861	+
	3862	+ copy.versionindex -= 1;
	3863	+
	3864	+ CopyChanged((Object3D)copy.versions[copy.versionindex]);
	3865	+
	3866	+ return true;
	3867	+ }
	3868	+
	3869	+ public boolean Restore()
	3870	+ {
	3871	+ System.err.println("Restore");
	3872	+
	3873	+ cRadio tab = GetCurrentTab();
	3874	+
	3875	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3629	3876	{
3630		- Save();
3631		- tab.undoindex -= 1;
	3877	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3878	+ return false;
3632	3879	}
3633	3880
3634		- tab.undoindex -= 1;
	3881	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3882	+ CopyChanged(copy.versions[copy.versionindex]);
	3883	+
	3884	+ return true;
	3885	+ }
3635	3886
3636		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3887	+ public boolean Replace()
	3888	+ {
	3889	+ System.err.println("Replace");
	3890	+
	3891	+ cRadio tab = GetCurrentTab();
	3892	+
	3893	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3894	+ {
	3895	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3896	+ return false;
	3897	+ }
	3898	+
	3899	+ copy.versions[copy.versionindex] = CompressCopy();
	3900	+
	3901	+ return true;
3637	3902	}
3638	3903
3639	3904	public void Redo()
3640	3905	{
	3906	+ // Option?
	3907	+ Replace();
	3908	+
3641	3909	cRadio tab = GetCurrentTab();
3642	3910
3643		- if (tab.graphs[tab.undoindex + 1] == null)
	3911	+ if (copy.versions[copy.versionindex + 1] == null)
3644	3912	{
3645	3913	java.awt.Toolkit.getDefaultToolkit().beep();
3646	3914	return;
3647	3915	}
3648	3916
3649		- tab.undoindex += 1;
	3917	+ copy.versionindex += 1;
3650	3918
3651		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3919	+ CopyChanged(copy.versions[copy.versionindex]);
	3920	+
	3921	+ //if (!tab.user[tab.versionindex])
	3922	+ // tab.graphs[tab.versionindex] = null;
3652	3923	}
3653	3924
3654	3925	void ImportGFD()
..	..	@@ -3944,9 +4215,25 @@
3944	4215	//copy.Touch();
3945	4216	}
3946	4217
	4218	+ cNumberSlider versionSlider;
	4219	+
3947	4220	public void stateChanged(ChangeEvent e)
3948	4221	{
3949	4222	// assert(false);
	4223	+ if (e.getSource() == versionSlider)
	4224	+ {
	4225	+ if (muteSlider)
	4226	+ return;
	4227	+
	4228	+ int version = versionSlider.getInteger();
	4229	+
	4230	+ if (copy.versions[version] != null)
	4231	+ {
	4232	+ CopyChanged(copy.versions[copy.versionindex = version]);
	4233	+ }
	4234	+
	4235	+ return;
	4236	+ }
3950	4237
3951	4238	if (freezematerial)
3952	4239	{
..	..	@@ -4295,7 +4582,7 @@
4295	4582
4296	4583	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4297	4584	{
4298		- if (Globals.SAVEONMAKE) // && resetmodel)
	4585	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4299	4586	Save();
4300	4587	//Tween.set(thing, 0).target(1).start(tweenManager);
4301	4588	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4537,7 +4824,9 @@
4537	4824	readobj.ResetDisplayList();
4538	4825	} catch (Exception e)
4539	4826	{
4540		- //e.printStackTrace();
	4827	+ if (!e.toString().contains("GZIP"))
	4828	+ e.printStackTrace();
	4829	+
4541	4830	try
4542	4831	{
4543	4832	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4611,12 +4900,14 @@
4611	4900
4612	4901	if (readobj != null)
4613	4902	{
4614		- if (Globals.SAVEONMAKE)
4615		- Save();
	4903	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4904	+ // Save();
4616	4905	try
4617	4906	{
4618	4907	//readobj.deepCopySelf(copy);
4619	4908	copy.clear(); // june 2014
	4909	+ copy.skyboxname = readobj.skyboxname;
	4910	+ copy.skyboxext = readobj.skyboxext;
4620	4911	for (int i = 0; i < readobj.size(); i++)
4621	4912	{
4622	4913	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4657,6 +4948,7 @@
4657	4948	}
4658	4949	} catch (ClassCastException e)
4659	4950	{
	4951	+ e.printStackTrace();
4660	4952	assert (false);
4661	4953	Composite c = (Composite) copy;
4662	4954	c.children.clear();
..	..	@@ -4667,13 +4959,24 @@
4667	4959	c.addChild(csg);
4668	4960	}
4669	4961
	4962	+ copy.versions = readobj.versions;
	4963	+ copy.versionindex = readobj.versionindex;
	4964	+
	4965	+ if (copy.versions == null)
	4966	+ {
	4967	+ copy.versions = new Object3D[100];
	4968	+ copy.versionindex = -1;
	4969	+ }
	4970	+
	4971	+ //? SetUndoStates();
	4972	+
4670	4973	ResetModel();
4671	4974	copy.HardTouch(); // recompile?
4672	4975	refreshContents();
4673	4976	}
4674	4977	}
4675	4978
4676		- void load() // throws ClassNotFoundException
	4979	+ void Open() // throws ClassNotFoundException
4677	4980	{
4678	4981	if (Grafreed.standAlone)
4679	4982	{
..	..	@@ -4776,6 +5079,7 @@
4776	5079	//ps.print(buffer.toString());
4777	5080	} catch (IOException e)
4778	5081	{
	5082	+ e.printStackTrace();
4779	5083	}
4780	5084	}
4781	5085
..	..	@@ -4958,7 +5262,7 @@
4958	5262	MenuBar menuBar;
4959	5263	Menu fileMenu;
4960	5264	MenuItem newItem;
4961		- MenuItem loadItem;
	5265	+ MenuItem openItem;
4962	5266	MenuItem saveItem;
4963	5267	MenuItem saveAsItem;
4964	5268	MenuItem exportAsItem;
..	..	@@ -4981,6 +5285,7 @@
4981	5285	CheckboxMenuItem toggleSwitchItem;
4982	5286	CheckboxMenuItem toggleRootItem;
4983	5287	CheckboxMenuItem animationItem;
	5288	+ MenuItem archiveItem;
4984	5289	CheckboxMenuItem toggleHandleItem;
4985	5290	CheckboxMenuItem togglePaintItem;
4986	5291	JSplitPane mainPanel;