~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -37,6 +41,65 @@
37	41	JFrame frame;
38	42
39	43	static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
40	103
41	104	// SCRIPT
42	105
..	..	@@ -147,7 +210,7 @@
147	210
148	211	objEditor.ctrlPanel.remove(namePanel);
149	212
150		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
151	214	return;
152	215
153	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -246,7 +309,7 @@
246	309	//localCopy.parent = null;
247	310
248	311	frame = new JFrame();
249		- frame.setUndecorated(true);
	312	+ frame.setUndecorated(false);
250	313	objEditor = this;
251	314	this.callee = callee;
252	315
..	..	@@ -277,12 +340,17 @@
277	340	return frame.action(event, obj);
278	341	}
279	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	+
280	348	void SetupMenu()
281	349	{
282	350	frame.setMenuBar(menuBar = new MenuBar());
283	351	menuBar.add(fileMenu = new Menu("File"));
284	352	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	353	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	354
287	355	//oe.menuBar.add(menu = new Menu("Include"));
288	356	Menu menu = new Menu("Import");
..	..	@@ -314,7 +382,7 @@
314	382	}
315	383
316	384	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
318	386	saveItem.addActionListener(this);
319	387	saveAsItem.addActionListener(this);
320	388	exportAsItem.addActionListener(this);
..	..	@@ -323,6 +391,32 @@
323	391	closeItem.addActionListener(this);
324	392
325	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	+
326	420	toolbarPanel = new JPanel();
327	421	toolbarPanel.setName("Toolbar");
328	422	treePanel = new cGridBag();
..	..	@@ -337,9 +431,12 @@
337	431	editPanel.add(editCommandsPanel);
338	432	editPanel.add(ctrlPanel);
339	433
340		- materialPanel = new cGridBag().setVertical(true);
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
341	436
	437	+ materialPanel = new cGridBag().setVertical(true);
342	438	materialPanel.setName("Material");
	439	+
343	440	/JTextPane/
344	441	infoarea = createTextPane();
345	442	doc = infoarea.getStyledDocument();
..	..	@@ -352,7 +449,7 @@
352	449	// TEXTAREA infoarea.setLineWrap(true);
353	450	// TEXTAREA infoarea.setWrapStyleWord(true);
354	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
355		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
356	453	infoPanel.setName("Info");
357	454	//infoPanel.setLayout(new BorderLayout());
358	455	//infoPanel.add(createTextPane());
..	..	@@ -364,7 +461,14 @@
364	461	mainPanel.setDividerSize(9);
365	462	mainPanel.setDividerLocation(0.5); //1.0);
366	463	mainPanel.setResizeWeight(0.5);
367		-
	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	+
368	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
369	473	//mainPanel.setLayout(new GridBagLayout());
370	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -595,8 +699,8 @@
595	699	}
596	700	}
597	701
598		-static GraphicsDevice device = GraphicsEnvironment
599		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
600	704
601	705	Rectangle keeprect;
602	706	cRadio radio;
..	..	@@ -612,13 +716,24 @@
612	716
613	717	boolean maximized;
614	718
	719	+ cButton fullscreenLayout;
	720	+
615	721	void Minimize()
616	722	{
617	723	frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
618	725	}
619	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={}
620	730	void Maximize()
621	731	{
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
622	737	if (maximized)
623	738	{
624	739	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -626,20 +741,36 @@
626	741	else
627	742	{
628	743	keeprect = frame.getBounds();
629		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
630		- Dimension rect2 = frame.getToolkit().getScreenSize();
631		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
632	747	// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
633	749	}
634	750
635	751	maximized ^= true;
	752	+
	753	+ frame.validate();
636	754	}
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
637	759
638	760	void ToggleFullScreen()
639	761	{
640		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
641	767	{
642	768	device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
643	774	//frame.setVisible(false);
644	775	// frame.removeNotify();
645	776	// frame.setUndecorated(false);
..	..	@@ -649,7 +780,7 @@
649	780	// X frame.getContentPane().remove(/"Center",/bigThree);
650	781	// X framePanel.add(bigThree);
651	782	// X frame.getContentPane().add(/"Center",/framePanel);
652		- framePanel.setDividerLocation(1);
	783	+ framePanel.setDividerLocation(46);
653	784
654	785	//frame.setVisible(true);
655	786	radio.layout = keepButton;
..	..	@@ -664,7 +795,12 @@
664	795	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
665	796	// frame.getToolkit().getScreenSize().height);
666	797	//frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
667	801	device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
668	804	// frame.removeNotify();
669	805	// frame.setUndecorated(true);
670	806	// frame.addNotify();
..	..	@@ -673,12 +809,11 @@
673	809	// X frame.getContentPane().add(/"Center",/bigThree);
674	810	framePanel.setDividerLocation(0);
675	811
676		- radio.layout = twoButton;
	812	+ radio.layout = fullscreenLayout;
677	813	radio.layout.doClick();
678	814	//frame.setVisible(true);
679	815	}
680		-
681		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
682	817	}
683	818
684	819	private JTextPane createTextPane()
..	..	@@ -819,7 +954,12 @@
819	954	JCheckBox speedupCB;
820	955	JCheckBox rewindCB;
821	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
822	961	JComboBox texresMenu;
	962	+
823	963	JButton resetButton;
824	964	JButton stepButton;
825	965	JButton stepAllButton;
..	..	@@ -1006,12 +1146,12 @@
1006	1146	namePanel = new cGridBag();
1007	1147
1008	1148	nameField = AddText(namePanel, copy.GetName());
1009		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1010	1150	oe.ctrlPanel.add(namePanel);
1011	1151
1012	1152	oe.ctrlPanel.Return();
1013	1153
1014		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
1015	1155	return;
1016	1156
1017	1157	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1024,15 +1164,15 @@
1024	1164	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1025	1165	hideCB.setToolTipText("Hide object");
1026	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1027		- markCB.setToolTipText("Set the animation target transform");
	1167	+ markCB.setToolTipText("As animation target transform");
1028	1168
1029	1169	setupPanel2 = new cGridBag().setVertical(false);
1030	1170
1031	1171	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1032	1172	rewindCB.setToolTipText("Rewind animation");
1033	1173
1034		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1035		- 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)");
1036	1176
1037	1177	if (Globals.ADVANCED)
1038	1178	{
..	..	@@ -1353,7 +1493,11 @@
1353	1493	// north.add(ctrlPanel, BorderLayout.NORTH);
1354	1494	// objectPanel.add(north);
1355	1495	objectPanel.add(editPanel);
1356		- objectPanel.add(infoPanel);
	1496	+
	1497	+ //if (Globals.ADVANCED)
	1498	+ objectPanel.add(infoPanel);
	1499	+
	1500	+ objectPanel.add(toolboxPanel);
1357	1501
1358	1502	/*
1359	1503	aConstraints.gridx = 0;
..	..	@@ -1362,7 +1506,7 @@
1362	1506	aConstraints.gridy += 1;
1363	1507	aConstraints.gridwidth = 1;
1364	1508	mainPanel.add(objectPanel, aConstraints);
1365		- */
	1509	+ */
1366	1510
1367	1511	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1368	1512	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1379,9 +1523,7 @@
1379	1523	JTabbedPane tabbedPane = new JTabbedPane();
1380	1524	tabbedPane.add(scrollpane);
1381	1525
1382		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1383		-
1384		- optionsPanel = new cGridBag().setVertical(true);
	1526	+ optionsPanel = new cGridBag().setVertical(false);
1385	1527
1386	1528	optionsPanel.setName("Options");
1387	1529
..	..	@@ -1389,6 +1531,8 @@
1389	1531
1390	1532	tabbedPane.add(optionsPanel);
1391	1533
	1534	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1535	+
1392	1536	scenePanel.add(tabbedPane);
1393	1537
1394	1538	/*
..	..	@@ -1461,9 +1605,9 @@
1461	1605	// aConstraints.gridheight = 1;
1462	1606
1463	1607	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1464		- framePanel.setContinuousLayout(true);
1465		- framePanel.setOneTouchExpandable(true);
1466		- framePanel.setDividerLocation(0.8);
	1608	+ framePanel.setContinuousLayout(false);
	1609	+ framePanel.setOneTouchExpandable(false);
	1610	+ //.setDividerLocation(0.8);
1467	1611	//framePanel.setDividerSize(15);
1468	1612	//framePanel.setResizeWeight(0.15);
1469	1613	framePanel.setName("Frame");
..	..	@@ -1481,11 +1625,14 @@
1481	1625	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1482	1626
1483	1627	frame.setSize(1280, 860);
1484		- frame.setVisible(true);
1485		-
	1628	+
1486	1629	cameraView.requestFocusInWindow();
1487	1630
1488	1631	gridPanel.setDividerLocation(1.0);
	1632	+
	1633	+ frame.validate();
	1634	+
	1635	+ frame.setVisible(true);
1489	1636
1490	1637	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1491	1638	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1572,24 +1719,6 @@
1572	1719	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573	1720	colorSection.add(texture);
1574	1721
1575		- cGridBag anisoU = new cGridBag();
1576		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1577		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1579		- colorSection.add(anisoU);
1580		-
1581		- cGridBag anisoV = new cGridBag();
1582		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1583		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1585		- colorSection.add(anisoV);
1586		-
1587		- cGridBag shadowbias = new cGridBag();
1588		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1589		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1591		- colorSection.add(shadowbias);
1592		-
1593	1722	panel.add(new JSeparator());
1594	1723
1595	1724	panel.add(colorSection);
..	..	@@ -1639,6 +1768,12 @@
1639	1768	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1640	1769	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1641	1770	diffuseSection.add(fakedepth);
	1771	+
	1772	+ cGridBag shadowbias = new cGridBag();
	1773	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1774	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1775	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1776	+ diffuseSection.add(shadowbias);
1642	1777
1643	1778	panel.add(new JSeparator());
1644	1779
..	..	@@ -1690,6 +1825,18 @@
1690	1825	// aConstraints.gridy += 1;
1691	1826	// aConstraints.gridwidth = 1;
1692	1827
	1828	+ cGridBag anisoU = new cGridBag();
	1829	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1830	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1831	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1832	+ specularSection.add(anisoU);
	1833	+
	1834	+ cGridBag anisoV = new cGridBag();
	1835	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1836	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1837	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1838	+ specularSection.add(anisoV);
	1839	+
1693	1840
1694	1841	panel.add(new JSeparator());
1695	1842
..	..	@@ -1697,35 +1844,35 @@
1697	1844
1698	1845	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1699	1846
1700		- cGridBag globalSection = new cGridBag().setVertical(true);
	1847	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1701	1848
1702	1849	cGridBag camera = new cGridBag();
1703	1850	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1704	1851	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	1852	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(camera);
	1853	+ colorSection.add(camera);
1707	1854
1708	1855	cGridBag ambient = new cGridBag();
1709	1856	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1710	1857	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711	1858	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1712		- globalSection.add(ambient);
	1859	+ colorSection.add(ambient);
1713	1860
1714	1861	cGridBag backlit = new cGridBag();
1715	1862	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1716	1863	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1717	1864	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1718		- globalSection.add(backlit);
	1865	+ colorSection.add(backlit);
1719	1866
1720	1867	cGridBag opacity = new cGridBag();
1721	1868	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1722	1869	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723	1870	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1724		- globalSection.add(opacity);
	1871	+ colorSection.add(opacity);
1725	1872
1726		- panel.add(new JSeparator());
	1873	+ //panel.add(new JSeparator());
1727	1874
1728		- panel.add(globalSection);
	1875	+ //panel.add(globalSection);
1729	1876
1730	1877	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1731	1878
..	..	@@ -1832,8 +1979,9 @@
1832	1979	// 3D models
1833	1980	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1834	1981	{
1835		- lastConverter = new com.jmex.model.converters.MaxToJme();
1836		- LoadFile(filename, lastConverter);
	1982	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1983	+ //LoadFile(filename, lastConverter);
	1984	+ LoadObjFile(filename); // New 3ds loader
1837	1985	continue;
1838	1986	}
1839	1987	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2559,6 +2707,7 @@
2559	2707	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2560	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2561	2709	}
	2710	+
2562	2711	//cJME.count++;
2563	2712	//cJME.count %= 12;
2564	2713	if (gc)
..	..	@@ -2742,6 +2891,7 @@
2742	2891	}
2743	2892	}
2744	2893	}
	2894	+
2745	2895	cFileSystemPane FSPane;
2746	2896
2747	2897	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2795,11 +2945,14 @@
2795	2945	}
2796	2946	}
2797	2947	}
	2948	+
2798	2949	freezematerial = false;
2799	2950	}
2800	2951
2801	2952	void SetMaterial(Object3D object)
2802	2953	{
	2954	+ latestObject = object;
	2955	+
2803	2956	cMaterial mat = object.material;
2804	2957
2805	2958	if (mat == null)
..	..	@@ -2911,12 +3064,17 @@
2911	3064	// }
2912	3065
2913	3066	/**/
2914		- if (deselect)
	3067	+ if (deselect \|\| child == null)
2915	3068	{
2916	3069	//group.deselectAll();
2917	3070	//freeze = true;
2918	3071	GetTree().clearSelection();
2919	3072	//freeze = false;
	3073	+
	3074	+ if (child == null)
	3075	+ {
	3076	+ return;
	3077	+ }
2920	3078	}
2921	3079
2922	3080	//group.addSelectee(child);
..	..	@@ -2985,7 +3143,7 @@
2985	3143	cameraView.ToggleDL();
2986	3144	cameraView.repaint();
2987	3145	return;
2988		- } else if (event.getSource() == toggleTextureItem)
	3146	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2989	3147	{
2990	3148	cameraView.ToggleTexture();
2991	3149	// june 2013 copy.HardTouch();
..	..	@@ -3024,7 +3182,7 @@
3024	3182	frame.validate();
3025	3183
3026	3184	return;
3027		- } else if (event.getSource() == toggleSwitchItem)
	3185	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3028	3186	{
3029	3187	cameraView.ToggleSwitch();
3030	3188	cameraView.repaint();
..	..	@@ -3240,9 +3398,9 @@
3240	3398	{
3241	3399	Close();
3242	3400	//return true;
3243		- } else if (source == loadItem)
	3401	+ } else if (source == openItem)
3244	3402	{
3245		- load();
	3403	+ Open();
3246	3404	//return true;
3247	3405	} else if (source == newItem)
3248	3406	{
..	..	@@ -3267,6 +3425,10 @@
3267	3425	{
3268	3426	generatePOV();
3269	3427	//return true;
	3428	+ } else if (event.getSource() == archiveItem)
	3429	+ {
	3430	+ cTools.Archive(frame);
	3431	+ return;
3270	3432	} else if (source == zBufferItem)
3271	3433	{
3272	3434	try
..	..	@@ -3408,6 +3570,30 @@
3408	3570
3409	3571	public void Save()
3410	3572	{
	3573	+ // Default reduces the probability of heuristics errors.
	3574	+ Save(true);
	3575	+ }
	3576	+
	3577	+ private boolean Equal(byte[] compress, byte[] name)
	3578	+ {
	3579	+ if (compress.length != name.length)
	3580	+ {
	3581	+ return false;
	3582	+ }
	3583	+
	3584	+ for (int i=compress.length; --i>=0;)
	3585	+ {
	3586	+ if (compress[i] != name[i])
	3587	+ return false;
	3588	+ }
	3589	+
	3590	+ return true;
	3591	+ }
	3592	+
	3593	+ public boolean Save(boolean user)
	3594	+ {
	3595	+ System.err.println("Save");
	3596	+
3411	3597	cRadio tab = GetCurrentTab();
3412	3598
3413	3599	boolean temp = CameraPane.SWITCH;
..	..	@@ -3415,20 +3601,37 @@
3415	3601
3416	3602	copy.ExtractBigData(hashtable);
3417	3603
3418		- //EditorFrame.m_MainFrame.requestFocusInWindow();
3419		- tab.graphs[tab.undoindex++] = Compress(copy);
3420		-
3421		- copy.RestoreBigData(hashtable);
	3604	+ byte[] compress = Compress(copy);
3422	3605
3423	3606	CameraPane.SWITCH = temp;
3424	3607
	3608	+ boolean thesame = false;
	3609	+
	3610	+ // Quick heuristic using length. Works only when stream is compressed.
	3611	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3612	+ {
	3613	+ thesame = true;
	3614	+ }
	3615	+
	3616	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3617	+ if (!thesame)
	3618	+ {
	3619	+ tab.user[tab.undoindex] = user;
	3620	+ tab.graphs[tab.undoindex++] = compress;
	3621	+ }
	3622	+
	3623	+ copy.RestoreBigData(hashtable);
	3624	+
3425	3625	//assert(hashtable.isEmpty());
3426	3626
3427	3627	for (int i = tab.undoindex; i < tab.graphs.length; i++)
3428	3628	{
	3629	+ tab.user[i] = false;
3429	3630	tab.graphs[i] = null;
3430	3631	}
3431	3632
	3633	+ SetUndoStates();
	3634	+
3432	3635	// test save
3433	3636	if (false)
3434	3637	{
..	..	@@ -3447,10 +3650,14 @@
3447	3650	e.printStackTrace();
3448	3651	}
3449	3652	}
	3653	+
	3654	+ return !thesame;
3450	3655	}
3451	3656
3452	3657	void CopyChanged(Object3D obj)
3453	3658	{
	3659	+ SetUndoStates();
	3660	+
3454	3661	boolean temp = CameraPane.SWITCH;
3455	3662	CameraPane.SWITCH = false;
3456	3663
..	..	@@ -3490,25 +3697,47 @@
3490	3697	refreshContents();
3491	3698	}
3492	3699
3493		- public void Undo()
	3700	+ cButton undoButton;
	3701	+ cButton redoButton;
	3702	+
	3703	+ void SetUndoStates()
3494	3704	{
	3705	+ cRadio tab = GetCurrentTab();
	3706	+
	3707	+ undoButton.setEnabled(tab.undoindex > 0);
	3708	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3709	+ }
	3710	+
	3711	+ public boolean Undo()
	3712	+ {
	3713	+ System.err.println("Undo");
	3714	+
3495	3715	cRadio tab = GetCurrentTab();
3496	3716
3497	3717	if (tab.undoindex == 0)
3498	3718	{
3499	3719	java.awt.Toolkit.getDefaultToolkit().beep();
3500		- return;
	3720	+ return false;
3501	3721	}
3502	3722
3503		- if (tab.graphs[tab.undoindex] == null)
	3723	+ if (tab.graphs[tab.undoindex] == null \|\| !tab.user[tab.undoindex])
3504	3724	{
3505		- Save();
3506		- tab.undoindex -= 1;
	3725	+ if (Save(false))
	3726	+ tab.undoindex -= 1;
	3727	+ else
	3728	+ {
	3729	+ if (tab.undoindex <= 0)
	3730	+ return false;
	3731	+ else
	3732	+ tab.undoindex -= 1;
	3733	+ }
3507	3734	}
3508	3735
3509	3736	tab.undoindex -= 1;
3510	3737
3511	3738	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3739	+
	3740	+ return true;
3512	3741	}
3513	3742
3514	3743	public void Redo()
..	..	@@ -3524,6 +3753,9 @@
3524	3753	tab.undoindex += 1;
3525	3754
3526	3755	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3756	+
	3757	+ if (!tab.user[tab.undoindex])
	3758	+ tab.graphs[tab.undoindex] = null;
3527	3759	}
3528	3760
3529	3761	void ImportGFD()
..	..	@@ -3675,7 +3907,7 @@
3675	3907	assert false;
3676	3908	}
3677	3909
3678		- void EditSelection()
	3910	+ void EditSelection(boolean newWindow)
3679	3911	{
3680	3912	}
3681	3913
..	..	@@ -4170,7 +4402,8 @@
4170	4402
4171	4403	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4172	4404	{
4173		- Save();
	4405	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4406	+ Save();
4174	4407	//Tween.set(thing, 0).target(1).start(tweenManager);
4175	4408	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4176	4409	// if (thing instanceof GenericJointDemo)
..	..	@@ -4257,6 +4490,12 @@
4257	4490	{
4258	4491	ResetModel();
4259	4492	Select(thing.GetTreePath(), true, false); // unselect... false);
	4493	+
	4494	+ if (thing.Size() == 0)
	4495	+ {
	4496	+ //EditSelection(false);
	4497	+ }
	4498	+
4260	4499	refreshContents();
4261	4500	}
4262	4501
..	..	@@ -4479,6 +4718,7 @@
4479	4718
4480	4719	if (readobj != null)
4481	4720	{
	4721	+ if (Globals.SAVEONMAKE)
4482	4722	Save();
4483	4723	try
4484	4724	{
..	..	@@ -4540,7 +4780,7 @@
4540	4780	}
4541	4781	}
4542	4782
4543		- void load() // throws ClassNotFoundException
	4783	+ void Open() // throws ClassNotFoundException
4544	4784	{
4545	4785	if (Grafreed.standAlone)
4546	4786	{
..	..	@@ -4657,6 +4897,8 @@
4657	4897	String filename = browser.getFile();
4658	4898	if (filename != null && filename.length() > 0)
4659	4899	{
	4900	+ if (!filename.endsWith(".gfd"))
	4901	+ filename += ".gfd";
4660	4902	lastname = browser.getDirectory() + filename;
4661	4903	save();
4662	4904	}
..	..	@@ -4823,7 +5065,7 @@
4823	5065	MenuBar menuBar;
4824	5066	Menu fileMenu;
4825	5067	MenuItem newItem;
4826		- MenuItem loadItem;
	5068	+ MenuItem openItem;
4827	5069	MenuItem saveItem;
4828	5070	MenuItem saveAsItem;
4829	5071	MenuItem exportAsItem;
..	..	@@ -4846,22 +5088,36 @@
4846	5088	CheckboxMenuItem toggleSwitchItem;
4847	5089	CheckboxMenuItem toggleRootItem;
4848	5090	CheckboxMenuItem animationItem;
	5091	+ MenuItem archiveItem;
4849	5092	CheckboxMenuItem toggleHandleItem;
4850	5093	CheckboxMenuItem togglePaintItem;
4851	5094	JSplitPane mainPanel;
4852	5095	JScrollPane scrollpane;
	5096	+
4853	5097	JPanel toolbarPanel;
	5098	+
4854	5099	cGridBag treePanel;
	5100	+
4855	5101	JPanel radioPanel;
4856	5102	ButtonGroup buttonGroup;
4857		- cGridBag ctrlPanel;
	5103	+
	5104	+ cGridBag toolboxPanel;
4858	5105	cGridBag materialPanel;
	5106	+ cGridBag ctrlPanel;
	5107	+
4859	5108	JScrollPane infoPanel;
	5109	+
4860	5110	cGridBag optionsPanel;
	5111	+
4861	5112	JTabbedPane objectPanel;
	5113	+ boolean materialFlushed;
	5114	+ Object3D latestObject;
	5115	+
4862	5116	cGridBag XYZPanel;
	5117	+
4863	5118	JSplitPane gridPanel;
4864	5119	JSplitPane bigPanel;
	5120	+
4865	5121	cGridBag bigThree;
4866	5122	cGridBag scenePanel;
4867	5123	cGridBag centralPanel;
..	..	@@ -4976,7 +5232,7 @@
4976	5232	cNumberSlider fogField;
4977	5233	JLabel opacityPowerLabel;
4978	5234	cNumberSlider opacityPowerField;
4979		- JTree jTree;
	5235	+ cTree jTree;
4980	5236	//ObjectUI parent;
4981	5237
4982	5238	cNumberSlider normalpushField;