~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);
..	..	@@ -279,6 +282,12 @@
279	282	client = inClient;
280	283	copy = client;
281	284
	285	+ if (copy.versions == null)
	286	+ {
	287	+ copy.versions = new byte[100][];
	288	+ copy.versionindex = -1;
	289	+ }
	290	+
282	291	// "this" is not called: SetupUI2(objEditor);
283	292	}
284	293
..	..	@@ -292,6 +301,12 @@
292	301	client = inClient;
293	302	copy = client;
294	303
	304	+ if (copy.versions == null)
	305	+ {
	306	+ copy.versions = new byte[100][];
	307	+ copy.versionindex = -1;
	308	+ }
	309	+
295	310	SetupUI2(callee.GetEditor());
296	311	}
297	312
..	..	@@ -306,7 +321,7 @@
306	321	//localCopy.parent = null;
307	322
308	323	frame = new JFrame();
309		- frame.setUndecorated(true);
	324	+ frame.setUndecorated(false);
310	325	objEditor = this;
311	326	this.callee = callee;
312	327
..	..	@@ -324,6 +339,12 @@
324	339	copy = localCopy;
325	340	copy.editWindow = this;
326	341
	342	+ if (copy.versions == null)
	343	+ {
	344	+ copy.versions = new byte[100][];
	345	+ copy.versionindex = -1;
	346	+ }
	347	+
327	348	SetupMenu();
328	349
329	350	//SetupName(objEditor); // new
..	..	@@ -337,12 +358,17 @@
337	358	return frame.action(event, obj);
338	359	}
339	360
	361	+ // Cannot work without static
	362	+ static boolean allparams = true;
	363	+
	364	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	365	+
340	366	void SetupMenu()
341	367	{
342	368	frame.setMenuBar(menuBar = new MenuBar());
343	369	menuBar.add(fileMenu = new Menu("File"));
344	370	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	371	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	372
347	373	//oe.menuBar.add(menu = new Menu("Include"));
348	374	Menu menu = new Menu("Import");
..	..	@@ -374,7 +400,7 @@
374	400	}
375	401
376	402	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	403	+ openItem.addActionListener(this);
378	404	saveItem.addActionListener(this);
379	405	saveAsItem.addActionListener(this);
380	406	exportAsItem.addActionListener(this);
..	..	@@ -383,6 +409,32 @@
383	409	closeItem.addActionListener(this);
384	410
385	411	objectPanel = new JTabbedPane();
	412	+
	413	+ ChangeListener changeListener = new ChangeListener()
	414	+ {
	415	+ public void stateChanged(ChangeEvent changeEvent)
	416	+ {
	417	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	418	+// {
	419	+// if (latestObject != null)
	420	+// {
	421	+// refreshContents(true);
	422	+// SetMaterial(latestObject);
	423	+// }
	424	+//
	425	+// materialFlushed = true;
	426	+// }
	427	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	428	+// {
	429	+// if (listUI.size() == 0)
	430	+// EditSelection(false);
	431	+// }
	432	+
	433	+ refreshContents(false); // To refresh Info tab
	434	+ }
	435	+ };
	436	+ objectPanel.addChangeListener(changeListener);
	437	+
386	438	toolbarPanel = new JPanel();
387	439	toolbarPanel.setName("Toolbar");
388	440	treePanel = new cGridBag();
..	..	@@ -415,7 +467,7 @@
415	467	// TEXTAREA infoarea.setLineWrap(true);
416	468	// TEXTAREA infoarea.setWrapStyleWord(true);
417	469	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
418		- infoPanel.setPreferredSize(new Dimension(50, 200));
	470	+ infoPanel.setPreferredSize(new Dimension(1, 1));
419	471	infoPanel.setName("Info");
420	472	//infoPanel.setLayout(new BorderLayout());
421	473	//infoPanel.add(createTextPane());
..	..	@@ -427,7 +479,14 @@
427	479	mainPanel.setDividerSize(9);
428	480	mainPanel.setDividerLocation(0.5); //1.0);
429	481	mainPanel.setResizeWeight(0.5);
430		-
	482	+
	483	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	484	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	485	+ divider.setDividerSize(15);
	486	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	487	+
	488	+ mainPanel.setUI(new BasicSplitPaneUI());
	489	+
431	490	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432	491	//mainPanel.setLayout(new GridBagLayout());
433	492	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -658,8 +717,8 @@
658	717	}
659	718	}
660	719
661		-static GraphicsDevice device = GraphicsEnvironment
662		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	720	+//static GraphicsDevice device = GraphicsEnvironment
	721	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
663	722
664	723	Rectangle keeprect;
665	724	cRadio radio;
..	..	@@ -680,10 +739,19 @@
680	739	void Minimize()
681	740	{
682	741	frame.setState(Frame.ICONIFIED);
	742	+ frame.validate();
683	743	}
684	744
	745	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	746	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	747	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
685	748	void Maximize()
686	749	{
	750	+ if (CameraPane.FULLSCREEN)
	751	+ {
	752	+ ToggleFullScreen();
	753	+ }
	754	+
687	755	if (maximized)
688	756	{
689	757	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -691,20 +759,36 @@
691	759	else
692	760	{
693	761	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);
	762	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	763	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	764	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
697	765	// frame.setState(Frame.MAXIMIZED_BOTH);
	766	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
698	767	}
699	768
700	769	maximized ^= true;
	770	+
	771	+ frame.validate();
701	772	}
	773	+
	774	+ cButton minButton;
	775	+ cButton maxButton;
	776	+ cButton fullButton;
702	777
703	778	void ToggleFullScreen()
704	779	{
705		- if (CameraPane.FULLSCREEN)
	780	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	781	+
	782	+ cameraView.ToggleFullScreen();
	783	+
	784	+ if (!CameraPane.FULLSCREEN)
706	785	{
707	786	device.setFullScreenWindow(null);
	787	+ frame.dispose();
	788	+ frame.setUndecorated(false);
	789	+ frame.validate();
	790	+ frame.setVisible(true);
	791	+
708	792	//frame.setVisible(false);
709	793	// frame.removeNotify();
710	794	// frame.setUndecorated(false);
..	..	@@ -714,7 +798,7 @@
714	798	// X frame.getContentPane().remove(/"Center",/bigThree);
715	799	// X framePanel.add(bigThree);
716	800	// X frame.getContentPane().add(/"Center",/framePanel);
717		- framePanel.setDividerLocation(1);
	801	+ framePanel.setDividerLocation(46);
718	802
719	803	//frame.setVisible(true);
720	804	radio.layout = keepButton;
..	..	@@ -729,7 +813,12 @@
729	813	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
730	814	// frame.getToolkit().getScreenSize().height);
731	815	//frame.setVisible(false);
	816	+
	817	+ frame.dispose();
	818	+ frame.setUndecorated(true);
732	819	device.setFullScreenWindow(frame);
	820	+ frame.validate();
	821	+ frame.setVisible(true);
733	822	// frame.removeNotify();
734	823	// frame.setUndecorated(true);
735	824	// frame.addNotify();
..	..	@@ -742,9 +831,30 @@
742	831	radio.layout.doClick();
743	832	//frame.setVisible(true);
744	833	}
745		-
746		- cameraView.ToggleFullScreen();
	834	+ frame.validate();
747	835	}
	836	+
	837	+ private byte[] CompressCopy()
	838	+ {
	839	+ boolean temp = CameraPane.SWITCH;
	840	+ CameraPane.SWITCH = false;
	841	+
	842	+ copy.ExtractBigData(versiontable);
	843	+ // if (copy == client)
	844	+
	845	+ byte[] versions[] = copy.versions;
	846	+ copy.versions = null;
	847	+
	848	+ byte[] compress = Compress(copy);
	849	+
	850	+ copy.versions = versions;
	851	+
	852	+ copy.RestoreBigData(versiontable);
	853	+
	854	+ CameraPane.SWITCH = temp;
	855	+
	856	+ return compress;
	857	+ }
748	858
749	859	private JTextPane createTextPane()
750	860	{
..	..	@@ -884,7 +994,12 @@
884	994	JCheckBox speedupCB;
885	995	JCheckBox rewindCB;
886	996	JCheckBox flipVCB;
	997	+
	998	+ cCheckBox toggleTextureCB;
	999	+ cCheckBox toggleSwitchCB;
	1000	+
887	1001	JComboBox texresMenu;
	1002	+
888	1003	JButton resetButton;
889	1004	JButton stepButton;
890	1005	JButton stepAllButton;
..	..	@@ -1071,12 +1186,12 @@
1071	1186	namePanel = new cGridBag();
1072	1187
1073	1188	nameField = AddText(namePanel, copy.GetName());
1074		- namePanel.add(nameField);
	1189	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1075	1190	oe.ctrlPanel.add(namePanel);
1076	1191
1077	1192	oe.ctrlPanel.Return();
1078	1193
1079		- if (!GroupEditor.allparams)
	1194	+ if (!allparams)
1080	1195	return;
1081	1196
1082	1197	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1089,20 +1204,21 @@
1089	1204	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1090	1205	hideCB.setToolTipText("Hide object");
1091	1206	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092		- markCB.setToolTipText("Set the animation target transform");
	1207	+ markCB.setToolTipText("As animation target transform");
1093	1208
1094	1209	setupPanel2 = new cGridBag().setVertical(false);
1095	1210
1096	1211	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1097	1212	rewindCB.setToolTipText("Rewind animation");
1098	1213
1099		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1214	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1215	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1101	1216
	1217	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1218	+ link2masterCB.setToolTipText("Attach to support");
	1219	+
1102	1220	if (Globals.ADVANCED)
1103	1221	{
1104		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1105		- link2masterCB.setToolTipText("Attach to support");
1106	1222	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1107	1223	speedupCB.setToolTipText("Option motion capture");
1108	1224	}
..	..	@@ -1412,14 +1528,17 @@
1412	1528
1413	1529	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1414	1530	//tmp.setName("Edit");
1415		- objectPanel.add(toolboxPanel);
1416	1531	objectPanel.add(materialPanel);
1417	1532	// JPanel north = new JPanel(new BorderLayout());
1418	1533	// north.setName("Edit");
1419	1534	// north.add(ctrlPanel, BorderLayout.NORTH);
1420	1535	// objectPanel.add(north);
1421	1536	objectPanel.add(editPanel);
1422		- objectPanel.add(infoPanel);
	1537	+
	1538	+ //if (Globals.ADVANCED)
	1539	+ objectPanel.add(infoPanel);
	1540	+
	1541	+ objectPanel.add(toolboxPanel);
1423	1542
1424	1543	/*
1425	1544	aConstraints.gridx = 0;
..	..	@@ -1428,7 +1547,7 @@
1428	1547	aConstraints.gridy += 1;
1429	1548	aConstraints.gridwidth = 1;
1430	1549	mainPanel.add(objectPanel, aConstraints);
1431		- */
	1550	+ */
1432	1551
1433	1552	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1434	1553	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1445,9 +1564,7 @@
1445	1564	JTabbedPane tabbedPane = new JTabbedPane();
1446	1565	tabbedPane.add(scrollpane);
1447	1566
1448		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1449		-
1450		- optionsPanel = new cGridBag().setVertical(true);
	1567	+ optionsPanel = new cGridBag().setVertical(false);
1451	1568
1452	1569	optionsPanel.setName("Options");
1453	1570
..	..	@@ -1455,6 +1572,8 @@
1455	1572
1456	1573	tabbedPane.add(optionsPanel);
1457	1574
	1575	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1576	+
1458	1577	scenePanel.add(tabbedPane);
1459	1578
1460	1579	/*
..	..	@@ -1527,9 +1646,9 @@
1527	1646	// aConstraints.gridheight = 1;
1528	1647
1529	1648	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1530		- framePanel.setContinuousLayout(true);
1531		- framePanel.setOneTouchExpandable(true);
1532		- framePanel.setDividerLocation(0.8);
	1649	+ framePanel.setContinuousLayout(false);
	1650	+ framePanel.setOneTouchExpandable(false);
	1651	+ //.setDividerLocation(0.8);
1533	1652	//framePanel.setDividerSize(15);
1534	1653	//framePanel.setResizeWeight(0.15);
1535	1654	framePanel.setName("Frame");
..	..	@@ -1547,11 +1666,14 @@
1547	1666	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1548	1667
1549	1668	frame.setSize(1280, 860);
1550		- frame.setVisible(true);
1551		-
	1669	+
1552	1670	cameraView.requestFocusInWindow();
1553	1671
1554	1672	gridPanel.setDividerLocation(1.0);
	1673	+
	1674	+ frame.validate();
	1675	+
	1676	+ frame.setVisible(true);
1555	1677
1556	1678	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1557	1679	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1638,24 +1760,6 @@
1638	1760	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1639	1761	colorSection.add(texture);
1640	1762
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	1763	panel.add(new JSeparator());
1660	1764
1661	1765	panel.add(colorSection);
..	..	@@ -1705,6 +1809,12 @@
1705	1809	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706	1810	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1707	1811	diffuseSection.add(fakedepth);
	1812	+
	1813	+ cGridBag shadowbias = new cGridBag();
	1814	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1815	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1816	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1817	+ diffuseSection.add(shadowbias);
1708	1818
1709	1819	panel.add(new JSeparator());
1710	1820
..	..	@@ -1756,6 +1866,18 @@
1756	1866	// aConstraints.gridy += 1;
1757	1867	// aConstraints.gridwidth = 1;
1758	1868
	1869	+ cGridBag anisoU = new cGridBag();
	1870	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1871	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1872	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1873	+ specularSection.add(anisoU);
	1874	+
	1875	+ cGridBag anisoV = new cGridBag();
	1876	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1877	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1878	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1879	+ specularSection.add(anisoV);
	1880	+
1759	1881
1760	1882	panel.add(new JSeparator());
1761	1883
..	..	@@ -1763,35 +1885,35 @@
1763	1885
1764	1886	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1765	1887
1766		- cGridBag globalSection = new cGridBag().setVertical(true);
	1888	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1767	1889
1768	1890	cGridBag camera = new cGridBag();
1769	1891	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1770	1892	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1771	1893	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1772		- globalSection.add(camera);
	1894	+ colorSection.add(camera);
1773	1895
1774	1896	cGridBag ambient = new cGridBag();
1775	1897	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1776	1898	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1777	1899	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1778		- globalSection.add(ambient);
	1900	+ colorSection.add(ambient);
1779	1901
1780	1902	cGridBag backlit = new cGridBag();
1781	1903	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1782	1904	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1783	1905	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1784		- globalSection.add(backlit);
	1906	+ colorSection.add(backlit);
1785	1907
1786	1908	cGridBag opacity = new cGridBag();
1787	1909	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1788	1910	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789	1911	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1790		- globalSection.add(opacity);
	1912	+ colorSection.add(opacity);
1791	1913
1792		- panel.add(new JSeparator());
	1914	+ //panel.add(new JSeparator());
1793	1915
1794		- panel.add(globalSection);
	1916	+ //panel.add(globalSection);
1795	1917
1796	1918	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	1919
..	..	@@ -1898,8 +2020,9 @@
1898	2020	// 3D models
1899	2021	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1900	2022	{
1901		- lastConverter = new com.jmex.model.converters.MaxToJme();
1902		- LoadFile(filename, lastConverter);
	2023	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2024	+ //LoadFile(filename, lastConverter);
	2025	+ LoadObjFile(filename); // New 3ds loader
1903	2026	continue;
1904	2027	}
1905	2028	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2625,6 +2748,7 @@
2625	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2626	2749	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2627	2750	}
	2751	+
2628	2752	//cJME.count++;
2629	2753	//cJME.count %= 12;
2630	2754	if (gc)
..	..	@@ -2808,6 +2932,7 @@
2808	2932	}
2809	2933	}
2810	2934	}
	2935	+
2811	2936	cFileSystemPane FSPane;
2812	2937
2813	2938	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2861,11 +2986,14 @@
2861	2986	}
2862	2987	}
2863	2988	}
	2989	+
2864	2990	freezematerial = false;
2865	2991	}
2866	2992
2867	2993	void SetMaterial(Object3D object)
2868	2994	{
	2995	+ latestObject = object;
	2996	+
2869	2997	cMaterial mat = object.material;
2870	2998
2871	2999	if (mat == null)
..	..	@@ -2977,12 +3105,17 @@
2977	3105	// }
2978	3106
2979	3107	/**/
2980		- if (deselect)
	3108	+ if (deselect \|\| child == null)
2981	3109	{
2982	3110	//group.deselectAll();
2983	3111	//freeze = true;
2984	3112	GetTree().clearSelection();
2985	3113	//freeze = false;
	3114	+
	3115	+ if (child == null)
	3116	+ {
	3117	+ return;
	3118	+ }
2986	3119	}
2987	3120
2988	3121	//group.addSelectee(child);
..	..	@@ -3051,7 +3184,7 @@
3051	3184	cameraView.ToggleDL();
3052	3185	cameraView.repaint();
3053	3186	return;
3054		- } else if (event.getSource() == toggleTextureItem)
	3187	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3055	3188	{
3056	3189	cameraView.ToggleTexture();
3057	3190	// june 2013 copy.HardTouch();
..	..	@@ -3090,7 +3223,7 @@
3090	3223	frame.validate();
3091	3224
3092	3225	return;
3093		- } else if (event.getSource() == toggleSwitchItem)
	3226	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3094	3227	{
3095	3228	cameraView.ToggleSwitch();
3096	3229	cameraView.repaint();
..	..	@@ -3306,9 +3439,9 @@
3306	3439	{
3307	3440	Close();
3308	3441	//return true;
3309		- } else if (source == loadItem)
	3442	+ } else if (source == openItem)
3310	3443	{
3311		- load();
	3444	+ Open();
3312	3445	//return true;
3313	3446	} else if (source == newItem)
3314	3447	{
..	..	@@ -3333,6 +3466,10 @@
3333	3466	{
3334	3467	generatePOV();
3335	3468	//return true;
	3469	+ } else if (event.getSource() == archiveItem)
	3470	+ {
	3471	+ cTools.Archive(frame);
	3472	+ return;
3336	3473	} else if (source == zBufferItem)
3337	3474	{
3338	3475	try
..	..	@@ -3384,8 +3521,8 @@
3384	3521	try
3385	3522	{
3386	3523	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3387		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3388		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3524	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3525	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3389	3526
3390	3527	Object3D parent = o.parent;
3391	3528	o.parent = null;
..	..	@@ -3396,10 +3533,14 @@
3396	3533
3397	3534	out.flush();
3398	3535
3399		- zstream.close();
	3536	+ baos //zstream
	3537	+ .close();
3400	3538	out.close();
3401	3539
3402		- return baos.toByteArray();
	3540	+ byte[] bytes = baos.toByteArray();
	3541	+
	3542	+ System.out.println("save #bytes = " + bytes.length);
	3543	+ return bytes;
3403	3544	} catch (Exception e)
3404	3545	{
3405	3546	System.err.println(e);
..	..	@@ -3409,13 +3550,16 @@
3409	3550
3410	3551	static public Object Uncompress(byte[] bytes)
3411	3552	{
3412		- System.out.println("#bytes = " + bytes.length);
	3553	+ System.out.println("restore #bytes = " + bytes.length);
3413	3554	try
3414	3555	{
3415	3556	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3416		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3417		- ObjectInputStream in = new ObjectInputStream(istream);
	3557	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3558	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3418	3559	Object obj = in.readObject();
	3560	+
	3561	+ bais //istream
	3562	+ .close();
3419	3563	in.close();
3420	3564
3421	3565	return obj;
..	..	@@ -3470,39 +3614,77 @@
3470	3614	return null;
3471	3615	}
3472	3616
3473		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3474	3617
3475	3618	public void Save()
	3619	+ {
	3620	+ //Save(true);
	3621	+ Replace();
	3622	+ }
	3623	+
	3624	+ private boolean Equal(byte[] compress, byte[] name)
	3625	+ {
	3626	+ if (compress.length != name.length)
	3627	+ {
	3628	+ return false;
	3629	+ }
	3630	+
	3631	+ for (int i=compress.length; --i>=0;)
	3632	+ {
	3633	+ if (compress[i] != name[i])
	3634	+ return false;
	3635	+ }
	3636	+
	3637	+ return true;
	3638	+ }
	3639	+
	3640	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3641	+
	3642	+ public boolean Save(boolean user)
3476	3643	{
3477	3644	System.err.println("Save");
3478	3645
3479	3646	cRadio tab = GetCurrentTab();
3480	3647
3481		- boolean temp = CameraPane.SWITCH;
3482		- CameraPane.SWITCH = false;
	3648	+ byte[] compress = CompressCopy();
3483	3649
3484		- copy.ExtractBigData(hashtable);
	3650	+ boolean thesame = false;
	3651	+
	3652	+ // Quick heuristic using length. Works only when stream is compressed.
	3653	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3654	+ {
	3655	+ thesame = true;
	3656	+ }
3485	3657
3486	3658	//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++)
	3659	+ if (!thesame)
3496	3660	{
3497		- tab.graphs[i] = null;
	3661	+ //tab.user[tab.versionindex] = user;
	3662	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3663	+
	3664	+ copy.versions[++copy.versionindex] = compress;
	3665	+
	3666	+ // if (increment)
	3667	+ // tab.versionindex++;
3498	3668	}
3499	3669
	3670	+ //copy.RestoreBigData(versiontable);
	3671	+
	3672	+ //assert(hashtable.isEmpty());
	3673	+
	3674	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3675	+ {
	3676	+ //tab.user[i] = false;
	3677	+ copy.versions[i] = null;
	3678	+ }
	3679	+
	3680	+ SetUndoStates();
	3681	+
3500	3682	// test save
3501	3683	if (false)
3502	3684	{
3503	3685	try
3504	3686	{
3505		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3687	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3506	3688	ObjectOutputStream p = new ObjectOutputStream(ostream);
3507	3689
3508	3690	p.writeObject(copy);
..	..	@@ -3515,14 +3697,18 @@
3515	3697	e.printStackTrace();
3516	3698	}
3517	3699	}
	3700	+
	3701	+ return !thesame;
3518	3702	}
3519	3703
3520	3704	void CopyChanged(Object3D obj)
3521	3705	{
	3706	+ SetUndoStates();
	3707	+
3522	3708	boolean temp = CameraPane.SWITCH;
3523	3709	CameraPane.SWITCH = false;
3524	3710
3525		- copy.ExtractBigData(hashtable);
	3711	+ copy.ExtractBigData(versiontable);
3526	3712
3527	3713	copy.clear();
3528	3714
..	..	@@ -3531,7 +3717,7 @@
3531	3717	copy.add(obj.get(i));
3532	3718	}
3533	3719
3534		- copy.RestoreBigData(hashtable);
	3720	+ copy.RestoreBigData(versiontable);
3535	3721
3536	3722	CameraPane.SWITCH = temp;
3537	3723
..	..	@@ -3558,42 +3744,130 @@
3558	3744	refreshContents();
3559	3745	}
3560	3746
3561		- public void Undo()
	3747	+ cButton undoButton;
	3748	+ cButton restoreButton;
	3749	+ cButton replaceButton;
	3750	+ cButton redoButton;
	3751	+
	3752	+ boolean muteSlider;
	3753	+
	3754	+ int VersionCount()
3562	3755	{
	3756	+ int count = 0;
	3757	+
	3758	+ for (int i = copy.versions.length; --i >= 0;)
	3759	+ {
	3760	+ if (copy.versions[i] != null)
	3761	+ count++;
	3762	+ }
	3763	+
	3764	+ return count;
	3765	+ }
	3766	+
	3767	+ void SetUndoStates()
	3768	+ {
	3769	+ cRadio tab = GetCurrentTab();
	3770	+
	3771	+ restoreButton.setEnabled(copy.versionindex != -1);
	3772	+ replaceButton.setEnabled(copy.versionindex != -1);
	3773	+
	3774	+ undoButton.setEnabled(copy.versionindex > 0);
	3775	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3776	+
	3777	+ muteSlider = true;
	3778	+ versionSlider.setMaximum(VersionCount() - 1);
	3779	+ versionSlider.setInteger(copy.versionindex);
	3780	+ muteSlider = false;
	3781	+ }
	3782	+
	3783	+ public boolean Undo()
	3784	+ {
	3785	+ // Option?
	3786	+ Replace();
	3787	+
3563	3788	System.err.println("Undo");
3564	3789
3565	3790	cRadio tab = GetCurrentTab();
3566	3791
3567		- if (tab.undoindex == 0)
	3792	+ if (copy.versionindex == 0)
3568	3793	{
3569	3794	java.awt.Toolkit.getDefaultToolkit().beep();
3570		- return;
	3795	+ return false;
3571	3796	}
3572	3797
3573		- if (tab.graphs[tab.undoindex] == null)
	3798	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3799	+// {
	3800	+// if (Save(false))
	3801	+// tab.versionindex -= 1;
	3802	+// else
	3803	+// {
	3804	+// if (tab.versionindex <= 0)
	3805	+// return false;
	3806	+// else
	3807	+// tab.versionindex -= 1;
	3808	+// }
	3809	+// }
	3810	+
	3811	+ copy.versionindex -= 1;
	3812	+
	3813	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3814	+
	3815	+ return true;
	3816	+ }
	3817	+
	3818	+ public boolean Restore()
	3819	+ {
	3820	+ System.err.println("Restore");
	3821	+
	3822	+ cRadio tab = GetCurrentTab();
	3823	+
	3824	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3574	3825	{
3575		- Save();
3576		- tab.undoindex -= 1;
	3826	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3827	+ return false;
3577	3828	}
3578	3829
3579		- tab.undoindex -= 1;
	3830	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3831	+
	3832	+ return true;
	3833	+ }
3580	3834
3581		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3835	+ public boolean Replace()
	3836	+ {
	3837	+ System.err.println("Replace");
	3838	+
	3839	+ cRadio tab = GetCurrentTab();
	3840	+
	3841	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3842	+ {
	3843	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3844	+ return false;
	3845	+ }
	3846	+
	3847	+ copy.versions[copy.versionindex] = CompressCopy();
	3848	+
	3849	+ return true;
3582	3850	}
3583	3851
3584	3852	public void Redo()
3585	3853	{
	3854	+ // Option?
	3855	+ Replace();
	3856	+
3586	3857	cRadio tab = GetCurrentTab();
3587	3858
3588		- if (tab.graphs[tab.undoindex + 1] == null)
	3859	+ if (copy.versions[copy.versionindex + 1] == null)
3589	3860	{
3590	3861	java.awt.Toolkit.getDefaultToolkit().beep();
3591	3862	return;
3592	3863	}
3593	3864
3594		- tab.undoindex += 1;
	3865	+ copy.versionindex += 1;
3595	3866
3596		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3867	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3868	+
	3869	+ //if (!tab.user[tab.versionindex])
	3870	+ // tab.graphs[tab.versionindex] = null;
3597	3871	}
3598	3872
3599	3873	void ImportGFD()
..	..	@@ -3889,9 +4163,25 @@
3889	4163	//copy.Touch();
3890	4164	}
3891	4165
	4166	+ cNumberSlider versionSlider;
	4167	+
3892	4168	public void stateChanged(ChangeEvent e)
3893	4169	{
3894	4170	// assert(false);
	4171	+ if (e.getSource() == versionSlider)
	4172	+ {
	4173	+ if (muteSlider)
	4174	+ return;
	4175	+
	4176	+ int version = versionSlider.getInteger();
	4177	+
	4178	+ if (copy.versions[version] != null)
	4179	+ {
	4180	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4181	+ }
	4182	+
	4183	+ return;
	4184	+ }
3895	4185
3896	4186	if (freezematerial)
3897	4187	{
..	..	@@ -4240,7 +4530,7 @@
4240	4530
4241	4531	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4242	4532	{
4243		- if (Globals.SAVEONMAKE) // && resetmodel)
	4533	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4244	4534	Save();
4245	4535	//Tween.set(thing, 0).target(1).start(tweenManager);
4246	4536	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4556,8 +4846,8 @@
4556	4846
4557	4847	if (readobj != null)
4558	4848	{
4559		- if (Globals.SAVEONMAKE)
4560		- Save();
	4849	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4850	+ // Save();
4561	4851	try
4562	4852	{
4563	4853	//readobj.deepCopySelf(copy);
..	..	@@ -4612,13 +4902,24 @@
4612	4902	c.addChild(csg);
4613	4903	}
4614	4904
	4905	+ copy.versions = readobj.versions;
	4906	+ copy.versionindex = readobj.versionindex;
	4907	+
	4908	+ if (copy.versions == null)
	4909	+ {
	4910	+ copy.versions = new byte[100][];
	4911	+ copy.versionindex = -1;
	4912	+ }
	4913	+
	4914	+ //? SetUndoStates();
	4915	+
4615	4916	ResetModel();
4616	4917	copy.HardTouch(); // recompile?
4617	4918	refreshContents();
4618	4919	}
4619	4920	}
4620	4921
4621		- void load() // throws ClassNotFoundException
	4922	+ void Open() // throws ClassNotFoundException
4622	4923	{
4623	4924	if (Grafreed.standAlone)
4624	4925	{
..	..	@@ -4735,6 +5036,8 @@
4735	5036	String filename = browser.getFile();
4736	5037	if (filename != null && filename.length() > 0)
4737	5038	{
	5039	+ if (!filename.endsWith(".gfd"))
	5040	+ filename += ".gfd";
4738	5041	lastname = browser.getDirectory() + filename;
4739	5042	save();
4740	5043	}
..	..	@@ -4901,7 +5204,7 @@
4901	5204	MenuBar menuBar;
4902	5205	Menu fileMenu;
4903	5206	MenuItem newItem;
4904		- MenuItem loadItem;
	5207	+ MenuItem openItem;
4905	5208	MenuItem saveItem;
4906	5209	MenuItem saveAsItem;
4907	5210	MenuItem exportAsItem;
..	..	@@ -4924,6 +5227,7 @@
4924	5227	CheckboxMenuItem toggleSwitchItem;
4925	5228	CheckboxMenuItem toggleRootItem;
4926	5229	CheckboxMenuItem animationItem;
	5230	+ MenuItem archiveItem;
4927	5231	CheckboxMenuItem toggleHandleItem;
4928	5232	CheckboxMenuItem togglePaintItem;
4929	5233	JSplitPane mainPanel;
..	..	@@ -4945,6 +5249,8 @@
4945	5249	cGridBag optionsPanel;
4946	5250
4947	5251	JTabbedPane objectPanel;
	5252	+ boolean materialFlushed;
	5253	+ Object3D latestObject;
4948	5254
4949	5255	cGridBag XYZPanel;
4950	5256