~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,9 +813,30 @@
742	813	radio.layout.doClick();
743	814	//frame.setVisible(true);
744	815	}
745		-
746		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
747	817	}
	818	+
	819	+ private byte[] CompressCopy()
	820	+ {
	821	+ boolean temp = CameraPane.SWITCH;
	822	+ CameraPane.SWITCH = false;
	823	+
	824	+ copy.ExtractBigData(versiontable);
	825	+ // if (copy == client)
	826	+
	827	+ byte[] versions[] = copy.versions;
	828	+ copy.versions = null;
	829	+
	830	+ byte[] compress = Compress(copy);
	831	+
	832	+ copy.versions = versions;
	833	+
	834	+ copy.RestoreBigData(versiontable);
	835	+
	836	+ CameraPane.SWITCH = temp;
	837	+
	838	+ return compress;
	839	+ }
748	840
749	841	private JTextPane createTextPane()
750	842	{
..	..	@@ -884,7 +976,12 @@
884	976	JCheckBox speedupCB;
885	977	JCheckBox rewindCB;
886	978	JCheckBox flipVCB;
	979	+
	980	+ cCheckBox toggleTextureCB;
	981	+ cCheckBox toggleSwitchCB;
	982	+
887	983	JComboBox texresMenu;
	984	+
888	985	JButton resetButton;
889	986	JButton stepButton;
890	987	JButton stepAllButton;
..	..	@@ -1071,12 +1168,12 @@
1071	1168	namePanel = new cGridBag();
1072	1169
1073	1170	nameField = AddText(namePanel, copy.GetName());
1074		- namePanel.add(nameField);
	1171	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1075	1172	oe.ctrlPanel.add(namePanel);
1076	1173
1077	1174	oe.ctrlPanel.Return();
1078	1175
1079		- if (!GroupEditor.allparams)
	1176	+ if (!allparams)
1080	1177	return;
1081	1178
1082	1179	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1089,20 +1186,21 @@
1089	1186	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1090	1187	hideCB.setToolTipText("Hide object");
1091	1188	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092		- markCB.setToolTipText("Set the animation target transform");
	1189	+ markCB.setToolTipText("As animation target transform");
1093	1190
1094	1191	setupPanel2 = new cGridBag().setVertical(false);
1095	1192
1096	1193	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1097	1194	rewindCB.setToolTipText("Rewind animation");
1098	1195
1099		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1196	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1197	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1101	1198
	1199	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1200	+ link2masterCB.setToolTipText("Attach to support");
	1201	+
1102	1202	if (Globals.ADVANCED)
1103	1203	{
1104		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1105		- link2masterCB.setToolTipText("Attach to support");
1106	1204	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1107	1205	speedupCB.setToolTipText("Option motion capture");
1108	1206	}
..	..	@@ -1412,14 +1510,17 @@
1412	1510
1413	1511	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1414	1512	//tmp.setName("Edit");
1415		- objectPanel.add(toolboxPanel);
1416	1513	objectPanel.add(materialPanel);
1417	1514	// JPanel north = new JPanel(new BorderLayout());
1418	1515	// north.setName("Edit");
1419	1516	// north.add(ctrlPanel, BorderLayout.NORTH);
1420	1517	// objectPanel.add(north);
1421	1518	objectPanel.add(editPanel);
1422		- objectPanel.add(infoPanel);
	1519	+
	1520	+ //if (Globals.ADVANCED)
	1521	+ objectPanel.add(infoPanel);
	1522	+
	1523	+ objectPanel.add(toolboxPanel);
1423	1524
1424	1525	/*
1425	1526	aConstraints.gridx = 0;
..	..	@@ -1428,7 +1529,7 @@
1428	1529	aConstraints.gridy += 1;
1429	1530	aConstraints.gridwidth = 1;
1430	1531	mainPanel.add(objectPanel, aConstraints);
1431		- */
	1532	+ */
1432	1533
1433	1534	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1434	1535	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1445,9 +1546,7 @@
1445	1546	JTabbedPane tabbedPane = new JTabbedPane();
1446	1547	tabbedPane.add(scrollpane);
1447	1548
1448		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1449		-
1450		- optionsPanel = new cGridBag().setVertical(true);
	1549	+ optionsPanel = new cGridBag().setVertical(false);
1451	1550
1452	1551	optionsPanel.setName("Options");
1453	1552
..	..	@@ -1455,6 +1554,8 @@
1455	1554
1456	1555	tabbedPane.add(optionsPanel);
1457	1556
	1557	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1558	+
1458	1559	scenePanel.add(tabbedPane);
1459	1560
1460	1561	/*
..	..	@@ -1527,9 +1628,9 @@
1527	1628	// aConstraints.gridheight = 1;
1528	1629
1529	1630	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1530		- framePanel.setContinuousLayout(true);
1531		- framePanel.setOneTouchExpandable(true);
1532		- framePanel.setDividerLocation(0.8);
	1631	+ framePanel.setContinuousLayout(false);
	1632	+ framePanel.setOneTouchExpandable(false);
	1633	+ //.setDividerLocation(0.8);
1533	1634	//framePanel.setDividerSize(15);
1534	1635	//framePanel.setResizeWeight(0.15);
1535	1636	framePanel.setName("Frame");
..	..	@@ -1547,11 +1648,14 @@
1547	1648	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1548	1649
1549	1650	frame.setSize(1280, 860);
1550		- frame.setVisible(true);
1551		-
	1651	+
1552	1652	cameraView.requestFocusInWindow();
1553	1653
1554	1654	gridPanel.setDividerLocation(1.0);
	1655	+
	1656	+ frame.validate();
	1657	+
	1658	+ frame.setVisible(true);
1555	1659
1556	1660	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1557	1661	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1638,24 +1742,6 @@
1638	1742	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1639	1743	colorSection.add(texture);
1640	1744
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	1745	panel.add(new JSeparator());
1660	1746
1661	1747	panel.add(colorSection);
..	..	@@ -1705,6 +1791,12 @@
1705	1791	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706	1792	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1707	1793	diffuseSection.add(fakedepth);
	1794	+
	1795	+ cGridBag shadowbias = new cGridBag();
	1796	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1797	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1798	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1799	+ diffuseSection.add(shadowbias);
1708	1800
1709	1801	panel.add(new JSeparator());
1710	1802
..	..	@@ -1756,6 +1848,18 @@
1756	1848	// aConstraints.gridy += 1;
1757	1849	// aConstraints.gridwidth = 1;
1758	1850
	1851	+ cGridBag anisoU = new cGridBag();
	1852	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1853	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1854	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1855	+ specularSection.add(anisoU);
	1856	+
	1857	+ cGridBag anisoV = new cGridBag();
	1858	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1859	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1860	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1861	+ specularSection.add(anisoV);
	1862	+
1759	1863
1760	1864	panel.add(new JSeparator());
1761	1865
..	..	@@ -1763,35 +1867,35 @@
1763	1867
1764	1868	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1765	1869
1766		- cGridBag globalSection = new cGridBag().setVertical(true);
	1870	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1767	1871
1768	1872	cGridBag camera = new cGridBag();
1769	1873	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1770	1874	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1771	1875	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1772		- globalSection.add(camera);
	1876	+ colorSection.add(camera);
1773	1877
1774	1878	cGridBag ambient = new cGridBag();
1775	1879	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1776	1880	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1777	1881	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1778		- globalSection.add(ambient);
	1882	+ colorSection.add(ambient);
1779	1883
1780	1884	cGridBag backlit = new cGridBag();
1781	1885	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1782	1886	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1783	1887	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1784		- globalSection.add(backlit);
	1888	+ colorSection.add(backlit);
1785	1889
1786	1890	cGridBag opacity = new cGridBag();
1787	1891	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1788	1892	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789	1893	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1790		- globalSection.add(opacity);
	1894	+ colorSection.add(opacity);
1791	1895
1792		- panel.add(new JSeparator());
	1896	+ //panel.add(new JSeparator());
1793	1897
1794		- panel.add(globalSection);
	1898	+ //panel.add(globalSection);
1795	1899
1796	1900	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	1901
..	..	@@ -1898,8 +2002,9 @@
1898	2002	// 3D models
1899	2003	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1900	2004	{
1901		- lastConverter = new com.jmex.model.converters.MaxToJme();
1902		- LoadFile(filename, lastConverter);
	2005	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2006	+ //LoadFile(filename, lastConverter);
	2007	+ LoadObjFile(filename); // New 3ds loader
1903	2008	continue;
1904	2009	}
1905	2010	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2625,6 +2730,7 @@
2625	2730	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2626	2731	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2627	2732	}
	2733	+
2628	2734	//cJME.count++;
2629	2735	//cJME.count %= 12;
2630	2736	if (gc)
..	..	@@ -2808,6 +2914,7 @@
2808	2914	}
2809	2915	}
2810	2916	}
	2917	+
2811	2918	cFileSystemPane FSPane;
2812	2919
2813	2920	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2861,11 +2968,14 @@
2861	2968	}
2862	2969	}
2863	2970	}
	2971	+
2864	2972	freezematerial = false;
2865	2973	}
2866	2974
2867	2975	void SetMaterial(Object3D object)
2868	2976	{
	2977	+ latestObject = object;
	2978	+
2869	2979	cMaterial mat = object.material;
2870	2980
2871	2981	if (mat == null)
..	..	@@ -2977,12 +3087,17 @@
2977	3087	// }
2978	3088
2979	3089	/**/
2980		- if (deselect)
	3090	+ if (deselect \|\| child == null)
2981	3091	{
2982	3092	//group.deselectAll();
2983	3093	//freeze = true;
2984	3094	GetTree().clearSelection();
2985	3095	//freeze = false;
	3096	+
	3097	+ if (child == null)
	3098	+ {
	3099	+ return;
	3100	+ }
2986	3101	}
2987	3102
2988	3103	//group.addSelectee(child);
..	..	@@ -3051,7 +3166,7 @@
3051	3166	cameraView.ToggleDL();
3052	3167	cameraView.repaint();
3053	3168	return;
3054		- } else if (event.getSource() == toggleTextureItem)
	3169	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3055	3170	{
3056	3171	cameraView.ToggleTexture();
3057	3172	// june 2013 copy.HardTouch();
..	..	@@ -3090,7 +3205,7 @@
3090	3205	frame.validate();
3091	3206
3092	3207	return;
3093		- } else if (event.getSource() == toggleSwitchItem)
	3208	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3094	3209	{
3095	3210	cameraView.ToggleSwitch();
3096	3211	cameraView.repaint();
..	..	@@ -3306,9 +3421,9 @@
3306	3421	{
3307	3422	Close();
3308	3423	//return true;
3309		- } else if (source == loadItem)
	3424	+ } else if (source == openItem)
3310	3425	{
3311		- load();
	3426	+ Open();
3312	3427	//return true;
3313	3428	} else if (source == newItem)
3314	3429	{
..	..	@@ -3333,6 +3448,10 @@
3333	3448	{
3334	3449	generatePOV();
3335	3450	//return true;
	3451	+ } else if (event.getSource() == archiveItem)
	3452	+ {
	3453	+ cTools.Archive(frame);
	3454	+ return;
3336	3455	} else if (source == zBufferItem)
3337	3456	{
3338	3457	try
..	..	@@ -3384,8 +3503,8 @@
3384	3503	try
3385	3504	{
3386	3505	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3387		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3388		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3506	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3507	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3389	3508
3390	3509	Object3D parent = o.parent;
3391	3510	o.parent = null;
..	..	@@ -3396,10 +3515,14 @@
3396	3515
3397	3516	out.flush();
3398	3517
3399		- zstream.close();
	3518	+ baos //zstream
	3519	+ .close();
3400	3520	out.close();
3401	3521
3402		- return baos.toByteArray();
	3522	+ byte[] bytes = baos.toByteArray();
	3523	+
	3524	+ System.out.println("save #bytes = " + bytes.length);
	3525	+ return bytes;
3403	3526	} catch (Exception e)
3404	3527	{
3405	3528	System.err.println(e);
..	..	@@ -3409,13 +3532,16 @@
3409	3532
3410	3533	static public Object Uncompress(byte[] bytes)
3411	3534	{
3412		- System.out.println("#bytes = " + bytes.length);
	3535	+ System.out.println("restore #bytes = " + bytes.length);
3413	3536	try
3414	3537	{
3415	3538	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3416		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3417		- ObjectInputStream in = new ObjectInputStream(istream);
	3539	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3540	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3418	3541	Object obj = in.readObject();
	3542	+
	3543	+ bais //istream
	3544	+ .close();
3419	3545	in.close();
3420	3546
3421	3547	return obj;
..	..	@@ -3470,39 +3596,77 @@
3470	3596	return null;
3471	3597	}
3472	3598
3473		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3474	3599
3475	3600	public void Save()
	3601	+ {
	3602	+ //Save(true);
	3603	+ Replace();
	3604	+ }
	3605	+
	3606	+ private boolean Equal(byte[] compress, byte[] name)
	3607	+ {
	3608	+ if (compress.length != name.length)
	3609	+ {
	3610	+ return false;
	3611	+ }
	3612	+
	3613	+ for (int i=compress.length; --i>=0;)
	3614	+ {
	3615	+ if (compress[i] != name[i])
	3616	+ return false;
	3617	+ }
	3618	+
	3619	+ return true;
	3620	+ }
	3621	+
	3622	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3623	+
	3624	+ public boolean Save(boolean user)
3476	3625	{
3477	3626	System.err.println("Save");
3478	3627
3479	3628	cRadio tab = GetCurrentTab();
3480	3629
3481		- boolean temp = CameraPane.SWITCH;
3482		- CameraPane.SWITCH = false;
	3630	+ byte[] compress = CompressCopy();
3483	3631
3484		- copy.ExtractBigData(hashtable);
	3632	+ boolean thesame = false;
	3633	+
	3634	+ // Quick heuristic using length. Works only when stream is compressed.
	3635	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3636	+ {
	3637	+ thesame = true;
	3638	+ }
3485	3639
3486	3640	//EditorFrame.m_MainFrame.requestFocusInWindow();
3487		- tab.graphs[tab.undoindex++] = Compress(copy);
3488		-
3489		- copy.RestoreBigData(hashtable);
3490		-
3491		- CameraPane.SWITCH = temp;
3492		-
3493		- //assert(hashtable.isEmpty());
3494		-
3495		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3641	+ if (!thesame)
3496	3642	{
3497		- tab.graphs[i] = null;
	3643	+ //tab.user[tab.versionindex] = user;
	3644	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3645	+
	3646	+ copy.versions[++copy.versionindex] = compress;
	3647	+
	3648	+ // if (increment)
	3649	+ // tab.versionindex++;
3498	3650	}
3499	3651
	3652	+ //copy.RestoreBigData(versiontable);
	3653	+
	3654	+ //assert(hashtable.isEmpty());
	3655	+
	3656	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3657	+ {
	3658	+ //tab.user[i] = false;
	3659	+ copy.versions[i] = null;
	3660	+ }
	3661	+
	3662	+ SetUndoStates();
	3663	+
3500	3664	// test save
3501	3665	if (false)
3502	3666	{
3503	3667	try
3504	3668	{
3505		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3669	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3506	3670	ObjectOutputStream p = new ObjectOutputStream(ostream);
3507	3671
3508	3672	p.writeObject(copy);
..	..	@@ -3515,14 +3679,18 @@
3515	3679	e.printStackTrace();
3516	3680	}
3517	3681	}
	3682	+
	3683	+ return !thesame;
3518	3684	}
3519	3685
3520	3686	void CopyChanged(Object3D obj)
3521	3687	{
	3688	+ SetUndoStates();
	3689	+
3522	3690	boolean temp = CameraPane.SWITCH;
3523	3691	CameraPane.SWITCH = false;
3524	3692
3525		- copy.ExtractBigData(hashtable);
	3693	+ copy.ExtractBigData(versiontable);
3526	3694
3527	3695	copy.clear();
3528	3696
..	..	@@ -3531,7 +3699,7 @@
3531	3699	copy.add(obj.get(i));
3532	3700	}
3533	3701
3534		- copy.RestoreBigData(hashtable);
	3702	+ copy.RestoreBigData(versiontable);
3535	3703
3536	3704	CameraPane.SWITCH = temp;
3537	3705
..	..	@@ -3558,42 +3726,103 @@
3558	3726	refreshContents();
3559	3727	}
3560	3728
3561		- public void Undo()
	3729	+ cButton undoButton;
	3730	+ cButton restoreButton;
	3731	+ cButton replaceButton;
	3732	+ cButton redoButton;
	3733	+
	3734	+ void SetUndoStates()
	3735	+ {
	3736	+ cRadio tab = GetCurrentTab();
	3737	+
	3738	+ restoreButton.setEnabled(copy.versionindex != -1);
	3739	+ replaceButton.setEnabled(copy.versionindex != -1);
	3740	+ undoButton.setEnabled(copy.versionindex > 0);
	3741	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3742	+ }
	3743	+
	3744	+ public boolean Undo()
3562	3745	{
3563	3746	System.err.println("Undo");
3564	3747
3565	3748	cRadio tab = GetCurrentTab();
3566	3749
3567		- if (tab.undoindex == 0)
	3750	+ if (copy.versionindex == 0)
3568	3751	{
3569	3752	java.awt.Toolkit.getDefaultToolkit().beep();
3570		- return;
	3753	+ return false;
3571	3754	}
3572	3755
3573		- if (tab.graphs[tab.undoindex] == null)
	3756	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3757	+// {
	3758	+// if (Save(false))
	3759	+// tab.versionindex -= 1;
	3760	+// else
	3761	+// {
	3762	+// if (tab.versionindex <= 0)
	3763	+// return false;
	3764	+// else
	3765	+// tab.versionindex -= 1;
	3766	+// }
	3767	+// }
	3768	+
	3769	+ copy.versionindex -= 1;
	3770	+
	3771	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3772	+
	3773	+ return true;
	3774	+ }
	3775	+
	3776	+ public boolean Restore()
	3777	+ {
	3778	+ System.err.println("Restore");
	3779	+
	3780	+ cRadio tab = GetCurrentTab();
	3781	+
	3782	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3574	3783	{
3575		- Save();
3576		- tab.undoindex -= 1;
	3784	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3785	+ return false;
3577	3786	}
3578	3787
3579		- tab.undoindex -= 1;
	3788	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3789	+
	3790	+ return true;
	3791	+ }
3580	3792
3581		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3793	+ public boolean Replace()
	3794	+ {
	3795	+ System.err.println("Replace");
	3796	+
	3797	+ cRadio tab = GetCurrentTab();
	3798	+
	3799	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3800	+ {
	3801	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3802	+ return false;
	3803	+ }
	3804	+
	3805	+ copy.versions[copy.versionindex] = CompressCopy();
	3806	+
	3807	+ return true;
3582	3808	}
3583	3809
3584	3810	public void Redo()
3585	3811	{
3586	3812	cRadio tab = GetCurrentTab();
3587	3813
3588		- if (tab.graphs[tab.undoindex + 1] == null)
	3814	+ if (copy.versions[copy.versionindex + 1] == null)
3589	3815	{
3590	3816	java.awt.Toolkit.getDefaultToolkit().beep();
3591	3817	return;
3592	3818	}
3593	3819
3594		- tab.undoindex += 1;
	3820	+ copy.versionindex += 1;
3595	3821
3596		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3822	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3823	+
	3824	+ //if (!tab.user[tab.versionindex])
	3825	+ // tab.graphs[tab.versionindex] = null;
3597	3826	}
3598	3827
3599	3828	void ImportGFD()
..	..	@@ -3889,9 +4118,22 @@
3889	4118	//copy.Touch();
3890	4119	}
3891	4120
	4121	+ cNumberSlider versionField;
	4122	+
3892	4123	public void stateChanged(ChangeEvent e)
3893	4124	{
3894	4125	// assert(false);
	4126	+ if (e.getSource() == versionField)
	4127	+ {
	4128	+ int version = versionField.getInteger();
	4129	+
	4130	+ if (copy.versions[version] != null)
	4131	+ {
	4132	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4133	+ }
	4134	+
	4135	+ return;
	4136	+ }
3895	4137
3896	4138	if (freezematerial)
3897	4139	{
..	..	@@ -4240,7 +4482,7 @@
4240	4482
4241	4483	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4242	4484	{
4243		- if (Globals.SAVEONMAKE) // && resetmodel)
	4485	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4244	4486	Save();
4245	4487	//Tween.set(thing, 0).target(1).start(tweenManager);
4246	4488	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4556,8 +4798,8 @@
4556	4798
4557	4799	if (readobj != null)
4558	4800	{
4559		- if (Globals.SAVEONMAKE)
4560		- Save();
	4801	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4802	+ // Save();
4561	4803	try
4562	4804	{
4563	4805	//readobj.deepCopySelf(copy);
..	..	@@ -4612,13 +4854,18 @@
4612	4854	c.addChild(csg);
4613	4855	}
4614	4856
	4857	+ copy.versions = readobj.versions;
	4858	+ copy.versionindex = readobj.versionindex;
	4859	+
	4860	+ SetUndoStates();
	4861	+
4615	4862	ResetModel();
4616	4863	copy.HardTouch(); // recompile?
4617	4864	refreshContents();
4618	4865	}
4619	4866	}
4620	4867
4621		- void load() // throws ClassNotFoundException
	4868	+ void Open() // throws ClassNotFoundException
4622	4869	{
4623	4870	if (Grafreed.standAlone)
4624	4871	{
..	..	@@ -4735,6 +4982,8 @@
4735	4982	String filename = browser.getFile();
4736	4983	if (filename != null && filename.length() > 0)
4737	4984	{
	4985	+ if (!filename.endsWith(".gfd"))
	4986	+ filename += ".gfd";
4738	4987	lastname = browser.getDirectory() + filename;
4739	4988	save();
4740	4989	}
..	..	@@ -4901,7 +5150,7 @@
4901	5150	MenuBar menuBar;
4902	5151	Menu fileMenu;
4903	5152	MenuItem newItem;
4904		- MenuItem loadItem;
	5153	+ MenuItem openItem;
4905	5154	MenuItem saveItem;
4906	5155	MenuItem saveAsItem;
4907	5156	MenuItem exportAsItem;
..	..	@@ -4924,6 +5173,7 @@
4924	5173	CheckboxMenuItem toggleSwitchItem;
4925	5174	CheckboxMenuItem toggleRootItem;
4926	5175	CheckboxMenuItem animationItem;
	5176	+ MenuItem archiveItem;
4927	5177	CheckboxMenuItem toggleHandleItem;
4928	5178	CheckboxMenuItem togglePaintItem;
4929	5179	JSplitPane mainPanel;
..	..	@@ -4945,6 +5195,8 @@
4945	5195	cGridBag optionsPanel;
4946	5196
4947	5197	JTabbedPane objectPanel;
	5198	+ boolean materialFlushed;
	5199	+ Object3D latestObject;
4948	5200
4949	5201	cGridBag XYZPanel;
4950	5202