~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,33 @@
785	847	radio.layout.doClick();
786	848	//frame.setVisible(true);
787	849	}
	850	+ frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
788	853	}
	854	+
	855	+ private Object3D CompressCopy()
	856	+ {
	857	+ boolean temp = CameraPane.SWITCH;
	858	+ CameraPane.SWITCH = false;
	859	+
	860	+ copy.ExtractBigData(versiontable);
	861	+ // if (copy == client)
	862	+
	863	+ Object3D versions[] = copy.versionlist;
	864	+ copy.versionlist = null;
	865	+
	866	+ //byte[] compress = Compress(copy);
	867	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	868	+
	869	+ copy.versionlist = versions;
	870	+
	871	+ copy.RestoreBigData(versiontable);
	872	+
	873	+ CameraPane.SWITCH = temp;
	874	+
	875	+ return compress;
	876	+ }
789	877
790	878	private JTextPane createTextPane()
791	879	{
..	..	@@ -908,6 +996,7 @@
908	996	{
909	997	SetupMaterial(materialPanel);
910	998	}
	999	+
911	1000	//SetupName();
912	1001	//SetupViews();
913	1002	}
..	..	@@ -917,7 +1006,7 @@
917	1006	// NumberSlider vDivsField;
918	1007	// JCheckBox endcaps;
919	1008	JCheckBox liveCB;
920		- JCheckBox selectCB;
	1009	+ JCheckBox selectableCB;
921	1010	JCheckBox hideCB;
922	1011	JCheckBox link2masterCB;
923	1012	JCheckBox markCB;
..	..	@@ -1117,7 +1206,7 @@
1117	1206	namePanel = new cGridBag();
1118	1207
1119	1208	nameField = AddText(namePanel, copy.GetName());
1120		- namePanel.add(nameField);
	1209	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1121	1210	oe.ctrlPanel.add(namePanel);
1122	1211
1123	1212	oe.ctrlPanel.Return();
..	..	@@ -1129,26 +1218,30 @@
1129	1218
1130	1219	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1131	1220	liveCB.setToolTipText("Animate object");
1132		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1133		- selectCB.setToolTipText("Make object selectable");
	1221	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1222	+ selectableCB.setToolTipText("Make object selectable");
1134	1223	// Return();
	1224	+
1135	1225	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1136	1226	hideCB.setToolTipText("Hide object");
1137	1227	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1138	1228	markCB.setToolTipText("As animation target transform");
	1229	+
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1139	1231
1140	1232	setupPanel2 = new cGridBag().setVertical(false);
1141	1233
1142	1234	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1143	1235	rewindCB.setToolTipText("Rewind animation");
1144	1236
1145		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1237	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1146	1238	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1147	1239
	1240	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1241	+ link2masterCB.setToolTipText("Attach to support");
	1242	+
1148	1243	if (Globals.ADVANCED)
1149	1244	{
1150		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1151		- link2masterCB.setToolTipText("Attach to support");
1152	1245	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1153	1246	speedupCB.setToolTipText("Option motion capture");
1154	1247	}
..	..	@@ -1422,6 +1515,7 @@
1422	1515	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1423	1516	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1424	1517	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1518	+ //XYZPanel.setName("XYZ");
1425	1519
1426	1520	/*
1427	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1459,13 +1553,29 @@
1459	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1460	1554	//tmp.setName("Edit");
1461	1555	objectPanel.add(materialPanel);
	1556	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
	1558	+
1462	1559	// JPanel north = new JPanel(new BorderLayout());
1463	1560	// north.setName("Edit");
1464	1561	// north.add(ctrlPanel, BorderLayout.NORTH);
1465	1562	// objectPanel.add(north);
1466	1563	objectPanel.add(editPanel);
1467		- objectPanel.add(infoPanel);
	1564	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1565	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1566	+
	1567	+ //if (Globals.ADVANCED)
	1568	+ objectPanel.add(infoPanel);
	1569	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1570	+ objectPanel.setToolTipTextAt(2, "Information");
	1571	+
	1572	+ objectPanel.add(XYZPanel);
	1573	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1574	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
	1575	+
1468	1576	objectPanel.add(toolboxPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1469	1579
1470	1580	/*
1471	1581	aConstraints.gridx = 0;
..	..	@@ -1486,7 +1596,7 @@
1486	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1487	1597
1488	1598	/JTabbedPane/ scenePanel = new cGridBag();
1489		- scenePanel.preferredWidth = 6;
	1599	+ scenePanel.preferredWidth = 5;
1490	1600
1491	1601	JTabbedPane tabbedPane = new JTabbedPane();
1492	1602	tabbedPane.add(scrollpane);
..	..	@@ -1564,7 +1674,7 @@
1564	1674	bigThree = new cGridBag();
1565	1675	bigThree.addComponent(scenePanel);
1566	1676	bigThree.addComponent(centralPanel);
1567		- bigThree.addComponent(XYZPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
1568	1678
1569	1679	// // SIDE EFFECT!!!
1570	1680	// aConstraints.gridx = 0;
..	..	@@ -1573,9 +1683,9 @@
1573	1683	// aConstraints.gridheight = 1;
1574	1684
1575	1685	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1576		- framePanel.setContinuousLayout(true);
1577		- framePanel.setOneTouchExpandable(true);
1578		- framePanel.setDividerLocation(0.8);
	1686	+ framePanel.setContinuousLayout(false);
	1687	+ framePanel.setOneTouchExpandable(false);
	1688	+ //.setDividerLocation(0.8);
1579	1689	//framePanel.setDividerSize(15);
1580	1690	//framePanel.setResizeWeight(0.15);
1581	1691	framePanel.setName("Frame");
..	..	@@ -1594,17 +1704,17 @@
1594	1704
1595	1705	frame.setSize(1280, 860);
1596	1706
1597		- frame.validate();
1598		- frame.setVisible(true);
1599		-
1600	1707	cameraView.requestFocusInWindow();
1601	1708
1602	1709	gridPanel.setDividerLocation(1.0);
	1710	+
	1711	+ frame.validate();
	1712	+
	1713	+ frame.setVisible(true);
1603	1714
1604	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1605	1716	frame.addWindowListener(new WindowAdapter()
1606	1717	{
1607		-
1608	1718	public void windowClosing(WindowEvent e)
1609	1719	{
1610	1720	Close();
..	..	@@ -1627,12 +1737,85 @@
1627	1737	ctrlPanel.removeAll();
1628	1738	}
1629	1739
1630		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1631	1741	{
1632		- /*
	1742	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1743	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1744	+ skin.addMouseListener(new MouseAdapter()
	1745	+ {
	1746	+ public void mouseClicked(MouseEvent e)
	1747	+ {
	1748	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1749	+ cMaterial material = object.material;
	1750	+
	1751	+ // Skin
	1752	+ colorField.setFloat(material.color);
	1753	+ saturationField.setFloat(material.modulation);
	1754	+ subsurfaceField.setFloat(material.subsurface);
	1755	+ selfshadowField.setFloat(material.diffuseness);
	1756	+ diffusenessField.setFloat(material.factor);
	1757	+ shininessField.setFloat(material.shininess);
	1758	+ shadowbiasField.setFloat(material.shadowbias);
	1759	+ diffuseField.setFloat(material.diffuse);
	1760	+ specularField.setFloat(material.specular);
	1761	+
	1762	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1763	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1764	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1765	+
	1766	+ materialtouched = true;
	1767	+ applySelf();
	1768	+ }
	1769	+ });
	1770	+ presetpanel.add(skin);
	1771	+
	1772	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1773	+ rough2.addMouseListener(new MouseAdapter()
	1774	+ {
	1775	+ public void mouseClicked(MouseEvent e)
	1776	+ {
	1777	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1778	+ cMaterial material = object.material;
	1779	+
	1780	+ shininessField.setFloat(material.shininess);
	1781	+ velvetField.setFloat(material.velvet);
	1782	+
	1783	+ materialtouched = true;
	1784	+ applySelf();
	1785	+ }
	1786	+ });
	1787	+ presetpanel.add(rough2);
	1788	+
	1789	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1790	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1791	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1792	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1793	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1794	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1795	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1796	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1797	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1798	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1799	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1800	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1801	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1802	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1803	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1804	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1805	+
	1806	+ cGridBag panel = new cGridBag().setVertical(true);
	1807	+
	1808	+ presetpanel.preferredWidth = 1;
	1809	+
	1810	+ materialpanel.add(panel);
	1811	+ materialpanel.add(presetpanel);
	1812	+
	1813	+ panel.preferredWidth = 8;
	1814	+
	1815	+ /*
1633	1816	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1634	1817	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1635		- */
	1818	+ */
1636	1819
1637	1820	cGridBag editBar = new cGridBag().setVertical(false);
1638	1821
..	..	@@ -1666,45 +1849,50 @@
1666	1849	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1667	1850
1668	1851	cGridBag colorSection = new cGridBag().setVertical(true);
	1852	+
	1853	+ cGridBag huepanel = new cGridBag();
	1854	+ cGridBag huelabel = new cGridBag();
	1855	+ skin = GetLabel("icons/hue.png", false);
	1856	+ skin.fit = true;
	1857	+ huelabel.add(skin);
	1858	+ huelabel.preferredWidth = 20;
	1859	+ huepanel.add(new cGridBag()); // Label
	1860	+ huepanel.add(huelabel); // Field/slider
	1861	+
	1862	+ huepanel.preferredHeight = 7;
	1863	+
	1864	+ colorSection.add(huepanel);
1669	1865
1670	1866	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);
	1867	+
	1868	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1869	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1871	+
1674	1872	//colorField.preferredWidth = 200;
1675	1873	colorSection.add(color);
1676	1874
1677	1875	cGridBag modulation = new cGridBag();
1678	1876	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1679	1877	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1878	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1681	1879	colorSection.add(modulation);
1682	1880
	1881	+ cGridBag opacity = new cGridBag();
	1882	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1883	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1884	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1885	+ colorSection.add(opacity);
	1886	+
	1887	+ colorSection.add(GetSeparator());
	1888	+
1683	1889	cGridBag texture = new cGridBag();
1684	1890	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1685	1891	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1686	1892	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1687	1893	colorSection.add(texture);
1688	1894
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());
	1895	+ panel.add(GetSeparator());
1708	1896
1709	1897	panel.add(colorSection);
1710	1898
..	..	@@ -1754,7 +1942,13 @@
1754	1942	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1755	1943	diffuseSection.add(fakedepth);
1756	1944
1757		- panel.add(new JSeparator());
	1945	+ cGridBag shadowbias = new cGridBag();
	1946	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1947	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1948	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1949	+ diffuseSection.add(shadowbias);
	1950	+
	1951	+ panel.add(GetSeparator());
1758	1952
1759	1953	panel.add(diffuseSection);
1760	1954
..	..	@@ -1804,42 +1998,48 @@
1804	1998	// aConstraints.gridy += 1;
1805	1999	// aConstraints.gridwidth = 1;
1806	2000
	2001	+ cGridBag anisoU = new cGridBag();
	2002	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2003	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2004	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2005	+ specularSection.add(anisoU);
1807	2006
1808		- panel.add(new JSeparator());
	2007	+ cGridBag anisoV = new cGridBag();
	2008	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2009	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2010	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2011	+ specularSection.add(anisoV);
	2012	+
	2013	+
	2014	+ panel.add(GetSeparator());
1809	2015
1810	2016	panel.add(specularSection);
1811	2017
1812	2018	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1813	2019
1814		- cGridBag globalSection = new cGridBag().setVertical(true);
	2020	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1815	2021
1816	2022	cGridBag camera = new cGridBag();
1817	2023	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1818	2024	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1819	2025	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1820		- globalSection.add(camera);
	2026	+ colorSection.add(camera);
1821	2027
1822	2028	cGridBag ambient = new cGridBag();
1823	2029	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1824	2030	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1825	2031	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1826		- globalSection.add(ambient);
	2032	+ colorSection.add(ambient);
1827	2033
1828	2034	cGridBag backlit = new cGridBag();
1829	2035	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1830	2036	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1831	2037	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1832		- globalSection.add(backlit);
	2038	+ colorSection.add(backlit);
1833	2039
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());
	2040	+ //panel.add(new JSeparator());
1841	2041
1842		- panel.add(globalSection);
	2042	+ //panel.add(globalSection);
1843	2043
1844	2044	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1845	2045
..	..	@@ -1881,7 +2081,7 @@
1881	2081	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1882	2082	textureSection.add(opacityPower);
1883	2083
1884		- panel.add(new JSeparator());
	2084	+ panel.add(GetSeparator());
1885	2085
1886	2086	panel.add(textureSection);
1887	2087
..	..	@@ -1946,8 +2146,9 @@
1946	2146	// 3D models
1947	2147	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1948	2148	{
1949		- lastConverter = new com.jmex.model.converters.MaxToJme();
1950		- LoadFile(filename, lastConverter);
	2149	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2150	+ //LoadFile(filename, lastConverter);
	2151	+ LoadObjFile(filename); // New 3ds loader
1951	2152	continue;
1952	2153	}
1953	2154	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2673,6 +2874,7 @@
2673	2874	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2674	2875	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2675	2876	}
	2877	+
2676	2878	//cJME.count++;
2677	2879	//cJME.count %= 12;
2678	2880	if (gc)
..	..	@@ -2856,6 +3058,7 @@
2856	3058	}
2857	3059	}
2858	3060	}
	3061	+
2859	3062	cFileSystemPane FSPane;
2860	3063
2861	3064	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2865,7 +3068,7 @@
2865	3068
2866	3069	freezematerial = true;
2867	3070	colorField.setFloat(mat.color);
2868		- modulationField.setFloat(mat.modulation);
	3071	+ saturationField.setFloat(mat.modulation);
2869	3072	metalnessField.setFloat(mat.metalness);
2870	3073	diffuseField.setFloat(mat.diffuse);
2871	3074	specularField.setFloat(mat.specular);
..	..	@@ -2909,6 +3112,7 @@
2909	3112	}
2910	3113	}
2911	3114	}
	3115	+
2912	3116	freezematerial = false;
2913	3117	}
2914	3118
..	..	@@ -3175,8 +3379,9 @@
3175	3379	} else if (event.getSource() == liveCB)
3176	3380	{
3177	3381	copy.live ^= true;
	3382	+ objEditor.refreshContents(true); // To show item colors
3178	3383	return;
3179		- } else if (event.getSource() == selectCB)
	3384	+ } else if (event.getSource() == selectableCB)
3180	3385	{
3181	3386	copy.dontselect ^= true;
3182	3387	return;
..	..	@@ -3184,7 +3389,7 @@
3184	3389	{
3185	3390	copy.hide ^= true;
3186	3391	copy.Touch(); // display list issue
3187		- objEditor.refreshContents();
	3392	+ objEditor.refreshContents(true); // To show item colors
3188	3393	return;
3189	3394	} else if (event.getSource() == link2masterCB)
3190	3395	{
..	..	@@ -3361,9 +3566,9 @@
3361	3566	{
3362	3567	Close();
3363	3568	//return true;
3364		- } else if (source == loadItem)
	3569	+ } else if (source == openItem)
3365	3570	{
3366		- load();
	3571	+ Open();
3367	3572	//return true;
3368	3573	} else if (source == newItem)
3369	3574	{
..	..	@@ -3388,6 +3593,10 @@
3388	3593	{
3389	3594	generatePOV();
3390	3595	//return true;
	3596	+ } else if (event.getSource() == archiveItem)
	3597	+ {
	3598	+ cTools.Archive(frame);
	3599	+ return;
3391	3600	} else if (source == zBufferItem)
3392	3601	{
3393	3602	try
..	..	@@ -3436,11 +3645,12 @@
3436	3645
3437	3646	static public byte[] Compress(Object3D o)
3438	3647	{
	3648	+ // Slower to actually compress.
3439	3649	try
3440	3650	{
3441	3651	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3442		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3443		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3652	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3653	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3444	3654
3445	3655	Object3D parent = o.parent;
3446	3656	o.parent = null;
..	..	@@ -3451,10 +3661,14 @@
3451	3661
3452	3662	out.flush();
3453	3663
3454		- zstream.close();
	3664	+ baos //zstream
	3665	+ .close();
3455	3666	out.close();
3456	3667
3457		- return baos.toByteArray();
	3668	+ byte[] bytes = baos.toByteArray();
	3669	+
	3670	+ System.out.println("save #bytes = " + bytes.length);
	3671	+ return bytes;
3458	3672	} catch (Exception e)
3459	3673	{
3460	3674	System.err.println(e);
..	..	@@ -3464,13 +3678,16 @@
3464	3678
3465	3679	static public Object Uncompress(byte[] bytes)
3466	3680	{
3467		- System.out.println("#bytes = " + bytes.length);
	3681	+ System.out.println("restore #bytes = " + bytes.length);
3468	3682	try
3469	3683	{
3470	3684	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3471		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3472		- ObjectInputStream in = new ObjectInputStream(istream);
	3685	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3686	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3473	3687	Object obj = in.readObject();
	3688	+
	3689	+ bais //istream
	3690	+ .close();
3474	3691	in.close();
3475	3692
3476	3693	return obj;
..	..	@@ -3525,32 +3742,86 @@
3525	3742	return null;
3526	3743	}
3527	3744
3528		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3529	3745
3530	3746	public void Save()
3531	3747	{
	3748	+ //Save(true);
	3749	+ Replace();
	3750	+ SetUndoStates();
	3751	+ }
	3752	+
	3753	+ private boolean Equal(byte[] compress, byte[] name)
	3754	+ {
	3755	+ if (compress.length != name.length)
	3756	+ {
	3757	+ return false;
	3758	+ }
	3759	+
	3760	+ for (int i=compress.length; --i>=0;)
	3761	+ {
	3762	+ if (compress[i] != name[i])
	3763	+ return false;
	3764	+ }
	3765	+
	3766	+ return true;
	3767	+ }
	3768	+
	3769	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3770	+
	3771	+ void DeleteVersion()
	3772	+ {
	3773	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	3774	+ {
	3775	+ copy.versionlist[i] = copy.versionlist[i+1];
	3776	+ }
	3777	+
	3778	+ CopyChanged();
	3779	+
	3780	+ SetUndoStates();
	3781	+ }
	3782	+
	3783	+ public boolean Save(boolean user)
	3784	+ {
3532	3785	System.err.println("Save");
	3786	+ //Replace();
3533	3787
3534	3788	cRadio tab = GetCurrentTab();
3535	3789
3536		- boolean temp = CameraPane.SWITCH;
3537		- CameraPane.SWITCH = false;
	3790	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3538	3791
3539		- copy.ExtractBigData(hashtable);
	3792	+ boolean thesame = false;
	3793	+
	3794	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3795	+// {
	3796	+// thesame = true;
	3797	+// }
3540	3798
3541	3799	//EditorFrame.m_MainFrame.requestFocusInWindow();
3542		- tab.graphs[tab.undoindex++] = Compress(copy);
	3800	+ if (!thesame)
	3801	+ {
	3802	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	3803	+ {
	3804	+ copy.versionlist[i] = copy.versionlist[i-1];
	3805	+ }
	3806	+
	3807	+ //tab.user[tab.versionindex] = user;
	3808	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3809	+
	3810	+ copy.versionlist[++copy.versionindex] = compress;
	3811	+
	3812	+ // if (increment)
	3813	+ // tab.versionindex++;
	3814	+ }
3543	3815
3544		- copy.RestoreBigData(hashtable);
	3816	+ //copy.RestoreBigData(versiontable);
3545	3817
3546		- CameraPane.SWITCH = temp;
3547		-
3548	3818	//assert(hashtable.isEmpty());
3549	3819
3550		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3551		- {
3552		- tab.graphs[i] = null;
3553		- }
	3820	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3821	+// {
	3822	+// //tab.user[i] = false;
	3823	+// copy.versionlist[i] = null;
	3824	+// }
3554	3825
3555	3826	SetUndoStates();
3556	3827
..	..	@@ -3559,7 +3830,7 @@
3559	3830	{
3560	3831	try
3561	3832	{
3562		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3833	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3563	3834	ObjectOutputStream p = new ObjectOutputStream(ostream);
3564	3835
3565	3836	p.writeObject(copy);
..	..	@@ -3572,28 +3843,68 @@
3572	3843	e.printStackTrace();
3573	3844	}
3574	3845	}
	3846	+
	3847	+ return !thesame;
	3848	+ }
	3849	+
	3850	+ boolean flashIt = true;
	3851	+
	3852	+ void RefreshSelection()
	3853	+ {
	3854	+ Object3D selection = new Object3D();
	3855	+
	3856	+ for (int i = 0; i < copy.selection.size(); i++)
	3857	+ {
	3858	+ Object3D elem = copy.selection.elementAt(i);
	3859	+
	3860	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3861	+
	3862	+ if (obj == null)
	3863	+ {
	3864	+ copy.selection.remove(i--);
	3865	+ }
	3866	+ else
	3867	+ {
	3868	+ selection.add(obj);
	3869	+ copy.selection.setElementAt(obj, i);
	3870	+ }
	3871	+ }
	3872	+
	3873	+ flashIt = false;
	3874	+ GetTree().clearSelection();
	3875	+ for (int i = 0; i < selection.size(); i++)
	3876	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3877	+ flashIt = true;
	3878	+
	3879	+ //refreshContents(false);
3575	3880	}
3576	3881
3577		- void CopyChanged(Object3D obj)
	3882	+ void CopyChanged()
3578	3883	{
	3884	+ Object3D obj = copy.versionlist[copy.versionindex];
	3885	+
3579	3886	SetUndoStates();
3580	3887
3581	3888	boolean temp = CameraPane.SWITCH;
3582	3889	CameraPane.SWITCH = false;
3583	3890
3584		- copy.ExtractBigData(hashtable);
	3891	+ copy.ExtractBigData(versiontable);
3585	3892
3586	3893	copy.clear();
3587	3894
	3895	+ copy.skyboxname = obj.skyboxname;
	3896	+ copy.skyboxext = obj.skyboxext;
	3897	+
3588	3898	for (int i=0; i<obj.Size(); i++)
3589	3899	{
3590	3900	copy.add(obj.get(i));
3591	3901	}
3592	3902
3593		- copy.RestoreBigData(hashtable);
	3903	+ copy.RestoreBigData(versiontable);
3594	3904
3595	3905	CameraPane.SWITCH = temp;
3596	3906
	3907	+ RefreshSelection();
3597	3908	//assert(hashtable.isEmpty());
3598	3909
3599	3910	copy.Touch();
..	..	@@ -3614,56 +3925,139 @@
3614	3925	}
3615	3926	}
3616	3927
3617		- refreshContents();
	3928	+ refreshContents(true);
3618	3929	}
3619	3930
3620		- cButton undoButton;
3621		- cButton redoButton;
	3931	+ cButton previousVersionButton;
	3932	+ cButton restoreButton;
	3933	+ cButton replaceButton;
	3934	+ cButton nextVersionButton;
	3935	+ cButton saveVersionButton;
	3936	+ cButton deleteVersionButton;
3622	3937
	3938	+ boolean muteSlider;
	3939	+
	3940	+ int VersionCount()
	3941	+ {
	3942	+ int count = 0;
	3943	+
	3944	+ for (int i = copy.versionlist.length; --i >= 0;)
	3945	+ {
	3946	+ if (copy.versionlist[i] != null)
	3947	+ count++;
	3948	+ }
	3949	+
	3950	+ return count;
	3951	+ }
	3952	+
3623	3953	void SetUndoStates()
3624	3954	{
3625	3955	cRadio tab = GetCurrentTab();
3626	3956
3627		- undoButton.setEnabled(tab.undoindex > 0);
3628		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3957	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	3958	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	3959	+
	3960	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	3961	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3962	+
	3963	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	3964	+ copy.versionlist[copy.versionindex + 1] != null);
	3965	+
	3966	+ muteSlider = true;
	3967	+ versionSlider.setMaximum(VersionCount() - 1);
	3968	+ versionSlider.setInteger(copy.versionindex);
	3969	+ muteSlider = false;
3629	3970	}
3630	3971
3631		- public void Undo()
	3972	+ public boolean PreviousVersion()
3632	3973	{
	3974	+ // Option?
	3975	+ Replace();
	3976	+
3633	3977	System.err.println("Undo");
3634	3978
3635	3979	cRadio tab = GetCurrentTab();
3636	3980
3637		- if (tab.undoindex == 0)
	3981	+ if (copy.versionindex == 0)
3638	3982	{
3639	3983	java.awt.Toolkit.getDefaultToolkit().beep();
3640		- return;
	3984	+ return false;
3641	3985	}
3642	3986
3643		- if (tab.graphs[tab.undoindex] == null)
3644		- {
3645		- Save();
3646		- tab.undoindex -= 1;
3647		- }
	3987	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3988	+// {
	3989	+// if (Save(false))
	3990	+// tab.versionindex -= 1;
	3991	+// else
	3992	+// {
	3993	+// if (tab.versionindex <= 0)
	3994	+// return false;
	3995	+// else
	3996	+// tab.versionindex -= 1;
	3997	+// }
	3998	+// }
3648	3999
3649		- tab.undoindex -= 1;
	4000	+ copy.versionindex -= 1;
3650	4001
3651		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4002	+ CopyChanged();
	4003	+
	4004	+ return true;
3652	4005	}
3653	4006
3654		- public void Redo()
	4007	+ public boolean Restore()
3655	4008	{
	4009	+ System.err.println("Restore");
	4010	+
3656	4011	cRadio tab = GetCurrentTab();
3657	4012
3658		- if (tab.graphs[tab.undoindex + 1] == null)
	4013	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4014	+ {
	4015	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4016	+ return false;
	4017	+ }
	4018	+
	4019	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4020	+ CopyChanged();
	4021	+
	4022	+ return true;
	4023	+ }
	4024	+
	4025	+ public boolean Replace()
	4026	+ {
	4027	+ System.err.println("Replace");
	4028	+
	4029	+ cRadio tab = GetCurrentTab();
	4030	+
	4031	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4032	+ {
	4033	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4034	+ return false;
	4035	+ }
	4036	+
	4037	+ copy.versionlist[copy.versionindex] = CompressCopy();
	4038	+
	4039	+ return true;
	4040	+ }
	4041	+
	4042	+ public void NextVersion()
	4043	+ {
	4044	+ // Option?
	4045	+ Replace();
	4046	+
	4047	+ cRadio tab = GetCurrentTab();
	4048	+
	4049	+ if (copy.versionlist[copy.versionindex + 1] == null)
3659	4050	{
3660	4051	java.awt.Toolkit.getDefaultToolkit().beep();
3661	4052	return;
3662	4053	}
3663	4054
3664		- tab.undoindex += 1;
	4055	+ copy.versionindex += 1;
3665	4056
3666		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4057	+ CopyChanged();
	4058	+
	4059	+ //if (!tab.user[tab.versionindex])
	4060	+ // tab.graphs[tab.versionindex] = null;
3667	4061	}
3668	4062
3669	4063	void ImportGFD()
..	..	@@ -3874,7 +4268,7 @@
3874	4268	//copy.material = new cMaterial(copy.GetMaterial());
3875	4269
3876	4270	current.color = (float) colorField.getFloat();
3877		- current.modulation = (float) modulationField.getFloat();
	4271	+ current.modulation = (float) saturationField.getFloat();
3878	4272	current.metalness = (float) metalnessField.getFloat();
3879	4273	current.diffuse = (float) diffuseField.getFloat();
3880	4274	current.specular = (float) specularField.getFloat();
..	..	@@ -3907,7 +4301,7 @@
3907	4301	cMaterial mat = copy.material;
3908	4302
3909	4303	colorField.SetToolTipValue((mat.color));
3910		- modulationField.SetToolTipValue((mat.modulation));
	4304	+ saturationField.SetToolTipValue((mat.modulation));
3911	4305	metalnessField.SetToolTipValue((mat.metalness));
3912	4306	diffuseField.SetToolTipValue((mat.diffuse));
3913	4307	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3959,9 +4353,26 @@
3959	4353	//copy.Touch();
3960	4354	}
3961	4355
	4356	+ cNumberSlider versionSlider;
	4357	+
3962	4358	public void stateChanged(ChangeEvent e)
3963	4359	{
3964	4360	// assert(false);
	4361	+ if (e.getSource() == versionSlider)
	4362	+ {
	4363	+ if (muteSlider)
	4364	+ return;
	4365	+
	4366	+ int version = versionSlider.getInteger();
	4367	+
	4368	+ if (copy.versionlist[version] != null)
	4369	+ {
	4370	+ copy.versionindex = version;
	4371	+ CopyChanged();
	4372	+ }
	4373	+
	4374	+ return;
	4375	+ }
3965	4376
3966	4377	if (freezematerial)
3967	4378	{
..	..	@@ -3997,6 +4408,12 @@
3997	4408	{
3998	4409	//System.out.println("stateChanged = " + this);
3999	4410	materialtouched = true;
	4411	+
	4412	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4413	+ {
	4414	+ saturationField.setFloat(1);
	4415	+ }
	4416	+
4000	4417	applySelf();
4001	4418	//System.out.println("this = " + this);
4002	4419	//System.out.println("PARENT = " + parent);
..	..	@@ -4296,6 +4713,7 @@
4296	4713	{
4297	4714	if (GetTree() != null)
4298	4715	{
	4716	+ GetTree().revalidate();
4299	4717	GetTree().repaint();
4300	4718	}
4301	4719
..	..	@@ -4304,13 +4722,16 @@
4304	4722	ctrlPanel.validate(); // ? new
4305	4723	ctrlPanel.repaint();
4306	4724	}
	4725	+
	4726	+ if (previousVersionButton != null && copy.versionlist != null)
	4727	+ SetUndoStates();
4307	4728	}
4308	4729
4309	4730	static TweenManager tweenManager = new TweenManager();
4310	4731
4311	4732	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4312	4733	{
4313		- if (Globals.SAVEONMAKE) // && resetmodel)
	4734	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4314	4735	Save();
4315	4736	//Tween.set(thing, 0).target(1).start(tweenManager);
4316	4737	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4552,7 +4973,9 @@
4552	4973	readobj.ResetDisplayList();
4553	4974	} catch (Exception e)
4554	4975	{
4555		- //e.printStackTrace();
	4976	+ if (!e.toString().contains("GZIP"))
	4977	+ e.printStackTrace();
	4978	+
4556	4979	try
4557	4980	{
4558	4981	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4626,12 +5049,14 @@
4626	5049
4627	5050	if (readobj != null)
4628	5051	{
4629		- if (Globals.SAVEONMAKE)
4630		- Save();
	5052	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5053	+ // Save();
4631	5054	try
4632	5055	{
4633	5056	//readobj.deepCopySelf(copy);
4634	5057	copy.clear(); // june 2014
	5058	+ copy.skyboxname = readobj.skyboxname;
	5059	+ copy.skyboxext = readobj.skyboxext;
4635	5060	for (int i = 0; i < readobj.size(); i++)
4636	5061	{
4637	5062	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4672,6 +5097,7 @@
4672	5097	}
4673	5098	} catch (ClassCastException e)
4674	5099	{
	5100	+ e.printStackTrace();
4675	5101	assert (false);
4676	5102	Composite c = (Composite) copy;
4677	5103	c.children.clear();
..	..	@@ -4682,17 +5108,28 @@
4682	5108	c.addChild(csg);
4683	5109	}
4684	5110
	5111	+ copy.versionlist = readobj.versionlist;
	5112	+ copy.versionindex = readobj.versionindex;
	5113	+
	5114	+ if (copy.versionlist == null)
	5115	+ {
	5116	+ copy.versionlist = new Object3D[100];
	5117	+ copy.versionindex = -1;
	5118	+ }
	5119	+
	5120	+ //? SetUndoStates();
	5121	+
4685	5122	ResetModel();
4686	5123	copy.HardTouch(); // recompile?
4687	5124	refreshContents();
4688	5125	}
4689	5126	}
4690	5127
4691		- void load() // throws ClassNotFoundException
	5128	+ void Open() // throws ClassNotFoundException
4692	5129	{
4693	5130	if (Grafreed.standAlone)
4694	5131	{
4695		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5132	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4696	5133	browser.show();
4697	5134	String filename = browser.getFile();
4698	5135	if (filename != null && filename.length() > 0)
..	..	@@ -4791,6 +5228,7 @@
4791	5228	//ps.print(buffer.toString());
4792	5229	} catch (IOException e)
4793	5230	{
	5231	+ e.printStackTrace();
4794	5232	}
4795	5233	}
4796	5234
..	..	@@ -4973,7 +5411,7 @@
4973	5411	MenuBar menuBar;
4974	5412	Menu fileMenu;
4975	5413	MenuItem newItem;
4976		- MenuItem loadItem;
	5414	+ MenuItem openItem;
4977	5415	MenuItem saveItem;
4978	5416	MenuItem saveAsItem;
4979	5417	MenuItem exportAsItem;
..	..	@@ -4996,6 +5434,7 @@
4996	5434	CheckboxMenuItem toggleSwitchItem;
4997	5435	CheckboxMenuItem toggleRootItem;
4998	5436	CheckboxMenuItem animationItem;
	5437	+ MenuItem archiveItem;
4999	5438	CheckboxMenuItem toggleHandleItem;
5000	5439	CheckboxMenuItem togglePaintItem;
5001	5440	JSplitPane mainPanel;
..	..	@@ -5082,7 +5521,7 @@
5082	5521	JLabel colorLabel;
5083	5522	cNumberSlider colorField;
5084	5523	JLabel modulationLabel;
5085		- cNumberSlider modulationField;
	5524	+ cNumberSlider saturationField;
5086	5525	JLabel metalnessLabel;
5087	5526	cNumberSlider metalnessField;
5088	5527	JLabel diffuseLabel;