~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -44,61 +44,47 @@
44	44
45	45	cButton GetButton(String name, boolean border)
46	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		- }
	47	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
56	49	}
57	50
58	51	cToggleButton GetToggleButton(String name, boolean border)
59	52	{
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		- }
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
69	55	}
70	56
71	57	cCheckBox GetCheckBox(String name, boolean border)
72	58	{
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ private ImageIcon GetIcon(String name)
	64	+ {
73	65	try
74	66	{
75		- ImageIcon icon = GetIcon(name);
76		- 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;
77	83	}
78	84	catch (Exception e)
79	85	{
80		- return new cCheckBox(name, border);
	86	+ return null;
81	87	}
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	88	}
103	89
104	90	// SCRIPT
..	..	@@ -282,6 +268,12 @@
282	268	client = inClient;
283	269	copy = client;
284	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
285	277	// "this" is not called: SetupUI2(objEditor);
286	278	}
287	279
..	..	@@ -295,6 +287,12 @@
295	287	client = inClient;
296	288	copy = client;
297	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
298	296	SetupUI2(callee.GetEditor());
299	297	}
300	298
..	..	@@ -309,7 +307,7 @@
309	307	//localCopy.parent = null;
310	308
311	309	frame = new JFrame();
312		- frame.setUndecorated(true);
	310	+ frame.setUndecorated(false);
313	311	objEditor = this;
314	312	this.callee = callee;
315	313
..	..	@@ -327,6 +325,12 @@
327	325	copy = localCopy;
328	326	copy.editWindow = this;
329	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+ copy.versions = new byte[100][];
	331	+ copy.versionindex = -1;
	332	+ }
	333	+
330	334	SetupMenu();
331	335
332	336	//SetupName(objEditor); // new
..	..	@@ -350,7 +354,7 @@
350	354	frame.setMenuBar(menuBar = new MenuBar());
351	355	menuBar.add(fileMenu = new Menu("File"));
352	356	fileMenu.add(newItem = new MenuItem("New"));
353		- fileMenu.add(loadItem = new MenuItem("Open..."));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
354	358
355	359	//oe.menuBar.add(menu = new Menu("Include"));
356	360	Menu menu = new Menu("Import");
..	..	@@ -382,7 +386,7 @@
382	386	}
383	387
384	388	newItem.addActionListener(this);
385		- loadItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
386	390	saveItem.addActionListener(this);
387	391	saveAsItem.addActionListener(this);
388	392	exportAsItem.addActionListener(this);
..	..	@@ -419,11 +423,12 @@
419	423
420	424	toolbarPanel = new JPanel();
421	425	toolbarPanel.setName("Toolbar");
	426	+
422	427	treePanel = new cGridBag();
423	428	treePanel.setName("Tree");
424	429
425	430	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	431	+ //editPanel.setName("Edit");
427	432
428	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	434
..	..	@@ -432,10 +437,10 @@
432	437	editPanel.add(ctrlPanel);
433	438
434	439	toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	440	+ //toolboxPanel.setName("Toolbox");
436	441
437	442	materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
439	444
440	445	/JTextPane/
441	446	infoarea = createTextPane();
..	..	@@ -443,14 +448,15 @@
443	448
444	449	infoarea.setEditable(true);
445	450	SetText();
	451	+
446	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	453	// infoarea.setOpaque(false);
448	454	// //infoarea.setForeground(textcolor);
449	455	// TEXTAREA infoarea.setLineWrap(true);
450	456	// TEXTAREA infoarea.setWrapStyleWord(true);
451	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452		- infoPanel.setPreferredSize(new Dimension(50, 200));
453		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
454	460	//infoPanel.setLayout(new BorderLayout());
455	461	//infoPanel.add(createTextPane());
456	462
..	..	@@ -699,8 +705,8 @@
699	705	}
700	706	}
701	707
702		-static GraphicsDevice device = GraphicsEnvironment
703		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
704	710
705	711	Rectangle keeprect;
706	712	cRadio radio;
..	..	@@ -721,10 +727,19 @@
721	727	void Minimize()
722	728	{
723	729	frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
724	731	}
725	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={}
726	736	void Maximize()
727	737	{
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
728	743	if (maximized)
729	744	{
730	745	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -732,22 +747,36 @@
732	747	else
733	748	{
734	749	keeprect = frame.getBounds();
735		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
736		- Dimension rect2 = frame.getToolkit().getScreenSize();
737		- 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);
738	753	// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
739	755	}
740	756
741	757	maximized ^= true;
	758	+
	759	+ frame.validate();
742	760	}
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
743	765
744	766	void ToggleFullScreen()
745	767	{
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
746	770	cameraView.ToggleFullScreen();
747	771
748	772	if (!CameraPane.FULLSCREEN)
749	773	{
750	774	device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
751	780	//frame.setVisible(false);
752	781	// frame.removeNotify();
753	782	// frame.setUndecorated(false);
..	..	@@ -757,7 +786,7 @@
757	786	// X frame.getContentPane().remove(/"Center",/bigThree);
758	787	// X framePanel.add(bigThree);
759	788	// X frame.getContentPane().add(/"Center",/framePanel);
760		- framePanel.setDividerLocation(1);
	789	+ framePanel.setDividerLocation(46);
761	790
762	791	//frame.setVisible(true);
763	792	radio.layout = keepButton;
..	..	@@ -772,7 +801,12 @@
772	801	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
773	802	// frame.getToolkit().getScreenSize().height);
774	803	//frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
775	807	device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
776	810	// frame.removeNotify();
777	811	// frame.setUndecorated(true);
778	812	// frame.addNotify();
..	..	@@ -785,7 +819,30 @@
785	819	radio.layout.doClick();
786	820	//frame.setVisible(true);
787	821	}
	822	+ frame.validate();
788	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	+ }
789	846
790	847	private JTextPane createTextPane()
791	848	{
..	..	@@ -1117,7 +1174,7 @@
1117	1174	namePanel = new cGridBag();
1118	1175
1119	1176	nameField = AddText(namePanel, copy.GetName());
1120		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1121	1178	oe.ctrlPanel.add(namePanel);
1122	1179
1123	1180	oe.ctrlPanel.Return();
..	..	@@ -1142,13 +1199,14 @@
1142	1199	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1143	1200	rewindCB.setToolTipText("Rewind animation");
1144	1201
1145		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1202	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1146	1203	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1147	1204
	1205	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1206	+ link2masterCB.setToolTipText("Attach to support");
	1207	+
1148	1208	if (Globals.ADVANCED)
1149	1209	{
1150		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1151		- link2masterCB.setToolTipText("Attach to support");
1152	1210	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1153	1211	speedupCB.setToolTipText("Option motion capture");
1154	1212	}
..	..	@@ -1422,6 +1480,7 @@
1422	1480	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1423	1481	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1424	1482	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1483	+ //XYZPanel.setName("XYZ");
1425	1484
1426	1485	/*
1427	1486	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1459,13 +1518,23 @@
1459	1518	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1460	1519	//tmp.setName("Edit");
1461	1520	objectPanel.add(materialPanel);
	1521	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1462	1522	// JPanel north = new JPanel(new BorderLayout());
1463	1523	// north.setName("Edit");
1464	1524	// north.add(ctrlPanel, BorderLayout.NORTH);
1465	1525	// objectPanel.add(north);
1466	1526	objectPanel.add(editPanel);
1467		- 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	+
1468	1536	objectPanel.add(toolboxPanel);
	1537	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1469	1538
1470	1539	/*
1471	1540	aConstraints.gridx = 0;
..	..	@@ -1486,7 +1555,7 @@
1486	1555	scrollpane.addMouseWheelListener(this); // Default not fast enough
1487	1556
1488	1557	/JTabbedPane/ scenePanel = new cGridBag();
1489		- scenePanel.preferredWidth = 6;
	1558	+ scenePanel.preferredWidth = 5;
1490	1559
1491	1560	JTabbedPane tabbedPane = new JTabbedPane();
1492	1561	tabbedPane.add(scrollpane);
..	..	@@ -1564,7 +1633,7 @@
1564	1633	bigThree = new cGridBag();
1565	1634	bigThree.addComponent(scenePanel);
1566	1635	bigThree.addComponent(centralPanel);
1567		- bigThree.addComponent(XYZPanel);
	1636	+ //bigThree.addComponent(XYZPanel);
1568	1637
1569	1638	// // SIDE EFFECT!!!
1570	1639	// aConstraints.gridx = 0;
..	..	@@ -1573,9 +1642,9 @@
1573	1642	// aConstraints.gridheight = 1;
1574	1643
1575	1644	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1576		- framePanel.setContinuousLayout(true);
1577		- framePanel.setOneTouchExpandable(true);
1578		- framePanel.setDividerLocation(0.8);
	1645	+ framePanel.setContinuousLayout(false);
	1646	+ framePanel.setOneTouchExpandable(false);
	1647	+ //.setDividerLocation(0.8);
1579	1648	//framePanel.setDividerSize(15);
1580	1649	//framePanel.setResizeWeight(0.15);
1581	1650	framePanel.setName("Frame");
..	..	@@ -1594,12 +1663,13 @@
1594	1663
1595	1664	frame.setSize(1280, 860);
1596	1665
1597		- frame.validate();
1598		- frame.setVisible(true);
1599		-
1600	1666	cameraView.requestFocusInWindow();
1601	1667
1602	1668	gridPanel.setDividerLocation(1.0);
	1669	+
	1670	+ frame.validate();
	1671	+
	1672	+ frame.setVisible(true);
1603	1673
1604	1674	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1605	1675	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1686,24 +1756,6 @@
1686	1756	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1687	1757	colorSection.add(texture);
1688	1758
1689		- cGridBag anisoU = new cGridBag();
1690		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1691		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1693		- colorSection.add(anisoU);
1694		-
1695		- cGridBag anisoV = new cGridBag();
1696		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1697		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1699		- colorSection.add(anisoV);
1700		-
1701		- cGridBag shadowbias = new cGridBag();
1702		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1703		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1704		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1705		- colorSection.add(shadowbias);
1706		-
1707	1759	panel.add(new JSeparator());
1708	1760
1709	1761	panel.add(colorSection);
..	..	@@ -1753,6 +1805,12 @@
1753	1805	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1754	1806	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1755	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);
1756	1814
1757	1815	panel.add(new JSeparator());
1758	1816
..	..	@@ -1804,6 +1862,18 @@
1804	1862	// aConstraints.gridy += 1;
1805	1863	// aConstraints.gridwidth = 1;
1806	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	+
1807	1877
1808	1878	panel.add(new JSeparator());
1809	1879
..	..	@@ -1811,35 +1881,35 @@
1811	1881
1812	1882	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1813	1883
1814		- cGridBag globalSection = new cGridBag().setVertical(true);
	1884	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1815	1885
1816	1886	cGridBag camera = new cGridBag();
1817	1887	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1818	1888	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1819	1889	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1820		- globalSection.add(camera);
	1890	+ colorSection.add(camera);
1821	1891
1822	1892	cGridBag ambient = new cGridBag();
1823	1893	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1824	1894	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1825	1895	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1826		- globalSection.add(ambient);
	1896	+ colorSection.add(ambient);
1827	1897
1828	1898	cGridBag backlit = new cGridBag();
1829	1899	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1830	1900	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1831	1901	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1832		- globalSection.add(backlit);
	1902	+ colorSection.add(backlit);
1833	1903
1834	1904	cGridBag opacity = new cGridBag();
1835	1905	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1836	1906	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1837	1907	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1838		- globalSection.add(opacity);
	1908	+ colorSection.add(opacity);
1839	1909
1840		- panel.add(new JSeparator());
	1910	+ //panel.add(new JSeparator());
1841	1911
1842		- panel.add(globalSection);
	1912	+ //panel.add(globalSection);
1843	1913
1844	1914	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1845	1915
..	..	@@ -1946,8 +2016,9 @@
1946	2016	// 3D models
1947	2017	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1948	2018	{
1949		- lastConverter = new com.jmex.model.converters.MaxToJme();
1950		- LoadFile(filename, lastConverter);
	2019	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2020	+ //LoadFile(filename, lastConverter);
	2021	+ LoadObjFile(filename); // New 3ds loader
1951	2022	continue;
1952	2023	}
1953	2024	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2673,6 +2744,7 @@
2673	2744	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2674	2745	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2675	2746	}
	2747	+
2676	2748	//cJME.count++;
2677	2749	//cJME.count %= 12;
2678	2750	if (gc)
..	..	@@ -2856,6 +2928,7 @@
2856	2928	}
2857	2929	}
2858	2930	}
	2931	+
2859	2932	cFileSystemPane FSPane;
2860	2933
2861	2934	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2909,6 +2982,7 @@
2909	2982	}
2910	2983	}
2911	2984	}
	2985	+
2912	2986	freezematerial = false;
2913	2987	}
2914	2988
..	..	@@ -3361,9 +3435,9 @@
3361	3435	{
3362	3436	Close();
3363	3437	//return true;
3364		- } else if (source == loadItem)
	3438	+ } else if (source == openItem)
3365	3439	{
3366		- load();
	3440	+ Open();
3367	3441	//return true;
3368	3442	} else if (source == newItem)
3369	3443	{
..	..	@@ -3388,6 +3462,10 @@
3388	3462	{
3389	3463	generatePOV();
3390	3464	//return true;
	3465	+ } else if (event.getSource() == archiveItem)
	3466	+ {
	3467	+ cTools.Archive(frame);
	3468	+ return;
3391	3469	} else if (source == zBufferItem)
3392	3470	{
3393	3471	try
..	..	@@ -3439,8 +3517,8 @@
3439	3517	try
3440	3518	{
3441	3519	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3442		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3443		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3520	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3521	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3444	3522
3445	3523	Object3D parent = o.parent;
3446	3524	o.parent = null;
..	..	@@ -3451,10 +3529,14 @@
3451	3529
3452	3530	out.flush();
3453	3531
3454		- zstream.close();
	3532	+ baos //zstream
	3533	+ .close();
3455	3534	out.close();
3456	3535
3457		- return baos.toByteArray();
	3536	+ byte[] bytes = baos.toByteArray();
	3537	+
	3538	+ System.out.println("save #bytes = " + bytes.length);
	3539	+ return bytes;
3458	3540	} catch (Exception e)
3459	3541	{
3460	3542	System.err.println(e);
..	..	@@ -3464,13 +3546,16 @@
3464	3546
3465	3547	static public Object Uncompress(byte[] bytes)
3466	3548	{
3467		- System.out.println("#bytes = " + bytes.length);
	3549	+ System.out.println("restore #bytes = " + bytes.length);
3468	3550	try
3469	3551	{
3470	3552	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3471		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3472		- ObjectInputStream in = new ObjectInputStream(istream);
	3553	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3554	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3473	3555	Object obj = in.readObject();
	3556	+
	3557	+ bais //istream
	3558	+ .close();
3474	3559	in.close();
3475	3560
3476	3561	return obj;
..	..	@@ -3525,31 +3610,67 @@
3525	3610	return null;
3526	3611	}
3527	3612
3528		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3529	3613
3530	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)
3531	3639	{
3532	3640	System.err.println("Save");
3533	3641
3534	3642	cRadio tab = GetCurrentTab();
3535	3643
3536		- boolean temp = CameraPane.SWITCH;
3537		- CameraPane.SWITCH = false;
	3644	+ byte[] compress = CompressCopy();
3538	3645
3539		- 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	+ }
3540	3653
3541	3654	//EditorFrame.m_MainFrame.requestFocusInWindow();
3542		- 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	+ }
3543	3665
3544		- copy.RestoreBigData(hashtable);
	3666	+ //copy.RestoreBigData(versiontable);
3545	3667
3546		- CameraPane.SWITCH = temp;
3547		-
3548	3668	//assert(hashtable.isEmpty());
3549	3669
3550		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3670	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3551	3671	{
3552		- tab.graphs[i] = null;
	3672	+ //tab.user[i] = false;
	3673	+ copy.versions[i] = null;
3553	3674	}
3554	3675
3555	3676	SetUndoStates();
..	..	@@ -3559,7 +3680,7 @@
3559	3680	{
3560	3681	try
3561	3682	{
3562		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3683	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3563	3684	ObjectOutputStream p = new ObjectOutputStream(ostream);
3564	3685
3565	3686	p.writeObject(copy);
..	..	@@ -3572,6 +3693,8 @@
3572	3693	e.printStackTrace();
3573	3694	}
3574	3695	}
	3696	+
	3697	+ return !thesame;
3575	3698	}
3576	3699
3577	3700	void CopyChanged(Object3D obj)
..	..	@@ -3581,7 +3704,7 @@
3581	3704	boolean temp = CameraPane.SWITCH;
3582	3705	CameraPane.SWITCH = false;
3583	3706
3584		- copy.ExtractBigData(hashtable);
	3707	+ copy.ExtractBigData(versiontable);
3585	3708
3586	3709	copy.clear();
3587	3710
..	..	@@ -3590,7 +3713,7 @@
3590	3713	copy.add(obj.get(i));
3591	3714	}
3592	3715
3593		- copy.RestoreBigData(hashtable);
	3716	+ copy.RestoreBigData(versiontable);
3594	3717
3595	3718	CameraPane.SWITCH = temp;
3596	3719
..	..	@@ -3618,52 +3741,129 @@
3618	3741	}
3619	3742
3620	3743	cButton undoButton;
	3744	+ cButton restoreButton;
	3745	+ cButton replaceButton;
3621	3746	cButton redoButton;
3622	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	+
3623	3763	void SetUndoStates()
3624	3764	{
3625	3765	cRadio tab = GetCurrentTab();
3626	3766
3627		- undoButton.setEnabled(tab.undoindex > 0);
3628		- 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;
3629	3777	}
3630	3778
3631		- public void Undo()
	3779	+ public boolean Undo()
3632	3780	{
	3781	+ // Option?
	3782	+ Replace();
	3783	+
3633	3784	System.err.println("Undo");
3634	3785
3635	3786	cRadio tab = GetCurrentTab();
3636	3787
3637		- if (tab.undoindex == 0)
	3788	+ if (copy.versionindex == 0)
3638	3789	{
3639	3790	java.awt.Toolkit.getDefaultToolkit().beep();
3640		- return;
	3791	+ return false;
3641	3792	}
3642	3793
3643		- 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)
3644	3821	{
3645		- Save();
3646		- tab.undoindex -= 1;
	3822	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3823	+ return false;
3647	3824	}
3648	3825
3649		- tab.undoindex -= 1;
	3826	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3827	+
	3828	+ return true;
	3829	+ }
3650	3830
3651		- 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;
3652	3846	}
3653	3847
3654	3848	public void Redo()
3655	3849	{
	3850	+ // Option?
	3851	+ Replace();
	3852	+
3656	3853	cRadio tab = GetCurrentTab();
3657	3854
3658		- if (tab.graphs[tab.undoindex + 1] == null)
	3855	+ if (copy.versions[copy.versionindex + 1] == null)
3659	3856	{
3660	3857	java.awt.Toolkit.getDefaultToolkit().beep();
3661	3858	return;
3662	3859	}
3663	3860
3664		- tab.undoindex += 1;
	3861	+ copy.versionindex += 1;
3665	3862
3666		- 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;
3667	3867	}
3668	3868
3669	3869	void ImportGFD()
..	..	@@ -3959,9 +4159,25 @@
3959	4159	//copy.Touch();
3960	4160	}
3961	4161
	4162	+ cNumberSlider versionSlider;
	4163	+
3962	4164	public void stateChanged(ChangeEvent e)
3963	4165	{
3964	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	+ }
3965	4181
3966	4182	if (freezematerial)
3967	4183	{
..	..	@@ -4310,7 +4526,7 @@
4310	4526
4311	4527	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4312	4528	{
4313		- if (Globals.SAVEONMAKE) // && resetmodel)
	4529	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4314	4530	Save();
4315	4531	//Tween.set(thing, 0).target(1).start(tweenManager);
4316	4532	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4626,8 +4842,8 @@
4626	4842
4627	4843	if (readobj != null)
4628	4844	{
4629		- if (Globals.SAVEONMAKE)
4630		- Save();
	4845	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4846	+ // Save();
4631	4847	try
4632	4848	{
4633	4849	//readobj.deepCopySelf(copy);
..	..	@@ -4682,13 +4898,24 @@
4682	4898	c.addChild(csg);
4683	4899	}
4684	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	+
4685	4912	ResetModel();
4686	4913	copy.HardTouch(); // recompile?
4687	4914	refreshContents();
4688	4915	}
4689	4916	}
4690	4917
4691		- void load() // throws ClassNotFoundException
	4918	+ void Open() // throws ClassNotFoundException
4692	4919	{
4693	4920	if (Grafreed.standAlone)
4694	4921	{
..	..	@@ -4973,7 +5200,7 @@
4973	5200	MenuBar menuBar;
4974	5201	Menu fileMenu;
4975	5202	MenuItem newItem;
4976		- MenuItem loadItem;
	5203	+ MenuItem openItem;
4977	5204	MenuItem saveItem;
4978	5205	MenuItem saveAsItem;
4979	5206	MenuItem exportAsItem;
..	..	@@ -4996,6 +5223,7 @@
4996	5223	CheckboxMenuItem toggleSwitchItem;
4997	5224	CheckboxMenuItem toggleRootItem;
4998	5225	CheckboxMenuItem animationItem;
	5226	+ MenuItem archiveItem;
4999	5227	CheckboxMenuItem toggleHandleItem;
5000	5228	CheckboxMenuItem togglePaintItem;
5001	5229	JSplitPane mainPanel;