~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,13 +809,34 @@
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	}
	818	+
	819	+ private byte[] CompressCopy()
	820	+ {
	821	+ boolean temp = CameraPane.SWITCH;
	822	+ CameraPane.SWITCH = false;
	823	+
	824	+ copy.ExtractBigData(versiontable);
	825	+ // if (copy == client)
	826	+
	827	+ byte[] versions[] = copy.versions;
	828	+ copy.versions = null;
	829	+
	830	+ byte[] compress = Compress(copy);
	831	+
	832	+ copy.versions = versions;
	833	+
	834	+ copy.RestoreBigData(versiontable);
	835	+
	836	+ CameraPane.SWITCH = temp;
	837	+
	838	+ return compress;
	839	+ }
683	840
684	841	private JTextPane createTextPane()
685	842	{
..	..	@@ -819,7 +976,12 @@
819	976	JCheckBox speedupCB;
820	977	JCheckBox rewindCB;
821	978	JCheckBox flipVCB;
	979	+
	980	+ cCheckBox toggleTextureCB;
	981	+ cCheckBox toggleSwitchCB;
	982	+
822	983	JComboBox texresMenu;
	984	+
823	985	JButton resetButton;
824	986	JButton stepButton;
825	987	JButton stepAllButton;
..	..	@@ -1006,12 +1168,12 @@
1006	1168	namePanel = new cGridBag();
1007	1169
1008	1170	nameField = AddText(namePanel, copy.GetName());
1009		- namePanel.add(nameField);
	1171	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1010	1172	oe.ctrlPanel.add(namePanel);
1011	1173
1012	1174	oe.ctrlPanel.Return();
1013	1175
1014		- if (!GroupEditor.allparams)
	1176	+ if (!allparams)
1015	1177	return;
1016	1178
1017	1179	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1024,20 +1186,21 @@
1024	1186	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1025	1187	hideCB.setToolTipText("Hide object");
1026	1188	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1027		- markCB.setToolTipText("Set the animation target transform");
	1189	+ markCB.setToolTipText("As animation target transform");
1028	1190
1029	1191	setupPanel2 = new cGridBag().setVertical(false);
1030	1192
1031	1193	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1032	1194	rewindCB.setToolTipText("Rewind animation");
1033	1195
1034		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1035		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1196	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1197	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1036	1198
	1199	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1200	+ link2masterCB.setToolTipText("Attach to support");
	1201	+
1037	1202	if (Globals.ADVANCED)
1038	1203	{
1039		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1040		- link2masterCB.setToolTipText("Attach to support");
1041	1204	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1042	1205	speedupCB.setToolTipText("Option motion capture");
1043	1206	}
..	..	@@ -1353,7 +1516,11 @@
1353	1516	// north.add(ctrlPanel, BorderLayout.NORTH);
1354	1517	// objectPanel.add(north);
1355	1518	objectPanel.add(editPanel);
1356		- objectPanel.add(infoPanel);
	1519	+
	1520	+ //if (Globals.ADVANCED)
	1521	+ objectPanel.add(infoPanel);
	1522	+
	1523	+ objectPanel.add(toolboxPanel);
1357	1524
1358	1525	/*
1359	1526	aConstraints.gridx = 0;
..	..	@@ -1362,7 +1529,7 @@
1362	1529	aConstraints.gridy += 1;
1363	1530	aConstraints.gridwidth = 1;
1364	1531	mainPanel.add(objectPanel, aConstraints);
1365		- */
	1532	+ */
1366	1533
1367	1534	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1368	1535	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1379,9 +1546,7 @@
1379	1546	JTabbedPane tabbedPane = new JTabbedPane();
1380	1547	tabbedPane.add(scrollpane);
1381	1548
1382		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1383		-
1384		- optionsPanel = new cGridBag().setVertical(true);
	1549	+ optionsPanel = new cGridBag().setVertical(false);
1385	1550
1386	1551	optionsPanel.setName("Options");
1387	1552
..	..	@@ -1389,6 +1554,8 @@
1389	1554
1390	1555	tabbedPane.add(optionsPanel);
1391	1556
	1557	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1558	+
1392	1559	scenePanel.add(tabbedPane);
1393	1560
1394	1561	/*
..	..	@@ -1461,9 +1628,9 @@
1461	1628	// aConstraints.gridheight = 1;
1462	1629
1463	1630	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1464		- framePanel.setContinuousLayout(true);
1465		- framePanel.setOneTouchExpandable(true);
1466		- framePanel.setDividerLocation(0.8);
	1631	+ framePanel.setContinuousLayout(false);
	1632	+ framePanel.setOneTouchExpandable(false);
	1633	+ //.setDividerLocation(0.8);
1467	1634	//framePanel.setDividerSize(15);
1468	1635	//framePanel.setResizeWeight(0.15);
1469	1636	framePanel.setName("Frame");
..	..	@@ -1481,11 +1648,14 @@
1481	1648	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1482	1649
1483	1650	frame.setSize(1280, 860);
1484		- frame.setVisible(true);
1485		-
	1651	+
1486	1652	cameraView.requestFocusInWindow();
1487	1653
1488	1654	gridPanel.setDividerLocation(1.0);
	1655	+
	1656	+ frame.validate();
	1657	+
	1658	+ frame.setVisible(true);
1489	1659
1490	1660	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1491	1661	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1572,24 +1742,6 @@
1572	1742	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573	1743	colorSection.add(texture);
1574	1744
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	1745	panel.add(new JSeparator());
1594	1746
1595	1747	panel.add(colorSection);
..	..	@@ -1639,6 +1791,12 @@
1639	1791	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1640	1792	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1641	1793	diffuseSection.add(fakedepth);
	1794	+
	1795	+ cGridBag shadowbias = new cGridBag();
	1796	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1797	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1798	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1799	+ diffuseSection.add(shadowbias);
1642	1800
1643	1801	panel.add(new JSeparator());
1644	1802
..	..	@@ -1690,6 +1848,18 @@
1690	1848	// aConstraints.gridy += 1;
1691	1849	// aConstraints.gridwidth = 1;
1692	1850
	1851	+ cGridBag anisoU = new cGridBag();
	1852	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1853	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1854	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1855	+ specularSection.add(anisoU);
	1856	+
	1857	+ cGridBag anisoV = new cGridBag();
	1858	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1859	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1860	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1861	+ specularSection.add(anisoV);
	1862	+
1693	1863
1694	1864	panel.add(new JSeparator());
1695	1865
..	..	@@ -1697,35 +1867,35 @@
1697	1867
1698	1868	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1699	1869
1700		- cGridBag globalSection = new cGridBag().setVertical(true);
	1870	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1701	1871
1702	1872	cGridBag camera = new cGridBag();
1703	1873	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1704	1874	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	1875	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(camera);
	1876	+ colorSection.add(camera);
1707	1877
1708	1878	cGridBag ambient = new cGridBag();
1709	1879	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1710	1880	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711	1881	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1712		- globalSection.add(ambient);
	1882	+ colorSection.add(ambient);
1713	1883
1714	1884	cGridBag backlit = new cGridBag();
1715	1885	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1716	1886	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1717	1887	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1718		- globalSection.add(backlit);
	1888	+ colorSection.add(backlit);
1719	1889
1720	1890	cGridBag opacity = new cGridBag();
1721	1891	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1722	1892	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723	1893	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1724		- globalSection.add(opacity);
	1894	+ colorSection.add(opacity);
1725	1895
1726		- panel.add(new JSeparator());
	1896	+ //panel.add(new JSeparator());
1727	1897
1728		- panel.add(globalSection);
	1898	+ //panel.add(globalSection);
1729	1899
1730	1900	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1731	1901
..	..	@@ -1832,8 +2002,9 @@
1832	2002	// 3D models
1833	2003	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1834	2004	{
1835		- lastConverter = new com.jmex.model.converters.MaxToJme();
1836		- LoadFile(filename, lastConverter);
	2005	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2006	+ //LoadFile(filename, lastConverter);
	2007	+ LoadObjFile(filename); // New 3ds loader
1837	2008	continue;
1838	2009	}
1839	2010	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2559,6 +2730,7 @@
2559	2730	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2560	2731	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2561	2732	}
	2733	+
2562	2734	//cJME.count++;
2563	2735	//cJME.count %= 12;
2564	2736	if (gc)
..	..	@@ -2742,6 +2914,7 @@
2742	2914	}
2743	2915	}
2744	2916	}
	2917	+
2745	2918	cFileSystemPane FSPane;
2746	2919
2747	2920	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2795,11 +2968,14 @@
2795	2968	}
2796	2969	}
2797	2970	}
	2971	+
2798	2972	freezematerial = false;
2799	2973	}
2800	2974
2801	2975	void SetMaterial(Object3D object)
2802	2976	{
	2977	+ latestObject = object;
	2978	+
2803	2979	cMaterial mat = object.material;
2804	2980
2805	2981	if (mat == null)
..	..	@@ -2911,12 +3087,17 @@
2911	3087	// }
2912	3088
2913	3089	/**/
2914		- if (deselect)
	3090	+ if (deselect \|\| child == null)
2915	3091	{
2916	3092	//group.deselectAll();
2917	3093	//freeze = true;
2918	3094	GetTree().clearSelection();
2919	3095	//freeze = false;
	3096	+
	3097	+ if (child == null)
	3098	+ {
	3099	+ return;
	3100	+ }
2920	3101	}
2921	3102
2922	3103	//group.addSelectee(child);
..	..	@@ -2985,7 +3166,7 @@
2985	3166	cameraView.ToggleDL();
2986	3167	cameraView.repaint();
2987	3168	return;
2988		- } else if (event.getSource() == toggleTextureItem)
	3169	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2989	3170	{
2990	3171	cameraView.ToggleTexture();
2991	3172	// june 2013 copy.HardTouch();
..	..	@@ -3024,7 +3205,7 @@
3024	3205	frame.validate();
3025	3206
3026	3207	return;
3027		- } else if (event.getSource() == toggleSwitchItem)
	3208	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3028	3209	{
3029	3210	cameraView.ToggleSwitch();
3030	3211	cameraView.repaint();
..	..	@@ -3240,9 +3421,9 @@
3240	3421	{
3241	3422	Close();
3242	3423	//return true;
3243		- } else if (source == loadItem)
	3424	+ } else if (source == openItem)
3244	3425	{
3245		- load();
	3426	+ Open();
3246	3427	//return true;
3247	3428	} else if (source == newItem)
3248	3429	{
..	..	@@ -3267,6 +3448,10 @@
3267	3448	{
3268	3449	generatePOV();
3269	3450	//return true;
	3451	+ } else if (event.getSource() == archiveItem)
	3452	+ {
	3453	+ cTools.Archive(frame);
	3454	+ return;
3270	3455	} else if (source == zBufferItem)
3271	3456	{
3272	3457	try
..	..	@@ -3318,8 +3503,8 @@
3318	3503	try
3319	3504	{
3320	3505	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3321		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3322		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3506	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3507	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3323	3508
3324	3509	Object3D parent = o.parent;
3325	3510	o.parent = null;
..	..	@@ -3330,10 +3515,14 @@
3330	3515
3331	3516	out.flush();
3332	3517
3333		- zstream.close();
	3518	+ baos //zstream
	3519	+ .close();
3334	3520	out.close();
3335	3521
3336		- return baos.toByteArray();
	3522	+ byte[] bytes = baos.toByteArray();
	3523	+
	3524	+ System.out.println("save #bytes = " + bytes.length);
	3525	+ return bytes;
3337	3526	} catch (Exception e)
3338	3527	{
3339	3528	System.err.println(e);
..	..	@@ -3343,13 +3532,16 @@
3343	3532
3344	3533	static public Object Uncompress(byte[] bytes)
3345	3534	{
3346		- System.out.println("#bytes = " + bytes.length);
	3535	+ System.out.println("restore #bytes = " + bytes.length);
3347	3536	try
3348	3537	{
3349	3538	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3350		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3351		- ObjectInputStream in = new ObjectInputStream(istream);
	3539	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3540	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3352	3541	Object obj = in.readObject();
	3542	+
	3543	+ bais //istream
	3544	+ .close();
3353	3545	in.close();
3354	3546
3355	3547	return obj;
..	..	@@ -3404,37 +3596,77 @@
3404	3596	return null;
3405	3597	}
3406	3598
3407		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3408	3599
3409	3600	public void Save()
3410	3601	{
	3602	+ //Save(true);
	3603	+ Replace();
	3604	+ }
	3605	+
	3606	+ private boolean Equal(byte[] compress, byte[] name)
	3607	+ {
	3608	+ if (compress.length != name.length)
	3609	+ {
	3610	+ return false;
	3611	+ }
	3612	+
	3613	+ for (int i=compress.length; --i>=0;)
	3614	+ {
	3615	+ if (compress[i] != name[i])
	3616	+ return false;
	3617	+ }
	3618	+
	3619	+ return true;
	3620	+ }
	3621	+
	3622	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3623	+
	3624	+ public boolean Save(boolean user)
	3625	+ {
	3626	+ System.err.println("Save");
	3627	+
3411	3628	cRadio tab = GetCurrentTab();
3412	3629
3413		- boolean temp = CameraPane.SWITCH;
3414		- CameraPane.SWITCH = false;
	3630	+ byte[] compress = CompressCopy();
3415	3631
3416		- copy.ExtractBigData(hashtable);
	3632	+ boolean thesame = false;
	3633	+
	3634	+ // Quick heuristic using length. Works only when stream is compressed.
	3635	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3636	+ {
	3637	+ thesame = true;
	3638	+ }
3417	3639
3418	3640	//EditorFrame.m_MainFrame.requestFocusInWindow();
3419		- tab.graphs[tab.undoindex++] = Compress(copy);
3420		-
3421		- copy.RestoreBigData(hashtable);
3422		-
3423		- CameraPane.SWITCH = temp;
3424		-
3425		- //assert(hashtable.isEmpty());
3426		-
3427		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3641	+ if (!thesame)
3428	3642	{
3429		- tab.graphs[i] = null;
	3643	+ //tab.user[tab.versionindex] = user;
	3644	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3645	+
	3646	+ copy.versions[++copy.versionindex] = compress;
	3647	+
	3648	+ // if (increment)
	3649	+ // tab.versionindex++;
3430	3650	}
3431	3651
	3652	+ //copy.RestoreBigData(versiontable);
	3653	+
	3654	+ //assert(hashtable.isEmpty());
	3655	+
	3656	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3657	+ {
	3658	+ //tab.user[i] = false;
	3659	+ copy.versions[i] = null;
	3660	+ }
	3661	+
	3662	+ SetUndoStates();
	3663	+
3432	3664	// test save
3433	3665	if (false)
3434	3666	{
3435	3667	try
3436	3668	{
3437		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3669	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3438	3670	ObjectOutputStream p = new ObjectOutputStream(ostream);
3439	3671
3440	3672	p.writeObject(copy);
..	..	@@ -3447,14 +3679,18 @@
3447	3679	e.printStackTrace();
3448	3680	}
3449	3681	}
	3682	+
	3683	+ return !thesame;
3450	3684	}
3451	3685
3452	3686	void CopyChanged(Object3D obj)
3453	3687	{
	3688	+ SetUndoStates();
	3689	+
3454	3690	boolean temp = CameraPane.SWITCH;
3455	3691	CameraPane.SWITCH = false;
3456	3692
3457		- copy.ExtractBigData(hashtable);
	3693	+ copy.ExtractBigData(versiontable);
3458	3694
3459	3695	copy.clear();
3460	3696
..	..	@@ -3463,7 +3699,7 @@
3463	3699	copy.add(obj.get(i));
3464	3700	}
3465	3701
3466		- copy.RestoreBigData(hashtable);
	3702	+ copy.RestoreBigData(versiontable);
3467	3703
3468	3704	CameraPane.SWITCH = temp;
3469	3705
..	..	@@ -3490,40 +3726,103 @@
3490	3726	refreshContents();
3491	3727	}
3492	3728
3493		- public void Undo()
	3729	+ cButton undoButton;
	3730	+ cButton restoreButton;
	3731	+ cButton replaceButton;
	3732	+ cButton redoButton;
	3733	+
	3734	+ void SetUndoStates()
3494	3735	{
3495	3736	cRadio tab = GetCurrentTab();
3496	3737
3497		- if (tab.undoindex == 0)
	3738	+ restoreButton.setEnabled(copy.versionindex != -1);
	3739	+ replaceButton.setEnabled(copy.versionindex != -1);
	3740	+ undoButton.setEnabled(copy.versionindex > 0);
	3741	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3742	+ }
	3743	+
	3744	+ public boolean Undo()
	3745	+ {
	3746	+ System.err.println("Undo");
	3747	+
	3748	+ cRadio tab = GetCurrentTab();
	3749	+
	3750	+ if (copy.versionindex == 0)
3498	3751	{
3499	3752	java.awt.Toolkit.getDefaultToolkit().beep();
3500		- return;
	3753	+ return false;
3501	3754	}
3502	3755
3503		- if (tab.graphs[tab.undoindex] == null)
	3756	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3757	+// {
	3758	+// if (Save(false))
	3759	+// tab.versionindex -= 1;
	3760	+// else
	3761	+// {
	3762	+// if (tab.versionindex <= 0)
	3763	+// return false;
	3764	+// else
	3765	+// tab.versionindex -= 1;
	3766	+// }
	3767	+// }
	3768	+
	3769	+ copy.versionindex -= 1;
	3770	+
	3771	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3772	+
	3773	+ return true;
	3774	+ }
	3775	+
	3776	+ public boolean Restore()
	3777	+ {
	3778	+ System.err.println("Restore");
	3779	+
	3780	+ cRadio tab = GetCurrentTab();
	3781	+
	3782	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3504	3783	{
3505		- Save();
3506		- tab.undoindex -= 1;
	3784	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3785	+ return false;
3507	3786	}
3508	3787
3509		- tab.undoindex -= 1;
	3788	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3789	+
	3790	+ return true;
	3791	+ }
3510	3792
3511		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3793	+ public boolean Replace()
	3794	+ {
	3795	+ System.err.println("Replace");
	3796	+
	3797	+ cRadio tab = GetCurrentTab();
	3798	+
	3799	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3800	+ {
	3801	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3802	+ return false;
	3803	+ }
	3804	+
	3805	+ copy.versions[copy.versionindex] = CompressCopy();
	3806	+
	3807	+ return true;
3512	3808	}
3513	3809
3514	3810	public void Redo()
3515	3811	{
3516	3812	cRadio tab = GetCurrentTab();
3517	3813
3518		- if (tab.graphs[tab.undoindex + 1] == null)
	3814	+ if (copy.versions[copy.versionindex + 1] == null)
3519	3815	{
3520	3816	java.awt.Toolkit.getDefaultToolkit().beep();
3521	3817	return;
3522	3818	}
3523	3819
3524		- tab.undoindex += 1;
	3820	+ copy.versionindex += 1;
3525	3821
3526		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3822	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3823	+
	3824	+ //if (!tab.user[tab.versionindex])
	3825	+ // tab.graphs[tab.versionindex] = null;
3527	3826	}
3528	3827
3529	3828	void ImportGFD()
..	..	@@ -3675,7 +3974,7 @@
3675	3974	assert false;
3676	3975	}
3677	3976
3678		- void EditSelection()
	3977	+ void EditSelection(boolean newWindow)
3679	3978	{
3680	3979	}
3681	3980
..	..	@@ -3819,9 +4118,22 @@
3819	4118	//copy.Touch();
3820	4119	}
3821	4120
	4121	+ cNumberSlider versionField;
	4122	+
3822	4123	public void stateChanged(ChangeEvent e)
3823	4124	{
3824	4125	// assert(false);
	4126	+ if (e.getSource() == versionField)
	4127	+ {
	4128	+ int version = versionField.getInteger();
	4129	+
	4130	+ if (copy.versions[version] != null)
	4131	+ {
	4132	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4133	+ }
	4134	+
	4135	+ return;
	4136	+ }
3825	4137
3826	4138	if (freezematerial)
3827	4139	{
..	..	@@ -4170,7 +4482,8 @@
4170	4482
4171	4483	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4172	4484	{
4173		- Save();
	4485	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4486	+ Save();
4174	4487	//Tween.set(thing, 0).target(1).start(tweenManager);
4175	4488	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4176	4489	// if (thing instanceof GenericJointDemo)
..	..	@@ -4257,6 +4570,12 @@
4257	4570	{
4258	4571	ResetModel();
4259	4572	Select(thing.GetTreePath(), true, false); // unselect... false);
	4573	+
	4574	+ if (thing.Size() == 0)
	4575	+ {
	4576	+ //EditSelection(false);
	4577	+ }
	4578	+
4260	4579	refreshContents();
4261	4580	}
4262	4581
..	..	@@ -4479,7 +4798,8 @@
4479	4798
4480	4799	if (readobj != null)
4481	4800	{
4482		- Save();
	4801	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4802	+ // Save();
4483	4803	try
4484	4804	{
4485	4805	//readobj.deepCopySelf(copy);
..	..	@@ -4534,13 +4854,18 @@
4534	4854	c.addChild(csg);
4535	4855	}
4536	4856
	4857	+ copy.versions = readobj.versions;
	4858	+ copy.versionindex = readobj.versionindex;
	4859	+
	4860	+ SetUndoStates();
	4861	+
4537	4862	ResetModel();
4538	4863	copy.HardTouch(); // recompile?
4539	4864	refreshContents();
4540	4865	}
4541	4866	}
4542	4867
4543		- void load() // throws ClassNotFoundException
	4868	+ void Open() // throws ClassNotFoundException
4544	4869	{
4545	4870	if (Grafreed.standAlone)
4546	4871	{
..	..	@@ -4657,6 +4982,8 @@
4657	4982	String filename = browser.getFile();
4658	4983	if (filename != null && filename.length() > 0)
4659	4984	{
	4985	+ if (!filename.endsWith(".gfd"))
	4986	+ filename += ".gfd";
4660	4987	lastname = browser.getDirectory() + filename;
4661	4988	save();
4662	4989	}
..	..	@@ -4823,7 +5150,7 @@
4823	5150	MenuBar menuBar;
4824	5151	Menu fileMenu;
4825	5152	MenuItem newItem;
4826		- MenuItem loadItem;
	5153	+ MenuItem openItem;
4827	5154	MenuItem saveItem;
4828	5155	MenuItem saveAsItem;
4829	5156	MenuItem exportAsItem;
..	..	@@ -4846,22 +5173,36 @@
4846	5173	CheckboxMenuItem toggleSwitchItem;
4847	5174	CheckboxMenuItem toggleRootItem;
4848	5175	CheckboxMenuItem animationItem;
	5176	+ MenuItem archiveItem;
4849	5177	CheckboxMenuItem toggleHandleItem;
4850	5178	CheckboxMenuItem togglePaintItem;
4851	5179	JSplitPane mainPanel;
4852	5180	JScrollPane scrollpane;
	5181	+
4853	5182	JPanel toolbarPanel;
	5183	+
4854	5184	cGridBag treePanel;
	5185	+
4855	5186	JPanel radioPanel;
4856	5187	ButtonGroup buttonGroup;
4857		- cGridBag ctrlPanel;
	5188	+
	5189	+ cGridBag toolboxPanel;
4858	5190	cGridBag materialPanel;
	5191	+ cGridBag ctrlPanel;
	5192	+
4859	5193	JScrollPane infoPanel;
	5194	+
4860	5195	cGridBag optionsPanel;
	5196	+
4861	5197	JTabbedPane objectPanel;
	5198	+ boolean materialFlushed;
	5199	+ Object3D latestObject;
	5200	+
4862	5201	cGridBag XYZPanel;
	5202	+
4863	5203	JSplitPane gridPanel;
4864	5204	JSplitPane bigPanel;
	5205	+
4865	5206	cGridBag bigThree;
4866	5207	cGridBag scenePanel;
4867	5208	cGridBag centralPanel;
..	..	@@ -4976,7 +5317,7 @@
4976	5317	cNumberSlider fogField;
4977	5318	JLabel opacityPowerLabel;
4978	5319	cNumberSlider opacityPowerField;
4979		- JTree jTree;
	5320	+ cTree jTree;
4980	5321	//ObjectUI parent;
4981	5322
4982	5323	cNumberSlider normalpushField;