~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -34,6 +34,7 @@
34	34	iSendInfo
35	35	//KeyListener
36	36	{
	37	+ public cToggleButton pinButton;
37	38	boolean timeline;
38	39	boolean wasFullScreen;
39	40
..	..	@@ -41,64 +42,78 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
44	53
45	54	cButton GetButton(String name, boolean border)
46	55	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
50		- return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
54		- return new cButton(name, border);
55		- }
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
56	64	}
57	65
58	66	cToggleButton GetToggleButton(String name, boolean border)
59	67	{
60		- try
61		- {
62		- ImageIcon icon = GetIcon(name);
63		- return new cToggleButton(icon, border);
64		- }
65		- catch (Exception e)
66		- {
67		- return new cToggleButton(name, border);
68		- }
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
69	70	}
70	71
71	72	cCheckBox GetCheckBox(String name, boolean border)
72	73	{
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
73	80	try
74	81	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
77	98	}
78	99	catch (Exception e)
79	100	{
80		- return new cCheckBox(name, border);
	101	+ return null;
81	102	}
82	103	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	104	+
	105	+ BufferedImage GetImage(String name)
85	106	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	107	+ try
89	108	{
90		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91		- Graphics2D g = resized.createGraphics();
92		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95		- g.dispose();
96		-
97		- image = resized;
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
98	112	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
102	117	}
103	118
104	119	// SCRIPT
..	..	@@ -282,6 +297,14 @@
282	297	client = inClient;
283	298	copy = client;
284	299
	300	+// if (copy.versionlist == null)
	301	+// {
	302	+// copy.versionlist = new Object3D[100];
	303	+// copy.versionindex = -1;
	304	+//
	305	+// callee.Save(true);
	306	+// }
	307	+
285	308	// "this" is not called: SetupUI2(objEditor);
286	309	}
287	310
..	..	@@ -295,6 +318,14 @@
295	318	client = inClient;
296	319	copy = client;
297	320
	321	+ if (copy.versionlist == null)
	322	+ {
	323	+ copy.versionlist = new Object3D[100];
	324	+ copy.versionindex = -1;
	325	+
	326	+// Save(true);
	327	+ }
	328	+
298	329	SetupUI2(callee.GetEditor());
299	330	}
300	331
..	..	@@ -327,6 +358,14 @@
327	358	copy = localCopy;
328	359	copy.editWindow = this;
329	360
	361	+// if (copy.versionlist == null)
	362	+// {
	363	+// copy.versionlist = new Object3D[100];
	364	+// copy.versionindex = -1;
	365	+//
	366	+// Save(true);
	367	+// }
	368	+
330	369	SetupMenu();
331	370
332	371	//SetupName(objEditor); // new
..	..	@@ -350,7 +389,7 @@
350	389	frame.setMenuBar(menuBar = new MenuBar());
351	390	menuBar.add(fileMenu = new Menu("File"));
352	391	fileMenu.add(newItem = new MenuItem("New"));
353		- fileMenu.add(loadItem = new MenuItem("Open..."));
	392	+ fileMenu.add(openItem = new MenuItem("Open..."));
354	393
355	394	//oe.menuBar.add(menu = new Menu("Include"));
356	395	Menu menu = new Menu("Import");
..	..	@@ -382,7 +421,7 @@
382	421	}
383	422
384	423	newItem.addActionListener(this);
385		- loadItem.addActionListener(this);
	424	+ openItem.addActionListener(this);
386	425	saveItem.addActionListener(this);
387	426	saveAsItem.addActionListener(this);
388	427	exportAsItem.addActionListener(this);
..	..	@@ -412,18 +451,19 @@
412	451	// EditSelection(false);
413	452	// }
414	453
415		- refreshContents(false); // To refresh Info tab
	454	+// refreshContents(false); // To refresh Info tab
416	455	}
417	456	};
418	457	objectPanel.addChangeListener(changeListener);
419	458
420	459	toolbarPanel = new JPanel();
421	460	toolbarPanel.setName("Toolbar");
	461	+
422	462	treePanel = new cGridBag();
423	463	treePanel.setName("Tree");
424	464
425	465	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	466	+ //editPanel.setName("Edit");
427	467
428	468	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	469
..	..	@@ -431,11 +471,13 @@
431	471	editPanel.add(editCommandsPanel);
432	472	editPanel.add(ctrlPanel);
433	473
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	474	+ toolboxPanel = new cGridBag().setVertical(true);
	475	+ //toolboxPanel.setName("Toolbox");
436	476
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	477	+ skyboxPanel = new cGridBag().setVertical(true);
	478	+
	479	+ materialPanel = new cGridBag().setVertical(false);
	480	+ //materialPanel.setName("Material");
439	481
440	482	/JTextPane/
441	483	infoarea = createTextPane();
..	..	@@ -443,14 +485,15 @@
443	485
444	486	infoarea.setEditable(true);
445	487	SetText();
	488	+
446	489	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	490	// infoarea.setOpaque(false);
448	491	// //infoarea.setForeground(textcolor);
449	492	// TEXTAREA infoarea.setLineWrap(true);
450	493	// TEXTAREA infoarea.setWrapStyleWord(true);
451	494	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");
	495	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	496	+ //infoPanel.setName("Info");
454	497	//infoPanel.setLayout(new BorderLayout());
455	498	//infoPanel.add(createTextPane());
456	499
..	..	@@ -717,6 +760,7 @@
717	760	boolean maximized;
718	761
719	762	cButton fullscreenLayout;
	763	+ cButton expandedLayout;
720	764
721	765	void Minimize()
722	766	{
..	..	@@ -756,10 +800,12 @@
756	800	cButton minButton;
757	801	cButton maxButton;
758	802	cButton fullButton;
	803	+ cButton collapseButton;
	804	+ cButton maximize3DButton;
759	805
760	806	void ToggleFullScreen()
761	807	{
762		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	808	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763	809
764	810	cameraView.ToggleFullScreen();
765	811
..	..	@@ -780,13 +826,13 @@
780	826	// X frame.getContentPane().remove(/"Center",/bigThree);
781	827	// X framePanel.add(bigThree);
782	828	// X frame.getContentPane().add(/"Center",/framePanel);
783		- framePanel.setDividerLocation(1);
	829	+// framePanel.setDividerLocation(46); // icons are 24x24
784	830
785	831	//frame.setVisible(true);
786		- radio.layout = keepButton;
	832	+// radio.layout = keepButton;
787	833	//theFrame = null;
788	834	keepButton = null;
789		- radio.layout.doClick();
	835	+// radio.layout.doClick();
790	836
791	837	} else
792	838	{
..	..	@@ -807,14 +853,47 @@
807	853	// X frame.getContentPane().remove(/"Center",/framePanel);
808	854	// X framePanel.remove(bigThree);
809	855	// X frame.getContentPane().add(/"Center",/bigThree);
810		- framePanel.setDividerLocation(0);
	856	+// framePanel.setDividerLocation(0);
811	857
812		- radio.layout = fullscreenLayout;
813		- radio.layout.doClick();
	858	+// radio.layout = fullscreenLayout;
	859	+// radio.layout.doClick();
814	860	//frame.setVisible(true);
815	861	}
816	862	frame.validate();
	863	+
	864	+ cameraView.requestFocusInWindow();
817	865	}
	866	+
	867	+ void CollapseToolbar()
	868	+ {
	869	+ framePanel.setDividerLocation(0);
	870	+ //frame.validate();
	871	+
	872	+ cameraView.requestFocusInWindow();
	873	+ }
	874	+
	875	+ private Object3D Duplicate(Object3D object)
	876	+ {
	877	+ boolean temp = CameraPane.SWITCH;
	878	+ CameraPane.SWITCH = false;
	879	+
	880	+ object.ExtractBigData(versiontable);
	881	+ // if (copy == client)
	882	+
	883	+ Object3D versions[] = object.versionlist;
	884	+ object.versionlist = null;
	885	+
	886	+ //byte[] compress = Compress(copy);
	887	+ Object3D compress = (Object3D)Grafreed.clone(object);
	888	+
	889	+ object.versionlist = versions;
	890	+
	891	+ object.RestoreBigData(versiontable);
	892	+
	893	+ CameraPane.SWITCH = temp;
	894	+
	895	+ return compress;
	896	+ }
818	897
819	898	private JTextPane createTextPane()
820	899	{
..	..	@@ -937,6 +1016,7 @@
937	1016	{
938	1017	SetupMaterial(materialPanel);
939	1018	}
	1019	+
940	1020	//SetupName();
941	1021	//SetupViews();
942	1022	}
..	..	@@ -946,7 +1026,7 @@
946	1026	// NumberSlider vDivsField;
947	1027	// JCheckBox endcaps;
948	1028	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1029	+ JCheckBox selectableCB;
950	1030	JCheckBox hideCB;
951	1031	JCheckBox link2masterCB;
952	1032	JCheckBox markCB;
..	..	@@ -1145,6 +1225,18 @@
1145	1225
1146	1226	namePanel = new cGridBag();
1147	1227
	1228	+ //if (copy.pinned)
	1229	+ {
	1230	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1231	+ pinButton.setSelected(copy.pinned);
	1232	+ cGridBag t = new cGridBag();
	1233	+ t.preferredWidth = 2;
	1234	+ t.add(pinButton);
	1235	+ namePanel.add(t);
	1236	+
	1237	+ pinButton.addItemListener(this);
	1238	+ }
	1239	+
1148	1240	nameField = AddText(namePanel, copy.GetName());
1149	1241	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1150	1242	oe.ctrlPanel.add(namePanel);
..	..	@@ -1158,13 +1250,16 @@
1158	1250
1159	1251	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1252	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1253	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1254	+ selectableCB.setToolTipText("Make object selectable");
1163	1255	// Return();
	1256	+
1164	1257	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1258	hideCB.setToolTipText("Hide object");
1166	1259	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167	1260	markCB.setToolTipText("As animation target transform");
	1261	+
	1262	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1263
1169	1264	setupPanel2 = new cGridBag().setVertical(false);
1170	1265
..	..	@@ -1174,10 +1269,11 @@
1174	1269	randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1175	1270	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1176	1271
	1272	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1273	+ link2masterCB.setToolTipText("Attach to support");
	1274	+
1177	1275	if (Globals.ADVANCED)
1178	1276	{
1179		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180		- link2masterCB.setToolTipText("Attach to support");
1181	1277	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1182	1278	speedupCB.setToolTipText("Option motion capture");
1183	1279	}
..	..	@@ -1451,6 +1547,7 @@
1451	1547	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1452	1548	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1453	1549	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1550	+ //XYZPanel.setName("XYZ");
1454	1551
1455	1552	/*
1456	1553	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1488,14 +1585,29 @@
1488	1585	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1489	1586	//tmp.setName("Edit");
1490	1587	objectPanel.add(materialPanel);
	1588	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1589	+ objectPanel.setToolTipTextAt(0, "Material");
	1590	+
	1591	+ objectPanel.add(toolboxPanel);
	1592	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1593	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1594	+
	1595	+ objectPanel.add(skyboxPanel);
	1596	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1597	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1598	+
1491	1599	// JPanel north = new JPanel(new BorderLayout());
1492	1600	// north.setName("Edit");
1493	1601	// north.add(ctrlPanel, BorderLayout.NORTH);
1494	1602	// objectPanel.add(north);
1495	1603	objectPanel.add(editPanel);
1496		- objectPanel.add(infoPanel);
1497		- objectPanel.add(toolboxPanel);
1498		-
	1604	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1605	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1606	+
	1607	+ objectPanel.add(XYZPanel);
	1608	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1609	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1610	+
1499	1611	/*
1500	1612	aConstraints.gridx = 0;
1501	1613	aConstraints.gridwidth = 1;
..	..	@@ -1515,7 +1627,7 @@
1515	1627	scrollpane.addMouseWheelListener(this); // Default not fast enough
1516	1628
1517	1629	/JTabbedPane/ scenePanel = new cGridBag();
1518		- scenePanel.preferredWidth = 6;
	1630	+ scenePanel.preferredWidth = 5;
1519	1631
1520	1632	JTabbedPane tabbedPane = new JTabbedPane();
1521	1633	tabbedPane.add(scrollpane);
..	..	@@ -1532,6 +1644,11 @@
1532	1644
1533	1645	scenePanel.add(tabbedPane);
1534	1646
	1647	+ //if (Globals.ADVANCED)
	1648	+ tabbedPane.add(infoPanel);
	1649	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1650	+ tabbedPane.setToolTipTextAt(3, "Information");
	1651	+
1535	1652	/*
1536	1653	cTree jTree = new cTree(null);
1537	1654	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1593,7 +1710,7 @@
1593	1710	bigThree = new cGridBag();
1594	1711	bigThree.addComponent(scenePanel);
1595	1712	bigThree.addComponent(centralPanel);
1596		- bigThree.addComponent(XYZPanel);
	1713	+ //bigThree.addComponent(XYZPanel);
1597	1714
1598	1715	// // SIDE EFFECT!!!
1599	1716	// aConstraints.gridx = 0;
..	..	@@ -1602,9 +1719,26 @@
1602	1719	// aConstraints.gridheight = 1;
1603	1720
1604	1721	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1605		- framePanel.setContinuousLayout(true);
1606		- framePanel.setOneTouchExpandable(true);
1607		- framePanel.setDividerLocation(0.8);
	1722	+
	1723	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1724	+ new java.beans.PropertyChangeListener()
	1725	+ {
	1726	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1727	+ {
	1728	+ if ((Integer)pce.getOldValue() == 1)
	1729	+ {
	1730	+ if (radio.layout != expandedLayout)
	1731	+ {
	1732	+ radio.layout = expandedLayout;
	1733	+ radio.layout.doClick();
	1734	+ }
	1735	+ }
	1736	+ }
	1737	+ });
	1738	+
	1739	+ framePanel.setContinuousLayout(false);
	1740	+ framePanel.setOneTouchExpandable(false);
	1741	+ //.setDividerLocation(0.8);
1608	1742	//framePanel.setDividerSize(15);
1609	1743	//framePanel.setResizeWeight(0.15);
1610	1744	framePanel.setName("Frame");
..	..	@@ -1634,7 +1768,6 @@
1634	1768	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1635	1769	frame.addWindowListener(new WindowAdapter()
1636	1770	{
1637		-
1638	1771	public void windowClosing(WindowEvent e)
1639	1772	{
1640	1773	Close();
..	..	@@ -1657,12 +1790,403 @@
1657	1790	ctrlPanel.removeAll();
1658	1791	}
1659	1792
1660		- void SetupMaterial(cGridBag panel)
	1793	+ void SetupMaterial(cGridBag materialpanel)
1661	1794	{
1662		- /*
	1795	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1796	+
	1797	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1798	+ skin.setToolTipText("Skin");
	1799	+ skin.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1804	+ cMaterial material = object.material;
	1805	+
	1806	+ // Skin
	1807	+ colorField.setFloat(material.color);
	1808	+ saturationField.setFloat(material.modulation);
	1809	+ subsurfaceField.setFloat(material.subsurface);
	1810	+ selfshadowField.setFloat(material.diffuseness);
	1811	+ diffusenessField.setFloat(material.factor);
	1812	+ shininessField.setFloat(material.shininess);
	1813	+ shadowbiasField.setFloat(material.shadowbias);
	1814	+ diffuseField.setFloat(material.diffuse);
	1815	+ specularField.setFloat(material.specular);
	1816	+
	1817	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1818	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1819	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1820	+
	1821	+ materialtouched = true;
	1822	+ applySelf();
	1823	+ }
	1824	+ });
	1825	+ presetpanel.add(skin);
	1826	+
	1827	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1828	+ lambert.setToolTipText("Diffuse");
	1829	+ lambert.addMouseListener(new MouseAdapter()
	1830	+ {
	1831	+ public void mouseClicked(MouseEvent e)
	1832	+ {
	1833	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1834	+ cMaterial material = object.material;
	1835	+
	1836	+ diffusenessField.setFloat(material.factor);
	1837	+ selfshadowField.setFloat(material.diffuseness);
	1838	+
	1839	+ materialtouched = true;
	1840	+ applySelf();
	1841	+ }
	1842	+ });
	1843	+ presetpanel.add(lambert);
	1844	+
	1845	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1846	+ diffuse2.setToolTipText("Diffuse2");
	1847	+ diffuse2.addMouseListener(new MouseAdapter()
	1848	+ {
	1849	+ public void mouseClicked(MouseEvent e)
	1850	+ {
	1851	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1852	+ cMaterial material = object.material;
	1853	+
	1854	+ diffusenessField.setFloat(material.factor);
	1855	+ selfshadowField.setFloat(material.diffuseness);
	1856	+
	1857	+ materialtouched = true;
	1858	+ applySelf();
	1859	+ }
	1860	+ });
	1861	+ presetpanel.add(diffuse2);
	1862	+
	1863	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1864	+ diffusemoon.setToolTipText("Moon");
	1865	+ diffusemoon.addMouseListener(new MouseAdapter()
	1866	+ {
	1867	+ public void mouseClicked(MouseEvent e)
	1868	+ {
	1869	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1870	+ cMaterial material = object.material;
	1871	+
	1872	+ diffusenessField.setFloat(material.factor);
	1873	+ selfshadowField.setFloat(material.diffuseness);
	1874	+
	1875	+ materialtouched = true;
	1876	+ applySelf();
	1877	+ }
	1878	+ });
	1879	+ presetpanel.add(diffusemoon);
	1880	+
	1881	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1882	+ diffusemoon2.setToolTipText("Moon2");
	1883	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1884	+ {
	1885	+ public void mouseClicked(MouseEvent e)
	1886	+ {
	1887	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1888	+ cMaterial material = object.material;
	1889	+
	1890	+ diffusenessField.setFloat(material.factor);
	1891	+ selfshadowField.setFloat(material.diffuseness);
	1892	+
	1893	+ materialtouched = true;
	1894	+ applySelf();
	1895	+ }
	1896	+ });
	1897	+ presetpanel.add(diffusemoon2);
	1898	+
	1899	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1900	+ diffusemoon3.setToolTipText("Moon3");
	1901	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1902	+ {
	1903	+ public void mouseClicked(MouseEvent e)
	1904	+ {
	1905	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1906	+ cMaterial material = object.material;
	1907	+
	1908	+ diffusenessField.setFloat(material.factor);
	1909	+ selfshadowField.setFloat(material.diffuseness);
	1910	+
	1911	+ materialtouched = true;
	1912	+ applySelf();
	1913	+ }
	1914	+ });
	1915	+ presetpanel.add(diffusemoon3);
	1916	+
	1917	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1918	+ diffusesheen.setToolTipText("Sheen");
	1919	+ diffusesheen.addMouseListener(new MouseAdapter()
	1920	+ {
	1921	+ public void mouseClicked(MouseEvent e)
	1922	+ {
	1923	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1924	+ cMaterial material = object.material;
	1925	+
	1926	+ sheenField.setFloat(material.sheen);
	1927	+
	1928	+ materialtouched = true;
	1929	+ applySelf();
	1930	+ }
	1931	+ });
	1932	+ presetpanel.add(diffusesheen);
	1933	+
	1934	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1935	+ rough.setToolTipText("Rough metal");
	1936	+ rough.addMouseListener(new MouseAdapter()
	1937	+ {
	1938	+ public void mouseClicked(MouseEvent e)
	1939	+ {
	1940	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1941	+ cMaterial material = object.material;
	1942	+
	1943	+ shininessField.setFloat(material.shininess);
	1944	+ velvetField.setFloat(material.velvet);
	1945	+
	1946	+ materialtouched = true;
	1947	+ applySelf();
	1948	+ }
	1949	+ });
	1950	+ presetpanel.add(rough);
	1951	+
	1952	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1953	+ rough2.setToolTipText("Medium metal");
	1954	+ rough2.addMouseListener(new MouseAdapter()
	1955	+ {
	1956	+ public void mouseClicked(MouseEvent e)
	1957	+ {
	1958	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1959	+ cMaterial material = object.material;
	1960	+
	1961	+ shininessField.setFloat(material.shininess);
	1962	+ lightareaField.setFloat(material.lightarea);
	1963	+
	1964	+ materialtouched = true;
	1965	+ applySelf();
	1966	+ }
	1967	+ });
	1968	+ presetpanel.add(rough2);
	1969	+
	1970	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1971	+ shini0.setToolTipText("Shiny");
	1972	+ shini0.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ shininessField.setFloat(material.shininess);
	1980	+ lightareaField.setFloat(material.lightarea);
	1981	+
	1982	+ materialtouched = true;
	1983	+ applySelf();
	1984	+ }
	1985	+ });
	1986	+ presetpanel.add(shini0);
	1987	+
	1988	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1989	+ shini1.setToolTipText("Shiny2");
	1990	+ shini1.addMouseListener(new MouseAdapter()
	1991	+ {
	1992	+ public void mouseClicked(MouseEvent e)
	1993	+ {
	1994	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1995	+ cMaterial material = object.material;
	1996	+
	1997	+ shininessField.setFloat(material.shininess);
	1998	+ lightareaField.setFloat(material.lightarea);
	1999	+
	2000	+ materialtouched = true;
	2001	+ applySelf();
	2002	+ }
	2003	+ });
	2004	+ presetpanel.add(shini1);
	2005	+
	2006	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2007	+ shini2.setToolTipText("Shiny3");
	2008	+ shini2.addMouseListener(new MouseAdapter()
	2009	+ {
	2010	+ public void mouseClicked(MouseEvent e)
	2011	+ {
	2012	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2013	+ cMaterial material = object.material;
	2014	+
	2015	+ shininessField.setFloat(material.shininess);
	2016	+ lightareaField.setFloat(material.lightarea);
	2017	+
	2018	+ materialtouched = true;
	2019	+ applySelf();
	2020	+ }
	2021	+ });
	2022	+ presetpanel.add(shini2);
	2023	+
	2024	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2025	+ aniso.setToolTipText("AnisoU");
	2026	+ aniso.addMouseListener(new MouseAdapter()
	2027	+ {
	2028	+ public void mouseClicked(MouseEvent e)
	2029	+ {
	2030	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2031	+ cMaterial material = object.material;
	2032	+
	2033	+ anisoField.setFloat(material.aniso);
	2034	+ anisoVField.setFloat(material.anisoV);
	2035	+
	2036	+ materialtouched = true;
	2037	+ applySelf();
	2038	+ }
	2039	+ });
	2040	+ presetpanel.add(aniso);
	2041	+
	2042	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2043	+ aniso2.setToolTipText("AnisoV");
	2044	+ aniso2.addMouseListener(new MouseAdapter()
	2045	+ {
	2046	+ public void mouseClicked(MouseEvent e)
	2047	+ {
	2048	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2049	+ cMaterial material = object.material;
	2050	+
	2051	+ anisoField.setFloat(material.aniso);
	2052	+ anisoVField.setFloat(material.anisoV);
	2053	+
	2054	+ materialtouched = true;
	2055	+ applySelf();
	2056	+ }
	2057	+ });
	2058	+ presetpanel.add(aniso2);
	2059	+
	2060	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2061	+ aniso3.setToolTipText("AnisoUV");
	2062	+ aniso3.addMouseListener(new MouseAdapter()
	2063	+ {
	2064	+ public void mouseClicked(MouseEvent e)
	2065	+ {
	2066	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2067	+ cMaterial material = object.material;
	2068	+
	2069	+ anisoField.setFloat(material.aniso);
	2070	+ anisoVField.setFloat(material.anisoV);
	2071	+
	2072	+ materialtouched = true;
	2073	+ applySelf();
	2074	+ }
	2075	+ });
	2076	+ presetpanel.add(aniso3);
	2077	+
	2078	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2079	+ velvet0.setToolTipText("Velvet");
	2080	+ velvet0.addMouseListener(new MouseAdapter()
	2081	+ {
	2082	+ public void mouseClicked(MouseEvent e)
	2083	+ {
	2084	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2085	+ cMaterial material = object.material;
	2086	+
	2087	+ diffusenessField.setFloat(material.factor);
	2088	+ selfshadowField.setFloat(material.diffuseness);
	2089	+ sheenField.setFloat(material.sheen);
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ velvetField.setFloat(material.velvet);
	2092	+ shiftField.setFloat(material.shift);
	2093	+
	2094	+ materialtouched = true;
	2095	+ applySelf();
	2096	+ }
	2097	+ });
	2098	+ presetpanel.add(velvet0);
	2099	+
	2100	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2101	+ bump0.setToolTipText("Bump texture");
	2102	+ bump0.addMouseListener(new MouseAdapter()
	2103	+ {
	2104	+ public void mouseClicked(MouseEvent e)
	2105	+ {
	2106	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2107	+ cMaterial material = object.material;
	2108	+
	2109	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2110	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2111	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2112	+
	2113	+ materialtouched = true;
	2114	+ applySelf();
	2115	+ }
	2116	+ });
	2117	+ presetpanel.add(bump0);
	2118	+
	2119	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2120	+ halo.setToolTipText("Halo");
	2121	+ halo.addMouseListener(new MouseAdapter()
	2122	+ {
	2123	+ public void mouseClicked(MouseEvent e)
	2124	+ {
	2125	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2126	+ cMaterial material = object.material;
	2127	+
	2128	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2129	+
	2130	+ materialtouched = true;
	2131	+ applySelf();
	2132	+ }
	2133	+ });
	2134	+ presetpanel.add(halo);
	2135	+
	2136	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2137	+ candle.setToolTipText("Candle");
	2138	+ candle.addMouseListener(new MouseAdapter()
	2139	+ {
	2140	+ public void mouseClicked(MouseEvent e)
	2141	+ {
	2142	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2143	+ cMaterial material = object.material;
	2144	+
	2145	+ subsurfaceField.setFloat(material.subsurface);
	2146	+ shadowbiasField.setFloat(material.shadowbias);
	2147	+ ambientField.setFloat(material.ambient);
	2148	+ specularField.setFloat(material.specular);
	2149	+ lightareaField.setFloat(material.lightarea);
	2150	+ shininessField.setFloat(material.shininess);
	2151	+
	2152	+ materialtouched = true;
	2153	+ applySelf();
	2154	+ }
	2155	+ });
	2156	+ presetpanel.add(candle);
	2157	+
	2158	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2159	+ shadowShader.setToolTipText("Shadow");
	2160	+ shadowShader.addMouseListener(new MouseAdapter()
	2161	+ {
	2162	+ public void mouseClicked(MouseEvent e)
	2163	+ {
	2164	+ diffuseField.setFloat(0.001);
	2165	+ ambientField.setFloat(0.001);
	2166	+ cameraField.setFloat(0.001);
	2167	+ specularField.setFloat(0.001);
	2168	+ fakedepthField.setFloat(0.001);
	2169	+ opacityField.setFloat(0.6);
	2170	+
	2171	+ materialtouched = true;
	2172	+ applySelf();
	2173	+ }
	2174	+ });
	2175	+ presetpanel.add(shadowShader);
	2176	+
	2177	+ cGridBag panel = new cGridBag().setVertical(true);
	2178	+
	2179	+ presetpanel.preferredWidth = 1;
	2180	+
	2181	+ materialpanel.add(presetpanel);
	2182	+ materialpanel.add(panel);
	2183	+
	2184	+ panel.preferredWidth = 8;
	2185	+
	2186	+ /*
1663	2187	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1664	2188	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- */
	2189	+ */
1666	2190
1667	2191	cGridBag editBar = new cGridBag().setVertical(false);
1668	2192
..	..	@@ -1696,27 +2220,50 @@
1696	2220	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1697	2221
1698	2222	cGridBag colorSection = new cGridBag().setVertical(true);
	2223	+
	2224	+ cGridBag huepanel = new cGridBag();
	2225	+ cGridBag huelabel = new cGridBag();
	2226	+ skin = GetLabel("icons/hue.png", false);
	2227	+ skin.fit = true;
	2228	+ huelabel.add(skin);
	2229	+ huelabel.preferredWidth = 20;
	2230	+ huepanel.add(new cGridBag()); // Label
	2231	+ huepanel.add(huelabel); // Field/slider
	2232	+
	2233	+ huepanel.preferredHeight = 7;
	2234	+
	2235	+ colorSection.add(huepanel);
1699	2236
1700	2237	cGridBag color = new cGridBag();
1701		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1702		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2238	+
	2239	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2240	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2241	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2242	+
1704	2243	//colorField.preferredWidth = 200;
1705	2244	colorSection.add(color);
1706	2245
1707	2246	cGridBag modulation = new cGridBag();
1708	2247	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1709	2248	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1710		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2249	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1711	2250	colorSection.add(modulation);
1712	2251
	2252	+ cGridBag opacity = new cGridBag();
	2253	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2254	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2255	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2256	+ colorSection.add(opacity);
	2257	+
	2258	+ colorSection.add(GetSeparator());
	2259	+
1713	2260	cGridBag texture = new cGridBag();
1714	2261	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1715	2262	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716	2263	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1717	2264	colorSection.add(texture);
1718	2265
1719		- panel.add(new JSeparator());
	2266	+ panel.add(GetSeparator());
1720	2267
1721	2268	panel.add(colorSection);
1722	2269
..	..	@@ -1772,7 +2319,7 @@
1772	2319	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1773	2320	diffuseSection.add(shadowbias);
1774	2321
1775		- panel.add(new JSeparator());
	2322	+ panel.add(GetSeparator());
1776	2323
1777	2324	panel.add(diffuseSection);
1778	2325
..	..	@@ -1835,7 +2382,7 @@
1835	2382	specularSection.add(anisoV);
1836	2383
1837	2384
1838		- panel.add(new JSeparator());
	2385	+ panel.add(GetSeparator());
1839	2386
1840	2387	panel.add(specularSection);
1841	2388
..	..	@@ -1860,12 +2407,6 @@
1860	2407	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1861	2408	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1862	2409	colorSection.add(backlit);
1863		-
1864		- cGridBag opacity = new cGridBag();
1865		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1866		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1867		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1868		- colorSection.add(opacity);
1869	2410
1870	2411	//panel.add(new JSeparator());
1871	2412
..	..	@@ -1911,7 +2452,7 @@
1911	2452	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1912	2453	textureSection.add(opacityPower);
1913	2454
1914		- panel.add(new JSeparator());
	2455	+ panel.add(GetSeparator());
1915	2456
1916	2457	panel.add(textureSection);
1917	2458
..	..	@@ -1976,8 +2517,9 @@
1976	2517	// 3D models
1977	2518	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1978	2519	{
1979		- lastConverter = new com.jmex.model.converters.MaxToJme();
1980		- LoadFile(filename, lastConverter);
	2520	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2521	+ //LoadFile(filename, lastConverter);
	2522	+ LoadObjFile(filename); // New 3ds loader
1981	2523	continue;
1982	2524	}
1983	2525	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2703,6 +3245,7 @@
2703	3245	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2704	3246	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2705	3247	}
	3248	+
2706	3249	//cJME.count++;
2707	3250	//cJME.count %= 12;
2708	3251	if (gc)
..	..	@@ -2886,6 +3429,7 @@
2886	3429	}
2887	3430	}
2888	3431	}
	3432	+
2889	3433	cFileSystemPane FSPane;
2890	3434
2891	3435	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2895,7 +3439,7 @@
2895	3439
2896	3440	freezematerial = true;
2897	3441	colorField.setFloat(mat.color);
2898		- modulationField.setFloat(mat.modulation);
	3442	+ saturationField.setFloat(mat.modulation);
2899	3443	metalnessField.setFloat(mat.metalness);
2900	3444	diffuseField.setFloat(mat.diffuse);
2901	3445	specularField.setFloat(mat.specular);
..	..	@@ -2939,6 +3483,7 @@
2939	3483	}
2940	3484	}
2941	3485	}
	3486	+
2942	3487	freezematerial = false;
2943	3488	}
2944	3489
..	..	@@ -3101,6 +3646,17 @@
3101	3646	public void itemStateChanged(ItemEvent event)
3102	3647	{
3103	3648	// System.out.println("Propagate = " + propagate);
	3649	+ if (event.getSource() == pinButton)
	3650	+ {
	3651	+ copy.pinned ^= true;
	3652	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3653	+ {
	3654	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3655	+ copy.CloseUI();
	3656	+ //copy.editWindow.refreshContents();
	3657	+ }
	3658	+ }
	3659	+ else
3104	3660	if (event.getSource() == propagateToggle)
3105	3661	{
3106	3662	propagate ^= true;
..	..	@@ -3205,8 +3761,9 @@
3205	3761	} else if (event.getSource() == liveCB)
3206	3762	{
3207	3763	copy.live ^= true;
	3764	+ objEditor.refreshContents(true); // To show item colors
3208	3765	return;
3209		- } else if (event.getSource() == selectCB)
	3766	+ } else if (event.getSource() == selectableCB)
3210	3767	{
3211	3768	copy.dontselect ^= true;
3212	3769	return;
..	..	@@ -3214,7 +3771,7 @@
3214	3771	{
3215	3772	copy.hide ^= true;
3216	3773	copy.Touch(); // display list issue
3217		- objEditor.refreshContents();
	3774	+ objEditor.refreshContents(true); // To show item colors
3218	3775	return;
3219	3776	} else if (event.getSource() == link2masterCB)
3220	3777	{
..	..	@@ -3391,9 +3948,9 @@
3391	3948	{
3392	3949	Close();
3393	3950	//return true;
3394		- } else if (source == loadItem)
	3951	+ } else if (source == openItem)
3395	3952	{
3396		- load();
	3953	+ Open();
3397	3954	//return true;
3398	3955	} else if (source == newItem)
3399	3956	{
..	..	@@ -3418,6 +3975,10 @@
3418	3975	{
3419	3976	generatePOV();
3420	3977	//return true;
	3978	+ } else if (event.getSource() == archiveItem)
	3979	+ {
	3980	+ cTools.Archive(frame);
	3981	+ return;
3421	3982	} else if (source == zBufferItem)
3422	3983	{
3423	3984	try
..	..	@@ -3466,11 +4027,12 @@
3466	4027
3467	4028	static public byte[] Compress(Object3D o)
3468	4029	{
	4030	+ // Slower to actually compress.
3469	4031	try
3470	4032	{
3471	4033	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3472		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3473		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4034	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4035	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3474	4036
3475	4037	Object3D parent = o.parent;
3476	4038	o.parent = null;
..	..	@@ -3481,10 +4043,14 @@
3481	4043
3482	4044	out.flush();
3483	4045
3484		- zstream.close();
	4046	+ baos //zstream
	4047	+ .close();
3485	4048	out.close();
3486	4049
3487		- return baos.toByteArray();
	4050	+ byte[] bytes = baos.toByteArray();
	4051	+
	4052	+ System.out.println("save #bytes = " + bytes.length);
	4053	+ return bytes;
3488	4054	} catch (Exception e)
3489	4055	{
3490	4056	System.err.println(e);
..	..	@@ -3494,13 +4060,16 @@
3494	4060
3495	4061	static public Object Uncompress(byte[] bytes)
3496	4062	{
3497		- System.out.println("#bytes = " + bytes.length);
	4063	+ System.out.println("restore #bytes = " + bytes.length);
3498	4064	try
3499	4065	{
3500	4066	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3501		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3502		- ObjectInputStream in = new ObjectInputStream(istream);
	4067	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4068	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3503	4069	Object obj = in.readObject();
	4070	+
	4071	+ bais //istream
	4072	+ .close();
3504	4073	in.close();
3505	4074
3506	4075	return obj;
..	..	@@ -3555,43 +4124,95 @@
3555	4124	return null;
3556	4125	}
3557	4126
3558		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3559	4127
3560	4128	public void Save()
3561	4129	{
	4130	+ //Save(true);
	4131	+ Replace();
	4132	+ SetVersionStates();
	4133	+ }
	4134	+
	4135	+ private boolean Equal(byte[] compress, byte[] name)
	4136	+ {
	4137	+ if (compress.length != name.length)
	4138	+ {
	4139	+ return false;
	4140	+ }
	4141	+
	4142	+ for (int i=compress.length; --i>=0;)
	4143	+ {
	4144	+ if (compress[i] != name[i])
	4145	+ return false;
	4146	+ }
	4147	+
	4148	+ return true;
	4149	+ }
	4150	+
	4151	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4152	+
	4153	+ void DeleteVersion()
	4154	+ {
	4155	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4156	+ {
	4157	+ copy.versionlist[i] = copy.versionlist[i+1];
	4158	+ }
	4159	+
	4160	+ CopyChanged();
	4161	+
	4162	+ SetVersionStates();
	4163	+ }
	4164	+
	4165	+ public boolean Save(boolean user)
	4166	+ {
3562	4167	System.err.println("Save");
	4168	+ Replace();
3563	4169
3564		- cRadio tab = GetCurrentTab();
	4170	+ //cRadio tab = GetCurrentTab();
3565	4171
3566		- boolean temp = CameraPane.SWITCH;
3567		- CameraPane.SWITCH = false;
	4172	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3568	4173
3569		- copy.ExtractBigData(hashtable);
	4174	+ boolean thesame = false;
3570	4175
3571		- byte[] compress = Compress(copy);
	4176	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4177	+// {
	4178	+// thesame = true;
	4179	+// }
3572	4180
3573	4181	//EditorFrame.m_MainFrame.requestFocusInWindow();
3574		- tab.graphs[tab.undoindex++] = compress;
3575		-
3576		- copy.RestoreBigData(hashtable);
3577		-
3578		- CameraPane.SWITCH = temp;
3579		-
3580		- //assert(hashtable.isEmpty());
3581		-
3582		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4182	+ if (!thesame)
3583	4183	{
3584		- tab.graphs[i] = null;
	4184	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4185	+ {
	4186	+ copy.versionlist[i] = copy.versionlist[i-1];
	4187	+ }
	4188	+
	4189	+ //tab.user[tab.versionindex] = user;
	4190	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4191	+
	4192	+ copy.versionlist[++copy.versionindex] = compress;
	4193	+
	4194	+ // if (increment)
	4195	+ // tab.versionindex++;
3585	4196	}
3586	4197
3587		- SetUndoStates();
	4198	+ //copy.RestoreBigData(versiontable);
	4199	+
	4200	+ //assert(hashtable.isEmpty());
	4201	+
	4202	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4203	+// {
	4204	+// //tab.user[i] = false;
	4205	+// copy.versionlist[i] = null;
	4206	+// }
	4207	+
	4208	+ SetVersionStates();
3588	4209
3589	4210	// test save
3590	4211	if (false)
3591	4212	{
3592	4213	try
3593	4214	{
3594		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4215	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3595	4216	ObjectOutputStream p = new ObjectOutputStream(ostream);
3596	4217
3597	4218	p.writeObject(copy);
..	..	@@ -3604,28 +4225,68 @@
3604	4225	e.printStackTrace();
3605	4226	}
3606	4227	}
	4228	+
	4229	+ return !thesame;
	4230	+ }
	4231	+
	4232	+ boolean flashIt = true;
	4233	+
	4234	+ void RefreshSelection()
	4235	+ {
	4236	+ Object3D selection = new Object3D();
	4237	+
	4238	+ for (int i = 0; i < copy.selection.size(); i++)
	4239	+ {
	4240	+ Object3D elem = copy.selection.elementAt(i);
	4241	+
	4242	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4243	+
	4244	+ if (obj == null)
	4245	+ {
	4246	+ copy.selection.remove(i--);
	4247	+ }
	4248	+ else
	4249	+ {
	4250	+ selection.add(obj);
	4251	+ copy.selection.setElementAt(obj, i);
	4252	+ }
	4253	+ }
	4254	+
	4255	+ flashIt = false;
	4256	+ GetTree().clearSelection();
	4257	+ for (int i = 0; i < selection.size(); i++)
	4258	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4259	+ flashIt = true;
	4260	+
	4261	+ //refreshContents(false);
3607	4262	}
3608	4263
3609		- void CopyChanged(Object3D obj)
	4264	+ void CopyChanged()
3610	4265	{
3611		- SetUndoStates();
	4266	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4267	+
	4268	+ SetVersionStates();
3612	4269
3613	4270	boolean temp = CameraPane.SWITCH;
3614	4271	CameraPane.SWITCH = false;
3615	4272
3616		- copy.ExtractBigData(hashtable);
	4273	+ copy.ExtractBigData(versiontable);
3617	4274
3618	4275	copy.clear();
3619	4276
	4277	+ copy.skyboxname = obj.skyboxname;
	4278	+ copy.skyboxext = obj.skyboxext;
	4279	+
3620	4280	for (int i=0; i<obj.Size(); i++)
3621	4281	{
3622	4282	copy.add(obj.get(i));
3623	4283	}
3624	4284
3625		- copy.RestoreBigData(hashtable);
	4285	+ copy.RestoreBigData(versiontable);
3626	4286
3627	4287	CameraPane.SWITCH = temp;
3628	4288
	4289	+ RefreshSelection();
3629	4290	//assert(hashtable.isEmpty());
3630	4291
3631	4292	copy.Touch();
..	..	@@ -3646,56 +4307,144 @@
3646	4307	}
3647	4308	}
3648	4309
3649		- refreshContents();
	4310	+ refreshContents(true);
3650	4311	}
3651	4312
3652		- cButton undoButton;
3653		- cButton redoButton;
	4313	+ cButton previousVersionButton;
	4314	+ cButton restoreButton;
	4315	+ cButton replaceButton;
	4316	+ cButton nextVersionButton;
	4317	+ cButton saveVersionButton;
	4318	+ cButton deleteVersionButton;
3654	4319
3655		- void SetUndoStates()
	4320	+ boolean muteSlider;
	4321	+
	4322	+ int VersionCount()
3656	4323	{
3657		- cRadio tab = GetCurrentTab();
	4324	+ int count = 0;
3658	4325
3659		- undoButton.setEnabled(tab.undoindex > 0);
3660		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4326	+ for (int i = copy.versionlist.length; --i >= 0;)
	4327	+ {
	4328	+ if (copy.versionlist[i] != null)
	4329	+ count++;
	4330	+ }
	4331	+
	4332	+ return count;
3661	4333	}
3662	4334
3663		- public void Undo()
	4335	+ void SetVersionStates()
3664	4336	{
	4337	+ //if (true)
	4338	+ // return;
	4339	+
	4340	+ //cRadio tab = GetCurrentTab();
	4341	+
	4342	+ restoreButton.setEnabled(copy.versionindex != -1);
	4343	+ replaceButton.setEnabled(copy.versionindex != -1);
	4344	+
	4345	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4346	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4347	+
	4348	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4349	+ copy.versionlist[copy.versionindex + 1] != null);
	4350	+
	4351	+ muteSlider = true;
	4352	+ versionSlider.setMinimum(0);
	4353	+ versionSlider.setMaximum(VersionCount() - 1);
	4354	+ versionSlider.setInteger(copy.versionindex);
	4355	+ versionSlider.setEnabled(copy.versionindex != -1);
	4356	+ muteSlider = false;
	4357	+ }
	4358	+
	4359	+ public boolean PreviousVersion()
	4360	+ {
	4361	+ // Option?
	4362	+ Replace();
	4363	+
3665	4364	System.err.println("Undo");
3666	4365
3667		- cRadio tab = GetCurrentTab();
	4366	+ //cRadio tab = GetCurrentTab();
3668	4367
3669		- if (tab.undoindex == 0)
	4368	+ if (copy.versionindex == 0)
3670	4369	{
3671	4370	java.awt.Toolkit.getDefaultToolkit().beep();
3672		- return;
	4371	+ return false;
3673	4372	}
3674	4373
3675		- if (tab.graphs[tab.undoindex] == null)
3676		- {
3677		- Save();
3678		- tab.undoindex -= 1;
3679		- }
	4374	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4375	+// {
	4376	+// if (Save(false))
	4377	+// tab.versionindex -= 1;
	4378	+// else
	4379	+// {
	4380	+// if (tab.versionindex <= 0)
	4381	+// return false;
	4382	+// else
	4383	+// tab.versionindex -= 1;
	4384	+// }
	4385	+// }
3680	4386
3681		- tab.undoindex -= 1;
	4387	+ copy.versionindex -= 1;
3682	4388
3683		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4389	+ CopyChanged();
	4390	+
	4391	+ return true;
3684	4392	}
3685	4393
3686		- public void Redo()
	4394	+ public boolean Restore()
3687	4395	{
3688		- cRadio tab = GetCurrentTab();
	4396	+ System.err.println("Restore");
3689	4397
3690		- if (tab.graphs[tab.undoindex + 1] == null)
	4398	+ //cRadio tab = GetCurrentTab();
	4399	+
	4400	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4401	+ {
	4402	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4403	+ return false;
	4404	+ }
	4405	+
	4406	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4407	+ CopyChanged();
	4408	+
	4409	+ return true;
	4410	+ }
	4411	+
	4412	+ public boolean Replace()
	4413	+ {
	4414	+ System.err.println("Replace");
	4415	+
	4416	+ //cRadio tab = GetCurrentTab();
	4417	+
	4418	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4419	+ {
	4420	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4421	+ return false;
	4422	+ }
	4423	+
	4424	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4425	+
	4426	+ return true;
	4427	+ }
	4428	+
	4429	+ public void NextVersion()
	4430	+ {
	4431	+ // Option?
	4432	+ Replace();
	4433	+
	4434	+ //cRadio tab = GetCurrentTab();
	4435	+
	4436	+ if (copy.versionlist[copy.versionindex + 1] == null)
3691	4437	{
3692	4438	java.awt.Toolkit.getDefaultToolkit().beep();
3693	4439	return;
3694	4440	}
3695	4441
3696		- tab.undoindex += 1;
	4442	+ copy.versionindex += 1;
3697	4443
3698		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4444	+ CopyChanged();
	4445	+
	4446	+ //if (!tab.user[tab.versionindex])
	4447	+ // tab.graphs[tab.versionindex] = null;
3699	4448	}
3700	4449
3701	4450	void ImportGFD()
..	..	@@ -3906,7 +4655,7 @@
3906	4655	//copy.material = new cMaterial(copy.GetMaterial());
3907	4656
3908	4657	current.color = (float) colorField.getFloat();
3909		- current.modulation = (float) modulationField.getFloat();
	4658	+ current.modulation = (float) saturationField.getFloat();
3910	4659	current.metalness = (float) metalnessField.getFloat();
3911	4660	current.diffuse = (float) diffuseField.getFloat();
3912	4661	current.specular = (float) specularField.getFloat();
..	..	@@ -3939,7 +4688,7 @@
3939	4688	cMaterial mat = copy.material;
3940	4689
3941	4690	colorField.SetToolTipValue((mat.color));
3942		- modulationField.SetToolTipValue((mat.modulation));
	4691	+ saturationField.SetToolTipValue((mat.modulation));
3943	4692	metalnessField.SetToolTipValue((mat.metalness));
3944	4693	diffuseField.SetToolTipValue((mat.diffuse));
3945	4694	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3991,9 +4740,26 @@
3991	4740	//copy.Touch();
3992	4741	}
3993	4742
	4743	+ cNumberSlider versionSlider;
	4744	+
3994	4745	public void stateChanged(ChangeEvent e)
3995	4746	{
3996	4747	// assert(false);
	4748	+ if (e.getSource() == versionSlider)
	4749	+ {
	4750	+ if (muteSlider)
	4751	+ return;
	4752	+
	4753	+ int version = versionSlider.getInteger();
	4754	+
	4755	+ if (version != -1 && copy.versionlist[version] != null)
	4756	+ {
	4757	+ copy.versionindex = version;
	4758	+ CopyChanged();
	4759	+ }
	4760	+
	4761	+ return;
	4762	+ }
3997	4763
3998	4764	if (freezematerial)
3999	4765	{
..	..	@@ -4029,6 +4795,12 @@
4029	4795	{
4030	4796	//System.out.println("stateChanged = " + this);
4031	4797	materialtouched = true;
	4798	+
	4799	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4800	+ {
	4801	+ saturationField.setFloat(1);
	4802	+ }
	4803	+
4032	4804	applySelf();
4033	4805	//System.out.println("this = " + this);
4034	4806	//System.out.println("PARENT = " + parent);
..	..	@@ -4328,6 +5100,7 @@
4328	5100	{
4329	5101	if (GetTree() != null)
4330	5102	{
	5103	+ GetTree().revalidate();
4331	5104	GetTree().repaint();
4332	5105	}
4333	5106
..	..	@@ -4336,13 +5109,16 @@
4336	5109	ctrlPanel.validate(); // ? new
4337	5110	ctrlPanel.repaint();
4338	5111	}
	5112	+
	5113	+ if (previousVersionButton != null && copy.versionlist != null)
	5114	+ SetVersionStates();
4339	5115	}
4340	5116
4341	5117	static TweenManager tweenManager = new TweenManager();
4342	5118
4343	5119	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4344	5120	{
4345		- if (Globals.SAVEONMAKE) // && resetmodel)
	5121	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4346	5122	Save();
4347	5123	//Tween.set(thing, 0).target(1).start(tweenManager);
4348	5124	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4584,7 +5360,9 @@
4584	5360	readobj.ResetDisplayList();
4585	5361	} catch (Exception e)
4586	5362	{
4587		- //e.printStackTrace();
	5363	+ if (!e.toString().contains("GZIP"))
	5364	+ e.printStackTrace();
	5365	+
4588	5366	try
4589	5367	{
4590	5368	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4658,12 +5436,14 @@
4658	5436
4659	5437	if (readobj != null)
4660	5438	{
4661		- if (Globals.SAVEONMAKE)
4662		- Save();
	5439	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5440	+ // Save();
4663	5441	try
4664	5442	{
4665	5443	//readobj.deepCopySelf(copy);
4666	5444	copy.clear(); // june 2014
	5445	+ copy.skyboxname = readobj.skyboxname;
	5446	+ copy.skyboxext = readobj.skyboxext;
4667	5447	for (int i = 0; i < readobj.size(); i++)
4668	5448	{
4669	5449	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4704,6 +5484,7 @@
4704	5484	}
4705	5485	} catch (ClassCastException e)
4706	5486	{
	5487	+ e.printStackTrace();
4707	5488	assert (false);
4708	5489	Composite c = (Composite) copy;
4709	5490	c.children.clear();
..	..	@@ -4714,17 +5495,31 @@
4714	5495	c.addChild(csg);
4715	5496	}
4716	5497
	5498	+ copy.versionlist = readobj.versionlist;
	5499	+ copy.versionindex = readobj.versionindex;
	5500	+
	5501	+ if (copy.versionlist == null)
	5502	+ {
	5503	+ // Backward compatibility
	5504	+ copy.versionlist = new Object3D[100];
	5505	+ copy.versionindex = -1;
	5506	+
	5507	+ Save(true);
	5508	+ }
	5509	+
	5510	+ //? SetUndoStates();
	5511	+
4717	5512	ResetModel();
4718	5513	copy.HardTouch(); // recompile?
4719	5514	refreshContents();
4720	5515	}
4721	5516	}
4722	5517
4723		- void load() // throws ClassNotFoundException
	5518	+ void Open() // throws ClassNotFoundException
4724	5519	{
4725	5520	if (Grafreed.standAlone)
4726	5521	{
4727		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5522	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4728	5523	browser.show();
4729	5524	String filename = browser.getFile();
4730	5525	if (filename != null && filename.length() > 0)
..	..	@@ -4801,6 +5596,8 @@
4801	5596
4802	5597	void save()
4803	5598	{
	5599	+ Replace();
	5600	+
4804	5601	if (lastname == null)
4805	5602	{
4806	5603	return;
..	..	@@ -4823,6 +5620,7 @@
4823	5620	//ps.print(buffer.toString());
4824	5621	} catch (IOException e)
4825	5622	{
	5623	+ e.printStackTrace();
4826	5624	}
4827	5625	}
4828	5626
..	..	@@ -5005,7 +5803,7 @@
5005	5803	MenuBar menuBar;
5006	5804	Menu fileMenu;
5007	5805	MenuItem newItem;
5008		- MenuItem loadItem;
	5806	+ MenuItem openItem;
5009	5807	MenuItem saveItem;
5010	5808	MenuItem saveAsItem;
5011	5809	MenuItem exportAsItem;
..	..	@@ -5028,6 +5826,7 @@
5028	5826	CheckboxMenuItem toggleSwitchItem;
5029	5827	CheckboxMenuItem toggleRootItem;
5030	5828	CheckboxMenuItem animationItem;
	5829	+ MenuItem archiveItem;
5031	5830	CheckboxMenuItem toggleHandleItem;
5032	5831	CheckboxMenuItem togglePaintItem;
5033	5832	JSplitPane mainPanel;
..	..	@@ -5041,6 +5840,7 @@
5041	5840	ButtonGroup buttonGroup;
5042	5841
5043	5842	cGridBag toolboxPanel;
	5843	+ cGridBag skyboxPanel;
5044	5844	cGridBag materialPanel;
5045	5845	cGridBag ctrlPanel;
5046	5846
..	..	@@ -5114,7 +5914,7 @@
5114	5914	JLabel colorLabel;
5115	5915	cNumberSlider colorField;
5116	5916	JLabel modulationLabel;
5117		- cNumberSlider modulationField;
	5917	+ cNumberSlider saturationField;
5118	5918	JLabel metalnessLabel;
5119	5919	cNumberSlider metalnessField;
5120	5920	JLabel diffuseLabel;
..	..	@@ -5145,6 +5945,7 @@
5145	5945	cNumberSlider anisoField;
5146	5946	JLabel anisoVLabel;
5147	5947	cNumberSlider anisoVField;
	5948	+
5148	5949	JLabel cameraLabel;
5149	5950	cNumberSlider cameraField;
5150	5951	JLabel selfshadowLabel;
..	..	@@ -5159,6 +5960,7 @@
5159	5960	cNumberSlider fakedepthField;
5160	5961	JLabel shadowbiasLabel;
5161	5962	cNumberSlider shadowbiasField;
	5963	+
5162	5964	JLabel bumpLabel;
5163	5965	cNumberSlider bumpField;
5164	5966	JLabel noiseLabel;