~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -49,6 +52,19 @@
49	52	catch (Exception e)
50	53	{
51	54	return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
52	68	}
53	69	}
54	70
..	..	@@ -194,7 +210,7 @@
194	210
195	211	objEditor.ctrlPanel.remove(namePanel);
196	212
197		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
198	214	return;
199	215
200	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -293,7 +309,7 @@
293	309	//localCopy.parent = null;
294	310
295	311	frame = new JFrame();
296		- frame.setUndecorated(true);
	312	+ frame.setUndecorated(false);
297	313	objEditor = this;
298	314	this.callee = callee;
299	315
..	..	@@ -324,12 +340,17 @@
324	340	return frame.action(event, obj);
325	341	}
326	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
327	348	void SetupMenu()
328	349	{
329	350	frame.setMenuBar(menuBar = new MenuBar());
330	351	menuBar.add(fileMenu = new Menu("File"));
331	352	fileMenu.add(newItem = new MenuItem("New"));
332		- fileMenu.add(loadItem = new MenuItem("Open..."));
	353	+ fileMenu.add(openItem = new MenuItem("Open..."));
333	354
334	355	//oe.menuBar.add(menu = new Menu("Include"));
335	356	Menu menu = new Menu("Import");
..	..	@@ -361,7 +382,7 @@
361	382	}
362	383
363	384	newItem.addActionListener(this);
364		- loadItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
365	386	saveItem.addActionListener(this);
366	387	saveAsItem.addActionListener(this);
367	388	exportAsItem.addActionListener(this);
..	..	@@ -370,6 +391,32 @@
370	391	closeItem.addActionListener(this);
371	392
372	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
373	420	toolbarPanel = new JPanel();
374	421	toolbarPanel.setName("Toolbar");
375	422	treePanel = new cGridBag();
..	..	@@ -384,9 +431,12 @@
384	431	editPanel.add(editCommandsPanel);
385	432	editPanel.add(ctrlPanel);
386	433
387		- materialPanel = new cGridBag().setVertical(true);
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
388	436
	437	+ materialPanel = new cGridBag().setVertical(true);
389	438	materialPanel.setName("Material");
	439	+
390	440	/JTextPane/
391	441	infoarea = createTextPane();
392	442	doc = infoarea.getStyledDocument();
..	..	@@ -399,7 +449,7 @@
399	449	// TEXTAREA infoarea.setLineWrap(true);
400	450	// TEXTAREA infoarea.setWrapStyleWord(true);
401	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
402		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
403	453	infoPanel.setName("Info");
404	454	//infoPanel.setLayout(new BorderLayout());
405	455	//infoPanel.add(createTextPane());
..	..	@@ -411,7 +461,14 @@
411	461	mainPanel.setDividerSize(9);
412	462	mainPanel.setDividerLocation(0.5); //1.0);
413	463	mainPanel.setResizeWeight(0.5);
414		-
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
415	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
416	473	//mainPanel.setLayout(new GridBagLayout());
417	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -642,8 +699,8 @@
642	699	}
643	700	}
644	701
645		-static GraphicsDevice device = GraphicsEnvironment
646		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
647	704
648	705	Rectangle keeprect;
649	706	cRadio radio;
..	..	@@ -659,13 +716,24 @@
659	716
660	717	boolean maximized;
661	718
	719	+ cButton fullscreenLayout;
	720	+
662	721	void Minimize()
663	722	{
664	723	frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
665	725	}
666	726
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
667	730	void Maximize()
668	731	{
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
669	737	if (maximized)
670	738	{
671	739	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -673,20 +741,36 @@
673	741	else
674	742	{
675	743	keeprect = frame.getBounds();
676		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
677		- Dimension rect2 = frame.getToolkit().getScreenSize();
678		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
679	747	// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
680	749	}
681	750
682	751	maximized ^= true;
	752	+
	753	+ frame.validate();
683	754	}
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
684	759
685	760	void ToggleFullScreen()
686	761	{
687		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
688	767	{
689	768	device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
690	774	//frame.setVisible(false);
691	775	// frame.removeNotify();
692	776	// frame.setUndecorated(false);
..	..	@@ -696,7 +780,7 @@
696	780	// X frame.getContentPane().remove(/"Center",/bigThree);
697	781	// X framePanel.add(bigThree);
698	782	// X frame.getContentPane().add(/"Center",/framePanel);
699		- framePanel.setDividerLocation(1);
	783	+ framePanel.setDividerLocation(46);
700	784
701	785	//frame.setVisible(true);
702	786	radio.layout = keepButton;
..	..	@@ -711,7 +795,12 @@
711	795	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
712	796	// frame.getToolkit().getScreenSize().height);
713	797	//frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
714	801	device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
715	804	// frame.removeNotify();
716	805	// frame.setUndecorated(true);
717	806	// frame.addNotify();
..	..	@@ -720,12 +809,11 @@
720	809	// X frame.getContentPane().add(/"Center",/bigThree);
721	810	framePanel.setDividerLocation(0);
722	811
723		- radio.layout = twoButton;
	812	+ radio.layout = fullscreenLayout;
724	813	radio.layout.doClick();
725	814	//frame.setVisible(true);
726	815	}
727		-
728		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
729	817	}
730	818
731	819	private JTextPane createTextPane()
..	..	@@ -866,7 +954,12 @@
866	954	JCheckBox speedupCB;
867	955	JCheckBox rewindCB;
868	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
869	961	JComboBox texresMenu;
	962	+
870	963	JButton resetButton;
871	964	JButton stepButton;
872	965	JButton stepAllButton;
..	..	@@ -1053,12 +1146,12 @@
1053	1146	namePanel = new cGridBag();
1054	1147
1055	1148	nameField = AddText(namePanel, copy.GetName());
1056		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1057	1150	oe.ctrlPanel.add(namePanel);
1058	1151
1059	1152	oe.ctrlPanel.Return();
1060	1153
1061		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
1062	1155	return;
1063	1156
1064	1157	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1071,20 +1164,21 @@
1071	1164	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1072	1165	hideCB.setToolTipText("Hide object");
1073	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1074		- markCB.setToolTipText("Set the animation target transform");
	1167	+ markCB.setToolTipText("As animation target transform");
1075	1168
1076	1169	setupPanel2 = new cGridBag().setVertical(false);
1077	1170
1078	1171	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1079	1172	rewindCB.setToolTipText("Rewind animation");
1080	1173
1081		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1082		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1083	1176
	1177	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1178	+ link2masterCB.setToolTipText("Attach to support");
	1179	+
1084	1180	if (Globals.ADVANCED)
1085	1181	{
1086		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1087		- link2masterCB.setToolTipText("Attach to support");
1088	1182	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1089	1183	speedupCB.setToolTipText("Option motion capture");
1090	1184	}
..	..	@@ -1400,7 +1494,11 @@
1400	1494	// north.add(ctrlPanel, BorderLayout.NORTH);
1401	1495	// objectPanel.add(north);
1402	1496	objectPanel.add(editPanel);
1403		- objectPanel.add(infoPanel);
	1497	+
	1498	+ //if (Globals.ADVANCED)
	1499	+ objectPanel.add(infoPanel);
	1500	+
	1501	+ objectPanel.add(toolboxPanel);
1404	1502
1405	1503	/*
1406	1504	aConstraints.gridx = 0;
..	..	@@ -1409,7 +1507,7 @@
1409	1507	aConstraints.gridy += 1;
1410	1508	aConstraints.gridwidth = 1;
1411	1509	mainPanel.add(objectPanel, aConstraints);
1412		- */
	1510	+ */
1413	1511
1414	1512	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1415	1513	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1426,9 +1524,7 @@
1426	1524	JTabbedPane tabbedPane = new JTabbedPane();
1427	1525	tabbedPane.add(scrollpane);
1428	1526
1429		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1430		-
1431		- optionsPanel = new cGridBag().setVertical(true);
	1527	+ optionsPanel = new cGridBag().setVertical(false);
1432	1528
1433	1529	optionsPanel.setName("Options");
1434	1530
..	..	@@ -1436,6 +1532,8 @@
1436	1532
1437	1533	tabbedPane.add(optionsPanel);
1438	1534
	1535	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1536	+
1439	1537	scenePanel.add(tabbedPane);
1440	1538
1441	1539	/*
..	..	@@ -1508,9 +1606,9 @@
1508	1606	// aConstraints.gridheight = 1;
1509	1607
1510	1608	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1511		- framePanel.setContinuousLayout(true);
1512		- framePanel.setOneTouchExpandable(true);
1513		- framePanel.setDividerLocation(0.8);
	1609	+ framePanel.setContinuousLayout(false);
	1610	+ framePanel.setOneTouchExpandable(false);
	1611	+ //.setDividerLocation(0.8);
1514	1612	//framePanel.setDividerSize(15);
1515	1613	//framePanel.setResizeWeight(0.15);
1516	1614	framePanel.setName("Frame");
..	..	@@ -1528,11 +1626,14 @@
1528	1626	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1529	1627
1530	1628	frame.setSize(1280, 860);
1531		- frame.setVisible(true);
1532		-
	1629	+
1533	1630	cameraView.requestFocusInWindow();
1534	1631
1535	1632	gridPanel.setDividerLocation(1.0);
	1633	+
	1634	+ frame.validate();
	1635	+
	1636	+ frame.setVisible(true);
1536	1637
1537	1638	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1538	1639	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1619,24 +1720,6 @@
1619	1720	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1620	1721	colorSection.add(texture);
1621	1722
1622		- cGridBag anisoU = new cGridBag();
1623		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1624		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1626		- colorSection.add(anisoU);
1627		-
1628		- cGridBag anisoV = new cGridBag();
1629		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1630		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1632		- colorSection.add(anisoV);
1633		-
1634		- cGridBag shadowbias = new cGridBag();
1635		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1636		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1638		- colorSection.add(shadowbias);
1639		-
1640	1723	panel.add(new JSeparator());
1641	1724
1642	1725	panel.add(colorSection);
..	..	@@ -1686,6 +1769,12 @@
1686	1769	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1687	1770	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1688	1771	diffuseSection.add(fakedepth);
	1772	+
	1773	+ cGridBag shadowbias = new cGridBag();
	1774	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1775	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1776	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1777	+ diffuseSection.add(shadowbias);
1689	1778
1690	1779	panel.add(new JSeparator());
1691	1780
..	..	@@ -1737,6 +1826,18 @@
1737	1826	// aConstraints.gridy += 1;
1738	1827	// aConstraints.gridwidth = 1;
1739	1828
	1829	+ cGridBag anisoU = new cGridBag();
	1830	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1831	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1832	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1833	+ specularSection.add(anisoU);
	1834	+
	1835	+ cGridBag anisoV = new cGridBag();
	1836	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1837	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1838	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1839	+ specularSection.add(anisoV);
	1840	+
1740	1841
1741	1842	panel.add(new JSeparator());
1742	1843
..	..	@@ -1744,35 +1845,35 @@
1744	1845
1745	1846	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1746	1847
1747		- cGridBag globalSection = new cGridBag().setVertical(true);
	1848	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1748	1849
1749	1850	cGridBag camera = new cGridBag();
1750	1851	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1751	1852	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1752	1853	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1753		- globalSection.add(camera);
	1854	+ colorSection.add(camera);
1754	1855
1755	1856	cGridBag ambient = new cGridBag();
1756	1857	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1757	1858	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1758	1859	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1759		- globalSection.add(ambient);
	1860	+ colorSection.add(ambient);
1760	1861
1761	1862	cGridBag backlit = new cGridBag();
1762	1863	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1763	1864	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1764	1865	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1765		- globalSection.add(backlit);
	1866	+ colorSection.add(backlit);
1766	1867
1767	1868	cGridBag opacity = new cGridBag();
1768	1869	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1769	1870	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770	1871	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1771		- globalSection.add(opacity);
	1872	+ colorSection.add(opacity);
1772	1873
1773		- panel.add(new JSeparator());
	1874	+ //panel.add(new JSeparator());
1774	1875
1775		- panel.add(globalSection);
	1876	+ //panel.add(globalSection);
1776	1877
1777	1878	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1778	1879
..	..	@@ -1879,8 +1980,9 @@
1879	1980	// 3D models
1880	1981	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1881	1982	{
1882		- lastConverter = new com.jmex.model.converters.MaxToJme();
1883		- LoadFile(filename, lastConverter);
	1983	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1984	+ //LoadFile(filename, lastConverter);
	1985	+ LoadObjFile(filename); // New 3ds loader
1884	1986	continue;
1885	1987	}
1886	1988	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2606,6 +2708,7 @@
2606	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2607	2709	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2608	2710	}
	2711	+
2609	2712	//cJME.count++;
2610	2713	//cJME.count %= 12;
2611	2714	if (gc)
..	..	@@ -2789,6 +2892,7 @@
2789	2892	}
2790	2893	}
2791	2894	}
	2895	+
2792	2896	cFileSystemPane FSPane;
2793	2897
2794	2898	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2842,11 +2946,14 @@
2842	2946	}
2843	2947	}
2844	2948	}
	2949	+
2845	2950	freezematerial = false;
2846	2951	}
2847	2952
2848	2953	void SetMaterial(Object3D object)
2849	2954	{
	2955	+ latestObject = object;
	2956	+
2850	2957	cMaterial mat = object.material;
2851	2958
2852	2959	if (mat == null)
..	..	@@ -2958,12 +3065,17 @@
2958	3065	// }
2959	3066
2960	3067	/**/
2961		- if (deselect)
	3068	+ if (deselect \|\| child == null)
2962	3069	{
2963	3070	//group.deselectAll();
2964	3071	//freeze = true;
2965	3072	GetTree().clearSelection();
2966	3073	//freeze = false;
	3074	+
	3075	+ if (child == null)
	3076	+ {
	3077	+ return;
	3078	+ }
2967	3079	}
2968	3080
2969	3081	//group.addSelectee(child);
..	..	@@ -3032,7 +3144,7 @@
3032	3144	cameraView.ToggleDL();
3033	3145	cameraView.repaint();
3034	3146	return;
3035		- } else if (event.getSource() == toggleTextureItem)
	3147	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3036	3148	{
3037	3149	cameraView.ToggleTexture();
3038	3150	// june 2013 copy.HardTouch();
..	..	@@ -3071,7 +3183,7 @@
3071	3183	frame.validate();
3072	3184
3073	3185	return;
3074		- } else if (event.getSource() == toggleSwitchItem)
	3186	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3075	3187	{
3076	3188	cameraView.ToggleSwitch();
3077	3189	cameraView.repaint();
..	..	@@ -3287,9 +3399,9 @@
3287	3399	{
3288	3400	Close();
3289	3401	//return true;
3290		- } else if (source == loadItem)
	3402	+ } else if (source == openItem)
3291	3403	{
3292		- load();
	3404	+ Open();
3293	3405	//return true;
3294	3406	} else if (source == newItem)
3295	3407	{
..	..	@@ -3314,6 +3426,10 @@
3314	3426	{
3315	3427	generatePOV();
3316	3428	//return true;
	3429	+ } else if (event.getSource() == archiveItem)
	3430	+ {
	3431	+ cTools.Archive(frame);
	3432	+ return;
3317	3433	} else if (source == zBufferItem)
3318	3434	{
3319	3435	try
..	..	@@ -3365,8 +3481,8 @@
3365	3481	try
3366	3482	{
3367	3483	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3368		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3369		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3484	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3485	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3370	3486
3371	3487	Object3D parent = o.parent;
3372	3488	o.parent = null;
..	..	@@ -3377,10 +3493,14 @@
3377	3493
3378	3494	out.flush();
3379	3495
3380		- zstream.close();
	3496	+ baos //zstream
	3497	+ .close();
3381	3498	out.close();
3382	3499
3383		- return baos.toByteArray();
	3500	+ byte[] bytes = baos.toByteArray();
	3501	+
	3502	+ System.out.println("save #bytes = " + bytes.length);
	3503	+ return bytes;
3384	3504	} catch (Exception e)
3385	3505	{
3386	3506	System.err.println(e);
..	..	@@ -3390,13 +3510,16 @@
3390	3510
3391	3511	static public Object Uncompress(byte[] bytes)
3392	3512	{
3393		- System.out.println("#bytes = " + bytes.length);
	3513	+ System.out.println("restore #bytes = " + bytes.length);
3394	3514	try
3395	3515	{
3396	3516	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3397		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3398		- ObjectInputStream in = new ObjectInputStream(istream);
	3517	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3518	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3399	3519	Object obj = in.readObject();
	3520	+
	3521	+ bais //istream
	3522	+ .close();
3400	3523	in.close();
3401	3524
3402	3525	return obj;
..	..	@@ -3455,6 +3578,27 @@
3455	3578
3456	3579	public void Save()
3457	3580	{
	3581	+ Save(true);
	3582	+ }
	3583	+
	3584	+ private boolean Equal(byte[] compress, byte[] name)
	3585	+ {
	3586	+ if (compress.length != name.length)
	3587	+ {
	3588	+ return false;
	3589	+ }
	3590	+
	3591	+ for (int i=compress.length; --i>=0;)
	3592	+ {
	3593	+ if (compress[i] != name[i])
	3594	+ return false;
	3595	+ }
	3596	+
	3597	+ return true;
	3598	+ }
	3599	+
	3600	+ public boolean Save(boolean user)
	3601	+ {
3458	3602	System.err.println("Save");
3459	3603
3460	3604	cRadio tab = GetCurrentTab();
..	..	@@ -3464,20 +3608,42 @@
3464	3608
3465	3609	copy.ExtractBigData(hashtable);
3466	3610
3467		- //EditorFrame.m_MainFrame.requestFocusInWindow();
3468		- tab.graphs[tab.undoindex++] = Compress(copy);
3469		-
3470		- copy.RestoreBigData(hashtable);
	3611	+ byte[] compress = Compress(copy);
3471	3612
3472	3613	CameraPane.SWITCH = temp;
3473	3614
	3615	+ boolean thesame = false;
	3616	+
	3617	+ // Quick heuristic using length. Works only when stream is compressed.
	3618	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3619	+ {
	3620	+ thesame = true;
	3621	+ }
	3622	+
	3623	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3624	+ if (!thesame)
	3625	+ {
	3626	+ //tab.user[tab.undoindex] = user;
	3627	+ boolean increment = tab.graphs[tab.undoindex] == null;
	3628	+
	3629	+ tab.graphs[tab.undoindex] = compress;
	3630	+
	3631	+ if (increment)
	3632	+ tab.undoindex++;
	3633	+ }
	3634	+
	3635	+ copy.RestoreBigData(hashtable);
	3636	+
3474	3637	//assert(hashtable.isEmpty());
3475	3638
3476	3639	for (int i = tab.undoindex; i < tab.graphs.length; i++)
3477	3640	{
3478		- tab.graphs[i] = null;
	3641	+ //tab.user[i] = false;
	3642	+ // tab.graphs[i] = null;
3479	3643	}
3480	3644
	3645	+ SetUndoStates();
	3646	+
3481	3647	// test save
3482	3648	if (false)
3483	3649	{
..	..	@@ -3496,10 +3662,14 @@
3496	3662	e.printStackTrace();
3497	3663	}
3498	3664	}
	3665	+
	3666	+ return !thesame;
3499	3667	}
3500	3668
3501	3669	void CopyChanged(Object3D obj)
3502	3670	{
	3671	+ SetUndoStates();
	3672	+
3503	3673	boolean temp = CameraPane.SWITCH;
3504	3674	CameraPane.SWITCH = false;
3505	3675
..	..	@@ -3539,7 +3709,18 @@
3539	3709	refreshContents();
3540	3710	}
3541	3711
3542		- public void Undo()
	3712	+ cButton undoButton;
	3713	+ cButton redoButton;
	3714	+
	3715	+ void SetUndoStates()
	3716	+ {
	3717	+ cRadio tab = GetCurrentTab();
	3718	+
	3719	+ undoButton.setEnabled(tab.undoindex > 0);
	3720	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3721	+ }
	3722	+
	3723	+ public boolean Undo()
3543	3724	{
3544	3725	System.err.println("Undo");
3545	3726
..	..	@@ -3548,18 +3729,27 @@
3548	3729	if (tab.undoindex == 0)
3549	3730	{
3550	3731	java.awt.Toolkit.getDefaultToolkit().beep();
3551		- return;
	3732	+ return false;
3552	3733	}
3553	3734
3554		- if (tab.graphs[tab.undoindex] == null)
	3735	+ if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
3555	3736	{
3556		- Save();
3557		- tab.undoindex -= 1;
	3737	+ if (Save(false))
	3738	+ tab.undoindex -= 1;
	3739	+ else
	3740	+ {
	3741	+ if (tab.undoindex <= 0)
	3742	+ return false;
	3743	+ else
	3744	+ tab.undoindex -= 1;
	3745	+ }
3558	3746	}
3559	3747
3560	3748	tab.undoindex -= 1;
3561	3749
3562	3750	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3751	+
	3752	+ return true;
3563	3753	}
3564	3754
3565	3755	public void Redo()
..	..	@@ -3575,6 +3765,9 @@
3575	3765	tab.undoindex += 1;
3576	3766
3577	3767	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3768	+
	3769	+ //if (!tab.user[tab.undoindex])
	3770	+ // tab.graphs[tab.undoindex] = null;
3578	3771	}
3579	3772
3580	3773	void ImportGFD()
..	..	@@ -3726,7 +3919,7 @@
3726	3919	assert false;
3727	3920	}
3728	3921
3729		- void EditSelection()
	3922	+ void EditSelection(boolean newWindow)
3730	3923	{
3731	3924	}
3732	3925
..	..	@@ -4221,7 +4414,7 @@
4221	4414
4222	4415	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4223	4416	{
4224		- if (Globals.SAVEONMAKE)
	4417	+ if (Globals.SAVEONMAKE) // && resetmodel)
4225	4418	Save();
4226	4419	//Tween.set(thing, 0).target(1).start(tweenManager);
4227	4420	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4309,6 +4502,12 @@
4309	4502	{
4310	4503	ResetModel();
4311	4504	Select(thing.GetTreePath(), true, false); // unselect... false);
	4505	+
	4506	+ if (thing.Size() == 0)
	4507	+ {
	4508	+ //EditSelection(false);
	4509	+ }
	4510	+
4312	4511	refreshContents();
4313	4512	}
4314	4513
..	..	@@ -4531,8 +4730,8 @@
4531	4730
4532	4731	if (readobj != null)
4533	4732	{
4534		- if (Globals.SAVEONMAKE)
4535		- Save();
	4733	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4734	+ // Save();
4536	4735	try
4537	4736	{
4538	4737	//readobj.deepCopySelf(copy);
..	..	@@ -4593,7 +4792,7 @@
4593	4792	}
4594	4793	}
4595	4794
4596		- void load() // throws ClassNotFoundException
	4795	+ void Open() // throws ClassNotFoundException
4597	4796	{
4598	4797	if (Grafreed.standAlone)
4599	4798	{
..	..	@@ -4710,6 +4909,8 @@
4710	4909	String filename = browser.getFile();
4711	4910	if (filename != null && filename.length() > 0)
4712	4911	{
	4912	+ if (!filename.endsWith(".gfd"))
	4913	+ filename += ".gfd";
4713	4914	lastname = browser.getDirectory() + filename;
4714	4915	save();
4715	4916	}
..	..	@@ -4876,7 +5077,7 @@
4876	5077	MenuBar menuBar;
4877	5078	Menu fileMenu;
4878	5079	MenuItem newItem;
4879		- MenuItem loadItem;
	5080	+ MenuItem openItem;
4880	5081	MenuItem saveItem;
4881	5082	MenuItem saveAsItem;
4882	5083	MenuItem exportAsItem;
..	..	@@ -4899,22 +5100,36 @@
4899	5100	CheckboxMenuItem toggleSwitchItem;
4900	5101	CheckboxMenuItem toggleRootItem;
4901	5102	CheckboxMenuItem animationItem;
	5103	+ MenuItem archiveItem;
4902	5104	CheckboxMenuItem toggleHandleItem;
4903	5105	CheckboxMenuItem togglePaintItem;
4904	5106	JSplitPane mainPanel;
4905	5107	JScrollPane scrollpane;
	5108	+
4906	5109	JPanel toolbarPanel;
	5110	+
4907	5111	cGridBag treePanel;
	5112	+
4908	5113	JPanel radioPanel;
4909	5114	ButtonGroup buttonGroup;
4910		- cGridBag ctrlPanel;
	5115	+
	5116	+ cGridBag toolboxPanel;
4911	5117	cGridBag materialPanel;
	5118	+ cGridBag ctrlPanel;
	5119	+
4912	5120	JScrollPane infoPanel;
	5121	+
4913	5122	cGridBag optionsPanel;
	5123	+
4914	5124	JTabbedPane objectPanel;
	5125	+ boolean materialFlushed;
	5126	+ Object3D latestObject;
	5127	+
4915	5128	cGridBag XYZPanel;
	5129	+
4916	5130	JSplitPane gridPanel;
4917	5131	JSplitPane bigPanel;
	5132	+
4918	5133	cGridBag bigThree;
4919	5134	cGridBag scenePanel;
4920	5135	cGridBag centralPanel;
..	..	@@ -5029,7 +5244,7 @@
5029	5244	cNumberSlider fogField;
5030	5245	JLabel opacityPowerLabel;
5031	5246	cNumberSlider opacityPowerField;
5032		- JTree jTree;
	5247	+ cTree jTree;
5033	5248	//ObjectUI parent;
5034	5249
5035	5250	cNumberSlider normalpushField;