~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,137 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
	90	+ public cGridBag GetSeparator()
	91	+ {
	92	+ cGridBag separator = new cGridBag();
	93	+ separator.add(new JSeparator());
	94	+ separator.preferredHeight = 5;
	95	+ return separator;
	96	+ }
44	97
45	98	cButton GetButton(String name, boolean border)
46	99	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
	100	+ ImageIcon icon = GetIcon(name);
	101	+ if (icon != null \|\| name.contains("/"))
50	102	return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
	103	+ else
54	104	return new cButton(name, border);
55		- }
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
56	111	}
57	112
58	113	cToggleButton GetToggleButton(String name, boolean border)
59	114	{
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		- }
	115	+ ImageIcon icon = GetIcon(name);
	116	+ return new cToggleButton(icon, border);
69	117	}
70	118
71	119	cCheckBox GetCheckBox(String name, boolean border)
72	120	{
	121	+ ImageIcon icon = GetIcon(name);
	122	+ return new cCheckBox(icon, border);
	123	+ }
	124	+
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
	128	+ {
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
73	135	try
74	136	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	138	+
	139	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	140	+// {
	141	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	142	+// Graphics2D g = resized.createGraphics();
	143	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	144	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	145	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	146	+// g.dispose();
	147	+//
	148	+// image = resized;
	149	+// }
	150	+
	151	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	152	+
	153	+ icons.put(name, icon);
	154	+
	155	+ return icon;
77	156	}
78	157	catch (Exception e)
79	158	{
80		- return new cCheckBox(name, border);
	159	+ //icons.put(name, null);
	160	+ return null;
81	161	}
82	162	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	163	+
	164	+ BufferedImage GetImage(String name)
85	165	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	166	+ try
89	167	{
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;
	168	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	169	+
	170	+ return image;
98	171	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	172	+ catch (Exception e)
	173	+ {
	174	+ return null;
	175	+ }
102	176	}
103	177
104	178	// SCRIPT
..	..	@@ -282,6 +356,14 @@
282	356	client = inClient;
283	357	copy = client;
284	358
	359	+// if (copy.versionlist == null)
	360	+// {
	361	+// copy.versionlist = new Object3D[100];
	362	+// copy.versionindex = -1;
	363	+//
	364	+// callee.Save(true);
	365	+// }
	366	+
285	367	// "this" is not called: SetupUI2(objEditor);
286	368	}
287	369
..	..	@@ -295,6 +377,14 @@
295	377	client = inClient;
296	378	copy = client;
297	379
	380	+ if (copy.versionlist == null)
	381	+ {
	382	+ copy.versionlist = new Object3D[100];
	383	+ copy.versionindex = -1;
	384	+
	385	+// Save(true);
	386	+ }
	387	+
298	388	SetupUI2(callee.GetEditor());
299	389	}
300	390
..	..	@@ -316,7 +406,8 @@
316	406	//parent = p;
317	407
318	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
319		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
320	411	//gd.setFullScreenWindow(this);
321	412	//setResizable(false);
322	413	//if (!isDisplayable())
..	..	@@ -327,6 +418,14 @@
327	418	copy = localCopy;
328	419	copy.editWindow = this;
329	420
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
	424	+// copy.versionindex = -1;
	425	+//
	426	+// Save(true);
	427	+// }
	428	+
330	429	SetupMenu();
331	430
332	431	//SetupName(objEditor); // new
..	..	@@ -345,6 +444,9 @@
345	444
346	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
348	450	void SetupMenu()
349	451	{
350	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -394,6 +496,8 @@
394	496
395	497	ChangeListener changeListener = new ChangeListener()
396	498	{
	499	+ //String name;
	500	+
397	501	public void stateChanged(ChangeEvent changeEvent)
398	502	{
399	503	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -412,18 +516,49 @@
412	516	// EditSelection(false);
413	517	// }
414	518
415		- refreshContents(false); // To refresh Info tab
	519	+// if (objectPanel.getSelectedIndex() == 4)
	520	+// {
	521	+// name = copy.skyboxname;
	522	+//
	523	+// if (name == null)
	524	+// {
	525	+// name = "";
	526	+// }
	527	+//
	528	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	529	+// copy.skyboxext = "jpg";
	530	+// }
	531	+// else
	532	+// {
	533	+// if (name != null)
	534	+// {
	535	+// if (name.equals(""))
	536	+// {
	537	+// copy.skyboxname = null;
	538	+// copy.skyboxext = null;
	539	+// }
	540	+// else
	541	+// {
	542	+// copy.skyboxname = name;
	543	+// }
	544	+// }
	545	+// }
	546	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	547	+
	548	+// refreshContents(false); // To refresh Info tab
	549	+ cameraView.repaint();
416	550	}
417	551	};
418	552	objectPanel.addChangeListener(changeListener);
419	553
420	554	toolbarPanel = new JPanel();
421	555	toolbarPanel.setName("Toolbar");
	556	+
422	557	treePanel = new cGridBag();
423	558	treePanel.setName("Tree");
424	559
425	560	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	561	+ //editPanel.setName("Edit");
427	562
428	563	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	564
..	..	@@ -431,11 +566,13 @@
431	566	editPanel.add(editCommandsPanel);
432	567	editPanel.add(ctrlPanel);
433	568
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	569	+ toolboxPanel = new cGridBag().setVertical(true);
	570	+ //toolboxPanel.setName("Toolbox");
436	571
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	572	+ skyboxPanel = new cGridBag().setVertical(true);
	573	+
	574	+ materialPanel = new cGridBag().setVertical(false);
	575	+ //materialPanel.setName("Material");
439	576
440	577	/JTextPane/
441	578	infoarea = createTextPane();
..	..	@@ -443,6 +580,7 @@
443	580
444	581	infoarea.setEditable(true);
445	582	SetText();
	583	+
446	584	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	585	// infoarea.setOpaque(false);
448	586	// //infoarea.setForeground(textcolor);
..	..	@@ -450,7 +588,7 @@
450	588	// TEXTAREA infoarea.setWrapStyleWord(true);
451	589	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452	590	infoPanel.setPreferredSize(new Dimension(1, 1));
453		- infoPanel.setName("Info");
	591	+ //infoPanel.setName("Info");
454	592	//infoPanel.setLayout(new BorderLayout());
455	593	//infoPanel.add(createTextPane());
456	594
..	..	@@ -717,6 +855,7 @@
717	855	boolean maximized;
718	856
719	857	cButton fullscreenLayout;
	858	+ cButton expandedLayout;
720	859
721	860	void Minimize()
722	861	{
..	..	@@ -756,10 +895,12 @@
756	895	cButton minButton;
757	896	cButton maxButton;
758	897	cButton fullButton;
	898	+ cButton collapseButton;
	899	+ cButton maximize3DButton;
759	900
760	901	void ToggleFullScreen()
761	902	{
762		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	903	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763	904
764	905	cameraView.ToggleFullScreen();
765	906
..	..	@@ -780,13 +921,13 @@
780	921	// X frame.getContentPane().remove(/"Center",/bigThree);
781	922	// X framePanel.add(bigThree);
782	923	// X frame.getContentPane().add(/"Center",/framePanel);
783		- framePanel.setDividerLocation(46);
	924	+// framePanel.setDividerLocation(46); // icons are 24x24
784	925
785	926	//frame.setVisible(true);
786		- radio.layout = keepButton;
	927	+// radio.layout = keepButton;
787	928	//theFrame = null;
788	929	keepButton = null;
789		- radio.layout.doClick();
	930	+// radio.layout.doClick();
790	931
791	932	} else
792	933	{
..	..	@@ -807,31 +948,53 @@
807	948	// X frame.getContentPane().remove(/"Center",/framePanel);
808	949	// X framePanel.remove(bigThree);
809	950	// X frame.getContentPane().add(/"Center",/bigThree);
810		- framePanel.setDividerLocation(0);
	951	+// framePanel.setDividerLocation(0);
811	952
812		- radio.layout = fullscreenLayout;
813		- radio.layout.doClick();
	953	+// radio.layout = fullscreenLayout;
	954	+// radio.layout.doClick();
814	955	//frame.setVisible(true);
815	956	}
816	957	frame.validate();
	958	+
	959	+ cameraView.requestFocusInWindow();
817	960	}
818	961
819		- private byte[] CompressCopy()
	962	+ void CollapseToolbar()
	963	+ {
	964	+ framePanel.setDividerLocation(0);
	965	+ //frame.validate();
	966	+
	967	+ cameraView.requestFocusInWindow();
	968	+ }
	969	+
	970	+ private Object3D Duplicate(Object3D object)
820	971	{
821	972	boolean temp = CameraPane.SWITCH;
822	973	CameraPane.SWITCH = false;
823	974
824		- copy.ExtractBigData(versiontable);
	975	+ if (Grafreed.grafreed.universe.versiontable == null)
	976	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	977	+
	978	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
825	979	// if (copy == client)
826	980
827		- byte[] versions[] = copy.versions;
828		- copy.versions = null;
	981	+ Object3D versions[] = object.versionlist;
	982	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	983	+ object.versionlist = null;
	984	+ object.versiontable = null;
829	985
830		- byte[] compress = Compress(copy);
	986	+ Object3D parent = object.parent;
	987	+ object.parent = null;
831	988
832		- copy.versions = versions;
	989	+ //byte[] compress = Compress(copy);
	990	+ Object3D compress = (Object3D)Grafreed.clone(object);
833	991
834		- copy.RestoreBigData(versiontable);
	992	+ object.parent = parent;
	993	+
	994	+ object.versionlist = versions;
	995	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	996	+
	997	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
835	998
836	999	CameraPane.SWITCH = temp;
837	1000
..	..	@@ -959,6 +1122,7 @@
959	1122	{
960	1123	SetupMaterial(materialPanel);
961	1124	}
	1125	+
962	1126	//SetupName();
963	1127	//SetupViews();
964	1128	}
..	..	@@ -968,7 +1132,7 @@
968	1132	// NumberSlider vDivsField;
969	1133	// JCheckBox endcaps;
970	1134	JCheckBox liveCB;
971		- JCheckBox selectCB;
	1135	+ JCheckBox selectableCB;
972	1136	JCheckBox hideCB;
973	1137	JCheckBox link2masterCB;
974	1138	JCheckBox markCB;
..	..	@@ -1167,6 +1331,18 @@
1167	1331
1168	1332	namePanel = new cGridBag();
1169	1333
	1334	+ //if (copy.pinned)
	1335	+ {
	1336	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1337	+ pinButton.setSelected(copy.pinned);
	1338	+ cGridBag t = new cGridBag();
	1339	+ t.preferredWidth = 2;
	1340	+ t.add(pinButton);
	1341	+ namePanel.add(t);
	1342	+
	1343	+ pinButton.addItemListener(this);
	1344	+ }
	1345	+
1170	1346	nameField = AddText(namePanel, copy.GetName());
1171	1347	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1172	1348	oe.ctrlPanel.add(namePanel);
..	..	@@ -1180,13 +1356,16 @@
1180	1356
1181	1357	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1182	1358	liveCB.setToolTipText("Animate object");
1183		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1184		- selectCB.setToolTipText("Make object selectable");
	1359	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1360	+ markCB.setToolTipText("Set target transform");
	1361	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1362	+ selectableCB.setToolTipText("Make object selectable");
1185	1363	// Return();
	1364	+
1186	1365	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1187	1366	hideCB.setToolTipText("Hide object");
1188		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1189		- markCB.setToolTipText("As animation target transform");
	1367	+
	1368	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1190	1369
1191	1370	setupPanel2 = new cGridBag().setVertical(false);
1192	1371
..	..	@@ -1386,22 +1565,9 @@
1386	1565
1387	1566	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1388	1567	{
1389		- System.out.println("CREATE CAMERAS");
1390		- cams = new cTemplate();
1391		- cams.name = "Cameras";
1392		- copy.insertElementAt(cams, 0);
1393		- //cams.parent = copy;
1394		-
1395		- cam = new Camera(); // LA.newVector(3, 2, 1));
1396		- cams.addChild(cam);
1397		- cam = new Camera(1);
1398		- cams.addChild(cam);
1399		- cam = new Camera(2);
1400		- cams.addChild(cam);
1401		- cam = new Camera(3);
1402		- cams.addChild(cam);
1403		- cam = new Camera(4); // Light
1404		- cams.addChild(cam);
	1568	+ if (Globals.DEBUG)
	1569	+ System.out.println("CREATE CAMERAS");
	1570	+ cams = CreateCameras();
1405	1571	} else
1406	1572	{
1407	1573	cams = (cGroup) copy.get(0);
..	..	@@ -1467,6 +1633,45 @@
1467	1633	//frontView.object = copy;
1468	1634	//sideView.object = copy;
1469	1635
	1636	+ transformPanel = new cGridBag().setVertical(true);
	1637	+
	1638	+ cGridBag resetTransformPanel = new cGridBag();
	1639	+
	1640	+ resetTransformPanel.preferredHeight = 2;
	1641	+
	1642	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1643	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1644	+ resetTransform.addMouseListener(new MouseAdapter()
	1645	+ {
	1646	+ public void mouseClicked(MouseEvent e)
	1647	+ {
	1648	+ ResetTransform();
	1649	+ }
	1650	+ });
	1651	+ resetTransformPanel.add(resetTransform);
	1652	+
	1653	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1654	+ resetTransform.setToolTipText("Reset Translation only");
	1655	+ resetTransform.addMouseListener(new MouseAdapter()
	1656	+ {
	1657	+ public void mouseClicked(MouseEvent e)
	1658	+ {
	1659	+ ResetTransform(1);
	1660	+ }
	1661	+ });
	1662	+ resetTransformPanel.add(resetTransform);
	1663	+
	1664	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1665	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1666	+ resetTransform.addMouseListener(new MouseAdapter()
	1667	+ {
	1668	+ public void mouseClicked(MouseEvent e)
	1669	+ {
	1670	+ ResetTransform(2);
	1671	+ }
	1672	+ });
	1673	+ resetTransformPanel.add(resetTransform);
	1674	+
1470	1675	XYZPanel = new cGridBag().setVertical(true);
1471	1676	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1472	1677
..	..	@@ -1474,7 +1679,11 @@
1474	1679	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1475	1680	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1476	1681	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1682	+ //XYZPanel.setName("XYZ");
1477	1683
	1684	+ transformPanel.add(resetTransformPanel);
	1685	+ transformPanel.add(XYZPanel);
	1686	+
1478	1687	/*
1479	1688	gridPanel = new JPanel(); //new BorderLayout());
1480	1689	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1482,12 +1691,12 @@
1482	1691	gridPanel.add(cameraView);
1483	1692	gridPanel.add(XYZPanel);
1484	1693	*/
1485		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1486		- gridPanel.setContinuousLayout(true);
1487		- gridPanel.setOneTouchExpandable(true);
1488		- gridPanel.setDividerLocation(1.0);
1489		- gridPanel.setDividerSize(9);
1490		- gridPanel.setResizeWeight(0.85);
	1694	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1695	+// gridPanel.setContinuousLayout(true);
	1696	+// gridPanel.setOneTouchExpandable(true);
	1697	+// gridPanel.setDividerLocation(1.0);
	1698	+// gridPanel.setDividerSize(9);
	1699	+// gridPanel.setResizeWeight(0.85);
1491	1700
1492	1701	// aConstraints.weighty = 0;
1493	1702	//System.out.println("THIS = " + this);
..	..	@@ -1510,18 +1719,34 @@
1510	1719
1511	1720	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1512	1721	//tmp.setName("Edit");
	1722	+ objectPanel.add(skyboxPanel);
	1723	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1724	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1725	+
	1726	+ objectPanel.add(toolboxPanel);
	1727	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1728	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1729	+
1513	1730	objectPanel.add(materialPanel);
	1731	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1732	+ objectPanel.setToolTipTextAt(2, "Material");
	1733	+
1514	1734	// JPanel north = new JPanel(new BorderLayout());
1515	1735	// north.setName("Edit");
1516	1736	// north.add(ctrlPanel, BorderLayout.NORTH);
1517	1737	// objectPanel.add(north);
1518	1738	objectPanel.add(editPanel);
	1739	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1740	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1519	1741
1520		- //if (Globals.ADVANCED)
1521		- objectPanel.add(infoPanel);
	1742	+ objectPanel.add(transformPanel);
	1743	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1744	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1522	1745
1523		- objectPanel.add(toolboxPanel);
1524		-
	1746	+ patchMaterial = true;
	1747	+ cameraView.patchMaterial = this;
	1748	+ objectPanel.setSelectedIndex(2);
	1749	+
1525	1750	/*
1526	1751	aConstraints.gridx = 0;
1527	1752	aConstraints.gridwidth = 1;
..	..	@@ -1552,11 +1777,51 @@
1552	1777
1553	1778	AddOptions(optionsPanel); //, aConstraints);
1554	1779
1555		- tabbedPane.add(optionsPanel);
1556		-
1557	1780	tabbedPane.add(FSPane = new cFileSystemPane(this));
1558	1781
	1782	+ tabbedPane.add(optionsPanel);
	1783	+
1559	1784	scenePanel.add(tabbedPane);
	1785	+
	1786	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1787	+ creditsPanel.setName("Credits");
	1788	+
	1789	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1790	+ creditsPanel.add(ogaLabel);
	1791	+
	1792	+ cButton opengameartButton;
	1793	+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1794	+ opengameartButton.setToolTipText("https://opengameart.org");
	1795	+
	1796	+ opengameartButton.addMouseListener(new MouseAdapter()
	1797	+ {
	1798	+ public void mouseClicked(MouseEvent e)
	1799	+ {
	1800	+ try
	1801	+ {
	1802	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1803	+ } catch (Exception e1)
	1804	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1805	+ {
	1806	+ e1.printStackTrace();
	1807	+ }
	1808	+ }
	1809	+ });
	1810	+
	1811	+ for (int i=10; --i>=0;)
	1812	+ {
	1813	+ creditsPanel.add(new cGridBag());
	1814	+ }
	1815	+
	1816	+ tabbedPane.add(creditsPanel);
	1817	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1818	+
	1819	+ if (Globals.ADVANCED)
	1820	+ {
	1821	+ tabbedPane.add(infoPanel);
	1822	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1823	+ tabbedPane.setToolTipTextAt(4, "Information");
	1824	+ }
1560	1825
1561	1826	/*
1562	1827	cTree jTree = new cTree(null);
..	..	@@ -1578,13 +1843,13 @@
1578	1843	jtp.add(tree);
1579	1844	*/
1580	1845
1581		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1582		- bigPanel.setContinuousLayout(true);
1583		- bigPanel.setOneTouchExpandable(true);
1584		- bigPanel.setDividerLocation(0.8);
1585		- bigPanel.setDividerSize(15);
1586		- bigPanel.setResizeWeight(0.15);
1587		- bigPanel.setName("Scene");
	1846	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1847	+// bigPanel.setContinuousLayout(true);
	1848	+// bigPanel.setOneTouchExpandable(true);
	1849	+// bigPanel.setDividerLocation(0.8);
	1850	+// bigPanel.setDividerSize(15);
	1851	+// bigPanel.setResizeWeight(0.15);
	1852	+// bigPanel.setName("Scene");
1588	1853
1589	1854	//bigPanel.setLayout(new BorderLayout());
1590	1855	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1619,7 +1884,7 @@
1619	1884	bigThree = new cGridBag();
1620	1885	bigThree.addComponent(scenePanel);
1621	1886	bigThree.addComponent(centralPanel);
1622		- bigThree.addComponent(XYZPanel);
	1887	+ //bigThree.addComponent(XYZPanel);
1623	1888
1624	1889	// // SIDE EFFECT!!!
1625	1890	// aConstraints.gridx = 0;
..	..	@@ -1628,6 +1893,23 @@
1628	1893	// aConstraints.gridheight = 1;
1629	1894
1630	1895	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1896	+
	1897	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1898	+ new java.beans.PropertyChangeListener()
	1899	+ {
	1900	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1901	+ {
	1902	+ if ((Integer)pce.getOldValue() == 1)
	1903	+ {
	1904	+ if (radio.layout != expandedLayout)
	1905	+ {
	1906	+ radio.layout = expandedLayout;
	1907	+ radio.layout.doClick();
	1908	+ }
	1909	+ }
	1910	+ }
	1911	+ });
	1912	+
1631	1913	framePanel.setContinuousLayout(false);
1632	1914	framePanel.setOneTouchExpandable(false);
1633	1915	//.setDividerLocation(0.8);
..	..	@@ -1637,7 +1919,7 @@
1637	1919
1638	1920	frame.getContentPane().setLayout(new BorderLayout());
1639	1921	/**/
1640		- JTabbedPane worldPane = new JTabbedPane();
	1922	+ //JTabbedPane worldPane = new JTabbedPane();
1641	1923	//worldPane.add(bigPanel);
1642	1924	//worldPane.add(worldPanel);
1643	1925	/**/
..	..	@@ -1651,7 +1933,7 @@
1651	1933
1652	1934	cameraView.requestFocusInWindow();
1653	1935
1654		- gridPanel.setDividerLocation(1.0);
	1936	+// gridPanel.setDividerLocation(1.0);
1655	1937
1656	1938	frame.validate();
1657	1939
..	..	@@ -1660,7 +1942,6 @@
1660	1942	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1661	1943	frame.addWindowListener(new WindowAdapter()
1662	1944	{
1663		-
1664	1945	public void windowClosing(WindowEvent e)
1665	1946	{
1666	1947	Close();
..	..	@@ -1683,28 +1964,442 @@
1683	1964	ctrlPanel.removeAll();
1684	1965	}
1685	1966
1686		- void SetupMaterial(cGridBag panel)
	1967	+ void SetupMaterial(cGridBag materialpanel)
1687	1968	{
1688		- /*
	1969	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1970	+
	1971	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	1972	+ skin.setToolTipText("Skin");
	1973	+ skin.addMouseListener(new MouseAdapter()
	1974	+ {
	1975	+ public void mouseClicked(MouseEvent e)
	1976	+ {
	1977	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1978	+ cMaterial material = object.material;
	1979	+
	1980	+ // Skin
	1981	+ colorField.setFloat(material.color);
	1982	+ float saturation = material.modulation;
	1983	+
	1984	+ if (!cameraView.Skinshader)
	1985	+ {
	1986	+ saturation /= 1.5;
	1987	+ }
	1988	+
	1989	+ saturationField.setFloat(saturation);
	1990	+
	1991	+ subsurfaceField.setFloat(material.subsurface);
	1992	+ selfshadowField.setFloat(material.diffuseness);
	1993	+ diffusenessField.setFloat(material.factor);
	1994	+ shininessField.setFloat(material.shininess);
	1995	+ shadowbiasField.setFloat(material.shadowbias);
	1996	+ diffuseField.setFloat(material.diffuse);
	1997	+ specularField.setFloat(material.specular);
	1998	+
	1999	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2000	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2001	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2002	+
	2003	+ materialtouched = true;
	2004	+ applySelf();
	2005	+ }
	2006	+ });
	2007	+ presetpanel.add(skin);
	2008	+
	2009	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2010	+ lambert.setToolTipText("Diffuse");
	2011	+ lambert.addMouseListener(new MouseAdapter()
	2012	+ {
	2013	+ public void mouseClicked(MouseEvent e)
	2014	+ {
	2015	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2016	+ cMaterial material = object.material;
	2017	+
	2018	+ diffusenessField.setFloat(material.factor);
	2019	+ selfshadowField.setFloat(material.diffuseness);
	2020	+
	2021	+ materialtouched = true;
	2022	+ applySelf();
	2023	+ }
	2024	+ });
	2025	+ presetpanel.add(lambert);
	2026	+
	2027	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2028	+ diffuse2.setToolTipText("Diffuse2");
	2029	+ diffuse2.addMouseListener(new MouseAdapter()
	2030	+ {
	2031	+ public void mouseClicked(MouseEvent e)
	2032	+ {
	2033	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2034	+ cMaterial material = object.material;
	2035	+
	2036	+ diffusenessField.setFloat(material.factor);
	2037	+ selfshadowField.setFloat(material.diffuseness);
	2038	+
	2039	+ materialtouched = true;
	2040	+ applySelf();
	2041	+ }
	2042	+ });
	2043	+ presetpanel.add(diffuse2);
	2044	+
	2045	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2046	+ diffusemoon.setToolTipText("Moon");
	2047	+ diffusemoon.addMouseListener(new MouseAdapter()
	2048	+ {
	2049	+ public void mouseClicked(MouseEvent e)
	2050	+ {
	2051	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2052	+ cMaterial material = object.material;
	2053	+
	2054	+ diffusenessField.setFloat(material.factor);
	2055	+ selfshadowField.setFloat(material.diffuseness);
	2056	+
	2057	+ materialtouched = true;
	2058	+ applySelf();
	2059	+ }
	2060	+ });
	2061	+ presetpanel.add(diffusemoon);
	2062	+
	2063	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2064	+ diffusemoon2.setToolTipText("Moon2");
	2065	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2066	+ {
	2067	+ public void mouseClicked(MouseEvent e)
	2068	+ {
	2069	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2070	+ cMaterial material = object.material;
	2071	+
	2072	+ diffusenessField.setFloat(material.factor);
	2073	+ selfshadowField.setFloat(material.diffuseness);
	2074	+
	2075	+ materialtouched = true;
	2076	+ applySelf();
	2077	+ }
	2078	+ });
	2079	+ presetpanel.add(diffusemoon2);
	2080	+
	2081	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2082	+ diffusemoon3.setToolTipText("Moon3");
	2083	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2084	+ {
	2085	+ public void mouseClicked(MouseEvent e)
	2086	+ {
	2087	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2088	+ cMaterial material = object.material;
	2089	+
	2090	+ diffusenessField.setFloat(material.factor);
	2091	+ selfshadowField.setFloat(material.diffuseness);
	2092	+
	2093	+ materialtouched = true;
	2094	+ applySelf();
	2095	+ }
	2096	+ });
	2097	+ presetpanel.add(diffusemoon3);
	2098	+
	2099	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2100	+ diffusesheen.setToolTipText("Sheen");
	2101	+ diffusesheen.addMouseListener(new MouseAdapter()
	2102	+ {
	2103	+ public void mouseClicked(MouseEvent e)
	2104	+ {
	2105	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2106	+ cMaterial material = object.material;
	2107	+
	2108	+ sheenField.setFloat(material.sheen);
	2109	+
	2110	+ materialtouched = true;
	2111	+ applySelf();
	2112	+ }
	2113	+ });
	2114	+ presetpanel.add(diffusesheen);
	2115	+
	2116	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2117	+ rough.setToolTipText("Rough metal");
	2118	+ rough.addMouseListener(new MouseAdapter()
	2119	+ {
	2120	+ public void mouseClicked(MouseEvent e)
	2121	+ {
	2122	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2123	+ cMaterial material = object.material;
	2124	+
	2125	+ shininessField.setFloat(material.shininess);
	2126	+ velvetField.setFloat(material.velvet);
	2127	+
	2128	+ materialtouched = true;
	2129	+ applySelf();
	2130	+ }
	2131	+ });
	2132	+ presetpanel.add(rough);
	2133	+
	2134	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2135	+ rough2.setToolTipText("Medium metal");
	2136	+ rough2.addMouseListener(new MouseAdapter()
	2137	+ {
	2138	+ public void mouseClicked(MouseEvent e)
	2139	+ {
	2140	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2141	+ cMaterial material = object.material;
	2142	+
	2143	+ shininessField.setFloat(material.shininess);
	2144	+ lightareaField.setFloat(material.lightarea);
	2145	+
	2146	+ materialtouched = true;
	2147	+ applySelf();
	2148	+ }
	2149	+ });
	2150	+ presetpanel.add(rough2);
	2151	+
	2152	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2153	+ shini0.setToolTipText("Shiny");
	2154	+ shini0.addMouseListener(new MouseAdapter()
	2155	+ {
	2156	+ public void mouseClicked(MouseEvent e)
	2157	+ {
	2158	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2159	+ cMaterial material = object.material;
	2160	+
	2161	+ shininessField.setFloat(material.shininess);
	2162	+ lightareaField.setFloat(material.lightarea);
	2163	+
	2164	+ materialtouched = true;
	2165	+ applySelf();
	2166	+ }
	2167	+ });
	2168	+ presetpanel.add(shini0);
	2169	+
	2170	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2171	+ shini1.setToolTipText("Shiny2");
	2172	+ shini1.addMouseListener(new MouseAdapter()
	2173	+ {
	2174	+ public void mouseClicked(MouseEvent e)
	2175	+ {
	2176	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2177	+ cMaterial material = object.material;
	2178	+
	2179	+ shininessField.setFloat(material.shininess);
	2180	+ lightareaField.setFloat(material.lightarea);
	2181	+
	2182	+ materialtouched = true;
	2183	+ applySelf();
	2184	+ }
	2185	+ });
	2186	+ presetpanel.add(shini1);
	2187	+
	2188	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2189	+ shini2.setToolTipText("Shiny3");
	2190	+ shini2.addMouseListener(new MouseAdapter()
	2191	+ {
	2192	+ public void mouseClicked(MouseEvent e)
	2193	+ {
	2194	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2195	+ cMaterial material = object.material;
	2196	+
	2197	+ shininessField.setFloat(material.shininess);
	2198	+ lightareaField.setFloat(material.lightarea);
	2199	+
	2200	+ materialtouched = true;
	2201	+ applySelf();
	2202	+ }
	2203	+ });
	2204	+ presetpanel.add(shini2);
	2205	+
	2206	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2207	+ aniso.setToolTipText("AnisoU");
	2208	+ aniso.addMouseListener(new MouseAdapter()
	2209	+ {
	2210	+ public void mouseClicked(MouseEvent e)
	2211	+ {
	2212	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2213	+ cMaterial material = object.material;
	2214	+
	2215	+ anisoField.setFloat(material.aniso);
	2216	+ anisoVField.setFloat(material.anisoV);
	2217	+
	2218	+ materialtouched = true;
	2219	+ applySelf();
	2220	+ }
	2221	+ });
	2222	+ presetpanel.add(aniso);
	2223	+
	2224	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2225	+ aniso2.setToolTipText("AnisoV");
	2226	+ aniso2.addMouseListener(new MouseAdapter()
	2227	+ {
	2228	+ public void mouseClicked(MouseEvent e)
	2229	+ {
	2230	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2231	+ cMaterial material = object.material;
	2232	+
	2233	+ anisoField.setFloat(material.aniso);
	2234	+ anisoVField.setFloat(material.anisoV);
	2235	+
	2236	+ materialtouched = true;
	2237	+ applySelf();
	2238	+ }
	2239	+ });
	2240	+ presetpanel.add(aniso2);
	2241	+
	2242	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2243	+ aniso3.setToolTipText("AnisoUV");
	2244	+ aniso3.addMouseListener(new MouseAdapter()
	2245	+ {
	2246	+ public void mouseClicked(MouseEvent e)
	2247	+ {
	2248	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2249	+ cMaterial material = object.material;
	2250	+
	2251	+ anisoField.setFloat(material.aniso);
	2252	+ anisoVField.setFloat(material.anisoV);
	2253	+
	2254	+ materialtouched = true;
	2255	+ applySelf();
	2256	+ }
	2257	+ });
	2258	+ presetpanel.add(aniso3);
	2259	+
	2260	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2261	+ velvet0.setToolTipText("Velvet");
	2262	+ velvet0.addMouseListener(new MouseAdapter()
	2263	+ {
	2264	+ public void mouseClicked(MouseEvent e)
	2265	+ {
	2266	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2267	+ cMaterial material = object.material;
	2268	+
	2269	+ diffusenessField.setFloat(material.factor);
	2270	+ selfshadowField.setFloat(material.diffuseness);
	2271	+ sheenField.setFloat(material.sheen);
	2272	+ shininessField.setFloat(material.shininess);
	2273	+ velvetField.setFloat(material.velvet);
	2274	+ shiftField.setFloat(material.shift);
	2275	+
	2276	+ materialtouched = true;
	2277	+ applySelf();
	2278	+ }
	2279	+ });
	2280	+ presetpanel.add(velvet0);
	2281	+
	2282	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2283	+ bump0.setToolTipText("Bump texture");
	2284	+ bump0.addMouseListener(new MouseAdapter()
	2285	+ {
	2286	+ public void mouseClicked(MouseEvent e)
	2287	+ {
	2288	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2289	+ cMaterial material = object.material;
	2290	+
	2291	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2292	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2293	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2294	+
	2295	+ materialtouched = true;
	2296	+ applySelf();
	2297	+ }
	2298	+ });
	2299	+ presetpanel.add(bump0);
	2300	+
	2301	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2302	+ borderShader.setToolTipText("Border fade");
	2303	+ borderShader.addMouseListener(new MouseAdapter()
	2304	+ {
	2305	+ public void mouseClicked(MouseEvent e)
	2306	+ {
	2307	+ borderfadeField.setFloat(0.5);
	2308	+ opacityField.setFloat(0.75);
	2309	+
	2310	+ materialtouched = true;
	2311	+ applySelf();
	2312	+ }
	2313	+ });
	2314	+ presetpanel.add(borderShader);
	2315	+
	2316	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2317	+ halo.setToolTipText("Halo");
	2318	+ halo.addMouseListener(new MouseAdapter()
	2319	+ {
	2320	+ public void mouseClicked(MouseEvent e)
	2321	+ {
	2322	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2323	+ cMaterial material = object.material;
	2324	+
	2325	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2326	+
	2327	+ materialtouched = true;
	2328	+ applySelf();
	2329	+ }
	2330	+ });
	2331	+ presetpanel.add(halo);
	2332	+
	2333	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2334	+ candle.setToolTipText("Candle");
	2335	+ candle.addMouseListener(new MouseAdapter()
	2336	+ {
	2337	+ public void mouseClicked(MouseEvent e)
	2338	+ {
	2339	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2340	+ cMaterial material = object.material;
	2341	+
	2342	+ subsurfaceField.setFloat(material.subsurface);
	2343	+ shadowbiasField.setFloat(material.shadowbias);
	2344	+ ambientField.setFloat(material.ambient);
	2345	+ specularField.setFloat(material.specular);
	2346	+ lightareaField.setFloat(material.lightarea);
	2347	+ shininessField.setFloat(material.shininess);
	2348	+
	2349	+ materialtouched = true;
	2350	+ applySelf();
	2351	+ }
	2352	+ });
	2353	+ presetpanel.add(candle);
	2354	+
	2355	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2356	+ shadowShader.setToolTipText("Shadow");
	2357	+ shadowShader.addMouseListener(new MouseAdapter()
	2358	+ {
	2359	+ public void mouseClicked(MouseEvent e)
	2360	+ {
	2361	+ diffuseField.setFloat(0.001);
	2362	+ ambientField.setFloat(0.001);
	2363	+ cameraField.setFloat(0.001);
	2364	+ specularField.setFloat(0.001);
	2365	+ fakedepthField.setFloat(0.001);
	2366	+ opacityField.setFloat(0.6);
	2367	+
	2368	+ materialtouched = true;
	2369	+ applySelf();
	2370	+ }
	2371	+ });
	2372	+ presetpanel.add(shadowShader);
	2373	+
	2374	+ cGridBag panel = new cGridBag().setVertical(true);
	2375	+
	2376	+ presetpanel.preferredWidth = 1;
	2377	+
	2378	+ materialpanel.add(presetpanel);
	2379	+ materialpanel.add(panel);
	2380	+
	2381	+ panel.preferredWidth = 8;
	2382	+
	2383	+ /*
1689	2384	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1690	2385	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1691		- */
	2386	+ */
1692	2387
1693	2388	cGridBag editBar = new cGridBag().setVertical(false);
1694	2389
1695		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2390	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1696	2391	createMaterialButton.setToolTipText("Create material");
1697	2392
1698	2393	/*
1699	2394	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1700	2395	*/
1701	2396
1702		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2397	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1703	2398	clearMaterialButton.setToolTipText("Clear material");
1704	2399
1705	2400	if (Globals.ADVANCED)
1706	2401	{
1707		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2402	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1708	2403	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1709	2404	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1710	2405	}
..	..	@@ -1722,27 +2417,61 @@
1722	2417	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1723	2418
1724	2419	cGridBag colorSection = new cGridBag().setVertical(true);
	2420	+
	2421	+ cGridBag huepanel = new cGridBag();
	2422	+ cGridBag huelabel = new cGridBag();
	2423	+ cLabel hue = GetLabel("icons/hue.png", false);
	2424	+ hue.fit = true;
	2425	+
	2426	+ hue.addMouseListener(new MouseAdapter()
	2427	+ {
	2428	+ public void mousePressed(MouseEvent e)
	2429	+ {
	2430	+ int x = e.getX();
	2431	+
	2432	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2433	+ }
	2434	+ });
	2435	+
	2436	+ huelabel.add(hue);
	2437	+ huelabel.preferredWidth = 20;
	2438	+ huepanel.add(new cGridBag()); // Label
	2439	+ huepanel.add(huelabel); // Field/slider
	2440	+
	2441	+ huepanel.preferredHeight = 7;
	2442	+
	2443	+ colorSection.add(huepanel);
1725	2444
1726	2445	cGridBag color = new cGridBag();
1727		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1728		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1729		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2446	+
	2447	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2448	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2449	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2450	+
1730	2451	//colorField.preferredWidth = 200;
1731	2452	colorSection.add(color);
1732	2453
1733	2454	cGridBag modulation = new cGridBag();
1734	2455	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1735	2456	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2457	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1737	2458	colorSection.add(modulation);
1738	2459
	2460	+ cGridBag opacity = new cGridBag();
	2461	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2462	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2463	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2464	+ colorSection.add(opacity);
	2465	+
	2466	+ colorSection.add(GetSeparator());
	2467	+
1739	2468	cGridBag texture = new cGridBag();
1740	2469	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1741	2470	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1742	2471	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1743	2472	colorSection.add(texture);
1744	2473
1745		- panel.add(new JSeparator());
	2474	+ panel.add(GetSeparator());
1746	2475
1747	2476	panel.add(colorSection);
1748	2477
..	..	@@ -1798,7 +2527,7 @@
1798	2527	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1799	2528	diffuseSection.add(shadowbias);
1800	2529
1801		- panel.add(new JSeparator());
	2530	+ panel.add(GetSeparator());
1802	2531
1803	2532	panel.add(diffuseSection);
1804	2533
..	..	@@ -1861,7 +2590,7 @@
1861	2590	specularSection.add(anisoV);
1862	2591
1863	2592
1864		- panel.add(new JSeparator());
	2593	+ panel.add(GetSeparator());
1865	2594
1866	2595	panel.add(specularSection);
1867	2596
..	..	@@ -1886,12 +2615,6 @@
1886	2615	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1887	2616	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1888	2617	colorSection.add(backlit);
1889		-
1890		- cGridBag opacity = new cGridBag();
1891		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1892		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1893		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1894		- colorSection.add(opacity);
1895	2618
1896	2619	//panel.add(new JSeparator());
1897	2620
..	..	@@ -1937,7 +2660,7 @@
1937	2660	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1938	2661	textureSection.add(opacityPower);
1939	2662
1940		- panel.add(new JSeparator());
	2663	+ panel.add(GetSeparator());
1941	2664
1942	2665	panel.add(textureSection);
1943	2666
..	..	@@ -2924,7 +3647,7 @@
2924	3647
2925	3648	freezematerial = true;
2926	3649	colorField.setFloat(mat.color);
2927		- modulationField.setFloat(mat.modulation);
	3650	+ saturationField.setFloat(mat.modulation);
2928	3651	metalnessField.setFloat(mat.metalness);
2929	3652	diffuseField.setFloat(mat.diffuse);
2930	3653	specularField.setFloat(mat.specular);
..	..	@@ -2986,32 +3709,8 @@
2986	3709
2987	3710	if (multiplyToggle != null)
2988	3711	multiplyToggle.setSelected(mat.multiply);
2989		-
2990		- assert (object.projectedVertices != null);
2991		-
2992		- if (object.projectedVertices.length <= 2)
2993		- {
2994		- // Side effect...
2995		- Object3D.cVector2[] keep = object.projectedVertices;
2996		- object.projectedVertices = new Object3D.cVector2[3];
2997		- for (int i = 0; i < 3; i++)
2998		- {
2999		- if (i < keep.length)
3000		- {
3001		- object.projectedVertices[i] = keep[i];
3002		- } else
3003		- {
3004		- object.projectedVertices[i] = new Object3D.cVector2();
3005		- }
3006		- /*
3007		- if(keep.length == 0)
3008		- object.projectedVertices[0] = new Object3D.cVector2();
3009		- else
3010		- object.projectedVertices[0] = keep[0];
3011		- object.projectedVertices[1] = new Object3D.cVector2();
3012		- */
3013		- }
3014		- }
	3712	+
	3713	+ AllocProjectedVertices(object);
3015	3714
3016	3715	SetMaterial(mat, object.projectedVertices);
3017	3716	}
..	..	@@ -3131,6 +3830,17 @@
3131	3830	public void itemStateChanged(ItemEvent event)
3132	3831	{
3133	3832	// System.out.println("Propagate = " + propagate);
	3833	+ if (event.getSource() == pinButton)
	3834	+ {
	3835	+ copy.pinned ^= true;
	3836	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3837	+ {
	3838	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3839	+ copy.CloseUI();
	3840	+ //copy.editWindow.refreshContents();
	3841	+ }
	3842	+ }
	3843	+ else
3134	3844	if (event.getSource() == propagateToggle)
3135	3845	{
3136	3846	propagate ^= true;
..	..	@@ -3235,8 +3945,9 @@
3235	3945	} else if (event.getSource() == liveCB)
3236	3946	{
3237	3947	copy.live ^= true;
	3948	+ objEditor.refreshContents(true); // To show item colors
3238	3949	return;
3239		- } else if (event.getSource() == selectCB)
	3950	+ } else if (event.getSource() == selectableCB)
3240	3951	{
3241	3952	copy.dontselect ^= true;
3242	3953	return;
..	..	@@ -3244,7 +3955,7 @@
3244	3955	{
3245	3956	copy.hide ^= true;
3246	3957	copy.Touch(); // display list issue
3247		- objEditor.refreshContents();
	3958	+ objEditor.refreshContents(true); // To show item colors
3248	3959	return;
3249	3960	} else if (event.getSource() == link2masterCB)
3250	3961	{
..	..	@@ -3309,7 +4020,7 @@
3309	4020	//System.out.println("ObjEditor " + event);
3310	4021	applySelf0(true);
3311	4022	//parent.applySelf();
3312		- objEditor.refreshContents();
	4023	+ // conflicts with requestFocus objEditor.refreshContents();
3313	4024	} else if (source == resetButton)
3314	4025	{
3315	4026	CameraPane.fullreset = true;
..	..	@@ -3489,17 +4200,25 @@
3489	4200
3490	4201	void New()
3491	4202	{
3492		- while (copy.Size() > 1)
	4203	+ while (copy.Size() > 0)
3493	4204	{
3494		- copy.remove(1);
	4205	+ copy.remove(0);
3495	4206	}
3496	4207
	4208	+ copy.selection.clear();
	4209	+
	4210	+ if (copy == Grafreed.grafreed.universe)
	4211	+ {
	4212	+ CreateCameras();
	4213	+ cameraView.SetCamera(GetCamera(copy, 0));
	4214	+ }
3497	4215	ResetModel();
3498	4216	objEditor.refreshContents();
3499	4217	}
3500	4218
3501	4219	static public byte[] Compress(Object3D o)
3502	4220	{
	4221	+ // Slower to actually compress.
3503	4222	try
3504	4223	{
3505	4224	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3601,6 +4320,7 @@
3601	4320	{
3602	4321	//Save(true);
3603	4322	Replace();
	4323	+ SetVersionStates();
3604	4324	}
3605	4325
3606	4326	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3619,31 +4339,50 @@
3619	4339	return true;
3620	4340	}
3621	4341
3622		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4342	+ void DeleteVersion()
	4343	+ {
	4344	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4345	+ {
	4346	+ copy.versionlist[i] = copy.versionlist[i+1];
	4347	+ }
	4348	+
	4349	+ if (copy.versionlist[copy.versionindex] == null)
	4350	+ copy.versionindex -= 1;
	4351	+
	4352	+ if (copy.versionindex != -1)
	4353	+ CopyChanged();
	4354	+
	4355	+ SetVersionStates();
	4356	+ }
3623	4357
3624	4358	public boolean Save(boolean user)
3625	4359	{
3626	4360	System.err.println("Save");
	4361	+ Replace();
3627	4362
3628		- cRadio tab = GetCurrentTab();
	4363	+ //cRadio tab = GetCurrentTab();
3629	4364
3630		- byte[] compress = CompressCopy();
	4365	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3631	4366
3632	4367	boolean thesame = false;
3633	4368
3634		- // Quick heuristic using length. Works only when stream is compressed.
3635		- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3636		- {
3637		- thesame = true;
3638		- }
	4369	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4370	+// {
	4371	+// thesame = true;
	4372	+// }
3639	4373
3640	4374	//EditorFrame.m_MainFrame.requestFocusInWindow();
3641	4375	if (!thesame)
3642	4376	{
	4377	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4378	+ {
	4379	+ copy.versionlist[i] = copy.versionlist[i-1];
	4380	+ }
	4381	+
3643	4382	//tab.user[tab.versionindex] = user;
3644	4383	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3645	4384
3646		- copy.versions[++copy.versionindex] = compress;
	4385	+ copy.versionlist[++copy.versionindex] = compress;
3647	4386
3648	4387	// if (increment)
3649	4388	// tab.versionindex++;
..	..	@@ -3653,13 +4392,13 @@
3653	4392
3654	4393	//assert(hashtable.isEmpty());
3655	4394
3656		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3657		- {
3658		- //tab.user[i] = false;
3659		- copy.versions[i] = null;
3660		- }
	4395	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4396	+// {
	4397	+// //tab.user[i] = false;
	4398	+// copy.versionlist[i] = null;
	4399	+// }
3661	4400
3662		- SetUndoStates();
	4401	+ SetVersionStates();
3663	4402
3664	4403	// test save
3665	4404	if (false)
..	..	@@ -3682,27 +4421,65 @@
3682	4421
3683	4422	return !thesame;
3684	4423	}
3685		-
3686		- void CopyChanged(Object3D obj)
	4424	+
	4425	+ boolean flashIt = true;
	4426	+
	4427	+ void RefreshSelection()
3687	4428	{
3688		- SetUndoStates();
	4429	+ Object3D selection = new Object3D();
	4430	+
	4431	+ for (int i = 0; i < copy.selection.size(); i++)
	4432	+ {
	4433	+ Object3D elem = copy.selection.elementAt(i);
	4434	+
	4435	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4436	+
	4437	+ if (obj == null)
	4438	+ {
	4439	+ copy.selection.remove(i--);
	4440	+ }
	4441	+ else
	4442	+ {
	4443	+ selection.add(obj);
	4444	+ copy.selection.setElementAt(obj, i);
	4445	+ }
	4446	+ }
	4447	+
	4448	+ flashIt = false;
	4449	+ GetTree().clearSelection();
	4450	+ for (int i = 0; i < selection.size(); i++)
	4451	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4452	+ flashIt = true;
	4453	+
	4454	+ //refreshContents(false);
	4455	+ }
	4456	+
	4457	+ void CopyChanged()
	4458	+ {
	4459	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4460	+
	4461	+ SetVersionStates();
3689	4462
3690	4463	boolean temp = CameraPane.SWITCH;
3691	4464	CameraPane.SWITCH = false;
3692	4465
3693		- copy.ExtractBigData(versiontable);
	4466	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3694	4467
3695	4468	copy.clear();
3696	4469
	4470	+ copy.skyboxname = obj.skyboxname;
	4471	+ copy.skyboxext = obj.skyboxext;
	4472	+
3697	4473	for (int i=0; i<obj.Size(); i++)
3698	4474	{
3699	4475	copy.add(obj.get(i));
3700	4476	}
3701	4477
3702		- copy.RestoreBigData(versiontable);
	4478	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3703	4479
3704	4480	CameraPane.SWITCH = temp;
3705	4481
	4482	+ RefreshSelection();
3706	4483	//assert(hashtable.isEmpty());
3707	4484
3708	4485	copy.Touch();
..	..	@@ -3723,29 +4500,80 @@
3723	4500	}
3724	4501	}
3725	4502
3726		- refreshContents();
	4503	+ refreshContents(true);
3727	4504	}
3728	4505
3729		- cButton undoButton;
	4506	+ cButton previousVersionButton;
3730	4507	cButton restoreButton;
3731	4508	cButton replaceButton;
3732		- cButton redoButton;
	4509	+ cButton nextVersionButton;
	4510	+ cButton saveVersionButton;
	4511	+ cButton deleteVersionButton;
3733	4512
3734		- void SetUndoStates()
	4513	+ boolean muteSlider;
	4514	+
	4515	+ int VersionCount()
3735	4516	{
3736		- cRadio tab = GetCurrentTab();
	4517	+ int count = 0;
3737	4518
3738		- restoreButton.setEnabled(copy.versionindex != -1);
3739		- replaceButton.setEnabled(copy.versionindex != -1);
3740		- undoButton.setEnabled(copy.versionindex > 0);
3741		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	4519	+ for (int i = copy.versionlist.length; --i >= 0;)
	4520	+ {
	4521	+ if (copy.versionlist[i] != null)
	4522	+ count++;
	4523	+ }
	4524	+
	4525	+ return count;
3742	4526	}
3743	4527
3744		- public boolean Undo()
	4528	+ public cGridBag versionSliderPane;
	4529	+
	4530	+ void SetVersionStates()
3745	4531	{
	4532	+ //if (true)
	4533	+ // return;
	4534	+
	4535	+ //cRadio tab = GetCurrentTab();
	4536	+
	4537	+ if (copy.versionlist == null)
	4538	+ {
	4539	+ saveVersionButton.setEnabled(false);
	4540	+ restoreButton.setEnabled(false);
	4541	+ replaceButton.setEnabled(false);
	4542	+ previousVersionButton.setEnabled(false);
	4543	+ nextVersionButton.setEnabled(false);
	4544	+ deleteVersionButton.setEnabled(false);
	4545	+ versionSliderPane.setVisible(false);
	4546	+ }
	4547	+ else
	4548	+ {
	4549	+ restoreButton.setEnabled(copy.versionindex != -1);
	4550	+ replaceButton.setEnabled(copy.versionindex != -1);
	4551	+
	4552	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4553	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4554	+
	4555	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4556	+ //copy.versionlist[copy.versionindex + 1] != null);
	4557	+
	4558	+ muteSlider = true;
	4559	+ versionSlider.setMinimum(0);
	4560	+ versionSlider.setMaximum(VersionCount() - 1);
	4561	+ versionSlider.setInteger(copy.versionindex);
	4562	+ versionSlider.setEnabled(copy.versionindex != -1);
	4563	+ muteSlider = false;
	4564	+
	4565	+ versionSliderPane.setVisible(true);
	4566	+ }
	4567	+ }
	4568	+
	4569	+ public boolean PreviousVersion()
	4570	+ {
	4571	+ // Option?
	4572	+ Replace();
	4573	+
3746	4574	System.err.println("Undo");
3747	4575
3748		- cRadio tab = GetCurrentTab();
	4576	+ //cRadio tab = GetCurrentTab();
3749	4577
3750	4578	if (copy.versionindex == 0)
3751	4579	{
..	..	@@ -3768,7 +4596,7 @@
3768	4596
3769	4597	copy.versionindex -= 1;
3770	4598
3771		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4599	+ CopyChanged();
3772	4600
3773	4601	return true;
3774	4602	}
..	..	@@ -3777,41 +4605,45 @@
3777	4605	{
3778	4606	System.err.println("Restore");
3779	4607
3780		- cRadio tab = GetCurrentTab();
	4608	+ //cRadio tab = GetCurrentTab();
3781	4609
3782		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4610	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3783	4611	{
3784	4612	java.awt.Toolkit.getDefaultToolkit().beep();
3785	4613	return false;
3786	4614	}
3787	4615
3788		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4616	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4617	+ CopyChanged();
3789	4618
3790	4619	return true;
3791	4620	}
3792	4621
3793	4622	public boolean Replace()
3794	4623	{
3795		- System.err.println("Replace");
	4624	+ //System.err.println("Replace");
3796	4625
3797		- cRadio tab = GetCurrentTab();
	4626	+ //cRadio tab = GetCurrentTab();
3798	4627
3799		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4628	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3800	4629	{
3801	4630	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3802	4631	return false;
3803	4632	}
3804	4633
3805		- copy.versions[copy.versionindex] = CompressCopy();
	4634	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3806	4635
3807	4636	return true;
3808	4637	}
3809	4638
3810		- public void Redo()
	4639	+ public void NextVersion()
3811	4640	{
3812		- cRadio tab = GetCurrentTab();
	4641	+ // Option?
	4642	+ Replace();
3813	4643
3814		- if (copy.versions[copy.versionindex + 1] == null)
	4644	+ //cRadio tab = GetCurrentTab();
	4645	+
	4646	+ if (copy.versionlist[copy.versionindex + 1] == null)
3815	4647	{
3816	4648	java.awt.Toolkit.getDefaultToolkit().beep();
3817	4649	return;
..	..	@@ -3819,7 +4651,7 @@
3819	4651
3820	4652	copy.versionindex += 1;
3821	4653
3822		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4654	+ CopyChanged();
3823	4655
3824	4656	//if (!tab.user[tab.versionindex])
3825	4657	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4016,6 +4848,12 @@
4016	4848	// else
4017	4849	// applySelf(true);
4018	4850	// }
	4851	+
	4852	+ boolean Equal(double a, double b)
	4853	+ {
	4854	+ return Math.abs(a - b) < 0.001;
	4855	+ }
	4856	+
4019	4857	void applySelf0(boolean name)
4020	4858	{
4021	4859	if (name)
..	..	@@ -4033,7 +4871,7 @@
4033	4871	//copy.material = new cMaterial(copy.GetMaterial());
4034	4872
4035	4873	current.color = (float) colorField.getFloat();
4036		- current.modulation = (float) modulationField.getFloat();
	4874	+ current.modulation = (float) saturationField.getFloat();
4037	4875	current.metalness = (float) metalnessField.getFloat();
4038	4876	current.diffuse = (float) diffuseField.getFloat();
4039	4877	current.specular = (float) specularField.getFloat();
..	..	@@ -4065,29 +4903,52 @@
4065	4903	{
4066	4904	cMaterial mat = copy.material;
4067	4905
4068		- colorField.SetToolTipValue((mat.color));
4069		- modulationField.SetToolTipValue((mat.modulation));
4070		- metalnessField.SetToolTipValue((mat.metalness));
4071		- diffuseField.SetToolTipValue((mat.diffuse));
4072		- specularField.SetToolTipValue((mat.specular));
4073		- shininessField.SetToolTipValue((mat.shininess));
4074		- shiftField.SetToolTipValue((mat.shift));
4075		- ambientField.SetToolTipValue((mat.ambient));
4076		- lightareaField.SetToolTipValue((mat.lightarea));
4077		- diffusenessField.SetToolTipValue((mat.factor));
4078		- velvetField.SetToolTipValue((mat.velvet));
4079		- sheenField.SetToolTipValue((mat.sheen));
4080		- subsurfaceField.SetToolTipValue((mat.subsurface));
4081		- backlitField.SetToolTipValue((mat.bump));
4082		- anisoField.SetToolTipValue((mat.aniso));
4083		- anisoVField.SetToolTipValue((mat.anisoV));
4084		- cameraField.SetToolTipValue((mat.cameralight));
4085		- selfshadowField.SetToolTipValue((mat.diffuseness));
4086		- shadowField.SetToolTipValue((mat.shadow));
4087		- textureField.SetToolTipValue((mat.texture));
4088		- opacityField.SetToolTipValue((mat.opacity));
4089		- fakedepthField.SetToolTipValue((mat.fakedepth));
4090		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4906	+ if (!Equal(colorField.getFloat(), mat.color))
	4907	+ colorField.SetToolTipValue((mat.color));
	4908	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4909	+ saturationField.SetToolTipValue((mat.modulation));
	4910	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4911	+ metalnessField.SetToolTipValue((mat.metalness));
	4912	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4913	+ diffuseField.SetToolTipValue((mat.diffuse));
	4914	+ if (!Equal(specularField.getFloat(), mat.specular))
	4915	+ specularField.SetToolTipValue((mat.specular));
	4916	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4917	+ shininessField.SetToolTipValue((mat.shininess));
	4918	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4919	+ shiftField.SetToolTipValue((mat.shift));
	4920	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4921	+ ambientField.SetToolTipValue((mat.ambient));
	4922	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4923	+ lightareaField.SetToolTipValue((mat.lightarea));
	4924	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4925	+ diffusenessField.SetToolTipValue((mat.factor));
	4926	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4927	+ velvetField.SetToolTipValue((mat.velvet));
	4928	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4929	+ sheenField.SetToolTipValue((mat.sheen));
	4930	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4931	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4932	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4933	+ backlitField.SetToolTipValue((mat.bump));
	4934	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4935	+ anisoField.SetToolTipValue((mat.aniso));
	4936	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4937	+ anisoVField.SetToolTipValue((mat.anisoV));
	4938	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4939	+ cameraField.SetToolTipValue((mat.cameralight));
	4940	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4941	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4942	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4943	+ shadowField.SetToolTipValue((mat.shadow));
	4944	+ if (!Equal(textureField.getFloat(), mat.texture))
	4945	+ textureField.SetToolTipValue((mat.texture));
	4946	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4947	+ opacityField.SetToolTipValue((mat.opacity));
	4948	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4949	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4950	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4951	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4091	4952	}
4092	4953
4093	4954	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4118,18 +4979,24 @@
4118	4979	//copy.Touch();
4119	4980	}
4120	4981
4121		- cNumberSlider versionField;
	4982	+ cNumberSlider versionSlider;
4122	4983
4123	4984	public void stateChanged(ChangeEvent e)
4124	4985	{
4125		- // assert(false);
4126		- if (e.getSource() == versionField)
	4986	+ // assert(false);
	4987	+ if (e.getSource() == versionSlider)
4127	4988	{
4128		- int version = versionField.getInteger();
	4989	+ if (muteSlider)
	4990	+ return;
4129	4991
4130		- if (copy.versions[version] != null)
	4992	+ Replace();
	4993	+
	4994	+ int version = versionSlider.getInteger();
	4995	+
	4996	+ if (version != -1 && copy.versionlist[version] != null)
4131	4997	{
4132		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4998	+ copy.versionindex = version;
	4999	+ CopyChanged();
4133	5000	}
4134	5001
4135	5002	return;
..	..	@@ -4169,6 +5036,12 @@
4169	5036	{
4170	5037	//System.out.println("stateChanged = " + this);
4171	5038	materialtouched = true;
	5039	+
	5040	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5041	+ {
	5042	+ saturationField.setFloat(1);
	5043	+ }
	5044	+
4172	5045	applySelf();
4173	5046	//System.out.println("this = " + this);
4174	5047	//System.out.println("PARENT = " + parent);
..	..	@@ -4468,6 +5341,7 @@
4468	5341	{
4469	5342	if (GetTree() != null)
4470	5343	{
	5344	+ GetTree().revalidate();
4471	5345	GetTree().repaint();
4472	5346	}
4473	5347
..	..	@@ -4476,6 +5350,11 @@
4476	5350	ctrlPanel.validate(); // ? new
4477	5351	ctrlPanel.repaint();
4478	5352	}
	5353	+
	5354	+ if (previousVersionButton != null && copy.versionlist != null)
	5355	+ SetVersionStates();
	5356	+
	5357	+ cameraView.requestFocusInWindow();
4479	5358	}
4480	5359
4481	5360	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4507,7 +5386,7 @@
4507	5386	// group = (Composite) group.get(0);
4508	5387	// }
4509	5388
4510		- System.out.println("makeSomething of " + thing);
	5389	+ //System.out.println("makeSomething of " + thing);
4511	5390
4512	5391	/*
4513	5392	if (deselect && jList != null)
..	..	@@ -4724,7 +5603,9 @@
4724	5603	readobj.ResetDisplayList();
4725	5604	} catch (Exception e)
4726	5605	{
4727		- //e.printStackTrace();
	5606	+ if (!e.toString().contains("GZIP"))
	5607	+ e.printStackTrace();
	5608	+
4728	5609	try
4729	5610	{
4730	5611	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4804,6 +5685,8 @@
4804	5685	{
4805	5686	//readobj.deepCopySelf(copy);
4806	5687	copy.clear(); // june 2014
	5688	+ copy.skyboxname = readobj.skyboxname;
	5689	+ copy.skyboxext = readobj.skyboxext;
4807	5690	for (int i = 0; i < readobj.size(); i++)
4808	5691	{
4809	5692	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4844,6 +5727,7 @@
4844	5727	}
4845	5728	} catch (ClassCastException e)
4846	5729	{
	5730	+ e.printStackTrace();
4847	5731	assert (false);
4848	5732	Composite c = (Composite) copy;
4849	5733	c.children.clear();
..	..	@@ -4854,10 +5738,20 @@
4854	5738	c.addChild(csg);
4855	5739	}
4856	5740
4857		- copy.versions = readobj.versions;
	5741	+ copy.versionlist = readobj.versionlist;
4858	5742	copy.versionindex = readobj.versionindex;
	5743	+ copy.versiontable = readobj.versiontable;
4859	5744
4860		- SetUndoStates();
	5745	+ if (copy.versionlist == null)
	5746	+ {
	5747	+ // Backward compatibility
	5748	+ copy.versionlist = new Object3D[100];
	5749	+ copy.versionindex = -1;
	5750	+
	5751	+ //Save(true);
	5752	+ }
	5753	+
	5754	+ //? SetUndoStates();
4861	5755
4862	5756	ResetModel();
4863	5757	copy.HardTouch(); // recompile?
..	..	@@ -4869,7 +5763,7 @@
4869	5763	{
4870	5764	if (Grafreed.standAlone)
4871	5765	{
4872		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5766	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4873	5767	browser.show();
4874	5768	String filename = browser.getFile();
4875	5769	if (filename != null && filename.length() > 0)
..	..	@@ -4946,6 +5840,8 @@
4946	5840
4947	5841	void save()
4948	5842	{
	5843	+ Replace();
	5844	+
4949	5845	if (lastname == null)
4950	5846	{
4951	5847	return;
..	..	@@ -4968,6 +5864,7 @@
4968	5864	//ps.print(buffer.toString());
4969	5865	} catch (IOException e)
4970	5866	{
	5867	+ e.printStackTrace();
4971	5868	}
4972	5869	}
4973	5870
..	..	@@ -5187,6 +6084,7 @@
5187	6084	ButtonGroup buttonGroup;
5188	6085
5189	6086	cGridBag toolboxPanel;
	6087	+ cGridBag skyboxPanel;
5190	6088	cGridBag materialPanel;
5191	6089	cGridBag ctrlPanel;
5192	6090
..	..	@@ -5198,6 +6096,7 @@
5198	6096	boolean materialFlushed;
5199	6097	Object3D latestObject;
5200	6098
	6099	+ cGridBag transformPanel;
5201	6100	cGridBag XYZPanel;
5202	6101
5203	6102	JSplitPane gridPanel;
..	..	@@ -5260,7 +6159,7 @@
5260	6159	JLabel colorLabel;
5261	6160	cNumberSlider colorField;
5262	6161	JLabel modulationLabel;
5263		- cNumberSlider modulationField;
	6162	+ cNumberSlider saturationField;
5264	6163	JLabel metalnessLabel;
5265	6164	cNumberSlider metalnessField;
5266	6165	JLabel diffuseLabel;
..	..	@@ -5291,6 +6190,7 @@
5291	6190	cNumberSlider anisoField;
5292	6191	JLabel anisoVLabel;
5293	6192	cNumberSlider anisoVField;
	6193	+
5294	6194	JLabel cameraLabel;
5295	6195	cNumberSlider cameraField;
5296	6196	JLabel selfshadowLabel;
..	..	@@ -5305,6 +6205,7 @@
5305	6205	cNumberSlider fakedepthField;
5306	6206	JLabel shadowbiasLabel;
5307	6207	cNumberSlider shadowbiasField;
	6208	+
5308	6209	JLabel bumpLabel;
5309	6210	cNumberSlider bumpField;
5310	6211	JLabel noiseLabel;