~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.
..	..	@@ -41,61 +44,47 @@
41	44
42	45	cButton GetButton(String name, boolean border)
43	46	{
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		- }
	47	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
53	49	}
54	50
55	51	cToggleButton GetToggleButton(String name, boolean border)
56	52	{
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		- }
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
66	55	}
67	56
68	57	cCheckBox GetCheckBox(String name, boolean border)
69	58	{
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ private ImageIcon GetIcon(String name)
	64	+ {
70	65	try
71	66	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	67	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	68	+
	69	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	70	+ {
	71	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	72	+ Graphics2D g = resized.createGraphics();
	73	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	74	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	75	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	76	+ g.dispose();
	77	+
	78	+ image = resized;
	79	+ }
	80	+
	81	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	82	+ return icon;
74	83	}
75	84	catch (Exception e)
76	85	{
77		- return new cCheckBox(name, border);
	86	+ return null;
78	87	}
79		- }
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
82		- {
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
86		- {
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;
95		- }
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
99	88	}
100	89
101	90	// SCRIPT
..	..	@@ -207,7 +196,7 @@
207	196
208	197	objEditor.ctrlPanel.remove(namePanel);
209	198
210		- if (!GroupEditor.allparams)
	199	+ if (!allparams)
211	200	return;
212	201
213	202	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -279,6 +268,12 @@
279	268	client = inClient;
280	269	copy = client;
281	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
282	277	// "this" is not called: SetupUI2(objEditor);
283	278	}
284	279
..	..	@@ -292,6 +287,12 @@
292	287	client = inClient;
293	288	copy = client;
294	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
295	296	SetupUI2(callee.GetEditor());
296	297	}
297	298
..	..	@@ -306,7 +307,7 @@
306	307	//localCopy.parent = null;
307	308
308	309	frame = new JFrame();
309		- frame.setUndecorated(true);
	310	+ frame.setUndecorated(false);
310	311	objEditor = this;
311	312	this.callee = callee;
312	313
..	..	@@ -324,6 +325,12 @@
324	325	copy = localCopy;
325	326	copy.editWindow = this;
326	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+// copy.versions = new byte[100][];
	331	+// copy.versionindex = -1;
	332	+ }
	333	+
327	334	SetupMenu();
328	335
329	336	//SetupName(objEditor); // new
..	..	@@ -337,12 +344,17 @@
337	344	return frame.action(event, obj);
338	345	}
339	346
	347	+ // Cannot work without static
	348	+ static boolean allparams = true;
	349	+
	350	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	351	+
340	352	void SetupMenu()
341	353	{
342	354	frame.setMenuBar(menuBar = new MenuBar());
343	355	menuBar.add(fileMenu = new Menu("File"));
344	356	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	358
347	359	//oe.menuBar.add(menu = new Menu("Include"));
348	360	Menu menu = new Menu("Import");
..	..	@@ -374,7 +386,7 @@
374	386	}
375	387
376	388	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
378	390	saveItem.addActionListener(this);
379	391	saveAsItem.addActionListener(this);
380	392	exportAsItem.addActionListener(this);
..	..	@@ -383,13 +395,40 @@
383	395	closeItem.addActionListener(this);
384	396
385	397	objectPanel = new JTabbedPane();
	398	+
	399	+ ChangeListener changeListener = new ChangeListener()
	400	+ {
	401	+ public void stateChanged(ChangeEvent changeEvent)
	402	+ {
	403	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	404	+// {
	405	+// if (latestObject != null)
	406	+// {
	407	+// refreshContents(true);
	408	+// SetMaterial(latestObject);
	409	+// }
	410	+//
	411	+// materialFlushed = true;
	412	+// }
	413	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	414	+// {
	415	+// if (listUI.size() == 0)
	416	+// EditSelection(false);
	417	+// }
	418	+
	419	+ refreshContents(false); // To refresh Info tab
	420	+ }
	421	+ };
	422	+ objectPanel.addChangeListener(changeListener);
	423	+
386	424	toolbarPanel = new JPanel();
387	425	toolbarPanel.setName("Toolbar");
	426	+
388	427	treePanel = new cGridBag();
389	428	treePanel.setName("Tree");
390	429
391	430	editPanel = new cGridBag().setVertical(true);
392		- editPanel.setName("Edit");
	431	+ //editPanel.setName("Edit");
393	432
394	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
395	434
..	..	@@ -398,10 +437,10 @@
398	437	editPanel.add(ctrlPanel);
399	438
400	439	toolboxPanel = new cGridBag().setVertical(false);
401		- toolboxPanel.setName("Toolbox");
	440	+ //toolboxPanel.setName("Toolbox");
402	441
403	442	materialPanel = new cGridBag().setVertical(true);
404		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
405	444
406	445	/JTextPane/
407	446	infoarea = createTextPane();
..	..	@@ -409,14 +448,15 @@
409	448
410	449	infoarea.setEditable(true);
411	450	SetText();
	451	+
412	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
413	453	// infoarea.setOpaque(false);
414	454	// //infoarea.setForeground(textcolor);
415	455	// TEXTAREA infoarea.setLineWrap(true);
416	456	// TEXTAREA infoarea.setWrapStyleWord(true);
417	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
418		- infoPanel.setPreferredSize(new Dimension(50, 200));
419		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
420	460	//infoPanel.setLayout(new BorderLayout());
421	461	//infoPanel.add(createTextPane());
422	462
..	..	@@ -427,7 +467,14 @@
427	467	mainPanel.setDividerSize(9);
428	468	mainPanel.setDividerLocation(0.5); //1.0);
429	469	mainPanel.setResizeWeight(0.5);
430		-
	470	+
	471	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	472	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	473	+ divider.setDividerSize(15);
	474	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	475	+
	476	+ mainPanel.setUI(new BasicSplitPaneUI());
	477	+
431	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432	479	//mainPanel.setLayout(new GridBagLayout());
433	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -658,8 +705,8 @@
658	705	}
659	706	}
660	707
661		-static GraphicsDevice device = GraphicsEnvironment
662		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
663	710
664	711	Rectangle keeprect;
665	712	cRadio radio;
..	..	@@ -680,10 +727,19 @@
680	727	void Minimize()
681	728	{
682	729	frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
683	731	}
684	732
	733	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	734	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	735	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
685	736	void Maximize()
686	737	{
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
687	743	if (maximized)
688	744	{
689	745	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -691,20 +747,36 @@
691	747	else
692	748	{
693	749	keeprect = frame.getBounds();
694		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
695		- Dimension rect2 = frame.getToolkit().getScreenSize();
696		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	750	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	751	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	752	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
697	753	// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
698	755	}
699	756
700	757	maximized ^= true;
	758	+
	759	+ frame.validate();
701	760	}
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
702	765
703	766	void ToggleFullScreen()
704	767	{
705		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
706	773	{
707	774	device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
708	780	//frame.setVisible(false);
709	781	// frame.removeNotify();
710	782	// frame.setUndecorated(false);
..	..	@@ -714,7 +786,7 @@
714	786	// X frame.getContentPane().remove(/"Center",/bigThree);
715	787	// X framePanel.add(bigThree);
716	788	// X frame.getContentPane().add(/"Center",/framePanel);
717		- framePanel.setDividerLocation(1);
	789	+ framePanel.setDividerLocation(46);
718	790
719	791	//frame.setVisible(true);
720	792	radio.layout = keepButton;
..	..	@@ -729,7 +801,12 @@
729	801	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
730	802	// frame.getToolkit().getScreenSize().height);
731	803	//frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
732	807	device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
733	810	// frame.removeNotify();
734	811	// frame.setUndecorated(true);
735	812	// frame.addNotify();
..	..	@@ -742,9 +819,30 @@
742	819	radio.layout.doClick();
743	820	//frame.setVisible(true);
744	821	}
745		-
746		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
747	823	}
	824	+
	825	+ private byte[] CompressCopy()
	826	+ {
	827	+ boolean temp = CameraPane.SWITCH;
	828	+ CameraPane.SWITCH = false;
	829	+
	830	+ copy.ExtractBigData(versiontable);
	831	+ // if (copy == client)
	832	+
	833	+ byte[] versions[] = copy.versions;
	834	+ copy.versions = null;
	835	+
	836	+ byte[] compress = Compress(copy);
	837	+
	838	+ copy.versions = versions;
	839	+
	840	+ copy.RestoreBigData(versiontable);
	841	+
	842	+ CameraPane.SWITCH = temp;
	843	+
	844	+ return compress;
	845	+ }
748	846
749	847	private JTextPane createTextPane()
750	848	{
..	..	@@ -876,7 +974,7 @@
876	974	// NumberSlider vDivsField;
877	975	// JCheckBox endcaps;
878	976	JCheckBox liveCB;
879		- JCheckBox selectCB;
	977	+ JCheckBox selectableCB;
880	978	JCheckBox hideCB;
881	979	JCheckBox link2masterCB;
882	980	JCheckBox markCB;
..	..	@@ -884,7 +982,12 @@
884	982	JCheckBox speedupCB;
885	983	JCheckBox rewindCB;
886	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
887	989	JComboBox texresMenu;
	990	+
888	991	JButton resetButton;
889	992	JButton stepButton;
890	993	JButton stepAllButton;
..	..	@@ -1071,38 +1174,40 @@
1071	1174	namePanel = new cGridBag();
1072	1175
1073	1176	nameField = AddText(namePanel, copy.GetName());
1074		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1075	1178	oe.ctrlPanel.add(namePanel);
1076	1179
1077	1180	oe.ctrlPanel.Return();
1078	1181
1079		- if (!GroupEditor.allparams)
	1182	+ if (!allparams)
1080	1183	return;
1081	1184
1082	1185	setupPanel = new cGridBag().setVertical(false);
1083	1186
1084	1187	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1085	1188	liveCB.setToolTipText("Animate object");
1086		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1087		- selectCB.setToolTipText("Make object selectable");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
1088	1191	// Return();
	1192	+
1089	1193	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1090	1194	hideCB.setToolTipText("Hide object");
1091	1195	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092		- markCB.setToolTipText("Set the animation target transform");
	1196	+ markCB.setToolTipText("As animation target transform");
1093	1197
1094	1198	setupPanel2 = new cGridBag().setVertical(false);
1095	1199
1096	1200	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1097	1201	rewindCB.setToolTipText("Rewind animation");
1098	1202
1099		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1203	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1204	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1101	1205
	1206	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1207	+ link2masterCB.setToolTipText("Attach to support");
	1208	+
1102	1209	if (Globals.ADVANCED)
1103	1210	{
1104		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1105		- link2masterCB.setToolTipText("Attach to support");
1106	1211	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1107	1212	speedupCB.setToolTipText("Option motion capture");
1108	1213	}
..	..	@@ -1376,6 +1481,7 @@
1376	1481	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1377	1482	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1378	1483	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1484	+ //XYZPanel.setName("XYZ");
1379	1485
1380	1486	/*
1381	1487	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1412,14 +1518,24 @@
1412	1518
1413	1519	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1414	1520	//tmp.setName("Edit");
1415		- objectPanel.add(toolboxPanel);
1416	1521	objectPanel.add(materialPanel);
	1522	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1417	1523	// JPanel north = new JPanel(new BorderLayout());
1418	1524	// north.setName("Edit");
1419	1525	// north.add(ctrlPanel, BorderLayout.NORTH);
1420	1526	// objectPanel.add(north);
1421	1527	objectPanel.add(editPanel);
1422		- objectPanel.add(infoPanel);
	1528	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1529	+
	1530	+ //if (Globals.ADVANCED)
	1531	+ objectPanel.add(infoPanel);
	1532	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1533	+
	1534	+ objectPanel.add(XYZPanel);
	1535	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1536	+
	1537	+ objectPanel.add(toolboxPanel);
	1538	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1423	1539
1424	1540	/*
1425	1541	aConstraints.gridx = 0;
..	..	@@ -1428,7 +1544,7 @@
1428	1544	aConstraints.gridy += 1;
1429	1545	aConstraints.gridwidth = 1;
1430	1546	mainPanel.add(objectPanel, aConstraints);
1431		- */
	1547	+ */
1432	1548
1433	1549	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1434	1550	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1440,14 +1556,12 @@
1440	1556	scrollpane.addMouseWheelListener(this); // Default not fast enough
1441	1557
1442	1558	/JTabbedPane/ scenePanel = new cGridBag();
1443		- scenePanel.preferredWidth = 6;
	1559	+ scenePanel.preferredWidth = 5;
1444	1560
1445	1561	JTabbedPane tabbedPane = new JTabbedPane();
1446	1562	tabbedPane.add(scrollpane);
1447	1563
1448		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1449		-
1450		- optionsPanel = new cGridBag().setVertical(true);
	1564	+ optionsPanel = new cGridBag().setVertical(false);
1451	1565
1452	1566	optionsPanel.setName("Options");
1453	1567
..	..	@@ -1455,6 +1569,8 @@
1455	1569
1456	1570	tabbedPane.add(optionsPanel);
1457	1571
	1572	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1573	+
1458	1574	scenePanel.add(tabbedPane);
1459	1575
1460	1576	/*
..	..	@@ -1516,9 +1632,9 @@
1516	1632	/**/
1517	1633
1518	1634	bigThree = new cGridBag();
1519		- bigThree.addComponent(scenePanel);
1520	1635	bigThree.addComponent(centralPanel);
1521		- bigThree.addComponent(XYZPanel);
	1636	+ bigThree.addComponent(scenePanel);
	1637	+ //bigThree.addComponent(XYZPanel);
1522	1638
1523	1639	// // SIDE EFFECT!!!
1524	1640	// aConstraints.gridx = 0;
..	..	@@ -1527,9 +1643,9 @@
1527	1643	// aConstraints.gridheight = 1;
1528	1644
1529	1645	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1530		- framePanel.setContinuousLayout(true);
1531		- framePanel.setOneTouchExpandable(true);
1532		- framePanel.setDividerLocation(0.8);
	1646	+ framePanel.setContinuousLayout(false);
	1647	+ framePanel.setOneTouchExpandable(false);
	1648	+ //.setDividerLocation(0.8);
1533	1649	//framePanel.setDividerSize(15);
1534	1650	//framePanel.setResizeWeight(0.15);
1535	1651	framePanel.setName("Frame");
..	..	@@ -1547,11 +1663,14 @@
1547	1663	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1548	1664
1549	1665	frame.setSize(1280, 860);
1550		- frame.setVisible(true);
1551		-
	1666	+
1552	1667	cameraView.requestFocusInWindow();
1553	1668
1554	1669	gridPanel.setDividerLocation(1.0);
	1670	+
	1671	+ frame.validate();
	1672	+
	1673	+ frame.setVisible(true);
1555	1674
1556	1675	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1557	1676	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1638,24 +1757,6 @@
1638	1757	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1639	1758	colorSection.add(texture);
1640	1759
1641		- cGridBag anisoU = new cGridBag();
1642		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1643		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1644		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1645		- colorSection.add(anisoU);
1646		-
1647		- cGridBag anisoV = new cGridBag();
1648		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1649		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1650		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1651		- colorSection.add(anisoV);
1652		-
1653		- cGridBag shadowbias = new cGridBag();
1654		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1655		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1656		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1657		- colorSection.add(shadowbias);
1658		-
1659	1760	panel.add(new JSeparator());
1660	1761
1661	1762	panel.add(colorSection);
..	..	@@ -1705,6 +1806,12 @@
1705	1806	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706	1807	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1707	1808	diffuseSection.add(fakedepth);
	1809	+
	1810	+ cGridBag shadowbias = new cGridBag();
	1811	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1812	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1813	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1814	+ diffuseSection.add(shadowbias);
1708	1815
1709	1816	panel.add(new JSeparator());
1710	1817
..	..	@@ -1756,6 +1863,18 @@
1756	1863	// aConstraints.gridy += 1;
1757	1864	// aConstraints.gridwidth = 1;
1758	1865
	1866	+ cGridBag anisoU = new cGridBag();
	1867	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1868	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1869	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1870	+ specularSection.add(anisoU);
	1871	+
	1872	+ cGridBag anisoV = new cGridBag();
	1873	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1874	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1875	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1876	+ specularSection.add(anisoV);
	1877	+
1759	1878
1760	1879	panel.add(new JSeparator());
1761	1880
..	..	@@ -1763,35 +1882,35 @@
1763	1882
1764	1883	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1765	1884
1766		- cGridBag globalSection = new cGridBag().setVertical(true);
	1885	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1767	1886
1768	1887	cGridBag camera = new cGridBag();
1769	1888	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1770	1889	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1771	1890	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1772		- globalSection.add(camera);
	1891	+ colorSection.add(camera);
1773	1892
1774	1893	cGridBag ambient = new cGridBag();
1775	1894	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1776	1895	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1777	1896	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1778		- globalSection.add(ambient);
	1897	+ colorSection.add(ambient);
1779	1898
1780	1899	cGridBag backlit = new cGridBag();
1781	1900	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1782	1901	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1783	1902	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1784		- globalSection.add(backlit);
	1903	+ colorSection.add(backlit);
1785	1904
1786	1905	cGridBag opacity = new cGridBag();
1787	1906	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1788	1907	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789	1908	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1790		- globalSection.add(opacity);
	1909	+ colorSection.add(opacity);
1791	1910
1792		- panel.add(new JSeparator());
	1911	+ //panel.add(new JSeparator());
1793	1912
1794		- panel.add(globalSection);
	1913	+ //panel.add(globalSection);
1795	1914
1796	1915	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	1916
..	..	@@ -1898,8 +2017,9 @@
1898	2017	// 3D models
1899	2018	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1900	2019	{
1901		- lastConverter = new com.jmex.model.converters.MaxToJme();
1902		- LoadFile(filename, lastConverter);
	2020	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2021	+ //LoadFile(filename, lastConverter);
	2022	+ LoadObjFile(filename); // New 3ds loader
1903	2023	continue;
1904	2024	}
1905	2025	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2625,6 +2745,7 @@
2625	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2626	2746	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2627	2747	}
	2748	+
2628	2749	//cJME.count++;
2629	2750	//cJME.count %= 12;
2630	2751	if (gc)
..	..	@@ -2808,6 +2929,7 @@
2808	2929	}
2809	2930	}
2810	2931	}
	2932	+
2811	2933	cFileSystemPane FSPane;
2812	2934
2813	2935	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2861,11 +2983,14 @@
2861	2983	}
2862	2984	}
2863	2985	}
	2986	+
2864	2987	freezematerial = false;
2865	2988	}
2866	2989
2867	2990	void SetMaterial(Object3D object)
2868	2991	{
	2992	+ latestObject = object;
	2993	+
2869	2994	cMaterial mat = object.material;
2870	2995
2871	2996	if (mat == null)
..	..	@@ -2977,12 +3102,17 @@
2977	3102	// }
2978	3103
2979	3104	/**/
2980		- if (deselect)
	3105	+ if (deselect \|\| child == null)
2981	3106	{
2982	3107	//group.deselectAll();
2983	3108	//freeze = true;
2984	3109	GetTree().clearSelection();
2985	3110	//freeze = false;
	3111	+
	3112	+ if (child == null)
	3113	+ {
	3114	+ return;
	3115	+ }
2986	3116	}
2987	3117
2988	3118	//group.addSelectee(child);
..	..	@@ -3051,7 +3181,7 @@
3051	3181	cameraView.ToggleDL();
3052	3182	cameraView.repaint();
3053	3183	return;
3054		- } else if (event.getSource() == toggleTextureItem)
	3184	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3055	3185	{
3056	3186	cameraView.ToggleTexture();
3057	3187	// june 2013 copy.HardTouch();
..	..	@@ -3090,7 +3220,7 @@
3090	3220	frame.validate();
3091	3221
3092	3222	return;
3093		- } else if (event.getSource() == toggleSwitchItem)
	3223	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3094	3224	{
3095	3225	cameraView.ToggleSwitch();
3096	3226	cameraView.repaint();
..	..	@@ -3121,7 +3251,7 @@
3121	3251	{
3122	3252	copy.live ^= true;
3123	3253	return;
3124		- } else if (event.getSource() == selectCB)
	3254	+ } else if (event.getSource() == selectableCB)
3125	3255	{
3126	3256	copy.dontselect ^= true;
3127	3257	return;
..	..	@@ -3306,9 +3436,9 @@
3306	3436	{
3307	3437	Close();
3308	3438	//return true;
3309		- } else if (source == loadItem)
	3439	+ } else if (source == openItem)
3310	3440	{
3311		- load();
	3441	+ Open();
3312	3442	//return true;
3313	3443	} else if (source == newItem)
3314	3444	{
..	..	@@ -3333,6 +3463,10 @@
3333	3463	{
3334	3464	generatePOV();
3335	3465	//return true;
	3466	+ } else if (event.getSource() == archiveItem)
	3467	+ {
	3468	+ cTools.Archive(frame);
	3469	+ return;
3336	3470	} else if (source == zBufferItem)
3337	3471	{
3338	3472	try
..	..	@@ -3384,8 +3518,8 @@
3384	3518	try
3385	3519	{
3386	3520	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3387		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3388		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3521	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3522	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3389	3523
3390	3524	Object3D parent = o.parent;
3391	3525	o.parent = null;
..	..	@@ -3396,10 +3530,14 @@
3396	3530
3397	3531	out.flush();
3398	3532
3399		- zstream.close();
	3533	+ baos //zstream
	3534	+ .close();
3400	3535	out.close();
3401	3536
3402		- return baos.toByteArray();
	3537	+ byte[] bytes = baos.toByteArray();
	3538	+
	3539	+ System.out.println("save #bytes = " + bytes.length);
	3540	+ return bytes;
3403	3541	} catch (Exception e)
3404	3542	{
3405	3543	System.err.println(e);
..	..	@@ -3409,13 +3547,16 @@
3409	3547
3410	3548	static public Object Uncompress(byte[] bytes)
3411	3549	{
3412		- System.out.println("#bytes = " + bytes.length);
	3550	+ System.out.println("restore #bytes = " + bytes.length);
3413	3551	try
3414	3552	{
3415	3553	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3416		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3417		- ObjectInputStream in = new ObjectInputStream(istream);
	3554	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3555	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3418	3556	Object obj = in.readObject();
	3557	+
	3558	+ bais //istream
	3559	+ .close();
3419	3560	in.close();
3420	3561
3421	3562	return obj;
..	..	@@ -3470,39 +3611,77 @@
3470	3611	return null;
3471	3612	}
3472	3613
3473		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3474	3614
3475	3615	public void Save()
	3616	+ {
	3617	+ //Save(true);
	3618	+ Replace();
	3619	+ }
	3620	+
	3621	+ private boolean Equal(byte[] compress, byte[] name)
	3622	+ {
	3623	+ if (compress.length != name.length)
	3624	+ {
	3625	+ return false;
	3626	+ }
	3627	+
	3628	+ for (int i=compress.length; --i>=0;)
	3629	+ {
	3630	+ if (compress[i] != name[i])
	3631	+ return false;
	3632	+ }
	3633	+
	3634	+ return true;
	3635	+ }
	3636	+
	3637	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3638	+
	3639	+ public boolean Save(boolean user)
3476	3640	{
3477	3641	System.err.println("Save");
3478	3642
3479	3643	cRadio tab = GetCurrentTab();
3480	3644
3481		- boolean temp = CameraPane.SWITCH;
3482		- CameraPane.SWITCH = false;
	3645	+ byte[] compress = CompressCopy();
3483	3646
3484		- copy.ExtractBigData(hashtable);
	3647	+ boolean thesame = false;
	3648	+
	3649	+ // Quick heuristic using length. Works only when stream is compressed.
	3650	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3651	+ {
	3652	+ thesame = true;
	3653	+ }
3485	3654
3486	3655	//EditorFrame.m_MainFrame.requestFocusInWindow();
3487		- tab.graphs[tab.undoindex++] = Compress(copy);
3488		-
3489		- copy.RestoreBigData(hashtable);
3490		-
3491		- CameraPane.SWITCH = temp;
3492		-
3493		- //assert(hashtable.isEmpty());
3494		-
3495		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3656	+ if (!thesame)
3496	3657	{
3497		- tab.graphs[i] = null;
	3658	+ //tab.user[tab.versionindex] = user;
	3659	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3660	+
	3661	+ copy.versions[++copy.versionindex] = compress;
	3662	+
	3663	+ // if (increment)
	3664	+ // tab.versionindex++;
3498	3665	}
3499	3666
	3667	+ //copy.RestoreBigData(versiontable);
	3668	+
	3669	+ //assert(hashtable.isEmpty());
	3670	+
	3671	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3672	+ {
	3673	+ //tab.user[i] = false;
	3674	+ copy.versions[i] = null;
	3675	+ }
	3676	+
	3677	+ SetUndoStates();
	3678	+
3500	3679	// test save
3501	3680	if (false)
3502	3681	{
3503	3682	try
3504	3683	{
3505		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3684	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3506	3685	ObjectOutputStream p = new ObjectOutputStream(ostream);
3507	3686
3508	3687	p.writeObject(copy);
..	..	@@ -3515,14 +3694,18 @@
3515	3694	e.printStackTrace();
3516	3695	}
3517	3696	}
	3697	+
	3698	+ return !thesame;
3518	3699	}
3519	3700
3520	3701	void CopyChanged(Object3D obj)
3521	3702	{
	3703	+ SetUndoStates();
	3704	+
3522	3705	boolean temp = CameraPane.SWITCH;
3523	3706	CameraPane.SWITCH = false;
3524	3707
3525		- copy.ExtractBigData(hashtable);
	3708	+ copy.ExtractBigData(versiontable);
3526	3709
3527	3710	copy.clear();
3528	3711
..	..	@@ -3531,7 +3714,7 @@
3531	3714	copy.add(obj.get(i));
3532	3715	}
3533	3716
3534		- copy.RestoreBigData(hashtable);
	3717	+ copy.RestoreBigData(versiontable);
3535	3718
3536	3719	CameraPane.SWITCH = temp;
3537	3720
..	..	@@ -3558,42 +3741,130 @@
3558	3741	refreshContents();
3559	3742	}
3560	3743
3561		- public void Undo()
	3744	+ cButton undoButton;
	3745	+ cButton restoreButton;
	3746	+ cButton replaceButton;
	3747	+ cButton redoButton;
	3748	+
	3749	+ boolean muteSlider;
	3750	+
	3751	+ int VersionCount()
3562	3752	{
	3753	+ int count = 0;
	3754	+
	3755	+ for (int i = copy.versions.length; --i >= 0;)
	3756	+ {
	3757	+ if (copy.versions[i] != null)
	3758	+ count++;
	3759	+ }
	3760	+
	3761	+ return count;
	3762	+ }
	3763	+
	3764	+ void SetUndoStates()
	3765	+ {
	3766	+ cRadio tab = GetCurrentTab();
	3767	+
	3768	+ restoreButton.setEnabled(copy.versionindex != -1);
	3769	+ replaceButton.setEnabled(copy.versionindex != -1);
	3770	+
	3771	+ undoButton.setEnabled(copy.versionindex > 0);
	3772	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3773	+
	3774	+ muteSlider = true;
	3775	+ versionSlider.setMaximum(VersionCount() - 1);
	3776	+ versionSlider.setInteger(copy.versionindex);
	3777	+ muteSlider = false;
	3778	+ }
	3779	+
	3780	+ public boolean Undo()
	3781	+ {
	3782	+ // Option?
	3783	+ Replace();
	3784	+
3563	3785	System.err.println("Undo");
3564	3786
3565	3787	cRadio tab = GetCurrentTab();
3566	3788
3567		- if (tab.undoindex == 0)
	3789	+ if (copy.versionindex == 0)
3568	3790	{
3569	3791	java.awt.Toolkit.getDefaultToolkit().beep();
3570		- return;
	3792	+ return false;
3571	3793	}
3572	3794
3573		- if (tab.graphs[tab.undoindex] == null)
	3795	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3796	+// {
	3797	+// if (Save(false))
	3798	+// tab.versionindex -= 1;
	3799	+// else
	3800	+// {
	3801	+// if (tab.versionindex <= 0)
	3802	+// return false;
	3803	+// else
	3804	+// tab.versionindex -= 1;
	3805	+// }
	3806	+// }
	3807	+
	3808	+ copy.versionindex -= 1;
	3809	+
	3810	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3811	+
	3812	+ return true;
	3813	+ }
	3814	+
	3815	+ public boolean Restore()
	3816	+ {
	3817	+ System.err.println("Restore");
	3818	+
	3819	+ cRadio tab = GetCurrentTab();
	3820	+
	3821	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3574	3822	{
3575		- Save();
3576		- tab.undoindex -= 1;
	3823	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3824	+ return false;
3577	3825	}
3578	3826
3579		- tab.undoindex -= 1;
	3827	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3828	+
	3829	+ return true;
	3830	+ }
3580	3831
3581		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3832	+ public boolean Replace()
	3833	+ {
	3834	+ System.err.println("Replace");
	3835	+
	3836	+ cRadio tab = GetCurrentTab();
	3837	+
	3838	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3839	+ {
	3840	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3841	+ return false;
	3842	+ }
	3843	+
	3844	+ copy.versions[copy.versionindex] = CompressCopy();
	3845	+
	3846	+ return true;
3582	3847	}
3583	3848
3584	3849	public void Redo()
3585	3850	{
	3851	+ // Option?
	3852	+ Replace();
	3853	+
3586	3854	cRadio tab = GetCurrentTab();
3587	3855
3588		- if (tab.graphs[tab.undoindex + 1] == null)
	3856	+ if (copy.versions[copy.versionindex + 1] == null)
3589	3857	{
3590	3858	java.awt.Toolkit.getDefaultToolkit().beep();
3591	3859	return;
3592	3860	}
3593	3861
3594		- tab.undoindex += 1;
	3862	+ copy.versionindex += 1;
3595	3863
3596		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3864	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3865	+
	3866	+ //if (!tab.user[tab.versionindex])
	3867	+ // tab.graphs[tab.versionindex] = null;
3597	3868	}
3598	3869
3599	3870	void ImportGFD()
..	..	@@ -3889,9 +4160,25 @@
3889	4160	//copy.Touch();
3890	4161	}
3891	4162
	4163	+ cNumberSlider versionSlider;
	4164	+
3892	4165	public void stateChanged(ChangeEvent e)
3893	4166	{
3894	4167	// assert(false);
	4168	+ if (e.getSource() == versionSlider)
	4169	+ {
	4170	+ if (muteSlider)
	4171	+ return;
	4172	+
	4173	+ int version = versionSlider.getInteger();
	4174	+
	4175	+ if (copy.versions[version] != null)
	4176	+ {
	4177	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4178	+ }
	4179	+
	4180	+ return;
	4181	+ }
3895	4182
3896	4183	if (freezematerial)
3897	4184	{
..	..	@@ -4240,7 +4527,7 @@
4240	4527
4241	4528	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4242	4529	{
4243		- if (Globals.SAVEONMAKE) // && resetmodel)
	4530	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4244	4531	Save();
4245	4532	//Tween.set(thing, 0).target(1).start(tweenManager);
4246	4533	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4482,7 +4769,9 @@
4482	4769	readobj.ResetDisplayList();
4483	4770	} catch (Exception e)
4484	4771	{
4485		- //e.printStackTrace();
	4772	+ if (!e.toString().contains("GZIP"))
	4773	+ e.printStackTrace();
	4774	+
4486	4775	try
4487	4776	{
4488	4777	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4556,8 +4845,8 @@
4556	4845
4557	4846	if (readobj != null)
4558	4847	{
4559		- if (Globals.SAVEONMAKE)
4560		- Save();
	4848	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4849	+ // Save();
4561	4850	try
4562	4851	{
4563	4852	//readobj.deepCopySelf(copy);
..	..	@@ -4602,6 +4891,7 @@
4602	4891	}
4603	4892	} catch (ClassCastException e)
4604	4893	{
	4894	+ e.printStackTrace();
4605	4895	assert (false);
4606	4896	Composite c = (Composite) copy;
4607	4897	c.children.clear();
..	..	@@ -4612,13 +4902,24 @@
4612	4902	c.addChild(csg);
4613	4903	}
4614	4904
	4905	+ copy.versions = readobj.versions;
	4906	+ copy.versionindex = readobj.versionindex;
	4907	+
	4908	+ if (copy.versions == null)
	4909	+ {
	4910	+ copy.versions = new byte[100][];
	4911	+ copy.versionindex = -1;
	4912	+ }
	4913	+
	4914	+ //? SetUndoStates();
	4915	+
4615	4916	ResetModel();
4616	4917	copy.HardTouch(); // recompile?
4617	4918	refreshContents();
4618	4919	}
4619	4920	}
4620	4921
4621		- void load() // throws ClassNotFoundException
	4922	+ void Open() // throws ClassNotFoundException
4622	4923	{
4623	4924	if (Grafreed.standAlone)
4624	4925	{
..	..	@@ -4721,6 +5022,7 @@
4721	5022	//ps.print(buffer.toString());
4722	5023	} catch (IOException e)
4723	5024	{
	5025	+ e.printStackTrace();
4724	5026	}
4725	5027	}
4726	5028
..	..	@@ -4735,6 +5037,8 @@
4735	5037	String filename = browser.getFile();
4736	5038	if (filename != null && filename.length() > 0)
4737	5039	{
	5040	+ if (!filename.endsWith(".gfd"))
	5041	+ filename += ".gfd";
4738	5042	lastname = browser.getDirectory() + filename;
4739	5043	save();
4740	5044	}
..	..	@@ -4901,7 +5205,7 @@
4901	5205	MenuBar menuBar;
4902	5206	Menu fileMenu;
4903	5207	MenuItem newItem;
4904		- MenuItem loadItem;
	5208	+ MenuItem openItem;
4905	5209	MenuItem saveItem;
4906	5210	MenuItem saveAsItem;
4907	5211	MenuItem exportAsItem;
..	..	@@ -4924,6 +5228,7 @@
4924	5228	CheckboxMenuItem toggleSwitchItem;
4925	5229	CheckboxMenuItem toggleRootItem;
4926	5230	CheckboxMenuItem animationItem;
	5231	+ MenuItem archiveItem;
4927	5232	CheckboxMenuItem toggleHandleItem;
4928	5233	CheckboxMenuItem togglePaintItem;
4929	5234	JSplitPane mainPanel;
..	..	@@ -4945,6 +5250,8 @@
4945	5250	cGridBag optionsPanel;
4946	5251
4947	5252	JTabbedPane objectPanel;
	5253	+ boolean materialFlushed;
	5254	+ Object3D latestObject;
4948	5255
4949	5256	cGridBag XYZPanel;
4950	5257