~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -41,61 +44,47 @@
41	44
42	45	cButton GetButton(String name, boolean border)
43	46	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	47	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
53	49	}
54	50
55	51	cToggleButton GetToggleButton(String name, boolean border)
56	52	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
66	55	}
67	56
68	57	cCheckBox GetCheckBox(String name, boolean border)
69	58	{
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ private ImageIcon GetIcon(String name)
	64	+ {
70	65	try
71	66	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	67	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	68	+
	69	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	70	+ {
	71	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	72	+ Graphics2D g = resized.createGraphics();
	73	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	74	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	75	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	76	+ g.dispose();
	77	+
	78	+ image = resized;
	79	+ }
	80	+
	81	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	82	+ return icon;
74	83	}
75	84	catch (Exception e)
76	85	{
77		- return new cCheckBox(name, border);
	86	+ return null;
78	87	}
79		- }
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
82		- {
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
86		- {
87		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88		- Graphics2D g = resized.createGraphics();
89		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92		- g.dispose();
93		-
94		- image = resized;
95		- }
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
99	88	}
100	89
101	90	// SCRIPT
..	..	@@ -279,6 +268,12 @@
279	268	client = inClient;
280	269	copy = client;
281	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
282	277	// "this" is not called: SetupUI2(objEditor);
283	278	}
284	279
..	..	@@ -292,6 +287,12 @@
292	287	client = inClient;
293	288	copy = client;
294	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
295	296	SetupUI2(callee.GetEditor());
296	297	}
297	298
..	..	@@ -306,7 +307,7 @@
306	307	//localCopy.parent = null;
307	308
308	309	frame = new JFrame();
309		- frame.setUndecorated(true);
	310	+ frame.setUndecorated(false);
310	311	objEditor = this;
311	312	this.callee = callee;
312	313
..	..	@@ -324,6 +325,12 @@
324	325	copy = localCopy;
325	326	copy.editWindow = this;
326	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+ copy.versions = new byte[100][];
	331	+ copy.versionindex = -1;
	332	+ }
	333	+
327	334	SetupMenu();
328	335
329	336	//SetupName(objEditor); // new
..	..	@@ -347,7 +354,7 @@
347	354	frame.setMenuBar(menuBar = new MenuBar());
348	355	menuBar.add(fileMenu = new Menu("File"));
349	356	fileMenu.add(newItem = new MenuItem("New"));
350		- fileMenu.add(loadItem = new MenuItem("Open..."));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
351	358
352	359	//oe.menuBar.add(menu = new Menu("Include"));
353	360	Menu menu = new Menu("Import");
..	..	@@ -379,7 +386,7 @@
379	386	}
380	387
381	388	newItem.addActionListener(this);
382		- loadItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
383	390	saveItem.addActionListener(this);
384	391	saveAsItem.addActionListener(this);
385	392	exportAsItem.addActionListener(this);
..	..	@@ -416,11 +423,12 @@
416	423
417	424	toolbarPanel = new JPanel();
418	425	toolbarPanel.setName("Toolbar");
	426	+
419	427	treePanel = new cGridBag();
420	428	treePanel.setName("Tree");
421	429
422	430	editPanel = new cGridBag().setVertical(true);
423		- editPanel.setName("Edit");
	431	+ //editPanel.setName("Edit");
424	432
425	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
426	434
..	..	@@ -429,10 +437,10 @@
429	437	editPanel.add(ctrlPanel);
430	438
431	439	toolboxPanel = new cGridBag().setVertical(false);
432		- toolboxPanel.setName("Toolbox");
	440	+ //toolboxPanel.setName("Toolbox");
433	441
434	442	materialPanel = new cGridBag().setVertical(true);
435		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
436	444
437	445	/JTextPane/
438	446	infoarea = createTextPane();
..	..	@@ -440,14 +448,15 @@
440	448
441	449	infoarea.setEditable(true);
442	450	SetText();
	451	+
443	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
444	453	// infoarea.setOpaque(false);
445	454	// //infoarea.setForeground(textcolor);
446	455	// TEXTAREA infoarea.setLineWrap(true);
447	456	// TEXTAREA infoarea.setWrapStyleWord(true);
448	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
449		- infoPanel.setPreferredSize(new Dimension(50, 200));
450		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
451	460	//infoPanel.setLayout(new BorderLayout());
452	461	//infoPanel.add(createTextPane());
453	462
..	..	@@ -458,7 +467,14 @@
458	467	mainPanel.setDividerSize(9);
459	468	mainPanel.setDividerLocation(0.5); //1.0);
460	469	mainPanel.setResizeWeight(0.5);
461		-
	470	+
	471	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	472	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	473	+ divider.setDividerSize(15);
	474	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	475	+
	476	+ mainPanel.setUI(new BasicSplitPaneUI());
	477	+
462	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
463	479	//mainPanel.setLayout(new GridBagLayout());
464	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -689,8 +705,8 @@
689	705	}
690	706	}
691	707
692		-static GraphicsDevice device = GraphicsEnvironment
693		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
694	710
695	711	Rectangle keeprect;
696	712	cRadio radio;
..	..	@@ -711,10 +727,19 @@
711	727	void Minimize()
712	728	{
713	729	frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
714	731	}
715	732
	733	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	734	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	735	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
716	736	void Maximize()
717	737	{
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
718	743	if (maximized)
719	744	{
720	745	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -722,22 +747,36 @@
722	747	else
723	748	{
724	749	keeprect = frame.getBounds();
725		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
726		- Dimension rect2 = frame.getToolkit().getScreenSize();
727		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	750	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	751	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	752	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
728	753	// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
729	755	}
730	756
731	757	maximized ^= true;
	758	+
	759	+ frame.validate();
732	760	}
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
733	765
734	766	void ToggleFullScreen()
735	767	{
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
736	770	cameraView.ToggleFullScreen();
737	771
738	772	if (!CameraPane.FULLSCREEN)
739	773	{
740	774	device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
741	780	//frame.setVisible(false);
742	781	// frame.removeNotify();
743	782	// frame.setUndecorated(false);
..	..	@@ -747,7 +786,7 @@
747	786	// X frame.getContentPane().remove(/"Center",/bigThree);
748	787	// X framePanel.add(bigThree);
749	788	// X frame.getContentPane().add(/"Center",/framePanel);
750		- framePanel.setDividerLocation(1);
	789	+ framePanel.setDividerLocation(46);
751	790
752	791	//frame.setVisible(true);
753	792	radio.layout = keepButton;
..	..	@@ -762,7 +801,12 @@
762	801	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
763	802	// frame.getToolkit().getScreenSize().height);
764	803	//frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
765	807	device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
766	810	// frame.removeNotify();
767	811	// frame.setUndecorated(true);
768	812	// frame.addNotify();
..	..	@@ -775,7 +819,30 @@
775	819	radio.layout.doClick();
776	820	//frame.setVisible(true);
777	821	}
	822	+ frame.validate();
778	823	}
	824	+
	825	+ private byte[] CompressCopy()
	826	+ {
	827	+ boolean temp = CameraPane.SWITCH;
	828	+ CameraPane.SWITCH = false;
	829	+
	830	+ copy.ExtractBigData(versiontable);
	831	+ // if (copy == client)
	832	+
	833	+ byte[] versions[] = copy.versions;
	834	+ copy.versions = null;
	835	+
	836	+ byte[] compress = Compress(copy);
	837	+
	838	+ copy.versions = versions;
	839	+
	840	+ copy.RestoreBigData(versiontable);
	841	+
	842	+ CameraPane.SWITCH = temp;
	843	+
	844	+ return compress;
	845	+ }
779	846
780	847	private JTextPane createTextPane()
781	848	{
..	..	@@ -1107,7 +1174,7 @@
1107	1174	namePanel = new cGridBag();
1108	1175
1109	1176	nameField = AddText(namePanel, copy.GetName());
1110		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1111	1178	oe.ctrlPanel.add(namePanel);
1112	1179
1113	1180	oe.ctrlPanel.Return();
..	..	@@ -1125,20 +1192,21 @@
1125	1192	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1126	1193	hideCB.setToolTipText("Hide object");
1127	1194	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1128		- markCB.setToolTipText("Set the animation target transform");
	1195	+ markCB.setToolTipText("As animation target transform");
1129	1196
1130	1197	setupPanel2 = new cGridBag().setVertical(false);
1131	1198
1132	1199	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1133	1200	rewindCB.setToolTipText("Rewind animation");
1134	1201
1135		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1136		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1202	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1203	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1137	1204
	1205	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1206	+ link2masterCB.setToolTipText("Attach to support");
	1207	+
1138	1208	if (Globals.ADVANCED)
1139	1209	{
1140		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1141		- link2masterCB.setToolTipText("Attach to support");
1142	1210	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1143	1211	speedupCB.setToolTipText("Option motion capture");
1144	1212	}
..	..	@@ -1412,6 +1480,7 @@
1412	1480	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1413	1481	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1414	1482	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1483	+ //XYZPanel.setName("XYZ");
1415	1484
1416	1485	/*
1417	1486	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1449,13 +1518,23 @@
1449	1518	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1450	1519	//tmp.setName("Edit");
1451	1520	objectPanel.add(materialPanel);
	1521	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1452	1522	// JPanel north = new JPanel(new BorderLayout());
1453	1523	// north.setName("Edit");
1454	1524	// north.add(ctrlPanel, BorderLayout.NORTH);
1455	1525	// objectPanel.add(north);
1456	1526	objectPanel.add(editPanel);
1457		- objectPanel.add(infoPanel);
	1527	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1528	+
	1529	+ //if (Globals.ADVANCED)
	1530	+ objectPanel.add(infoPanel);
	1531	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1532	+
	1533	+ objectPanel.add(XYZPanel);
	1534	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1535	+
1458	1536	objectPanel.add(toolboxPanel);
	1537	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1459	1538
1460	1539	/*
1461	1540	aConstraints.gridx = 0;
..	..	@@ -1476,7 +1555,7 @@
1476	1555	scrollpane.addMouseWheelListener(this); // Default not fast enough
1477	1556
1478	1557	/JTabbedPane/ scenePanel = new cGridBag();
1479		- scenePanel.preferredWidth = 6;
	1558	+ scenePanel.preferredWidth = 5;
1480	1559
1481	1560	JTabbedPane tabbedPane = new JTabbedPane();
1482	1561	tabbedPane.add(scrollpane);
..	..	@@ -1554,7 +1633,7 @@
1554	1633	bigThree = new cGridBag();
1555	1634	bigThree.addComponent(scenePanel);
1556	1635	bigThree.addComponent(centralPanel);
1557		- bigThree.addComponent(XYZPanel);
	1636	+ //bigThree.addComponent(XYZPanel);
1558	1637
1559	1638	// // SIDE EFFECT!!!
1560	1639	// aConstraints.gridx = 0;
..	..	@@ -1563,9 +1642,9 @@
1563	1642	// aConstraints.gridheight = 1;
1564	1643
1565	1644	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1566		- framePanel.setContinuousLayout(true);
1567		- framePanel.setOneTouchExpandable(true);
1568		- framePanel.setDividerLocation(0.8);
	1645	+ framePanel.setContinuousLayout(false);
	1646	+ framePanel.setOneTouchExpandable(false);
	1647	+ //.setDividerLocation(0.8);
1569	1648	//framePanel.setDividerSize(15);
1570	1649	//framePanel.setResizeWeight(0.15);
1571	1650	framePanel.setName("Frame");
..	..	@@ -1584,12 +1663,13 @@
1584	1663
1585	1664	frame.setSize(1280, 860);
1586	1665
1587		- frame.validate();
1588		- frame.setVisible(true);
1589		-
1590	1666	cameraView.requestFocusInWindow();
1591	1667
1592	1668	gridPanel.setDividerLocation(1.0);
	1669	+
	1670	+ frame.validate();
	1671	+
	1672	+ frame.setVisible(true);
1593	1673
1594	1674	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1595	1675	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1676,24 +1756,6 @@
1676	1756	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1677	1757	colorSection.add(texture);
1678	1758
1679		- cGridBag anisoU = new cGridBag();
1680		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1681		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1683		- colorSection.add(anisoU);
1684		-
1685		- cGridBag anisoV = new cGridBag();
1686		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1687		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1689		- colorSection.add(anisoV);
1690		-
1691		- cGridBag shadowbias = new cGridBag();
1692		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1693		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1694		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1695		- colorSection.add(shadowbias);
1696		-
1697	1759	panel.add(new JSeparator());
1698	1760
1699	1761	panel.add(colorSection);
..	..	@@ -1743,6 +1805,12 @@
1743	1805	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1744	1806	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1745	1807	diffuseSection.add(fakedepth);
	1808	+
	1809	+ cGridBag shadowbias = new cGridBag();
	1810	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1811	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1812	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1813	+ diffuseSection.add(shadowbias);
1746	1814
1747	1815	panel.add(new JSeparator());
1748	1816
..	..	@@ -1794,6 +1862,18 @@
1794	1862	// aConstraints.gridy += 1;
1795	1863	// aConstraints.gridwidth = 1;
1796	1864
	1865	+ cGridBag anisoU = new cGridBag();
	1866	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1867	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1868	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1869	+ specularSection.add(anisoU);
	1870	+
	1871	+ cGridBag anisoV = new cGridBag();
	1872	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1873	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1874	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1875	+ specularSection.add(anisoV);
	1876	+
1797	1877
1798	1878	panel.add(new JSeparator());
1799	1879
..	..	@@ -1801,35 +1881,35 @@
1801	1881
1802	1882	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1803	1883
1804		- cGridBag globalSection = new cGridBag().setVertical(true);
	1884	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1805	1885
1806	1886	cGridBag camera = new cGridBag();
1807	1887	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1808	1888	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1809	1889	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1810		- globalSection.add(camera);
	1890	+ colorSection.add(camera);
1811	1891
1812	1892	cGridBag ambient = new cGridBag();
1813	1893	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1814	1894	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1815	1895	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816		- globalSection.add(ambient);
	1896	+ colorSection.add(ambient);
1817	1897
1818	1898	cGridBag backlit = new cGridBag();
1819	1899	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1820	1900	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1821	1901	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1822		- globalSection.add(backlit);
	1902	+ colorSection.add(backlit);
1823	1903
1824	1904	cGridBag opacity = new cGridBag();
1825	1905	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1826	1906	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1827	1907	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1828		- globalSection.add(opacity);
	1908	+ colorSection.add(opacity);
1829	1909
1830		- panel.add(new JSeparator());
	1910	+ //panel.add(new JSeparator());
1831	1911
1832		- panel.add(globalSection);
	1912	+ //panel.add(globalSection);
1833	1913
1834	1914	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1835	1915
..	..	@@ -1936,8 +2016,9 @@
1936	2016	// 3D models
1937	2017	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1938	2018	{
1939		- lastConverter = new com.jmex.model.converters.MaxToJme();
1940		- LoadFile(filename, lastConverter);
	2019	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2020	+ //LoadFile(filename, lastConverter);
	2021	+ LoadObjFile(filename); // New 3ds loader
1941	2022	continue;
1942	2023	}
1943	2024	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2663,6 +2744,7 @@
2663	2744	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2664	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2665	2746	}
	2747	+
2666	2748	//cJME.count++;
2667	2749	//cJME.count %= 12;
2668	2750	if (gc)
..	..	@@ -2846,6 +2928,7 @@
2846	2928	}
2847	2929	}
2848	2930	}
	2931	+
2849	2932	cFileSystemPane FSPane;
2850	2933
2851	2934	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2899,6 +2982,7 @@
2899	2982	}
2900	2983	}
2901	2984	}
	2985	+
2902	2986	freezematerial = false;
2903	2987	}
2904	2988
..	..	@@ -3017,12 +3101,17 @@
3017	3101	// }
3018	3102
3019	3103	/**/
3020		- if (deselect)
	3104	+ if (deselect \|\| child == null)
3021	3105	{
3022	3106	//group.deselectAll();
3023	3107	//freeze = true;
3024	3108	GetTree().clearSelection();
3025	3109	//freeze = false;
	3110	+
	3111	+ if (child == null)
	3112	+ {
	3113	+ return;
	3114	+ }
3026	3115	}
3027	3116
3028	3117	//group.addSelectee(child);
..	..	@@ -3346,9 +3435,9 @@
3346	3435	{
3347	3436	Close();
3348	3437	//return true;
3349		- } else if (source == loadItem)
	3438	+ } else if (source == openItem)
3350	3439	{
3351		- load();
	3440	+ Open();
3352	3441	//return true;
3353	3442	} else if (source == newItem)
3354	3443	{
..	..	@@ -3373,6 +3462,10 @@
3373	3462	{
3374	3463	generatePOV();
3375	3464	//return true;
	3465	+ } else if (event.getSource() == archiveItem)
	3466	+ {
	3467	+ cTools.Archive(frame);
	3468	+ return;
3376	3469	} else if (source == zBufferItem)
3377	3470	{
3378	3471	try
..	..	@@ -3424,8 +3517,8 @@
3424	3517	try
3425	3518	{
3426	3519	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3427		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3428		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3520	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3521	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3429	3522
3430	3523	Object3D parent = o.parent;
3431	3524	o.parent = null;
..	..	@@ -3436,10 +3529,14 @@
3436	3529
3437	3530	out.flush();
3438	3531
3439		- zstream.close();
	3532	+ baos //zstream
	3533	+ .close();
3440	3534	out.close();
3441	3535
3442		- return baos.toByteArray();
	3536	+ byte[] bytes = baos.toByteArray();
	3537	+
	3538	+ System.out.println("save #bytes = " + bytes.length);
	3539	+ return bytes;
3443	3540	} catch (Exception e)
3444	3541	{
3445	3542	System.err.println(e);
..	..	@@ -3449,13 +3546,16 @@
3449	3546
3450	3547	static public Object Uncompress(byte[] bytes)
3451	3548	{
3452		- System.out.println("#bytes = " + bytes.length);
	3549	+ System.out.println("restore #bytes = " + bytes.length);
3453	3550	try
3454	3551	{
3455	3552	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3456		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3457		- ObjectInputStream in = new ObjectInputStream(istream);
	3553	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3554	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3458	3555	Object obj = in.readObject();
	3556	+
	3557	+ bais //istream
	3558	+ .close();
3459	3559	in.close();
3460	3560
3461	3561	return obj;
..	..	@@ -3510,31 +3610,67 @@
3510	3610	return null;
3511	3611	}
3512	3612
3513		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3514	3613
3515	3614	public void Save()
	3615	+ {
	3616	+ //Save(true);
	3617	+ Replace();
	3618	+ }
	3619	+
	3620	+ private boolean Equal(byte[] compress, byte[] name)
	3621	+ {
	3622	+ if (compress.length != name.length)
	3623	+ {
	3624	+ return false;
	3625	+ }
	3626	+
	3627	+ for (int i=compress.length; --i>=0;)
	3628	+ {
	3629	+ if (compress[i] != name[i])
	3630	+ return false;
	3631	+ }
	3632	+
	3633	+ return true;
	3634	+ }
	3635	+
	3636	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3637	+
	3638	+ public boolean Save(boolean user)
3516	3639	{
3517	3640	System.err.println("Save");
3518	3641
3519	3642	cRadio tab = GetCurrentTab();
3520	3643
3521		- boolean temp = CameraPane.SWITCH;
3522		- CameraPane.SWITCH = false;
	3644	+ byte[] compress = CompressCopy();
3523	3645
3524		- copy.ExtractBigData(hashtable);
	3646	+ boolean thesame = false;
	3647	+
	3648	+ // Quick heuristic using length. Works only when stream is compressed.
	3649	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3650	+ {
	3651	+ thesame = true;
	3652	+ }
3525	3653
3526	3654	//EditorFrame.m_MainFrame.requestFocusInWindow();
3527		- tab.graphs[tab.undoindex++] = Compress(copy);
	3655	+ if (!thesame)
	3656	+ {
	3657	+ //tab.user[tab.versionindex] = user;
	3658	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3659	+
	3660	+ copy.versions[++copy.versionindex] = compress;
	3661	+
	3662	+ // if (increment)
	3663	+ // tab.versionindex++;
	3664	+ }
3528	3665
3529		- copy.RestoreBigData(hashtable);
	3666	+ //copy.RestoreBigData(versiontable);
3530	3667
3531		- CameraPane.SWITCH = temp;
3532		-
3533	3668	//assert(hashtable.isEmpty());
3534	3669
3535		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3670	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3536	3671	{
3537		- tab.graphs[i] = null;
	3672	+ //tab.user[i] = false;
	3673	+ copy.versions[i] = null;
3538	3674	}
3539	3675
3540	3676	SetUndoStates();
..	..	@@ -3544,7 +3680,7 @@
3544	3680	{
3545	3681	try
3546	3682	{
3547		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3683	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3548	3684	ObjectOutputStream p = new ObjectOutputStream(ostream);
3549	3685
3550	3686	p.writeObject(copy);
..	..	@@ -3557,6 +3693,8 @@
3557	3693	e.printStackTrace();
3558	3694	}
3559	3695	}
	3696	+
	3697	+ return !thesame;
3560	3698	}
3561	3699
3562	3700	void CopyChanged(Object3D obj)
..	..	@@ -3566,7 +3704,7 @@
3566	3704	boolean temp = CameraPane.SWITCH;
3567	3705	CameraPane.SWITCH = false;
3568	3706
3569		- copy.ExtractBigData(hashtable);
	3707	+ copy.ExtractBigData(versiontable);
3570	3708
3571	3709	copy.clear();
3572	3710
..	..	@@ -3575,7 +3713,7 @@
3575	3713	copy.add(obj.get(i));
3576	3714	}
3577	3715
3578		- copy.RestoreBigData(hashtable);
	3716	+ copy.RestoreBigData(versiontable);
3579	3717
3580	3718	CameraPane.SWITCH = temp;
3581	3719
..	..	@@ -3603,52 +3741,129 @@
3603	3741	}
3604	3742
3605	3743	cButton undoButton;
	3744	+ cButton restoreButton;
	3745	+ cButton replaceButton;
3606	3746	cButton redoButton;
3607	3747
	3748	+ boolean muteSlider;
	3749	+
	3750	+ int VersionCount()
	3751	+ {
	3752	+ int count = 0;
	3753	+
	3754	+ for (int i = copy.versions.length; --i >= 0;)
	3755	+ {
	3756	+ if (copy.versions[i] != null)
	3757	+ count++;
	3758	+ }
	3759	+
	3760	+ return count;
	3761	+ }
	3762	+
3608	3763	void SetUndoStates()
3609	3764	{
3610	3765	cRadio tab = GetCurrentTab();
3611	3766
3612		- undoButton.setEnabled(tab.undoindex > 0);
3613		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3767	+ restoreButton.setEnabled(copy.versionindex != -1);
	3768	+ replaceButton.setEnabled(copy.versionindex != -1);
	3769	+
	3770	+ undoButton.setEnabled(copy.versionindex > 0);
	3771	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3772	+
	3773	+ muteSlider = true;
	3774	+ versionSlider.setMaximum(VersionCount() - 1);
	3775	+ versionSlider.setInteger(copy.versionindex);
	3776	+ muteSlider = false;
3614	3777	}
3615	3778
3616		- public void Undo()
	3779	+ public boolean Undo()
3617	3780	{
	3781	+ // Option?
	3782	+ Replace();
	3783	+
3618	3784	System.err.println("Undo");
3619	3785
3620	3786	cRadio tab = GetCurrentTab();
3621	3787
3622		- if (tab.undoindex == 0)
	3788	+ if (copy.versionindex == 0)
3623	3789	{
3624	3790	java.awt.Toolkit.getDefaultToolkit().beep();
3625		- return;
	3791	+ return false;
3626	3792	}
3627	3793
3628		- if (tab.graphs[tab.undoindex] == null)
	3794	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3795	+// {
	3796	+// if (Save(false))
	3797	+// tab.versionindex -= 1;
	3798	+// else
	3799	+// {
	3800	+// if (tab.versionindex <= 0)
	3801	+// return false;
	3802	+// else
	3803	+// tab.versionindex -= 1;
	3804	+// }
	3805	+// }
	3806	+
	3807	+ copy.versionindex -= 1;
	3808	+
	3809	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3810	+
	3811	+ return true;
	3812	+ }
	3813	+
	3814	+ public boolean Restore()
	3815	+ {
	3816	+ System.err.println("Restore");
	3817	+
	3818	+ cRadio tab = GetCurrentTab();
	3819	+
	3820	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3629	3821	{
3630		- Save();
3631		- tab.undoindex -= 1;
	3822	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3823	+ return false;
3632	3824	}
3633	3825
3634		- tab.undoindex -= 1;
	3826	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3827	+
	3828	+ return true;
	3829	+ }
3635	3830
3636		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3831	+ public boolean Replace()
	3832	+ {
	3833	+ System.err.println("Replace");
	3834	+
	3835	+ cRadio tab = GetCurrentTab();
	3836	+
	3837	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3838	+ {
	3839	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3840	+ return false;
	3841	+ }
	3842	+
	3843	+ copy.versions[copy.versionindex] = CompressCopy();
	3844	+
	3845	+ return true;
3637	3846	}
3638	3847
3639	3848	public void Redo()
3640	3849	{
	3850	+ // Option?
	3851	+ Replace();
	3852	+
3641	3853	cRadio tab = GetCurrentTab();
3642	3854
3643		- if (tab.graphs[tab.undoindex + 1] == null)
	3855	+ if (copy.versions[copy.versionindex + 1] == null)
3644	3856	{
3645	3857	java.awt.Toolkit.getDefaultToolkit().beep();
3646	3858	return;
3647	3859	}
3648	3860
3649		- tab.undoindex += 1;
	3861	+ copy.versionindex += 1;
3650	3862
3651		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3864	+
	3865	+ //if (!tab.user[tab.versionindex])
	3866	+ // tab.graphs[tab.versionindex] = null;
3652	3867	}
3653	3868
3654	3869	void ImportGFD()
..	..	@@ -3944,9 +4159,25 @@
3944	4159	//copy.Touch();
3945	4160	}
3946	4161
	4162	+ cNumberSlider versionSlider;
	4163	+
3947	4164	public void stateChanged(ChangeEvent e)
3948	4165	{
3949	4166	// assert(false);
	4167	+ if (e.getSource() == versionSlider)
	4168	+ {
	4169	+ if (muteSlider)
	4170	+ return;
	4171	+
	4172	+ int version = versionSlider.getInteger();
	4173	+
	4174	+ if (copy.versions[version] != null)
	4175	+ {
	4176	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4177	+ }
	4178	+
	4179	+ return;
	4180	+ }
3950	4181
3951	4182	if (freezematerial)
3952	4183	{
..	..	@@ -4295,7 +4526,7 @@
4295	4526
4296	4527	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4297	4528	{
4298		- if (Globals.SAVEONMAKE) // && resetmodel)
	4529	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4299	4530	Save();
4300	4531	//Tween.set(thing, 0).target(1).start(tweenManager);
4301	4532	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4611,8 +4842,8 @@
4611	4842
4612	4843	if (readobj != null)
4613	4844	{
4614		- if (Globals.SAVEONMAKE)
4615		- Save();
	4845	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4846	+ // Save();
4616	4847	try
4617	4848	{
4618	4849	//readobj.deepCopySelf(copy);
..	..	@@ -4667,13 +4898,24 @@
4667	4898	c.addChild(csg);
4668	4899	}
4669	4900
	4901	+ copy.versions = readobj.versions;
	4902	+ copy.versionindex = readobj.versionindex;
	4903	+
	4904	+ if (copy.versions == null)
	4905	+ {
	4906	+ copy.versions = new byte[100][];
	4907	+ copy.versionindex = -1;
	4908	+ }
	4909	+
	4910	+ //? SetUndoStates();
	4911	+
4670	4912	ResetModel();
4671	4913	copy.HardTouch(); // recompile?
4672	4914	refreshContents();
4673	4915	}
4674	4916	}
4675	4917
4676		- void load() // throws ClassNotFoundException
	4918	+ void Open() // throws ClassNotFoundException
4677	4919	{
4678	4920	if (Grafreed.standAlone)
4679	4921	{
..	..	@@ -4958,7 +5200,7 @@
4958	5200	MenuBar menuBar;
4959	5201	Menu fileMenu;
4960	5202	MenuItem newItem;
4961		- MenuItem loadItem;
	5203	+ MenuItem openItem;
4962	5204	MenuItem saveItem;
4963	5205	MenuItem saveAsItem;
4964	5206	MenuItem exportAsItem;
..	..	@@ -4981,6 +5223,7 @@
4981	5223	CheckboxMenuItem toggleSwitchItem;
4982	5224	CheckboxMenuItem toggleRootItem;
4983	5225	CheckboxMenuItem animationItem;
	5226	+ MenuItem archiveItem;
4984	5227	CheckboxMenuItem toggleHandleItem;
4985	5228	CheckboxMenuItem togglePaintItem;
4986	5229	JSplitPane mainPanel;