~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -38,64 +41,78 @@
38	41	JFrame frame;
39	42
40	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	+ }
41	52
42	53	cButton GetButton(String name, boolean border)
43	54	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	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);
53	63	}
54	64
55	65	cToggleButton GetToggleButton(String name, boolean border)
56	66	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
66	69	}
67	70
68	71	cCheckBox GetCheckBox(String name, boolean border)
69	72	{
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
70	79	try
71	80	{
72		- ImageIcon icon = GetIcon(name);
73		- 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;
74	97	}
75	98	catch (Exception e)
76	99	{
77		- return new cCheckBox(name, border);
	100	+ return null;
78	101	}
79	102	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	103	+
	104	+ BufferedImage GetImage(String name)
82	105	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	106	+ try
86	107	{
87		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88		- Graphics2D g = resized.createGraphics();
89		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92		- g.dispose();
93		-
94		- image = resized;
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
95	111	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
99	116	}
100	117
101	118	// SCRIPT
..	..	@@ -279,6 +296,12 @@
279	296	client = inClient;
280	297	copy = client;
281	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
282	305	// "this" is not called: SetupUI2(objEditor);
283	306	}
284	307
..	..	@@ -292,6 +315,12 @@
292	315	client = inClient;
293	316	copy = client;
294	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
295	324	SetupUI2(callee.GetEditor());
296	325	}
297	326
..	..	@@ -306,7 +335,7 @@
306	335	//localCopy.parent = null;
307	336
308	337	frame = new JFrame();
309		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
310	339	objEditor = this;
311	340	this.callee = callee;
312	341
..	..	@@ -324,6 +353,12 @@
324	353	copy = localCopy;
325	354	copy.editWindow = this;
326	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
327	362	SetupMenu();
328	363
329	364	//SetupName(objEditor); // new
..	..	@@ -347,7 +382,7 @@
347	382	frame.setMenuBar(menuBar = new MenuBar());
348	383	menuBar.add(fileMenu = new Menu("File"));
349	384	fileMenu.add(newItem = new MenuItem("New"));
350		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
351	386
352	387	//oe.menuBar.add(menu = new Menu("Include"));
353	388	Menu menu = new Menu("Import");
..	..	@@ -379,7 +414,7 @@
379	414	}
380	415
381	416	newItem.addActionListener(this);
382		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
383	418	saveItem.addActionListener(this);
384	419	saveAsItem.addActionListener(this);
385	420	exportAsItem.addActionListener(this);
..	..	@@ -416,11 +451,12 @@
416	451
417	452	toolbarPanel = new JPanel();
418	453	toolbarPanel.setName("Toolbar");
	454	+
419	455	treePanel = new cGridBag();
420	456	treePanel.setName("Tree");
421	457
422	458	editPanel = new cGridBag().setVertical(true);
423		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
424	460
425	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
426	462
..	..	@@ -428,11 +464,11 @@
428	464	editPanel.add(editCommandsPanel);
429	465	editPanel.add(ctrlPanel);
430	466
431		- toolboxPanel = new cGridBag().setVertical(false);
432		- toolboxPanel.setName("Toolbox");
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
433	469
434		- materialPanel = new cGridBag().setVertical(true);
435		- materialPanel.setName("Material");
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
436	472
437	473	/JTextPane/
438	474	infoarea = createTextPane();
..	..	@@ -440,14 +476,15 @@
440	476
441	477	infoarea.setEditable(true);
442	478	SetText();
	479	+
443	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
444	481	// infoarea.setOpaque(false);
445	482	// //infoarea.setForeground(textcolor);
446	483	// TEXTAREA infoarea.setLineWrap(true);
447	484	// TEXTAREA infoarea.setWrapStyleWord(true);
448	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
449		- infoPanel.setPreferredSize(new Dimension(50, 200));
450		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
451	488	//infoPanel.setLayout(new BorderLayout());
452	489	//infoPanel.add(createTextPane());
453	490
..	..	@@ -458,7 +495,14 @@
458	495	mainPanel.setDividerSize(9);
459	496	mainPanel.setDividerLocation(0.5); //1.0);
460	497	mainPanel.setResizeWeight(0.5);
461		-
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
462	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
463	507	//mainPanel.setLayout(new GridBagLayout());
464	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -689,8 +733,8 @@
689	733	}
690	734	}
691	735
692		-static GraphicsDevice device = GraphicsEnvironment
693		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
694	738
695	739	Rectangle keeprect;
696	740	cRadio radio;
..	..	@@ -711,10 +755,19 @@
711	755	void Minimize()
712	756	{
713	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
714	759	}
715	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={}
716	764	void Maximize()
717	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
718	771	if (maximized)
719	772	{
720	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -722,22 +775,36 @@
722	775	else
723	776	{
724	777	keeprect = frame.getBounds();
725		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
726		- Dimension rect2 = frame.getToolkit().getScreenSize();
727		- 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);
728	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
729	783	}
730	784
731	785	maximized ^= true;
	786	+
	787	+ frame.validate();
732	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
733	793
734	794	void ToggleFullScreen()
735	795	{
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
736	798	cameraView.ToggleFullScreen();
737	799
738	800	if (!CameraPane.FULLSCREEN)
739	801	{
740	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
741	808	//frame.setVisible(false);
742	809	// frame.removeNotify();
743	810	// frame.setUndecorated(false);
..	..	@@ -747,7 +814,7 @@
747	814	// X frame.getContentPane().remove(/"Center",/bigThree);
748	815	// X framePanel.add(bigThree);
749	816	// X frame.getContentPane().add(/"Center",/framePanel);
750		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
751	818
752	819	//frame.setVisible(true);
753	820	radio.layout = keepButton;
..	..	@@ -762,7 +829,12 @@
762	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
763	830	// frame.getToolkit().getScreenSize().height);
764	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
765	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
766	838	// frame.removeNotify();
767	839	// frame.setUndecorated(true);
768	840	// frame.addNotify();
..	..	@@ -775,7 +847,33 @@
775	847	radio.layout.doClick();
776	848	//frame.setVisible(true);
777	849	}
	850	+ frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
778	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	+ }
779	877
780	878	private JTextPane createTextPane()
781	879	{
..	..	@@ -898,6 +996,7 @@
898	996	{
899	997	SetupMaterial(materialPanel);
900	998	}
	999	+
901	1000	//SetupName();
902	1001	//SetupViews();
903	1002	}
..	..	@@ -907,7 +1006,7 @@
907	1006	// NumberSlider vDivsField;
908	1007	// JCheckBox endcaps;
909	1008	JCheckBox liveCB;
910		- JCheckBox selectCB;
	1009	+ JCheckBox selectableCB;
911	1010	JCheckBox hideCB;
912	1011	JCheckBox link2masterCB;
913	1012	JCheckBox markCB;
..	..	@@ -1107,7 +1206,7 @@
1107	1206	namePanel = new cGridBag();
1108	1207
1109	1208	nameField = AddText(namePanel, copy.GetName());
1110		- namePanel.add(nameField);
	1209	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1111	1210	oe.ctrlPanel.add(namePanel);
1112	1211
1113	1212	oe.ctrlPanel.Return();
..	..	@@ -1119,26 +1218,30 @@
1119	1218
1120	1219	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1121	1220	liveCB.setToolTipText("Animate object");
1122		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1123		- selectCB.setToolTipText("Make object selectable");
	1221	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1222	+ selectableCB.setToolTipText("Make object selectable");
1124	1223	// Return();
	1224	+
1125	1225	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1126	1226	hideCB.setToolTipText("Hide object");
1127	1227	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1128		- markCB.setToolTipText("Set the animation target transform");
	1228	+ markCB.setToolTipText("As animation target transform");
	1229	+
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1129	1231
1130	1232	setupPanel2 = new cGridBag().setVertical(false);
1131	1233
1132	1234	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1133	1235	rewindCB.setToolTipText("Rewind animation");
1134	1236
1135		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1136		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1237	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1238	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1137	1239
	1240	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1241	+ link2masterCB.setToolTipText("Attach to support");
	1242	+
1138	1243	if (Globals.ADVANCED)
1139	1244	{
1140		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1141		- link2masterCB.setToolTipText("Attach to support");
1142	1245	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1143	1246	speedupCB.setToolTipText("Option motion capture");
1144	1247	}
..	..	@@ -1412,6 +1515,7 @@
1412	1515	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1413	1516	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1414	1517	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1518	+ //XYZPanel.setName("XYZ");
1415	1519
1416	1520	/*
1417	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1449,13 +1553,29 @@
1449	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1450	1554	//tmp.setName("Edit");
1451	1555	objectPanel.add(materialPanel);
	1556	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
	1558	+
1452	1559	// JPanel north = new JPanel(new BorderLayout());
1453	1560	// north.setName("Edit");
1454	1561	// north.add(ctrlPanel, BorderLayout.NORTH);
1455	1562	// objectPanel.add(north);
1456	1563	objectPanel.add(editPanel);
1457		- 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	+
1458	1576	objectPanel.add(toolboxPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1459	1579
1460	1580	/*
1461	1581	aConstraints.gridx = 0;
..	..	@@ -1476,7 +1596,7 @@
1476	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1477	1597
1478	1598	/JTabbedPane/ scenePanel = new cGridBag();
1479		- scenePanel.preferredWidth = 6;
	1599	+ scenePanel.preferredWidth = 5;
1480	1600
1481	1601	JTabbedPane tabbedPane = new JTabbedPane();
1482	1602	tabbedPane.add(scrollpane);
..	..	@@ -1554,7 +1674,7 @@
1554	1674	bigThree = new cGridBag();
1555	1675	bigThree.addComponent(scenePanel);
1556	1676	bigThree.addComponent(centralPanel);
1557		- bigThree.addComponent(XYZPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
1558	1678
1559	1679	// // SIDE EFFECT!!!
1560	1680	// aConstraints.gridx = 0;
..	..	@@ -1563,9 +1683,9 @@
1563	1683	// aConstraints.gridheight = 1;
1564	1684
1565	1685	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1566		- framePanel.setContinuousLayout(true);
1567		- framePanel.setOneTouchExpandable(true);
1568		- framePanel.setDividerLocation(0.8);
	1686	+ framePanel.setContinuousLayout(false);
	1687	+ framePanel.setOneTouchExpandable(false);
	1688	+ //.setDividerLocation(0.8);
1569	1689	//framePanel.setDividerSize(15);
1570	1690	//framePanel.setResizeWeight(0.15);
1571	1691	framePanel.setName("Frame");
..	..	@@ -1584,17 +1704,17 @@
1584	1704
1585	1705	frame.setSize(1280, 860);
1586	1706
1587		- frame.validate();
1588		- frame.setVisible(true);
1589		-
1590	1707	cameraView.requestFocusInWindow();
1591	1708
1592	1709	gridPanel.setDividerLocation(1.0);
	1710	+
	1711	+ frame.validate();
	1712	+
	1713	+ frame.setVisible(true);
1593	1714
1594	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1595	1716	frame.addWindowListener(new WindowAdapter()
1596	1717	{
1597		-
1598	1718	public void windowClosing(WindowEvent e)
1599	1719	{
1600	1720	Close();
..	..	@@ -1617,12 +1737,85 @@
1617	1737	ctrlPanel.removeAll();
1618	1738	}
1619	1739
1620		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1621	1741	{
1622		- /*
	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	+ /*
1623	1816	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1624	1817	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- */
	1818	+ */
1626	1819
1627	1820	cGridBag editBar = new cGridBag().setVertical(false);
1628	1821
..	..	@@ -1656,45 +1849,50 @@
1656	1849	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1657	1850
1658	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);
1659	1865
1660	1866	cGridBag color = new cGridBag();
1661		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1662		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663		- 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	+
1664	1872	//colorField.preferredWidth = 200;
1665	1873	colorSection.add(color);
1666	1874
1667	1875	cGridBag modulation = new cGridBag();
1668	1876	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1669	1877	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1878	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1671	1879	colorSection.add(modulation);
1672	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	+
1673	1889	cGridBag texture = new cGridBag();
1674	1890	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1675	1891	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1676	1892	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1677	1893	colorSection.add(texture);
1678	1894
1679		- cGridBag anisoU = new cGridBag();
1680		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1681		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1683		- colorSection.add(anisoU);
1684		-
1685		- cGridBag anisoV = new cGridBag();
1686		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1687		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1689		- colorSection.add(anisoV);
1690		-
1691		- cGridBag shadowbias = new cGridBag();
1692		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1693		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1694		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1695		- colorSection.add(shadowbias);
1696		-
1697		- panel.add(new JSeparator());
	1895	+ panel.add(GetSeparator());
1698	1896
1699	1897	panel.add(colorSection);
1700	1898
..	..	@@ -1744,7 +1942,13 @@
1744	1942	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1745	1943	diffuseSection.add(fakedepth);
1746	1944
1747		- 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());
1748	1952
1749	1953	panel.add(diffuseSection);
1750	1954
..	..	@@ -1794,42 +1998,48 @@
1794	1998	// aConstraints.gridy += 1;
1795	1999	// aConstraints.gridwidth = 1;
1796	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);
1797	2006
1798		- 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());
1799	2015
1800	2016	panel.add(specularSection);
1801	2017
1802	2018	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1803	2019
1804		- cGridBag globalSection = new cGridBag().setVertical(true);
	2020	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1805	2021
1806	2022	cGridBag camera = new cGridBag();
1807	2023	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1808	2024	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1809	2025	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1810		- globalSection.add(camera);
	2026	+ colorSection.add(camera);
1811	2027
1812	2028	cGridBag ambient = new cGridBag();
1813	2029	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1814	2030	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1815	2031	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816		- globalSection.add(ambient);
	2032	+ colorSection.add(ambient);
1817	2033
1818	2034	cGridBag backlit = new cGridBag();
1819	2035	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1820	2036	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1821	2037	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1822		- globalSection.add(backlit);
	2038	+ colorSection.add(backlit);
1823	2039
1824		- cGridBag opacity = new cGridBag();
1825		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1826		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1827		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1828		- globalSection.add(opacity);
1829		-
1830		- panel.add(new JSeparator());
	2040	+ //panel.add(new JSeparator());
1831	2041
1832		- panel.add(globalSection);
	2042	+ //panel.add(globalSection);
1833	2043
1834	2044	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1835	2045
..	..	@@ -1871,7 +2081,7 @@
1871	2081	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1872	2082	textureSection.add(opacityPower);
1873	2083
1874		- panel.add(new JSeparator());
	2084	+ panel.add(GetSeparator());
1875	2085
1876	2086	panel.add(textureSection);
1877	2087
..	..	@@ -1936,8 +2146,9 @@
1936	2146	// 3D models
1937	2147	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1938	2148	{
1939		- lastConverter = new com.jmex.model.converters.MaxToJme();
1940		- LoadFile(filename, lastConverter);
	2149	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2150	+ //LoadFile(filename, lastConverter);
	2151	+ LoadObjFile(filename); // New 3ds loader
1941	2152	continue;
1942	2153	}
1943	2154	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2663,6 +2874,7 @@
2663	2874	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2664	2875	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2665	2876	}
	2877	+
2666	2878	//cJME.count++;
2667	2879	//cJME.count %= 12;
2668	2880	if (gc)
..	..	@@ -2846,6 +3058,7 @@
2846	3058	}
2847	3059	}
2848	3060	}
	3061	+
2849	3062	cFileSystemPane FSPane;
2850	3063
2851	3064	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2855,7 +3068,7 @@
2855	3068
2856	3069	freezematerial = true;
2857	3070	colorField.setFloat(mat.color);
2858		- modulationField.setFloat(mat.modulation);
	3071	+ saturationField.setFloat(mat.modulation);
2859	3072	metalnessField.setFloat(mat.metalness);
2860	3073	diffuseField.setFloat(mat.diffuse);
2861	3074	specularField.setFloat(mat.specular);
..	..	@@ -2899,6 +3112,7 @@
2899	3112	}
2900	3113	}
2901	3114	}
	3115	+
2902	3116	freezematerial = false;
2903	3117	}
2904	3118
..	..	@@ -3017,12 +3231,17 @@
3017	3231	// }
3018	3232
3019	3233	/**/
3020		- if (deselect)
	3234	+ if (deselect \|\| child == null)
3021	3235	{
3022	3236	//group.deselectAll();
3023	3237	//freeze = true;
3024	3238	GetTree().clearSelection();
3025	3239	//freeze = false;
	3240	+
	3241	+ if (child == null)
	3242	+ {
	3243	+ return;
	3244	+ }
3026	3245	}
3027	3246
3028	3247	//group.addSelectee(child);
..	..	@@ -3160,8 +3379,9 @@
3160	3379	} else if (event.getSource() == liveCB)
3161	3380	{
3162	3381	copy.live ^= true;
	3382	+ objEditor.refreshContents(true); // To show item colors
3163	3383	return;
3164		- } else if (event.getSource() == selectCB)
	3384	+ } else if (event.getSource() == selectableCB)
3165	3385	{
3166	3386	copy.dontselect ^= true;
3167	3387	return;
..	..	@@ -3169,7 +3389,7 @@
3169	3389	{
3170	3390	copy.hide ^= true;
3171	3391	copy.Touch(); // display list issue
3172		- objEditor.refreshContents();
	3392	+ objEditor.refreshContents(true); // To show item colors
3173	3393	return;
3174	3394	} else if (event.getSource() == link2masterCB)
3175	3395	{
..	..	@@ -3346,9 +3566,9 @@
3346	3566	{
3347	3567	Close();
3348	3568	//return true;
3349		- } else if (source == loadItem)
	3569	+ } else if (source == openItem)
3350	3570	{
3351		- load();
	3571	+ Open();
3352	3572	//return true;
3353	3573	} else if (source == newItem)
3354	3574	{
..	..	@@ -3373,6 +3593,10 @@
3373	3593	{
3374	3594	generatePOV();
3375	3595	//return true;
	3596	+ } else if (event.getSource() == archiveItem)
	3597	+ {
	3598	+ cTools.Archive(frame);
	3599	+ return;
3376	3600	} else if (source == zBufferItem)
3377	3601	{
3378	3602	try
..	..	@@ -3421,11 +3645,12 @@
3421	3645
3422	3646	static public byte[] Compress(Object3D o)
3423	3647	{
	3648	+ // Slower to actually compress.
3424	3649	try
3425	3650	{
3426	3651	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3427		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3428		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3652	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3653	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3429	3654
3430	3655	Object3D parent = o.parent;
3431	3656	o.parent = null;
..	..	@@ -3436,10 +3661,14 @@
3436	3661
3437	3662	out.flush();
3438	3663
3439		- zstream.close();
	3664	+ baos //zstream
	3665	+ .close();
3440	3666	out.close();
3441	3667
3442		- return baos.toByteArray();
	3668	+ byte[] bytes = baos.toByteArray();
	3669	+
	3670	+ System.out.println("save #bytes = " + bytes.length);
	3671	+ return bytes;
3443	3672	} catch (Exception e)
3444	3673	{
3445	3674	System.err.println(e);
..	..	@@ -3449,13 +3678,16 @@
3449	3678
3450	3679	static public Object Uncompress(byte[] bytes)
3451	3680	{
3452		- System.out.println("#bytes = " + bytes.length);
	3681	+ System.out.println("restore #bytes = " + bytes.length);
3453	3682	try
3454	3683	{
3455	3684	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3456		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3457		- ObjectInputStream in = new ObjectInputStream(istream);
	3685	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3686	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3458	3687	Object obj = in.readObject();
	3688	+
	3689	+ bais //istream
	3690	+ .close();
3459	3691	in.close();
3460	3692
3461	3693	return obj;
..	..	@@ -3510,32 +3742,86 @@
3510	3742	return null;
3511	3743	}
3512	3744
3513		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3514	3745
3515	3746	public void Save()
3516	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	+ {
3517	3785	System.err.println("Save");
	3786	+ //Replace();
3518	3787
3519	3788	cRadio tab = GetCurrentTab();
3520	3789
3521		- boolean temp = CameraPane.SWITCH;
3522		- CameraPane.SWITCH = false;
	3790	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3523	3791
3524		- 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	+// }
3525	3798
3526	3799	//EditorFrame.m_MainFrame.requestFocusInWindow();
3527		- 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	+ }
3528	3815
3529		- copy.RestoreBigData(hashtable);
	3816	+ //copy.RestoreBigData(versiontable);
3530	3817
3531		- CameraPane.SWITCH = temp;
3532		-
3533	3818	//assert(hashtable.isEmpty());
3534	3819
3535		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3536		- {
3537		- tab.graphs[i] = null;
3538		- }
	3820	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3821	+// {
	3822	+// //tab.user[i] = false;
	3823	+// copy.versionlist[i] = null;
	3824	+// }
3539	3825
3540	3826	SetUndoStates();
3541	3827
..	..	@@ -3544,7 +3830,7 @@
3544	3830	{
3545	3831	try
3546	3832	{
3547		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3833	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3548	3834	ObjectOutputStream p = new ObjectOutputStream(ostream);
3549	3835
3550	3836	p.writeObject(copy);
..	..	@@ -3557,28 +3843,68 @@
3557	3843	e.printStackTrace();
3558	3844	}
3559	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);
3560	3880	}
3561	3881
3562		- void CopyChanged(Object3D obj)
	3882	+ void CopyChanged()
3563	3883	{
	3884	+ Object3D obj = copy.versionlist[copy.versionindex];
	3885	+
3564	3886	SetUndoStates();
3565	3887
3566	3888	boolean temp = CameraPane.SWITCH;
3567	3889	CameraPane.SWITCH = false;
3568	3890
3569		- copy.ExtractBigData(hashtable);
	3891	+ copy.ExtractBigData(versiontable);
3570	3892
3571	3893	copy.clear();
3572	3894
	3895	+ copy.skyboxname = obj.skyboxname;
	3896	+ copy.skyboxext = obj.skyboxext;
	3897	+
3573	3898	for (int i=0; i<obj.Size(); i++)
3574	3899	{
3575	3900	copy.add(obj.get(i));
3576	3901	}
3577	3902
3578		- copy.RestoreBigData(hashtable);
	3903	+ copy.RestoreBigData(versiontable);
3579	3904
3580	3905	CameraPane.SWITCH = temp;
3581	3906
	3907	+ RefreshSelection();
3582	3908	//assert(hashtable.isEmpty());
3583	3909
3584	3910	copy.Touch();
..	..	@@ -3599,56 +3925,139 @@
3599	3925	}
3600	3926	}
3601	3927
3602		- refreshContents();
	3928	+ refreshContents(true);
3603	3929	}
3604	3930
3605		- cButton undoButton;
3606		- cButton redoButton;
	3931	+ cButton previousVersionButton;
	3932	+ cButton restoreButton;
	3933	+ cButton replaceButton;
	3934	+ cButton nextVersionButton;
	3935	+ cButton saveVersionButton;
	3936	+ cButton deleteVersionButton;
3607	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	+
3608	3953	void SetUndoStates()
3609	3954	{
3610	3955	cRadio tab = GetCurrentTab();
3611	3956
3612		- undoButton.setEnabled(tab.undoindex > 0);
3613		- 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;
3614	3970	}
3615	3971
3616		- public void Undo()
	3972	+ public boolean PreviousVersion()
3617	3973	{
	3974	+ // Option?
	3975	+ Replace();
	3976	+
3618	3977	System.err.println("Undo");
3619	3978
3620	3979	cRadio tab = GetCurrentTab();
3621	3980
3622		- if (tab.undoindex == 0)
	3981	+ if (copy.versionindex == 0)
3623	3982	{
3624	3983	java.awt.Toolkit.getDefaultToolkit().beep();
3625		- return;
	3984	+ return false;
3626	3985	}
3627	3986
3628		- if (tab.graphs[tab.undoindex] == null)
3629		- {
3630		- Save();
3631		- tab.undoindex -= 1;
3632		- }
	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	+// }
3633	3999
3634		- tab.undoindex -= 1;
	4000	+ copy.versionindex -= 1;
3635	4001
3636		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4002	+ CopyChanged();
	4003	+
	4004	+ return true;
3637	4005	}
3638	4006
3639		- public void Redo()
	4007	+ public boolean Restore()
3640	4008	{
	4009	+ System.err.println("Restore");
	4010	+
3641	4011	cRadio tab = GetCurrentTab();
3642	4012
3643		- 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)
3644	4050	{
3645	4051	java.awt.Toolkit.getDefaultToolkit().beep();
3646	4052	return;
3647	4053	}
3648	4054
3649		- tab.undoindex += 1;
	4055	+ copy.versionindex += 1;
3650	4056
3651		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4057	+ CopyChanged();
	4058	+
	4059	+ //if (!tab.user[tab.versionindex])
	4060	+ // tab.graphs[tab.versionindex] = null;
3652	4061	}
3653	4062
3654	4063	void ImportGFD()
..	..	@@ -3859,7 +4268,7 @@
3859	4268	//copy.material = new cMaterial(copy.GetMaterial());
3860	4269
3861	4270	current.color = (float) colorField.getFloat();
3862		- current.modulation = (float) modulationField.getFloat();
	4271	+ current.modulation = (float) saturationField.getFloat();
3863	4272	current.metalness = (float) metalnessField.getFloat();
3864	4273	current.diffuse = (float) diffuseField.getFloat();
3865	4274	current.specular = (float) specularField.getFloat();
..	..	@@ -3892,7 +4301,7 @@
3892	4301	cMaterial mat = copy.material;
3893	4302
3894	4303	colorField.SetToolTipValue((mat.color));
3895		- modulationField.SetToolTipValue((mat.modulation));
	4304	+ saturationField.SetToolTipValue((mat.modulation));
3896	4305	metalnessField.SetToolTipValue((mat.metalness));
3897	4306	diffuseField.SetToolTipValue((mat.diffuse));
3898	4307	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3944,9 +4353,26 @@
3944	4353	//copy.Touch();
3945	4354	}
3946	4355
	4356	+ cNumberSlider versionSlider;
	4357	+
3947	4358	public void stateChanged(ChangeEvent e)
3948	4359	{
3949	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	+ }
3950	4376
3951	4377	if (freezematerial)
3952	4378	{
..	..	@@ -3982,6 +4408,12 @@
3982	4408	{
3983	4409	//System.out.println("stateChanged = " + this);
3984	4410	materialtouched = true;
	4411	+
	4412	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4413	+ {
	4414	+ saturationField.setFloat(1);
	4415	+ }
	4416	+
3985	4417	applySelf();
3986	4418	//System.out.println("this = " + this);
3987	4419	//System.out.println("PARENT = " + parent);
..	..	@@ -4281,6 +4713,7 @@
4281	4713	{
4282	4714	if (GetTree() != null)
4283	4715	{
	4716	+ GetTree().revalidate();
4284	4717	GetTree().repaint();
4285	4718	}
4286	4719
..	..	@@ -4289,13 +4722,16 @@
4289	4722	ctrlPanel.validate(); // ? new
4290	4723	ctrlPanel.repaint();
4291	4724	}
	4725	+
	4726	+ if (previousVersionButton != null && copy.versionlist != null)
	4727	+ SetUndoStates();
4292	4728	}
4293	4729
4294	4730	static TweenManager tweenManager = new TweenManager();
4295	4731
4296	4732	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4297	4733	{
4298		- if (Globals.SAVEONMAKE) // && resetmodel)
	4734	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4299	4735	Save();
4300	4736	//Tween.set(thing, 0).target(1).start(tweenManager);
4301	4737	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4537,7 +4973,9 @@
4537	4973	readobj.ResetDisplayList();
4538	4974	} catch (Exception e)
4539	4975	{
4540		- //e.printStackTrace();
	4976	+ if (!e.toString().contains("GZIP"))
	4977	+ e.printStackTrace();
	4978	+
4541	4979	try
4542	4980	{
4543	4981	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4611,12 +5049,14 @@
4611	5049
4612	5050	if (readobj != null)
4613	5051	{
4614		- if (Globals.SAVEONMAKE)
4615		- Save();
	5052	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5053	+ // Save();
4616	5054	try
4617	5055	{
4618	5056	//readobj.deepCopySelf(copy);
4619	5057	copy.clear(); // june 2014
	5058	+ copy.skyboxname = readobj.skyboxname;
	5059	+ copy.skyboxext = readobj.skyboxext;
4620	5060	for (int i = 0; i < readobj.size(); i++)
4621	5061	{
4622	5062	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4657,6 +5097,7 @@
4657	5097	}
4658	5098	} catch (ClassCastException e)
4659	5099	{
	5100	+ e.printStackTrace();
4660	5101	assert (false);
4661	5102	Composite c = (Composite) copy;
4662	5103	c.children.clear();
..	..	@@ -4667,17 +5108,28 @@
4667	5108	c.addChild(csg);
4668	5109	}
4669	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	+
4670	5122	ResetModel();
4671	5123	copy.HardTouch(); // recompile?
4672	5124	refreshContents();
4673	5125	}
4674	5126	}
4675	5127
4676		- void load() // throws ClassNotFoundException
	5128	+ void Open() // throws ClassNotFoundException
4677	5129	{
4678	5130	if (Grafreed.standAlone)
4679	5131	{
4680		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5132	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4681	5133	browser.show();
4682	5134	String filename = browser.getFile();
4683	5135	if (filename != null && filename.length() > 0)
..	..	@@ -4776,6 +5228,7 @@
4776	5228	//ps.print(buffer.toString());
4777	5229	} catch (IOException e)
4778	5230	{
	5231	+ e.printStackTrace();
4779	5232	}
4780	5233	}
4781	5234
..	..	@@ -4958,7 +5411,7 @@
4958	5411	MenuBar menuBar;
4959	5412	Menu fileMenu;
4960	5413	MenuItem newItem;
4961		- MenuItem loadItem;
	5414	+ MenuItem openItem;
4962	5415	MenuItem saveItem;
4963	5416	MenuItem saveAsItem;
4964	5417	MenuItem exportAsItem;
..	..	@@ -4981,6 +5434,7 @@
4981	5434	CheckboxMenuItem toggleSwitchItem;
4982	5435	CheckboxMenuItem toggleRootItem;
4983	5436	CheckboxMenuItem animationItem;
	5437	+ MenuItem archiveItem;
4984	5438	CheckboxMenuItem toggleHandleItem;
4985	5439	CheckboxMenuItem togglePaintItem;
4986	5440	JSplitPane mainPanel;
..	..	@@ -5067,7 +5521,7 @@
5067	5521	JLabel colorLabel;
5068	5522	cNumberSlider colorField;
5069	5523	JLabel modulationLabel;
5070		- cNumberSlider modulationField;
	5524	+ cNumberSlider saturationField;
5071	5525	JLabel metalnessLabel;
5072	5526	cNumberSlider metalnessField;
5073	5527	JLabel diffuseLabel;