~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);
..	..	@@ -219,6 +296,12 @@
219	296	client = inClient;
220	297	copy = client;
221	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new Object3D[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 Object3D[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,13 +423,40 @@
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");
330	457
331	458	editPanel = new cGridBag().setVertical(true);
332		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
333	460
334	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
335	462
..	..	@@ -337,23 +464,27 @@
337	464	editPanel.add(editCommandsPanel);
338	465	editPanel.add(ctrlPanel);
339	466
340		- materialPanel = new cGridBag().setVertical(true);
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
341	469
342		- materialPanel.setName("Material");
	470	+ materialPanel = new cGridBag().setVertical(true);
	471	+ //materialPanel.setName("Material");
	472	+
343	473	/JTextPane/
344	474	infoarea = createTextPane();
345	475	doc = infoarea.getStyledDocument();
346	476
347	477	infoarea.setEditable(true);
348	478	SetText();
	479	+
349	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
350	481	// infoarea.setOpaque(false);
351	482	// //infoarea.setForeground(textcolor);
352	483	// TEXTAREA infoarea.setLineWrap(true);
353	484	// TEXTAREA infoarea.setWrapStyleWord(true);
354	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
355		- infoPanel.setPreferredSize(new Dimension(50, 200));
356		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
357	488	//infoPanel.setLayout(new BorderLayout());
358	489	//infoPanel.add(createTextPane());
359	490
..	..	@@ -364,7 +495,14 @@
364	495	mainPanel.setDividerSize(9);
365	496	mainPanel.setDividerLocation(0.5); //1.0);
366	497	mainPanel.setResizeWeight(0.5);
367		-
	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	+
368	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
369	507	//mainPanel.setLayout(new GridBagLayout());
370	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -595,8 +733,8 @@
595	733	}
596	734	}
597	735
598		-static GraphicsDevice device = GraphicsEnvironment
599		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
600	738
601	739	Rectangle keeprect;
602	740	cRadio radio;
..	..	@@ -612,13 +750,24 @@
612	750
613	751	boolean maximized;
614	752
	753	+ cButton fullscreenLayout;
	754	+
615	755	void Minimize()
616	756	{
617	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
618	759	}
619	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={}
620	764	void Maximize()
621	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
622	771	if (maximized)
623	772	{
624	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -626,20 +775,36 @@
626	775	else
627	776	{
628	777	keeprect = frame.getBounds();
629		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
630		- Dimension rect2 = frame.getToolkit().getScreenSize();
631		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
632	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
633	783	}
634	784
635	785	maximized ^= true;
	786	+
	787	+ frame.validate();
636	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
637	793
638	794	void ToggleFullScreen()
639	795	{
640		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
641	801	{
642	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
643	808	//frame.setVisible(false);
644	809	// frame.removeNotify();
645	810	// frame.setUndecorated(false);
..	..	@@ -649,7 +814,7 @@
649	814	// X frame.getContentPane().remove(/"Center",/bigThree);
650	815	// X framePanel.add(bigThree);
651	816	// X frame.getContentPane().add(/"Center",/framePanel);
652		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
653	818
654	819	//frame.setVisible(true);
655	820	radio.layout = keepButton;
..	..	@@ -664,7 +829,12 @@
664	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
665	830	// frame.getToolkit().getScreenSize().height);
666	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
667	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
668	838	// frame.removeNotify();
669	839	// frame.setUndecorated(true);
670	840	// frame.addNotify();
..	..	@@ -673,13 +843,35 @@
673	843	// X frame.getContentPane().add(/"Center",/bigThree);
674	844	framePanel.setDividerLocation(0);
675	845
676		- radio.layout = twoButton;
	846	+ radio.layout = fullscreenLayout;
677	847	radio.layout.doClick();
678	848	//frame.setVisible(true);
679	849	}
680		-
681		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
682	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	+ }
683	875
684	876	private JTextPane createTextPane()
685	877	{
..	..	@@ -811,7 +1003,7 @@
811	1003	// NumberSlider vDivsField;
812	1004	// JCheckBox endcaps;
813	1005	JCheckBox liveCB;
814		- JCheckBox selectCB;
	1006	+ JCheckBox selectableCB;
815	1007	JCheckBox hideCB;
816	1008	JCheckBox link2masterCB;
817	1009	JCheckBox markCB;
..	..	@@ -819,7 +1011,12 @@
819	1011	JCheckBox speedupCB;
820	1012	JCheckBox rewindCB;
821	1013	JCheckBox flipVCB;
	1014	+
	1015	+ cCheckBox toggleTextureCB;
	1016	+ cCheckBox toggleSwitchCB;
	1017	+
822	1018	JComboBox texresMenu;
	1019	+
823	1020	JButton resetButton;
824	1021	JButton stepButton;
825	1022	JButton stepAllButton;
..	..	@@ -1006,38 +1203,42 @@
1006	1203	namePanel = new cGridBag();
1007	1204
1008	1205	nameField = AddText(namePanel, copy.GetName());
1009		- namePanel.add(nameField);
	1206	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1010	1207	oe.ctrlPanel.add(namePanel);
1011	1208
1012	1209	oe.ctrlPanel.Return();
1013	1210
1014		- if (!GroupEditor.allparams)
	1211	+ if (!allparams)
1015	1212	return;
1016	1213
1017	1214	setupPanel = new cGridBag().setVertical(false);
1018	1215
1019	1216	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1020	1217	liveCB.setToolTipText("Animate object");
1021		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1022		- selectCB.setToolTipText("Make object selectable");
	1218	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1219	+ selectableCB.setToolTipText("Make object selectable");
1023	1220	// Return();
	1221	+
1024	1222	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1025	1223	hideCB.setToolTipText("Hide object");
1026	1224	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1027		- markCB.setToolTipText("Set the animation target transform");
	1225	+ markCB.setToolTipText("As animation target transform");
	1226	+
	1227	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1028	1228
1029	1229	setupPanel2 = new cGridBag().setVertical(false);
1030	1230
1031	1231	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1032	1232	rewindCB.setToolTipText("Rewind animation");
1033	1233
1034		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1035		- 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)");
1036	1236
	1237	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1238	+ link2masterCB.setToolTipText("Attach to support");
	1239	+
1037	1240	if (Globals.ADVANCED)
1038	1241	{
1039		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1040		- link2masterCB.setToolTipText("Attach to support");
1041	1242	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1042	1243	speedupCB.setToolTipText("Option motion capture");
1043	1244	}
..	..	@@ -1311,6 +1512,7 @@
1311	1512	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1312	1513	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1313	1514	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1515	+ //XYZPanel.setName("XYZ");
1314	1516
1315	1517	/*
1316	1518	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1348,12 +1550,29 @@
1348	1550	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1349	1551	//tmp.setName("Edit");
1350	1552	objectPanel.add(materialPanel);
	1553	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1554	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1555	+
1351	1556	// JPanel north = new JPanel(new BorderLayout());
1352	1557	// north.setName("Edit");
1353	1558	// north.add(ctrlPanel, BorderLayout.NORTH);
1354	1559	// objectPanel.add(north);
1355	1560	objectPanel.add(editPanel);
1356		- 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");
1357	1576
1358	1577	/*
1359	1578	aConstraints.gridx = 0;
..	..	@@ -1362,7 +1581,7 @@
1362	1581	aConstraints.gridy += 1;
1363	1582	aConstraints.gridwidth = 1;
1364	1583	mainPanel.add(objectPanel, aConstraints);
1365		- */
	1584	+ */
1366	1585
1367	1586	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1368	1587	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1374,14 +1593,12 @@
1374	1593	scrollpane.addMouseWheelListener(this); // Default not fast enough
1375	1594
1376	1595	/JTabbedPane/ scenePanel = new cGridBag();
1377		- scenePanel.preferredWidth = 6;
	1596	+ scenePanel.preferredWidth = 5;
1378	1597
1379	1598	JTabbedPane tabbedPane = new JTabbedPane();
1380	1599	tabbedPane.add(scrollpane);
1381	1600
1382		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1383		-
1384		- optionsPanel = new cGridBag().setVertical(true);
	1601	+ optionsPanel = new cGridBag().setVertical(false);
1385	1602
1386	1603	optionsPanel.setName("Options");
1387	1604
..	..	@@ -1389,6 +1606,8 @@
1389	1606
1390	1607	tabbedPane.add(optionsPanel);
1391	1608
	1609	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1610	+
1392	1611	scenePanel.add(tabbedPane);
1393	1612
1394	1613	/*
..	..	@@ -1452,7 +1671,7 @@
1452	1671	bigThree = new cGridBag();
1453	1672	bigThree.addComponent(scenePanel);
1454	1673	bigThree.addComponent(centralPanel);
1455		- bigThree.addComponent(XYZPanel);
	1674	+ //bigThree.addComponent(XYZPanel);
1456	1675
1457	1676	// // SIDE EFFECT!!!
1458	1677	// aConstraints.gridx = 0;
..	..	@@ -1461,9 +1680,9 @@
1461	1680	// aConstraints.gridheight = 1;
1462	1681
1463	1682	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1464		- framePanel.setContinuousLayout(true);
1465		- framePanel.setOneTouchExpandable(true);
1466		- framePanel.setDividerLocation(0.8);
	1683	+ framePanel.setContinuousLayout(false);
	1684	+ framePanel.setOneTouchExpandable(false);
	1685	+ //.setDividerLocation(0.8);
1467	1686	//framePanel.setDividerSize(15);
1468	1687	//framePanel.setResizeWeight(0.15);
1469	1688	framePanel.setName("Frame");
..	..	@@ -1481,16 +1700,18 @@
1481	1700	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1482	1701
1483	1702	frame.setSize(1280, 860);
1484		- frame.setVisible(true);
1485		-
	1703	+
1486	1704	cameraView.requestFocusInWindow();
1487	1705
1488	1706	gridPanel.setDividerLocation(1.0);
	1707	+
	1708	+ frame.validate();
	1709	+
	1710	+ frame.setVisible(true);
1489	1711
1490	1712	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1491	1713	frame.addWindowListener(new WindowAdapter()
1492	1714	{
1493		-
1494	1715	public void windowClosing(WindowEvent e)
1495	1716	{
1496	1717	Close();
..	..	@@ -1552,45 +1773,48 @@
1552	1773	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1553	1774
1554	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);
1555	1787
1556	1788	cGridBag color = new cGridBag();
1557		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1558		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559		- 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	+
1560	1794	//colorField.preferredWidth = 200;
1561	1795	colorSection.add(color);
1562	1796
1563	1797	cGridBag modulation = new cGridBag();
1564	1798	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1565	1799	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1800	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1567	1801	colorSection.add(modulation);
1568	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	+
1569	1811	cGridBag texture = new cGridBag();
1570	1812	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1571	1813	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572	1814	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573	1815	colorSection.add(texture);
1574	1816
1575		- cGridBag anisoU = new cGridBag();
1576		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1577		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1579		- colorSection.add(anisoU);
1580		-
1581		- cGridBag anisoV = new cGridBag();
1582		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1583		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1585		- colorSection.add(anisoV);
1586		-
1587		- cGridBag shadowbias = new cGridBag();
1588		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1589		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1591		- colorSection.add(shadowbias);
1592		-
1593		- panel.add(new JSeparator());
	1817	+ panel.add(GetSeparator());
1594	1818
1595	1819	panel.add(colorSection);
1596	1820
..	..	@@ -1640,7 +1864,13 @@
1640	1864	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1641	1865	diffuseSection.add(fakedepth);
1642	1866
1643		- 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());
1644	1874
1645	1875	panel.add(diffuseSection);
1646	1876
..	..	@@ -1690,42 +1920,48 @@
1690	1920	// aConstraints.gridy += 1;
1691	1921	// aConstraints.gridwidth = 1;
1692	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);
1693	1928
1694		- 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());
1695	1937
1696	1938	panel.add(specularSection);
1697	1939
1698	1940	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1699	1941
1700		- cGridBag globalSection = new cGridBag().setVertical(true);
	1942	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1701	1943
1702	1944	cGridBag camera = new cGridBag();
1703	1945	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1704	1946	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	1947	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(camera);
	1948	+ colorSection.add(camera);
1707	1949
1708	1950	cGridBag ambient = new cGridBag();
1709	1951	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1710	1952	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711	1953	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1712		- globalSection.add(ambient);
	1954	+ colorSection.add(ambient);
1713	1955
1714	1956	cGridBag backlit = new cGridBag();
1715	1957	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1716	1958	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1717	1959	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1718		- globalSection.add(backlit);
	1960	+ colorSection.add(backlit);
1719	1961
1720		- cGridBag opacity = new cGridBag();
1721		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1722		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1724		- globalSection.add(opacity);
1725		-
1726		- panel.add(new JSeparator());
	1962	+ //panel.add(new JSeparator());
1727	1963
1728		- panel.add(globalSection);
	1964	+ //panel.add(globalSection);
1729	1965
1730	1966	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1731	1967
..	..	@@ -1767,7 +2003,7 @@
1767	2003	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1768	2004	textureSection.add(opacityPower);
1769	2005
1770		- panel.add(new JSeparator());
	2006	+ panel.add(GetSeparator());
1771	2007
1772	2008	panel.add(textureSection);
1773	2009
..	..	@@ -1832,8 +2068,9 @@
1832	2068	// 3D models
1833	2069	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1834	2070	{
1835		- lastConverter = new com.jmex.model.converters.MaxToJme();
1836		- LoadFile(filename, lastConverter);
	2071	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2072	+ //LoadFile(filename, lastConverter);
	2073	+ LoadObjFile(filename); // New 3ds loader
1837	2074	continue;
1838	2075	}
1839	2076	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2559,6 +2796,7 @@
2559	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2560	2797	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2561	2798	}
	2799	+
2562	2800	//cJME.count++;
2563	2801	//cJME.count %= 12;
2564	2802	if (gc)
..	..	@@ -2742,6 +2980,7 @@
2742	2980	}
2743	2981	}
2744	2982	}
	2983	+
2745	2984	cFileSystemPane FSPane;
2746	2985
2747	2986	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2795,11 +3034,14 @@
2795	3034	}
2796	3035	}
2797	3036	}
	3037	+
2798	3038	freezematerial = false;
2799	3039	}
2800	3040
2801	3041	void SetMaterial(Object3D object)
2802	3042	{
	3043	+ latestObject = object;
	3044	+
2803	3045	cMaterial mat = object.material;
2804	3046
2805	3047	if (mat == null)
..	..	@@ -2911,12 +3153,17 @@
2911	3153	// }
2912	3154
2913	3155	/**/
2914		- if (deselect)
	3156	+ if (deselect \|\| child == null)
2915	3157	{
2916	3158	//group.deselectAll();
2917	3159	//freeze = true;
2918	3160	GetTree().clearSelection();
2919	3161	//freeze = false;
	3162	+
	3163	+ if (child == null)
	3164	+ {
	3165	+ return;
	3166	+ }
2920	3167	}
2921	3168
2922	3169	//group.addSelectee(child);
..	..	@@ -2985,7 +3232,7 @@
2985	3232	cameraView.ToggleDL();
2986	3233	cameraView.repaint();
2987	3234	return;
2988		- } else if (event.getSource() == toggleTextureItem)
	3235	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2989	3236	{
2990	3237	cameraView.ToggleTexture();
2991	3238	// june 2013 copy.HardTouch();
..	..	@@ -3024,7 +3271,7 @@
3024	3271	frame.validate();
3025	3272
3026	3273	return;
3027		- } else if (event.getSource() == toggleSwitchItem)
	3274	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3028	3275	{
3029	3276	cameraView.ToggleSwitch();
3030	3277	cameraView.repaint();
..	..	@@ -3055,7 +3302,7 @@
3055	3302	{
3056	3303	copy.live ^= true;
3057	3304	return;
3058		- } else if (event.getSource() == selectCB)
	3305	+ } else if (event.getSource() == selectableCB)
3059	3306	{
3060	3307	copy.dontselect ^= true;
3061	3308	return;
..	..	@@ -3240,9 +3487,9 @@
3240	3487	{
3241	3488	Close();
3242	3489	//return true;
3243		- } else if (source == loadItem)
	3490	+ } else if (source == openItem)
3244	3491	{
3245		- load();
	3492	+ Open();
3246	3493	//return true;
3247	3494	} else if (source == newItem)
3248	3495	{
..	..	@@ -3267,6 +3514,10 @@
3267	3514	{
3268	3515	generatePOV();
3269	3516	//return true;
	3517	+ } else if (event.getSource() == archiveItem)
	3518	+ {
	3519	+ cTools.Archive(frame);
	3520	+ return;
3270	3521	} else if (source == zBufferItem)
3271	3522	{
3272	3523	try
..	..	@@ -3315,11 +3566,12 @@
3315	3566
3316	3567	static public byte[] Compress(Object3D o)
3317	3568	{
	3569	+ // Slower to actually compress.
3318	3570	try
3319	3571	{
3320	3572	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3321		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3322		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3573	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3574	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3323	3575
3324	3576	Object3D parent = o.parent;
3325	3577	o.parent = null;
..	..	@@ -3330,10 +3582,14 @@
3330	3582
3331	3583	out.flush();
3332	3584
3333		- zstream.close();
	3585	+ baos //zstream
	3586	+ .close();
3334	3587	out.close();
3335	3588
3336		- return baos.toByteArray();
	3589	+ byte[] bytes = baos.toByteArray();
	3590	+
	3591	+ System.out.println("save #bytes = " + bytes.length);
	3592	+ return bytes;
3337	3593	} catch (Exception e)
3338	3594	{
3339	3595	System.err.println(e);
..	..	@@ -3343,13 +3599,16 @@
3343	3599
3344	3600	static public Object Uncompress(byte[] bytes)
3345	3601	{
3346		- System.out.println("#bytes = " + bytes.length);
	3602	+ System.out.println("restore #bytes = " + bytes.length);
3347	3603	try
3348	3604	{
3349	3605	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3350		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3351		- ObjectInputStream in = new ObjectInputStream(istream);
	3606	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3607	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3352	3608	Object obj = in.readObject();
	3609	+
	3610	+ bais //istream
	3611	+ .close();
3353	3612	in.close();
3354	3613
3355	3614	return obj;
..	..	@@ -3404,37 +3663,76 @@
3404	3663	return null;
3405	3664	}
3406	3665
3407		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3408	3666
3409	3667	public void Save()
3410	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)
	3692	+ {
	3693	+ System.err.println("Save");
	3694	+
3411	3695	cRadio tab = GetCurrentTab();
3412	3696
3413		- boolean temp = CameraPane.SWITCH;
3414		- CameraPane.SWITCH = false;
	3697	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
3415	3698
3416		- 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	+// }
3417	3705
3418	3706	//EditorFrame.m_MainFrame.requestFocusInWindow();
3419		- tab.graphs[tab.undoindex++] = Compress(copy);
3420		-
3421		- copy.RestoreBigData(hashtable);
3422		-
3423		- CameraPane.SWITCH = temp;
3424		-
3425		- //assert(hashtable.isEmpty());
3426		-
3427		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3707	+ if (!thesame)
3428	3708	{
3429		- 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++;
3430	3716	}
3431	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	+
3432	3730	// test save
3433	3731	if (false)
3434	3732	{
3435	3733	try
3436	3734	{
3437		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3735	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3438	3736	ObjectOutputStream p = new ObjectOutputStream(ostream);
3439	3737
3440	3738	p.writeObject(copy);
..	..	@@ -3447,23 +3745,30 @@
3447	3745	e.printStackTrace();
3448	3746	}
3449	3747	}
	3748	+
	3749	+ return !thesame;
3450	3750	}
3451	3751
3452	3752	void CopyChanged(Object3D obj)
3453	3753	{
	3754	+ SetUndoStates();
	3755	+
3454	3756	boolean temp = CameraPane.SWITCH;
3455	3757	CameraPane.SWITCH = false;
3456	3758
3457		- copy.ExtractBigData(hashtable);
	3759	+ copy.ExtractBigData(versiontable);
3458	3760
3459	3761	copy.clear();
3460	3762
	3763	+ copy.skyboxname = obj.skyboxname;
	3764	+ copy.skyboxext = obj.skyboxext;
	3765	+
3461	3766	for (int i=0; i<obj.Size(); i++)
3462	3767	{
3463	3768	copy.add(obj.get(i));
3464	3769	}
3465	3770
3466		- copy.RestoreBigData(hashtable);
	3771	+ copy.RestoreBigData(versiontable);
3467	3772
3468	3773	CameraPane.SWITCH = temp;
3469	3774
..	..	@@ -3490,40 +3795,131 @@
3490	3795	refreshContents();
3491	3796	}
3492	3797
3493		- public void Undo()
	3798	+ cButton undoButton;
	3799	+ cButton restoreButton;
	3800	+ cButton replaceButton;
	3801	+ cButton redoButton;
	3802	+
	3803	+ boolean muteSlider;
	3804	+
	3805	+ int VersionCount()
	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()
3494	3819	{
3495	3820	cRadio tab = GetCurrentTab();
3496	3821
3497		- if (tab.undoindex == 0)
	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	+
	3839	+ System.err.println("Undo");
	3840	+
	3841	+ cRadio tab = GetCurrentTab();
	3842	+
	3843	+ if (copy.versionindex == 0)
3498	3844	{
3499	3845	java.awt.Toolkit.getDefaultToolkit().beep();
3500		- return;
	3846	+ return false;
3501	3847	}
3502	3848
3503		- 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)
3504	3876	{
3505		- Save();
3506		- tab.undoindex -= 1;
	3877	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3878	+ return false;
3507	3879	}
3508	3880
3509		- tab.undoindex -= 1;
	3881	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3882	+ CopyChanged(copy.versions[copy.versionindex]);
	3883	+
	3884	+ return true;
	3885	+ }
3510	3886
3511		- 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;
3512	3902	}
3513	3903
3514	3904	public void Redo()
3515	3905	{
	3906	+ // Option?
	3907	+ Replace();
	3908	+
3516	3909	cRadio tab = GetCurrentTab();
3517	3910
3518		- if (tab.graphs[tab.undoindex + 1] == null)
	3911	+ if (copy.versions[copy.versionindex + 1] == null)
3519	3912	{
3520	3913	java.awt.Toolkit.getDefaultToolkit().beep();
3521	3914	return;
3522	3915	}
3523	3916
3524		- tab.undoindex += 1;
	3917	+ copy.versionindex += 1;
3525	3918
3526		- 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;
3527	3923	}
3528	3924
3529	3925	void ImportGFD()
..	..	@@ -3675,7 +4071,7 @@
3675	4071	assert false;
3676	4072	}
3677	4073
3678		- void EditSelection()
	4074	+ void EditSelection(boolean newWindow)
3679	4075	{
3680	4076	}
3681	4077
..	..	@@ -3819,9 +4215,25 @@
3819	4215	//copy.Touch();
3820	4216	}
3821	4217
	4218	+ cNumberSlider versionSlider;
	4219	+
3822	4220	public void stateChanged(ChangeEvent e)
3823	4221	{
3824	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	+ }
3825	4237
3826	4238	if (freezematerial)
3827	4239	{
..	..	@@ -4170,7 +4582,8 @@
4170	4582
4171	4583	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4172	4584	{
4173		- Save();
	4585	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4586	+ Save();
4174	4587	//Tween.set(thing, 0).target(1).start(tweenManager);
4175	4588	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4176	4589	// if (thing instanceof GenericJointDemo)
..	..	@@ -4257,6 +4670,12 @@
4257	4670	{
4258	4671	ResetModel();
4259	4672	Select(thing.GetTreePath(), true, false); // unselect... false);
	4673	+
	4674	+ if (thing.Size() == 0)
	4675	+ {
	4676	+ //EditSelection(false);
	4677	+ }
	4678	+
4260	4679	refreshContents();
4261	4680	}
4262	4681
..	..	@@ -4405,7 +4824,9 @@
4405	4824	readobj.ResetDisplayList();
4406	4825	} catch (Exception e)
4407	4826	{
4408		- //e.printStackTrace();
	4827	+ if (!e.toString().contains("GZIP"))
	4828	+ e.printStackTrace();
	4829	+
4409	4830	try
4410	4831	{
4411	4832	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4479,11 +4900,14 @@
4479	4900
4480	4901	if (readobj != null)
4481	4902	{
4482		- Save();
	4903	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4904	+ // Save();
4483	4905	try
4484	4906	{
4485	4907	//readobj.deepCopySelf(copy);
4486	4908	copy.clear(); // june 2014
	4909	+ copy.skyboxname = readobj.skyboxname;
	4910	+ copy.skyboxext = readobj.skyboxext;
4487	4911	for (int i = 0; i < readobj.size(); i++)
4488	4912	{
4489	4913	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4524,6 +4948,7 @@
4524	4948	}
4525	4949	} catch (ClassCastException e)
4526	4950	{
	4951	+ e.printStackTrace();
4527	4952	assert (false);
4528	4953	Composite c = (Composite) copy;
4529	4954	c.children.clear();
..	..	@@ -4534,13 +4959,24 @@
4534	4959	c.addChild(csg);
4535	4960	}
4536	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	+
4537	4973	ResetModel();
4538	4974	copy.HardTouch(); // recompile?
4539	4975	refreshContents();
4540	4976	}
4541	4977	}
4542	4978
4543		- void load() // throws ClassNotFoundException
	4979	+ void Open() // throws ClassNotFoundException
4544	4980	{
4545	4981	if (Grafreed.standAlone)
4546	4982	{
..	..	@@ -4643,6 +5079,7 @@
4643	5079	//ps.print(buffer.toString());
4644	5080	} catch (IOException e)
4645	5081	{
	5082	+ e.printStackTrace();
4646	5083	}
4647	5084	}
4648	5085
..	..	@@ -4657,6 +5094,8 @@
4657	5094	String filename = browser.getFile();
4658	5095	if (filename != null && filename.length() > 0)
4659	5096	{
	5097	+ if (!filename.endsWith(".gfd"))
	5098	+ filename += ".gfd";
4660	5099	lastname = browser.getDirectory() + filename;
4661	5100	save();
4662	5101	}
..	..	@@ -4823,7 +5262,7 @@
4823	5262	MenuBar menuBar;
4824	5263	Menu fileMenu;
4825	5264	MenuItem newItem;
4826		- MenuItem loadItem;
	5265	+ MenuItem openItem;
4827	5266	MenuItem saveItem;
4828	5267	MenuItem saveAsItem;
4829	5268	MenuItem exportAsItem;
..	..	@@ -4846,22 +5285,36 @@
4846	5285	CheckboxMenuItem toggleSwitchItem;
4847	5286	CheckboxMenuItem toggleRootItem;
4848	5287	CheckboxMenuItem animationItem;
	5288	+ MenuItem archiveItem;
4849	5289	CheckboxMenuItem toggleHandleItem;
4850	5290	CheckboxMenuItem togglePaintItem;
4851	5291	JSplitPane mainPanel;
4852	5292	JScrollPane scrollpane;
	5293	+
4853	5294	JPanel toolbarPanel;
	5295	+
4854	5296	cGridBag treePanel;
	5297	+
4855	5298	JPanel radioPanel;
4856	5299	ButtonGroup buttonGroup;
4857		- cGridBag ctrlPanel;
	5300	+
	5301	+ cGridBag toolboxPanel;
4858	5302	cGridBag materialPanel;
	5303	+ cGridBag ctrlPanel;
	5304	+
4859	5305	JScrollPane infoPanel;
	5306	+
4860	5307	cGridBag optionsPanel;
	5308	+
4861	5309	JTabbedPane objectPanel;
	5310	+ boolean materialFlushed;
	5311	+ Object3D latestObject;
	5312	+
4862	5313	cGridBag XYZPanel;
	5314	+
4863	5315	JSplitPane gridPanel;
4864	5316	JSplitPane bigPanel;
	5317	+
4865	5318	cGridBag bigThree;
4866	5319	cGridBag scenePanel;
4867	5320	cGridBag centralPanel;
..	..	@@ -4976,7 +5429,7 @@
4976	5429	cNumberSlider fogField;
4977	5430	JLabel opacityPowerLabel;
4978	5431	cNumberSlider opacityPowerField;
4979		- JTree jTree;
	5432	+ cTree jTree;
4980	5433	//ObjectUI parent;
4981	5434
4982	5435	cNumberSlider normalpushField;