~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
..	..	@@ -309,7 +307,7 @@
309	307	//localCopy.parent = null;
310	308
311	309	frame = new JFrame();
312		- frame.setUndecorated(true);
	310	+ frame.setUndecorated(false);
313	311	objEditor = this;
314	312	this.callee = callee;
315	313
..	..	@@ -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
..	..	@@ -699,8 +705,8 @@
699	705	}
700	706	}
701	707
702		-static GraphicsDevice device = GraphicsEnvironment
703		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
704	710
705	711	Rectangle keeprect;
706	712	cRadio radio;
..	..	@@ -741,10 +747,11 @@
741	747	else
742	748	{
743	749	keeprect = frame.getBounds();
744		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
745		- Dimension rect2 = frame.getToolkit().getScreenSize();
746		- 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);
747	753	// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
748	755	}
749	756
750	757	maximized ^= true;
..	..	@@ -758,12 +765,17 @@
758	765
759	766	void ToggleFullScreen()
760	767	{
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
761	770	cameraView.ToggleFullScreen();
762	771
763	772	if (!CameraPane.FULLSCREEN)
764	773	{
765	774	device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
766	777	frame.validate();
	778	+ frame.setVisible(true);
767	779
768	780	//frame.setVisible(false);
769	781	// frame.removeNotify();
..	..	@@ -774,7 +786,7 @@
774	786	// X frame.getContentPane().remove(/"Center",/bigThree);
775	787	// X framePanel.add(bigThree);
776	788	// X frame.getContentPane().add(/"Center",/framePanel);
777		- framePanel.setDividerLocation(1);
	789	+ framePanel.setDividerLocation(46);
778	790
779	791	//frame.setVisible(true);
780	792	radio.layout = keepButton;
..	..	@@ -789,8 +801,12 @@
789	801	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
790	802	// frame.getToolkit().getScreenSize().height);
791	803	//frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
792	807	device.setFullScreenWindow(frame);
793	808	frame.validate();
	809	+ frame.setVisible(true);
794	810	// frame.removeNotify();
795	811	// frame.setUndecorated(true);
796	812	// frame.addNotify();
..	..	@@ -805,6 +821,28 @@
805	821	}
806	822	frame.validate();
807	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	+ }
808	846
809	847	private JTextPane createTextPane()
810	848	{
..	..	@@ -936,7 +974,7 @@
936	974	// NumberSlider vDivsField;
937	975	// JCheckBox endcaps;
938	976	JCheckBox liveCB;
939		- JCheckBox selectCB;
	977	+ JCheckBox selectableCB;
940	978	JCheckBox hideCB;
941	979	JCheckBox link2masterCB;
942	980	JCheckBox markCB;
..	..	@@ -1148,13 +1186,16 @@
1148	1186
1149	1187	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1150	1188	liveCB.setToolTipText("Animate object");
1151		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1152		- selectCB.setToolTipText("Make object selectable");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
1153	1191	// Return();
	1192	+
1154	1193	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1155	1194	hideCB.setToolTipText("Hide object");
1156	1195	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1157	1196	markCB.setToolTipText("As animation target transform");
	1197	+
	1198	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1158	1199
1159	1200	setupPanel2 = new cGridBag().setVertical(false);
1160	1201
..	..	@@ -1164,10 +1205,11 @@
1164	1205	randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1165	1206	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1166	1207
	1208	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1209	+ link2masterCB.setToolTipText("Attach to support");
	1210	+
1167	1211	if (Globals.ADVANCED)
1168	1212	{
1169		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1170		- link2masterCB.setToolTipText("Attach to support");
1171	1213	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1172	1214	speedupCB.setToolTipText("Option motion capture");
1173	1215	}
..	..	@@ -1441,6 +1483,7 @@
1441	1483	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1442	1484	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1443	1485	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1486	+ //XYZPanel.setName("XYZ");
1444	1487
1445	1488	/*
1446	1489	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1478,13 +1521,23 @@
1478	1521	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1479	1522	//tmp.setName("Edit");
1480	1523	objectPanel.add(materialPanel);
	1524	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1481	1525	// JPanel north = new JPanel(new BorderLayout());
1482	1526	// north.setName("Edit");
1483	1527	// north.add(ctrlPanel, BorderLayout.NORTH);
1484	1528	// objectPanel.add(north);
1485	1529	objectPanel.add(editPanel);
1486		- 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	+
1487	1539	objectPanel.add(toolboxPanel);
	1540	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1488	1541
1489	1542	/*
1490	1543	aConstraints.gridx = 0;
..	..	@@ -1505,7 +1558,7 @@
1505	1558	scrollpane.addMouseWheelListener(this); // Default not fast enough
1506	1559
1507	1560	/JTabbedPane/ scenePanel = new cGridBag();
1508		- scenePanel.preferredWidth = 6;
	1561	+ scenePanel.preferredWidth = 5;
1509	1562
1510	1563	JTabbedPane tabbedPane = new JTabbedPane();
1511	1564	tabbedPane.add(scrollpane);
..	..	@@ -1581,9 +1634,9 @@
1581	1634	/**/
1582	1635
1583	1636	bigThree = new cGridBag();
1584		- bigThree.addComponent(scenePanel);
1585	1637	bigThree.addComponent(centralPanel);
1586		- bigThree.addComponent(XYZPanel);
	1638	+ bigThree.addComponent(scenePanel);
	1639	+ //bigThree.addComponent(XYZPanel);
1587	1640
1588	1641	// // SIDE EFFECT!!!
1589	1642	// aConstraints.gridx = 0;
..	..	@@ -1592,9 +1645,9 @@
1592	1645	// aConstraints.gridheight = 1;
1593	1646
1594	1647	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1595		- framePanel.setContinuousLayout(true);
1596		- framePanel.setOneTouchExpandable(true);
1597		- framePanel.setDividerLocation(0.8);
	1648	+ framePanel.setContinuousLayout(false);
	1649	+ framePanel.setOneTouchExpandable(false);
	1650	+ //.setDividerLocation(0.8);
1598	1651	//framePanel.setDividerSize(15);
1599	1652	//framePanel.setResizeWeight(0.15);
1600	1653	framePanel.setName("Frame");
..	..	@@ -1613,12 +1666,13 @@
1613	1666
1614	1667	frame.setSize(1280, 860);
1615	1668
1616		- frame.validate();
1617		- frame.setVisible(true);
1618		-
1619	1669	cameraView.requestFocusInWindow();
1620	1670
1621	1671	gridPanel.setDividerLocation(1.0);
	1672	+
	1673	+ frame.validate();
	1674	+
	1675	+ frame.setVisible(true);
1622	1676
1623	1677	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1624	1678	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1965,8 +2019,9 @@
1965	2019	// 3D models
1966	2020	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1967	2021	{
1968		- lastConverter = new com.jmex.model.converters.MaxToJme();
1969		- LoadFile(filename, lastConverter);
	2022	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2023	+ //LoadFile(filename, lastConverter);
	2024	+ LoadObjFile(filename); // New 3ds loader
1970	2025	continue;
1971	2026	}
1972	2027	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2692,6 +2747,7 @@
2692	2747	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2693	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2694	2749	}
	2750	+
2695	2751	//cJME.count++;
2696	2752	//cJME.count %= 12;
2697	2753	if (gc)
..	..	@@ -2875,6 +2931,7 @@
2875	2931	}
2876	2932	}
2877	2933	}
	2934	+
2878	2935	cFileSystemPane FSPane;
2879	2936
2880	2937	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2928,6 +2985,7 @@
2928	2985	}
2929	2986	}
2930	2987	}
	2988	+
2931	2989	freezematerial = false;
2932	2990	}
2933	2991
..	..	@@ -3195,7 +3253,7 @@
3195	3253	{
3196	3254	copy.live ^= true;
3197	3255	return;
3198		- } else if (event.getSource() == selectCB)
	3256	+ } else if (event.getSource() == selectableCB)
3199	3257	{
3200	3258	copy.dontselect ^= true;
3201	3259	return;
..	..	@@ -3380,9 +3438,9 @@
3380	3438	{
3381	3439	Close();
3382	3440	//return true;
3383		- } else if (source == loadItem)
	3441	+ } else if (source == openItem)
3384	3442	{
3385		- load();
	3443	+ Open();
3386	3444	//return true;
3387	3445	} else if (source == newItem)
3388	3446	{
..	..	@@ -3407,6 +3465,10 @@
3407	3465	{
3408	3466	generatePOV();
3409	3467	//return true;
	3468	+ } else if (event.getSource() == archiveItem)
	3469	+ {
	3470	+ cTools.Archive(frame);
	3471	+ return;
3410	3472	} else if (source == zBufferItem)
3411	3473	{
3412	3474	try
..	..	@@ -3458,8 +3520,8 @@
3458	3520	try
3459	3521	{
3460	3522	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3461		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3462		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3523	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3524	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3463	3525
3464	3526	Object3D parent = o.parent;
3465	3527	o.parent = null;
..	..	@@ -3470,10 +3532,14 @@
3470	3532
3471	3533	out.flush();
3472	3534
3473		- zstream.close();
	3535	+ baos //zstream
	3536	+ .close();
3474	3537	out.close();
3475	3538
3476		- return baos.toByteArray();
	3539	+ byte[] bytes = baos.toByteArray();
	3540	+
	3541	+ System.out.println("save #bytes = " + bytes.length);
	3542	+ return bytes;
3477	3543	} catch (Exception e)
3478	3544	{
3479	3545	System.err.println(e);
..	..	@@ -3483,13 +3549,16 @@
3483	3549
3484	3550	static public Object Uncompress(byte[] bytes)
3485	3551	{
3486		- System.out.println("#bytes = " + bytes.length);
	3552	+ System.out.println("restore #bytes = " + bytes.length);
3487	3553	try
3488	3554	{
3489	3555	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3490		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3491		- ObjectInputStream in = new ObjectInputStream(istream);
	3556	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3557	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3492	3558	Object obj = in.readObject();
	3559	+
	3560	+ bais //istream
	3561	+ .close();
3493	3562	in.close();
3494	3563
3495	3564	return obj;
..	..	@@ -3544,33 +3613,67 @@
3544	3613	return null;
3545	3614	}
3546	3615
3547		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3548	3616
3549	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)
3550	3642	{
3551	3643	System.err.println("Save");
3552	3644
3553	3645	cRadio tab = GetCurrentTab();
3554	3646
3555		- boolean temp = CameraPane.SWITCH;
3556		- CameraPane.SWITCH = false;
	3647	+ byte[] compress = CompressCopy();
3557	3648
3558		- copy.ExtractBigData(hashtable);
	3649	+ boolean thesame = false;
3559	3650
3560		- 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	+ }
3561	3656
3562	3657	//EditorFrame.m_MainFrame.requestFocusInWindow();
3563		- 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	+ }
3564	3668
3565		- copy.RestoreBigData(hashtable);
	3669	+ //copy.RestoreBigData(versiontable);
3566	3670
3567		- CameraPane.SWITCH = temp;
3568		-
3569	3671	//assert(hashtable.isEmpty());
3570	3672
3571		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3673	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3572	3674	{
3573		- tab.graphs[i] = null;
	3675	+ //tab.user[i] = false;
	3676	+ copy.versions[i] = null;
3574	3677	}
3575	3678
3576	3679	SetUndoStates();
..	..	@@ -3580,7 +3683,7 @@
3580	3683	{
3581	3684	try
3582	3685	{
3583		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3686	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3584	3687	ObjectOutputStream p = new ObjectOutputStream(ostream);
3585	3688
3586	3689	p.writeObject(copy);
..	..	@@ -3593,6 +3696,8 @@
3593	3696	e.printStackTrace();
3594	3697	}
3595	3698	}
	3699	+
	3700	+ return !thesame;
3596	3701	}
3597	3702
3598	3703	void CopyChanged(Object3D obj)
..	..	@@ -3602,7 +3707,7 @@
3602	3707	boolean temp = CameraPane.SWITCH;
3603	3708	CameraPane.SWITCH = false;
3604	3709
3605		- copy.ExtractBigData(hashtable);
	3710	+ copy.ExtractBigData(versiontable);
3606	3711
3607	3712	copy.clear();
3608	3713
..	..	@@ -3611,7 +3716,7 @@
3611	3716	copy.add(obj.get(i));
3612	3717	}
3613	3718
3614		- copy.RestoreBigData(hashtable);
	3719	+ copy.RestoreBigData(versiontable);
3615	3720
3616	3721	CameraPane.SWITCH = temp;
3617	3722
..	..	@@ -3639,52 +3744,129 @@
3639	3744	}
3640	3745
3641	3746	cButton undoButton;
	3747	+ cButton restoreButton;
	3748	+ cButton replaceButton;
3642	3749	cButton redoButton;
3643	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	+
3644	3766	void SetUndoStates()
3645	3767	{
3646	3768	cRadio tab = GetCurrentTab();
3647	3769
3648		- undoButton.setEnabled(tab.undoindex > 0);
3649		- 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;
3650	3780	}
3651	3781
3652		- public void Undo()
	3782	+ public boolean Undo()
3653	3783	{
	3784	+ // Option?
	3785	+ Replace();
	3786	+
3654	3787	System.err.println("Undo");
3655	3788
3656	3789	cRadio tab = GetCurrentTab();
3657	3790
3658		- if (tab.undoindex == 0)
	3791	+ if (copy.versionindex == 0)
3659	3792	{
3660	3793	java.awt.Toolkit.getDefaultToolkit().beep();
3661		- return;
	3794	+ return false;
3662	3795	}
3663	3796
3664		- 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)
3665	3824	{
3666		- Save();
3667		- tab.undoindex -= 1;
	3825	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3826	+ return false;
3668	3827	}
3669	3828
3670		- tab.undoindex -= 1;
	3829	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3830	+
	3831	+ return true;
	3832	+ }
3671	3833
3672		- 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;
3673	3849	}
3674	3850
3675	3851	public void Redo()
3676	3852	{
	3853	+ // Option?
	3854	+ Replace();
	3855	+
3677	3856	cRadio tab = GetCurrentTab();
3678	3857
3679		- if (tab.graphs[tab.undoindex + 1] == null)
	3858	+ if (copy.versions[copy.versionindex + 1] == null)
3680	3859	{
3681	3860	java.awt.Toolkit.getDefaultToolkit().beep();
3682	3861	return;
3683	3862	}
3684	3863
3685		- tab.undoindex += 1;
	3864	+ copy.versionindex += 1;
3686	3865
3687		- 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;
3688	3870	}
3689	3871
3690	3872	void ImportGFD()
..	..	@@ -3980,9 +4162,25 @@
3980	4162	//copy.Touch();
3981	4163	}
3982	4164
	4165	+ cNumberSlider versionSlider;
	4166	+
3983	4167	public void stateChanged(ChangeEvent e)
3984	4168	{
3985	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	+ }
3986	4184
3987	4185	if (freezematerial)
3988	4186	{
..	..	@@ -4331,7 +4529,7 @@
4331	4529
4332	4530	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4333	4531	{
4334		- if (Globals.SAVEONMAKE) // && resetmodel)
	4532	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4335	4533	Save();
4336	4534	//Tween.set(thing, 0).target(1).start(tweenManager);
4337	4535	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4573,7 +4771,9 @@
4573	4771	readobj.ResetDisplayList();
4574	4772	} catch (Exception e)
4575	4773	{
4576		- //e.printStackTrace();
	4774	+ if (!e.toString().contains("GZIP"))
	4775	+ e.printStackTrace();
	4776	+
4577	4777	try
4578	4778	{
4579	4779	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4647,12 +4847,14 @@
4647	4847
4648	4848	if (readobj != null)
4649	4849	{
4650		- if (Globals.SAVEONMAKE)
4651		- Save();
	4850	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4851	+ // Save();
4652	4852	try
4653	4853	{
4654	4854	//readobj.deepCopySelf(copy);
4655	4855	copy.clear(); // june 2014
	4856	+ copy.skyboxname = readobj.skyboxname;
	4857	+ copy.skyboxext = readobj.skyboxext;
4656	4858	for (int i = 0; i < readobj.size(); i++)
4657	4859	{
4658	4860	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4693,6 +4895,7 @@
4693	4895	}
4694	4896	} catch (ClassCastException e)
4695	4897	{
	4898	+ e.printStackTrace();
4696	4899	assert (false);
4697	4900	Composite c = (Composite) copy;
4698	4901	c.children.clear();
..	..	@@ -4703,13 +4906,24 @@
4703	4906	c.addChild(csg);
4704	4907	}
4705	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	+
4706	4920	ResetModel();
4707	4921	copy.HardTouch(); // recompile?
4708	4922	refreshContents();
4709	4923	}
4710	4924	}
4711	4925
4712		- void load() // throws ClassNotFoundException
	4926	+ void Open() // throws ClassNotFoundException
4713	4927	{
4714	4928	if (Grafreed.standAlone)
4715	4929	{
..	..	@@ -4812,6 +5026,7 @@
4812	5026	//ps.print(buffer.toString());
4813	5027	} catch (IOException e)
4814	5028	{
	5029	+ e.printStackTrace();
4815	5030	}
4816	5031	}
4817	5032
..	..	@@ -4994,7 +5209,7 @@
4994	5209	MenuBar menuBar;
4995	5210	Menu fileMenu;
4996	5211	MenuItem newItem;
4997		- MenuItem loadItem;
	5212	+ MenuItem openItem;
4998	5213	MenuItem saveItem;
4999	5214	MenuItem saveAsItem;
5000	5215	MenuItem exportAsItem;
..	..	@@ -5017,6 +5232,7 @@
5017	5232	CheckboxMenuItem toggleSwitchItem;
5018	5233	CheckboxMenuItem toggleRootItem;
5019	5234	CheckboxMenuItem animationItem;
	5235	+ MenuItem archiveItem;
5020	5236	CheckboxMenuItem toggleHandleItem;
5021	5237	CheckboxMenuItem togglePaintItem;
5022	5238	JSplitPane mainPanel;