~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -37,6 +41,51 @@
37	41	JFrame frame;
38	42
39	43	static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
	49	+ }
	50	+
	51	+ cToggleButton GetToggleButton(String name, boolean border)
	52	+ {
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
	55	+ }
	56	+
	57	+ cCheckBox GetCheckBox(String name, boolean border)
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ ImageIcon GetIcon(String name)
	64	+ {
	65	+ try
	66	+ {
	67	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	68	+
	69	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	70	+// {
	71	+// BufferedImage resized = new BufferedImage(48, 48, 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, 48, 48, 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;
	83	+ }
	84	+ catch (Exception e)
	85	+ {
	86	+ return null;
	87	+ }
	88	+ }
40	89
41	90	// SCRIPT
42	91
..	..	@@ -147,7 +196,7 @@
147	196
148	197	objEditor.ctrlPanel.remove(namePanel);
149	198
150		- if (!GroupEditor.allparams)
	199	+ if (!allparams)
151	200	return;
152	201
153	202	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -219,6 +268,12 @@
219	268	client = inClient;
220	269	copy = client;
221	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
222	277	// "this" is not called: SetupUI2(objEditor);
223	278	}
224	279
..	..	@@ -232,6 +287,12 @@
232	287	client = inClient;
233	288	copy = client;
234	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
235	296	SetupUI2(callee.GetEditor());
236	297	}
237	298
..	..	@@ -246,7 +307,7 @@
246	307	//localCopy.parent = null;
247	308
248	309	frame = new JFrame();
249		- frame.setUndecorated(true);
	310	+ frame.setUndecorated(false);
250	311	objEditor = this;
251	312	this.callee = callee;
252	313
..	..	@@ -264,6 +325,12 @@
264	325	copy = localCopy;
265	326	copy.editWindow = this;
266	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+// copy.versions = new byte[100][];
	331	+// copy.versionindex = -1;
	332	+ }
	333	+
267	334	SetupMenu();
268	335
269	336	//SetupName(objEditor); // new
..	..	@@ -277,12 +344,17 @@
277	344	return frame.action(event, obj);
278	345	}
279	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	+
280	352	void SetupMenu()
281	353	{
282	354	frame.setMenuBar(menuBar = new MenuBar());
283	355	menuBar.add(fileMenu = new Menu("File"));
284	356	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	358
287	359	//oe.menuBar.add(menu = new Menu("Include"));
288	360	Menu menu = new Menu("Import");
..	..	@@ -314,7 +386,7 @@
314	386	}
315	387
316	388	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
318	390	saveItem.addActionListener(this);
319	391	saveAsItem.addActionListener(this);
320	392	exportAsItem.addActionListener(this);
..	..	@@ -323,13 +395,40 @@
323	395	closeItem.addActionListener(this);
324	396
325	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	+
326	424	toolbarPanel = new JPanel();
327	425	toolbarPanel.setName("Toolbar");
	426	+
328	427	treePanel = new cGridBag();
329	428	treePanel.setName("Tree");
330	429
331	430	editPanel = new cGridBag().setVertical(true);
332		- editPanel.setName("Edit");
	431	+ //editPanel.setName("Edit");
333	432
334	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
335	434
..	..	@@ -337,23 +436,27 @@
337	436	editPanel.add(editCommandsPanel);
338	437	editPanel.add(ctrlPanel);
339	438
340		- materialPanel = new cGridBag().setVertical(true);
	439	+ toolboxPanel = new cGridBag().setVertical(true);
	440	+ //toolboxPanel.setName("Toolbox");
341	441
342		- materialPanel.setName("Material");
	442	+ materialPanel = new cGridBag().setVertical(true);
	443	+ //materialPanel.setName("Material");
	444	+
343	445	/JTextPane/
344	446	infoarea = createTextPane();
345	447	doc = infoarea.getStyledDocument();
346	448
347	449	infoarea.setEditable(true);
348	450	SetText();
	451	+
349	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
350	453	// infoarea.setOpaque(false);
351	454	// //infoarea.setForeground(textcolor);
352	455	// TEXTAREA infoarea.setLineWrap(true);
353	456	// TEXTAREA infoarea.setWrapStyleWord(true);
354	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
355		- infoPanel.setPreferredSize(new Dimension(50, 200));
356		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
357	460	//infoPanel.setLayout(new BorderLayout());
358	461	//infoPanel.add(createTextPane());
359	462
..	..	@@ -364,7 +467,14 @@
364	467	mainPanel.setDividerSize(9);
365	468	mainPanel.setDividerLocation(0.5); //1.0);
366	469	mainPanel.setResizeWeight(0.5);
367		-
	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	+
368	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
369	479	//mainPanel.setLayout(new GridBagLayout());
370	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -595,8 +705,8 @@
595	705	}
596	706	}
597	707
598		-static GraphicsDevice device = GraphicsEnvironment
599		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
600	710
601	711	Rectangle keeprect;
602	712	cRadio radio;
..	..	@@ -612,13 +722,24 @@
612	722
613	723	boolean maximized;
614	724
	725	+ cButton fullscreenLayout;
	726	+
615	727	void Minimize()
616	728	{
617	729	frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
618	731	}
619	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={}
620	736	void Maximize()
621	737	{
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
622	743	if (maximized)
623	744	{
624	745	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -626,20 +747,36 @@
626	747	else
627	748	{
628	749	keeprect = frame.getBounds();
629		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
630		- Dimension rect2 = frame.getToolkit().getScreenSize();
631		- 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);
632	753	// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
633	755	}
634	756
635	757	maximized ^= true;
	758	+
	759	+ frame.validate();
636	760	}
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
637	765
638	766	void ToggleFullScreen()
639	767	{
640		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
641	773	{
642	774	device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
643	780	//frame.setVisible(false);
644	781	// frame.removeNotify();
645	782	// frame.setUndecorated(false);
..	..	@@ -649,7 +786,7 @@
649	786	// X frame.getContentPane().remove(/"Center",/bigThree);
650	787	// X framePanel.add(bigThree);
651	788	// X frame.getContentPane().add(/"Center",/framePanel);
652		- framePanel.setDividerLocation(1);
	789	+ framePanel.setDividerLocation(46);
653	790
654	791	//frame.setVisible(true);
655	792	radio.layout = keepButton;
..	..	@@ -664,7 +801,12 @@
664	801	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
665	802	// frame.getToolkit().getScreenSize().height);
666	803	//frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
667	807	device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
668	810	// frame.removeNotify();
669	811	// frame.setUndecorated(true);
670	812	// frame.addNotify();
..	..	@@ -673,13 +815,34 @@
673	815	// X frame.getContentPane().add(/"Center",/bigThree);
674	816	framePanel.setDividerLocation(0);
675	817
676		- radio.layout = twoButton;
	818	+ radio.layout = fullscreenLayout;
677	819	radio.layout.doClick();
678	820	//frame.setVisible(true);
679	821	}
680		-
681		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
682	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	+ }
683	846
684	847	private JTextPane createTextPane()
685	848	{
..	..	@@ -811,7 +974,7 @@
811	974	// NumberSlider vDivsField;
812	975	// JCheckBox endcaps;
813	976	JCheckBox liveCB;
814		- JCheckBox selectCB;
	977	+ JCheckBox selectableCB;
815	978	JCheckBox hideCB;
816	979	JCheckBox link2masterCB;
817	980	JCheckBox markCB;
..	..	@@ -819,7 +982,12 @@
819	982	JCheckBox speedupCB;
820	983	JCheckBox rewindCB;
821	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
822	989	JComboBox texresMenu;
	990	+
823	991	JButton resetButton;
824	992	JButton stepButton;
825	993	JButton stepAllButton;
..	..	@@ -1006,38 +1174,42 @@
1006	1174	namePanel = new cGridBag();
1007	1175
1008	1176	nameField = AddText(namePanel, copy.GetName());
1009		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1010	1178	oe.ctrlPanel.add(namePanel);
1011	1179
1012	1180	oe.ctrlPanel.Return();
1013	1181
1014		- if (!GroupEditor.allparams)
	1182	+ if (!allparams)
1015	1183	return;
1016	1184
1017	1185	setupPanel = new cGridBag().setVertical(false);
1018	1186
1019	1187	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1020	1188	liveCB.setToolTipText("Animate object");
1021		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1022		- selectCB.setToolTipText("Make object selectable");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
1023	1191	// Return();
	1192	+
1024	1193	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1025	1194	hideCB.setToolTipText("Hide object");
1026	1195	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1027		- markCB.setToolTipText("Set the animation target transform");
	1196	+ markCB.setToolTipText("As animation target transform");
	1197	+
	1198	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1028	1199
1029	1200	setupPanel2 = new cGridBag().setVertical(false);
1030	1201
1031	1202	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1032	1203	rewindCB.setToolTipText("Rewind animation");
1033	1204
1034		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1035		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1205	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1206	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1036	1207
	1208	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1209	+ link2masterCB.setToolTipText("Attach to support");
	1210	+
1037	1211	if (Globals.ADVANCED)
1038	1212	{
1039		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1040		- link2masterCB.setToolTipText("Attach to support");
1041	1213	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1042	1214	speedupCB.setToolTipText("Option motion capture");
1043	1215	}
..	..	@@ -1311,6 +1483,7 @@
1311	1483	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1312	1484	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1313	1485	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1486	+ //XYZPanel.setName("XYZ");
1314	1487
1315	1488	/*
1316	1489	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1348,12 +1521,23 @@
1348	1521	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1349	1522	//tmp.setName("Edit");
1350	1523	objectPanel.add(materialPanel);
	1524	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1351	1525	// JPanel north = new JPanel(new BorderLayout());
1352	1526	// north.setName("Edit");
1353	1527	// north.add(ctrlPanel, BorderLayout.NORTH);
1354	1528	// objectPanel.add(north);
1355	1529	objectPanel.add(editPanel);
1356		- objectPanel.add(infoPanel);
	1530	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1531	+
	1532	+ //if (Globals.ADVANCED)
	1533	+ objectPanel.add(infoPanel);
	1534	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1535	+
	1536	+ objectPanel.add(XYZPanel);
	1537	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1538	+
	1539	+ objectPanel.add(toolboxPanel);
	1540	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1357	1541
1358	1542	/*
1359	1543	aConstraints.gridx = 0;
..	..	@@ -1362,7 +1546,7 @@
1362	1546	aConstraints.gridy += 1;
1363	1547	aConstraints.gridwidth = 1;
1364	1548	mainPanel.add(objectPanel, aConstraints);
1365		- */
	1549	+ */
1366	1550
1367	1551	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1368	1552	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1374,14 +1558,12 @@
1374	1558	scrollpane.addMouseWheelListener(this); // Default not fast enough
1375	1559
1376	1560	/JTabbedPane/ scenePanel = new cGridBag();
1377		- scenePanel.preferredWidth = 6;
	1561	+ scenePanel.preferredWidth = 5;
1378	1562
1379	1563	JTabbedPane tabbedPane = new JTabbedPane();
1380	1564	tabbedPane.add(scrollpane);
1381	1565
1382		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1383		-
1384		- optionsPanel = new cGridBag().setVertical(true);
	1566	+ optionsPanel = new cGridBag().setVertical(false);
1385	1567
1386	1568	optionsPanel.setName("Options");
1387	1569
..	..	@@ -1389,6 +1571,8 @@
1389	1571
1390	1572	tabbedPane.add(optionsPanel);
1391	1573
	1574	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1575	+
1392	1576	scenePanel.add(tabbedPane);
1393	1577
1394	1578	/*
..	..	@@ -1450,9 +1634,9 @@
1450	1634	/**/
1451	1635
1452	1636	bigThree = new cGridBag();
1453		- bigThree.addComponent(scenePanel);
1454	1637	bigThree.addComponent(centralPanel);
1455		- bigThree.addComponent(XYZPanel);
	1638	+ bigThree.addComponent(scenePanel);
	1639	+ //bigThree.addComponent(XYZPanel);
1456	1640
1457	1641	// // SIDE EFFECT!!!
1458	1642	// aConstraints.gridx = 0;
..	..	@@ -1461,9 +1645,9 @@
1461	1645	// aConstraints.gridheight = 1;
1462	1646
1463	1647	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1464		- framePanel.setContinuousLayout(true);
1465		- framePanel.setOneTouchExpandable(true);
1466		- framePanel.setDividerLocation(0.8);
	1648	+ framePanel.setContinuousLayout(false);
	1649	+ framePanel.setOneTouchExpandable(false);
	1650	+ //.setDividerLocation(0.8);
1467	1651	//framePanel.setDividerSize(15);
1468	1652	//framePanel.setResizeWeight(0.15);
1469	1653	framePanel.setName("Frame");
..	..	@@ -1481,11 +1665,14 @@
1481	1665	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1482	1666
1483	1667	frame.setSize(1280, 860);
1484		- frame.setVisible(true);
1485		-
	1668	+
1486	1669	cameraView.requestFocusInWindow();
1487	1670
1488	1671	gridPanel.setDividerLocation(1.0);
	1672	+
	1673	+ frame.validate();
	1674	+
	1675	+ frame.setVisible(true);
1489	1676
1490	1677	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1491	1678	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1572,24 +1759,6 @@
1572	1759	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573	1760	colorSection.add(texture);
1574	1761
1575		- cGridBag anisoU = new cGridBag();
1576		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1577		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1579		- colorSection.add(anisoU);
1580		-
1581		- cGridBag anisoV = new cGridBag();
1582		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1583		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1585		- colorSection.add(anisoV);
1586		-
1587		- cGridBag shadowbias = new cGridBag();
1588		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1589		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1591		- colorSection.add(shadowbias);
1592		-
1593	1762	panel.add(new JSeparator());
1594	1763
1595	1764	panel.add(colorSection);
..	..	@@ -1639,6 +1808,12 @@
1639	1808	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1640	1809	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1641	1810	diffuseSection.add(fakedepth);
	1811	+
	1812	+ cGridBag shadowbias = new cGridBag();
	1813	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1814	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1815	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1816	+ diffuseSection.add(shadowbias);
1642	1817
1643	1818	panel.add(new JSeparator());
1644	1819
..	..	@@ -1690,6 +1865,18 @@
1690	1865	// aConstraints.gridy += 1;
1691	1866	// aConstraints.gridwidth = 1;
1692	1867
	1868	+ cGridBag anisoU = new cGridBag();
	1869	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1870	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1871	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1872	+ specularSection.add(anisoU);
	1873	+
	1874	+ cGridBag anisoV = new cGridBag();
	1875	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1876	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1877	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1878	+ specularSection.add(anisoV);
	1879	+
1693	1880
1694	1881	panel.add(new JSeparator());
1695	1882
..	..	@@ -1697,35 +1884,35 @@
1697	1884
1698	1885	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1699	1886
1700		- cGridBag globalSection = new cGridBag().setVertical(true);
	1887	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1701	1888
1702	1889	cGridBag camera = new cGridBag();
1703	1890	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1704	1891	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	1892	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(camera);
	1893	+ colorSection.add(camera);
1707	1894
1708	1895	cGridBag ambient = new cGridBag();
1709	1896	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1710	1897	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711	1898	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1712		- globalSection.add(ambient);
	1899	+ colorSection.add(ambient);
1713	1900
1714	1901	cGridBag backlit = new cGridBag();
1715	1902	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1716	1903	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1717	1904	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1718		- globalSection.add(backlit);
	1905	+ colorSection.add(backlit);
1719	1906
1720	1907	cGridBag opacity = new cGridBag();
1721	1908	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1722	1909	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723	1910	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1724		- globalSection.add(opacity);
	1911	+ colorSection.add(opacity);
1725	1912
1726		- panel.add(new JSeparator());
	1913	+ //panel.add(new JSeparator());
1727	1914
1728		- panel.add(globalSection);
	1915	+ //panel.add(globalSection);
1729	1916
1730	1917	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1731	1918
..	..	@@ -1832,8 +2019,9 @@
1832	2019	// 3D models
1833	2020	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1834	2021	{
1835		- lastConverter = new com.jmex.model.converters.MaxToJme();
1836		- LoadFile(filename, lastConverter);
	2022	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2023	+ //LoadFile(filename, lastConverter);
	2024	+ LoadObjFile(filename); // New 3ds loader
1837	2025	continue;
1838	2026	}
1839	2027	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2559,6 +2747,7 @@
2559	2747	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2560	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2561	2749	}
	2750	+
2562	2751	//cJME.count++;
2563	2752	//cJME.count %= 12;
2564	2753	if (gc)
..	..	@@ -2742,6 +2931,7 @@
2742	2931	}
2743	2932	}
2744	2933	}
	2934	+
2745	2935	cFileSystemPane FSPane;
2746	2936
2747	2937	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2795,11 +2985,14 @@
2795	2985	}
2796	2986	}
2797	2987	}
	2988	+
2798	2989	freezematerial = false;
2799	2990	}
2800	2991
2801	2992	void SetMaterial(Object3D object)
2802	2993	{
	2994	+ latestObject = object;
	2995	+
2803	2996	cMaterial mat = object.material;
2804	2997
2805	2998	if (mat == null)
..	..	@@ -2911,12 +3104,17 @@
2911	3104	// }
2912	3105
2913	3106	/**/
2914		- if (deselect)
	3107	+ if (deselect \|\| child == null)
2915	3108	{
2916	3109	//group.deselectAll();
2917	3110	//freeze = true;
2918	3111	GetTree().clearSelection();
2919	3112	//freeze = false;
	3113	+
	3114	+ if (child == null)
	3115	+ {
	3116	+ return;
	3117	+ }
2920	3118	}
2921	3119
2922	3120	//group.addSelectee(child);
..	..	@@ -2985,7 +3183,7 @@
2985	3183	cameraView.ToggleDL();
2986	3184	cameraView.repaint();
2987	3185	return;
2988		- } else if (event.getSource() == toggleTextureItem)
	3186	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2989	3187	{
2990	3188	cameraView.ToggleTexture();
2991	3189	// june 2013 copy.HardTouch();
..	..	@@ -3024,7 +3222,7 @@
3024	3222	frame.validate();
3025	3223
3026	3224	return;
3027		- } else if (event.getSource() == toggleSwitchItem)
	3225	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3028	3226	{
3029	3227	cameraView.ToggleSwitch();
3030	3228	cameraView.repaint();
..	..	@@ -3055,7 +3253,7 @@
3055	3253	{
3056	3254	copy.live ^= true;
3057	3255	return;
3058		- } else if (event.getSource() == selectCB)
	3256	+ } else if (event.getSource() == selectableCB)
3059	3257	{
3060	3258	copy.dontselect ^= true;
3061	3259	return;
..	..	@@ -3240,9 +3438,9 @@
3240	3438	{
3241	3439	Close();
3242	3440	//return true;
3243		- } else if (source == loadItem)
	3441	+ } else if (source == openItem)
3244	3442	{
3245		- load();
	3443	+ Open();
3246	3444	//return true;
3247	3445	} else if (source == newItem)
3248	3446	{
..	..	@@ -3267,6 +3465,10 @@
3267	3465	{
3268	3466	generatePOV();
3269	3467	//return true;
	3468	+ } else if (event.getSource() == archiveItem)
	3469	+ {
	3470	+ cTools.Archive(frame);
	3471	+ return;
3270	3472	} else if (source == zBufferItem)
3271	3473	{
3272	3474	try
..	..	@@ -3318,8 +3520,8 @@
3318	3520	try
3319	3521	{
3320	3522	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3321		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3322		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3523	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3524	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3323	3525
3324	3526	Object3D parent = o.parent;
3325	3527	o.parent = null;
..	..	@@ -3330,10 +3532,14 @@
3330	3532
3331	3533	out.flush();
3332	3534
3333		- zstream.close();
	3535	+ baos //zstream
	3536	+ .close();
3334	3537	out.close();
3335	3538
3336		- return baos.toByteArray();
	3539	+ byte[] bytes = baos.toByteArray();
	3540	+
	3541	+ System.out.println("save #bytes = " + bytes.length);
	3542	+ return bytes;
3337	3543	} catch (Exception e)
3338	3544	{
3339	3545	System.err.println(e);
..	..	@@ -3343,13 +3549,16 @@
3343	3549
3344	3550	static public Object Uncompress(byte[] bytes)
3345	3551	{
3346		- System.out.println("#bytes = " + bytes.length);
	3552	+ System.out.println("restore #bytes = " + bytes.length);
3347	3553	try
3348	3554	{
3349	3555	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3350		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3351		- ObjectInputStream in = new ObjectInputStream(istream);
	3556	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3557	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3352	3558	Object obj = in.readObject();
	3559	+
	3560	+ bais //istream
	3561	+ .close();
3353	3562	in.close();
3354	3563
3355	3564	return obj;
..	..	@@ -3404,37 +3613,77 @@
3404	3613	return null;
3405	3614	}
3406	3615
3407		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3408	3616
3409	3617	public void Save()
3410	3618	{
	3619	+ //Save(true);
	3620	+ Replace();
	3621	+ }
	3622	+
	3623	+ private boolean Equal(byte[] compress, byte[] name)
	3624	+ {
	3625	+ if (compress.length != name.length)
	3626	+ {
	3627	+ return false;
	3628	+ }
	3629	+
	3630	+ for (int i=compress.length; --i>=0;)
	3631	+ {
	3632	+ if (compress[i] != name[i])
	3633	+ return false;
	3634	+ }
	3635	+
	3636	+ return true;
	3637	+ }
	3638	+
	3639	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3640	+
	3641	+ public boolean Save(boolean user)
	3642	+ {
	3643	+ System.err.println("Save");
	3644	+
3411	3645	cRadio tab = GetCurrentTab();
3412	3646
3413		- boolean temp = CameraPane.SWITCH;
3414		- CameraPane.SWITCH = false;
	3647	+ byte[] compress = CompressCopy();
3415	3648
3416		- copy.ExtractBigData(hashtable);
	3649	+ boolean thesame = false;
	3650	+
	3651	+ // Quick heuristic using length. Works only when stream is compressed.
	3652	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3653	+ {
	3654	+ thesame = true;
	3655	+ }
3417	3656
3418	3657	//EditorFrame.m_MainFrame.requestFocusInWindow();
3419		- tab.graphs[tab.undoindex++] = Compress(copy);
3420		-
3421		- copy.RestoreBigData(hashtable);
3422		-
3423		- CameraPane.SWITCH = temp;
3424		-
3425		- //assert(hashtable.isEmpty());
3426		-
3427		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3658	+ if (!thesame)
3428	3659	{
3429		- tab.graphs[i] = null;
	3660	+ //tab.user[tab.versionindex] = user;
	3661	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3662	+
	3663	+ copy.versions[++copy.versionindex] = compress;
	3664	+
	3665	+ // if (increment)
	3666	+ // tab.versionindex++;
3430	3667	}
3431	3668
	3669	+ //copy.RestoreBigData(versiontable);
	3670	+
	3671	+ //assert(hashtable.isEmpty());
	3672	+
	3673	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3674	+ {
	3675	+ //tab.user[i] = false;
	3676	+ copy.versions[i] = null;
	3677	+ }
	3678	+
	3679	+ SetUndoStates();
	3680	+
3432	3681	// test save
3433	3682	if (false)
3434	3683	{
3435	3684	try
3436	3685	{
3437		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3686	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3438	3687	ObjectOutputStream p = new ObjectOutputStream(ostream);
3439	3688
3440	3689	p.writeObject(copy);
..	..	@@ -3447,14 +3696,18 @@
3447	3696	e.printStackTrace();
3448	3697	}
3449	3698	}
	3699	+
	3700	+ return !thesame;
3450	3701	}
3451	3702
3452	3703	void CopyChanged(Object3D obj)
3453	3704	{
	3705	+ SetUndoStates();
	3706	+
3454	3707	boolean temp = CameraPane.SWITCH;
3455	3708	CameraPane.SWITCH = false;
3456	3709
3457		- copy.ExtractBigData(hashtable);
	3710	+ copy.ExtractBigData(versiontable);
3458	3711
3459	3712	copy.clear();
3460	3713
..	..	@@ -3463,7 +3716,7 @@
3463	3716	copy.add(obj.get(i));
3464	3717	}
3465	3718
3466		- copy.RestoreBigData(hashtable);
	3719	+ copy.RestoreBigData(versiontable);
3467	3720
3468	3721	CameraPane.SWITCH = temp;
3469	3722
..	..	@@ -3490,40 +3743,130 @@
3490	3743	refreshContents();
3491	3744	}
3492	3745
3493		- public void Undo()
	3746	+ cButton undoButton;
	3747	+ cButton restoreButton;
	3748	+ cButton replaceButton;
	3749	+ cButton redoButton;
	3750	+
	3751	+ boolean muteSlider;
	3752	+
	3753	+ int VersionCount()
	3754	+ {
	3755	+ int count = 0;
	3756	+
	3757	+ for (int i = copy.versions.length; --i >= 0;)
	3758	+ {
	3759	+ if (copy.versions[i] != null)
	3760	+ count++;
	3761	+ }
	3762	+
	3763	+ return count;
	3764	+ }
	3765	+
	3766	+ void SetUndoStates()
3494	3767	{
3495	3768	cRadio tab = GetCurrentTab();
3496	3769
3497		- if (tab.undoindex == 0)
	3770	+ restoreButton.setEnabled(copy.versionindex != -1);
	3771	+ replaceButton.setEnabled(copy.versionindex != -1);
	3772	+
	3773	+ undoButton.setEnabled(copy.versionindex > 0);
	3774	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3775	+
	3776	+ muteSlider = true;
	3777	+ versionSlider.setMaximum(VersionCount() - 1);
	3778	+ versionSlider.setInteger(copy.versionindex);
	3779	+ muteSlider = false;
	3780	+ }
	3781	+
	3782	+ public boolean Undo()
	3783	+ {
	3784	+ // Option?
	3785	+ Replace();
	3786	+
	3787	+ System.err.println("Undo");
	3788	+
	3789	+ cRadio tab = GetCurrentTab();
	3790	+
	3791	+ if (copy.versionindex == 0)
3498	3792	{
3499	3793	java.awt.Toolkit.getDefaultToolkit().beep();
3500		- return;
	3794	+ return false;
3501	3795	}
3502	3796
3503		- if (tab.graphs[tab.undoindex] == null)
	3797	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3798	+// {
	3799	+// if (Save(false))
	3800	+// tab.versionindex -= 1;
	3801	+// else
	3802	+// {
	3803	+// if (tab.versionindex <= 0)
	3804	+// return false;
	3805	+// else
	3806	+// tab.versionindex -= 1;
	3807	+// }
	3808	+// }
	3809	+
	3810	+ copy.versionindex -= 1;
	3811	+
	3812	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3813	+
	3814	+ return true;
	3815	+ }
	3816	+
	3817	+ public boolean Restore()
	3818	+ {
	3819	+ System.err.println("Restore");
	3820	+
	3821	+ cRadio tab = GetCurrentTab();
	3822	+
	3823	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3504	3824	{
3505		- Save();
3506		- tab.undoindex -= 1;
	3825	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3826	+ return false;
3507	3827	}
3508	3828
3509		- tab.undoindex -= 1;
	3829	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3830	+
	3831	+ return true;
	3832	+ }
3510	3833
3511		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3834	+ public boolean Replace()
	3835	+ {
	3836	+ System.err.println("Replace");
	3837	+
	3838	+ cRadio tab = GetCurrentTab();
	3839	+
	3840	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3841	+ {
	3842	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3843	+ return false;
	3844	+ }
	3845	+
	3846	+ copy.versions[copy.versionindex] = CompressCopy();
	3847	+
	3848	+ return true;
3512	3849	}
3513	3850
3514	3851	public void Redo()
3515	3852	{
	3853	+ // Option?
	3854	+ Replace();
	3855	+
3516	3856	cRadio tab = GetCurrentTab();
3517	3857
3518		- if (tab.graphs[tab.undoindex + 1] == null)
	3858	+ if (copy.versions[copy.versionindex + 1] == null)
3519	3859	{
3520	3860	java.awt.Toolkit.getDefaultToolkit().beep();
3521	3861	return;
3522	3862	}
3523	3863
3524		- tab.undoindex += 1;
	3864	+ copy.versionindex += 1;
3525	3865
3526		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3866	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3867	+
	3868	+ //if (!tab.user[tab.versionindex])
	3869	+ // tab.graphs[tab.versionindex] = null;
3527	3870	}
3528	3871
3529	3872	void ImportGFD()
..	..	@@ -3675,7 +4018,7 @@
3675	4018	assert false;
3676	4019	}
3677	4020
3678		- void EditSelection()
	4021	+ void EditSelection(boolean newWindow)
3679	4022	{
3680	4023	}
3681	4024
..	..	@@ -3819,9 +4162,25 @@
3819	4162	//copy.Touch();
3820	4163	}
3821	4164
	4165	+ cNumberSlider versionSlider;
	4166	+
3822	4167	public void stateChanged(ChangeEvent e)
3823	4168	{
3824	4169	// assert(false);
	4170	+ if (e.getSource() == versionSlider)
	4171	+ {
	4172	+ if (muteSlider)
	4173	+ return;
	4174	+
	4175	+ int version = versionSlider.getInteger();
	4176	+
	4177	+ if (copy.versions[version] != null)
	4178	+ {
	4179	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4180	+ }
	4181	+
	4182	+ return;
	4183	+ }
3825	4184
3826	4185	if (freezematerial)
3827	4186	{
..	..	@@ -4170,7 +4529,8 @@
4170	4529
4171	4530	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4172	4531	{
4173		- Save();
	4532	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4533	+ Save();
4174	4534	//Tween.set(thing, 0).target(1).start(tweenManager);
4175	4535	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4176	4536	// if (thing instanceof GenericJointDemo)
..	..	@@ -4257,6 +4617,12 @@
4257	4617	{
4258	4618	ResetModel();
4259	4619	Select(thing.GetTreePath(), true, false); // unselect... false);
	4620	+
	4621	+ if (thing.Size() == 0)
	4622	+ {
	4623	+ //EditSelection(false);
	4624	+ }
	4625	+
4260	4626	refreshContents();
4261	4627	}
4262	4628
..	..	@@ -4405,7 +4771,9 @@
4405	4771	readobj.ResetDisplayList();
4406	4772	} catch (Exception e)
4407	4773	{
4408		- //e.printStackTrace();
	4774	+ if (!e.toString().contains("GZIP"))
	4775	+ e.printStackTrace();
	4776	+
4409	4777	try
4410	4778	{
4411	4779	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4479,11 +4847,14 @@
4479	4847
4480	4848	if (readobj != null)
4481	4849	{
4482		- Save();
	4850	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4851	+ // Save();
4483	4852	try
4484	4853	{
4485	4854	//readobj.deepCopySelf(copy);
4486	4855	copy.clear(); // june 2014
	4856	+ copy.skyboxname = readobj.skyboxname;
	4857	+ copy.skyboxext = readobj.skyboxext;
4487	4858	for (int i = 0; i < readobj.size(); i++)
4488	4859	{
4489	4860	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4524,6 +4895,7 @@
4524	4895	}
4525	4896	} catch (ClassCastException e)
4526	4897	{
	4898	+ e.printStackTrace();
4527	4899	assert (false);
4528	4900	Composite c = (Composite) copy;
4529	4901	c.children.clear();
..	..	@@ -4534,13 +4906,24 @@
4534	4906	c.addChild(csg);
4535	4907	}
4536	4908
	4909	+ copy.versions = readobj.versions;
	4910	+ copy.versionindex = readobj.versionindex;
	4911	+
	4912	+ if (copy.versions == null)
	4913	+ {
	4914	+ copy.versions = new byte[100][];
	4915	+ copy.versionindex = -1;
	4916	+ }
	4917	+
	4918	+ //? SetUndoStates();
	4919	+
4537	4920	ResetModel();
4538	4921	copy.HardTouch(); // recompile?
4539	4922	refreshContents();
4540	4923	}
4541	4924	}
4542	4925
4543		- void load() // throws ClassNotFoundException
	4926	+ void Open() // throws ClassNotFoundException
4544	4927	{
4545	4928	if (Grafreed.standAlone)
4546	4929	{
..	..	@@ -4643,6 +5026,7 @@
4643	5026	//ps.print(buffer.toString());
4644	5027	} catch (IOException e)
4645	5028	{
	5029	+ e.printStackTrace();
4646	5030	}
4647	5031	}
4648	5032
..	..	@@ -4657,6 +5041,8 @@
4657	5041	String filename = browser.getFile();
4658	5042	if (filename != null && filename.length() > 0)
4659	5043	{
	5044	+ if (!filename.endsWith(".gfd"))
	5045	+ filename += ".gfd";
4660	5046	lastname = browser.getDirectory() + filename;
4661	5047	save();
4662	5048	}
..	..	@@ -4823,7 +5209,7 @@
4823	5209	MenuBar menuBar;
4824	5210	Menu fileMenu;
4825	5211	MenuItem newItem;
4826		- MenuItem loadItem;
	5212	+ MenuItem openItem;
4827	5213	MenuItem saveItem;
4828	5214	MenuItem saveAsItem;
4829	5215	MenuItem exportAsItem;
..	..	@@ -4846,22 +5232,36 @@
4846	5232	CheckboxMenuItem toggleSwitchItem;
4847	5233	CheckboxMenuItem toggleRootItem;
4848	5234	CheckboxMenuItem animationItem;
	5235	+ MenuItem archiveItem;
4849	5236	CheckboxMenuItem toggleHandleItem;
4850	5237	CheckboxMenuItem togglePaintItem;
4851	5238	JSplitPane mainPanel;
4852	5239	JScrollPane scrollpane;
	5240	+
4853	5241	JPanel toolbarPanel;
	5242	+
4854	5243	cGridBag treePanel;
	5244	+
4855	5245	JPanel radioPanel;
4856	5246	ButtonGroup buttonGroup;
4857		- cGridBag ctrlPanel;
	5247	+
	5248	+ cGridBag toolboxPanel;
4858	5249	cGridBag materialPanel;
	5250	+ cGridBag ctrlPanel;
	5251	+
4859	5252	JScrollPane infoPanel;
	5253	+
4860	5254	cGridBag optionsPanel;
	5255	+
4861	5256	JTabbedPane objectPanel;
	5257	+ boolean materialFlushed;
	5258	+ Object3D latestObject;
	5259	+
4862	5260	cGridBag XYZPanel;
	5261	+
4863	5262	JSplitPane gridPanel;
4864	5263	JSplitPane bigPanel;
	5264	+
4865	5265	cGridBag bigThree;
4866	5266	cGridBag scenePanel;
4867	5267	cGridBag centralPanel;
..	..	@@ -4976,7 +5376,7 @@
4976	5376	cNumberSlider fogField;
4977	5377	JLabel opacityPowerLabel;
4978	5378	cNumberSlider opacityPowerField;
4979		- JTree jTree;
	5379	+ cTree jTree;
4980	5380	//ObjectUI parent;
4981	5381
4982	5382	cNumberSlider normalpushField;