~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -38,64 +41,78 @@
38	41	JFrame frame;
39	42
40	43	static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
41	52
42	53	cButton GetButton(String name, boolean border)
43	54	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
53	63	}
54	64
55	65	cToggleButton GetToggleButton(String name, boolean border)
56	66	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
66	69	}
67	70
68	71	cCheckBox GetCheckBox(String name, boolean border)
69	72	{
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
70	79	try
71	80	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
74	97	}
75	98	catch (Exception e)
76	99	{
77		- return new cCheckBox(name, border);
	100	+ return null;
78	101	}
79	102	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	103	+
	104	+ BufferedImage GetImage(String name)
82	105	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	106	+ try
86	107	{
87		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88		- Graphics2D g = resized.createGraphics();
89		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92		- g.dispose();
93		-
94		- image = resized;
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
95	111	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
99	116	}
100	117
101	118	// SCRIPT
..	..	@@ -207,7 +224,7 @@
207	224
208	225	objEditor.ctrlPanel.remove(namePanel);
209	226
210		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
211	228	return;
212	229
213	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -279,6 +296,12 @@
279	296	client = inClient;
280	297	copy = client;
281	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
282	305	// "this" is not called: SetupUI2(objEditor);
283	306	}
284	307
..	..	@@ -292,6 +315,12 @@
292	315	client = inClient;
293	316	copy = client;
294	317
	318	+ if (copy.versions == null)
	319	+ {
	320	+ copy.versions = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
295	324	SetupUI2(callee.GetEditor());
296	325	}
297	326
..	..	@@ -306,7 +335,7 @@
306	335	//localCopy.parent = null;
307	336
308	337	frame = new JFrame();
309		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
310	339	objEditor = this;
311	340	this.callee = callee;
312	341
..	..	@@ -324,6 +353,12 @@
324	353	copy = localCopy;
325	354	copy.editWindow = this;
326	355
	356	+ if (copy.versions == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
327	362	SetupMenu();
328	363
329	364	//SetupName(objEditor); // new
..	..	@@ -337,12 +372,17 @@
337	372	return frame.action(event, obj);
338	373	}
339	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
340	380	void SetupMenu()
341	381	{
342	382	frame.setMenuBar(menuBar = new MenuBar());
343	383	menuBar.add(fileMenu = new Menu("File"));
344	384	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	386
347	387	//oe.menuBar.add(menu = new Menu("Include"));
348	388	Menu menu = new Menu("Import");
..	..	@@ -374,7 +414,7 @@
374	414	}
375	415
376	416	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
378	418	saveItem.addActionListener(this);
379	419	saveAsItem.addActionListener(this);
380	420	exportAsItem.addActionListener(this);
..	..	@@ -383,13 +423,40 @@
383	423	closeItem.addActionListener(this);
384	424
385	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
386	452	toolbarPanel = new JPanel();
387	453	toolbarPanel.setName("Toolbar");
	454	+
388	455	treePanel = new cGridBag();
389	456	treePanel.setName("Tree");
390	457
391	458	editPanel = new cGridBag().setVertical(true);
392		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
393	460
394	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
395	462
..	..	@@ -397,11 +464,11 @@
397	464	editPanel.add(editCommandsPanel);
398	465	editPanel.add(ctrlPanel);
399	466
400		- toolboxPanel = new cGridBag().setVertical(false);
401		- toolboxPanel.setName("Toolbox");
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
402	469
403	470	materialPanel = new cGridBag().setVertical(true);
404		- materialPanel.setName("Material");
	471	+ //materialPanel.setName("Material");
405	472
406	473	/JTextPane/
407	474	infoarea = createTextPane();
..	..	@@ -409,14 +476,15 @@
409	476
410	477	infoarea.setEditable(true);
411	478	SetText();
	479	+
412	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
413	481	// infoarea.setOpaque(false);
414	482	// //infoarea.setForeground(textcolor);
415	483	// TEXTAREA infoarea.setLineWrap(true);
416	484	// TEXTAREA infoarea.setWrapStyleWord(true);
417	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
418		- infoPanel.setPreferredSize(new Dimension(50, 200));
419		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
420	488	//infoPanel.setLayout(new BorderLayout());
421	489	//infoPanel.add(createTextPane());
422	490
..	..	@@ -427,7 +495,14 @@
427	495	mainPanel.setDividerSize(9);
428	496	mainPanel.setDividerLocation(0.5); //1.0);
429	497	mainPanel.setResizeWeight(0.5);
430		-
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
431	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432	507	//mainPanel.setLayout(new GridBagLayout());
433	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -658,8 +733,8 @@
658	733	}
659	734	}
660	735
661		-static GraphicsDevice device = GraphicsEnvironment
662		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
663	738
664	739	Rectangle keeprect;
665	740	cRadio radio;
..	..	@@ -680,10 +755,19 @@
680	755	void Minimize()
681	756	{
682	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
683	759	}
684	760
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
685	764	void Maximize()
686	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
687	771	if (maximized)
688	772	{
689	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -691,20 +775,36 @@
691	775	else
692	776	{
693	777	keeprect = frame.getBounds();
694		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
695		- Dimension rect2 = frame.getToolkit().getScreenSize();
696		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
697	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
698	783	}
699	784
700	785	maximized ^= true;
	786	+
	787	+ frame.validate();
701	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
702	793
703	794	void ToggleFullScreen()
704	795	{
705		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
706	801	{
707	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
708	808	//frame.setVisible(false);
709	809	// frame.removeNotify();
710	810	// frame.setUndecorated(false);
..	..	@@ -714,7 +814,7 @@
714	814	// X frame.getContentPane().remove(/"Center",/bigThree);
715	815	// X framePanel.add(bigThree);
716	816	// X frame.getContentPane().add(/"Center",/framePanel);
717		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
718	818
719	819	//frame.setVisible(true);
720	820	radio.layout = keepButton;
..	..	@@ -729,7 +829,12 @@
729	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
730	830	// frame.getToolkit().getScreenSize().height);
731	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
732	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
733	838	// frame.removeNotify();
734	839	// frame.setUndecorated(true);
735	840	// frame.addNotify();
..	..	@@ -742,9 +847,31 @@
742	847	radio.layout.doClick();
743	848	//frame.setVisible(true);
744	849	}
745		-
746		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
747	851	}
	852	+
	853	+ private Object3D CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versions;
	862	+ copy.versions = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versions = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
748	875
749	876	private JTextPane createTextPane()
750	877	{
..	..	@@ -876,7 +1003,7 @@
876	1003	// NumberSlider vDivsField;
877	1004	// JCheckBox endcaps;
878	1005	JCheckBox liveCB;
879		- JCheckBox selectCB;
	1006	+ JCheckBox selectableCB;
880	1007	JCheckBox hideCB;
881	1008	JCheckBox link2masterCB;
882	1009	JCheckBox markCB;
..	..	@@ -884,7 +1011,12 @@
884	1011	JCheckBox speedupCB;
885	1012	JCheckBox rewindCB;
886	1013	JCheckBox flipVCB;
	1014	+
	1015	+ cCheckBox toggleTextureCB;
	1016	+ cCheckBox toggleSwitchCB;
	1017	+
887	1018	JComboBox texresMenu;
	1019	+
888	1020	JButton resetButton;
889	1021	JButton stepButton;
890	1022	JButton stepAllButton;
..	..	@@ -1071,38 +1203,42 @@
1071	1203	namePanel = new cGridBag();
1072	1204
1073	1205	nameField = AddText(namePanel, copy.GetName());
1074		- namePanel.add(nameField);
	1206	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1075	1207	oe.ctrlPanel.add(namePanel);
1076	1208
1077	1209	oe.ctrlPanel.Return();
1078	1210
1079		- if (!GroupEditor.allparams)
	1211	+ if (!allparams)
1080	1212	return;
1081	1213
1082	1214	setupPanel = new cGridBag().setVertical(false);
1083	1215
1084	1216	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1085	1217	liveCB.setToolTipText("Animate object");
1086		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1087		- selectCB.setToolTipText("Make object selectable");
	1218	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1219	+ selectableCB.setToolTipText("Make object selectable");
1088	1220	// Return();
	1221	+
1089	1222	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1090	1223	hideCB.setToolTipText("Hide object");
1091	1224	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092		- markCB.setToolTipText("Set the animation target transform");
	1225	+ markCB.setToolTipText("As animation target transform");
	1226	+
	1227	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1093	1228
1094	1229	setupPanel2 = new cGridBag().setVertical(false);
1095	1230
1096	1231	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1097	1232	rewindCB.setToolTipText("Rewind animation");
1098	1233
1099		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1234	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1235	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1101	1236
	1237	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1238	+ link2masterCB.setToolTipText("Attach to support");
	1239	+
1102	1240	if (Globals.ADVANCED)
1103	1241	{
1104		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1105		- link2masterCB.setToolTipText("Attach to support");
1106	1242	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1107	1243	speedupCB.setToolTipText("Option motion capture");
1108	1244	}
..	..	@@ -1376,6 +1512,7 @@
1376	1512	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1377	1513	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1378	1514	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1515	+ //XYZPanel.setName("XYZ");
1379	1516
1380	1517	/*
1381	1518	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1412,14 +1549,30 @@
1412	1549
1413	1550	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1414	1551	//tmp.setName("Edit");
1415		- objectPanel.add(toolboxPanel);
1416	1552	objectPanel.add(materialPanel);
	1553	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1554	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1555	+
1417	1556	// JPanel north = new JPanel(new BorderLayout());
1418	1557	// north.setName("Edit");
1419	1558	// north.add(ctrlPanel, BorderLayout.NORTH);
1420	1559	// objectPanel.add(north);
1421	1560	objectPanel.add(editPanel);
1422		- objectPanel.add(infoPanel);
	1561	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1562	+ objectPanel.setToolTipTextAt(1, "Edit panel");
	1563	+
	1564	+ //if (Globals.ADVANCED)
	1565	+ objectPanel.add(infoPanel);
	1566	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1567	+ objectPanel.setToolTipTextAt(2, "Info panel");
	1568	+
	1569	+ objectPanel.add(XYZPanel);
	1570	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1571	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1572	+
	1573	+ objectPanel.add(toolboxPanel);
	1574	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1575	+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1423	1576
1424	1577	/*
1425	1578	aConstraints.gridx = 0;
..	..	@@ -1428,7 +1581,7 @@
1428	1581	aConstraints.gridy += 1;
1429	1582	aConstraints.gridwidth = 1;
1430	1583	mainPanel.add(objectPanel, aConstraints);
1431		- */
	1584	+ */
1432	1585
1433	1586	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1434	1587	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1440,14 +1593,12 @@
1440	1593	scrollpane.addMouseWheelListener(this); // Default not fast enough
1441	1594
1442	1595	/JTabbedPane/ scenePanel = new cGridBag();
1443		- scenePanel.preferredWidth = 6;
	1596	+ scenePanel.preferredWidth = 5;
1444	1597
1445	1598	JTabbedPane tabbedPane = new JTabbedPane();
1446	1599	tabbedPane.add(scrollpane);
1447	1600
1448		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1449		-
1450		- optionsPanel = new cGridBag().setVertical(true);
	1601	+ optionsPanel = new cGridBag().setVertical(false);
1451	1602
1452	1603	optionsPanel.setName("Options");
1453	1604
..	..	@@ -1455,6 +1606,8 @@
1455	1606
1456	1607	tabbedPane.add(optionsPanel);
1457	1608
	1609	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1610	+
1458	1611	scenePanel.add(tabbedPane);
1459	1612
1460	1613	/*
..	..	@@ -1518,7 +1671,7 @@
1518	1671	bigThree = new cGridBag();
1519	1672	bigThree.addComponent(scenePanel);
1520	1673	bigThree.addComponent(centralPanel);
1521		- bigThree.addComponent(XYZPanel);
	1674	+ //bigThree.addComponent(XYZPanel);
1522	1675
1523	1676	// // SIDE EFFECT!!!
1524	1677	// aConstraints.gridx = 0;
..	..	@@ -1527,9 +1680,9 @@
1527	1680	// aConstraints.gridheight = 1;
1528	1681
1529	1682	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1530		- framePanel.setContinuousLayout(true);
1531		- framePanel.setOneTouchExpandable(true);
1532		- framePanel.setDividerLocation(0.8);
	1683	+ framePanel.setContinuousLayout(false);
	1684	+ framePanel.setOneTouchExpandable(false);
	1685	+ //.setDividerLocation(0.8);
1533	1686	//framePanel.setDividerSize(15);
1534	1687	//framePanel.setResizeWeight(0.15);
1535	1688	framePanel.setName("Frame");
..	..	@@ -1547,16 +1700,18 @@
1547	1700	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1548	1701
1549	1702	frame.setSize(1280, 860);
1550		- frame.setVisible(true);
1551		-
	1703	+
1552	1704	cameraView.requestFocusInWindow();
1553	1705
1554	1706	gridPanel.setDividerLocation(1.0);
	1707	+
	1708	+ frame.validate();
	1709	+
	1710	+ frame.setVisible(true);
1555	1711
1556	1712	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1557	1713	frame.addWindowListener(new WindowAdapter()
1558	1714	{
1559		-
1560	1715	public void windowClosing(WindowEvent e)
1561	1716	{
1562	1717	Close();
..	..	@@ -1618,45 +1773,48 @@
1618	1773	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1619	1774
1620	1775	cGridBag colorSection = new cGridBag().setVertical(true);
	1776	+
	1777	+ cGridBag huepanel = new cGridBag();
	1778	+ cGridBag huelabel = new cGridBag();
	1779	+ huelabel.add(GetLabel("icons/hue.png", false));
	1780	+ huelabel.preferredWidth = 20;
	1781	+ huepanel.add(new cGridBag()); // Label
	1782	+ huepanel.add(huelabel); // Field/slider
	1783	+
	1784	+ huepanel.preferredHeight = 7;
	1785	+
	1786	+ colorSection.add(huepanel);
1621	1787
1622	1788	cGridBag color = new cGridBag();
1623		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1624		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1789	+
	1790	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1791	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1792	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1793	+
1626	1794	//colorField.preferredWidth = 200;
1627	1795	colorSection.add(color);
1628	1796
1629	1797	cGridBag modulation = new cGridBag();
1630	1798	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1631	1799	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1632		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1800	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1633	1801	colorSection.add(modulation);
1634	1802
	1803	+ cGridBag opacity = new cGridBag();
	1804	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1805	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1806	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1807	+ colorSection.add(opacity);
	1808	+
	1809	+ colorSection.add(GetSeparator());
	1810	+
1635	1811	cGridBag texture = new cGridBag();
1636	1812	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1637	1813	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638	1814	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1639	1815	colorSection.add(texture);
1640	1816
1641		- cGridBag anisoU = new cGridBag();
1642		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1643		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1644		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1645		- colorSection.add(anisoU);
1646		-
1647		- cGridBag anisoV = new cGridBag();
1648		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1649		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1650		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1651		- colorSection.add(anisoV);
1652		-
1653		- cGridBag shadowbias = new cGridBag();
1654		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1655		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1656		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1657		- colorSection.add(shadowbias);
1658		-
1659		- panel.add(new JSeparator());
	1817	+ panel.add(GetSeparator());
1660	1818
1661	1819	panel.add(colorSection);
1662	1820
..	..	@@ -1706,7 +1864,13 @@
1706	1864	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1707	1865	diffuseSection.add(fakedepth);
1708	1866
1709		- panel.add(new JSeparator());
	1867	+ cGridBag shadowbias = new cGridBag();
	1868	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1869	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1871	+ diffuseSection.add(shadowbias);
	1872	+
	1873	+ panel.add(GetSeparator());
1710	1874
1711	1875	panel.add(diffuseSection);
1712	1876
..	..	@@ -1756,42 +1920,48 @@
1756	1920	// aConstraints.gridy += 1;
1757	1921	// aConstraints.gridwidth = 1;
1758	1922
	1923	+ cGridBag anisoU = new cGridBag();
	1924	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1925	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1926	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1927	+ specularSection.add(anisoU);
1759	1928
1760		- panel.add(new JSeparator());
	1929	+ cGridBag anisoV = new cGridBag();
	1930	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1931	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1932	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1933	+ specularSection.add(anisoV);
	1934	+
	1935	+
	1936	+ panel.add(GetSeparator());
1761	1937
1762	1938	panel.add(specularSection);
1763	1939
1764	1940	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1765	1941
1766		- cGridBag globalSection = new cGridBag().setVertical(true);
	1942	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1767	1943
1768	1944	cGridBag camera = new cGridBag();
1769	1945	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1770	1946	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1771	1947	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1772		- globalSection.add(camera);
	1948	+ colorSection.add(camera);
1773	1949
1774	1950	cGridBag ambient = new cGridBag();
1775	1951	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1776	1952	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1777	1953	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1778		- globalSection.add(ambient);
	1954	+ colorSection.add(ambient);
1779	1955
1780	1956	cGridBag backlit = new cGridBag();
1781	1957	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1782	1958	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1783	1959	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1784		- globalSection.add(backlit);
	1960	+ colorSection.add(backlit);
1785	1961
1786		- cGridBag opacity = new cGridBag();
1787		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1788		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1790		- globalSection.add(opacity);
1791		-
1792		- panel.add(new JSeparator());
	1962	+ //panel.add(new JSeparator());
1793	1963
1794		- panel.add(globalSection);
	1964	+ //panel.add(globalSection);
1795	1965
1796	1966	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	1967
..	..	@@ -1833,7 +2003,7 @@
1833	2003	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1834	2004	textureSection.add(opacityPower);
1835	2005
1836		- panel.add(new JSeparator());
	2006	+ panel.add(GetSeparator());
1837	2007
1838	2008	panel.add(textureSection);
1839	2009
..	..	@@ -1898,8 +2068,9 @@
1898	2068	// 3D models
1899	2069	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1900	2070	{
1901		- lastConverter = new com.jmex.model.converters.MaxToJme();
1902		- LoadFile(filename, lastConverter);
	2071	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2072	+ //LoadFile(filename, lastConverter);
	2073	+ LoadObjFile(filename); // New 3ds loader
1903	2074	continue;
1904	2075	}
1905	2076	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2625,6 +2796,7 @@
2625	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2626	2797	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2627	2798	}
	2799	+
2628	2800	//cJME.count++;
2629	2801	//cJME.count %= 12;
2630	2802	if (gc)
..	..	@@ -2808,6 +2980,7 @@
2808	2980	}
2809	2981	}
2810	2982	}
	2983	+
2811	2984	cFileSystemPane FSPane;
2812	2985
2813	2986	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2861,11 +3034,14 @@
2861	3034	}
2862	3035	}
2863	3036	}
	3037	+
2864	3038	freezematerial = false;
2865	3039	}
2866	3040
2867	3041	void SetMaterial(Object3D object)
2868	3042	{
	3043	+ latestObject = object;
	3044	+
2869	3045	cMaterial mat = object.material;
2870	3046
2871	3047	if (mat == null)
..	..	@@ -2977,12 +3153,17 @@
2977	3153	// }
2978	3154
2979	3155	/**/
2980		- if (deselect)
	3156	+ if (deselect \|\| child == null)
2981	3157	{
2982	3158	//group.deselectAll();
2983	3159	//freeze = true;
2984	3160	GetTree().clearSelection();
2985	3161	//freeze = false;
	3162	+
	3163	+ if (child == null)
	3164	+ {
	3165	+ return;
	3166	+ }
2986	3167	}
2987	3168
2988	3169	//group.addSelectee(child);
..	..	@@ -3051,7 +3232,7 @@
3051	3232	cameraView.ToggleDL();
3052	3233	cameraView.repaint();
3053	3234	return;
3054		- } else if (event.getSource() == toggleTextureItem)
	3235	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3055	3236	{
3056	3237	cameraView.ToggleTexture();
3057	3238	// june 2013 copy.HardTouch();
..	..	@@ -3090,7 +3271,7 @@
3090	3271	frame.validate();
3091	3272
3092	3273	return;
3093		- } else if (event.getSource() == toggleSwitchItem)
	3274	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3094	3275	{
3095	3276	cameraView.ToggleSwitch();
3096	3277	cameraView.repaint();
..	..	@@ -3121,7 +3302,7 @@
3121	3302	{
3122	3303	copy.live ^= true;
3123	3304	return;
3124		- } else if (event.getSource() == selectCB)
	3305	+ } else if (event.getSource() == selectableCB)
3125	3306	{
3126	3307	copy.dontselect ^= true;
3127	3308	return;
..	..	@@ -3306,9 +3487,9 @@
3306	3487	{
3307	3488	Close();
3308	3489	//return true;
3309		- } else if (source == loadItem)
	3490	+ } else if (source == openItem)
3310	3491	{
3311		- load();
	3492	+ Open();
3312	3493	//return true;
3313	3494	} else if (source == newItem)
3314	3495	{
..	..	@@ -3333,6 +3514,10 @@
3333	3514	{
3334	3515	generatePOV();
3335	3516	//return true;
	3517	+ } else if (event.getSource() == archiveItem)
	3518	+ {
	3519	+ cTools.Archive(frame);
	3520	+ return;
3336	3521	} else if (source == zBufferItem)
3337	3522	{
3338	3523	try
..	..	@@ -3381,11 +3566,12 @@
3381	3566
3382	3567	static public byte[] Compress(Object3D o)
3383	3568	{
	3569	+ // Slower to actually compress.
3384	3570	try
3385	3571	{
3386	3572	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3387		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3388		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3573	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3574	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3389	3575
3390	3576	Object3D parent = o.parent;
3391	3577	o.parent = null;
..	..	@@ -3396,10 +3582,14 @@
3396	3582
3397	3583	out.flush();
3398	3584
3399		- zstream.close();
	3585	+ baos //zstream
	3586	+ .close();
3400	3587	out.close();
3401	3588
3402		- return baos.toByteArray();
	3589	+ byte[] bytes = baos.toByteArray();
	3590	+
	3591	+ System.out.println("save #bytes = " + bytes.length);
	3592	+ return bytes;
3403	3593	} catch (Exception e)
3404	3594	{
3405	3595	System.err.println(e);
..	..	@@ -3409,13 +3599,16 @@
3409	3599
3410	3600	static public Object Uncompress(byte[] bytes)
3411	3601	{
3412		- System.out.println("#bytes = " + bytes.length);
	3602	+ System.out.println("restore #bytes = " + bytes.length);
3413	3603	try
3414	3604	{
3415	3605	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3416		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3417		- ObjectInputStream in = new ObjectInputStream(istream);
	3606	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3607	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3418	3608	Object obj = in.readObject();
	3609	+
	3610	+ bais //istream
	3611	+ .close();
3419	3612	in.close();
3420	3613
3421	3614	return obj;
..	..	@@ -3470,39 +3663,76 @@
3470	3663	return null;
3471	3664	}
3472	3665
3473		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3474	3666
3475	3667	public void Save()
	3668	+ {
	3669	+ //Save(true);
	3670	+ Replace();
	3671	+ }
	3672	+
	3673	+ private boolean Equal(byte[] compress, byte[] name)
	3674	+ {
	3675	+ if (compress.length != name.length)
	3676	+ {
	3677	+ return false;
	3678	+ }
	3679	+
	3680	+ for (int i=compress.length; --i>=0;)
	3681	+ {
	3682	+ if (compress[i] != name[i])
	3683	+ return false;
	3684	+ }
	3685	+
	3686	+ return true;
	3687	+ }
	3688	+
	3689	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3690	+
	3691	+ public boolean Save(boolean user)
3476	3692	{
3477	3693	System.err.println("Save");
3478	3694
3479	3695	cRadio tab = GetCurrentTab();
3480	3696
3481		- boolean temp = CameraPane.SWITCH;
3482		- CameraPane.SWITCH = false;
	3697	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
3483	3698
3484		- copy.ExtractBigData(hashtable);
	3699	+ boolean thesame = false;
	3700	+
	3701	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3702	+// {
	3703	+// thesame = true;
	3704	+// }
3485	3705
3486	3706	//EditorFrame.m_MainFrame.requestFocusInWindow();
3487		- tab.graphs[tab.undoindex++] = Compress(copy);
3488		-
3489		- copy.RestoreBigData(hashtable);
3490		-
3491		- CameraPane.SWITCH = temp;
3492		-
3493		- //assert(hashtable.isEmpty());
3494		-
3495		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3707	+ if (!thesame)
3496	3708	{
3497		- tab.graphs[i] = null;
	3709	+ //tab.user[tab.versionindex] = user;
	3710	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3711	+
	3712	+ copy.versions[++copy.versionindex] = compress;
	3713	+
	3714	+ // if (increment)
	3715	+ // tab.versionindex++;
3498	3716	}
3499	3717
	3718	+ //copy.RestoreBigData(versiontable);
	3719	+
	3720	+ //assert(hashtable.isEmpty());
	3721	+
	3722	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3723	+ {
	3724	+ //tab.user[i] = false;
	3725	+ copy.versions[i] = null;
	3726	+ }
	3727	+
	3728	+ SetUndoStates();
	3729	+
3500	3730	// test save
3501	3731	if (false)
3502	3732	{
3503	3733	try
3504	3734	{
3505		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3735	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3506	3736	ObjectOutputStream p = new ObjectOutputStream(ostream);
3507	3737
3508	3738	p.writeObject(copy);
..	..	@@ -3515,23 +3745,30 @@
3515	3745	e.printStackTrace();
3516	3746	}
3517	3747	}
	3748	+
	3749	+ return !thesame;
3518	3750	}
3519	3751
3520	3752	void CopyChanged(Object3D obj)
3521	3753	{
	3754	+ SetUndoStates();
	3755	+
3522	3756	boolean temp = CameraPane.SWITCH;
3523	3757	CameraPane.SWITCH = false;
3524	3758
3525		- copy.ExtractBigData(hashtable);
	3759	+ copy.ExtractBigData(versiontable);
3526	3760
3527	3761	copy.clear();
3528	3762
	3763	+ copy.skyboxname = obj.skyboxname;
	3764	+ copy.skyboxext = obj.skyboxext;
	3765	+
3529	3766	for (int i=0; i<obj.Size(); i++)
3530	3767	{
3531	3768	copy.add(obj.get(i));
3532	3769	}
3533	3770
3534		- copy.RestoreBigData(hashtable);
	3771	+ copy.RestoreBigData(versiontable);
3535	3772
3536	3773	CameraPane.SWITCH = temp;
3537	3774
..	..	@@ -3558,42 +3795,131 @@
3558	3795	refreshContents();
3559	3796	}
3560	3797
3561		- public void Undo()
	3798	+ cButton undoButton;
	3799	+ cButton restoreButton;
	3800	+ cButton replaceButton;
	3801	+ cButton redoButton;
	3802	+
	3803	+ boolean muteSlider;
	3804	+
	3805	+ int VersionCount()
3562	3806	{
	3807	+ int count = 0;
	3808	+
	3809	+ for (int i = copy.versions.length; --i >= 0;)
	3810	+ {
	3811	+ if (copy.versions[i] != null)
	3812	+ count++;
	3813	+ }
	3814	+
	3815	+ return count;
	3816	+ }
	3817	+
	3818	+ void SetUndoStates()
	3819	+ {
	3820	+ cRadio tab = GetCurrentTab();
	3821	+
	3822	+ restoreButton.setEnabled(copy.versionindex != -1);
	3823	+ replaceButton.setEnabled(copy.versionindex != -1);
	3824	+
	3825	+ undoButton.setEnabled(copy.versionindex > 0);
	3826	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3827	+
	3828	+ muteSlider = true;
	3829	+ versionSlider.setMaximum(VersionCount() - 1);
	3830	+ versionSlider.setInteger(copy.versionindex);
	3831	+ muteSlider = false;
	3832	+ }
	3833	+
	3834	+ public boolean Undo()
	3835	+ {
	3836	+ // Option?
	3837	+ Replace();
	3838	+
3563	3839	System.err.println("Undo");
3564	3840
3565	3841	cRadio tab = GetCurrentTab();
3566	3842
3567		- if (tab.undoindex == 0)
	3843	+ if (copy.versionindex == 0)
3568	3844	{
3569	3845	java.awt.Toolkit.getDefaultToolkit().beep();
3570		- return;
	3846	+ return false;
3571	3847	}
3572	3848
3573		- if (tab.graphs[tab.undoindex] == null)
	3849	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3850	+// {
	3851	+// if (Save(false))
	3852	+// tab.versionindex -= 1;
	3853	+// else
	3854	+// {
	3855	+// if (tab.versionindex <= 0)
	3856	+// return false;
	3857	+// else
	3858	+// tab.versionindex -= 1;
	3859	+// }
	3860	+// }
	3861	+
	3862	+ copy.versionindex -= 1;
	3863	+
	3864	+ CopyChanged((Object3D)copy.versions[copy.versionindex]);
	3865	+
	3866	+ return true;
	3867	+ }
	3868	+
	3869	+ public boolean Restore()
	3870	+ {
	3871	+ System.err.println("Restore");
	3872	+
	3873	+ cRadio tab = GetCurrentTab();
	3874	+
	3875	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3574	3876	{
3575		- Save();
3576		- tab.undoindex -= 1;
	3877	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3878	+ return false;
3577	3879	}
3578	3880
3579		- tab.undoindex -= 1;
	3881	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3882	+ CopyChanged(copy.versions[copy.versionindex]);
	3883	+
	3884	+ return true;
	3885	+ }
3580	3886
3581		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3887	+ public boolean Replace()
	3888	+ {
	3889	+ System.err.println("Replace");
	3890	+
	3891	+ cRadio tab = GetCurrentTab();
	3892	+
	3893	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3894	+ {
	3895	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3896	+ return false;
	3897	+ }
	3898	+
	3899	+ copy.versions[copy.versionindex] = CompressCopy();
	3900	+
	3901	+ return true;
3582	3902	}
3583	3903
3584	3904	public void Redo()
3585	3905	{
	3906	+ // Option?
	3907	+ Replace();
	3908	+
3586	3909	cRadio tab = GetCurrentTab();
3587	3910
3588		- if (tab.graphs[tab.undoindex + 1] == null)
	3911	+ if (copy.versions[copy.versionindex + 1] == null)
3589	3912	{
3590	3913	java.awt.Toolkit.getDefaultToolkit().beep();
3591	3914	return;
3592	3915	}
3593	3916
3594		- tab.undoindex += 1;
	3917	+ copy.versionindex += 1;
3595	3918
3596		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3919	+ CopyChanged(copy.versions[copy.versionindex]);
	3920	+
	3921	+ //if (!tab.user[tab.versionindex])
	3922	+ // tab.graphs[tab.versionindex] = null;
3597	3923	}
3598	3924
3599	3925	void ImportGFD()
..	..	@@ -3889,9 +4215,25 @@
3889	4215	//copy.Touch();
3890	4216	}
3891	4217
	4218	+ cNumberSlider versionSlider;
	4219	+
3892	4220	public void stateChanged(ChangeEvent e)
3893	4221	{
3894	4222	// assert(false);
	4223	+ if (e.getSource() == versionSlider)
	4224	+ {
	4225	+ if (muteSlider)
	4226	+ return;
	4227	+
	4228	+ int version = versionSlider.getInteger();
	4229	+
	4230	+ if (copy.versions[version] != null)
	4231	+ {
	4232	+ CopyChanged(copy.versions[copy.versionindex = version]);
	4233	+ }
	4234	+
	4235	+ return;
	4236	+ }
3895	4237
3896	4238	if (freezematerial)
3897	4239	{
..	..	@@ -4240,7 +4582,7 @@
4240	4582
4241	4583	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4242	4584	{
4243		- if (Globals.SAVEONMAKE) // && resetmodel)
	4585	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4244	4586	Save();
4245	4587	//Tween.set(thing, 0).target(1).start(tweenManager);
4246	4588	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4482,7 +4824,9 @@
4482	4824	readobj.ResetDisplayList();
4483	4825	} catch (Exception e)
4484	4826	{
4485		- //e.printStackTrace();
	4827	+ if (!e.toString().contains("GZIP"))
	4828	+ e.printStackTrace();
	4829	+
4486	4830	try
4487	4831	{
4488	4832	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4556,12 +4900,14 @@
4556	4900
4557	4901	if (readobj != null)
4558	4902	{
4559		- if (Globals.SAVEONMAKE)
4560		- Save();
	4903	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4904	+ // Save();
4561	4905	try
4562	4906	{
4563	4907	//readobj.deepCopySelf(copy);
4564	4908	copy.clear(); // june 2014
	4909	+ copy.skyboxname = readobj.skyboxname;
	4910	+ copy.skyboxext = readobj.skyboxext;
4565	4911	for (int i = 0; i < readobj.size(); i++)
4566	4912	{
4567	4913	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4602,6 +4948,7 @@
4602	4948	}
4603	4949	} catch (ClassCastException e)
4604	4950	{
	4951	+ e.printStackTrace();
4605	4952	assert (false);
4606	4953	Composite c = (Composite) copy;
4607	4954	c.children.clear();
..	..	@@ -4612,13 +4959,24 @@
4612	4959	c.addChild(csg);
4613	4960	}
4614	4961
	4962	+ copy.versions = readobj.versions;
	4963	+ copy.versionindex = readobj.versionindex;
	4964	+
	4965	+ if (copy.versions == null)
	4966	+ {
	4967	+ copy.versions = new Object3D[100];
	4968	+ copy.versionindex = -1;
	4969	+ }
	4970	+
	4971	+ //? SetUndoStates();
	4972	+
4615	4973	ResetModel();
4616	4974	copy.HardTouch(); // recompile?
4617	4975	refreshContents();
4618	4976	}
4619	4977	}
4620	4978
4621		- void load() // throws ClassNotFoundException
	4979	+ void Open() // throws ClassNotFoundException
4622	4980	{
4623	4981	if (Grafreed.standAlone)
4624	4982	{
..	..	@@ -4721,6 +5079,7 @@
4721	5079	//ps.print(buffer.toString());
4722	5080	} catch (IOException e)
4723	5081	{
	5082	+ e.printStackTrace();
4724	5083	}
4725	5084	}
4726	5085
..	..	@@ -4735,6 +5094,8 @@
4735	5094	String filename = browser.getFile();
4736	5095	if (filename != null && filename.length() > 0)
4737	5096	{
	5097	+ if (!filename.endsWith(".gfd"))
	5098	+ filename += ".gfd";
4738	5099	lastname = browser.getDirectory() + filename;
4739	5100	save();
4740	5101	}
..	..	@@ -4901,7 +5262,7 @@
4901	5262	MenuBar menuBar;
4902	5263	Menu fileMenu;
4903	5264	MenuItem newItem;
4904		- MenuItem loadItem;
	5265	+ MenuItem openItem;
4905	5266	MenuItem saveItem;
4906	5267	MenuItem saveAsItem;
4907	5268	MenuItem exportAsItem;
..	..	@@ -4924,6 +5285,7 @@
4924	5285	CheckboxMenuItem toggleSwitchItem;
4925	5286	CheckboxMenuItem toggleRootItem;
4926	5287	CheckboxMenuItem animationItem;
	5288	+ MenuItem archiveItem;
4927	5289	CheckboxMenuItem toggleHandleItem;
4928	5290	CheckboxMenuItem togglePaintItem;
4929	5291	JSplitPane mainPanel;
..	..	@@ -4945,6 +5307,8 @@
4945	5307	cGridBag optionsPanel;
4946	5308
4947	5309	JTabbedPane objectPanel;
	5310	+ boolean materialFlushed;
	5311	+ Object3D latestObject;
4948	5312
4949	5313	cGridBag XYZPanel;
4950	5314