~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -34,6 +34,7 @@
34	34	iSendInfo
35	35	//KeyListener
36	36	{
	37	+ public cToggleButton pinButton;
37	38	boolean timeline;
38	39	boolean wasFullScreen;
39	40
..	..	@@ -41,64 +42,78 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
44	53
45	54	cButton GetButton(String name, boolean border)
46	55	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
50		- return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
54		- return new cButton(name, border);
55		- }
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
56	64	}
57	65
58	66	cToggleButton GetToggleButton(String name, boolean border)
59	67	{
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		- }
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
69	70	}
70	71
71	72	cCheckBox GetCheckBox(String name, boolean border)
72	73	{
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
73	80	try
74	81	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
77	98	}
78	99	catch (Exception e)
79	100	{
80		- return new cCheckBox(name, border);
	101	+ return null;
81	102	}
82	103	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	104	+
	105	+ BufferedImage GetImage(String name)
85	106	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	107	+ try
89	108	{
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;
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
98	112	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
102	117	}
103	118
104	119	// SCRIPT
..	..	@@ -282,6 +297,12 @@
282	297	client = inClient;
283	298	copy = client;
284	299
	300	+ if (copy.versionlist == null)
	301	+ {
	302	+ copy.versionlist = new Object3D[100];
	303	+ copy.versionindex = -1;
	304	+ }
	305	+
285	306	// "this" is not called: SetupUI2(objEditor);
286	307	}
287	308
..	..	@@ -295,6 +316,12 @@
295	316	client = inClient;
296	317	copy = client;
297	318
	319	+ if (copy.versionlist == null)
	320	+ {
	321	+ copy.versionlist = new Object3D[100];
	322	+ copy.versionindex = -1;
	323	+ }
	324	+
298	325	SetupUI2(callee.GetEditor());
299	326	}
300	327
..	..	@@ -327,6 +354,12 @@
327	354	copy = localCopy;
328	355	copy.editWindow = this;
329	356
	357	+ if (copy.versionlist == null)
	358	+ {
	359	+// copy.versions = new byte[100][];
	360	+// copy.versionindex = -1;
	361	+ }
	362	+
330	363	SetupMenu();
331	364
332	365	//SetupName(objEditor); // new
..	..	@@ -350,7 +383,7 @@
350	383	frame.setMenuBar(menuBar = new MenuBar());
351	384	menuBar.add(fileMenu = new Menu("File"));
352	385	fileMenu.add(newItem = new MenuItem("New"));
353		- fileMenu.add(loadItem = new MenuItem("Open..."));
	386	+ fileMenu.add(openItem = new MenuItem("Open..."));
354	387
355	388	//oe.menuBar.add(menu = new Menu("Include"));
356	389	Menu menu = new Menu("Import");
..	..	@@ -382,7 +415,7 @@
382	415	}
383	416
384	417	newItem.addActionListener(this);
385		- loadItem.addActionListener(this);
	418	+ openItem.addActionListener(this);
386	419	saveItem.addActionListener(this);
387	420	saveAsItem.addActionListener(this);
388	421	exportAsItem.addActionListener(this);
..	..	@@ -419,11 +452,12 @@
419	452
420	453	toolbarPanel = new JPanel();
421	454	toolbarPanel.setName("Toolbar");
	455	+
422	456	treePanel = new cGridBag();
423	457	treePanel.setName("Tree");
424	458
425	459	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	460	+ //editPanel.setName("Edit");
427	461
428	462	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	463
..	..	@@ -431,11 +465,13 @@
431	465	editPanel.add(editCommandsPanel);
432	466	editPanel.add(ctrlPanel);
433	467
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	468	+ toolboxPanel = new cGridBag().setVertical(true);
	469	+ //toolboxPanel.setName("Toolbox");
436	470
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	471	+ skyboxPanel = new cGridBag().setVertical(true);
	472	+
	473	+ materialPanel = new cGridBag().setVertical(false);
	474	+ //materialPanel.setName("Material");
439	475
440	476	/JTextPane/
441	477	infoarea = createTextPane();
..	..	@@ -443,14 +479,15 @@
443	479
444	480	infoarea.setEditable(true);
445	481	SetText();
	482	+
446	483	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	484	// infoarea.setOpaque(false);
448	485	// //infoarea.setForeground(textcolor);
449	486	// TEXTAREA infoarea.setLineWrap(true);
450	487	// TEXTAREA infoarea.setWrapStyleWord(true);
451	488	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");
	489	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	490	+ //infoPanel.setName("Info");
454	491	//infoPanel.setLayout(new BorderLayout());
455	492	//infoPanel.add(createTextPane());
456	493
..	..	@@ -717,6 +754,7 @@
717	754	boolean maximized;
718	755
719	756	cButton fullscreenLayout;
	757	+ cButton expandedLayout;
720	758
721	759	void Minimize()
722	760	{
..	..	@@ -756,10 +794,12 @@
756	794	cButton minButton;
757	795	cButton maxButton;
758	796	cButton fullButton;
	797	+ cButton collapseButton;
	798	+ cButton maximize3DButton;
759	799
760	800	void ToggleFullScreen()
761	801	{
762		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	802	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763	803
764	804	cameraView.ToggleFullScreen();
765	805
..	..	@@ -780,13 +820,13 @@
780	820	// X frame.getContentPane().remove(/"Center",/bigThree);
781	821	// X framePanel.add(bigThree);
782	822	// X frame.getContentPane().add(/"Center",/framePanel);
783		- framePanel.setDividerLocation(1);
	823	+// framePanel.setDividerLocation(46); // icons are 24x24
784	824
785	825	//frame.setVisible(true);
786		- radio.layout = keepButton;
	826	+// radio.layout = keepButton;
787	827	//theFrame = null;
788	828	keepButton = null;
789		- radio.layout.doClick();
	829	+// radio.layout.doClick();
790	830
791	831	} else
792	832	{
..	..	@@ -807,14 +847,47 @@
807	847	// X frame.getContentPane().remove(/"Center",/framePanel);
808	848	// X framePanel.remove(bigThree);
809	849	// X frame.getContentPane().add(/"Center",/bigThree);
810		- framePanel.setDividerLocation(0);
	850	+// framePanel.setDividerLocation(0);
811	851
812		- radio.layout = fullscreenLayout;
813		- radio.layout.doClick();
	852	+// radio.layout = fullscreenLayout;
	853	+// radio.layout.doClick();
814	854	//frame.setVisible(true);
815	855	}
816	856	frame.validate();
	857	+
	858	+ cameraView.requestFocusInWindow();
817	859	}
	860	+
	861	+ void CollapseToolbar()
	862	+ {
	863	+ framePanel.setDividerLocation(0);
	864	+ //frame.validate();
	865	+
	866	+ cameraView.requestFocusInWindow();
	867	+ }
	868	+
	869	+ private Object3D Duplicate(Object3D object)
	870	+ {
	871	+ boolean temp = CameraPane.SWITCH;
	872	+ CameraPane.SWITCH = false;
	873	+
	874	+ object.ExtractBigData(versiontable);
	875	+ // if (copy == client)
	876	+
	877	+ Object3D versions[] = object.versionlist;
	878	+ object.versionlist = null;
	879	+
	880	+ //byte[] compress = Compress(copy);
	881	+ Object3D compress = (Object3D)Grafreed.clone(object);
	882	+
	883	+ object.versionlist = versions;
	884	+
	885	+ object.RestoreBigData(versiontable);
	886	+
	887	+ CameraPane.SWITCH = temp;
	888	+
	889	+ return compress;
	890	+ }
818	891
819	892	private JTextPane createTextPane()
820	893	{
..	..	@@ -937,6 +1010,7 @@
937	1010	{
938	1011	SetupMaterial(materialPanel);
939	1012	}
	1013	+
940	1014	//SetupName();
941	1015	//SetupViews();
942	1016	}
..	..	@@ -946,7 +1020,7 @@
946	1020	// NumberSlider vDivsField;
947	1021	// JCheckBox endcaps;
948	1022	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1023	+ JCheckBox selectableCB;
950	1024	JCheckBox hideCB;
951	1025	JCheckBox link2masterCB;
952	1026	JCheckBox markCB;
..	..	@@ -1145,6 +1219,18 @@
1145	1219
1146	1220	namePanel = new cGridBag();
1147	1221
	1222	+ //if (copy.pinned)
	1223	+ {
	1224	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1225	+ pinButton.setSelected(copy.pinned);
	1226	+ cGridBag t = new cGridBag();
	1227	+ t.preferredWidth = 2;
	1228	+ t.add(pinButton);
	1229	+ namePanel.add(t);
	1230	+
	1231	+ pinButton.addItemListener(this);
	1232	+ }
	1233	+
1148	1234	nameField = AddText(namePanel, copy.GetName());
1149	1235	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1150	1236	oe.ctrlPanel.add(namePanel);
..	..	@@ -1158,13 +1244,16 @@
1158	1244
1159	1245	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1246	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1247	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1248	+ selectableCB.setToolTipText("Make object selectable");
1163	1249	// Return();
	1250	+
1164	1251	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1252	hideCB.setToolTipText("Hide object");
1166	1253	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167	1254	markCB.setToolTipText("As animation target transform");
	1255	+
	1256	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1257
1169	1258	setupPanel2 = new cGridBag().setVertical(false);
1170	1259
..	..	@@ -1174,10 +1263,11 @@
1174	1263	randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1175	1264	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1176	1265
	1266	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1267	+ link2masterCB.setToolTipText("Attach to support");
	1268	+
1177	1269	if (Globals.ADVANCED)
1178	1270	{
1179		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180		- link2masterCB.setToolTipText("Attach to support");
1181	1271	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1182	1272	speedupCB.setToolTipText("Option motion capture");
1183	1273	}
..	..	@@ -1451,6 +1541,7 @@
1451	1541	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1452	1542	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1453	1543	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1544	+ //XYZPanel.setName("XYZ");
1454	1545
1455	1546	/*
1456	1547	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1488,14 +1579,29 @@
1488	1579	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1489	1580	//tmp.setName("Edit");
1490	1581	objectPanel.add(materialPanel);
	1582	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1583	+ objectPanel.setToolTipTextAt(0, "Material");
	1584	+
	1585	+ objectPanel.add(toolboxPanel);
	1586	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1587	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1588	+
	1589	+ objectPanel.add(skyboxPanel);
	1590	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1591	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1592	+
1491	1593	// JPanel north = new JPanel(new BorderLayout());
1492	1594	// north.setName("Edit");
1493	1595	// north.add(ctrlPanel, BorderLayout.NORTH);
1494	1596	// objectPanel.add(north);
1495	1597	objectPanel.add(editPanel);
1496		- objectPanel.add(infoPanel);
1497		- objectPanel.add(toolboxPanel);
1498		-
	1598	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1599	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1600	+
	1601	+ objectPanel.add(XYZPanel);
	1602	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1603	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1604	+
1499	1605	/*
1500	1606	aConstraints.gridx = 0;
1501	1607	aConstraints.gridwidth = 1;
..	..	@@ -1515,7 +1621,7 @@
1515	1621	scrollpane.addMouseWheelListener(this); // Default not fast enough
1516	1622
1517	1623	/JTabbedPane/ scenePanel = new cGridBag();
1518		- scenePanel.preferredWidth = 6;
	1624	+ scenePanel.preferredWidth = 5;
1519	1625
1520	1626	JTabbedPane tabbedPane = new JTabbedPane();
1521	1627	tabbedPane.add(scrollpane);
..	..	@@ -1532,6 +1638,11 @@
1532	1638
1533	1639	scenePanel.add(tabbedPane);
1534	1640
	1641	+ //if (Globals.ADVANCED)
	1642	+ tabbedPane.add(infoPanel);
	1643	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1644	+ tabbedPane.setToolTipTextAt(3, "Information");
	1645	+
1535	1646	/*
1536	1647	cTree jTree = new cTree(null);
1537	1648	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1593,7 +1704,7 @@
1593	1704	bigThree = new cGridBag();
1594	1705	bigThree.addComponent(scenePanel);
1595	1706	bigThree.addComponent(centralPanel);
1596		- bigThree.addComponent(XYZPanel);
	1707	+ //bigThree.addComponent(XYZPanel);
1597	1708
1598	1709	// // SIDE EFFECT!!!
1599	1710	// aConstraints.gridx = 0;
..	..	@@ -1602,9 +1713,26 @@
1602	1713	// aConstraints.gridheight = 1;
1603	1714
1604	1715	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1605		- framePanel.setContinuousLayout(true);
1606		- framePanel.setOneTouchExpandable(true);
1607		- framePanel.setDividerLocation(0.8);
	1716	+
	1717	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1718	+ new java.beans.PropertyChangeListener()
	1719	+ {
	1720	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1721	+ {
	1722	+ if ((Integer)pce.getOldValue() == 1)
	1723	+ {
	1724	+ if (radio.layout != expandedLayout)
	1725	+ {
	1726	+ radio.layout = expandedLayout;
	1727	+ radio.layout.doClick();
	1728	+ }
	1729	+ }
	1730	+ }
	1731	+ });
	1732	+
	1733	+ framePanel.setContinuousLayout(false);
	1734	+ framePanel.setOneTouchExpandable(false);
	1735	+ //.setDividerLocation(0.8);
1608	1736	//framePanel.setDividerSize(15);
1609	1737	//framePanel.setResizeWeight(0.15);
1610	1738	framePanel.setName("Frame");
..	..	@@ -1634,7 +1762,6 @@
1634	1762	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1635	1763	frame.addWindowListener(new WindowAdapter()
1636	1764	{
1637		-
1638	1765	public void windowClosing(WindowEvent e)
1639	1766	{
1640	1767	Close();
..	..	@@ -1657,12 +1784,403 @@
1657	1784	ctrlPanel.removeAll();
1658	1785	}
1659	1786
1660		- void SetupMaterial(cGridBag panel)
	1787	+ void SetupMaterial(cGridBag materialpanel)
1661	1788	{
1662		- /*
	1789	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1790	+
	1791	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1792	+ skin.setToolTipText("Skin");
	1793	+ skin.addMouseListener(new MouseAdapter()
	1794	+ {
	1795	+ public void mouseClicked(MouseEvent e)
	1796	+ {
	1797	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1798	+ cMaterial material = object.material;
	1799	+
	1800	+ // Skin
	1801	+ colorField.setFloat(material.color);
	1802	+ saturationField.setFloat(material.modulation);
	1803	+ subsurfaceField.setFloat(material.subsurface);
	1804	+ selfshadowField.setFloat(material.diffuseness);
	1805	+ diffusenessField.setFloat(material.factor);
	1806	+ shininessField.setFloat(material.shininess);
	1807	+ shadowbiasField.setFloat(material.shadowbias);
	1808	+ diffuseField.setFloat(material.diffuse);
	1809	+ specularField.setFloat(material.specular);
	1810	+
	1811	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1812	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1813	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1814	+
	1815	+ materialtouched = true;
	1816	+ applySelf();
	1817	+ }
	1818	+ });
	1819	+ presetpanel.add(skin);
	1820	+
	1821	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1822	+ lambert.setToolTipText("Diffuse");
	1823	+ lambert.addMouseListener(new MouseAdapter()
	1824	+ {
	1825	+ public void mouseClicked(MouseEvent e)
	1826	+ {
	1827	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1828	+ cMaterial material = object.material;
	1829	+
	1830	+ diffusenessField.setFloat(material.factor);
	1831	+ selfshadowField.setFloat(material.diffuseness);
	1832	+
	1833	+ materialtouched = true;
	1834	+ applySelf();
	1835	+ }
	1836	+ });
	1837	+ presetpanel.add(lambert);
	1838	+
	1839	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1840	+ diffuse2.setToolTipText("Diffuse2");
	1841	+ diffuse2.addMouseListener(new MouseAdapter()
	1842	+ {
	1843	+ public void mouseClicked(MouseEvent e)
	1844	+ {
	1845	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1846	+ cMaterial material = object.material;
	1847	+
	1848	+ diffusenessField.setFloat(material.factor);
	1849	+ selfshadowField.setFloat(material.diffuseness);
	1850	+
	1851	+ materialtouched = true;
	1852	+ applySelf();
	1853	+ }
	1854	+ });
	1855	+ presetpanel.add(diffuse2);
	1856	+
	1857	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1858	+ diffusemoon.setToolTipText("Moon");
	1859	+ diffusemoon.addMouseListener(new MouseAdapter()
	1860	+ {
	1861	+ public void mouseClicked(MouseEvent e)
	1862	+ {
	1863	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1864	+ cMaterial material = object.material;
	1865	+
	1866	+ diffusenessField.setFloat(material.factor);
	1867	+ selfshadowField.setFloat(material.diffuseness);
	1868	+
	1869	+ materialtouched = true;
	1870	+ applySelf();
	1871	+ }
	1872	+ });
	1873	+ presetpanel.add(diffusemoon);
	1874	+
	1875	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1876	+ diffusemoon2.setToolTipText("Moon2");
	1877	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1878	+ {
	1879	+ public void mouseClicked(MouseEvent e)
	1880	+ {
	1881	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1882	+ cMaterial material = object.material;
	1883	+
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+
	1887	+ materialtouched = true;
	1888	+ applySelf();
	1889	+ }
	1890	+ });
	1891	+ presetpanel.add(diffusemoon2);
	1892	+
	1893	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1894	+ diffusemoon3.setToolTipText("Moon3");
	1895	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1896	+ {
	1897	+ public void mouseClicked(MouseEvent e)
	1898	+ {
	1899	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1900	+ cMaterial material = object.material;
	1901	+
	1902	+ diffusenessField.setFloat(material.factor);
	1903	+ selfshadowField.setFloat(material.diffuseness);
	1904	+
	1905	+ materialtouched = true;
	1906	+ applySelf();
	1907	+ }
	1908	+ });
	1909	+ presetpanel.add(diffusemoon3);
	1910	+
	1911	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1912	+ diffusesheen.setToolTipText("Sheen");
	1913	+ diffusesheen.addMouseListener(new MouseAdapter()
	1914	+ {
	1915	+ public void mouseClicked(MouseEvent e)
	1916	+ {
	1917	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1918	+ cMaterial material = object.material;
	1919	+
	1920	+ sheenField.setFloat(material.sheen);
	1921	+
	1922	+ materialtouched = true;
	1923	+ applySelf();
	1924	+ }
	1925	+ });
	1926	+ presetpanel.add(diffusesheen);
	1927	+
	1928	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1929	+ rough.setToolTipText("Rough metal");
	1930	+ rough.addMouseListener(new MouseAdapter()
	1931	+ {
	1932	+ public void mouseClicked(MouseEvent e)
	1933	+ {
	1934	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1935	+ cMaterial material = object.material;
	1936	+
	1937	+ shininessField.setFloat(material.shininess);
	1938	+ velvetField.setFloat(material.velvet);
	1939	+
	1940	+ materialtouched = true;
	1941	+ applySelf();
	1942	+ }
	1943	+ });
	1944	+ presetpanel.add(rough);
	1945	+
	1946	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1947	+ rough2.setToolTipText("Medium metal");
	1948	+ rough2.addMouseListener(new MouseAdapter()
	1949	+ {
	1950	+ public void mouseClicked(MouseEvent e)
	1951	+ {
	1952	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1953	+ cMaterial material = object.material;
	1954	+
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ lightareaField.setFloat(material.lightarea);
	1957	+
	1958	+ materialtouched = true;
	1959	+ applySelf();
	1960	+ }
	1961	+ });
	1962	+ presetpanel.add(rough2);
	1963	+
	1964	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1965	+ shini0.setToolTipText("Shiny");
	1966	+ shini0.addMouseListener(new MouseAdapter()
	1967	+ {
	1968	+ public void mouseClicked(MouseEvent e)
	1969	+ {
	1970	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1971	+ cMaterial material = object.material;
	1972	+
	1973	+ shininessField.setFloat(material.shininess);
	1974	+ lightareaField.setFloat(material.lightarea);
	1975	+
	1976	+ materialtouched = true;
	1977	+ applySelf();
	1978	+ }
	1979	+ });
	1980	+ presetpanel.add(shini0);
	1981	+
	1982	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1983	+ shini1.setToolTipText("Shiny2");
	1984	+ shini1.addMouseListener(new MouseAdapter()
	1985	+ {
	1986	+ public void mouseClicked(MouseEvent e)
	1987	+ {
	1988	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1989	+ cMaterial material = object.material;
	1990	+
	1991	+ shininessField.setFloat(material.shininess);
	1992	+ lightareaField.setFloat(material.lightarea);
	1993	+
	1994	+ materialtouched = true;
	1995	+ applySelf();
	1996	+ }
	1997	+ });
	1998	+ presetpanel.add(shini1);
	1999	+
	2000	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2001	+ shini2.setToolTipText("Shiny3");
	2002	+ shini2.addMouseListener(new MouseAdapter()
	2003	+ {
	2004	+ public void mouseClicked(MouseEvent e)
	2005	+ {
	2006	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2007	+ cMaterial material = object.material;
	2008	+
	2009	+ shininessField.setFloat(material.shininess);
	2010	+ lightareaField.setFloat(material.lightarea);
	2011	+
	2012	+ materialtouched = true;
	2013	+ applySelf();
	2014	+ }
	2015	+ });
	2016	+ presetpanel.add(shini2);
	2017	+
	2018	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2019	+ aniso.setToolTipText("AnisoU");
	2020	+ aniso.addMouseListener(new MouseAdapter()
	2021	+ {
	2022	+ public void mouseClicked(MouseEvent e)
	2023	+ {
	2024	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2025	+ cMaterial material = object.material;
	2026	+
	2027	+ anisoField.setFloat(material.aniso);
	2028	+ anisoVField.setFloat(material.anisoV);
	2029	+
	2030	+ materialtouched = true;
	2031	+ applySelf();
	2032	+ }
	2033	+ });
	2034	+ presetpanel.add(aniso);
	2035	+
	2036	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2037	+ aniso2.setToolTipText("AnisoV");
	2038	+ aniso2.addMouseListener(new MouseAdapter()
	2039	+ {
	2040	+ public void mouseClicked(MouseEvent e)
	2041	+ {
	2042	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2043	+ cMaterial material = object.material;
	2044	+
	2045	+ anisoField.setFloat(material.aniso);
	2046	+ anisoVField.setFloat(material.anisoV);
	2047	+
	2048	+ materialtouched = true;
	2049	+ applySelf();
	2050	+ }
	2051	+ });
	2052	+ presetpanel.add(aniso2);
	2053	+
	2054	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2055	+ aniso3.setToolTipText("AnisoUV");
	2056	+ aniso3.addMouseListener(new MouseAdapter()
	2057	+ {
	2058	+ public void mouseClicked(MouseEvent e)
	2059	+ {
	2060	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2061	+ cMaterial material = object.material;
	2062	+
	2063	+ anisoField.setFloat(material.aniso);
	2064	+ anisoVField.setFloat(material.anisoV);
	2065	+
	2066	+ materialtouched = true;
	2067	+ applySelf();
	2068	+ }
	2069	+ });
	2070	+ presetpanel.add(aniso3);
	2071	+
	2072	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2073	+ velvet0.setToolTipText("Velvet");
	2074	+ velvet0.addMouseListener(new MouseAdapter()
	2075	+ {
	2076	+ public void mouseClicked(MouseEvent e)
	2077	+ {
	2078	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2079	+ cMaterial material = object.material;
	2080	+
	2081	+ diffusenessField.setFloat(material.factor);
	2082	+ selfshadowField.setFloat(material.diffuseness);
	2083	+ sheenField.setFloat(material.sheen);
	2084	+ shininessField.setFloat(material.shininess);
	2085	+ velvetField.setFloat(material.velvet);
	2086	+ shiftField.setFloat(material.shift);
	2087	+
	2088	+ materialtouched = true;
	2089	+ applySelf();
	2090	+ }
	2091	+ });
	2092	+ presetpanel.add(velvet0);
	2093	+
	2094	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2095	+ bump0.setToolTipText("Bump texture");
	2096	+ bump0.addMouseListener(new MouseAdapter()
	2097	+ {
	2098	+ public void mouseClicked(MouseEvent e)
	2099	+ {
	2100	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2101	+ cMaterial material = object.material;
	2102	+
	2103	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2104	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2105	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(bump0);
	2112	+
	2113	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2114	+ halo.setToolTipText("Halo");
	2115	+ halo.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2123	+
	2124	+ materialtouched = true;
	2125	+ applySelf();
	2126	+ }
	2127	+ });
	2128	+ presetpanel.add(halo);
	2129	+
	2130	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2131	+ candle.setToolTipText("Candle");
	2132	+ candle.addMouseListener(new MouseAdapter()
	2133	+ {
	2134	+ public void mouseClicked(MouseEvent e)
	2135	+ {
	2136	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2137	+ cMaterial material = object.material;
	2138	+
	2139	+ subsurfaceField.setFloat(material.subsurface);
	2140	+ shadowbiasField.setFloat(material.shadowbias);
	2141	+ ambientField.setFloat(material.ambient);
	2142	+ specularField.setFloat(material.specular);
	2143	+ lightareaField.setFloat(material.lightarea);
	2144	+ shininessField.setFloat(material.shininess);
	2145	+
	2146	+ materialtouched = true;
	2147	+ applySelf();
	2148	+ }
	2149	+ });
	2150	+ presetpanel.add(candle);
	2151	+
	2152	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2153	+ shadowShader.setToolTipText("Shadow");
	2154	+ shadowShader.addMouseListener(new MouseAdapter()
	2155	+ {
	2156	+ public void mouseClicked(MouseEvent e)
	2157	+ {
	2158	+ diffuseField.setFloat(0.001);
	2159	+ ambientField.setFloat(0.001);
	2160	+ cameraField.setFloat(0.001);
	2161	+ specularField.setFloat(0.001);
	2162	+ fakedepthField.setFloat(0.001);
	2163	+ opacityField.setFloat(0.6);
	2164	+
	2165	+ materialtouched = true;
	2166	+ applySelf();
	2167	+ }
	2168	+ });
	2169	+ presetpanel.add(shadowShader);
	2170	+
	2171	+ cGridBag panel = new cGridBag().setVertical(true);
	2172	+
	2173	+ presetpanel.preferredWidth = 1;
	2174	+
	2175	+ materialpanel.add(presetpanel);
	2176	+ materialpanel.add(panel);
	2177	+
	2178	+ panel.preferredWidth = 8;
	2179	+
	2180	+ /*
1663	2181	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1664	2182	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- */
	2183	+ */
1666	2184
1667	2185	cGridBag editBar = new cGridBag().setVertical(false);
1668	2186
..	..	@@ -1696,27 +2214,50 @@
1696	2214	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1697	2215
1698	2216	cGridBag colorSection = new cGridBag().setVertical(true);
	2217	+
	2218	+ cGridBag huepanel = new cGridBag();
	2219	+ cGridBag huelabel = new cGridBag();
	2220	+ skin = GetLabel("icons/hue.png", false);
	2221	+ skin.fit = true;
	2222	+ huelabel.add(skin);
	2223	+ huelabel.preferredWidth = 20;
	2224	+ huepanel.add(new cGridBag()); // Label
	2225	+ huepanel.add(huelabel); // Field/slider
	2226	+
	2227	+ huepanel.preferredHeight = 7;
	2228	+
	2229	+ colorSection.add(huepanel);
1699	2230
1700	2231	cGridBag color = new cGridBag();
1701		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1702		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2232	+
	2233	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2234	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2235	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2236	+
1704	2237	//colorField.preferredWidth = 200;
1705	2238	colorSection.add(color);
1706	2239
1707	2240	cGridBag modulation = new cGridBag();
1708	2241	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1709	2242	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1710		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2243	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1711	2244	colorSection.add(modulation);
1712	2245
	2246	+ cGridBag opacity = new cGridBag();
	2247	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2248	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2249	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2250	+ colorSection.add(opacity);
	2251	+
	2252	+ colorSection.add(GetSeparator());
	2253	+
1713	2254	cGridBag texture = new cGridBag();
1714	2255	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1715	2256	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716	2257	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1717	2258	colorSection.add(texture);
1718	2259
1719		- panel.add(new JSeparator());
	2260	+ panel.add(GetSeparator());
1720	2261
1721	2262	panel.add(colorSection);
1722	2263
..	..	@@ -1772,7 +2313,7 @@
1772	2313	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1773	2314	diffuseSection.add(shadowbias);
1774	2315
1775		- panel.add(new JSeparator());
	2316	+ panel.add(GetSeparator());
1776	2317
1777	2318	panel.add(diffuseSection);
1778	2319
..	..	@@ -1835,7 +2376,7 @@
1835	2376	specularSection.add(anisoV);
1836	2377
1837	2378
1838		- panel.add(new JSeparator());
	2379	+ panel.add(GetSeparator());
1839	2380
1840	2381	panel.add(specularSection);
1841	2382
..	..	@@ -1860,12 +2401,6 @@
1860	2401	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1861	2402	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1862	2403	colorSection.add(backlit);
1863		-
1864		- cGridBag opacity = new cGridBag();
1865		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1866		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1867		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1868		- colorSection.add(opacity);
1869	2404
1870	2405	//panel.add(new JSeparator());
1871	2406
..	..	@@ -1911,7 +2446,7 @@
1911	2446	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1912	2447	textureSection.add(opacityPower);
1913	2448
1914		- panel.add(new JSeparator());
	2449	+ panel.add(GetSeparator());
1915	2450
1916	2451	panel.add(textureSection);
1917	2452
..	..	@@ -1976,8 +2511,9 @@
1976	2511	// 3D models
1977	2512	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1978	2513	{
1979		- lastConverter = new com.jmex.model.converters.MaxToJme();
1980		- LoadFile(filename, lastConverter);
	2514	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2515	+ //LoadFile(filename, lastConverter);
	2516	+ LoadObjFile(filename); // New 3ds loader
1981	2517	continue;
1982	2518	}
1983	2519	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2703,6 +3239,7 @@
2703	3239	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2704	3240	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2705	3241	}
	3242	+
2706	3243	//cJME.count++;
2707	3244	//cJME.count %= 12;
2708	3245	if (gc)
..	..	@@ -2886,6 +3423,7 @@
2886	3423	}
2887	3424	}
2888	3425	}
	3426	+
2889	3427	cFileSystemPane FSPane;
2890	3428
2891	3429	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2895,7 +3433,7 @@
2895	3433
2896	3434	freezematerial = true;
2897	3435	colorField.setFloat(mat.color);
2898		- modulationField.setFloat(mat.modulation);
	3436	+ saturationField.setFloat(mat.modulation);
2899	3437	metalnessField.setFloat(mat.metalness);
2900	3438	diffuseField.setFloat(mat.diffuse);
2901	3439	specularField.setFloat(mat.specular);
..	..	@@ -2939,6 +3477,7 @@
2939	3477	}
2940	3478	}
2941	3479	}
	3480	+
2942	3481	freezematerial = false;
2943	3482	}
2944	3483
..	..	@@ -3101,6 +3640,17 @@
3101	3640	public void itemStateChanged(ItemEvent event)
3102	3641	{
3103	3642	// System.out.println("Propagate = " + propagate);
	3643	+ if (event.getSource() == pinButton)
	3644	+ {
	3645	+ copy.pinned ^= true;
	3646	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3647	+ {
	3648	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3649	+ copy.CloseUI();
	3650	+ //copy.editWindow.refreshContents();
	3651	+ }
	3652	+ }
	3653	+ else
3104	3654	if (event.getSource() == propagateToggle)
3105	3655	{
3106	3656	propagate ^= true;
..	..	@@ -3205,8 +3755,9 @@
3205	3755	} else if (event.getSource() == liveCB)
3206	3756	{
3207	3757	copy.live ^= true;
	3758	+ objEditor.refreshContents(true); // To show item colors
3208	3759	return;
3209		- } else if (event.getSource() == selectCB)
	3760	+ } else if (event.getSource() == selectableCB)
3210	3761	{
3211	3762	copy.dontselect ^= true;
3212	3763	return;
..	..	@@ -3214,7 +3765,7 @@
3214	3765	{
3215	3766	copy.hide ^= true;
3216	3767	copy.Touch(); // display list issue
3217		- objEditor.refreshContents();
	3768	+ objEditor.refreshContents(true); // To show item colors
3218	3769	return;
3219	3770	} else if (event.getSource() == link2masterCB)
3220	3771	{
..	..	@@ -3391,9 +3942,9 @@
3391	3942	{
3392	3943	Close();
3393	3944	//return true;
3394		- } else if (source == loadItem)
	3945	+ } else if (source == openItem)
3395	3946	{
3396		- load();
	3947	+ Open();
3397	3948	//return true;
3398	3949	} else if (source == newItem)
3399	3950	{
..	..	@@ -3418,6 +3969,10 @@
3418	3969	{
3419	3970	generatePOV();
3420	3971	//return true;
	3972	+ } else if (event.getSource() == archiveItem)
	3973	+ {
	3974	+ cTools.Archive(frame);
	3975	+ return;
3421	3976	} else if (source == zBufferItem)
3422	3977	{
3423	3978	try
..	..	@@ -3466,11 +4021,12 @@
3466	4021
3467	4022	static public byte[] Compress(Object3D o)
3468	4023	{
	4024	+ // Slower to actually compress.
3469	4025	try
3470	4026	{
3471	4027	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3472		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3473		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4028	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4029	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3474	4030
3475	4031	Object3D parent = o.parent;
3476	4032	o.parent = null;
..	..	@@ -3481,10 +4037,14 @@
3481	4037
3482	4038	out.flush();
3483	4039
3484		- zstream.close();
	4040	+ baos //zstream
	4041	+ .close();
3485	4042	out.close();
3486	4043
3487		- return baos.toByteArray();
	4044	+ byte[] bytes = baos.toByteArray();
	4045	+
	4046	+ System.out.println("save #bytes = " + bytes.length);
	4047	+ return bytes;
3488	4048	} catch (Exception e)
3489	4049	{
3490	4050	System.err.println(e);
..	..	@@ -3494,13 +4054,16 @@
3494	4054
3495	4055	static public Object Uncompress(byte[] bytes)
3496	4056	{
3497		- System.out.println("#bytes = " + bytes.length);
	4057	+ System.out.println("restore #bytes = " + bytes.length);
3498	4058	try
3499	4059	{
3500	4060	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3501		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3502		- ObjectInputStream in = new ObjectInputStream(istream);
	4061	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4062	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3503	4063	Object obj = in.readObject();
	4064	+
	4065	+ bais //istream
	4066	+ .close();
3504	4067	in.close();
3505	4068
3506	4069	return obj;
..	..	@@ -3555,34 +4118,86 @@
3555	4118	return null;
3556	4119	}
3557	4120
3558		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3559	4121
3560	4122	public void Save()
3561	4123	{
	4124	+ //Save(true);
	4125	+ Replace();
	4126	+ SetUndoStates();
	4127	+ }
	4128	+
	4129	+ private boolean Equal(byte[] compress, byte[] name)
	4130	+ {
	4131	+ if (compress.length != name.length)
	4132	+ {
	4133	+ return false;
	4134	+ }
	4135	+
	4136	+ for (int i=compress.length; --i>=0;)
	4137	+ {
	4138	+ if (compress[i] != name[i])
	4139	+ return false;
	4140	+ }
	4141	+
	4142	+ return true;
	4143	+ }
	4144	+
	4145	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4146	+
	4147	+ void DeleteVersion()
	4148	+ {
	4149	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4150	+ {
	4151	+ copy.versionlist[i] = copy.versionlist[i+1];
	4152	+ }
	4153	+
	4154	+ CopyChanged();
	4155	+
	4156	+ SetUndoStates();
	4157	+ }
	4158	+
	4159	+ public boolean Save(boolean user)
	4160	+ {
3562	4161	System.err.println("Save");
	4162	+ Replace();
3563	4163
3564	4164	cRadio tab = GetCurrentTab();
3565	4165
3566		- boolean temp = CameraPane.SWITCH;
3567		- CameraPane.SWITCH = false;
	4166	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3568	4167
3569		- copy.ExtractBigData(hashtable);
	4168	+ boolean thesame = false;
3570	4169
3571		- byte[] compress = Compress(copy);
	4170	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4171	+// {
	4172	+// thesame = true;
	4173	+// }
3572	4174
3573	4175	//EditorFrame.m_MainFrame.requestFocusInWindow();
3574		- tab.graphs[tab.undoindex++] = compress;
	4176	+ if (!thesame)
	4177	+ {
	4178	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4179	+ {
	4180	+ copy.versionlist[i] = copy.versionlist[i-1];
	4181	+ }
	4182	+
	4183	+ //tab.user[tab.versionindex] = user;
	4184	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4185	+
	4186	+ copy.versionlist[++copy.versionindex] = compress;
	4187	+
	4188	+ // if (increment)
	4189	+ // tab.versionindex++;
	4190	+ }
3575	4191
3576		- copy.RestoreBigData(hashtable);
	4192	+ //copy.RestoreBigData(versiontable);
3577	4193
3578		- CameraPane.SWITCH = temp;
3579		-
3580	4194	//assert(hashtable.isEmpty());
3581	4195
3582		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3583		- {
3584		- tab.graphs[i] = null;
3585		- }
	4196	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4197	+// {
	4198	+// //tab.user[i] = false;
	4199	+// copy.versionlist[i] = null;
	4200	+// }
3586	4201
3587	4202	SetUndoStates();
3588	4203
..	..	@@ -3591,7 +4206,7 @@
3591	4206	{
3592	4207	try
3593	4208	{
3594		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4209	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3595	4210	ObjectOutputStream p = new ObjectOutputStream(ostream);
3596	4211
3597	4212	p.writeObject(copy);
..	..	@@ -3604,28 +4219,68 @@
3604	4219	e.printStackTrace();
3605	4220	}
3606	4221	}
	4222	+
	4223	+ return !thesame;
	4224	+ }
	4225	+
	4226	+ boolean flashIt = true;
	4227	+
	4228	+ void RefreshSelection()
	4229	+ {
	4230	+ Object3D selection = new Object3D();
	4231	+
	4232	+ for (int i = 0; i < copy.selection.size(); i++)
	4233	+ {
	4234	+ Object3D elem = copy.selection.elementAt(i);
	4235	+
	4236	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4237	+
	4238	+ if (obj == null)
	4239	+ {
	4240	+ copy.selection.remove(i--);
	4241	+ }
	4242	+ else
	4243	+ {
	4244	+ selection.add(obj);
	4245	+ copy.selection.setElementAt(obj, i);
	4246	+ }
	4247	+ }
	4248	+
	4249	+ flashIt = false;
	4250	+ GetTree().clearSelection();
	4251	+ for (int i = 0; i < selection.size(); i++)
	4252	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4253	+ flashIt = true;
	4254	+
	4255	+ //refreshContents(false);
3607	4256	}
3608	4257
3609		- void CopyChanged(Object3D obj)
	4258	+ void CopyChanged()
3610	4259	{
	4260	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4261	+
3611	4262	SetUndoStates();
3612	4263
3613	4264	boolean temp = CameraPane.SWITCH;
3614	4265	CameraPane.SWITCH = false;
3615	4266
3616		- copy.ExtractBigData(hashtable);
	4267	+ copy.ExtractBigData(versiontable);
3617	4268
3618	4269	copy.clear();
3619	4270
	4271	+ copy.skyboxname = obj.skyboxname;
	4272	+ copy.skyboxext = obj.skyboxext;
	4273	+
3620	4274	for (int i=0; i<obj.Size(); i++)
3621	4275	{
3622	4276	copy.add(obj.get(i));
3623	4277	}
3624	4278
3625		- copy.RestoreBigData(hashtable);
	4279	+ copy.RestoreBigData(versiontable);
3626	4280
3627	4281	CameraPane.SWITCH = temp;
3628	4282
	4283	+ RefreshSelection();
3629	4284	//assert(hashtable.isEmpty());
3630	4285
3631	4286	copy.Touch();
..	..	@@ -3646,56 +4301,139 @@
3646	4301	}
3647	4302	}
3648	4303
3649		- refreshContents();
	4304	+ refreshContents(true);
3650	4305	}
3651	4306
3652		- cButton undoButton;
3653		- cButton redoButton;
	4307	+ cButton previousVersionButton;
	4308	+ cButton restoreButton;
	4309	+ cButton replaceButton;
	4310	+ cButton nextVersionButton;
	4311	+ cButton saveVersionButton;
	4312	+ cButton deleteVersionButton;
3654	4313
	4314	+ boolean muteSlider;
	4315	+
	4316	+ int VersionCount()
	4317	+ {
	4318	+ int count = 0;
	4319	+
	4320	+ for (int i = copy.versionlist.length; --i >= 0;)
	4321	+ {
	4322	+ if (copy.versionlist[i] != null)
	4323	+ count++;
	4324	+ }
	4325	+
	4326	+ return count;
	4327	+ }
	4328	+
3655	4329	void SetUndoStates()
3656	4330	{
3657	4331	cRadio tab = GetCurrentTab();
3658	4332
3659		- undoButton.setEnabled(tab.undoindex > 0);
3660		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4333	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4334	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4335	+
	4336	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4337	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4338	+
	4339	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4340	+ copy.versionlist[copy.versionindex + 1] != null);
	4341	+
	4342	+ muteSlider = true;
	4343	+ versionSlider.setMaximum(VersionCount() - 1);
	4344	+ versionSlider.setInteger(copy.versionindex);
	4345	+ muteSlider = false;
3661	4346	}
3662	4347
3663		- public void Undo()
	4348	+ public boolean PreviousVersion()
3664	4349	{
	4350	+ // Option?
	4351	+ Replace();
	4352	+
3665	4353	System.err.println("Undo");
3666	4354
3667	4355	cRadio tab = GetCurrentTab();
3668	4356
3669		- if (tab.undoindex == 0)
	4357	+ if (copy.versionindex == 0)
3670	4358	{
3671	4359	java.awt.Toolkit.getDefaultToolkit().beep();
3672		- return;
	4360	+ return false;
3673	4361	}
3674	4362
3675		- if (tab.graphs[tab.undoindex] == null)
3676		- {
3677		- Save();
3678		- tab.undoindex -= 1;
3679		- }
	4363	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4364	+// {
	4365	+// if (Save(false))
	4366	+// tab.versionindex -= 1;
	4367	+// else
	4368	+// {
	4369	+// if (tab.versionindex <= 0)
	4370	+// return false;
	4371	+// else
	4372	+// tab.versionindex -= 1;
	4373	+// }
	4374	+// }
3680	4375
3681		- tab.undoindex -= 1;
	4376	+ copy.versionindex -= 1;
3682	4377
3683		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4378	+ CopyChanged();
	4379	+
	4380	+ return true;
3684	4381	}
3685	4382
3686		- public void Redo()
	4383	+ public boolean Restore()
3687	4384	{
	4385	+ System.err.println("Restore");
	4386	+
3688	4387	cRadio tab = GetCurrentTab();
3689	4388
3690		- if (tab.graphs[tab.undoindex + 1] == null)
	4389	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4390	+ {
	4391	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4392	+ return false;
	4393	+ }
	4394	+
	4395	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4396	+ CopyChanged();
	4397	+
	4398	+ return true;
	4399	+ }
	4400	+
	4401	+ public boolean Replace()
	4402	+ {
	4403	+ System.err.println("Replace");
	4404	+
	4405	+ cRadio tab = GetCurrentTab();
	4406	+
	4407	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4408	+ {
	4409	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4410	+ return false;
	4411	+ }
	4412	+
	4413	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4414	+
	4415	+ return true;
	4416	+ }
	4417	+
	4418	+ public void NextVersion()
	4419	+ {
	4420	+ // Option?
	4421	+ Replace();
	4422	+
	4423	+ cRadio tab = GetCurrentTab();
	4424	+
	4425	+ if (copy.versionlist[copy.versionindex + 1] == null)
3691	4426	{
3692	4427	java.awt.Toolkit.getDefaultToolkit().beep();
3693	4428	return;
3694	4429	}
3695	4430
3696		- tab.undoindex += 1;
	4431	+ copy.versionindex += 1;
3697	4432
3698		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4433	+ CopyChanged();
	4434	+
	4435	+ //if (!tab.user[tab.versionindex])
	4436	+ // tab.graphs[tab.versionindex] = null;
3699	4437	}
3700	4438
3701	4439	void ImportGFD()
..	..	@@ -3906,7 +4644,7 @@
3906	4644	//copy.material = new cMaterial(copy.GetMaterial());
3907	4645
3908	4646	current.color = (float) colorField.getFloat();
3909		- current.modulation = (float) modulationField.getFloat();
	4647	+ current.modulation = (float) saturationField.getFloat();
3910	4648	current.metalness = (float) metalnessField.getFloat();
3911	4649	current.diffuse = (float) diffuseField.getFloat();
3912	4650	current.specular = (float) specularField.getFloat();
..	..	@@ -3939,7 +4677,7 @@
3939	4677	cMaterial mat = copy.material;
3940	4678
3941	4679	colorField.SetToolTipValue((mat.color));
3942		- modulationField.SetToolTipValue((mat.modulation));
	4680	+ saturationField.SetToolTipValue((mat.modulation));
3943	4681	metalnessField.SetToolTipValue((mat.metalness));
3944	4682	diffuseField.SetToolTipValue((mat.diffuse));
3945	4683	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3991,9 +4729,26 @@
3991	4729	//copy.Touch();
3992	4730	}
3993	4731
	4732	+ cNumberSlider versionSlider;
	4733	+
3994	4734	public void stateChanged(ChangeEvent e)
3995	4735	{
3996	4736	// assert(false);
	4737	+ if (e.getSource() == versionSlider)
	4738	+ {
	4739	+ if (muteSlider)
	4740	+ return;
	4741	+
	4742	+ int version = versionSlider.getInteger();
	4743	+
	4744	+ if (copy.versionlist[version] != null)
	4745	+ {
	4746	+ copy.versionindex = version;
	4747	+ CopyChanged();
	4748	+ }
	4749	+
	4750	+ return;
	4751	+ }
3997	4752
3998	4753	if (freezematerial)
3999	4754	{
..	..	@@ -4029,6 +4784,12 @@
4029	4784	{
4030	4785	//System.out.println("stateChanged = " + this);
4031	4786	materialtouched = true;
	4787	+
	4788	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4789	+ {
	4790	+ saturationField.setFloat(1);
	4791	+ }
	4792	+
4032	4793	applySelf();
4033	4794	//System.out.println("this = " + this);
4034	4795	//System.out.println("PARENT = " + parent);
..	..	@@ -4328,6 +5089,7 @@
4328	5089	{
4329	5090	if (GetTree() != null)
4330	5091	{
	5092	+ GetTree().revalidate();
4331	5093	GetTree().repaint();
4332	5094	}
4333	5095
..	..	@@ -4336,13 +5098,16 @@
4336	5098	ctrlPanel.validate(); // ? new
4337	5099	ctrlPanel.repaint();
4338	5100	}
	5101	+
	5102	+ if (previousVersionButton != null && copy.versionlist != null)
	5103	+ SetUndoStates();
4339	5104	}
4340	5105
4341	5106	static TweenManager tweenManager = new TweenManager();
4342	5107
4343	5108	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4344	5109	{
4345		- if (Globals.SAVEONMAKE) // && resetmodel)
	5110	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4346	5111	Save();
4347	5112	//Tween.set(thing, 0).target(1).start(tweenManager);
4348	5113	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4584,7 +5349,9 @@
4584	5349	readobj.ResetDisplayList();
4585	5350	} catch (Exception e)
4586	5351	{
4587		- //e.printStackTrace();
	5352	+ if (!e.toString().contains("GZIP"))
	5353	+ e.printStackTrace();
	5354	+
4588	5355	try
4589	5356	{
4590	5357	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4658,12 +5425,14 @@
4658	5425
4659	5426	if (readobj != null)
4660	5427	{
4661		- if (Globals.SAVEONMAKE)
4662		- Save();
	5428	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5429	+ // Save();
4663	5430	try
4664	5431	{
4665	5432	//readobj.deepCopySelf(copy);
4666	5433	copy.clear(); // june 2014
	5434	+ copy.skyboxname = readobj.skyboxname;
	5435	+ copy.skyboxext = readobj.skyboxext;
4667	5436	for (int i = 0; i < readobj.size(); i++)
4668	5437	{
4669	5438	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4704,6 +5473,7 @@
4704	5473	}
4705	5474	} catch (ClassCastException e)
4706	5475	{
	5476	+ e.printStackTrace();
4707	5477	assert (false);
4708	5478	Composite c = (Composite) copy;
4709	5479	c.children.clear();
..	..	@@ -4714,17 +5484,28 @@
4714	5484	c.addChild(csg);
4715	5485	}
4716	5486
	5487	+ copy.versionlist = readobj.versionlist;
	5488	+ copy.versionindex = readobj.versionindex;
	5489	+
	5490	+ if (copy.versionlist == null)
	5491	+ {
	5492	+ copy.versionlist = new Object3D[100];
	5493	+ copy.versionindex = -1;
	5494	+ }
	5495	+
	5496	+ //? SetUndoStates();
	5497	+
4717	5498	ResetModel();
4718	5499	copy.HardTouch(); // recompile?
4719	5500	refreshContents();
4720	5501	}
4721	5502	}
4722	5503
4723		- void load() // throws ClassNotFoundException
	5504	+ void Open() // throws ClassNotFoundException
4724	5505	{
4725	5506	if (Grafreed.standAlone)
4726	5507	{
4727		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5508	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4728	5509	browser.show();
4729	5510	String filename = browser.getFile();
4730	5511	if (filename != null && filename.length() > 0)
..	..	@@ -4823,6 +5604,7 @@
4823	5604	//ps.print(buffer.toString());
4824	5605	} catch (IOException e)
4825	5606	{
	5607	+ e.printStackTrace();
4826	5608	}
4827	5609	}
4828	5610
..	..	@@ -5005,7 +5787,7 @@
5005	5787	MenuBar menuBar;
5006	5788	Menu fileMenu;
5007	5789	MenuItem newItem;
5008		- MenuItem loadItem;
	5790	+ MenuItem openItem;
5009	5791	MenuItem saveItem;
5010	5792	MenuItem saveAsItem;
5011	5793	MenuItem exportAsItem;
..	..	@@ -5028,6 +5810,7 @@
5028	5810	CheckboxMenuItem toggleSwitchItem;
5029	5811	CheckboxMenuItem toggleRootItem;
5030	5812	CheckboxMenuItem animationItem;
	5813	+ MenuItem archiveItem;
5031	5814	CheckboxMenuItem toggleHandleItem;
5032	5815	CheckboxMenuItem togglePaintItem;
5033	5816	JSplitPane mainPanel;
..	..	@@ -5041,6 +5824,7 @@
5041	5824	ButtonGroup buttonGroup;
5042	5825
5043	5826	cGridBag toolboxPanel;
	5827	+ cGridBag skyboxPanel;
5044	5828	cGridBag materialPanel;
5045	5829	cGridBag ctrlPanel;
5046	5830
..	..	@@ -5114,7 +5898,7 @@
5114	5898	JLabel colorLabel;
5115	5899	cNumberSlider colorField;
5116	5900	JLabel modulationLabel;
5117		- cNumberSlider modulationField;
	5901	+ cNumberSlider saturationField;
5118	5902	JLabel metalnessLabel;
5119	5903	cNumberSlider metalnessField;
5120	5904	JLabel diffuseLabel;
..	..	@@ -5145,6 +5929,7 @@
5145	5929	cNumberSlider anisoField;
5146	5930	JLabel anisoVLabel;
5147	5931	cNumberSlider anisoVField;
	5932	+
5148	5933	JLabel cameraLabel;
5149	5934	cNumberSlider cameraField;
5150	5935	JLabel selfshadowLabel;
..	..	@@ -5159,6 +5944,7 @@
5159	5944	cNumberSlider fakedepthField;
5160	5945	JLabel shadowbiasLabel;
5161	5946	cNumberSlider shadowbiasField;
	5947	+
5162	5948	JLabel bumpLabel;
5163	5949	cNumberSlider bumpField;
5164	5950	JLabel noiseLabel;