~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -44,61 +44,47 @@
44	44
45	45	cButton GetButton(String name, boolean border)
46	46	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
50		- return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
54		- return new cButton(name, border);
55		- }
	47	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
56	49	}
57	50
58	51	cToggleButton GetToggleButton(String name, boolean border)
59	52	{
60		- try
61		- {
62		- ImageIcon icon = GetIcon(name);
63		- return new cToggleButton(icon, border);
64		- }
65		- catch (Exception e)
66		- {
67		- return new cToggleButton(name, border);
68		- }
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
69	55	}
70	56
71	57	cCheckBox GetCheckBox(String name, boolean border)
72	58	{
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ ImageIcon GetIcon(String name)
	64	+ {
73	65	try
74	66	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	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;
77	83	}
78	84	catch (Exception e)
79	85	{
80		- return new cCheckBox(name, border);
	86	+ return null;
81	87	}
82		- }
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
85		- {
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
89		- {
90		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91		- Graphics2D g = resized.createGraphics();
92		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95		- g.dispose();
96		-
97		- image = resized;
98		- }
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
102	88	}
103	89
104	90	// SCRIPT
..	..	@@ -282,6 +268,12 @@
282	268	client = inClient;
283	269	copy = client;
284	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
285	277	// "this" is not called: SetupUI2(objEditor);
286	278	}
287	279
..	..	@@ -295,6 +287,12 @@
295	287	client = inClient;
296	288	copy = client;
297	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
298	296	SetupUI2(callee.GetEditor());
299	297	}
300	298
..	..	@@ -327,6 +325,12 @@
327	325	copy = localCopy;
328	326	copy.editWindow = this;
329	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+// copy.versions = new byte[100][];
	331	+// copy.versionindex = -1;
	332	+ }
	333	+
330	334	SetupMenu();
331	335
332	336	//SetupName(objEditor); // new
..	..	@@ -350,7 +354,7 @@
350	354	frame.setMenuBar(menuBar = new MenuBar());
351	355	menuBar.add(fileMenu = new Menu("File"));
352	356	fileMenu.add(newItem = new MenuItem("New"));
353		- fileMenu.add(loadItem = new MenuItem("Open..."));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
354	358
355	359	//oe.menuBar.add(menu = new Menu("Include"));
356	360	Menu menu = new Menu("Import");
..	..	@@ -382,7 +386,7 @@
382	386	}
383	387
384	388	newItem.addActionListener(this);
385		- loadItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
386	390	saveItem.addActionListener(this);
387	391	saveAsItem.addActionListener(this);
388	392	exportAsItem.addActionListener(this);
..	..	@@ -419,11 +423,12 @@
419	423
420	424	toolbarPanel = new JPanel();
421	425	toolbarPanel.setName("Toolbar");
	426	+
422	427	treePanel = new cGridBag();
423	428	treePanel.setName("Tree");
424	429
425	430	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	431	+ //editPanel.setName("Edit");
427	432
428	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	434
..	..	@@ -431,11 +436,11 @@
431	436	editPanel.add(editCommandsPanel);
432	437	editPanel.add(ctrlPanel);
433	438
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	439	+ toolboxPanel = new cGridBag().setVertical(true);
	440	+ //toolboxPanel.setName("Toolbox");
436	441
437	442	materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
439	444
440	445	/JTextPane/
441	446	infoarea = createTextPane();
..	..	@@ -443,14 +448,15 @@
443	448
444	449	infoarea.setEditable(true);
445	450	SetText();
	451	+
446	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	453	// infoarea.setOpaque(false);
448	454	// //infoarea.setForeground(textcolor);
449	455	// TEXTAREA infoarea.setLineWrap(true);
450	456	// TEXTAREA infoarea.setWrapStyleWord(true);
451	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452		- //infoPanel.setPreferredSize(new Dimension(50, 200));
453		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
454	460	//infoPanel.setLayout(new BorderLayout());
455	461	//infoPanel.add(createTextPane());
456	462
..	..	@@ -780,7 +786,7 @@
780	786	// X frame.getContentPane().remove(/"Center",/bigThree);
781	787	// X framePanel.add(bigThree);
782	788	// X frame.getContentPane().add(/"Center",/framePanel);
783		- framePanel.setDividerLocation(1);
	789	+ framePanel.setDividerLocation(46);
784	790
785	791	//frame.setVisible(true);
786	792	radio.layout = keepButton;
..	..	@@ -815,6 +821,28 @@
815	821	}
816	822	frame.validate();
817	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	+ }
818	846
819	847	private JTextPane createTextPane()
820	848	{
..	..	@@ -946,7 +974,7 @@
946	974	// NumberSlider vDivsField;
947	975	// JCheckBox endcaps;
948	976	JCheckBox liveCB;
949		- JCheckBox selectCB;
	977	+ JCheckBox selectableCB;
950	978	JCheckBox hideCB;
951	979	JCheckBox link2masterCB;
952	980	JCheckBox markCB;
..	..	@@ -1158,13 +1186,16 @@
1158	1186
1159	1187	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1188	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
1163	1191	// Return();
	1192	+
1164	1193	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1194	hideCB.setToolTipText("Hide object");
1166	1195	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167	1196	markCB.setToolTipText("As animation target transform");
	1197	+
	1198	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1199
1169	1200	setupPanel2 = new cGridBag().setVertical(false);
1170	1201
..	..	@@ -1174,10 +1205,11 @@
1174	1205	randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1175	1206	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1176	1207
	1208	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1209	+ link2masterCB.setToolTipText("Attach to support");
	1210	+
1177	1211	if (Globals.ADVANCED)
1178	1212	{
1179		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180		- link2masterCB.setToolTipText("Attach to support");
1181	1213	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1182	1214	speedupCB.setToolTipText("Option motion capture");
1183	1215	}
..	..	@@ -1451,6 +1483,7 @@
1451	1483	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1452	1484	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1453	1485	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1486	+ //XYZPanel.setName("XYZ");
1454	1487
1455	1488	/*
1456	1489	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1488,13 +1521,23 @@
1488	1521	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1489	1522	//tmp.setName("Edit");
1490	1523	objectPanel.add(materialPanel);
	1524	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1491	1525	// JPanel north = new JPanel(new BorderLayout());
1492	1526	// north.setName("Edit");
1493	1527	// north.add(ctrlPanel, BorderLayout.NORTH);
1494	1528	// objectPanel.add(north);
1495	1529	objectPanel.add(editPanel);
1496		- 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	+
1497	1539	objectPanel.add(toolboxPanel);
	1540	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1498	1541
1499	1542	/*
1500	1543	aConstraints.gridx = 0;
..	..	@@ -1515,7 +1558,7 @@
1515	1558	scrollpane.addMouseWheelListener(this); // Default not fast enough
1516	1559
1517	1560	/JTabbedPane/ scenePanel = new cGridBag();
1518		- scenePanel.preferredWidth = 6;
	1561	+ scenePanel.preferredWidth = 5;
1519	1562
1520	1563	JTabbedPane tabbedPane = new JTabbedPane();
1521	1564	tabbedPane.add(scrollpane);
..	..	@@ -1591,9 +1634,9 @@
1591	1634	/**/
1592	1635
1593	1636	bigThree = new cGridBag();
1594		- bigThree.addComponent(scenePanel);
1595	1637	bigThree.addComponent(centralPanel);
1596		- bigThree.addComponent(XYZPanel);
	1638	+ bigThree.addComponent(scenePanel);
	1639	+ //bigThree.addComponent(XYZPanel);
1597	1640
1598	1641	// // SIDE EFFECT!!!
1599	1642	// aConstraints.gridx = 0;
..	..	@@ -1602,9 +1645,9 @@
1602	1645	// aConstraints.gridheight = 1;
1603	1646
1604	1647	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1605		- framePanel.setContinuousLayout(true);
1606		- framePanel.setOneTouchExpandable(true);
1607		- framePanel.setDividerLocation(0.8);
	1648	+ framePanel.setContinuousLayout(false);
	1649	+ framePanel.setOneTouchExpandable(false);
	1650	+ //.setDividerLocation(0.8);
1608	1651	//framePanel.setDividerSize(15);
1609	1652	//framePanel.setResizeWeight(0.15);
1610	1653	framePanel.setName("Frame");
..	..	@@ -1976,8 +2019,9 @@
1976	2019	// 3D models
1977	2020	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1978	2021	{
1979		- lastConverter = new com.jmex.model.converters.MaxToJme();
1980		- LoadFile(filename, lastConverter);
	2022	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2023	+ //LoadFile(filename, lastConverter);
	2024	+ LoadObjFile(filename); // New 3ds loader
1981	2025	continue;
1982	2026	}
1983	2027	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2703,6 +2747,7 @@
2703	2747	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2704	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2705	2749	}
	2750	+
2706	2751	//cJME.count++;
2707	2752	//cJME.count %= 12;
2708	2753	if (gc)
..	..	@@ -2886,6 +2931,7 @@
2886	2931	}
2887	2932	}
2888	2933	}
	2934	+
2889	2935	cFileSystemPane FSPane;
2890	2936
2891	2937	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2939,6 +2985,7 @@
2939	2985	}
2940	2986	}
2941	2987	}
	2988	+
2942	2989	freezematerial = false;
2943	2990	}
2944	2991
..	..	@@ -3206,7 +3253,7 @@
3206	3253	{
3207	3254	copy.live ^= true;
3208	3255	return;
3209		- } else if (event.getSource() == selectCB)
	3256	+ } else if (event.getSource() == selectableCB)
3210	3257	{
3211	3258	copy.dontselect ^= true;
3212	3259	return;
..	..	@@ -3391,9 +3438,9 @@
3391	3438	{
3392	3439	Close();
3393	3440	//return true;
3394		- } else if (source == loadItem)
	3441	+ } else if (source == openItem)
3395	3442	{
3396		- load();
	3443	+ Open();
3397	3444	//return true;
3398	3445	} else if (source == newItem)
3399	3446	{
..	..	@@ -3418,6 +3465,10 @@
3418	3465	{
3419	3466	generatePOV();
3420	3467	//return true;
	3468	+ } else if (event.getSource() == archiveItem)
	3469	+ {
	3470	+ cTools.Archive(frame);
	3471	+ return;
3421	3472	} else if (source == zBufferItem)
3422	3473	{
3423	3474	try
..	..	@@ -3469,8 +3520,8 @@
3469	3520	try
3470	3521	{
3471	3522	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3472		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3473		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3523	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3524	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3474	3525
3475	3526	Object3D parent = o.parent;
3476	3527	o.parent = null;
..	..	@@ -3481,10 +3532,14 @@
3481	3532
3482	3533	out.flush();
3483	3534
3484		- zstream.close();
	3535	+ baos //zstream
	3536	+ .close();
3485	3537	out.close();
3486	3538
3487		- return baos.toByteArray();
	3539	+ byte[] bytes = baos.toByteArray();
	3540	+
	3541	+ System.out.println("save #bytes = " + bytes.length);
	3542	+ return bytes;
3488	3543	} catch (Exception e)
3489	3544	{
3490	3545	System.err.println(e);
..	..	@@ -3494,13 +3549,16 @@
3494	3549
3495	3550	static public Object Uncompress(byte[] bytes)
3496	3551	{
3497		- System.out.println("#bytes = " + bytes.length);
	3552	+ System.out.println("restore #bytes = " + bytes.length);
3498	3553	try
3499	3554	{
3500	3555	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3501		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3502		- ObjectInputStream in = new ObjectInputStream(istream);
	3556	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3557	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3503	3558	Object obj = in.readObject();
	3559	+
	3560	+ bais //istream
	3561	+ .close();
3504	3562	in.close();
3505	3563
3506	3564	return obj;
..	..	@@ -3555,33 +3613,67 @@
3555	3613	return null;
3556	3614	}
3557	3615
3558		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3559	3616
3560	3617	public void Save()
	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)
3561	3642	{
3562	3643	System.err.println("Save");
3563	3644
3564	3645	cRadio tab = GetCurrentTab();
3565	3646
3566		- boolean temp = CameraPane.SWITCH;
3567		- CameraPane.SWITCH = false;
	3647	+ byte[] compress = CompressCopy();
3568	3648
3569		- copy.ExtractBigData(hashtable);
	3649	+ boolean thesame = false;
3570	3650
3571		- byte[] compress = Compress(copy);
	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	+ }
3572	3656
3573	3657	//EditorFrame.m_MainFrame.requestFocusInWindow();
3574		- tab.graphs[tab.undoindex++] = compress;
	3658	+ if (!thesame)
	3659	+ {
	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++;
	3667	+ }
3575	3668
3576		- copy.RestoreBigData(hashtable);
	3669	+ //copy.RestoreBigData(versiontable);
3577	3670
3578		- CameraPane.SWITCH = temp;
3579		-
3580	3671	//assert(hashtable.isEmpty());
3581	3672
3582		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3673	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3583	3674	{
3584		- tab.graphs[i] = null;
	3675	+ //tab.user[i] = false;
	3676	+ copy.versions[i] = null;
3585	3677	}
3586	3678
3587	3679	SetUndoStates();
..	..	@@ -3591,7 +3683,7 @@
3591	3683	{
3592	3684	try
3593	3685	{
3594		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3686	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3595	3687	ObjectOutputStream p = new ObjectOutputStream(ostream);
3596	3688
3597	3689	p.writeObject(copy);
..	..	@@ -3604,6 +3696,8 @@
3604	3696	e.printStackTrace();
3605	3697	}
3606	3698	}
	3699	+
	3700	+ return !thesame;
3607	3701	}
3608	3702
3609	3703	void CopyChanged(Object3D obj)
..	..	@@ -3613,7 +3707,7 @@
3613	3707	boolean temp = CameraPane.SWITCH;
3614	3708	CameraPane.SWITCH = false;
3615	3709
3616		- copy.ExtractBigData(hashtable);
	3710	+ copy.ExtractBigData(versiontable);
3617	3711
3618	3712	copy.clear();
3619	3713
..	..	@@ -3622,7 +3716,7 @@
3622	3716	copy.add(obj.get(i));
3623	3717	}
3624	3718
3625		- copy.RestoreBigData(hashtable);
	3719	+ copy.RestoreBigData(versiontable);
3626	3720
3627	3721	CameraPane.SWITCH = temp;
3628	3722
..	..	@@ -3650,52 +3744,129 @@
3650	3744	}
3651	3745
3652	3746	cButton undoButton;
	3747	+ cButton restoreButton;
	3748	+ cButton replaceButton;
3653	3749	cButton redoButton;
3654	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	+
3655	3766	void SetUndoStates()
3656	3767	{
3657	3768	cRadio tab = GetCurrentTab();
3658	3769
3659		- undoButton.setEnabled(tab.undoindex > 0);
3660		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	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;
3661	3780	}
3662	3781
3663		- public void Undo()
	3782	+ public boolean Undo()
3664	3783	{
	3784	+ // Option?
	3785	+ Replace();
	3786	+
3665	3787	System.err.println("Undo");
3666	3788
3667	3789	cRadio tab = GetCurrentTab();
3668	3790
3669		- if (tab.undoindex == 0)
	3791	+ if (copy.versionindex == 0)
3670	3792	{
3671	3793	java.awt.Toolkit.getDefaultToolkit().beep();
3672		- return;
	3794	+ return false;
3673	3795	}
3674	3796
3675		- 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)
3676	3824	{
3677		- Save();
3678		- tab.undoindex -= 1;
	3825	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3826	+ return false;
3679	3827	}
3680	3828
3681		- tab.undoindex -= 1;
	3829	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3830	+
	3831	+ return true;
	3832	+ }
3682	3833
3683		- 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;
3684	3849	}
3685	3850
3686	3851	public void Redo()
3687	3852	{
	3853	+ // Option?
	3854	+ Replace();
	3855	+
3688	3856	cRadio tab = GetCurrentTab();
3689	3857
3690		- if (tab.graphs[tab.undoindex + 1] == null)
	3858	+ if (copy.versions[copy.versionindex + 1] == null)
3691	3859	{
3692	3860	java.awt.Toolkit.getDefaultToolkit().beep();
3693	3861	return;
3694	3862	}
3695	3863
3696		- tab.undoindex += 1;
	3864	+ copy.versionindex += 1;
3697	3865
3698		- 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;
3699	3870	}
3700	3871
3701	3872	void ImportGFD()
..	..	@@ -3991,9 +4162,25 @@
3991	4162	//copy.Touch();
3992	4163	}
3993	4164
	4165	+ cNumberSlider versionSlider;
	4166	+
3994	4167	public void stateChanged(ChangeEvent e)
3995	4168	{
3996	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	+ }
3997	4184
3998	4185	if (freezematerial)
3999	4186	{
..	..	@@ -4342,7 +4529,7 @@
4342	4529
4343	4530	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4344	4531	{
4345		- if (Globals.SAVEONMAKE) // && resetmodel)
	4532	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4346	4533	Save();
4347	4534	//Tween.set(thing, 0).target(1).start(tweenManager);
4348	4535	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4584,7 +4771,9 @@
4584	4771	readobj.ResetDisplayList();
4585	4772	} catch (Exception e)
4586	4773	{
4587		- //e.printStackTrace();
	4774	+ if (!e.toString().contains("GZIP"))
	4775	+ e.printStackTrace();
	4776	+
4588	4777	try
4589	4778	{
4590	4779	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4658,12 +4847,14 @@
4658	4847
4659	4848	if (readobj != null)
4660	4849	{
4661		- if (Globals.SAVEONMAKE)
4662		- Save();
	4850	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4851	+ // Save();
4663	4852	try
4664	4853	{
4665	4854	//readobj.deepCopySelf(copy);
4666	4855	copy.clear(); // june 2014
	4856	+ copy.skyboxname = readobj.skyboxname;
	4857	+ copy.skyboxext = readobj.skyboxext;
4667	4858	for (int i = 0; i < readobj.size(); i++)
4668	4859	{
4669	4860	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4704,6 +4895,7 @@
4704	4895	}
4705	4896	} catch (ClassCastException e)
4706	4897	{
	4898	+ e.printStackTrace();
4707	4899	assert (false);
4708	4900	Composite c = (Composite) copy;
4709	4901	c.children.clear();
..	..	@@ -4714,13 +4906,24 @@
4714	4906	c.addChild(csg);
4715	4907	}
4716	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	+
4717	4920	ResetModel();
4718	4921	copy.HardTouch(); // recompile?
4719	4922	refreshContents();
4720	4923	}
4721	4924	}
4722	4925
4723		- void load() // throws ClassNotFoundException
	4926	+ void Open() // throws ClassNotFoundException
4724	4927	{
4725	4928	if (Grafreed.standAlone)
4726	4929	{
..	..	@@ -4823,6 +5026,7 @@
4823	5026	//ps.print(buffer.toString());
4824	5027	} catch (IOException e)
4825	5028	{
	5029	+ e.printStackTrace();
4826	5030	}
4827	5031	}
4828	5032
..	..	@@ -5005,7 +5209,7 @@
5005	5209	MenuBar menuBar;
5006	5210	Menu fileMenu;
5007	5211	MenuItem newItem;
5008		- MenuItem loadItem;
	5212	+ MenuItem openItem;
5009	5213	MenuItem saveItem;
5010	5214	MenuItem saveAsItem;
5011	5215	MenuItem exportAsItem;
..	..	@@ -5028,6 +5232,7 @@
5028	5232	CheckboxMenuItem toggleSwitchItem;
5029	5233	CheckboxMenuItem toggleRootItem;
5030	5234	CheckboxMenuItem animationItem;
	5235	+ MenuItem archiveItem;
5031	5236	CheckboxMenuItem toggleHandleItem;
5032	5237	CheckboxMenuItem togglePaintItem;
5033	5238	JSplitPane mainPanel;