~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -41,64 +41,78 @@
41	41	JFrame frame;
42	42
43	43	static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
44	52
45	53	cButton GetButton(String name, boolean border)
46	54	{
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		- }
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
56	63	}
57	64
58	65	cToggleButton GetToggleButton(String name, boolean border)
59	66	{
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		- }
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
69	69	}
70	70
71	71	cCheckBox GetCheckBox(String name, boolean border)
72	72	{
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
73	79	try
74	80	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
77	97	}
78	98	catch (Exception e)
79	99	{
80		- return new cCheckBox(name, border);
	100	+ return null;
81	101	}
82	102	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	103	+
	104	+ BufferedImage GetImage(String name)
85	105	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	106	+ try
89	107	{
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;
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
98	111	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
102	116	}
103	117
104	118	// SCRIPT
..	..	@@ -282,6 +296,12 @@
282	296	client = inClient;
283	297	copy = client;
284	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
285	305	// "this" is not called: SetupUI2(objEditor);
286	306	}
287	307
..	..	@@ -295,6 +315,12 @@
295	315	client = inClient;
296	316	copy = client;
297	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
298	324	SetupUI2(callee.GetEditor());
299	325	}
300	326
..	..	@@ -327,6 +353,12 @@
327	353	copy = localCopy;
328	354	copy.editWindow = this;
329	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
330	362	SetupMenu();
331	363
332	364	//SetupName(objEditor); // new
..	..	@@ -419,11 +451,12 @@
419	451
420	452	toolbarPanel = new JPanel();
421	453	toolbarPanel.setName("Toolbar");
	454	+
422	455	treePanel = new cGridBag();
423	456	treePanel.setName("Tree");
424	457
425	458	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
427	460
428	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	462
..	..	@@ -431,11 +464,11 @@
431	464	editPanel.add(editCommandsPanel);
432	465	editPanel.add(ctrlPanel);
433	466
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
436	469
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
439	472
440	473	/JTextPane/
441	474	infoarea = createTextPane();
..	..	@@ -443,14 +476,15 @@
443	476
444	477	infoarea.setEditable(true);
445	478	SetText();
	479	+
446	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	481	// infoarea.setOpaque(false);
448	482	// //infoarea.setForeground(textcolor);
449	483	// TEXTAREA infoarea.setLineWrap(true);
450	484	// TEXTAREA infoarea.setWrapStyleWord(true);
451	485	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");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
454	488	//infoPanel.setLayout(new BorderLayout());
455	489	//infoPanel.add(createTextPane());
456	490
..	..	@@ -816,6 +850,29 @@
816	850	frame.validate();
817	851	}
818	852
	853	+ private Object3D CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versionlist;
	862	+ copy.versionlist = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versionlist = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
	875	+
819	876	private JTextPane createTextPane()
820	877	{
821	878	// TEXTAREA String[] initString =
..	..	@@ -937,6 +994,7 @@
937	994	{
938	995	SetupMaterial(materialPanel);
939	996	}
	997	+
940	998	//SetupName();
941	999	//SetupViews();
942	1000	}
..	..	@@ -946,7 +1004,7 @@
946	1004	// NumberSlider vDivsField;
947	1005	// JCheckBox endcaps;
948	1006	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1007	+ JCheckBox selectableCB;
950	1008	JCheckBox hideCB;
951	1009	JCheckBox link2masterCB;
952	1010	JCheckBox markCB;
..	..	@@ -1158,13 +1216,16 @@
1158	1216
1159	1217	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1218	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1219	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1220	+ selectableCB.setToolTipText("Make object selectable");
1163	1221	// Return();
	1222	+
1164	1223	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1224	hideCB.setToolTipText("Hide object");
1166	1225	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167	1226	markCB.setToolTipText("As animation target transform");
	1227	+
	1228	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1229
1169	1230	setupPanel2 = new cGridBag().setVertical(false);
1170	1231
..	..	@@ -1174,10 +1235,11 @@
1174	1235	randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1175	1236	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1176	1237
	1238	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1239	+ link2masterCB.setToolTipText("Attach to support");
	1240	+
1177	1241	if (Globals.ADVANCED)
1178	1242	{
1179		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180		- link2masterCB.setToolTipText("Attach to support");
1181	1243	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1182	1244	speedupCB.setToolTipText("Option motion capture");
1183	1245	}
..	..	@@ -1451,6 +1513,7 @@
1451	1513	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1452	1514	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1453	1515	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1516	+ //XYZPanel.setName("XYZ");
1454	1517
1455	1518	/*
1456	1519	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1488,16 +1551,29 @@
1488	1551	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1489	1552	//tmp.setName("Edit");
1490	1553	objectPanel.add(materialPanel);
	1554	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1555	+ objectPanel.setToolTipTextAt(0, "Material");
	1556	+
1491	1557	// JPanel north = new JPanel(new BorderLayout());
1492	1558	// north.setName("Edit");
1493	1559	// north.add(ctrlPanel, BorderLayout.NORTH);
1494	1560	// objectPanel.add(north);
1495	1561	objectPanel.add(editPanel);
	1562	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1563	+ objectPanel.setToolTipTextAt(1, "Edit controls");
1496	1564
1497		- if (Globals.ADVANCED)
	1565	+ //if (Globals.ADVANCED)
1498	1566	objectPanel.add(infoPanel);
	1567	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1568	+ objectPanel.setToolTipTextAt(2, "Information");
	1569	+
	1570	+ objectPanel.add(XYZPanel);
	1571	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1572	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1499	1573
1500	1574	objectPanel.add(toolboxPanel);
	1575	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1576	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1501	1577
1502	1578	/*
1503	1579	aConstraints.gridx = 0;
..	..	@@ -1518,7 +1594,7 @@
1518	1594	scrollpane.addMouseWheelListener(this); // Default not fast enough
1519	1595
1520	1596	/JTabbedPane/ scenePanel = new cGridBag();
1521		- scenePanel.preferredWidth = 6;
	1597	+ scenePanel.preferredWidth = 5;
1522	1598
1523	1599	JTabbedPane tabbedPane = new JTabbedPane();
1524	1600	tabbedPane.add(scrollpane);
..	..	@@ -1596,7 +1672,7 @@
1596	1672	bigThree = new cGridBag();
1597	1673	bigThree.addComponent(scenePanel);
1598	1674	bigThree.addComponent(centralPanel);
1599		- bigThree.addComponent(XYZPanel);
	1675	+ //bigThree.addComponent(XYZPanel);
1600	1676
1601	1677	// // SIDE EFFECT!!!
1602	1678	// aConstraints.gridx = 0;
..	..	@@ -1637,7 +1713,6 @@
1637	1713	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1638	1714	frame.addWindowListener(new WindowAdapter()
1639	1715	{
1640		-
1641	1716	public void windowClosing(WindowEvent e)
1642	1717	{
1643	1718	Close();
..	..	@@ -1660,12 +1735,56 @@
1660	1735	ctrlPanel.removeAll();
1661	1736	}
1662	1737
1663		- void SetupMaterial(cGridBag panel)
	1738	+ void SetupMaterial(cGridBag materialpanel)
1664	1739	{
1665		- /*
	1740	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1741	+ cLabel label = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1742	+ label.addMouseListener(new MouseAdapter()
	1743	+ {
	1744	+ public void mouseClicked(MouseEvent e)
	1745	+ {
	1746	+ colorField.setFloat(0);
	1747	+ saturationField.setFloat(1);
	1748	+ materialtouched = true;
	1749	+ applySelf();
	1750	+ }
	1751	+ });
	1752	+ presetpanel.add(label);
	1753	+
	1754	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF));
	1755	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1756	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1757	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1758	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1759	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1760	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1761	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1762	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1763	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1764	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1765	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1766	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1767	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1768	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1769	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1770	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1771	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF));
	1772	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00019.png", !Grafreed.NIMBUSLAF));
	1773	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00020.png", !Grafreed.NIMBUSLAF));
	1774	+
	1775	+ cGridBag panel = new cGridBag().setVertical(true);
	1776	+
	1777	+ presetpanel.preferredWidth = 1;
	1778	+
	1779	+ materialpanel.add(panel);
	1780	+ materialpanel.add(presetpanel);
	1781	+
	1782	+ panel.preferredWidth = 8;
	1783	+
	1784	+ /*
1666	1785	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1667	1786	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668		- */
	1787	+ */
1669	1788
1670	1789	cGridBag editBar = new cGridBag().setVertical(false);
1671	1790
..	..	@@ -1699,27 +1818,50 @@
1699	1818	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1700	1819
1701	1820	cGridBag colorSection = new cGridBag().setVertical(true);
	1821	+
	1822	+ cGridBag huepanel = new cGridBag();
	1823	+ cGridBag huelabel = new cGridBag();
	1824	+ label = GetLabel("icons/hue.png", false);
	1825	+ label.fit = true;
	1826	+ huelabel.add(label);
	1827	+ huelabel.preferredWidth = 20;
	1828	+ huepanel.add(new cGridBag()); // Label
	1829	+ huepanel.add(huelabel); // Field/slider
	1830	+
	1831	+ huepanel.preferredHeight = 7;
	1832	+
	1833	+ colorSection.add(huepanel);
1702	1834
1703	1835	cGridBag color = new cGridBag();
1704		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1705		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1836	+
	1837	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1838	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1839	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1840	+
1707	1841	//colorField.preferredWidth = 200;
1708	1842	colorSection.add(color);
1709	1843
1710	1844	cGridBag modulation = new cGridBag();
1711	1845	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1712	1846	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1847	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1714	1848	colorSection.add(modulation);
1715	1849
	1850	+ cGridBag opacity = new cGridBag();
	1851	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1852	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1853	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1854	+ colorSection.add(opacity);
	1855	+
	1856	+ colorSection.add(GetSeparator());
	1857	+
1716	1858	cGridBag texture = new cGridBag();
1717	1859	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1718	1860	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1719	1861	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1720	1862	colorSection.add(texture);
1721	1863
1722		- panel.add(new JSeparator());
	1864	+ panel.add(GetSeparator());
1723	1865
1724	1866	panel.add(colorSection);
1725	1867
..	..	@@ -1775,7 +1917,7 @@
1775	1917	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1776	1918	diffuseSection.add(shadowbias);
1777	1919
1778		- panel.add(new JSeparator());
	1920	+ panel.add(GetSeparator());
1779	1921
1780	1922	panel.add(diffuseSection);
1781	1923
..	..	@@ -1838,7 +1980,7 @@
1838	1980	specularSection.add(anisoV);
1839	1981
1840	1982
1841		- panel.add(new JSeparator());
	1983	+ panel.add(GetSeparator());
1842	1984
1843	1985	panel.add(specularSection);
1844	1986
..	..	@@ -1863,12 +2005,6 @@
1863	2005	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1864	2006	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1865	2007	colorSection.add(backlit);
1866		-
1867		- cGridBag opacity = new cGridBag();
1868		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1869		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1870		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1871		- colorSection.add(opacity);
1872	2008
1873	2009	//panel.add(new JSeparator());
1874	2010
..	..	@@ -1914,7 +2050,7 @@
1914	2050	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1915	2051	textureSection.add(opacityPower);
1916	2052
1917		- panel.add(new JSeparator());
	2053	+ panel.add(GetSeparator());
1918	2054
1919	2055	panel.add(textureSection);
1920	2056
..	..	@@ -1979,8 +2115,9 @@
1979	2115	// 3D models
1980	2116	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1981	2117	{
1982		- lastConverter = new com.jmex.model.converters.MaxToJme();
1983		- LoadFile(filename, lastConverter);
	2118	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2119	+ //LoadFile(filename, lastConverter);
	2120	+ LoadObjFile(filename); // New 3ds loader
1984	2121	continue;
1985	2122	}
1986	2123	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2706,6 +2843,7 @@
2706	2843	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2707	2844	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2708	2845	}
	2846	+
2709	2847	//cJME.count++;
2710	2848	//cJME.count %= 12;
2711	2849	if (gc)
..	..	@@ -2889,6 +3027,7 @@
2889	3027	}
2890	3028	}
2891	3029	}
	3030	+
2892	3031	cFileSystemPane FSPane;
2893	3032
2894	3033	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2898,7 +3037,7 @@
2898	3037
2899	3038	freezematerial = true;
2900	3039	colorField.setFloat(mat.color);
2901		- modulationField.setFloat(mat.modulation);
	3040	+ saturationField.setFloat(mat.modulation);
2902	3041	metalnessField.setFloat(mat.metalness);
2903	3042	diffuseField.setFloat(mat.diffuse);
2904	3043	specularField.setFloat(mat.specular);
..	..	@@ -2942,6 +3081,7 @@
2942	3081	}
2943	3082	}
2944	3083	}
	3084	+
2945	3085	freezematerial = false;
2946	3086	}
2947	3087
..	..	@@ -3201,10 +3341,6 @@
3201	3341	{
3202	3342	ToggleAnimation();
3203	3343	return;
3204		- } else if (event.getSource() == archiveItem)
3205		- {
3206		- cTools.Archive(frame);
3207		- return;
3208	3344	} else if (event.getSource() == flipVCB)
3209	3345	{
3210	3346	copy.flipV ^= true;
..	..	@@ -3212,8 +3348,9 @@
3212	3348	} else if (event.getSource() == liveCB)
3213	3349	{
3214	3350	copy.live ^= true;
	3351	+ objEditor.refreshContents(true); // To show item colors
3215	3352	return;
3216		- } else if (event.getSource() == selectCB)
	3353	+ } else if (event.getSource() == selectableCB)
3217	3354	{
3218	3355	copy.dontselect ^= true;
3219	3356	return;
..	..	@@ -3221,7 +3358,7 @@
3221	3358	{
3222	3359	copy.hide ^= true;
3223	3360	copy.Touch(); // display list issue
3224		- objEditor.refreshContents();
	3361	+ objEditor.refreshContents(true); // To show item colors
3225	3362	return;
3226	3363	} else if (event.getSource() == link2masterCB)
3227	3364	{
..	..	@@ -3425,6 +3562,10 @@
3425	3562	{
3426	3563	generatePOV();
3427	3564	//return true;
	3565	+ } else if (event.getSource() == archiveItem)
	3566	+ {
	3567	+ cTools.Archive(frame);
	3568	+ return;
3428	3569	} else if (source == zBufferItem)
3429	3570	{
3430	3571	try
..	..	@@ -3473,11 +3614,12 @@
3473	3614
3474	3615	static public byte[] Compress(Object3D o)
3475	3616	{
	3617	+ // Slower to actually compress.
3476	3618	try
3477	3619	{
3478	3620	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3479		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3480		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3621	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3622	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3481	3623
3482	3624	Object3D parent = o.parent;
3483	3625	o.parent = null;
..	..	@@ -3488,10 +3630,14 @@
3488	3630
3489	3631	out.flush();
3490	3632
3491		- zstream.close();
	3633	+ baos //zstream
	3634	+ .close();
3492	3635	out.close();
3493	3636
3494		- return baos.toByteArray();
	3637	+ byte[] bytes = baos.toByteArray();
	3638	+
	3639	+ System.out.println("save #bytes = " + bytes.length);
	3640	+ return bytes;
3495	3641	} catch (Exception e)
3496	3642	{
3497	3643	System.err.println(e);
..	..	@@ -3501,13 +3647,16 @@
3501	3647
3502	3648	static public Object Uncompress(byte[] bytes)
3503	3649	{
3504		- System.out.println("#bytes = " + bytes.length);
	3650	+ System.out.println("restore #bytes = " + bytes.length);
3505	3651	try
3506	3652	{
3507	3653	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3508		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3509		- ObjectInputStream in = new ObjectInputStream(istream);
	3654	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3655	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3510	3656	Object obj = in.readObject();
	3657	+
	3658	+ bais //istream
	3659	+ .close();
3511	3660	in.close();
3512	3661
3513	3662	return obj;
..	..	@@ -3562,33 +3711,68 @@
3562	3711	return null;
3563	3712	}
3564	3713
3565		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3566	3714
3567	3715	public void Save()
3568	3716	{
	3717	+ //Save(true);
	3718	+ Replace();
	3719	+ SetUndoStates();
	3720	+ }
	3721	+
	3722	+ private boolean Equal(byte[] compress, byte[] name)
	3723	+ {
	3724	+ if (compress.length != name.length)
	3725	+ {
	3726	+ return false;
	3727	+ }
	3728	+
	3729	+ for (int i=compress.length; --i>=0;)
	3730	+ {
	3731	+ if (compress[i] != name[i])
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ return true;
	3736	+ }
	3737	+
	3738	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3739	+
	3740	+ public boolean Save(boolean user)
	3741	+ {
3569	3742	System.err.println("Save");
	3743	+ Replace();
3570	3744
3571	3745	cRadio tab = GetCurrentTab();
3572	3746
3573		- boolean temp = CameraPane.SWITCH;
3574		- CameraPane.SWITCH = false;
	3747	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
3575	3748
3576		- copy.ExtractBigData(hashtable);
	3749	+ boolean thesame = false;
3577	3750
3578		- byte[] compress = Compress(copy);
	3751	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3752	+// {
	3753	+// thesame = true;
	3754	+// }
3579	3755
3580	3756	//EditorFrame.m_MainFrame.requestFocusInWindow();
3581		- tab.graphs[tab.undoindex++] = compress;
	3757	+ if (!thesame)
	3758	+ {
	3759	+ //tab.user[tab.versionindex] = user;
	3760	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3761	+
	3762	+ copy.versionlist[++copy.versionindex] = compress;
	3763	+
	3764	+ // if (increment)
	3765	+ // tab.versionindex++;
	3766	+ }
3582	3767
3583		- copy.RestoreBigData(hashtable);
	3768	+ //copy.RestoreBigData(versiontable);
3584	3769
3585		- CameraPane.SWITCH = temp;
3586		-
3587	3770	//assert(hashtable.isEmpty());
3588	3771
3589		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3772	+ for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
3590	3773	{
3591		- tab.graphs[i] = null;
	3774	+ //tab.user[i] = false;
	3775	+ copy.versionlist[i] = null;
3592	3776	}
3593	3777
3594	3778	SetUndoStates();
..	..	@@ -3598,7 +3782,7 @@
3598	3782	{
3599	3783	try
3600	3784	{
3601		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3785	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3602	3786	ObjectOutputStream p = new ObjectOutputStream(ostream);
3603	3787
3604	3788	p.writeObject(copy);
..	..	@@ -3611,6 +3795,40 @@
3611	3795	e.printStackTrace();
3612	3796	}
3613	3797	}
	3798	+
	3799	+ return !thesame;
	3800	+ }
	3801	+
	3802	+ boolean flashIt = true;
	3803	+
	3804	+ void RefreshSelection()
	3805	+ {
	3806	+ Object3D selection = new Object3D();
	3807	+
	3808	+ for (int i = 0; i < copy.selection.size(); i++)
	3809	+ {
	3810	+ Object3D elem = copy.selection.elementAt(i);
	3811	+
	3812	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3813	+
	3814	+ if (obj == null)
	3815	+ {
	3816	+ copy.selection.remove(i--);
	3817	+ }
	3818	+ else
	3819	+ {
	3820	+ selection.add(obj);
	3821	+ copy.selection.setElementAt(obj, i);
	3822	+ }
	3823	+ }
	3824	+
	3825	+ flashIt = false;
	3826	+ GetTree().clearSelection();
	3827	+ for (int i = 0; i < selection.size(); i++)
	3828	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3829	+ flashIt = true;
	3830	+
	3831	+ refreshContents(false);
3614	3832	}
3615	3833
3616	3834	void CopyChanged(Object3D obj)
..	..	@@ -3620,19 +3838,23 @@
3620	3838	boolean temp = CameraPane.SWITCH;
3621	3839	CameraPane.SWITCH = false;
3622	3840
3623		- copy.ExtractBigData(hashtable);
	3841	+ copy.ExtractBigData(versiontable);
3624	3842
3625	3843	copy.clear();
3626	3844
	3845	+ copy.skyboxname = obj.skyboxname;
	3846	+ copy.skyboxext = obj.skyboxext;
	3847	+
3627	3848	for (int i=0; i<obj.Size(); i++)
3628	3849	{
3629	3850	copy.add(obj.get(i));
3630	3851	}
3631	3852
3632		- copy.RestoreBigData(hashtable);
	3853	+ copy.RestoreBigData(versiontable);
3633	3854
3634	3855	CameraPane.SWITCH = temp;
3635	3856
	3857	+ RefreshSelection();
3636	3858	//assert(hashtable.isEmpty());
3637	3859
3638	3860	copy.Touch();
..	..	@@ -3657,52 +3879,130 @@
3657	3879	}
3658	3880
3659	3881	cButton undoButton;
	3882	+ cButton restoreButton;
	3883	+ cButton replaceButton;
3660	3884	cButton redoButton;
3661	3885
	3886	+ boolean muteSlider;
	3887	+
	3888	+ int VersionCount()
	3889	+ {
	3890	+ int count = 0;
	3891	+
	3892	+ for (int i = copy.versionlist.length; --i >= 0;)
	3893	+ {
	3894	+ if (copy.versionlist[i] != null)
	3895	+ count++;
	3896	+ }
	3897	+
	3898	+ return count;
	3899	+ }
	3900	+
3662	3901	void SetUndoStates()
3663	3902	{
3664	3903	cRadio tab = GetCurrentTab();
3665	3904
3666		- undoButton.setEnabled(tab.undoindex > 0);
3667		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3905	+ restoreButton.setEnabled(copy.versionindex != -1);
	3906	+ replaceButton.setEnabled(copy.versionindex != -1);
	3907	+
	3908	+ undoButton.setEnabled(copy.versionindex > 0);
	3909	+ redoButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3910	+
	3911	+ muteSlider = true;
	3912	+ versionSlider.setMaximum(VersionCount() - 1);
	3913	+ versionSlider.setInteger(copy.versionindex);
	3914	+ muteSlider = false;
3668	3915	}
3669	3916
3670		- public void Undo()
	3917	+ public boolean Undo()
3671	3918	{
	3919	+ // Option?
	3920	+ Replace();
	3921	+
3672	3922	System.err.println("Undo");
3673	3923
3674	3924	cRadio tab = GetCurrentTab();
3675	3925
3676		- if (tab.undoindex == 0)
	3926	+ if (copy.versionindex == 0)
3677	3927	{
3678	3928	java.awt.Toolkit.getDefaultToolkit().beep();
3679		- return;
	3929	+ return false;
3680	3930	}
3681	3931
3682		- if (tab.graphs[tab.undoindex] == null)
	3932	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3933	+// {
	3934	+// if (Save(false))
	3935	+// tab.versionindex -= 1;
	3936	+// else
	3937	+// {
	3938	+// if (tab.versionindex <= 0)
	3939	+// return false;
	3940	+// else
	3941	+// tab.versionindex -= 1;
	3942	+// }
	3943	+// }
	3944	+
	3945	+ copy.versionindex -= 1;
	3946	+
	3947	+ CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
	3948	+
	3949	+ return true;
	3950	+ }
	3951	+
	3952	+ public boolean Restore()
	3953	+ {
	3954	+ System.err.println("Restore");
	3955	+
	3956	+ cRadio tab = GetCurrentTab();
	3957	+
	3958	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3683	3959	{
3684		- Save();
3685		- tab.undoindex -= 1;
	3960	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3961	+ return false;
3686	3962	}
3687	3963
3688		- tab.undoindex -= 1;
	3964	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3965	+ CopyChanged(copy.versionlist[copy.versionindex]);
	3966	+
	3967	+ return true;
	3968	+ }
3689	3969
3690		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3970	+ public boolean Replace()
	3971	+ {
	3972	+ System.err.println("Replace");
	3973	+
	3974	+ cRadio tab = GetCurrentTab();
	3975	+
	3976	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3977	+ {
	3978	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3979	+ return false;
	3980	+ }
	3981	+
	3982	+ copy.versionlist[copy.versionindex] = CompressCopy();
	3983	+
	3984	+ return true;
3691	3985	}
3692	3986
3693	3987	public void Redo()
3694	3988	{
	3989	+ // Option?
	3990	+ Replace();
	3991	+
3695	3992	cRadio tab = GetCurrentTab();
3696	3993
3697		- if (tab.graphs[tab.undoindex + 1] == null)
	3994	+ if (copy.versionlist[copy.versionindex + 1] == null)
3698	3995	{
3699	3996	java.awt.Toolkit.getDefaultToolkit().beep();
3700	3997	return;
3701	3998	}
3702	3999
3703		- tab.undoindex += 1;
	4000	+ copy.versionindex += 1;
3704	4001
3705		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4002	+ CopyChanged(copy.versionlist[copy.versionindex]);
	4003	+
	4004	+ //if (!tab.user[tab.versionindex])
	4005	+ // tab.graphs[tab.versionindex] = null;
3706	4006	}
3707	4007
3708	4008	void ImportGFD()
..	..	@@ -3913,7 +4213,7 @@
3913	4213	//copy.material = new cMaterial(copy.GetMaterial());
3914	4214
3915	4215	current.color = (float) colorField.getFloat();
3916		- current.modulation = (float) modulationField.getFloat();
	4216	+ current.modulation = (float) saturationField.getFloat();
3917	4217	current.metalness = (float) metalnessField.getFloat();
3918	4218	current.diffuse = (float) diffuseField.getFloat();
3919	4219	current.specular = (float) specularField.getFloat();
..	..	@@ -3946,7 +4246,7 @@
3946	4246	cMaterial mat = copy.material;
3947	4247
3948	4248	colorField.SetToolTipValue((mat.color));
3949		- modulationField.SetToolTipValue((mat.modulation));
	4249	+ saturationField.SetToolTipValue((mat.modulation));
3950	4250	metalnessField.SetToolTipValue((mat.metalness));
3951	4251	diffuseField.SetToolTipValue((mat.diffuse));
3952	4252	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3998,9 +4298,25 @@
3998	4298	//copy.Touch();
3999	4299	}
4000	4300
	4301	+ cNumberSlider versionSlider;
	4302	+
4001	4303	public void stateChanged(ChangeEvent e)
4002	4304	{
4003	4305	// assert(false);
	4306	+ if (e.getSource() == versionSlider)
	4307	+ {
	4308	+ if (muteSlider)
	4309	+ return;
	4310	+
	4311	+ int version = versionSlider.getInteger();
	4312	+
	4313	+ if (copy.versionlist[version] != null)
	4314	+ {
	4315	+ CopyChanged(copy.versionlist[copy.versionindex = version]);
	4316	+ }
	4317	+
	4318	+ return;
	4319	+ }
4004	4320
4005	4321	if (freezematerial)
4006	4322	{
..	..	@@ -4036,6 +4352,12 @@
4036	4352	{
4037	4353	//System.out.println("stateChanged = " + this);
4038	4354	materialtouched = true;
	4355	+
	4356	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4357	+ {
	4358	+ saturationField.setFloat(1);
	4359	+ }
	4360	+
4039	4361	applySelf();
4040	4362	//System.out.println("this = " + this);
4041	4363	//System.out.println("PARENT = " + parent);
..	..	@@ -4335,6 +4657,7 @@
4335	4657	{
4336	4658	if (GetTree() != null)
4337	4659	{
	4660	+ GetTree().revalidate();
4338	4661	GetTree().repaint();
4339	4662	}
4340	4663
..	..	@@ -4349,7 +4672,7 @@
4349	4672
4350	4673	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4351	4674	{
4352		- if (Globals.SAVEONMAKE) // && resetmodel)
	4675	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4353	4676	Save();
4354	4677	//Tween.set(thing, 0).target(1).start(tweenManager);
4355	4678	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4591,7 +4914,9 @@
4591	4914	readobj.ResetDisplayList();
4592	4915	} catch (Exception e)
4593	4916	{
4594		- //e.printStackTrace();
	4917	+ if (!e.toString().contains("GZIP"))
	4918	+ e.printStackTrace();
	4919	+
4595	4920	try
4596	4921	{
4597	4922	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4665,12 +4990,14 @@
4665	4990
4666	4991	if (readobj != null)
4667	4992	{
4668		- if (Globals.SAVEONMAKE)
4669		- Save();
	4993	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4994	+ // Save();
4670	4995	try
4671	4996	{
4672	4997	//readobj.deepCopySelf(copy);
4673	4998	copy.clear(); // june 2014
	4999	+ copy.skyboxname = readobj.skyboxname;
	5000	+ copy.skyboxext = readobj.skyboxext;
4674	5001	for (int i = 0; i < readobj.size(); i++)
4675	5002	{
4676	5003	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4711,6 +5038,7 @@
4711	5038	}
4712	5039	} catch (ClassCastException e)
4713	5040	{
	5041	+ e.printStackTrace();
4714	5042	assert (false);
4715	5043	Composite c = (Composite) copy;
4716	5044	c.children.clear();
..	..	@@ -4721,6 +5049,17 @@
4721	5049	c.addChild(csg);
4722	5050	}
4723	5051
	5052	+ copy.versionlist = readobj.versionlist;
	5053	+ copy.versionindex = readobj.versionindex;
	5054	+
	5055	+ if (copy.versionlist == null)
	5056	+ {
	5057	+ copy.versionlist = new Object3D[100];
	5058	+ copy.versionindex = -1;
	5059	+ }
	5060	+
	5061	+ //? SetUndoStates();
	5062	+
4724	5063	ResetModel();
4725	5064	copy.HardTouch(); // recompile?
4726	5065	refreshContents();
..	..	@@ -4830,6 +5169,7 @@
4830	5169	//ps.print(buffer.toString());
4831	5170	} catch (IOException e)
4832	5171	{
	5172	+ e.printStackTrace();
4833	5173	}
4834	5174	}
4835	5175
..	..	@@ -5035,7 +5375,7 @@
5035	5375	CheckboxMenuItem toggleSwitchItem;
5036	5376	CheckboxMenuItem toggleRootItem;
5037	5377	CheckboxMenuItem animationItem;
5038		- CheckboxMenuItem archiveItem;
	5378	+ MenuItem archiveItem;
5039	5379	CheckboxMenuItem toggleHandleItem;
5040	5380	CheckboxMenuItem togglePaintItem;
5041	5381	JSplitPane mainPanel;
..	..	@@ -5122,7 +5462,7 @@
5122	5462	JLabel colorLabel;
5123	5463	cNumberSlider colorField;
5124	5464	JLabel modulationLabel;
5125		- cNumberSlider modulationField;
	5465	+ cNumberSlider saturationField;
5126	5466	JLabel metalnessLabel;
5127	5467	cNumberSlider metalnessField;
5128	5468	JLabel diffuseLabel;