~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,143 @@
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;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
	145	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	146	+// {
	147	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	148	+// Graphics2D g = resized.createGraphics();
	149	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	150	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	151	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	152	+// g.dispose();
	153	+//
	154	+// image = resized;
	155	+// }
	156	+
	157	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
	161	+ return icon;
77	162	}
78	163	catch (Exception e)
79	164	{
80		- return new cCheckBox(name, border);
	165	+ //icons.put(name, null);
	166	+ return null;
81	167	}
82	168	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	169	+
	170	+ BufferedImage GetImage(String name)
85	171	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	172	+ try
89	173	{
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;
	174	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	175	+
	176	+ return image;
98	177	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	178	+ catch (Exception e)
	179	+ {
	180	+ return null;
	181	+ }
102	182	}
103	183
104	184	// SCRIPT
..	..	@@ -282,11 +362,13 @@
282	362	client = inClient;
283	363	copy = client;
284	364
285		- if (copy.versions == null)
286		- {
287		- copy.versions = new byte[100][];
288		- copy.versionindex = -1;
289		- }
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
290	372
291	373	// "this" is not called: SetupUI2(objEditor);
292	374	}
..	..	@@ -301,12 +383,6 @@
301	383	client = inClient;
302	384	copy = client;
303	385
304		- if (copy.versions == null)
305		- {
306		- copy.versions = new byte[100][];
307		- copy.versionindex = -1;
308		- }
309		-
310	386	SetupUI2(callee.GetEditor());
311	387	}
312	388
..	..	@@ -328,7 +404,8 @@
328	404	//parent = p;
329	405
330	406	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
331		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	407	+ if (Globals.DEBUG)
	408	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
332	409	//gd.setFullScreenWindow(this);
333	410	//setResizable(false);
334	411	//if (!isDisplayable())
..	..	@@ -339,11 +416,13 @@
339	416	copy = localCopy;
340	417	copy.editWindow = this;
341	418
342		- if (copy.versions == null)
343		- {
344		- copy.versions = new byte[100][];
345		- copy.versionindex = -1;
346		- }
	419	+// if (copy.versionlist == null)
	420	+// {
	421	+// copy.versionlist = new Object3D[100];
	422	+// copy.versionindex = -1;
	423	+//
	424	+// Save(true);
	425	+// }
347	426
348	427	SetupMenu();
349	428
..	..	@@ -363,6 +442,9 @@
363	442
364	443	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
365	444
	445	+ // This is to refresh the UI of the material panel.
	446	+ boolean patchMaterial;
	447	+
366	448	void SetupMenu()
367	449	{
368	450	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -376,8 +458,11 @@
376	458	importOBJItem.addActionListener(this);
377	459	import3DSItem = menu.add(new MenuItem("3DS file..."));
378	460	import3DSItem.addActionListener(this);
	461	+ if (Globals.ADVANCED)
	462	+ {
379	463	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
380	464	importVRMLX3DItem.addActionListener(this);
	465	+ }
381	466	menu.add("-");
382	467	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
383	468	importGFDItem.addActionListener(this);
..	..	@@ -412,6 +497,8 @@
412	497
413	498	ChangeListener changeListener = new ChangeListener()
414	499	{
	500	+ //String name;
	501	+
415	502	public void stateChanged(ChangeEvent changeEvent)
416	503	{
417	504	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -430,18 +517,49 @@
430	517	// EditSelection(false);
431	518	// }
432	519
433		- refreshContents(false); // To refresh Info tab
	520	+// if (objectPanel.getSelectedIndex() == 4)
	521	+// {
	522	+// name = copy.skyboxname;
	523	+//
	524	+// if (name == null)
	525	+// {
	526	+// name = "";
	527	+// }
	528	+//
	529	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	530	+// copy.skyboxext = "jpg";
	531	+// }
	532	+// else
	533	+// {
	534	+// if (name != null)
	535	+// {
	536	+// if (name.equals(""))
	537	+// {
	538	+// copy.skyboxname = null;
	539	+// copy.skyboxext = null;
	540	+// }
	541	+// else
	542	+// {
	543	+// copy.skyboxname = name;
	544	+// }
	545	+// }
	546	+// }
	547	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	548	+
	549	+// refreshContents(false); // To refresh Info tab
	550	+ cameraView.repaint();
434	551	}
435	552	};
436	553	objectPanel.addChangeListener(changeListener);
437	554
438	555	toolbarPanel = new JPanel();
439	556	toolbarPanel.setName("Toolbar");
	557	+
440	558	treePanel = new cGridBag();
441	559	treePanel.setName("Tree");
442	560
443	561	editPanel = new cGridBag().setVertical(true);
444		- editPanel.setName("Edit");
	562	+ //editPanel.setName("Edit");
445	563
446	564	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
447	565
..	..	@@ -449,11 +567,13 @@
449	567	editPanel.add(editCommandsPanel);
450	568	editPanel.add(ctrlPanel);
451	569
452		- toolboxPanel = new cGridBag().setVertical(false);
453		- toolboxPanel.setName("Toolbox");
	570	+ toolboxPanel = new cGridBag().setVertical(true);
	571	+ //toolboxPanel.setName("Toolbox");
454	572
455		- materialPanel = new cGridBag().setVertical(true);
456		- materialPanel.setName("Material");
	573	+ skyboxPanel = new cGridBag().setVertical(true);
	574	+
	575	+ materialPanel = new cGridBag().setVertical(false);
	576	+ //materialPanel.setName("Material");
457	577
458	578	/JTextPane/
459	579	infoarea = createTextPane();
..	..	@@ -461,6 +581,7 @@
461	581
462	582	infoarea.setEditable(true);
463	583	SetText();
	584	+
464	585	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
465	586	// infoarea.setOpaque(false);
466	587	// //infoarea.setForeground(textcolor);
..	..	@@ -468,7 +589,7 @@
468	589	// TEXTAREA infoarea.setWrapStyleWord(true);
469	590	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
470	591	infoPanel.setPreferredSize(new Dimension(1, 1));
471		- infoPanel.setName("Info");
	592	+ //infoPanel.setName("Info");
472	593	//infoPanel.setLayout(new BorderLayout());
473	594	//infoPanel.add(createTextPane());
474	595
..	..	@@ -735,6 +856,7 @@
735	856	boolean maximized;
736	857
737	858	cButton fullscreenLayout;
	859	+ cButton expandedLayout;
738	860
739	861	void Minimize()
740	862	{
..	..	@@ -774,10 +896,12 @@
774	896	cButton minButton;
775	897	cButton maxButton;
776	898	cButton fullButton;
	899	+ cButton collapseButton;
	900	+ cButton maximize3DButton;
777	901
778	902	void ToggleFullScreen()
779	903	{
780		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	904	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
781	905
782	906	cameraView.ToggleFullScreen();
783	907
..	..	@@ -798,13 +922,13 @@
798	922	// X frame.getContentPane().remove(/"Center",/bigThree);
799	923	// X framePanel.add(bigThree);
800	924	// X frame.getContentPane().add(/"Center",/framePanel);
801		- framePanel.setDividerLocation(46);
	925	+// framePanel.setDividerLocation(46); // icons are 24x24
802	926
803	927	//frame.setVisible(true);
804		- radio.layout = keepButton;
	928	+// radio.layout = keepButton;
805	929	//theFrame = null;
806	930	keepButton = null;
807		- radio.layout.doClick();
	931	+// radio.layout.doClick();
808	932
809	933	} else
810	934	{
..	..	@@ -825,31 +949,53 @@
825	949	// X frame.getContentPane().remove(/"Center",/framePanel);
826	950	// X framePanel.remove(bigThree);
827	951	// X frame.getContentPane().add(/"Center",/bigThree);
828		- framePanel.setDividerLocation(0);
	952	+// framePanel.setDividerLocation(0);
829	953
830		- radio.layout = fullscreenLayout;
831		- radio.layout.doClick();
	954	+// radio.layout = fullscreenLayout;
	955	+// radio.layout.doClick();
832	956	//frame.setVisible(true);
833	957	}
834	958	frame.validate();
	959	+
	960	+ cameraView.requestFocusInWindow();
835	961	}
836	962
837		- private byte[] CompressCopy()
	963	+ void CollapseToolbar()
	964	+ {
	965	+ framePanel.setDividerLocation(0);
	966	+ //frame.validate();
	967	+
	968	+ cameraView.requestFocusInWindow();
	969	+ }
	970	+
	971	+ private Object3D Duplicate(Object3D object)
838	972	{
839	973	boolean temp = CameraPane.SWITCH;
840	974	CameraPane.SWITCH = false;
841	975
842		- copy.ExtractBigData(versiontable);
	976	+ if (Grafreed.grafreed.universe.versiontable == null)
	977	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	978	+
	979	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
843	980	// if (copy == client)
844	981
845		- byte[] versions[] = copy.versions;
846		- copy.versions = null;
	982	+ Object3D versions[] = object.versionlist;
	983	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	984	+ object.versionlist = null;
	985	+ object.versiontable = null;
847	986
848		- byte[] compress = Compress(copy);
	987	+ Object3D parent = object.parent;
	988	+ object.parent = null;
849	989
850		- copy.versions = versions;
	990	+ //byte[] compress = Compress(copy);
	991	+ Object3D compress = (Object3D)Grafreed.clone(object);
851	992
852		- copy.RestoreBigData(versiontable);
	993	+ object.parent = parent;
	994	+
	995	+ object.versionlist = versions;
	996	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	997	+
	998	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
853	999
854	1000	CameraPane.SWITCH = temp;
855	1001
..	..	@@ -977,6 +1123,7 @@
977	1123	{
978	1124	SetupMaterial(materialPanel);
979	1125	}
	1126	+
980	1127	//SetupName();
981	1128	//SetupViews();
982	1129	}
..	..	@@ -986,7 +1133,7 @@
986	1133	// NumberSlider vDivsField;
987	1134	// JCheckBox endcaps;
988	1135	JCheckBox liveCB;
989		- JCheckBox selectCB;
	1136	+ JCheckBox selectableCB;
990	1137	JCheckBox hideCB;
991	1138	JCheckBox link2masterCB;
992	1139	JCheckBox markCB;
..	..	@@ -1185,6 +1332,18 @@
1185	1332
1186	1333	namePanel = new cGridBag();
1187	1334
	1335	+ //if (copy.pinned)
	1336	+ {
	1337	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1338	+ pinButton.setSelected(copy.pinned);
	1339	+ cGridBag t = new cGridBag();
	1340	+ t.preferredWidth = 2;
	1341	+ t.add(pinButton);
	1342	+ namePanel.add(t);
	1343	+
	1344	+ pinButton.addItemListener(this);
	1345	+ }
	1346	+
1188	1347	nameField = AddText(namePanel, copy.GetName());
1189	1348	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1190	1349	oe.ctrlPanel.add(namePanel);
..	..	@@ -1198,13 +1357,16 @@
1198	1357
1199	1358	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1200	1359	liveCB.setToolTipText("Animate object");
1201		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1202		- selectCB.setToolTipText("Make object selectable");
	1360	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1361	+ markCB.setToolTipText("Set target transform");
	1362	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1363	+ selectableCB.setToolTipText("Make object selectable");
1203	1364	// Return();
	1365	+
1204	1366	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1205	1367	hideCB.setToolTipText("Hide object");
1206		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1207		- markCB.setToolTipText("As animation target transform");
	1368	+
	1369	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1208	1370
1209	1371	setupPanel2 = new cGridBag().setVertical(false);
1210	1372
..	..	@@ -1404,22 +1566,9 @@
1404	1566
1405	1567	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1406	1568	{
1407		- System.out.println("CREATE CAMERAS");
1408		- cams = new cTemplate();
1409		- cams.name = "Cameras";
1410		- copy.insertElementAt(cams, 0);
1411		- //cams.parent = copy;
1412		-
1413		- cam = new Camera(); // LA.newVector(3, 2, 1));
1414		- cams.addChild(cam);
1415		- cam = new Camera(1);
1416		- cams.addChild(cam);
1417		- cam = new Camera(2);
1418		- cams.addChild(cam);
1419		- cam = new Camera(3);
1420		- cams.addChild(cam);
1421		- cam = new Camera(4); // Light
1422		- cams.addChild(cam);
	1569	+ if (Globals.DEBUG)
	1570	+ System.out.println("CREATE CAMERAS");
	1571	+ cams = CreateCameras();
1423	1572	} else
1424	1573	{
1425	1574	cams = (cGroup) copy.get(0);
..	..	@@ -1485,6 +1634,45 @@
1485	1634	//frontView.object = copy;
1486	1635	//sideView.object = copy;
1487	1636
	1637	+ transformPanel = new cGridBag().setVertical(true);
	1638	+
	1639	+ cGridBag resetTransformPanel = new cGridBag();
	1640	+
	1641	+ resetTransformPanel.preferredHeight = 2;
	1642	+
	1643	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1644	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1645	+ resetTransform.addMouseListener(new MouseAdapter()
	1646	+ {
	1647	+ public void mouseClicked(MouseEvent e)
	1648	+ {
	1649	+ ResetTransform();
	1650	+ }
	1651	+ });
	1652	+ resetTransformPanel.add(resetTransform);
	1653	+
	1654	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1655	+ resetTransform.setToolTipText("Reset Translation only");
	1656	+ resetTransform.addMouseListener(new MouseAdapter()
	1657	+ {
	1658	+ public void mouseClicked(MouseEvent e)
	1659	+ {
	1660	+ ResetTransform(1);
	1661	+ }
	1662	+ });
	1663	+ resetTransformPanel.add(resetTransform);
	1664	+
	1665	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1666	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1667	+ resetTransform.addMouseListener(new MouseAdapter()
	1668	+ {
	1669	+ public void mouseClicked(MouseEvent e)
	1670	+ {
	1671	+ ResetTransform(2);
	1672	+ }
	1673	+ });
	1674	+ resetTransformPanel.add(resetTransform);
	1675	+
1488	1676	XYZPanel = new cGridBag().setVertical(true);
1489	1677	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1490	1678
..	..	@@ -1492,7 +1680,11 @@
1492	1680	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1493	1681	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1494	1682	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1683	+ //XYZPanel.setName("XYZ");
1495	1684
	1685	+ transformPanel.add(resetTransformPanel);
	1686	+ transformPanel.add(XYZPanel);
	1687	+
1496	1688	/*
1497	1689	gridPanel = new JPanel(); //new BorderLayout());
1498	1690	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1500,12 +1692,12 @@
1500	1692	gridPanel.add(cameraView);
1501	1693	gridPanel.add(XYZPanel);
1502	1694	*/
1503		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1504		- gridPanel.setContinuousLayout(true);
1505		- gridPanel.setOneTouchExpandable(true);
1506		- gridPanel.setDividerLocation(1.0);
1507		- gridPanel.setDividerSize(9);
1508		- gridPanel.setResizeWeight(0.85);
	1695	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1696	+// gridPanel.setContinuousLayout(true);
	1697	+// gridPanel.setOneTouchExpandable(true);
	1698	+// gridPanel.setDividerLocation(1.0);
	1699	+// gridPanel.setDividerSize(9);
	1700	+// gridPanel.setResizeWeight(0.85);
1509	1701
1510	1702	// aConstraints.weighty = 0;
1511	1703	//System.out.println("THIS = " + this);
..	..	@@ -1528,18 +1720,34 @@
1528	1720
1529	1721	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1530	1722	//tmp.setName("Edit");
	1723	+ objectPanel.add(skyboxPanel);
	1724	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1725	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1726	+
	1727	+ objectPanel.add(toolboxPanel);
	1728	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1729	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1730	+
1531	1731	objectPanel.add(materialPanel);
	1732	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1733	+ objectPanel.setToolTipTextAt(2, "Material");
	1734	+
1532	1735	// JPanel north = new JPanel(new BorderLayout());
1533	1736	// north.setName("Edit");
1534	1737	// north.add(ctrlPanel, BorderLayout.NORTH);
1535	1738	// objectPanel.add(north);
1536	1739	objectPanel.add(editPanel);
	1740	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1741	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1537	1742
1538		- //if (Globals.ADVANCED)
1539		- objectPanel.add(infoPanel);
	1743	+ objectPanel.add(transformPanel);
	1744	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1745	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1540	1746
1541		- objectPanel.add(toolboxPanel);
1542		-
	1747	+ patchMaterial = true;
	1748	+ cameraView.patchMaterial = this;
	1749	+ objectPanel.setSelectedIndex(2);
	1750	+
1543	1751	/*
1544	1752	aConstraints.gridx = 0;
1545	1753	aConstraints.gridwidth = 1;
..	..	@@ -1570,11 +1778,108 @@
1570	1778
1571	1779	AddOptions(optionsPanel); //, aConstraints);
1572	1780
1573		- tabbedPane.add(optionsPanel);
1574		-
1575	1781	tabbedPane.add(FSPane = new cFileSystemPane(this));
1576	1782
	1783	+ tabbedPane.add(optionsPanel);
	1784	+
1577	1785	scenePanel.add(tabbedPane);
	1786	+
	1787	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1788	+ creditsPanel.setName("Credits");
	1789	+
	1790	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1791	+ creditsPanel.add(ogaLabel);
	1792	+
	1793	+ cButton creditButton;
	1794	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1795	+ creditButton.setToolTipText("https://opengameart.org");
	1796	+
	1797	+ creditButton.addMouseListener(new MouseAdapter()
	1798	+ {
	1799	+ public void mouseClicked(MouseEvent e)
	1800	+ {
	1801	+ try
	1802	+ {
	1803	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1804	+ } catch (Exception e1)
	1805	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1806	+ {
	1807	+ e1.printStackTrace();
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
	1812	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1813	+ creditsPanel.add(ogaLabel);
	1814	+
	1815	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1816	+ creditButton.setToolTipText("https://3delicious.net");
	1817	+
	1818	+ creditButton.addMouseListener(new MouseAdapter()
	1819	+ {
	1820	+ public void mouseClicked(MouseEvent e)
	1821	+ {
	1822	+ try
	1823	+ {
	1824	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1825	+ } catch (Exception e1)
	1826	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1827	+ {
	1828	+ e1.printStackTrace();
	1829	+ }
	1830	+ }
	1831	+ });
	1832	+
	1833	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1834	+ creditButton.setToolTipText("https://archive3d.net");
	1835	+
	1836	+ creditButton.addMouseListener(new MouseAdapter()
	1837	+ {
	1838	+ public void mouseClicked(MouseEvent e)
	1839	+ {
	1840	+ try
	1841	+ {
	1842	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1843	+ } catch (Exception e1)
	1844	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1845	+ {
	1846	+ e1.printStackTrace();
	1847	+ }
	1848	+ }
	1849	+ });
	1850	+
	1851	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1852	+ creditButton.setToolTipText("https://turbosquid.com");
	1853	+
	1854	+ creditButton.addMouseListener(new MouseAdapter()
	1855	+ {
	1856	+ public void mouseClicked(MouseEvent e)
	1857	+ {
	1858	+ try
	1859	+ {
	1860	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1861	+ } catch (Exception e1)
	1862	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1863	+ {
	1864	+ e1.printStackTrace();
	1865	+ }
	1866	+ }
	1867	+ });
	1868	+
	1869	+ for (int i=6; --i>=0;)
	1870	+ {
	1871	+ creditsPanel.add(new cGridBag());
	1872	+ }
	1873	+
	1874	+ tabbedPane.add(creditsPanel);
	1875	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1876	+
	1877	+ if (Globals.ADVANCED)
	1878	+ {
	1879	+ objectPanel.add(infoPanel);
	1880	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1881	+ objectPanel.setToolTipTextAt(4, "Information");
	1882	+ }
1578	1883
1579	1884	/*
1580	1885	cTree jTree = new cTree(null);
..	..	@@ -1596,13 +1901,13 @@
1596	1901	jtp.add(tree);
1597	1902	*/
1598	1903
1599		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1600		- bigPanel.setContinuousLayout(true);
1601		- bigPanel.setOneTouchExpandable(true);
1602		- bigPanel.setDividerLocation(0.8);
1603		- bigPanel.setDividerSize(15);
1604		- bigPanel.setResizeWeight(0.15);
1605		- bigPanel.setName("Scene");
	1904	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1905	+// bigPanel.setContinuousLayout(true);
	1906	+// bigPanel.setOneTouchExpandable(true);
	1907	+// bigPanel.setDividerLocation(0.8);
	1908	+// bigPanel.setDividerSize(15);
	1909	+// bigPanel.setResizeWeight(0.15);
	1910	+// bigPanel.setName("Scene");
1606	1911
1607	1912	//bigPanel.setLayout(new BorderLayout());
1608	1913	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1637,7 +1942,7 @@
1637	1942	bigThree = new cGridBag();
1638	1943	bigThree.addComponent(scenePanel);
1639	1944	bigThree.addComponent(centralPanel);
1640		- bigThree.addComponent(XYZPanel);
	1945	+ //bigThree.addComponent(XYZPanel);
1641	1946
1642	1947	// // SIDE EFFECT!!!
1643	1948	// aConstraints.gridx = 0;
..	..	@@ -1646,6 +1951,23 @@
1646	1951	// aConstraints.gridheight = 1;
1647	1952
1648	1953	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1954	+
	1955	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1956	+ new java.beans.PropertyChangeListener()
	1957	+ {
	1958	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1959	+ {
	1960	+ if ((Integer)pce.getOldValue() == 1)
	1961	+ {
	1962	+ if (radio.layout != expandedLayout)
	1963	+ {
	1964	+ radio.layout = expandedLayout;
	1965	+ radio.layout.doClick();
	1966	+ }
	1967	+ }
	1968	+ }
	1969	+ });
	1970	+
1649	1971	framePanel.setContinuousLayout(false);
1650	1972	framePanel.setOneTouchExpandable(false);
1651	1973	//.setDividerLocation(0.8);
..	..	@@ -1655,7 +1977,7 @@
1655	1977
1656	1978	frame.getContentPane().setLayout(new BorderLayout());
1657	1979	/**/
1658		- JTabbedPane worldPane = new JTabbedPane();
	1980	+ //JTabbedPane worldPane = new JTabbedPane();
1659	1981	//worldPane.add(bigPanel);
1660	1982	//worldPane.add(worldPanel);
1661	1983	/**/
..	..	@@ -1669,7 +1991,7 @@
1669	1991
1670	1992	cameraView.requestFocusInWindow();
1671	1993
1672		- gridPanel.setDividerLocation(1.0);
	1994	+// gridPanel.setDividerLocation(1.0);
1673	1995
1674	1996	frame.validate();
1675	1997
..	..	@@ -1678,7 +2000,6 @@
1678	2000	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1679	2001	frame.addWindowListener(new WindowAdapter()
1680	2002	{
1681		-
1682	2003	public void windowClosing(WindowEvent e)
1683	2004	{
1684	2005	Close();
..	..	@@ -1701,28 +2022,484 @@
1701	2022	ctrlPanel.removeAll();
1702	2023	}
1703	2024
1704		- void SetupMaterial(cGridBag panel)
	2025	+ void SetupMaterial(cGridBag materialpanel)
1705	2026	{
1706		- /*
	2027	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2028	+
	2029	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2030	+ skin.setToolTipText("Skin");
	2031	+ skin.addMouseListener(new MouseAdapter()
	2032	+ {
	2033	+ public void mouseClicked(MouseEvent e)
	2034	+ {
	2035	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2036	+ cMaterial material = object.material;
	2037	+
	2038	+ // Skin
	2039	+ colorField.setFloat(material.color);
	2040	+ float saturation = material.modulation;
	2041	+
	2042	+ if (!cameraView.Skinshader)
	2043	+ {
	2044	+ saturation /= 1.5;
	2045	+ }
	2046	+
	2047	+ saturationField.setFloat(saturation);
	2048	+
	2049	+ subsurfaceField.setFloat(material.subsurface);
	2050	+ selfshadowField.setFloat(material.diffuseness);
	2051	+ diffusenessField.setFloat(material.factor);
	2052	+ shininessField.setFloat(material.shininess);
	2053	+ shadowbiasField.setFloat(material.shadowbias);
	2054	+ diffuseField.setFloat(material.diffuse);
	2055	+ specularField.setFloat(material.specular);
	2056	+
	2057	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2058	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2059	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2060	+
	2061	+ materialtouched = true;
	2062	+ applySelf();
	2063	+ }
	2064	+ });
	2065	+ presetpanel.add(skin);
	2066	+
	2067	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2068	+ lambert.setToolTipText("Diffuse");
	2069	+ lambert.addMouseListener(new MouseAdapter()
	2070	+ {
	2071	+ public void mouseClicked(MouseEvent e)
	2072	+ {
	2073	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2074	+ cMaterial material = object.material;
	2075	+
	2076	+ diffusenessField.setFloat(material.factor);
	2077	+ selfshadowField.setFloat(material.diffuseness);
	2078	+
	2079	+ materialtouched = true;
	2080	+ applySelf();
	2081	+ }
	2082	+ });
	2083	+ presetpanel.add(lambert);
	2084	+
	2085	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2086	+ diffuse2.setToolTipText("Diffuse2");
	2087	+ diffuse2.addMouseListener(new MouseAdapter()
	2088	+ {
	2089	+ public void mouseClicked(MouseEvent e)
	2090	+ {
	2091	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2092	+ cMaterial material = object.material;
	2093	+
	2094	+ diffusenessField.setFloat(material.factor);
	2095	+ selfshadowField.setFloat(material.diffuseness);
	2096	+
	2097	+ materialtouched = true;
	2098	+ applySelf();
	2099	+ }
	2100	+ });
	2101	+ presetpanel.add(diffuse2);
	2102	+
	2103	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2104	+ diffusemoon.setToolTipText("Moon");
	2105	+ diffusemoon.addMouseListener(new MouseAdapter()
	2106	+ {
	2107	+ public void mouseClicked(MouseEvent e)
	2108	+ {
	2109	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2110	+ cMaterial material = object.material;
	2111	+
	2112	+ diffusenessField.setFloat(material.factor);
	2113	+ selfshadowField.setFloat(material.diffuseness);
	2114	+
	2115	+ materialtouched = true;
	2116	+ applySelf();
	2117	+ }
	2118	+ });
	2119	+ presetpanel.add(diffusemoon);
	2120	+
	2121	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2122	+ diffusemoon2.setToolTipText("Moon2");
	2123	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2124	+ {
	2125	+ public void mouseClicked(MouseEvent e)
	2126	+ {
	2127	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2128	+ cMaterial material = object.material;
	2129	+
	2130	+ diffusenessField.setFloat(material.factor);
	2131	+ selfshadowField.setFloat(material.diffuseness);
	2132	+
	2133	+ materialtouched = true;
	2134	+ applySelf();
	2135	+ }
	2136	+ });
	2137	+ presetpanel.add(diffusemoon2);
	2138	+
	2139	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2140	+ diffusemoon3.setToolTipText("Moon3");
	2141	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2142	+ {
	2143	+ public void mouseClicked(MouseEvent e)
	2144	+ {
	2145	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2146	+ cMaterial material = object.material;
	2147	+
	2148	+ diffusenessField.setFloat(material.factor);
	2149	+ selfshadowField.setFloat(material.diffuseness);
	2150	+
	2151	+ materialtouched = true;
	2152	+ applySelf();
	2153	+ }
	2154	+ });
	2155	+ presetpanel.add(diffusemoon3);
	2156	+
	2157	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2158	+ diffusesheen.setToolTipText("Sheen");
	2159	+ diffusesheen.addMouseListener(new MouseAdapter()
	2160	+ {
	2161	+ public void mouseClicked(MouseEvent e)
	2162	+ {
	2163	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2164	+ cMaterial material = object.material;
	2165	+
	2166	+ sheenField.setFloat(material.sheen);
	2167	+
	2168	+ materialtouched = true;
	2169	+ applySelf();
	2170	+ }
	2171	+ });
	2172	+ presetpanel.add(diffusesheen);
	2173	+
	2174	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2175	+ rough.setToolTipText("Rough metal");
	2176	+ rough.addMouseListener(new MouseAdapter()
	2177	+ {
	2178	+ public void mouseClicked(MouseEvent e)
	2179	+ {
	2180	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2181	+ cMaterial material = object.material;
	2182	+
	2183	+ shininessField.setFloat(material.shininess);
	2184	+ velvetField.setFloat(material.velvet);
	2185	+
	2186	+ materialtouched = true;
	2187	+ applySelf();
	2188	+ }
	2189	+ });
	2190	+ presetpanel.add(rough);
	2191	+
	2192	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2193	+ rough2.setToolTipText("Medium metal");
	2194	+ rough2.addMouseListener(new MouseAdapter()
	2195	+ {
	2196	+ public void mouseClicked(MouseEvent e)
	2197	+ {
	2198	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2199	+ cMaterial material = object.material;
	2200	+
	2201	+ shininessField.setFloat(material.shininess);
	2202	+ lightareaField.setFloat(material.lightarea);
	2203	+
	2204	+ materialtouched = true;
	2205	+ applySelf();
	2206	+ }
	2207	+ });
	2208	+ presetpanel.add(rough2);
	2209	+
	2210	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2211	+ shini0.setToolTipText("Shiny");
	2212	+ shini0.addMouseListener(new MouseAdapter()
	2213	+ {
	2214	+ public void mouseClicked(MouseEvent e)
	2215	+ {
	2216	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2217	+ cMaterial material = object.material;
	2218	+
	2219	+ shininessField.setFloat(material.shininess);
	2220	+ lightareaField.setFloat(material.lightarea);
	2221	+
	2222	+ materialtouched = true;
	2223	+ applySelf();
	2224	+ }
	2225	+ });
	2226	+ presetpanel.add(shini0);
	2227	+
	2228	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2229	+ shini1.setToolTipText("Shiny2");
	2230	+ shini1.addMouseListener(new MouseAdapter()
	2231	+ {
	2232	+ public void mouseClicked(MouseEvent e)
	2233	+ {
	2234	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2235	+ cMaterial material = object.material;
	2236	+
	2237	+ shininessField.setFloat(material.shininess);
	2238	+ lightareaField.setFloat(material.lightarea);
	2239	+
	2240	+ materialtouched = true;
	2241	+ applySelf();
	2242	+ }
	2243	+ });
	2244	+ presetpanel.add(shini1);
	2245	+
	2246	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2247	+ shini2.setToolTipText("Shiny3");
	2248	+ shini2.addMouseListener(new MouseAdapter()
	2249	+ {
	2250	+ public void mouseClicked(MouseEvent e)
	2251	+ {
	2252	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2253	+ cMaterial material = object.material;
	2254	+
	2255	+ shininessField.setFloat(material.shininess);
	2256	+ lightareaField.setFloat(material.lightarea);
	2257	+
	2258	+ materialtouched = true;
	2259	+ applySelf();
	2260	+ }
	2261	+ });
	2262	+ presetpanel.add(shini2);
	2263	+
	2264	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2265	+ aniso.setToolTipText("AnisoU");
	2266	+ aniso.addMouseListener(new MouseAdapter()
	2267	+ {
	2268	+ public void mouseClicked(MouseEvent e)
	2269	+ {
	2270	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2271	+ cMaterial material = object.material;
	2272	+
	2273	+ anisoField.setFloat(material.aniso);
	2274	+ anisoVField.setFloat(material.anisoV);
	2275	+
	2276	+ materialtouched = true;
	2277	+ applySelf();
	2278	+ }
	2279	+ });
	2280	+ presetpanel.add(aniso);
	2281	+
	2282	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2283	+ aniso2.setToolTipText("AnisoV");
	2284	+ aniso2.addMouseListener(new MouseAdapter()
	2285	+ {
	2286	+ public void mouseClicked(MouseEvent e)
	2287	+ {
	2288	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2289	+ cMaterial material = object.material;
	2290	+
	2291	+ anisoField.setFloat(material.aniso);
	2292	+ anisoVField.setFloat(material.anisoV);
	2293	+
	2294	+ materialtouched = true;
	2295	+ applySelf();
	2296	+ }
	2297	+ });
	2298	+ presetpanel.add(aniso2);
	2299	+
	2300	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2301	+ aniso3.setToolTipText("AnisoUV");
	2302	+ aniso3.addMouseListener(new MouseAdapter()
	2303	+ {
	2304	+ public void mouseClicked(MouseEvent e)
	2305	+ {
	2306	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2307	+ cMaterial material = object.material;
	2308	+
	2309	+ anisoField.setFloat(material.aniso);
	2310	+ anisoVField.setFloat(material.anisoV);
	2311	+
	2312	+ materialtouched = true;
	2313	+ applySelf();
	2314	+ }
	2315	+ });
	2316	+ presetpanel.add(aniso3);
	2317	+
	2318	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2319	+ velvet0.setToolTipText("Velvet");
	2320	+ velvet0.addMouseListener(new MouseAdapter()
	2321	+ {
	2322	+ public void mouseClicked(MouseEvent e)
	2323	+ {
	2324	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2325	+ cMaterial material = object.material;
	2326	+
	2327	+ diffusenessField.setFloat(material.factor);
	2328	+ selfshadowField.setFloat(material.diffuseness);
	2329	+ sheenField.setFloat(material.sheen);
	2330	+ shininessField.setFloat(material.shininess);
	2331	+ velvetField.setFloat(material.velvet);
	2332	+ shiftField.setFloat(material.shift);
	2333	+
	2334	+ materialtouched = true;
	2335	+ applySelf();
	2336	+ }
	2337	+ });
	2338	+ presetpanel.add(velvet0);
	2339	+
	2340	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2341	+ bump0.setToolTipText("Bump texture");
	2342	+ bump0.addMouseListener(new MouseAdapter()
	2343	+ {
	2344	+ public void mouseClicked(MouseEvent e)
	2345	+ {
	2346	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2347	+ cMaterial material = object.material;
	2348	+
	2349	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2350	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2351	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2352	+
	2353	+ materialtouched = true;
	2354	+ applySelf();
	2355	+ }
	2356	+ });
	2357	+ presetpanel.add(bump0);
	2358	+
	2359	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2360	+ borderShader.setToolTipText("Border fade");
	2361	+ borderShader.addMouseListener(new MouseAdapter()
	2362	+ {
	2363	+ public void mouseClicked(MouseEvent e)
	2364	+ {
	2365	+ borderfadeField.setFloat(0.4);
	2366	+ opacityField.setFloat(0.75);
	2367	+
	2368	+ materialtouched = true;
	2369	+ applySelf();
	2370	+ }
	2371	+ });
	2372	+ presetpanel.add(borderShader);
	2373	+
	2374	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2375	+ halo.setToolTipText("Halo");
	2376	+ halo.addMouseListener(new MouseAdapter()
	2377	+ {
	2378	+ public void mouseClicked(MouseEvent e)
	2379	+ {
	2380	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2381	+ cMaterial material = object.material;
	2382	+
	2383	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2384	+
	2385	+ materialtouched = true;
	2386	+ applySelf();
	2387	+ }
	2388	+ });
	2389	+ presetpanel.add(halo);
	2390	+
	2391	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2392	+ candle.setToolTipText("Candle");
	2393	+ candle.addMouseListener(new MouseAdapter()
	2394	+ {
	2395	+ public void mouseClicked(MouseEvent e)
	2396	+ {
	2397	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2398	+ cMaterial material = object.material;
	2399	+
	2400	+ subsurfaceField.setFloat(material.subsurface);
	2401	+ shadowbiasField.setFloat(material.shadowbias);
	2402	+ ambientField.setFloat(material.ambient);
	2403	+ specularField.setFloat(material.specular);
	2404	+ lightareaField.setFloat(material.lightarea);
	2405	+ shininessField.setFloat(material.shininess);
	2406	+
	2407	+ materialtouched = true;
	2408	+ applySelf();
	2409	+ }
	2410	+ });
	2411	+ presetpanel.add(candle);
	2412	+
	2413	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2414	+ shadowShader.setToolTipText("Shadow");
	2415	+ shadowShader.addMouseListener(new MouseAdapter()
	2416	+ {
	2417	+ public void mouseClicked(MouseEvent e)
	2418	+ {
	2419	+ diffuseField.setFloat(0.001);
	2420	+ ambientField.setFloat(0.001);
	2421	+ cameraField.setFloat(0.001);
	2422	+ specularField.setFloat(0.001);
	2423	+ fakedepthField.setFloat(0.001);
	2424	+ opacityField.setFloat(0.6);
	2425	+
	2426	+ materialtouched = true;
	2427	+ applySelf();
	2428	+ }
	2429	+ });
	2430	+ presetpanel.add(shadowShader);
	2431	+
	2432	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2433	+ para0.setToolTipText("No parallax");
	2434	+ para0.addMouseListener(new MouseAdapter()
	2435	+ {
	2436	+ public void mouseClicked(MouseEvent e)
	2437	+ {
	2438	+ parallaxField.setFloat(0.125);
	2439	+
	2440	+ materialtouched = true;
	2441	+ applySelf();
	2442	+ }
	2443	+ });
	2444	+ presetpanel.add(para0);
	2445	+
	2446	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2447	+ para1.setToolTipText("With parallax");
	2448	+ para1.addMouseListener(new MouseAdapter()
	2449	+ {
	2450	+ public void mouseClicked(MouseEvent e)
	2451	+ {
	2452	+ parallaxField.setFloat(0.13);
	2453	+
	2454	+ materialtouched = true;
	2455	+ applySelf();
	2456	+ }
	2457	+ });
	2458	+ presetpanel.add(para1);
	2459	+
	2460	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2461	+ para2.setToolTipText("Reset parallax");
	2462	+ para2.addMouseListener(new MouseAdapter()
	2463	+ {
	2464	+ public void mouseClicked(MouseEvent e)
	2465	+ {
	2466	+ parallaxField.setFloat(0.14);
	2467	+
	2468	+ materialtouched = true;
	2469	+ applySelf();
	2470	+ }
	2471	+ });
	2472	+ presetpanel.add(para2);
	2473	+
	2474	+ cGridBag panel = new cGridBag().setVertical(true);
	2475	+
	2476	+ presetpanel.preferredWidth = 1;
	2477	+
	2478	+ materialpanel.add(presetpanel);
	2479	+ materialpanel.add(panel);
	2480	+
	2481	+ panel.preferredWidth = 8;
	2482	+
	2483	+ /*
1707	2484	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1708	2485	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- */
	2486	+ */
1710	2487
1711	2488	cGridBag editBar = new cGridBag().setVertical(false);
1712	2489
1713		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2490	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1714	2491	createMaterialButton.setToolTipText("Create material");
1715	2492
1716	2493	/*
1717	2494	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1718	2495	*/
1719	2496
1720		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2497	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1721	2498	clearMaterialButton.setToolTipText("Clear material");
1722	2499
1723	2500	if (Globals.ADVANCED)
1724	2501	{
1725		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2502	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1726	2503	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1727	2504	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1728	2505	}
..	..	@@ -1740,27 +2517,61 @@
1740	2517	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1741	2518
1742	2519	cGridBag colorSection = new cGridBag().setVertical(true);
	2520	+
	2521	+ cGridBag huepanel = new cGridBag();
	2522	+ cGridBag huelabel = new cGridBag();
	2523	+ cLabel hue = GetLabel("icons/hue.png", false);
	2524	+ hue.fit = true;
	2525	+
	2526	+ hue.addMouseListener(new MouseAdapter()
	2527	+ {
	2528	+ public void mousePressed(MouseEvent e)
	2529	+ {
	2530	+ int x = e.getX();
	2531	+
	2532	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2533	+ }
	2534	+ });
	2535	+
	2536	+ huelabel.add(hue);
	2537	+ huelabel.preferredWidth = 20;
	2538	+ huepanel.add(new cGridBag()); // Label
	2539	+ huepanel.add(huelabel); // Field/slider
	2540	+
	2541	+ huepanel.preferredHeight = 7;
	2542	+
	2543	+ colorSection.add(huepanel);
1743	2544
1744	2545	cGridBag color = new cGridBag();
1745		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1746		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1747		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2546	+
	2547	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2548	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2549	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2550	+
1748	2551	//colorField.preferredWidth = 200;
1749	2552	colorSection.add(color);
1750	2553
1751	2554	cGridBag modulation = new cGridBag();
1752	2555	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1753	2556	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1754		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2557	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1755	2558	colorSection.add(modulation);
1756	2559
	2560	+ cGridBag opacity = new cGridBag();
	2561	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2562	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2563	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2564	+ colorSection.add(opacity);
	2565	+
	2566	+ colorSection.add(GetSeparator());
	2567	+
1757	2568	cGridBag texture = new cGridBag();
1758	2569	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1759	2570	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760	2571	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1761	2572	colorSection.add(texture);
1762	2573
1763		- panel.add(new JSeparator());
	2574	+ panel.add(GetSeparator());
1764	2575
1765	2576	panel.add(colorSection);
1766	2577
..	..	@@ -1816,7 +2627,7 @@
1816	2627	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1817	2628	diffuseSection.add(shadowbias);
1818	2629
1819		- panel.add(new JSeparator());
	2630	+ panel.add(GetSeparator());
1820	2631
1821	2632	panel.add(diffuseSection);
1822	2633
..	..	@@ -1879,7 +2690,7 @@
1879	2690	specularSection.add(anisoV);
1880	2691
1881	2692
1882		- panel.add(new JSeparator());
	2693	+ panel.add(GetSeparator());
1883	2694
1884	2695	panel.add(specularSection);
1885	2696
..	..	@@ -1905,12 +2716,12 @@
1905	2716	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1906	2717	colorSection.add(backlit);
1907	2718
1908		- cGridBag opacity = new cGridBag();
1909		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1910		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1911		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1912		- colorSection.add(opacity);
1913		-
	2719	+ cGridBag parallax = new cGridBag();
	2720	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2721	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2722	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2723	+ colorSection.add(parallax);
	2724	+
1914	2725	//panel.add(new JSeparator());
1915	2726
1916	2727	//panel.add(globalSection);
..	..	@@ -1955,7 +2766,7 @@
1955	2766	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1956	2767	textureSection.add(opacityPower);
1957	2768
1958		- panel.add(new JSeparator());
	2769	+ panel.add(GetSeparator());
1959	2770
1960	2771	panel.add(textureSection);
1961	2772
..	..	@@ -2942,7 +3753,7 @@
2942	3753
2943	3754	freezematerial = true;
2944	3755	colorField.setFloat(mat.color);
2945		- modulationField.setFloat(mat.modulation);
	3756	+ saturationField.setFloat(mat.modulation);
2946	3757	metalnessField.setFloat(mat.metalness);
2947	3758	diffuseField.setFloat(mat.diffuse);
2948	3759	specularField.setFloat(mat.specular);
..	..	@@ -2962,6 +3773,7 @@
2962	3773	shadowField.setFloat(mat.shadow);
2963	3774	textureField.setFloat(mat.texture);
2964	3775	opacityField.setFloat(mat.opacity);
	3776	+ parallaxField.setFloat(mat.parallax + 0.125f);
2965	3777	fakedepthField.setFloat(mat.fakedepth);
2966	3778	shadowbiasField.setFloat(mat.shadowbias);
2967	3779	bumpField.setInteger(1); // dec 2013
..	..	@@ -3004,32 +3816,8 @@
3004	3816
3005	3817	if (multiplyToggle != null)
3006	3818	multiplyToggle.setSelected(mat.multiply);
3007		-
3008		- assert (object.projectedVertices != null);
3009		-
3010		- if (object.projectedVertices.length <= 2)
3011		- {
3012		- // Side effect...
3013		- Object3D.cVector2[] keep = object.projectedVertices;
3014		- object.projectedVertices = new Object3D.cVector2[3];
3015		- for (int i = 0; i < 3; i++)
3016		- {
3017		- if (i < keep.length)
3018		- {
3019		- object.projectedVertices[i] = keep[i];
3020		- } else
3021		- {
3022		- object.projectedVertices[i] = new Object3D.cVector2();
3023		- }
3024		- /*
3025		- if(keep.length == 0)
3026		- object.projectedVertices[0] = new Object3D.cVector2();
3027		- else
3028		- object.projectedVertices[0] = keep[0];
3029		- object.projectedVertices[1] = new Object3D.cVector2();
3030		- */
3031		- }
3032		- }
	3819	+
	3820	+ AllocProjectedVertices(object);
3033	3821
3034	3822	SetMaterial(mat, object.projectedVertices);
3035	3823	}
..	..	@@ -3149,6 +3937,17 @@
3149	3937	public void itemStateChanged(ItemEvent event)
3150	3938	{
3151	3939	// System.out.println("Propagate = " + propagate);
	3940	+ if (event.getSource() == pinButton)
	3941	+ {
	3942	+ copy.pinned ^= true;
	3943	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3944	+ {
	3945	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3946	+ copy.CloseUI();
	3947	+ //copy.editWindow.refreshContents();
	3948	+ }
	3949	+ }
	3950	+ else
3152	3951	if (event.getSource() == propagateToggle)
3153	3952	{
3154	3953	propagate ^= true;
..	..	@@ -3253,8 +4052,9 @@
3253	4052	} else if (event.getSource() == liveCB)
3254	4053	{
3255	4054	copy.live ^= true;
	4055	+ objEditor.refreshContents(true); // To show item colors
3256	4056	return;
3257		- } else if (event.getSource() == selectCB)
	4057	+ } else if (event.getSource() == selectableCB)
3258	4058	{
3259	4059	copy.dontselect ^= true;
3260	4060	return;
..	..	@@ -3262,7 +4062,7 @@
3262	4062	{
3263	4063	copy.hide ^= true;
3264	4064	copy.Touch(); // display list issue
3265		- objEditor.refreshContents();
	4065	+ objEditor.refreshContents(true); // To show item colors
3266	4066	return;
3267	4067	} else if (event.getSource() == link2masterCB)
3268	4068	{
..	..	@@ -3327,7 +4127,7 @@
3327	4127	//System.out.println("ObjEditor " + event);
3328	4128	applySelf0(true);
3329	4129	//parent.applySelf();
3330		- objEditor.refreshContents();
	4130	+ // conflicts with requestFocus objEditor.refreshContents();
3331	4131	} else if (source == resetButton)
3332	4132	{
3333	4133	CameraPane.fullreset = true;
..	..	@@ -3507,17 +4307,25 @@
3507	4307
3508	4308	void New()
3509	4309	{
3510		- while (copy.Size() > 1)
	4310	+ while (copy.Size() > 0)
3511	4311	{
3512		- copy.remove(1);
	4312	+ copy.remove(0);
3513	4313	}
3514	4314
	4315	+ copy.selection.clear();
	4316	+
	4317	+ if (copy == Grafreed.grafreed.universe)
	4318	+ {
	4319	+ CreateCameras();
	4320	+ cameraView.SetCamera(GetCamera(copy, 0));
	4321	+ }
3515	4322	ResetModel();
3516	4323	objEditor.refreshContents();
3517	4324	}
3518	4325
3519	4326	static public byte[] Compress(Object3D o)
3520	4327	{
	4328	+ // Slower to actually compress.
3521	4329	try
3522	4330	{
3523	4331	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3619,6 +4427,7 @@
3619	4427	{
3620	4428	//Save(true);
3621	4429	Replace();
	4430	+ SetVersionStates();
3622	4431	}
3623	4432
3624	4433	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3637,31 +4446,54 @@
3637	4446	return true;
3638	4447	}
3639	4448
3640		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4449	+ void DeleteVersion()
	4450	+ {
	4451	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4452	+ {
	4453	+ copy.versionlist[i] = copy.versionlist[i+1];
	4454	+ }
	4455	+
	4456	+ if (copy.versionlist[copy.versionindex] == null)
	4457	+ copy.versionindex -= 1;
	4458	+
	4459	+ if (copy.versionindex != -1)
	4460	+ CopyChanged();
	4461	+
	4462	+ SetVersionStates();
	4463	+ }
3641	4464
3642	4465	public boolean Save(boolean user)
3643	4466	{
3644	4467	System.err.println("Save");
	4468	+ Replace();
3645	4469
3646		- cRadio tab = GetCurrentTab();
	4470	+ if (copy.versionlist == null)
	4471	+ {
	4472	+ copy.versionlist = new Object3D[100];
	4473	+ copy.versionindex = -1;
	4474	+ }
3647	4475
3648		- byte[] compress = CompressCopy();
	4476	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3649	4477
3650	4478	boolean thesame = false;
3651	4479
3652		- // Quick heuristic using length. Works only when stream is compressed.
3653		- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3654		- {
3655		- thesame = true;
3656		- }
	4480	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4481	+// {
	4482	+// thesame = true;
	4483	+// }
3657	4484
3658	4485	//EditorFrame.m_MainFrame.requestFocusInWindow();
3659	4486	if (!thesame)
3660	4487	{
	4488	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4489	+ {
	4490	+ copy.versionlist[i] = copy.versionlist[i-1];
	4491	+ }
	4492	+
3661	4493	//tab.user[tab.versionindex] = user;
3662	4494	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3663	4495
3664		- copy.versions[++copy.versionindex] = compress;
	4496	+ copy.versionlist[++copy.versionindex] = compress;
3665	4497
3666	4498	// if (increment)
3667	4499	// tab.versionindex++;
..	..	@@ -3671,13 +4503,13 @@
3671	4503
3672	4504	//assert(hashtable.isEmpty());
3673	4505
3674		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3675		- {
3676		- //tab.user[i] = false;
3677		- copy.versions[i] = null;
3678		- }
	4506	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4507	+// {
	4508	+// //tab.user[i] = false;
	4509	+// copy.versionlist[i] = null;
	4510	+// }
3679	4511
3680		- SetUndoStates();
	4512	+ SetVersionStates();
3681	4513
3682	4514	// test save
3683	4515	if (false)
..	..	@@ -3700,27 +4532,65 @@
3700	4532
3701	4533	return !thesame;
3702	4534	}
3703		-
3704		- void CopyChanged(Object3D obj)
	4535	+
	4536	+ boolean flashIt = true;
	4537	+
	4538	+ void RefreshSelection()
3705	4539	{
3706		- SetUndoStates();
	4540	+ Object3D selection = new Object3D();
	4541	+
	4542	+ for (int i = 0; i < copy.selection.size(); i++)
	4543	+ {
	4544	+ Object3D elem = copy.selection.elementAt(i);
	4545	+
	4546	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4547	+
	4548	+ if (obj == null)
	4549	+ {
	4550	+ copy.selection.remove(i--);
	4551	+ }
	4552	+ else
	4553	+ {
	4554	+ selection.add(obj);
	4555	+ copy.selection.setElementAt(obj, i);
	4556	+ }
	4557	+ }
	4558	+
	4559	+ flashIt = false;
	4560	+ GetTree().clearSelection();
	4561	+ for (int i = 0; i < selection.size(); i++)
	4562	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4563	+ flashIt = true;
	4564	+
	4565	+ //refreshContents(false);
	4566	+ }
	4567	+
	4568	+ void CopyChanged()
	4569	+ {
	4570	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4571	+
	4572	+ SetVersionStates();
3707	4573
3708	4574	boolean temp = CameraPane.SWITCH;
3709	4575	CameraPane.SWITCH = false;
3710	4576
3711		- copy.ExtractBigData(versiontable);
	4577	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3712	4578
3713	4579	copy.clear();
3714	4580
	4581	+ copy.skyboxname = obj.skyboxname;
	4582	+ copy.skyboxext = obj.skyboxext;
	4583	+
3715	4584	for (int i=0; i<obj.Size(); i++)
3716	4585	{
3717	4586	copy.add(obj.get(i));
3718	4587	}
3719	4588
3720		- copy.RestoreBigData(versiontable);
	4589	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3721	4590
3722	4591	CameraPane.SWITCH = temp;
3723	4592
	4593	+ RefreshSelection();
3724	4594	//assert(hashtable.isEmpty());
3725	4595
3726	4596	copy.Touch();
..	..	@@ -3741,13 +4611,15 @@
3741	4611	}
3742	4612	}
3743	4613
3744		- refreshContents();
	4614	+ refreshContents(true);
3745	4615	}
3746	4616
3747		- cButton undoButton;
	4617	+ cButton previousVersionButton;
3748	4618	cButton restoreButton;
3749	4619	cButton replaceButton;
3750		- cButton redoButton;
	4620	+ cButton nextVersionButton;
	4621	+ cButton saveVersionButton;
	4622	+ cButton deleteVersionButton;
3751	4623
3752	4624	boolean muteSlider;
3753	4625
..	..	@@ -3755,39 +4627,64 @@
3755	4627	{
3756	4628	int count = 0;
3757	4629
3758		- for (int i = copy.versions.length; --i >= 0;)
	4630	+ for (int i = copy.versionlist.length; --i >= 0;)
3759	4631	{
3760		- if (copy.versions[i] != null)
	4632	+ if (copy.versionlist[i] != null)
3761	4633	count++;
3762	4634	}
3763	4635
3764	4636	return count;
3765	4637	}
3766	4638
3767		- void SetUndoStates()
	4639	+ public cGridBag versionSliderPane;
	4640	+
	4641	+ void SetVersionStates()
3768	4642	{
3769		- cRadio tab = GetCurrentTab();
	4643	+ //if (true)
	4644	+ // return;
	4645	+
	4646	+ //cRadio tab = GetCurrentTab();
3770	4647
3771		- restoreButton.setEnabled(copy.versionindex != -1);
3772		- replaceButton.setEnabled(copy.versionindex != -1);
3773		-
3774		- undoButton.setEnabled(copy.versionindex > 0);
3775		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3776		-
3777		- muteSlider = true;
3778		- versionSlider.setMaximum(VersionCount() - 1);
3779		- versionSlider.setInteger(copy.versionindex);
3780		- muteSlider = false;
	4648	+ if (copy.versionindex == -2)
	4649	+ {
	4650	+ saveVersionButton.setEnabled(false);
	4651	+ restoreButton.setEnabled(false);
	4652	+ replaceButton.setEnabled(false);
	4653	+ previousVersionButton.setEnabled(false);
	4654	+ nextVersionButton.setEnabled(false);
	4655	+ deleteVersionButton.setEnabled(false);
	4656	+ versionSliderPane.setVisible(false);
	4657	+ }
	4658	+ else
	4659	+ {
	4660	+ restoreButton.setEnabled(copy.versionindex != -1);
	4661	+ replaceButton.setEnabled(copy.versionindex != -1);
	4662	+
	4663	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4664	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4665	+
	4666	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4667	+ //copy.versionlist[copy.versionindex + 1] != null);
	4668	+
	4669	+ muteSlider = true;
	4670	+ versionSlider.setMinimum(0);
	4671	+ versionSlider.setMaximum(VersionCount() - 1);
	4672	+ versionSlider.setInteger(copy.versionindex);
	4673	+ versionSlider.setEnabled(copy.versionindex != -1);
	4674	+ muteSlider = false;
	4675	+
	4676	+ versionSliderPane.setVisible(true);
	4677	+ }
3781	4678	}
3782	4679
3783		- public boolean Undo()
	4680	+ public boolean PreviousVersion()
3784	4681	{
3785	4682	// Option?
3786	4683	Replace();
3787	4684
3788	4685	System.err.println("Undo");
3789	4686
3790		- cRadio tab = GetCurrentTab();
	4687	+ //cRadio tab = GetCurrentTab();
3791	4688
3792	4689	if (copy.versionindex == 0)
3793	4690	{
..	..	@@ -3810,7 +4707,7 @@
3810	4707
3811	4708	copy.versionindex -= 1;
3812	4709
3813		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4710	+ CopyChanged();
3814	4711
3815	4712	return true;
3816	4713	}
..	..	@@ -3819,44 +4716,45 @@
3819	4716	{
3820	4717	System.err.println("Restore");
3821	4718
3822		- cRadio tab = GetCurrentTab();
	4719	+ //cRadio tab = GetCurrentTab();
3823	4720
3824		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4721	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3825	4722	{
3826	4723	java.awt.Toolkit.getDefaultToolkit().beep();
3827	4724	return false;
3828	4725	}
3829	4726
3830		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4727	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4728	+ CopyChanged();
3831	4729
3832	4730	return true;
3833	4731	}
3834	4732
3835	4733	public boolean Replace()
3836	4734	{
3837		- System.err.println("Replace");
	4735	+ //System.err.println("Replace");
3838	4736
3839		- cRadio tab = GetCurrentTab();
	4737	+ //cRadio tab = GetCurrentTab();
3840	4738
3841		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4739	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3842	4740	{
3843	4741	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3844	4742	return false;
3845	4743	}
3846	4744
3847		- copy.versions[copy.versionindex] = CompressCopy();
	4745	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3848	4746
3849	4747	return true;
3850	4748	}
3851	4749
3852		- public void Redo()
	4750	+ public void NextVersion()
3853	4751	{
3854	4752	// Option?
3855	4753	Replace();
3856	4754
3857		- cRadio tab = GetCurrentTab();
	4755	+ //cRadio tab = GetCurrentTab();
3858	4756
3859		- if (copy.versions[copy.versionindex + 1] == null)
	4757	+ if (copy.versionlist[copy.versionindex + 1] == null)
3860	4758	{
3861	4759	java.awt.Toolkit.getDefaultToolkit().beep();
3862	4760	return;
..	..	@@ -3864,7 +4762,7 @@
3864	4762
3865	4763	copy.versionindex += 1;
3866	4764
3867		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4765	+ CopyChanged();
3868	4766
3869	4767	//if (!tab.user[tab.versionindex])
3870	4768	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4061,6 +4959,12 @@
4061	4959	// else
4062	4960	// applySelf(true);
4063	4961	// }
	4962	+
	4963	+ boolean Equal(double a, double b)
	4964	+ {
	4965	+ return Math.abs(a - b) < 0.001;
	4966	+ }
	4967	+
4064	4968	void applySelf0(boolean name)
4065	4969	{
4066	4970	if (name)
..	..	@@ -4078,7 +4982,7 @@
4078	4982	//copy.material = new cMaterial(copy.GetMaterial());
4079	4983
4080	4984	current.color = (float) colorField.getFloat();
4081		- current.modulation = (float) modulationField.getFloat();
	4985	+ current.modulation = (float) saturationField.getFloat();
4082	4986	current.metalness = (float) metalnessField.getFloat();
4083	4987	current.diffuse = (float) diffuseField.getFloat();
4084	4988	current.specular = (float) specularField.getFloat();
..	..	@@ -4098,6 +5002,7 @@
4098	5002	current.shadow = (float) shadowField.getFloat();
4099	5003	current.texture = (float) textureField.getFloat();
4100	5004	current.opacity = (float) opacityField.getFloat();
	5005	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4101	5006	current.fakedepth = (float) fakedepthField.getFloat();
4102	5007	current.shadowbias = (float) shadowbiasField.getFloat();
4103	5008
..	..	@@ -4110,29 +5015,54 @@
4110	5015	{
4111	5016	cMaterial mat = copy.material;
4112	5017
4113		- colorField.SetToolTipValue((mat.color));
4114		- modulationField.SetToolTipValue((mat.modulation));
4115		- metalnessField.SetToolTipValue((mat.metalness));
4116		- diffuseField.SetToolTipValue((mat.diffuse));
4117		- specularField.SetToolTipValue((mat.specular));
4118		- shininessField.SetToolTipValue((mat.shininess));
4119		- shiftField.SetToolTipValue((mat.shift));
4120		- ambientField.SetToolTipValue((mat.ambient));
4121		- lightareaField.SetToolTipValue((mat.lightarea));
4122		- diffusenessField.SetToolTipValue((mat.factor));
4123		- velvetField.SetToolTipValue((mat.velvet));
4124		- sheenField.SetToolTipValue((mat.sheen));
4125		- subsurfaceField.SetToolTipValue((mat.subsurface));
4126		- backlitField.SetToolTipValue((mat.bump));
4127		- anisoField.SetToolTipValue((mat.aniso));
4128		- anisoVField.SetToolTipValue((mat.anisoV));
4129		- cameraField.SetToolTipValue((mat.cameralight));
4130		- selfshadowField.SetToolTipValue((mat.diffuseness));
4131		- shadowField.SetToolTipValue((mat.shadow));
4132		- textureField.SetToolTipValue((mat.texture));
4133		- opacityField.SetToolTipValue((mat.opacity));
4134		- fakedepthField.SetToolTipValue((mat.fakedepth));
4135		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	5018	+ if (!Equal(colorField.getFloat(), mat.color))
	5019	+ colorField.SetToolTipValue((mat.color));
	5020	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5021	+ saturationField.SetToolTipValue((mat.modulation));
	5022	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5023	+ metalnessField.SetToolTipValue((mat.metalness));
	5024	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5025	+ diffuseField.SetToolTipValue((mat.diffuse));
	5026	+ if (!Equal(specularField.getFloat(), mat.specular))
	5027	+ specularField.SetToolTipValue((mat.specular));
	5028	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5029	+ shininessField.SetToolTipValue((mat.shininess));
	5030	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5031	+ shiftField.SetToolTipValue((mat.shift));
	5032	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5033	+ ambientField.SetToolTipValue((mat.ambient));
	5034	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5035	+ lightareaField.SetToolTipValue((mat.lightarea));
	5036	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5037	+ diffusenessField.SetToolTipValue((mat.factor));
	5038	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5039	+ velvetField.SetToolTipValue((mat.velvet));
	5040	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5041	+ sheenField.SetToolTipValue((mat.sheen));
	5042	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5043	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5044	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5045	+ backlitField.SetToolTipValue((mat.bump));
	5046	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5047	+ anisoField.SetToolTipValue((mat.aniso));
	5048	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5049	+ anisoVField.SetToolTipValue((mat.anisoV));
	5050	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5051	+ cameraField.SetToolTipValue((mat.cameralight));
	5052	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5053	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5054	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5055	+ shadowField.SetToolTipValue((mat.shadow));
	5056	+ if (!Equal(textureField.getFloat(), mat.texture))
	5057	+ textureField.SetToolTipValue((mat.texture));
	5058	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5059	+ opacityField.SetToolTipValue((mat.opacity));
	5060	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5061	+ parallaxField.SetToolTipValue((mat.parallax));
	5062	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5063	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5064	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5065	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4136	5066	}
4137	5067
4138	5068	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4167,17 +5097,20 @@
4167	5097
4168	5098	public void stateChanged(ChangeEvent e)
4169	5099	{
4170		- // assert(false);
	5100	+ // assert(false);
4171	5101	if (e.getSource() == versionSlider)
4172	5102	{
4173	5103	if (muteSlider)
4174	5104	return;
4175	5105
	5106	+ Replace();
	5107	+
4176	5108	int version = versionSlider.getInteger();
4177	5109
4178		- if (copy.versions[version] != null)
	5110	+ if (version != -1 && copy.versionlist[version] != null)
4179	5111	{
4180		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	5112	+ copy.versionindex = version;
	5113	+ CopyChanged();
4181	5114	}
4182	5115
4183	5116	return;
..	..	@@ -4217,6 +5150,12 @@
4217	5150	{
4218	5151	//System.out.println("stateChanged = " + this);
4219	5152	materialtouched = true;
	5153	+
	5154	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5155	+ {
	5156	+ saturationField.setFloat(1);
	5157	+ }
	5158	+
4220	5159	applySelf();
4221	5160	//System.out.println("this = " + this);
4222	5161	//System.out.println("PARENT = " + parent);
..	..	@@ -4516,6 +5455,7 @@
4516	5455	{
4517	5456	if (GetTree() != null)
4518	5457	{
	5458	+ GetTree().revalidate();
4519	5459	GetTree().repaint();
4520	5460	}
4521	5461
..	..	@@ -4524,6 +5464,11 @@
4524	5464	ctrlPanel.validate(); // ? new
4525	5465	ctrlPanel.repaint();
4526	5466	}
	5467	+
	5468	+ if (previousVersionButton != null && copy.versionlist != null)
	5469	+ SetVersionStates();
	5470	+
	5471	+ cameraView.requestFocusInWindow();
4527	5472	}
4528	5473
4529	5474	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4555,7 +5500,7 @@
4555	5500	// group = (Composite) group.get(0);
4556	5501	// }
4557	5502
4558		- System.out.println("makeSomething of " + thing);
	5503	+ //System.out.println("makeSomething of " + thing);
4559	5504
4560	5505	/*
4561	5506	if (deselect && jList != null)
..	..	@@ -4772,7 +5717,9 @@
4772	5717	readobj.ResetDisplayList();
4773	5718	} catch (Exception e)
4774	5719	{
4775		- //e.printStackTrace();
	5720	+ if (!e.toString().contains("GZIP"))
	5721	+ e.printStackTrace();
	5722	+
4776	5723	try
4777	5724	{
4778	5725	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4852,6 +5799,8 @@
4852	5799	{
4853	5800	//readobj.deepCopySelf(copy);
4854	5801	copy.clear(); // june 2014
	5802	+ copy.skyboxname = readobj.skyboxname;
	5803	+ copy.skyboxext = readobj.skyboxext;
4855	5804	for (int i = 0; i < readobj.size(); i++)
4856	5805	{
4857	5806	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4892,6 +5841,7 @@
4892	5841	}
4893	5842	} catch (ClassCastException e)
4894	5843	{
	5844	+ e.printStackTrace();
4895	5845	assert (false);
4896	5846	Composite c = (Composite) copy;
4897	5847	c.children.clear();
..	..	@@ -4902,13 +5852,17 @@
4902	5852	c.addChild(csg);
4903	5853	}
4904	5854
4905		- copy.versions = readobj.versions;
	5855	+ copy.versionlist = readobj.versionlist;
4906	5856	copy.versionindex = readobj.versionindex;
	5857	+ copy.versiontable = readobj.versiontable;
4907	5858
4908		- if (copy.versions == null)
	5859	+ if (copy.versionlist == null)
4909	5860	{
4910		- copy.versions = new byte[100][];
	5861	+ // Backward compatibility
	5862	+ copy.versionlist = new Object3D[100];
4911	5863	copy.versionindex = -1;
	5864	+
	5865	+ //Save(true);
4912	5866	}
4913	5867
4914	5868	//? SetUndoStates();
..	..	@@ -4923,7 +5877,7 @@
4923	5877	{
4924	5878	if (Grafreed.standAlone)
4925	5879	{
4926		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5880	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4927	5881	browser.show();
4928	5882	String filename = browser.getFile();
4929	5883	if (filename != null && filename.length() > 0)
..	..	@@ -5000,6 +5954,8 @@
5000	5954
5001	5955	void save()
5002	5956	{
	5957	+ Replace();
	5958	+
5003	5959	if (lastname == null)
5004	5960	{
5005	5961	return;
..	..	@@ -5022,6 +5978,7 @@
5022	5978	//ps.print(buffer.toString());
5023	5979	} catch (IOException e)
5024	5980	{
	5981	+ e.printStackTrace();
5025	5982	}
5026	5983	}
5027	5984
..	..	@@ -5241,6 +6198,7 @@
5241	6198	ButtonGroup buttonGroup;
5242	6199
5243	6200	cGridBag toolboxPanel;
	6201	+ cGridBag skyboxPanel;
5244	6202	cGridBag materialPanel;
5245	6203	cGridBag ctrlPanel;
5246	6204
..	..	@@ -5252,6 +6210,7 @@
5252	6210	boolean materialFlushed;
5253	6211	Object3D latestObject;
5254	6212
	6213	+ cGridBag transformPanel;
5255	6214	cGridBag XYZPanel;
5256	6215
5257	6216	JSplitPane gridPanel;
..	..	@@ -5314,7 +6273,7 @@
5314	6273	JLabel colorLabel;
5315	6274	cNumberSlider colorField;
5316	6275	JLabel modulationLabel;
5317		- cNumberSlider modulationField;
	6276	+ cNumberSlider saturationField;
5318	6277	JLabel metalnessLabel;
5319	6278	cNumberSlider metalnessField;
5320	6279	JLabel diffuseLabel;
..	..	@@ -5345,6 +6304,7 @@
5345	6304	cNumberSlider anisoField;
5346	6305	JLabel anisoVLabel;
5347	6306	cNumberSlider anisoVField;
	6307	+
5348	6308	JLabel cameraLabel;
5349	6309	cNumberSlider cameraField;
5350	6310	JLabel selfshadowLabel;
..	..	@@ -5355,10 +6315,13 @@
5355	6315	cNumberSlider textureField;
5356	6316	JLabel opacityLabel;
5357	6317	cNumberSlider opacityField;
	6318	+ JLabel parallaxLabel;
	6319	+ cNumberSlider parallaxField;
5358	6320	JLabel fakedepthLabel;
5359	6321	cNumberSlider fakedepthField;
5360	6322	JLabel shadowbiasLabel;
5361	6323	cNumberSlider shadowbiasField;
	6324	+
5362	6325	JLabel bumpLabel;
5363	6326	cNumberSlider bumpField;
5364	6327	JLabel noiseLabel;