~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.
..	..	@@ -207,7 +210,7 @@
207	210
208	211	objEditor.ctrlPanel.remove(namePanel);
209	212
210		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
211	214	return;
212	215
213	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -306,7 +309,7 @@
306	309	//localCopy.parent = null;
307	310
308	311	frame = new JFrame();
309		- frame.setUndecorated(true);
	312	+ frame.setUndecorated(false);
310	313	objEditor = this;
311	314	this.callee = callee;
312	315
..	..	@@ -337,12 +340,17 @@
337	340	return frame.action(event, obj);
338	341	}
339	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	+
340	348	void SetupMenu()
341	349	{
342	350	frame.setMenuBar(menuBar = new MenuBar());
343	351	menuBar.add(fileMenu = new Menu("File"));
344	352	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	353	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	354
347	355	//oe.menuBar.add(menu = new Menu("Include"));
348	356	Menu menu = new Menu("Import");
..	..	@@ -374,7 +382,7 @@
374	382	}
375	383
376	384	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
378	386	saveItem.addActionListener(this);
379	387	saveAsItem.addActionListener(this);
380	388	exportAsItem.addActionListener(this);
..	..	@@ -383,6 +391,32 @@
383	391	closeItem.addActionListener(this);
384	392
385	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	+
386	420	toolbarPanel = new JPanel();
387	421	toolbarPanel.setName("Toolbar");
388	422	treePanel = new cGridBag();
..	..	@@ -415,7 +449,7 @@
415	449	// TEXTAREA infoarea.setLineWrap(true);
416	450	// TEXTAREA infoarea.setWrapStyleWord(true);
417	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
418		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
419	453	infoPanel.setName("Info");
420	454	//infoPanel.setLayout(new BorderLayout());
421	455	//infoPanel.add(createTextPane());
..	..	@@ -427,7 +461,14 @@
427	461	mainPanel.setDividerSize(9);
428	462	mainPanel.setDividerLocation(0.5); //1.0);
429	463	mainPanel.setResizeWeight(0.5);
430		-
	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	+
431	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432	473	//mainPanel.setLayout(new GridBagLayout());
433	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -658,8 +699,8 @@
658	699	}
659	700	}
660	701
661		-static GraphicsDevice device = GraphicsEnvironment
662		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
663	704
664	705	Rectangle keeprect;
665	706	cRadio radio;
..	..	@@ -680,10 +721,19 @@
680	721	void Minimize()
681	722	{
682	723	frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
683	725	}
684	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={}
685	730	void Maximize()
686	731	{
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
687	737	if (maximized)
688	738	{
689	739	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -691,20 +741,36 @@
691	741	else
692	742	{
693	743	keeprect = frame.getBounds();
694		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
695		- Dimension rect2 = frame.getToolkit().getScreenSize();
696		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
697	747	// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
698	749	}
699	750
700	751	maximized ^= true;
	752	+
	753	+ frame.validate();
701	754	}
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
702	759
703	760	void ToggleFullScreen()
704	761	{
705		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
706	767	{
707	768	device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
708	774	//frame.setVisible(false);
709	775	// frame.removeNotify();
710	776	// frame.setUndecorated(false);
..	..	@@ -714,7 +780,7 @@
714	780	// X frame.getContentPane().remove(/"Center",/bigThree);
715	781	// X framePanel.add(bigThree);
716	782	// X frame.getContentPane().add(/"Center",/framePanel);
717		- framePanel.setDividerLocation(1);
	783	+ framePanel.setDividerLocation(46);
718	784
719	785	//frame.setVisible(true);
720	786	radio.layout = keepButton;
..	..	@@ -729,7 +795,12 @@
729	795	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
730	796	// frame.getToolkit().getScreenSize().height);
731	797	//frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
732	801	device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
733	804	// frame.removeNotify();
734	805	// frame.setUndecorated(true);
735	806	// frame.addNotify();
..	..	@@ -742,8 +813,7 @@
742	813	radio.layout.doClick();
743	814	//frame.setVisible(true);
744	815	}
745		-
746		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
747	817	}
748	818
749	819	private JTextPane createTextPane()
..	..	@@ -884,7 +954,12 @@
884	954	JCheckBox speedupCB;
885	955	JCheckBox rewindCB;
886	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
887	961	JComboBox texresMenu;
	962	+
888	963	JButton resetButton;
889	964	JButton stepButton;
890	965	JButton stepAllButton;
..	..	@@ -1071,12 +1146,12 @@
1071	1146	namePanel = new cGridBag();
1072	1147
1073	1148	nameField = AddText(namePanel, copy.GetName());
1074		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1075	1150	oe.ctrlPanel.add(namePanel);
1076	1151
1077	1152	oe.ctrlPanel.Return();
1078	1153
1079		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
1080	1155	return;
1081	1156
1082	1157	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1089,20 +1164,21 @@
1089	1164	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1090	1165	hideCB.setToolTipText("Hide object");
1091	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092		- markCB.setToolTipText("Set the animation target transform");
	1167	+ markCB.setToolTipText("As animation target transform");
1093	1168
1094	1169	setupPanel2 = new cGridBag().setVertical(false);
1095	1170
1096	1171	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1097	1172	rewindCB.setToolTipText("Rewind animation");
1098	1173
1099		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100		- 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)");
1101	1176
	1177	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1178	+ link2masterCB.setToolTipText("Attach to support");
	1179	+
1102	1180	if (Globals.ADVANCED)
1103	1181	{
1104		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1105		- link2masterCB.setToolTipText("Attach to support");
1106	1182	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1107	1183	speedupCB.setToolTipText("Option motion capture");
1108	1184	}
..	..	@@ -1412,14 +1488,17 @@
1412	1488
1413	1489	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1414	1490	//tmp.setName("Edit");
1415		- objectPanel.add(toolboxPanel);
1416	1491	objectPanel.add(materialPanel);
1417	1492	// JPanel north = new JPanel(new BorderLayout());
1418	1493	// north.setName("Edit");
1419	1494	// north.add(ctrlPanel, BorderLayout.NORTH);
1420	1495	// objectPanel.add(north);
1421	1496	objectPanel.add(editPanel);
1422		- objectPanel.add(infoPanel);
	1497	+
	1498	+ //if (Globals.ADVANCED)
	1499	+ objectPanel.add(infoPanel);
	1500	+
	1501	+ objectPanel.add(toolboxPanel);
1423	1502
1424	1503	/*
1425	1504	aConstraints.gridx = 0;
..	..	@@ -1428,7 +1507,7 @@
1428	1507	aConstraints.gridy += 1;
1429	1508	aConstraints.gridwidth = 1;
1430	1509	mainPanel.add(objectPanel, aConstraints);
1431		- */
	1510	+ */
1432	1511
1433	1512	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1434	1513	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1445,9 +1524,7 @@
1445	1524	JTabbedPane tabbedPane = new JTabbedPane();
1446	1525	tabbedPane.add(scrollpane);
1447	1526
1448		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1449		-
1450		- optionsPanel = new cGridBag().setVertical(true);
	1527	+ optionsPanel = new cGridBag().setVertical(false);
1451	1528
1452	1529	optionsPanel.setName("Options");
1453	1530
..	..	@@ -1455,6 +1532,8 @@
1455	1532
1456	1533	tabbedPane.add(optionsPanel);
1457	1534
	1535	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1536	+
1458	1537	scenePanel.add(tabbedPane);
1459	1538
1460	1539	/*
..	..	@@ -1527,9 +1606,9 @@
1527	1606	// aConstraints.gridheight = 1;
1528	1607
1529	1608	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1530		- framePanel.setContinuousLayout(true);
1531		- framePanel.setOneTouchExpandable(true);
1532		- framePanel.setDividerLocation(0.8);
	1609	+ framePanel.setContinuousLayout(false);
	1610	+ framePanel.setOneTouchExpandable(false);
	1611	+ //.setDividerLocation(0.8);
1533	1612	//framePanel.setDividerSize(15);
1534	1613	//framePanel.setResizeWeight(0.15);
1535	1614	framePanel.setName("Frame");
..	..	@@ -1547,11 +1626,14 @@
1547	1626	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1548	1627
1549	1628	frame.setSize(1280, 860);
1550		- frame.setVisible(true);
1551		-
	1629	+
1552	1630	cameraView.requestFocusInWindow();
1553	1631
1554	1632	gridPanel.setDividerLocation(1.0);
	1633	+
	1634	+ frame.validate();
	1635	+
	1636	+ frame.setVisible(true);
1555	1637
1556	1638	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1557	1639	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1638,24 +1720,6 @@
1638	1720	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1639	1721	colorSection.add(texture);
1640	1722
1641		- cGridBag anisoU = new cGridBag();
1642		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1643		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1644		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1645		- colorSection.add(anisoU);
1646		-
1647		- cGridBag anisoV = new cGridBag();
1648		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1649		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1650		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1651		- colorSection.add(anisoV);
1652		-
1653		- cGridBag shadowbias = new cGridBag();
1654		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1655		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1656		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1657		- colorSection.add(shadowbias);
1658		-
1659	1723	panel.add(new JSeparator());
1660	1724
1661	1725	panel.add(colorSection);
..	..	@@ -1705,6 +1769,12 @@
1705	1769	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706	1770	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1707	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);
1708	1778
1709	1779	panel.add(new JSeparator());
1710	1780
..	..	@@ -1756,6 +1826,18 @@
1756	1826	// aConstraints.gridy += 1;
1757	1827	// aConstraints.gridwidth = 1;
1758	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	+
1759	1841
1760	1842	panel.add(new JSeparator());
1761	1843
..	..	@@ -1763,35 +1845,35 @@
1763	1845
1764	1846	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1765	1847
1766		- cGridBag globalSection = new cGridBag().setVertical(true);
	1848	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1767	1849
1768	1850	cGridBag camera = new cGridBag();
1769	1851	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1770	1852	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1771	1853	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1772		- globalSection.add(camera);
	1854	+ colorSection.add(camera);
1773	1855
1774	1856	cGridBag ambient = new cGridBag();
1775	1857	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1776	1858	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1777	1859	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1778		- globalSection.add(ambient);
	1860	+ colorSection.add(ambient);
1779	1861
1780	1862	cGridBag backlit = new cGridBag();
1781	1863	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1782	1864	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1783	1865	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1784		- globalSection.add(backlit);
	1866	+ colorSection.add(backlit);
1785	1867
1786	1868	cGridBag opacity = new cGridBag();
1787	1869	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1788	1870	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789	1871	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1790		- globalSection.add(opacity);
	1872	+ colorSection.add(opacity);
1791	1873
1792		- panel.add(new JSeparator());
	1874	+ //panel.add(new JSeparator());
1793	1875
1794		- panel.add(globalSection);
	1876	+ //panel.add(globalSection);
1795	1877
1796	1878	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	1879
..	..	@@ -1898,8 +1980,9 @@
1898	1980	// 3D models
1899	1981	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1900	1982	{
1901		- lastConverter = new com.jmex.model.converters.MaxToJme();
1902		- LoadFile(filename, lastConverter);
	1983	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1984	+ //LoadFile(filename, lastConverter);
	1985	+ LoadObjFile(filename); // New 3ds loader
1903	1986	continue;
1904	1987	}
1905	1988	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2625,6 +2708,7 @@
2625	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2626	2709	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2627	2710	}
	2711	+
2628	2712	//cJME.count++;
2629	2713	//cJME.count %= 12;
2630	2714	if (gc)
..	..	@@ -2808,6 +2892,7 @@
2808	2892	}
2809	2893	}
2810	2894	}
	2895	+
2811	2896	cFileSystemPane FSPane;
2812	2897
2813	2898	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2861,11 +2946,14 @@
2861	2946	}
2862	2947	}
2863	2948	}
	2949	+
2864	2950	freezematerial = false;
2865	2951	}
2866	2952
2867	2953	void SetMaterial(Object3D object)
2868	2954	{
	2955	+ latestObject = object;
	2956	+
2869	2957	cMaterial mat = object.material;
2870	2958
2871	2959	if (mat == null)
..	..	@@ -2977,12 +3065,17 @@
2977	3065	// }
2978	3066
2979	3067	/**/
2980		- if (deselect)
	3068	+ if (deselect \|\| child == null)
2981	3069	{
2982	3070	//group.deselectAll();
2983	3071	//freeze = true;
2984	3072	GetTree().clearSelection();
2985	3073	//freeze = false;
	3074	+
	3075	+ if (child == null)
	3076	+ {
	3077	+ return;
	3078	+ }
2986	3079	}
2987	3080
2988	3081	//group.addSelectee(child);
..	..	@@ -3051,7 +3144,7 @@
3051	3144	cameraView.ToggleDL();
3052	3145	cameraView.repaint();
3053	3146	return;
3054		- } else if (event.getSource() == toggleTextureItem)
	3147	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3055	3148	{
3056	3149	cameraView.ToggleTexture();
3057	3150	// june 2013 copy.HardTouch();
..	..	@@ -3090,7 +3183,7 @@
3090	3183	frame.validate();
3091	3184
3092	3185	return;
3093		- } else if (event.getSource() == toggleSwitchItem)
	3186	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3094	3187	{
3095	3188	cameraView.ToggleSwitch();
3096	3189	cameraView.repaint();
..	..	@@ -3306,9 +3399,9 @@
3306	3399	{
3307	3400	Close();
3308	3401	//return true;
3309		- } else if (source == loadItem)
	3402	+ } else if (source == openItem)
3310	3403	{
3311		- load();
	3404	+ Open();
3312	3405	//return true;
3313	3406	} else if (source == newItem)
3314	3407	{
..	..	@@ -3333,6 +3426,10 @@
3333	3426	{
3334	3427	generatePOV();
3335	3428	//return true;
	3429	+ } else if (event.getSource() == archiveItem)
	3430	+ {
	3431	+ cTools.Archive(frame);
	3432	+ return;
3336	3433	} else if (source == zBufferItem)
3337	3434	{
3338	3435	try
..	..	@@ -3384,8 +3481,8 @@
3384	3481	try
3385	3482	{
3386	3483	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3387		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3388		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3484	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3485	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3389	3486
3390	3487	Object3D parent = o.parent;
3391	3488	o.parent = null;
..	..	@@ -3396,10 +3493,14 @@
3396	3493
3397	3494	out.flush();
3398	3495
3399		- zstream.close();
	3496	+ baos //zstream
	3497	+ .close();
3400	3498	out.close();
3401	3499
3402		- return baos.toByteArray();
	3500	+ byte[] bytes = baos.toByteArray();
	3501	+
	3502	+ System.out.println("save #bytes = " + bytes.length);
	3503	+ return bytes;
3403	3504	} catch (Exception e)
3404	3505	{
3405	3506	System.err.println(e);
..	..	@@ -3409,13 +3510,16 @@
3409	3510
3410	3511	static public Object Uncompress(byte[] bytes)
3411	3512	{
3412		- System.out.println("#bytes = " + bytes.length);
	3513	+ System.out.println("restore #bytes = " + bytes.length);
3413	3514	try
3414	3515	{
3415	3516	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3416		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3417		- ObjectInputStream in = new ObjectInputStream(istream);
	3517	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3518	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3418	3519	Object obj = in.readObject();
	3520	+
	3521	+ bais //istream
	3522	+ .close();
3419	3523	in.close();
3420	3524
3421	3525	return obj;
..	..	@@ -3474,6 +3578,27 @@
3474	3578
3475	3579	public void Save()
3476	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	+ {
3477	3602	System.err.println("Save");
3478	3603
3479	3604	cRadio tab = GetCurrentTab();
..	..	@@ -3483,20 +3608,42 @@
3483	3608
3484	3609	copy.ExtractBigData(hashtable);
3485	3610
3486		- //EditorFrame.m_MainFrame.requestFocusInWindow();
3487		- tab.graphs[tab.undoindex++] = Compress(copy);
3488		-
3489		- copy.RestoreBigData(hashtable);
	3611	+ byte[] compress = Compress(copy);
3490	3612
3491	3613	CameraPane.SWITCH = temp;
3492	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	+
3493	3637	//assert(hashtable.isEmpty());
3494	3638
3495	3639	for (int i = tab.undoindex; i < tab.graphs.length; i++)
3496	3640	{
3497		- tab.graphs[i] = null;
	3641	+ //tab.user[i] = false;
	3642	+ // tab.graphs[i] = null;
3498	3643	}
3499	3644
	3645	+ SetUndoStates();
	3646	+
3500	3647	// test save
3501	3648	if (false)
3502	3649	{
..	..	@@ -3515,10 +3662,14 @@
3515	3662	e.printStackTrace();
3516	3663	}
3517	3664	}
	3665	+
	3666	+ return !thesame;
3518	3667	}
3519	3668
3520	3669	void CopyChanged(Object3D obj)
3521	3670	{
	3671	+ SetUndoStates();
	3672	+
3522	3673	boolean temp = CameraPane.SWITCH;
3523	3674	CameraPane.SWITCH = false;
3524	3675
..	..	@@ -3558,7 +3709,18 @@
3558	3709	refreshContents();
3559	3710	}
3560	3711
3561		- 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()
3562	3724	{
3563	3725	System.err.println("Undo");
3564	3726
..	..	@@ -3567,18 +3729,27 @@
3567	3729	if (tab.undoindex == 0)
3568	3730	{
3569	3731	java.awt.Toolkit.getDefaultToolkit().beep();
3570		- return;
	3732	+ return false;
3571	3733	}
3572	3734
3573		- if (tab.graphs[tab.undoindex] == null)
	3735	+ if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
3574	3736	{
3575		- Save();
3576		- 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	+ }
3577	3746	}
3578	3747
3579	3748	tab.undoindex -= 1;
3580	3749
3581	3750	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3751	+
	3752	+ return true;
3582	3753	}
3583	3754
3584	3755	public void Redo()
..	..	@@ -3594,6 +3765,9 @@
3594	3765	tab.undoindex += 1;
3595	3766
3596	3767	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3768	+
	3769	+ //if (!tab.user[tab.undoindex])
	3770	+ // tab.graphs[tab.undoindex] = null;
3597	3771	}
3598	3772
3599	3773	void ImportGFD()
..	..	@@ -4556,8 +4730,8 @@
4556	4730
4557	4731	if (readobj != null)
4558	4732	{
4559		- if (Globals.SAVEONMAKE)
4560		- Save();
	4733	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4734	+ // Save();
4561	4735	try
4562	4736	{
4563	4737	//readobj.deepCopySelf(copy);
..	..	@@ -4618,7 +4792,7 @@
4618	4792	}
4619	4793	}
4620	4794
4621		- void load() // throws ClassNotFoundException
	4795	+ void Open() // throws ClassNotFoundException
4622	4796	{
4623	4797	if (Grafreed.standAlone)
4624	4798	{
..	..	@@ -4735,6 +4909,8 @@
4735	4909	String filename = browser.getFile();
4736	4910	if (filename != null && filename.length() > 0)
4737	4911	{
	4912	+ if (!filename.endsWith(".gfd"))
	4913	+ filename += ".gfd";
4738	4914	lastname = browser.getDirectory() + filename;
4739	4915	save();
4740	4916	}
..	..	@@ -4901,7 +5077,7 @@
4901	5077	MenuBar menuBar;
4902	5078	Menu fileMenu;
4903	5079	MenuItem newItem;
4904		- MenuItem loadItem;
	5080	+ MenuItem openItem;
4905	5081	MenuItem saveItem;
4906	5082	MenuItem saveAsItem;
4907	5083	MenuItem exportAsItem;
..	..	@@ -4924,6 +5100,7 @@
4924	5100	CheckboxMenuItem toggleSwitchItem;
4925	5101	CheckboxMenuItem toggleRootItem;
4926	5102	CheckboxMenuItem animationItem;
	5103	+ MenuItem archiveItem;
4927	5104	CheckboxMenuItem toggleHandleItem;
4928	5105	CheckboxMenuItem togglePaintItem;
4929	5106	JSplitPane mainPanel;
..	..	@@ -4945,6 +5122,8 @@
4945	5122	cGridBag optionsPanel;
4946	5123
4947	5124	JTabbedPane objectPanel;
	5125	+ boolean materialFlushed;
	5126	+ Object3D latestObject;
4948	5127
4949	5128	cGridBag XYZPanel;
4950	5129