~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -37,6 +41,79 @@
37	41	JFrame frame;
38	42
39	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	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	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);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	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;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
40	117
41	118	// SCRIPT
42	119
..	..	@@ -147,7 +224,7 @@
147	224
148	225	objEditor.ctrlPanel.remove(namePanel);
149	226
150		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
151	228	return;
152	229
153	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -171,7 +248,7 @@
171	248
172	249	objEditor.ctrlPanel.remove(setupPanel);
173	250	objEditor.ctrlPanel.remove(setupPanel2);
174		- objEditor.ctrlPanel.remove(commandsPanel);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
175	252	objEditor.ctrlPanel.remove(pushPanel);
176	253	//objEditor.ctrlPanel.remove(fillPanel);
177	254
..	..	@@ -219,6 +296,12 @@
219	296	client = inClient;
220	297	copy = client;
221	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new byte[100][];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
222	305	// "this" is not called: SetupUI2(objEditor);
223	306	}
224	307
..	..	@@ -232,6 +315,12 @@
232	315	client = inClient;
233	316	copy = client;
234	317
	318	+ if (copy.versions == null)
	319	+ {
	320	+ copy.versions = new byte[100][];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
235	324	SetupUI2(callee.GetEditor());
236	325	}
237	326
..	..	@@ -246,7 +335,7 @@
246	335	//localCopy.parent = null;
247	336
248	337	frame = new JFrame();
249		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
250	339	objEditor = this;
251	340	this.callee = callee;
252	341
..	..	@@ -264,6 +353,12 @@
264	353	copy = localCopy;
265	354	copy.editWindow = this;
266	355
	356	+ if (copy.versions == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
267	362	SetupMenu();
268	363
269	364	//SetupName(objEditor); // new
..	..	@@ -277,12 +372,17 @@
277	372	return frame.action(event, obj);
278	373	}
279	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	+
280	380	void SetupMenu()
281	381	{
282	382	frame.setMenuBar(menuBar = new MenuBar());
283	383	menuBar.add(fileMenu = new Menu("File"));
284	384	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	386
287	387	//oe.menuBar.add(menu = new Menu("Include"));
288	388	Menu menu = new Menu("Import");
..	..	@@ -314,7 +414,7 @@
314	414	}
315	415
316	416	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
318	418	saveItem.addActionListener(this);
319	419	saveAsItem.addActionListener(this);
320	420	exportAsItem.addActionListener(this);
..	..	@@ -323,28 +423,68 @@
323	423	closeItem.addActionListener(this);
324	424
325	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	+
326	452	toolbarPanel = new JPanel();
327	453	toolbarPanel.setName("Toolbar");
	454	+
328	455	treePanel = new cGridBag();
329	456	treePanel.setName("Tree");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
330	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331		- ctrlPanel.setName("Edit");
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
332	470	materialPanel = new cGridBag().setVertical(true);
333		- materialPanel.setName("Material");
	471	+ //materialPanel.setName("Material");
	472	+
334	473	/JTextPane/
335	474	infoarea = createTextPane();
336	475	doc = infoarea.getStyledDocument();
337	476
338	477	infoarea.setEditable(true);
339	478	SetText();
	479	+
340	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
341	481	// infoarea.setOpaque(false);
342	482	// //infoarea.setForeground(textcolor);
343	483	// TEXTAREA infoarea.setLineWrap(true);
344	484	// TEXTAREA infoarea.setWrapStyleWord(true);
345	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
346		- infoPanel.setPreferredSize(new Dimension(50, 200));
347		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
348	488	//infoPanel.setLayout(new BorderLayout());
349	489	//infoPanel.add(createTextPane());
350	490
..	..	@@ -355,7 +495,14 @@
355	495	mainPanel.setDividerSize(9);
356	496	mainPanel.setDividerLocation(0.5); //1.0);
357	497	mainPanel.setResizeWeight(0.5);
358		-
	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	+
359	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
360	507	//mainPanel.setLayout(new GridBagLayout());
361	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -586,8 +733,8 @@
586	733	}
587	734	}
588	735
589		-static GraphicsDevice device = GraphicsEnvironment
590		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
591	738
592	739	Rectangle keeprect;
593	740	cRadio radio;
..	..	@@ -603,13 +750,24 @@
603	750
604	751	boolean maximized;
605	752
	753	+ cButton fullscreenLayout;
	754	+
606	755	void Minimize()
607	756	{
608	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
609	759	}
610	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={}
611	764	void Maximize()
612	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
613	771	if (maximized)
614	772	{
615	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -617,20 +775,36 @@
617	775	else
618	776	{
619	777	keeprect = frame.getBounds();
620		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
621		- Dimension rect2 = frame.getToolkit().getScreenSize();
622		- 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);
623	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
624	783	}
625	784
626	785	maximized ^= true;
	786	+
	787	+ frame.validate();
627	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
628	793
629	794	void ToggleFullScreen()
630	795	{
631		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
632	801	{
633	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
634	808	//frame.setVisible(false);
635	809	// frame.removeNotify();
636	810	// frame.setUndecorated(false);
..	..	@@ -640,7 +814,7 @@
640	814	// X frame.getContentPane().remove(/"Center",/bigThree);
641	815	// X framePanel.add(bigThree);
642	816	// X frame.getContentPane().add(/"Center",/framePanel);
643		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
644	818
645	819	//frame.setVisible(true);
646	820	radio.layout = keepButton;
..	..	@@ -655,7 +829,12 @@
655	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
656	830	// frame.getToolkit().getScreenSize().height);
657	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
658	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
659	838	// frame.removeNotify();
660	839	// frame.setUndecorated(true);
661	840	// frame.addNotify();
..	..	@@ -664,13 +843,34 @@
664	843	// X frame.getContentPane().add(/"Center",/bigThree);
665	844	framePanel.setDividerLocation(0);
666	845
667		- radio.layout = twoButton;
	846	+ radio.layout = fullscreenLayout;
668	847	radio.layout.doClick();
669	848	//frame.setVisible(true);
670	849	}
671		-
672		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
673	851	}
	852	+
	853	+ private byte[] CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ byte[] versions[] = copy.versions;
	862	+ copy.versions = null;
	863	+
	864	+ byte[] compress = Compress(copy);
	865	+
	866	+ copy.versions = versions;
	867	+
	868	+ copy.RestoreBigData(versiontable);
	869	+
	870	+ CameraPane.SWITCH = temp;
	871	+
	872	+ return compress;
	873	+ }
674	874
675	875	private JTextPane createTextPane()
676	876	{
..	..	@@ -802,7 +1002,7 @@
802	1002	// NumberSlider vDivsField;
803	1003	// JCheckBox endcaps;
804	1004	JCheckBox liveCB;
805		- JCheckBox selectCB;
	1005	+ JCheckBox selectableCB;
806	1006	JCheckBox hideCB;
807	1007	JCheckBox link2masterCB;
808	1008	JCheckBox markCB;
..	..	@@ -810,7 +1010,12 @@
810	1010	JCheckBox speedupCB;
811	1011	JCheckBox rewindCB;
812	1012	JCheckBox flipVCB;
	1013	+
	1014	+ cCheckBox toggleTextureCB;
	1015	+ cCheckBox toggleSwitchCB;
	1016	+
813	1017	JComboBox texresMenu;
	1018	+
814	1019	JButton resetButton;
815	1020	JButton stepButton;
816	1021	JButton stepAllButton;
..	..	@@ -819,10 +1024,13 @@
819	1024	JButton fasterButton;
820	1025	JButton remarkButton;
821	1026
	1027	+ cGridBag editPanel;
	1028	+ cGridBag editCommandsPanel;
	1029	+
822	1030	cGridBag namePanel;
823	1031	cGridBag setupPanel;
824	1032	cGridBag setupPanel2;
825		- cGridBag commandsPanel;
	1033	+ cGridBag objectCommandsPanel;
826	1034	cGridBag pushPanel;
827	1035	cGridBag fillPanel;
828	1036
..	..	@@ -994,38 +1202,42 @@
994	1202	namePanel = new cGridBag();
995	1203
996	1204	nameField = AddText(namePanel, copy.GetName());
997		- namePanel.add(nameField);
	1205	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
998	1206	oe.ctrlPanel.add(namePanel);
999	1207
1000	1208	oe.ctrlPanel.Return();
1001	1209
1002		- if (!GroupEditor.allparams)
	1210	+ if (!allparams)
1003	1211	return;
1004	1212
1005	1213	setupPanel = new cGridBag().setVertical(false);
1006	1214
1007	1215	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1008	1216	liveCB.setToolTipText("Animate object");
1009		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1010		- selectCB.setToolTipText("Make object selectable");
	1217	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1218	+ selectableCB.setToolTipText("Make object selectable");
1011	1219	// Return();
	1220	+
1012	1221	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1013	1222	hideCB.setToolTipText("Hide object");
1014	1223	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1015		- markCB.setToolTipText("Set the animation target transform");
	1224	+ markCB.setToolTipText("As animation target transform");
	1225	+
	1226	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1016	1227
1017	1228	setupPanel2 = new cGridBag().setVertical(false);
1018	1229
1019	1230	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1020	1231	rewindCB.setToolTipText("Rewind animation");
1021	1232
1022		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1233	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1234	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1024	1235
	1236	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1237	+ link2masterCB.setToolTipText("Attach to support");
	1238	+
1025	1239	if (Globals.ADVANCED)
1026	1240	{
1027		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1028		- link2masterCB.setToolTipText("Attach to support");
1029	1241	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1030	1242	speedupCB.setToolTipText("Option motion capture");
1031	1243	}
..	..	@@ -1035,23 +1247,23 @@
1035	1247	oe.ctrlPanel.add(setupPanel2);
1036	1248	oe.ctrlPanel.Return();
1037	1249
1038		- commandsPanel = new cGridBag().setVertical(false);
	1250	+ objectCommandsPanel = new cGridBag().setVertical(false);
1039	1251
1040		- resetButton = AddButton(commandsPanel, "Reset");
	1252	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1041	1253	resetButton.setToolTipText("Jump to frame zero");
1042		- stepButton = AddButton(commandsPanel, "Step");
	1254	+ stepButton = AddButton(objectCommandsPanel, "Step");
1043	1255	stepButton.setToolTipText("Step one frame");
1044	1256	// resetAllButton = AddButton(oe, "Reset All");
1045	1257	// stepAllButton = AddButton(oe, "Step All");
1046	1258	// Return();
1047		- slowerButton = AddButton(commandsPanel, "Slow");
	1259	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1048	1260	slowerButton.setToolTipText("Decrease animation speed");
1049		- fasterButton = AddButton(commandsPanel, "Fast");
	1261	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1050	1262	fasterButton.setToolTipText("Increase animation speed");
1051		- remarkButton = AddButton(commandsPanel, "Remark");
	1263	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1052	1264	remarkButton.setToolTipText("Set the current transform as the target");
1053	1265
1054		- oe.ctrlPanel.add(commandsPanel);
	1266	+ oe.ctrlPanel.add(objectCommandsPanel);
1055	1267	oe.ctrlPanel.Return();
1056	1268
1057	1269	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1299,6 +1511,7 @@
1299	1511	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1300	1512	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1301	1513	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1514	+ //XYZPanel.setName("XYZ");
1302	1515
1303	1516	/*
1304	1517	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1336,12 +1549,29 @@
1336	1549	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1337	1550	//tmp.setName("Edit");
1338	1551	objectPanel.add(materialPanel);
	1552	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1553	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1554	+
1339	1555	// JPanel north = new JPanel(new BorderLayout());
1340	1556	// north.setName("Edit");
1341	1557	// north.add(ctrlPanel, BorderLayout.NORTH);
1342	1558	// objectPanel.add(north);
1343		- objectPanel.add(ctrlPanel);
1344		- objectPanel.add(infoPanel);
	1559	+ objectPanel.add(editPanel);
	1560	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1561	+ objectPanel.setToolTipTextAt(1, "Edit panel");
	1562	+
	1563	+ //if (Globals.ADVANCED)
	1564	+ objectPanel.add(infoPanel);
	1565	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1566	+ objectPanel.setToolTipTextAt(2, "Info panel");
	1567	+
	1568	+ objectPanel.add(XYZPanel);
	1569	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1570	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1571	+
	1572	+ objectPanel.add(toolboxPanel);
	1573	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1574	+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1345	1575
1346	1576	/*
1347	1577	aConstraints.gridx = 0;
..	..	@@ -1350,7 +1580,7 @@
1350	1580	aConstraints.gridy += 1;
1351	1581	aConstraints.gridwidth = 1;
1352	1582	mainPanel.add(objectPanel, aConstraints);
1353		- */
	1583	+ */
1354	1584
1355	1585	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1356	1586	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1362,14 +1592,12 @@
1362	1592	scrollpane.addMouseWheelListener(this); // Default not fast enough
1363	1593
1364	1594	/JTabbedPane/ scenePanel = new cGridBag();
1365		- scenePanel.preferredWidth = 6;
	1595	+ scenePanel.preferredWidth = 5;
1366	1596
1367	1597	JTabbedPane tabbedPane = new JTabbedPane();
1368	1598	tabbedPane.add(scrollpane);
1369	1599
1370		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1371		-
1372		- optionsPanel = new cGridBag().setVertical(true);
	1600	+ optionsPanel = new cGridBag().setVertical(false);
1373	1601
1374	1602	optionsPanel.setName("Options");
1375	1603
..	..	@@ -1377,6 +1605,8 @@
1377	1605
1378	1606	tabbedPane.add(optionsPanel);
1379	1607
	1608	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1609	+
1380	1610	scenePanel.add(tabbedPane);
1381	1611
1382	1612	/*
..	..	@@ -1440,7 +1670,7 @@
1440	1670	bigThree = new cGridBag();
1441	1671	bigThree.addComponent(scenePanel);
1442	1672	bigThree.addComponent(centralPanel);
1443		- bigThree.addComponent(XYZPanel);
	1673	+ //bigThree.addComponent(XYZPanel);
1444	1674
1445	1675	// // SIDE EFFECT!!!
1446	1676	// aConstraints.gridx = 0;
..	..	@@ -1449,9 +1679,9 @@
1449	1679	// aConstraints.gridheight = 1;
1450	1680
1451	1681	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1452		- framePanel.setContinuousLayout(true);
1453		- framePanel.setOneTouchExpandable(true);
1454		- framePanel.setDividerLocation(0.8);
	1682	+ framePanel.setContinuousLayout(false);
	1683	+ framePanel.setOneTouchExpandable(false);
	1684	+ //.setDividerLocation(0.8);
1455	1685	//framePanel.setDividerSize(15);
1456	1686	//framePanel.setResizeWeight(0.15);
1457	1687	framePanel.setName("Frame");
..	..	@@ -1469,16 +1699,18 @@
1469	1699	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1470	1700
1471	1701	frame.setSize(1280, 860);
1472		- frame.setVisible(true);
1473		-
	1702	+
1474	1703	cameraView.requestFocusInWindow();
1475	1704
1476	1705	gridPanel.setDividerLocation(1.0);
	1706	+
	1707	+ frame.validate();
	1708	+
	1709	+ frame.setVisible(true);
1477	1710
1478	1711	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1479	1712	frame.addWindowListener(new WindowAdapter()
1480	1713	{
1481		-
1482	1714	public void windowClosing(WindowEvent e)
1483	1715	{
1484	1716	Close();
..	..	@@ -1540,45 +1772,48 @@
1540	1772	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1541	1773
1542	1774	cGridBag colorSection = new cGridBag().setVertical(true);
	1775	+
	1776	+ cGridBag huepanel = new cGridBag();
	1777	+ cGridBag huelabel = new cGridBag();
	1778	+ huelabel.add(GetLabel("icons/hue.png", false));
	1779	+ huelabel.preferredWidth = 20;
	1780	+ huepanel.add(new cGridBag()); // Label
	1781	+ huepanel.add(huelabel); // Field/slider
	1782	+
	1783	+ huepanel.preferredHeight = 7;
	1784	+
	1785	+ colorSection.add(huepanel);
1543	1786
1544	1787	cGridBag color = new cGridBag();
1545		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1546		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1788	+
	1789	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1790	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1791	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1792	+
1548	1793	//colorField.preferredWidth = 200;
1549	1794	colorSection.add(color);
1550	1795
1551	1796	cGridBag modulation = new cGridBag();
1552	1797	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1553	1798	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1799	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1555	1800	colorSection.add(modulation);
1556	1801
	1802	+ cGridBag opacity = new cGridBag();
	1803	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1804	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1805	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1806	+ colorSection.add(opacity);
	1807	+
	1808	+ colorSection.add(GetSeparator());
	1809	+
1557	1810	cGridBag texture = new cGridBag();
1558	1811	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1559	1812	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1560	1813	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1561	1814	colorSection.add(texture);
1562	1815
1563		- cGridBag anisoU = new cGridBag();
1564		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1565		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1567		- colorSection.add(anisoU);
1568		-
1569		- cGridBag anisoV = new cGridBag();
1570		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1571		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573		- colorSection.add(anisoV);
1574		-
1575		- cGridBag shadowbias = new cGridBag();
1576		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1577		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1579		- colorSection.add(shadowbias);
1580		-
1581		- panel.add(new JSeparator());
	1816	+ panel.add(GetSeparator());
1582	1817
1583	1818	panel.add(colorSection);
1584	1819
..	..	@@ -1628,7 +1863,13 @@
1628	1863	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1629	1864	diffuseSection.add(fakedepth);
1630	1865
1631		- panel.add(new JSeparator());
	1866	+ cGridBag shadowbias = new cGridBag();
	1867	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1868	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1869	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1870	+ diffuseSection.add(shadowbias);
	1871	+
	1872	+ panel.add(GetSeparator());
1632	1873
1633	1874	panel.add(diffuseSection);
1634	1875
..	..	@@ -1678,42 +1919,48 @@
1678	1919	// aConstraints.gridy += 1;
1679	1920	// aConstraints.gridwidth = 1;
1680	1921
	1922	+ cGridBag anisoU = new cGridBag();
	1923	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1924	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1925	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1926	+ specularSection.add(anisoU);
1681	1927
1682		- panel.add(new JSeparator());
	1928	+ cGridBag anisoV = new cGridBag();
	1929	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1930	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1931	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1932	+ specularSection.add(anisoV);
	1933	+
	1934	+
	1935	+ panel.add(GetSeparator());
1683	1936
1684	1937	panel.add(specularSection);
1685	1938
1686	1939	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1687	1940
1688		- cGridBag globalSection = new cGridBag().setVertical(true);
	1941	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1689	1942
1690	1943	cGridBag camera = new cGridBag();
1691	1944	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1692	1945	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693	1946	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1694		- globalSection.add(camera);
	1947	+ colorSection.add(camera);
1695	1948
1696	1949	cGridBag ambient = new cGridBag();
1697	1950	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1698	1951	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699	1952	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1700		- globalSection.add(ambient);
	1953	+ colorSection.add(ambient);
1701	1954
1702	1955	cGridBag backlit = new cGridBag();
1703	1956	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1704	1957	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	1958	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(backlit);
	1959	+ colorSection.add(backlit);
1707	1960
1708		- cGridBag opacity = new cGridBag();
1709		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1710		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1712		- globalSection.add(opacity);
1713		-
1714		- panel.add(new JSeparator());
	1961	+ //panel.add(new JSeparator());
1715	1962
1716		- panel.add(globalSection);
	1963	+ //panel.add(globalSection);
1717	1964
1718	1965	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1719	1966
..	..	@@ -1755,7 +2002,7 @@
1755	2002	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1756	2003	textureSection.add(opacityPower);
1757	2004
1758		- panel.add(new JSeparator());
	2005	+ panel.add(GetSeparator());
1759	2006
1760	2007	panel.add(textureSection);
1761	2008
..	..	@@ -1820,8 +2067,9 @@
1820	2067	// 3D models
1821	2068	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1822	2069	{
1823		- lastConverter = new com.jmex.model.converters.MaxToJme();
1824		- LoadFile(filename, lastConverter);
	2070	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2071	+ //LoadFile(filename, lastConverter);
	2072	+ LoadObjFile(filename); // New 3ds loader
1825	2073	continue;
1826	2074	}
1827	2075	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2547,6 +2795,7 @@
2547	2795	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2548	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2549	2797	}
	2798	+
2550	2799	//cJME.count++;
2551	2800	//cJME.count %= 12;
2552	2801	if (gc)
..	..	@@ -2730,6 +2979,7 @@
2730	2979	}
2731	2980	}
2732	2981	}
	2982	+
2733	2983	cFileSystemPane FSPane;
2734	2984
2735	2985	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2783,11 +3033,14 @@
2783	3033	}
2784	3034	}
2785	3035	}
	3036	+
2786	3037	freezematerial = false;
2787	3038	}
2788	3039
2789	3040	void SetMaterial(Object3D object)
2790	3041	{
	3042	+ latestObject = object;
	3043	+
2791	3044	cMaterial mat = object.material;
2792	3045
2793	3046	if (mat == null)
..	..	@@ -2899,12 +3152,17 @@
2899	3152	// }
2900	3153
2901	3154	/**/
2902		- if (deselect)
	3155	+ if (deselect \|\| child == null)
2903	3156	{
2904	3157	//group.deselectAll();
2905	3158	//freeze = true;
2906	3159	GetTree().clearSelection();
2907	3160	//freeze = false;
	3161	+
	3162	+ if (child == null)
	3163	+ {
	3164	+ return;
	3165	+ }
2908	3166	}
2909	3167
2910	3168	//group.addSelectee(child);
..	..	@@ -2973,7 +3231,7 @@
2973	3231	cameraView.ToggleDL();
2974	3232	cameraView.repaint();
2975	3233	return;
2976		- } else if (event.getSource() == toggleTextureItem)
	3234	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2977	3235	{
2978	3236	cameraView.ToggleTexture();
2979	3237	// june 2013 copy.HardTouch();
..	..	@@ -3012,7 +3270,7 @@
3012	3270	frame.validate();
3013	3271
3014	3272	return;
3015		- } else if (event.getSource() == toggleSwitchItem)
	3273	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3016	3274	{
3017	3275	cameraView.ToggleSwitch();
3018	3276	cameraView.repaint();
..	..	@@ -3043,7 +3301,7 @@
3043	3301	{
3044	3302	copy.live ^= true;
3045	3303	return;
3046		- } else if (event.getSource() == selectCB)
	3304	+ } else if (event.getSource() == selectableCB)
3047	3305	{
3048	3306	copy.dontselect ^= true;
3049	3307	return;
..	..	@@ -3228,9 +3486,9 @@
3228	3486	{
3229	3487	Close();
3230	3488	//return true;
3231		- } else if (source == loadItem)
	3489	+ } else if (source == openItem)
3232	3490	{
3233		- load();
	3491	+ Open();
3234	3492	//return true;
3235	3493	} else if (source == newItem)
3236	3494	{
..	..	@@ -3255,6 +3513,10 @@
3255	3513	{
3256	3514	generatePOV();
3257	3515	//return true;
	3516	+ } else if (event.getSource() == archiveItem)
	3517	+ {
	3518	+ cTools.Archive(frame);
	3519	+ return;
3258	3520	} else if (source == zBufferItem)
3259	3521	{
3260	3522	try
..	..	@@ -3306,8 +3568,8 @@
3306	3568	try
3307	3569	{
3308	3570	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3309		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3310		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3571	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3572	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3311	3573
3312	3574	Object3D parent = o.parent;
3313	3575	o.parent = null;
..	..	@@ -3318,10 +3580,14 @@
3318	3580
3319	3581	out.flush();
3320	3582
3321		- zstream.close();
	3583	+ baos //zstream
	3584	+ .close();
3322	3585	out.close();
3323	3586
3324		- return baos.toByteArray();
	3587	+ byte[] bytes = baos.toByteArray();
	3588	+
	3589	+ System.out.println("save #bytes = " + bytes.length);
	3590	+ return bytes;
3325	3591	} catch (Exception e)
3326	3592	{
3327	3593	System.err.println(e);
..	..	@@ -3331,13 +3597,16 @@
3331	3597
3332	3598	static public Object Uncompress(byte[] bytes)
3333	3599	{
3334		- System.out.println("#bytes = " + bytes.length);
	3600	+ System.out.println("restore #bytes = " + bytes.length);
3335	3601	try
3336	3602	{
3337	3603	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3338		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3339		- ObjectInputStream in = new ObjectInputStream(istream);
	3604	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3605	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3340	3606	Object obj = in.readObject();
	3607	+
	3608	+ bais //istream
	3609	+ .close();
3341	3610	in.close();
3342	3611
3343	3612	return obj;
..	..	@@ -3392,37 +3661,77 @@
3392	3661	return null;
3393	3662	}
3394	3663
3395		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3396	3664
3397	3665	public void Save()
3398	3666	{
	3667	+ //Save(true);
	3668	+ Replace();
	3669	+ }
	3670	+
	3671	+ private boolean Equal(byte[] compress, byte[] name)
	3672	+ {
	3673	+ if (compress.length != name.length)
	3674	+ {
	3675	+ return false;
	3676	+ }
	3677	+
	3678	+ for (int i=compress.length; --i>=0;)
	3679	+ {
	3680	+ if (compress[i] != name[i])
	3681	+ return false;
	3682	+ }
	3683	+
	3684	+ return true;
	3685	+ }
	3686	+
	3687	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3688	+
	3689	+ public boolean Save(boolean user)
	3690	+ {
	3691	+ System.err.println("Save");
	3692	+
3399	3693	cRadio tab = GetCurrentTab();
3400	3694
3401		- boolean temp = CameraPane.SWITCH;
3402		- CameraPane.SWITCH = false;
	3695	+ byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
3403	3696
3404		- copy.ExtractBigData(hashtable);
	3697	+ boolean thesame = false;
	3698	+
	3699	+ // Quick heuristic using length. Works only when stream is compressed.
	3700	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3701	+ {
	3702	+ thesame = true;
	3703	+ }
3405	3704
3406	3705	//EditorFrame.m_MainFrame.requestFocusInWindow();
3407		- tab.graphs[tab.undoindex++] = Compress(copy);
3408		-
3409		- copy.RestoreBigData(hashtable);
3410		-
3411		- CameraPane.SWITCH = temp;
3412		-
3413		- //assert(hashtable.isEmpty());
3414		-
3415		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3706	+ if (!thesame)
3416	3707	{
3417		- tab.graphs[i] = null;
	3708	+ //tab.user[tab.versionindex] = user;
	3709	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3710	+
	3711	+ copy.versions[++copy.versionindex] = compress;
	3712	+
	3713	+ // if (increment)
	3714	+ // tab.versionindex++;
3418	3715	}
3419	3716
	3717	+ //copy.RestoreBigData(versiontable);
	3718	+
	3719	+ //assert(hashtable.isEmpty());
	3720	+
	3721	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3722	+ {
	3723	+ //tab.user[i] = false;
	3724	+ copy.versions[i] = null;
	3725	+ }
	3726	+
	3727	+ SetUndoStates();
	3728	+
3420	3729	// test save
3421	3730	if (false)
3422	3731	{
3423	3732	try
3424	3733	{
3425		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3734	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3426	3735	ObjectOutputStream p = new ObjectOutputStream(ostream);
3427	3736
3428	3737	p.writeObject(copy);
..	..	@@ -3435,23 +3744,30 @@
3435	3744	e.printStackTrace();
3436	3745	}
3437	3746	}
	3747	+
	3748	+ return !thesame;
3438	3749	}
3439	3750
3440	3751	void CopyChanged(Object3D obj)
3441	3752	{
	3753	+ SetUndoStates();
	3754	+
3442	3755	boolean temp = CameraPane.SWITCH;
3443	3756	CameraPane.SWITCH = false;
3444	3757
3445		- copy.ExtractBigData(hashtable);
	3758	+ copy.ExtractBigData(versiontable);
3446	3759
3447	3760	copy.clear();
3448	3761
	3762	+ copy.skyboxname = obj.skyboxname;
	3763	+ copy.skyboxext = obj.skyboxext;
	3764	+
3449	3765	for (int i=0; i<obj.Size(); i++)
3450	3766	{
3451	3767	copy.add(obj.get(i));
3452	3768	}
3453	3769
3454		- copy.RestoreBigData(hashtable);
	3770	+ copy.RestoreBigData(versiontable);
3455	3771
3456	3772	CameraPane.SWITCH = temp;
3457	3773
..	..	@@ -3478,40 +3794,130 @@
3478	3794	refreshContents();
3479	3795	}
3480	3796
3481		- public void Undo()
	3797	+ cButton undoButton;
	3798	+ cButton restoreButton;
	3799	+ cButton replaceButton;
	3800	+ cButton redoButton;
	3801	+
	3802	+ boolean muteSlider;
	3803	+
	3804	+ int VersionCount()
	3805	+ {
	3806	+ int count = 0;
	3807	+
	3808	+ for (int i = copy.versions.length; --i >= 0;)
	3809	+ {
	3810	+ if (copy.versions[i] != null)
	3811	+ count++;
	3812	+ }
	3813	+
	3814	+ return count;
	3815	+ }
	3816	+
	3817	+ void SetUndoStates()
3482	3818	{
3483	3819	cRadio tab = GetCurrentTab();
3484	3820
3485		- if (tab.undoindex == 0)
	3821	+ restoreButton.setEnabled(copy.versionindex != -1);
	3822	+ replaceButton.setEnabled(copy.versionindex != -1);
	3823	+
	3824	+ undoButton.setEnabled(copy.versionindex > 0);
	3825	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3826	+
	3827	+ muteSlider = true;
	3828	+ versionSlider.setMaximum(VersionCount() - 1);
	3829	+ versionSlider.setInteger(copy.versionindex);
	3830	+ muteSlider = false;
	3831	+ }
	3832	+
	3833	+ public boolean Undo()
	3834	+ {
	3835	+ // Option?
	3836	+ Replace();
	3837	+
	3838	+ System.err.println("Undo");
	3839	+
	3840	+ cRadio tab = GetCurrentTab();
	3841	+
	3842	+ if (copy.versionindex == 0)
3486	3843	{
3487	3844	java.awt.Toolkit.getDefaultToolkit().beep();
3488		- return;
	3845	+ return false;
3489	3846	}
3490	3847
3491		- if (tab.graphs[tab.undoindex] == null)
	3848	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3849	+// {
	3850	+// if (Save(false))
	3851	+// tab.versionindex -= 1;
	3852	+// else
	3853	+// {
	3854	+// if (tab.versionindex <= 0)
	3855	+// return false;
	3856	+// else
	3857	+// tab.versionindex -= 1;
	3858	+// }
	3859	+// }
	3860	+
	3861	+ copy.versionindex -= 1;
	3862	+
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3864	+
	3865	+ return true;
	3866	+ }
	3867	+
	3868	+ public boolean Restore()
	3869	+ {
	3870	+ System.err.println("Restore");
	3871	+
	3872	+ cRadio tab = GetCurrentTab();
	3873	+
	3874	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3492	3875	{
3493		- Save();
3494		- tab.undoindex -= 1;
	3876	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3877	+ return false;
3495	3878	}
3496	3879
3497		- tab.undoindex -= 1;
	3880	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3881	+
	3882	+ return true;
	3883	+ }
3498	3884
3499		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3885	+ public boolean Replace()
	3886	+ {
	3887	+ System.err.println("Replace");
	3888	+
	3889	+ cRadio tab = GetCurrentTab();
	3890	+
	3891	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3892	+ {
	3893	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3894	+ return false;
	3895	+ }
	3896	+
	3897	+ copy.versions[copy.versionindex] = CompressCopy();
	3898	+
	3899	+ return true;
3500	3900	}
3501	3901
3502	3902	public void Redo()
3503	3903	{
	3904	+ // Option?
	3905	+ Replace();
	3906	+
3504	3907	cRadio tab = GetCurrentTab();
3505	3908
3506		- if (tab.graphs[tab.undoindex + 1] == null)
	3909	+ if (copy.versions[copy.versionindex + 1] == null)
3507	3910	{
3508	3911	java.awt.Toolkit.getDefaultToolkit().beep();
3509	3912	return;
3510	3913	}
3511	3914
3512		- tab.undoindex += 1;
	3915	+ copy.versionindex += 1;
3513	3916
3514		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3917	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3918	+
	3919	+ //if (!tab.user[tab.versionindex])
	3920	+ // tab.graphs[tab.versionindex] = null;
3515	3921	}
3516	3922
3517	3923	void ImportGFD()
..	..	@@ -3663,7 +4069,7 @@
3663	4069	assert false;
3664	4070	}
3665	4071
3666		- void EditSelection()
	4072	+ void EditSelection(boolean newWindow)
3667	4073	{
3668	4074	}
3669	4075
..	..	@@ -3807,9 +4213,25 @@
3807	4213	//copy.Touch();
3808	4214	}
3809	4215
	4216	+ cNumberSlider versionSlider;
	4217	+
3810	4218	public void stateChanged(ChangeEvent e)
3811	4219	{
3812	4220	// assert(false);
	4221	+ if (e.getSource() == versionSlider)
	4222	+ {
	4223	+ if (muteSlider)
	4224	+ return;
	4225	+
	4226	+ int version = versionSlider.getInteger();
	4227	+
	4228	+ if (copy.versions[version] != null)
	4229	+ {
	4230	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4231	+ }
	4232	+
	4233	+ return;
	4234	+ }
3813	4235
3814	4236	if (freezematerial)
3815	4237	{
..	..	@@ -4158,7 +4580,8 @@
4158	4580
4159	4581	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4160	4582	{
4161		- Save();
	4583	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4584	+ Save();
4162	4585	//Tween.set(thing, 0).target(1).start(tweenManager);
4163	4586	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4164	4587	// if (thing instanceof GenericJointDemo)
..	..	@@ -4245,6 +4668,12 @@
4245	4668	{
4246	4669	ResetModel();
4247	4670	Select(thing.GetTreePath(), true, false); // unselect... false);
	4671	+
	4672	+ if (thing.Size() == 0)
	4673	+ {
	4674	+ //EditSelection(false);
	4675	+ }
	4676	+
4248	4677	refreshContents();
4249	4678	}
4250	4679
..	..	@@ -4393,7 +4822,9 @@
4393	4822	readobj.ResetDisplayList();
4394	4823	} catch (Exception e)
4395	4824	{
4396		- //e.printStackTrace();
	4825	+ if (!e.toString().contains("GZIP"))
	4826	+ e.printStackTrace();
	4827	+
4397	4828	try
4398	4829	{
4399	4830	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4467,11 +4898,14 @@
4467	4898
4468	4899	if (readobj != null)
4469	4900	{
4470		- Save();
	4901	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4902	+ // Save();
4471	4903	try
4472	4904	{
4473	4905	//readobj.deepCopySelf(copy);
4474	4906	copy.clear(); // june 2014
	4907	+ copy.skyboxname = readobj.skyboxname;
	4908	+ copy.skyboxext = readobj.skyboxext;
4475	4909	for (int i = 0; i < readobj.size(); i++)
4476	4910	{
4477	4911	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4512,6 +4946,7 @@
4512	4946	}
4513	4947	} catch (ClassCastException e)
4514	4948	{
	4949	+ e.printStackTrace();
4515	4950	assert (false);
4516	4951	Composite c = (Composite) copy;
4517	4952	c.children.clear();
..	..	@@ -4522,13 +4957,24 @@
4522	4957	c.addChild(csg);
4523	4958	}
4524	4959
	4960	+ copy.versions = readobj.versions;
	4961	+ copy.versionindex = readobj.versionindex;
	4962	+
	4963	+ if (copy.versions == null)
	4964	+ {
	4965	+ copy.versions = new byte[100][];
	4966	+ copy.versionindex = -1;
	4967	+ }
	4968	+
	4969	+ //? SetUndoStates();
	4970	+
4525	4971	ResetModel();
4526	4972	copy.HardTouch(); // recompile?
4527	4973	refreshContents();
4528	4974	}
4529	4975	}
4530	4976
4531		- void load() // throws ClassNotFoundException
	4977	+ void Open() // throws ClassNotFoundException
4532	4978	{
4533	4979	if (Grafreed.standAlone)
4534	4980	{
..	..	@@ -4631,6 +5077,7 @@
4631	5077	//ps.print(buffer.toString());
4632	5078	} catch (IOException e)
4633	5079	{
	5080	+ e.printStackTrace();
4634	5081	}
4635	5082	}
4636	5083
..	..	@@ -4645,6 +5092,8 @@
4645	5092	String filename = browser.getFile();
4646	5093	if (filename != null && filename.length() > 0)
4647	5094	{
	5095	+ if (!filename.endsWith(".gfd"))
	5096	+ filename += ".gfd";
4648	5097	lastname = browser.getDirectory() + filename;
4649	5098	save();
4650	5099	}
..	..	@@ -4811,7 +5260,7 @@
4811	5260	MenuBar menuBar;
4812	5261	Menu fileMenu;
4813	5262	MenuItem newItem;
4814		- MenuItem loadItem;
	5263	+ MenuItem openItem;
4815	5264	MenuItem saveItem;
4816	5265	MenuItem saveAsItem;
4817	5266	MenuItem exportAsItem;
..	..	@@ -4834,22 +5283,36 @@
4834	5283	CheckboxMenuItem toggleSwitchItem;
4835	5284	CheckboxMenuItem toggleRootItem;
4836	5285	CheckboxMenuItem animationItem;
	5286	+ MenuItem archiveItem;
4837	5287	CheckboxMenuItem toggleHandleItem;
4838	5288	CheckboxMenuItem togglePaintItem;
4839	5289	JSplitPane mainPanel;
4840	5290	JScrollPane scrollpane;
	5291	+
4841	5292	JPanel toolbarPanel;
	5293	+
4842	5294	cGridBag treePanel;
	5295	+
4843	5296	JPanel radioPanel;
4844	5297	ButtonGroup buttonGroup;
4845		- cGridBag ctrlPanel;
	5298	+
	5299	+ cGridBag toolboxPanel;
4846	5300	cGridBag materialPanel;
	5301	+ cGridBag ctrlPanel;
	5302	+
4847	5303	JScrollPane infoPanel;
	5304	+
4848	5305	cGridBag optionsPanel;
	5306	+
4849	5307	JTabbedPane objectPanel;
	5308	+ boolean materialFlushed;
	5309	+ Object3D latestObject;
	5310	+
4850	5311	cGridBag XYZPanel;
	5312	+
4851	5313	JSplitPane gridPanel;
4852	5314	JSplitPane bigPanel;
	5315	+
4853	5316	cGridBag bigThree;
4854	5317	cGridBag scenePanel;
4855	5318	cGridBag centralPanel;
..	..	@@ -4964,7 +5427,7 @@
4964	5427	cNumberSlider fogField;
4965	5428	JLabel opacityPowerLabel;
4966	5429	cNumberSlider opacityPowerField;
4967		- JTree jTree;
	5430	+ cTree jTree;
4968	5431	//ObjectUI parent;
4969	5432
4970	5433	cNumberSlider normalpushField;