~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,20 +1164,21 @@
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
	1177	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1178	+ link2masterCB.setToolTipText("Attach to support");
	1179	+
1037	1180	if (Globals.ADVANCED)
1038	1181	{
1039		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1040		- link2masterCB.setToolTipText("Attach to support");
1041	1182	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1042	1183	speedupCB.setToolTipText("Option motion capture");
1043	1184	}
..	..	@@ -1353,7 +1494,11 @@
1353	1494	// north.add(ctrlPanel, BorderLayout.NORTH);
1354	1495	// objectPanel.add(north);
1355	1496	objectPanel.add(editPanel);
1356		- objectPanel.add(infoPanel);
	1497	+
	1498	+ //if (Globals.ADVANCED)
	1499	+ objectPanel.add(infoPanel);
	1500	+
	1501	+ objectPanel.add(toolboxPanel);
1357	1502
1358	1503	/*
1359	1504	aConstraints.gridx = 0;
..	..	@@ -1362,7 +1507,7 @@
1362	1507	aConstraints.gridy += 1;
1363	1508	aConstraints.gridwidth = 1;
1364	1509	mainPanel.add(objectPanel, aConstraints);
1365		- */
	1510	+ */
1366	1511
1367	1512	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1368	1513	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1379,9 +1524,7 @@
1379	1524	JTabbedPane tabbedPane = new JTabbedPane();
1380	1525	tabbedPane.add(scrollpane);
1381	1526
1382		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1383		-
1384		- optionsPanel = new cGridBag().setVertical(true);
	1527	+ optionsPanel = new cGridBag().setVertical(false);
1385	1528
1386	1529	optionsPanel.setName("Options");
1387	1530
..	..	@@ -1389,6 +1532,8 @@
1389	1532
1390	1533	tabbedPane.add(optionsPanel);
1391	1534
	1535	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1536	+
1392	1537	scenePanel.add(tabbedPane);
1393	1538
1394	1539	/*
..	..	@@ -1461,9 +1606,9 @@
1461	1606	// aConstraints.gridheight = 1;
1462	1607
1463	1608	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1464		- framePanel.setContinuousLayout(true);
1465		- framePanel.setOneTouchExpandable(true);
1466		- framePanel.setDividerLocation(0.8);
	1609	+ framePanel.setContinuousLayout(false);
	1610	+ framePanel.setOneTouchExpandable(false);
	1611	+ //.setDividerLocation(0.8);
1467	1612	//framePanel.setDividerSize(15);
1468	1613	//framePanel.setResizeWeight(0.15);
1469	1614	framePanel.setName("Frame");
..	..	@@ -1481,11 +1626,14 @@
1481	1626	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1482	1627
1483	1628	frame.setSize(1280, 860);
1484		- frame.setVisible(true);
1485		-
	1629	+
1486	1630	cameraView.requestFocusInWindow();
1487	1631
1488	1632	gridPanel.setDividerLocation(1.0);
	1633	+
	1634	+ frame.validate();
	1635	+
	1636	+ frame.setVisible(true);
1489	1637
1490	1638	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1491	1639	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1572,24 +1720,6 @@
1572	1720	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573	1721	colorSection.add(texture);
1574	1722
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	1723	panel.add(new JSeparator());
1594	1724
1595	1725	panel.add(colorSection);
..	..	@@ -1639,6 +1769,12 @@
1639	1769	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1640	1770	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1641	1771	diffuseSection.add(fakedepth);
	1772	+
	1773	+ cGridBag shadowbias = new cGridBag();
	1774	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1775	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1776	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1777	+ diffuseSection.add(shadowbias);
1642	1778
1643	1779	panel.add(new JSeparator());
1644	1780
..	..	@@ -1690,6 +1826,18 @@
1690	1826	// aConstraints.gridy += 1;
1691	1827	// aConstraints.gridwidth = 1;
1692	1828
	1829	+ cGridBag anisoU = new cGridBag();
	1830	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1831	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1832	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1833	+ specularSection.add(anisoU);
	1834	+
	1835	+ cGridBag anisoV = new cGridBag();
	1836	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1837	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1838	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1839	+ specularSection.add(anisoV);
	1840	+
1693	1841
1694	1842	panel.add(new JSeparator());
1695	1843
..	..	@@ -1697,35 +1845,35 @@
1697	1845
1698	1846	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1699	1847
1700		- cGridBag globalSection = new cGridBag().setVertical(true);
	1848	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1701	1849
1702	1850	cGridBag camera = new cGridBag();
1703	1851	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1704	1852	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	1853	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(camera);
	1854	+ colorSection.add(camera);
1707	1855
1708	1856	cGridBag ambient = new cGridBag();
1709	1857	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1710	1858	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711	1859	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1712		- globalSection.add(ambient);
	1860	+ colorSection.add(ambient);
1713	1861
1714	1862	cGridBag backlit = new cGridBag();
1715	1863	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1716	1864	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1717	1865	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1718		- globalSection.add(backlit);
	1866	+ colorSection.add(backlit);
1719	1867
1720	1868	cGridBag opacity = new cGridBag();
1721	1869	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1722	1870	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723	1871	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1724		- globalSection.add(opacity);
	1872	+ colorSection.add(opacity);
1725	1873
1726		- panel.add(new JSeparator());
	1874	+ //panel.add(new JSeparator());
1727	1875
1728		- panel.add(globalSection);
	1876	+ //panel.add(globalSection);
1729	1877
1730	1878	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1731	1879
..	..	@@ -1832,8 +1980,9 @@
1832	1980	// 3D models
1833	1981	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1834	1982	{
1835		- lastConverter = new com.jmex.model.converters.MaxToJme();
1836		- LoadFile(filename, lastConverter);
	1983	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1984	+ //LoadFile(filename, lastConverter);
	1985	+ LoadObjFile(filename); // New 3ds loader
1837	1986	continue;
1838	1987	}
1839	1988	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2559,6 +2708,7 @@
2559	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2560	2709	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2561	2710	}
	2711	+
2562	2712	//cJME.count++;
2563	2713	//cJME.count %= 12;
2564	2714	if (gc)
..	..	@@ -2742,6 +2892,7 @@
2742	2892	}
2743	2893	}
2744	2894	}
	2895	+
2745	2896	cFileSystemPane FSPane;
2746	2897
2747	2898	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2795,11 +2946,14 @@
2795	2946	}
2796	2947	}
2797	2948	}
	2949	+
2798	2950	freezematerial = false;
2799	2951	}
2800	2952
2801	2953	void SetMaterial(Object3D object)
2802	2954	{
	2955	+ latestObject = object;
	2956	+
2803	2957	cMaterial mat = object.material;
2804	2958
2805	2959	if (mat == null)
..	..	@@ -2911,12 +3065,17 @@
2911	3065	// }
2912	3066
2913	3067	/**/
2914		- if (deselect)
	3068	+ if (deselect \|\| child == null)
2915	3069	{
2916	3070	//group.deselectAll();
2917	3071	//freeze = true;
2918	3072	GetTree().clearSelection();
2919	3073	//freeze = false;
	3074	+
	3075	+ if (child == null)
	3076	+ {
	3077	+ return;
	3078	+ }
2920	3079	}
2921	3080
2922	3081	//group.addSelectee(child);
..	..	@@ -2985,7 +3144,7 @@
2985	3144	cameraView.ToggleDL();
2986	3145	cameraView.repaint();
2987	3146	return;
2988		- } else if (event.getSource() == toggleTextureItem)
	3147	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2989	3148	{
2990	3149	cameraView.ToggleTexture();
2991	3150	// june 2013 copy.HardTouch();
..	..	@@ -3024,7 +3183,7 @@
3024	3183	frame.validate();
3025	3184
3026	3185	return;
3027		- } else if (event.getSource() == toggleSwitchItem)
	3186	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3028	3187	{
3029	3188	cameraView.ToggleSwitch();
3030	3189	cameraView.repaint();
..	..	@@ -3240,9 +3399,9 @@
3240	3399	{
3241	3400	Close();
3242	3401	//return true;
3243		- } else if (source == loadItem)
	3402	+ } else if (source == openItem)
3244	3403	{
3245		- load();
	3404	+ Open();
3246	3405	//return true;
3247	3406	} else if (source == newItem)
3248	3407	{
..	..	@@ -3267,6 +3426,10 @@
3267	3426	{
3268	3427	generatePOV();
3269	3428	//return true;
	3429	+ } else if (event.getSource() == archiveItem)
	3430	+ {
	3431	+ cTools.Archive(frame);
	3432	+ return;
3270	3433	} else if (source == zBufferItem)
3271	3434	{
3272	3435	try
..	..	@@ -3318,8 +3481,8 @@
3318	3481	try
3319	3482	{
3320	3483	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3321		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3322		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3484	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3485	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3323	3486
3324	3487	Object3D parent = o.parent;
3325	3488	o.parent = null;
..	..	@@ -3330,10 +3493,14 @@
3330	3493
3331	3494	out.flush();
3332	3495
3333		- zstream.close();
	3496	+ baos //zstream
	3497	+ .close();
3334	3498	out.close();
3335	3499
3336		- return baos.toByteArray();
	3500	+ byte[] bytes = baos.toByteArray();
	3501	+
	3502	+ System.out.println("save #bytes = " + bytes.length);
	3503	+ return bytes;
3337	3504	} catch (Exception e)
3338	3505	{
3339	3506	System.err.println(e);
..	..	@@ -3343,13 +3510,16 @@
3343	3510
3344	3511	static public Object Uncompress(byte[] bytes)
3345	3512	{
3346		- System.out.println("#bytes = " + bytes.length);
	3513	+ System.out.println("restore #bytes = " + bytes.length);
3347	3514	try
3348	3515	{
3349	3516	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3350		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3351		- ObjectInputStream in = new ObjectInputStream(istream);
	3517	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3518	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3352	3519	Object obj = in.readObject();
	3520	+
	3521	+ bais //istream
	3522	+ .close();
3353	3523	in.close();
3354	3524
3355	3525	return obj;
..	..	@@ -3408,6 +3578,29 @@
3408	3578
3409	3579	public void Save()
3410	3580	{
	3581	+ Save(true);
	3582	+ }
	3583	+
	3584	+ private boolean Equal(byte[] compress, byte[] name)
	3585	+ {
	3586	+ if (compress.length != name.length)
	3587	+ {
	3588	+ return false;
	3589	+ }
	3590	+
	3591	+ for (int i=compress.length; --i>=0;)
	3592	+ {
	3593	+ if (compress[i] != name[i])
	3594	+ return false;
	3595	+ }
	3596	+
	3597	+ return true;
	3598	+ }
	3599	+
	3600	+ public boolean Save(boolean user)
	3601	+ {
	3602	+ System.err.println("Save");
	3603	+
3411	3604	cRadio tab = GetCurrentTab();
3412	3605
3413	3606	boolean temp = CameraPane.SWITCH;
..	..	@@ -3415,20 +3608,42 @@
3415	3608
3416	3609	copy.ExtractBigData(hashtable);
3417	3610
3418		- //EditorFrame.m_MainFrame.requestFocusInWindow();
3419		- tab.graphs[tab.undoindex++] = Compress(copy);
3420		-
3421		- copy.RestoreBigData(hashtable);
	3611	+ byte[] compress = Compress(copy);
3422	3612
3423	3613	CameraPane.SWITCH = temp;
3424	3614
	3615	+ boolean thesame = false;
	3616	+
	3617	+ // Quick heuristic using length. Works only when stream is compressed.
	3618	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3619	+ {
	3620	+ thesame = true;
	3621	+ }
	3622	+
	3623	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3624	+ if (!thesame)
	3625	+ {
	3626	+ //tab.user[tab.undoindex] = user;
	3627	+ boolean increment = tab.graphs[tab.undoindex] == null;
	3628	+
	3629	+ tab.graphs[tab.undoindex] = compress;
	3630	+
	3631	+ if (increment)
	3632	+ tab.undoindex++;
	3633	+ }
	3634	+
	3635	+ copy.RestoreBigData(hashtable);
	3636	+
3425	3637	//assert(hashtable.isEmpty());
3426	3638
3427	3639	for (int i = tab.undoindex; i < tab.graphs.length; i++)
3428	3640	{
3429		- tab.graphs[i] = null;
	3641	+ //tab.user[i] = false;
	3642	+ // tab.graphs[i] = null;
3430	3643	}
3431	3644
	3645	+ SetUndoStates();
	3646	+
3432	3647	// test save
3433	3648	if (false)
3434	3649	{
..	..	@@ -3447,10 +3662,14 @@
3447	3662	e.printStackTrace();
3448	3663	}
3449	3664	}
	3665	+
	3666	+ return !thesame;
3450	3667	}
3451	3668
3452	3669	void CopyChanged(Object3D obj)
3453	3670	{
	3671	+ SetUndoStates();
	3672	+
3454	3673	boolean temp = CameraPane.SWITCH;
3455	3674	CameraPane.SWITCH = false;
3456	3675
..	..	@@ -3490,25 +3709,47 @@
3490	3709	refreshContents();
3491	3710	}
3492	3711
3493		- public void Undo()
	3712	+ cButton undoButton;
	3713	+ cButton redoButton;
	3714	+
	3715	+ void SetUndoStates()
3494	3716	{
	3717	+ cRadio tab = GetCurrentTab();
	3718	+
	3719	+ undoButton.setEnabled(tab.undoindex > 0);
	3720	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3721	+ }
	3722	+
	3723	+ public boolean Undo()
	3724	+ {
	3725	+ System.err.println("Undo");
	3726	+
3495	3727	cRadio tab = GetCurrentTab();
3496	3728
3497	3729	if (tab.undoindex == 0)
3498	3730	{
3499	3731	java.awt.Toolkit.getDefaultToolkit().beep();
3500		- return;
	3732	+ return false;
3501	3733	}
3502	3734
3503		- if (tab.graphs[tab.undoindex] == null)
	3735	+ if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
3504	3736	{
3505		- Save();
3506		- tab.undoindex -= 1;
	3737	+ if (Save(false))
	3738	+ tab.undoindex -= 1;
	3739	+ else
	3740	+ {
	3741	+ if (tab.undoindex <= 0)
	3742	+ return false;
	3743	+ else
	3744	+ tab.undoindex -= 1;
	3745	+ }
3507	3746	}
3508	3747
3509	3748	tab.undoindex -= 1;
3510	3749
3511	3750	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3751	+
	3752	+ return true;
3512	3753	}
3513	3754
3514	3755	public void Redo()
..	..	@@ -3524,6 +3765,9 @@
3524	3765	tab.undoindex += 1;
3525	3766
3526	3767	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3768	+
	3769	+ //if (!tab.user[tab.undoindex])
	3770	+ // tab.graphs[tab.undoindex] = null;
3527	3771	}
3528	3772
3529	3773	void ImportGFD()
..	..	@@ -3675,7 +3919,7 @@
3675	3919	assert false;
3676	3920	}
3677	3921
3678		- void EditSelection()
	3922	+ void EditSelection(boolean newWindow)
3679	3923	{
3680	3924	}
3681	3925
..	..	@@ -4170,7 +4414,8 @@
4170	4414
4171	4415	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4172	4416	{
4173		- Save();
	4417	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4418	+ Save();
4174	4419	//Tween.set(thing, 0).target(1).start(tweenManager);
4175	4420	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4176	4421	// if (thing instanceof GenericJointDemo)
..	..	@@ -4257,6 +4502,12 @@
4257	4502	{
4258	4503	ResetModel();
4259	4504	Select(thing.GetTreePath(), true, false); // unselect... false);
	4505	+
	4506	+ if (thing.Size() == 0)
	4507	+ {
	4508	+ //EditSelection(false);
	4509	+ }
	4510	+
4260	4511	refreshContents();
4261	4512	}
4262	4513
..	..	@@ -4479,7 +4730,8 @@
4479	4730
4480	4731	if (readobj != null)
4481	4732	{
4482		- Save();
	4733	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4734	+ // Save();
4483	4735	try
4484	4736	{
4485	4737	//readobj.deepCopySelf(copy);
..	..	@@ -4540,7 +4792,7 @@
4540	4792	}
4541	4793	}
4542	4794
4543		- void load() // throws ClassNotFoundException
	4795	+ void Open() // throws ClassNotFoundException
4544	4796	{
4545	4797	if (Grafreed.standAlone)
4546	4798	{
..	..	@@ -4657,6 +4909,8 @@
4657	4909	String filename = browser.getFile();
4658	4910	if (filename != null && filename.length() > 0)
4659	4911	{
	4912	+ if (!filename.endsWith(".gfd"))
	4913	+ filename += ".gfd";
4660	4914	lastname = browser.getDirectory() + filename;
4661	4915	save();
4662	4916	}
..	..	@@ -4823,7 +5077,7 @@
4823	5077	MenuBar menuBar;
4824	5078	Menu fileMenu;
4825	5079	MenuItem newItem;
4826		- MenuItem loadItem;
	5080	+ MenuItem openItem;
4827	5081	MenuItem saveItem;
4828	5082	MenuItem saveAsItem;
4829	5083	MenuItem exportAsItem;
..	..	@@ -4846,22 +5100,36 @@
4846	5100	CheckboxMenuItem toggleSwitchItem;
4847	5101	CheckboxMenuItem toggleRootItem;
4848	5102	CheckboxMenuItem animationItem;
	5103	+ MenuItem archiveItem;
4849	5104	CheckboxMenuItem toggleHandleItem;
4850	5105	CheckboxMenuItem togglePaintItem;
4851	5106	JSplitPane mainPanel;
4852	5107	JScrollPane scrollpane;
	5108	+
4853	5109	JPanel toolbarPanel;
	5110	+
4854	5111	cGridBag treePanel;
	5112	+
4855	5113	JPanel radioPanel;
4856	5114	ButtonGroup buttonGroup;
4857		- cGridBag ctrlPanel;
	5115	+
	5116	+ cGridBag toolboxPanel;
4858	5117	cGridBag materialPanel;
	5118	+ cGridBag ctrlPanel;
	5119	+
4859	5120	JScrollPane infoPanel;
	5121	+
4860	5122	cGridBag optionsPanel;
	5123	+
4861	5124	JTabbedPane objectPanel;
	5125	+ boolean materialFlushed;
	5126	+ Object3D latestObject;
	5127	+
4862	5128	cGridBag XYZPanel;
	5129	+
4863	5130	JSplitPane gridPanel;
4864	5131	JSplitPane bigPanel;
	5132	+
4865	5133	cGridBag bigThree;
4866	5134	cGridBag scenePanel;
4867	5135	cGridBag centralPanel;
..	..	@@ -4976,7 +5244,7 @@
4976	5244	cNumberSlider fogField;
4977	5245	JLabel opacityPowerLabel;
4978	5246	cNumberSlider opacityPowerField;
4979		- JTree jTree;
	5247	+ cTree jTree;
4980	5248	//ObjectUI parent;
4981	5249
4982	5250	cNumberSlider normalpushField;