~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
..	..	@@ -309,7 +335,7 @@
309	335	//localCopy.parent = null;
310	336
311	337	frame = new JFrame();
312		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
313	339	objEditor = this;
314	340	this.callee = callee;
315	341
..	..	@@ -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
..	..	@@ -350,7 +382,7 @@
350	382	frame.setMenuBar(menuBar = new MenuBar());
351	383	menuBar.add(fileMenu = new Menu("File"));
352	384	fileMenu.add(newItem = new MenuItem("New"));
353		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
354	386
355	387	//oe.menuBar.add(menu = new Menu("Include"));
356	388	Menu menu = new Menu("Import");
..	..	@@ -382,7 +414,7 @@
382	414	}
383	415
384	416	newItem.addActionListener(this);
385		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
386	418	saveItem.addActionListener(this);
387	419	saveAsItem.addActionListener(this);
388	420	exportAsItem.addActionListener(this);
..	..	@@ -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
..	..	@@ -699,8 +733,8 @@
699	733	}
700	734	}
701	735
702		-static GraphicsDevice device = GraphicsEnvironment
703		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
704	738
705	739	Rectangle keeprect;
706	740	cRadio radio;
..	..	@@ -721,10 +755,19 @@
721	755	void Minimize()
722	756	{
723	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
724	759	}
725	760
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
726	764	void Maximize()
727	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
728	771	if (maximized)
729	772	{
730	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -732,22 +775,36 @@
732	775	else
733	776	{
734	777	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);
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
738	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
739	783	}
740	784
741	785	maximized ^= true;
	786	+
	787	+ frame.validate();
742	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
743	793
744	794	void ToggleFullScreen()
745	795	{
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
746	798	cameraView.ToggleFullScreen();
747	799
748	800	if (!CameraPane.FULLSCREEN)
749	801	{
750	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
751	808	//frame.setVisible(false);
752	809	// frame.removeNotify();
753	810	// frame.setUndecorated(false);
..	..	@@ -757,7 +814,7 @@
757	814	// X frame.getContentPane().remove(/"Center",/bigThree);
758	815	// X framePanel.add(bigThree);
759	816	// X frame.getContentPane().add(/"Center",/framePanel);
760		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
761	818
762	819	//frame.setVisible(true);
763	820	radio.layout = keepButton;
..	..	@@ -772,7 +829,12 @@
772	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
773	830	// frame.getToolkit().getScreenSize().height);
774	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
775	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
776	838	// frame.removeNotify();
777	839	// frame.setUndecorated(true);
778	840	// frame.addNotify();
..	..	@@ -785,7 +847,31 @@
785	847	radio.layout.doClick();
786	848	//frame.setVisible(true);
787	849	}
	850	+ frame.validate();
788	851	}
	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	+ }
789	875
790	876	private JTextPane createTextPane()
791	877	{
..	..	@@ -908,6 +994,7 @@
908	994	{
909	995	SetupMaterial(materialPanel);
910	996	}
	997	+
911	998	//SetupName();
912	999	//SetupViews();
913	1000	}
..	..	@@ -917,7 +1004,7 @@
917	1004	// NumberSlider vDivsField;
918	1005	// JCheckBox endcaps;
919	1006	JCheckBox liveCB;
920		- JCheckBox selectCB;
	1007	+ JCheckBox selectableCB;
921	1008	JCheckBox hideCB;
922	1009	JCheckBox link2masterCB;
923	1010	JCheckBox markCB;
..	..	@@ -1117,7 +1204,7 @@
1117	1204	namePanel = new cGridBag();
1118	1205
1119	1206	nameField = AddText(namePanel, copy.GetName());
1120		- namePanel.add(nameField);
	1207	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1121	1208	oe.ctrlPanel.add(namePanel);
1122	1209
1123	1210	oe.ctrlPanel.Return();
..	..	@@ -1129,26 +1216,30 @@
1129	1216
1130	1217	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1131	1218	liveCB.setToolTipText("Animate object");
1132		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1133		- selectCB.setToolTipText("Make object selectable");
	1219	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1220	+ selectableCB.setToolTipText("Make object selectable");
1134	1221	// Return();
	1222	+
1135	1223	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1136	1224	hideCB.setToolTipText("Hide object");
1137	1225	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1138	1226	markCB.setToolTipText("As animation target transform");
	1227	+
	1228	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1139	1229
1140	1230	setupPanel2 = new cGridBag().setVertical(false);
1141	1231
1142	1232	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1143	1233	rewindCB.setToolTipText("Rewind animation");
1144	1234
1145		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1235	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1146	1236	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1147	1237
	1238	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1239	+ link2masterCB.setToolTipText("Attach to support");
	1240	+
1148	1241	if (Globals.ADVANCED)
1149	1242	{
1150		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1151		- link2masterCB.setToolTipText("Attach to support");
1152	1243	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1153	1244	speedupCB.setToolTipText("Option motion capture");
1154	1245	}
..	..	@@ -1422,6 +1513,7 @@
1422	1513	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1423	1514	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1424	1515	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1516	+ //XYZPanel.setName("XYZ");
1425	1517
1426	1518	/*
1427	1519	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1459,13 +1551,29 @@
1459	1551	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1460	1552	//tmp.setName("Edit");
1461	1553	objectPanel.add(materialPanel);
	1554	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1555	+ objectPanel.setToolTipTextAt(0, "Material");
	1556	+
1462	1557	// JPanel north = new JPanel(new BorderLayout());
1463	1558	// north.setName("Edit");
1464	1559	// north.add(ctrlPanel, BorderLayout.NORTH);
1465	1560	// objectPanel.add(north);
1466	1561	objectPanel.add(editPanel);
1467		- objectPanel.add(infoPanel);
	1562	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1563	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1564	+
	1565	+ //if (Globals.ADVANCED)
	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");
	1573	+
1468	1574	objectPanel.add(toolboxPanel);
	1575	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1576	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1469	1577
1470	1578	/*
1471	1579	aConstraints.gridx = 0;
..	..	@@ -1486,7 +1594,7 @@
1486	1594	scrollpane.addMouseWheelListener(this); // Default not fast enough
1487	1595
1488	1596	/JTabbedPane/ scenePanel = new cGridBag();
1489		- scenePanel.preferredWidth = 6;
	1597	+ scenePanel.preferredWidth = 5;
1490	1598
1491	1599	JTabbedPane tabbedPane = new JTabbedPane();
1492	1600	tabbedPane.add(scrollpane);
..	..	@@ -1564,7 +1672,7 @@
1564	1672	bigThree = new cGridBag();
1565	1673	bigThree.addComponent(scenePanel);
1566	1674	bigThree.addComponent(centralPanel);
1567		- bigThree.addComponent(XYZPanel);
	1675	+ //bigThree.addComponent(XYZPanel);
1568	1676
1569	1677	// // SIDE EFFECT!!!
1570	1678	// aConstraints.gridx = 0;
..	..	@@ -1573,9 +1681,9 @@
1573	1681	// aConstraints.gridheight = 1;
1574	1682
1575	1683	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1576		- framePanel.setContinuousLayout(true);
1577		- framePanel.setOneTouchExpandable(true);
1578		- framePanel.setDividerLocation(0.8);
	1684	+ framePanel.setContinuousLayout(false);
	1685	+ framePanel.setOneTouchExpandable(false);
	1686	+ //.setDividerLocation(0.8);
1579	1687	//framePanel.setDividerSize(15);
1580	1688	//framePanel.setResizeWeight(0.15);
1581	1689	framePanel.setName("Frame");
..	..	@@ -1594,17 +1702,17 @@
1594	1702
1595	1703	frame.setSize(1280, 860);
1596	1704
1597		- frame.validate();
1598		- frame.setVisible(true);
1599		-
1600	1705	cameraView.requestFocusInWindow();
1601	1706
1602	1707	gridPanel.setDividerLocation(1.0);
	1708	+
	1709	+ frame.validate();
	1710	+
	1711	+ frame.setVisible(true);
1603	1712
1604	1713	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1605	1714	frame.addWindowListener(new WindowAdapter()
1606	1715	{
1607		-
1608	1716	public void windowClosing(WindowEvent e)
1609	1717	{
1610	1718	Close();
..	..	@@ -1627,12 +1735,56 @@
1627	1735	ctrlPanel.removeAll();
1628	1736	}
1629	1737
1630		- void SetupMaterial(cGridBag panel)
	1738	+ void SetupMaterial(cGridBag materialpanel)
1631	1739	{
1632		- /*
	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	+ /*
1633	1785	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1634	1786	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1635		- */
	1787	+ */
1636	1788
1637	1789	cGridBag editBar = new cGridBag().setVertical(false);
1638	1790
..	..	@@ -1666,45 +1818,50 @@
1666	1818	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1667	1819
1668	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);
1669	1834
1670	1835	cGridBag color = new cGridBag();
1671		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1672		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1673		- 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	+
1674	1841	//colorField.preferredWidth = 200;
1675	1842	colorSection.add(color);
1676	1843
1677	1844	cGridBag modulation = new cGridBag();
1678	1845	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1679	1846	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1847	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1681	1848	colorSection.add(modulation);
1682	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	+
1683	1858	cGridBag texture = new cGridBag();
1684	1859	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1685	1860	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1686	1861	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1687	1862	colorSection.add(texture);
1688	1863
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		- panel.add(new JSeparator());
	1864	+ panel.add(GetSeparator());
1708	1865
1709	1866	panel.add(colorSection);
1710	1867
..	..	@@ -1754,7 +1911,13 @@
1754	1911	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1755	1912	diffuseSection.add(fakedepth);
1756	1913
1757		- panel.add(new JSeparator());
	1914	+ cGridBag shadowbias = new cGridBag();
	1915	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1916	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1917	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1918	+ diffuseSection.add(shadowbias);
	1919	+
	1920	+ panel.add(GetSeparator());
1758	1921
1759	1922	panel.add(diffuseSection);
1760	1923
..	..	@@ -1804,42 +1967,48 @@
1804	1967	// aConstraints.gridy += 1;
1805	1968	// aConstraints.gridwidth = 1;
1806	1969
	1970	+ cGridBag anisoU = new cGridBag();
	1971	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1972	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1973	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1974	+ specularSection.add(anisoU);
1807	1975
1808		- panel.add(new JSeparator());
	1976	+ cGridBag anisoV = new cGridBag();
	1977	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1978	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1979	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1980	+ specularSection.add(anisoV);
	1981	+
	1982	+
	1983	+ panel.add(GetSeparator());
1809	1984
1810	1985	panel.add(specularSection);
1811	1986
1812	1987	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1813	1988
1814		- cGridBag globalSection = new cGridBag().setVertical(true);
	1989	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1815	1990
1816	1991	cGridBag camera = new cGridBag();
1817	1992	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1818	1993	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1819	1994	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1820		- globalSection.add(camera);
	1995	+ colorSection.add(camera);
1821	1996
1822	1997	cGridBag ambient = new cGridBag();
1823	1998	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1824	1999	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1825	2000	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1826		- globalSection.add(ambient);
	2001	+ colorSection.add(ambient);
1827	2002
1828	2003	cGridBag backlit = new cGridBag();
1829	2004	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1830	2005	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1831	2006	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1832		- globalSection.add(backlit);
	2007	+ colorSection.add(backlit);
1833	2008
1834		- cGridBag opacity = new cGridBag();
1835		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1836		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1837		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1838		- globalSection.add(opacity);
1839		-
1840		- panel.add(new JSeparator());
	2009	+ //panel.add(new JSeparator());
1841	2010
1842		- panel.add(globalSection);
	2011	+ //panel.add(globalSection);
1843	2012
1844	2013	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1845	2014
..	..	@@ -1881,7 +2050,7 @@
1881	2050	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1882	2051	textureSection.add(opacityPower);
1883	2052
1884		- panel.add(new JSeparator());
	2053	+ panel.add(GetSeparator());
1885	2054
1886	2055	panel.add(textureSection);
1887	2056
..	..	@@ -1946,8 +2115,9 @@
1946	2115	// 3D models
1947	2116	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1948	2117	{
1949		- lastConverter = new com.jmex.model.converters.MaxToJme();
1950		- LoadFile(filename, lastConverter);
	2118	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2119	+ //LoadFile(filename, lastConverter);
	2120	+ LoadObjFile(filename); // New 3ds loader
1951	2121	continue;
1952	2122	}
1953	2123	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2673,6 +2843,7 @@
2673	2843	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2674	2844	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2675	2845	}
	2846	+
2676	2847	//cJME.count++;
2677	2848	//cJME.count %= 12;
2678	2849	if (gc)
..	..	@@ -2856,6 +3027,7 @@
2856	3027	}
2857	3028	}
2858	3029	}
	3030	+
2859	3031	cFileSystemPane FSPane;
2860	3032
2861	3033	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2865,7 +3037,7 @@
2865	3037
2866	3038	freezematerial = true;
2867	3039	colorField.setFloat(mat.color);
2868		- modulationField.setFloat(mat.modulation);
	3040	+ saturationField.setFloat(mat.modulation);
2869	3041	metalnessField.setFloat(mat.metalness);
2870	3042	diffuseField.setFloat(mat.diffuse);
2871	3043	specularField.setFloat(mat.specular);
..	..	@@ -2909,6 +3081,7 @@
2909	3081	}
2910	3082	}
2911	3083	}
	3084	+
2912	3085	freezematerial = false;
2913	3086	}
2914	3087
..	..	@@ -3175,8 +3348,9 @@
3175	3348	} else if (event.getSource() == liveCB)
3176	3349	{
3177	3350	copy.live ^= true;
	3351	+ objEditor.refreshContents(true); // To show item colors
3178	3352	return;
3179		- } else if (event.getSource() == selectCB)
	3353	+ } else if (event.getSource() == selectableCB)
3180	3354	{
3181	3355	copy.dontselect ^= true;
3182	3356	return;
..	..	@@ -3184,7 +3358,7 @@
3184	3358	{
3185	3359	copy.hide ^= true;
3186	3360	copy.Touch(); // display list issue
3187		- objEditor.refreshContents();
	3361	+ objEditor.refreshContents(true); // To show item colors
3188	3362	return;
3189	3363	} else if (event.getSource() == link2masterCB)
3190	3364	{
..	..	@@ -3361,9 +3535,9 @@
3361	3535	{
3362	3536	Close();
3363	3537	//return true;
3364		- } else if (source == loadItem)
	3538	+ } else if (source == openItem)
3365	3539	{
3366		- load();
	3540	+ Open();
3367	3541	//return true;
3368	3542	} else if (source == newItem)
3369	3543	{
..	..	@@ -3388,6 +3562,10 @@
3388	3562	{
3389	3563	generatePOV();
3390	3564	//return true;
	3565	+ } else if (event.getSource() == archiveItem)
	3566	+ {
	3567	+ cTools.Archive(frame);
	3568	+ return;
3391	3569	} else if (source == zBufferItem)
3392	3570	{
3393	3571	try
..	..	@@ -3436,11 +3614,12 @@
3436	3614
3437	3615	static public byte[] Compress(Object3D o)
3438	3616	{
	3617	+ // Slower to actually compress.
3439	3618	try
3440	3619	{
3441	3620	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3442		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3443		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3621	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3622	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3444	3623
3445	3624	Object3D parent = o.parent;
3446	3625	o.parent = null;
..	..	@@ -3451,10 +3630,14 @@
3451	3630
3452	3631	out.flush();
3453	3632
3454		- zstream.close();
	3633	+ baos //zstream
	3634	+ .close();
3455	3635	out.close();
3456	3636
3457		- return baos.toByteArray();
	3637	+ byte[] bytes = baos.toByteArray();
	3638	+
	3639	+ System.out.println("save #bytes = " + bytes.length);
	3640	+ return bytes;
3458	3641	} catch (Exception e)
3459	3642	{
3460	3643	System.err.println(e);
..	..	@@ -3464,13 +3647,16 @@
3464	3647
3465	3648	static public Object Uncompress(byte[] bytes)
3466	3649	{
3467		- System.out.println("#bytes = " + bytes.length);
	3650	+ System.out.println("restore #bytes = " + bytes.length);
3468	3651	try
3469	3652	{
3470	3653	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3471		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3472		- ObjectInputStream in = new ObjectInputStream(istream);
	3654	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3655	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3473	3656	Object obj = in.readObject();
	3657	+
	3658	+ bais //istream
	3659	+ .close();
3474	3660	in.close();
3475	3661
3476	3662	return obj;
..	..	@@ -3525,31 +3711,68 @@
3525	3711	return null;
3526	3712	}
3527	3713
3528		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3529	3714
3530	3715	public void Save()
3531	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	+ {
3532	3742	System.err.println("Save");
	3743	+ Replace();
3533	3744
3534	3745	cRadio tab = GetCurrentTab();
3535	3746
3536		- boolean temp = CameraPane.SWITCH;
3537		- CameraPane.SWITCH = false;
	3747	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
3538	3748
3539		- copy.ExtractBigData(hashtable);
	3749	+ boolean thesame = false;
	3750	+
	3751	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3752	+// {
	3753	+// thesame = true;
	3754	+// }
3540	3755
3541	3756	//EditorFrame.m_MainFrame.requestFocusInWindow();
3542		- tab.graphs[tab.undoindex++] = Compress(copy);
	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	+ }
3543	3767
3544		- copy.RestoreBigData(hashtable);
	3768	+ //copy.RestoreBigData(versiontable);
3545	3769
3546		- CameraPane.SWITCH = temp;
3547		-
3548	3770	//assert(hashtable.isEmpty());
3549	3771
3550		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3772	+ for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
3551	3773	{
3552		- tab.graphs[i] = null;
	3774	+ //tab.user[i] = false;
	3775	+ copy.versionlist[i] = null;
3553	3776	}
3554	3777
3555	3778	SetUndoStates();
..	..	@@ -3559,7 +3782,7 @@
3559	3782	{
3560	3783	try
3561	3784	{
3562		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3785	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3563	3786	ObjectOutputStream p = new ObjectOutputStream(ostream);
3564	3787
3565	3788	p.writeObject(copy);
..	..	@@ -3572,6 +3795,40 @@
3572	3795	e.printStackTrace();
3573	3796	}
3574	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);
3575	3832	}
3576	3833
3577	3834	void CopyChanged(Object3D obj)
..	..	@@ -3581,19 +3838,23 @@
3581	3838	boolean temp = CameraPane.SWITCH;
3582	3839	CameraPane.SWITCH = false;
3583	3840
3584		- copy.ExtractBigData(hashtable);
	3841	+ copy.ExtractBigData(versiontable);
3585	3842
3586	3843	copy.clear();
3587	3844
	3845	+ copy.skyboxname = obj.skyboxname;
	3846	+ copy.skyboxext = obj.skyboxext;
	3847	+
3588	3848	for (int i=0; i<obj.Size(); i++)
3589	3849	{
3590	3850	copy.add(obj.get(i));
3591	3851	}
3592	3852
3593		- copy.RestoreBigData(hashtable);
	3853	+ copy.RestoreBigData(versiontable);
3594	3854
3595	3855	CameraPane.SWITCH = temp;
3596	3856
	3857	+ RefreshSelection();
3597	3858	//assert(hashtable.isEmpty());
3598	3859
3599	3860	copy.Touch();
..	..	@@ -3618,52 +3879,130 @@
3618	3879	}
3619	3880
3620	3881	cButton undoButton;
	3882	+ cButton restoreButton;
	3883	+ cButton replaceButton;
3621	3884	cButton redoButton;
3622	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	+
3623	3901	void SetUndoStates()
3624	3902	{
3625	3903	cRadio tab = GetCurrentTab();
3626	3904
3627		- undoButton.setEnabled(tab.undoindex > 0);
3628		- 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;
3629	3915	}
3630	3916
3631		- public void Undo()
	3917	+ public boolean Undo()
3632	3918	{
	3919	+ // Option?
	3920	+ Replace();
	3921	+
3633	3922	System.err.println("Undo");
3634	3923
3635	3924	cRadio tab = GetCurrentTab();
3636	3925
3637		- if (tab.undoindex == 0)
	3926	+ if (copy.versionindex == 0)
3638	3927	{
3639	3928	java.awt.Toolkit.getDefaultToolkit().beep();
3640		- return;
	3929	+ return false;
3641	3930	}
3642	3931
3643		- 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)
3644	3959	{
3645		- Save();
3646		- tab.undoindex -= 1;
	3960	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3961	+ return false;
3647	3962	}
3648	3963
3649		- tab.undoindex -= 1;
	3964	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3965	+ CopyChanged(copy.versionlist[copy.versionindex]);
	3966	+
	3967	+ return true;
	3968	+ }
3650	3969
3651		- 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;
3652	3985	}
3653	3986
3654	3987	public void Redo()
3655	3988	{
	3989	+ // Option?
	3990	+ Replace();
	3991	+
3656	3992	cRadio tab = GetCurrentTab();
3657	3993
3658		- if (tab.graphs[tab.undoindex + 1] == null)
	3994	+ if (copy.versionlist[copy.versionindex + 1] == null)
3659	3995	{
3660	3996	java.awt.Toolkit.getDefaultToolkit().beep();
3661	3997	return;
3662	3998	}
3663	3999
3664		- tab.undoindex += 1;
	4000	+ copy.versionindex += 1;
3665	4001
3666		- 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;
3667	4006	}
3668	4007
3669	4008	void ImportGFD()
..	..	@@ -3874,7 +4213,7 @@
3874	4213	//copy.material = new cMaterial(copy.GetMaterial());
3875	4214
3876	4215	current.color = (float) colorField.getFloat();
3877		- current.modulation = (float) modulationField.getFloat();
	4216	+ current.modulation = (float) saturationField.getFloat();
3878	4217	current.metalness = (float) metalnessField.getFloat();
3879	4218	current.diffuse = (float) diffuseField.getFloat();
3880	4219	current.specular = (float) specularField.getFloat();
..	..	@@ -3907,7 +4246,7 @@
3907	4246	cMaterial mat = copy.material;
3908	4247
3909	4248	colorField.SetToolTipValue((mat.color));
3910		- modulationField.SetToolTipValue((mat.modulation));
	4249	+ saturationField.SetToolTipValue((mat.modulation));
3911	4250	metalnessField.SetToolTipValue((mat.metalness));
3912	4251	diffuseField.SetToolTipValue((mat.diffuse));
3913	4252	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3959,9 +4298,25 @@
3959	4298	//copy.Touch();
3960	4299	}
3961	4300
	4301	+ cNumberSlider versionSlider;
	4302	+
3962	4303	public void stateChanged(ChangeEvent e)
3963	4304	{
3964	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	+ }
3965	4320
3966	4321	if (freezematerial)
3967	4322	{
..	..	@@ -3997,6 +4352,12 @@
3997	4352	{
3998	4353	//System.out.println("stateChanged = " + this);
3999	4354	materialtouched = true;
	4355	+
	4356	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4357	+ {
	4358	+ saturationField.setFloat(1);
	4359	+ }
	4360	+
4000	4361	applySelf();
4001	4362	//System.out.println("this = " + this);
4002	4363	//System.out.println("PARENT = " + parent);
..	..	@@ -4296,6 +4657,7 @@
4296	4657	{
4297	4658	if (GetTree() != null)
4298	4659	{
	4660	+ GetTree().revalidate();
4299	4661	GetTree().repaint();
4300	4662	}
4301	4663
..	..	@@ -4310,7 +4672,7 @@
4310	4672
4311	4673	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4312	4674	{
4313		- if (Globals.SAVEONMAKE) // && resetmodel)
	4675	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4314	4676	Save();
4315	4677	//Tween.set(thing, 0).target(1).start(tweenManager);
4316	4678	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4552,7 +4914,9 @@
4552	4914	readobj.ResetDisplayList();
4553	4915	} catch (Exception e)
4554	4916	{
4555		- //e.printStackTrace();
	4917	+ if (!e.toString().contains("GZIP"))
	4918	+ e.printStackTrace();
	4919	+
4556	4920	try
4557	4921	{
4558	4922	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4626,12 +4990,14 @@
4626	4990
4627	4991	if (readobj != null)
4628	4992	{
4629		- if (Globals.SAVEONMAKE)
4630		- Save();
	4993	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4994	+ // Save();
4631	4995	try
4632	4996	{
4633	4997	//readobj.deepCopySelf(copy);
4634	4998	copy.clear(); // june 2014
	4999	+ copy.skyboxname = readobj.skyboxname;
	5000	+ copy.skyboxext = readobj.skyboxext;
4635	5001	for (int i = 0; i < readobj.size(); i++)
4636	5002	{
4637	5003	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4672,6 +5038,7 @@
4672	5038	}
4673	5039	} catch (ClassCastException e)
4674	5040	{
	5041	+ e.printStackTrace();
4675	5042	assert (false);
4676	5043	Composite c = (Composite) copy;
4677	5044	c.children.clear();
..	..	@@ -4682,13 +5049,24 @@
4682	5049	c.addChild(csg);
4683	5050	}
4684	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	+
4685	5063	ResetModel();
4686	5064	copy.HardTouch(); // recompile?
4687	5065	refreshContents();
4688	5066	}
4689	5067	}
4690	5068
4691		- void load() // throws ClassNotFoundException
	5069	+ void Open() // throws ClassNotFoundException
4692	5070	{
4693	5071	if (Grafreed.standAlone)
4694	5072	{
..	..	@@ -4791,6 +5169,7 @@
4791	5169	//ps.print(buffer.toString());
4792	5170	} catch (IOException e)
4793	5171	{
	5172	+ e.printStackTrace();
4794	5173	}
4795	5174	}
4796	5175
..	..	@@ -4973,7 +5352,7 @@
4973	5352	MenuBar menuBar;
4974	5353	Menu fileMenu;
4975	5354	MenuItem newItem;
4976		- MenuItem loadItem;
	5355	+ MenuItem openItem;
4977	5356	MenuItem saveItem;
4978	5357	MenuItem saveAsItem;
4979	5358	MenuItem exportAsItem;
..	..	@@ -4996,6 +5375,7 @@
4996	5375	CheckboxMenuItem toggleSwitchItem;
4997	5376	CheckboxMenuItem toggleRootItem;
4998	5377	CheckboxMenuItem animationItem;
	5378	+ MenuItem archiveItem;
4999	5379	CheckboxMenuItem toggleHandleItem;
5000	5380	CheckboxMenuItem togglePaintItem;
5001	5381	JSplitPane mainPanel;
..	..	@@ -5082,7 +5462,7 @@
5082	5462	JLabel colorLabel;
5083	5463	cNumberSlider colorField;
5084	5464	JLabel modulationLabel;
5085		- cNumberSlider modulationField;
	5465	+ cNumberSlider saturationField;
5086	5466	JLabel metalnessLabel;
5087	5467	cNumberSlider metalnessField;
5088	5468	JLabel diffuseLabel;