~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,10 +383,12 @@
301	383	client = inClient;
302	384	copy = client;
303	385
304		- if (copy.versions == null)
	386	+ if (copy.versionlist == null)
305	387	{
306		- copy.versions = new byte[100][];
	388	+ copy.versionlist = new Object3D[100];
307	389	copy.versionindex = -1;
	390	+
	391	+// Save(true);
308	392	}
309	393
310	394	SetupUI2(callee.GetEditor());
..	..	@@ -328,7 +412,8 @@
328	412	//parent = p;
329	413
330	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
331		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
332	417	//gd.setFullScreenWindow(this);
333	418	//setResizable(false);
334	419	//if (!isDisplayable())
..	..	@@ -339,11 +424,13 @@
339	424	copy = localCopy;
340	425	copy.editWindow = this;
341	426
342		- if (copy.versions == null)
343		- {
344		- copy.versions = new byte[100][];
345		- copy.versionindex = -1;
346		- }
	427	+// if (copy.versionlist == null)
	428	+// {
	429	+// copy.versionlist = new Object3D[100];
	430	+// copy.versionindex = -1;
	431	+//
	432	+// Save(true);
	433	+// }
347	434
348	435	SetupMenu();
349	436
..	..	@@ -363,6 +450,9 @@
363	450
364	451	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
365	452
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
366	456	void SetupMenu()
367	457	{
368	458	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -376,8 +466,11 @@
376	466	importOBJItem.addActionListener(this);
377	467	import3DSItem = menu.add(new MenuItem("3DS file..."));
378	468	import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
379	471	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
380	472	importVRMLX3DItem.addActionListener(this);
	473	+ }
381	474	menu.add("-");
382	475	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
383	476	importGFDItem.addActionListener(this);
..	..	@@ -412,6 +505,8 @@
412	505
413	506	ChangeListener changeListener = new ChangeListener()
414	507	{
	508	+ //String name;
	509	+
415	510	public void stateChanged(ChangeEvent changeEvent)
416	511	{
417	512	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -430,18 +525,49 @@
430	525	// EditSelection(false);
431	526	// }
432	527
433		- refreshContents(false); // To refresh Info tab
	528	+// if (objectPanel.getSelectedIndex() == 4)
	529	+// {
	530	+// name = copy.skyboxname;
	531	+//
	532	+// if (name == null)
	533	+// {
	534	+// name = "";
	535	+// }
	536	+//
	537	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	538	+// copy.skyboxext = "jpg";
	539	+// }
	540	+// else
	541	+// {
	542	+// if (name != null)
	543	+// {
	544	+// if (name.equals(""))
	545	+// {
	546	+// copy.skyboxname = null;
	547	+// copy.skyboxext = null;
	548	+// }
	549	+// else
	550	+// {
	551	+// copy.skyboxname = name;
	552	+// }
	553	+// }
	554	+// }
	555	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	556	+
	557	+// refreshContents(false); // To refresh Info tab
	558	+ cameraView.repaint();
434	559	}
435	560	};
436	561	objectPanel.addChangeListener(changeListener);
437	562
438	563	toolbarPanel = new JPanel();
439	564	toolbarPanel.setName("Toolbar");
	565	+
440	566	treePanel = new cGridBag();
441	567	treePanel.setName("Tree");
442	568
443	569	editPanel = new cGridBag().setVertical(true);
444		- editPanel.setName("Edit");
	570	+ //editPanel.setName("Edit");
445	571
446	572	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
447	573
..	..	@@ -449,11 +575,13 @@
449	575	editPanel.add(editCommandsPanel);
450	576	editPanel.add(ctrlPanel);
451	577
452		- toolboxPanel = new cGridBag().setVertical(false);
453		- toolboxPanel.setName("Toolbox");
	578	+ toolboxPanel = new cGridBag().setVertical(true);
	579	+ //toolboxPanel.setName("Toolbox");
454	580
455		- materialPanel = new cGridBag().setVertical(true);
456		- materialPanel.setName("Material");
	581	+ skyboxPanel = new cGridBag().setVertical(true);
	582	+
	583	+ materialPanel = new cGridBag().setVertical(false);
	584	+ //materialPanel.setName("Material");
457	585
458	586	/JTextPane/
459	587	infoarea = createTextPane();
..	..	@@ -461,6 +589,7 @@
461	589
462	590	infoarea.setEditable(true);
463	591	SetText();
	592	+
464	593	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
465	594	// infoarea.setOpaque(false);
466	595	// //infoarea.setForeground(textcolor);
..	..	@@ -468,7 +597,7 @@
468	597	// TEXTAREA infoarea.setWrapStyleWord(true);
469	598	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
470	599	infoPanel.setPreferredSize(new Dimension(1, 1));
471		- infoPanel.setName("Info");
	600	+ //infoPanel.setName("Info");
472	601	//infoPanel.setLayout(new BorderLayout());
473	602	//infoPanel.add(createTextPane());
474	603
..	..	@@ -735,6 +864,7 @@
735	864	boolean maximized;
736	865
737	866	cButton fullscreenLayout;
	867	+ cButton expandedLayout;
738	868
739	869	void Minimize()
740	870	{
..	..	@@ -774,10 +904,12 @@
774	904	cButton minButton;
775	905	cButton maxButton;
776	906	cButton fullButton;
	907	+ cButton collapseButton;
	908	+ cButton maximize3DButton;
777	909
778	910	void ToggleFullScreen()
779	911	{
780		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	912	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
781	913
782	914	cameraView.ToggleFullScreen();
783	915
..	..	@@ -798,13 +930,13 @@
798	930	// X frame.getContentPane().remove(/"Center",/bigThree);
799	931	// X framePanel.add(bigThree);
800	932	// X frame.getContentPane().add(/"Center",/framePanel);
801		- framePanel.setDividerLocation(46);
	933	+// framePanel.setDividerLocation(46); // icons are 24x24
802	934
803	935	//frame.setVisible(true);
804		- radio.layout = keepButton;
	936	+// radio.layout = keepButton;
805	937	//theFrame = null;
806	938	keepButton = null;
807		- radio.layout.doClick();
	939	+// radio.layout.doClick();
808	940
809	941	} else
810	942	{
..	..	@@ -825,31 +957,53 @@
825	957	// X frame.getContentPane().remove(/"Center",/framePanel);
826	958	// X framePanel.remove(bigThree);
827	959	// X frame.getContentPane().add(/"Center",/bigThree);
828		- framePanel.setDividerLocation(0);
	960	+// framePanel.setDividerLocation(0);
829	961
830		- radio.layout = fullscreenLayout;
831		- radio.layout.doClick();
	962	+// radio.layout = fullscreenLayout;
	963	+// radio.layout.doClick();
832	964	//frame.setVisible(true);
833	965	}
834	966	frame.validate();
	967	+
	968	+ cameraView.requestFocusInWindow();
835	969	}
836	970
837		- private byte[] CompressCopy()
	971	+ void CollapseToolbar()
	972	+ {
	973	+ framePanel.setDividerLocation(0);
	974	+ //frame.validate();
	975	+
	976	+ cameraView.requestFocusInWindow();
	977	+ }
	978	+
	979	+ private Object3D Duplicate(Object3D object)
838	980	{
839	981	boolean temp = CameraPane.SWITCH;
840	982	CameraPane.SWITCH = false;
841	983
842		- copy.ExtractBigData(versiontable);
	984	+ if (Grafreed.grafreed.universe.versiontable == null)
	985	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	986	+
	987	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
843	988	// if (copy == client)
844	989
845		- byte[] versions[] = copy.versions;
846		- copy.versions = null;
	990	+ Object3D versions[] = object.versionlist;
	991	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	992	+ object.versionlist = null;
	993	+ object.versiontable = null;
847	994
848		- byte[] compress = Compress(copy);
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
849	997
850		- copy.versions = versions;
	998	+ //byte[] compress = Compress(copy);
	999	+ Object3D compress = (Object3D)Grafreed.clone(object);
851	1000
852		- copy.RestoreBigData(versiontable);
	1001	+ object.parent = parent;
	1002	+
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
853	1007
854	1008	CameraPane.SWITCH = temp;
855	1009
..	..	@@ -977,6 +1131,7 @@
977	1131	{
978	1132	SetupMaterial(materialPanel);
979	1133	}
	1134	+
980	1135	//SetupName();
981	1136	//SetupViews();
982	1137	}
..	..	@@ -986,7 +1141,7 @@
986	1141	// NumberSlider vDivsField;
987	1142	// JCheckBox endcaps;
988	1143	JCheckBox liveCB;
989		- JCheckBox selectCB;
	1144	+ JCheckBox selectableCB;
990	1145	JCheckBox hideCB;
991	1146	JCheckBox link2masterCB;
992	1147	JCheckBox markCB;
..	..	@@ -1185,6 +1340,18 @@
1185	1340
1186	1341	namePanel = new cGridBag();
1187	1342
	1343	+ //if (copy.pinned)
	1344	+ {
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1346	+ pinButton.setSelected(copy.pinned);
	1347	+ cGridBag t = new cGridBag();
	1348	+ t.preferredWidth = 2;
	1349	+ t.add(pinButton);
	1350	+ namePanel.add(t);
	1351	+
	1352	+ pinButton.addItemListener(this);
	1353	+ }
	1354	+
1188	1355	nameField = AddText(namePanel, copy.GetName());
1189	1356	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1190	1357	oe.ctrlPanel.add(namePanel);
..	..	@@ -1198,13 +1365,16 @@
1198	1365
1199	1366	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1200	1367	liveCB.setToolTipText("Animate object");
1201		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1202		- selectCB.setToolTipText("Make object selectable");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
	1370	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1371	+ selectableCB.setToolTipText("Make object selectable");
1203	1372	// Return();
	1373	+
1204	1374	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1205	1375	hideCB.setToolTipText("Hide object");
1206		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1207		- markCB.setToolTipText("As animation target transform");
	1376	+
	1377	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1208	1378
1209	1379	setupPanel2 = new cGridBag().setVertical(false);
1210	1380
..	..	@@ -1404,22 +1574,9 @@
1404	1574
1405	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1406	1576	{
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);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1423	1580	} else
1424	1581	{
1425	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1485,6 +1642,45 @@
1485	1642	//frontView.object = copy;
1486	1643	//sideView.object = copy;
1487	1644
	1645	+ transformPanel = new cGridBag().setVertical(true);
	1646	+
	1647	+ cGridBag resetTransformPanel = new cGridBag();
	1648	+
	1649	+ resetTransformPanel.preferredHeight = 2;
	1650	+
	1651	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1652	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1653	+ resetTransform.addMouseListener(new MouseAdapter()
	1654	+ {
	1655	+ public void mouseClicked(MouseEvent e)
	1656	+ {
	1657	+ ResetTransform();
	1658	+ }
	1659	+ });
	1660	+ resetTransformPanel.add(resetTransform);
	1661	+
	1662	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1663	+ resetTransform.setToolTipText("Reset Translation only");
	1664	+ resetTransform.addMouseListener(new MouseAdapter()
	1665	+ {
	1666	+ public void mouseClicked(MouseEvent e)
	1667	+ {
	1668	+ ResetTransform(1);
	1669	+ }
	1670	+ });
	1671	+ resetTransformPanel.add(resetTransform);
	1672	+
	1673	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1674	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1675	+ resetTransform.addMouseListener(new MouseAdapter()
	1676	+ {
	1677	+ public void mouseClicked(MouseEvent e)
	1678	+ {
	1679	+ ResetTransform(2);
	1680	+ }
	1681	+ });
	1682	+ resetTransformPanel.add(resetTransform);
	1683	+
1488	1684	XYZPanel = new cGridBag().setVertical(true);
1489	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1490	1686
..	..	@@ -1492,7 +1688,11 @@
1492	1688	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1493	1689	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1494	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1691	+ //XYZPanel.setName("XYZ");
1495	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1496	1696	/*
1497	1697	gridPanel = new JPanel(); //new BorderLayout());
1498	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1500,12 +1700,12 @@
1500	1700	gridPanel.add(cameraView);
1501	1701	gridPanel.add(XYZPanel);
1502	1702	*/
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);
	1703	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1704	+// gridPanel.setContinuousLayout(true);
	1705	+// gridPanel.setOneTouchExpandable(true);
	1706	+// gridPanel.setDividerLocation(1.0);
	1707	+// gridPanel.setDividerSize(9);
	1708	+// gridPanel.setResizeWeight(0.85);
1509	1709
1510	1710	// aConstraints.weighty = 0;
1511	1711	//System.out.println("THIS = " + this);
..	..	@@ -1528,18 +1728,34 @@
1528	1728
1529	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1530	1730	//tmp.setName("Edit");
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
	1735	+ objectPanel.add(toolboxPanel);
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1738	+
1531	1739	objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
1532	1743	// JPanel north = new JPanel(new BorderLayout());
1533	1744	// north.setName("Edit");
1534	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1535	1746	// objectPanel.add(north);
1536	1747	objectPanel.add(editPanel);
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1749	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1537	1750
1538		- //if (Globals.ADVANCED)
1539		- objectPanel.add(infoPanel);
	1751	+ objectPanel.add(transformPanel);
	1752	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1540	1754
1541		- objectPanel.add(toolboxPanel);
1542		-
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1543	1759	/*
1544	1760	aConstraints.gridx = 0;
1545	1761	aConstraints.gridwidth = 1;
..	..	@@ -1570,11 +1786,108 @@
1570	1786
1571	1787	AddOptions(optionsPanel); //, aConstraints);
1572	1788
1573		- tabbedPane.add(optionsPanel);
1574		-
1575	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1576	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1577	1793	scenePanel.add(tabbedPane);
	1794	+
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
	1797	+
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ tabbedPane.add(infoPanel);
	1888	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1889	+ tabbedPane.setToolTipTextAt(4, "Information");
	1890	+ }
1578	1891
1579	1892	/*
1580	1893	cTree jTree = new cTree(null);
..	..	@@ -1596,13 +1909,13 @@
1596	1909	jtp.add(tree);
1597	1910	*/
1598	1911
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");
	1912	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1913	+// bigPanel.setContinuousLayout(true);
	1914	+// bigPanel.setOneTouchExpandable(true);
	1915	+// bigPanel.setDividerLocation(0.8);
	1916	+// bigPanel.setDividerSize(15);
	1917	+// bigPanel.setResizeWeight(0.15);
	1918	+// bigPanel.setName("Scene");
1606	1919
1607	1920	//bigPanel.setLayout(new BorderLayout());
1608	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1637,7 +1950,7 @@
1637	1950	bigThree = new cGridBag();
1638	1951	bigThree.addComponent(scenePanel);
1639	1952	bigThree.addComponent(centralPanel);
1640		- bigThree.addComponent(XYZPanel);
	1953	+ //bigThree.addComponent(XYZPanel);
1641	1954
1642	1955	// // SIDE EFFECT!!!
1643	1956	// aConstraints.gridx = 0;
..	..	@@ -1646,6 +1959,23 @@
1646	1959	// aConstraints.gridheight = 1;
1647	1960
1648	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1962	+
	1963	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1964	+ new java.beans.PropertyChangeListener()
	1965	+ {
	1966	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1967	+ {
	1968	+ if ((Integer)pce.getOldValue() == 1)
	1969	+ {
	1970	+ if (radio.layout != expandedLayout)
	1971	+ {
	1972	+ radio.layout = expandedLayout;
	1973	+ radio.layout.doClick();
	1974	+ }
	1975	+ }
	1976	+ }
	1977	+ });
	1978	+
1649	1979	framePanel.setContinuousLayout(false);
1650	1980	framePanel.setOneTouchExpandable(false);
1651	1981	//.setDividerLocation(0.8);
..	..	@@ -1655,7 +1985,7 @@
1655	1985
1656	1986	frame.getContentPane().setLayout(new BorderLayout());
1657	1987	/**/
1658		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1659	1989	//worldPane.add(bigPanel);
1660	1990	//worldPane.add(worldPanel);
1661	1991	/**/
..	..	@@ -1669,7 +1999,7 @@
1669	1999
1670	2000	cameraView.requestFocusInWindow();
1671	2001
1672		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1673	2003
1674	2004	frame.validate();
1675	2005
..	..	@@ -1678,7 +2008,6 @@
1678	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1679	2009	frame.addWindowListener(new WindowAdapter()
1680	2010	{
1681		-
1682	2011	public void windowClosing(WindowEvent e)
1683	2012	{
1684	2013	Close();
..	..	@@ -1701,28 +2030,484 @@
1701	2030	ctrlPanel.removeAll();
1702	2031	}
1703	2032
1704		- void SetupMaterial(cGridBag panel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1705	2034	{
1706		- /*
	2035	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2036	+
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2038	+ skin.setToolTipText("Skin");
	2039	+ skin.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ // Skin
	2047	+ colorField.setFloat(material.color);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
	2057	+ subsurfaceField.setFloat(material.subsurface);
	2058	+ selfshadowField.setFloat(material.diffuseness);
	2059	+ diffusenessField.setFloat(material.factor);
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ shadowbiasField.setFloat(material.shadowbias);
	2062	+ diffuseField.setFloat(material.diffuse);
	2063	+ specularField.setFloat(material.specular);
	2064	+
	2065	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2066	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2067	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2068	+
	2069	+ materialtouched = true;
	2070	+ applySelf();
	2071	+ }
	2072	+ });
	2073	+ presetpanel.add(skin);
	2074	+
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2076	+ lambert.setToolTipText("Diffuse");
	2077	+ lambert.addMouseListener(new MouseAdapter()
	2078	+ {
	2079	+ public void mouseClicked(MouseEvent e)
	2080	+ {
	2081	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2082	+ cMaterial material = object.material;
	2083	+
	2084	+ diffusenessField.setFloat(material.factor);
	2085	+ selfshadowField.setFloat(material.diffuseness);
	2086	+
	2087	+ materialtouched = true;
	2088	+ applySelf();
	2089	+ }
	2090	+ });
	2091	+ presetpanel.add(lambert);
	2092	+
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2094	+ diffuse2.setToolTipText("Diffuse2");
	2095	+ diffuse2.addMouseListener(new MouseAdapter()
	2096	+ {
	2097	+ public void mouseClicked(MouseEvent e)
	2098	+ {
	2099	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2100	+ cMaterial material = object.material;
	2101	+
	2102	+ diffusenessField.setFloat(material.factor);
	2103	+ selfshadowField.setFloat(material.diffuseness);
	2104	+
	2105	+ materialtouched = true;
	2106	+ applySelf();
	2107	+ }
	2108	+ });
	2109	+ presetpanel.add(diffuse2);
	2110	+
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2112	+ diffusemoon.setToolTipText("Moon");
	2113	+ diffusemoon.addMouseListener(new MouseAdapter()
	2114	+ {
	2115	+ public void mouseClicked(MouseEvent e)
	2116	+ {
	2117	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2118	+ cMaterial material = object.material;
	2119	+
	2120	+ diffusenessField.setFloat(material.factor);
	2121	+ selfshadowField.setFloat(material.diffuseness);
	2122	+
	2123	+ materialtouched = true;
	2124	+ applySelf();
	2125	+ }
	2126	+ });
	2127	+ presetpanel.add(diffusemoon);
	2128	+
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2130	+ diffusemoon2.setToolTipText("Moon2");
	2131	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2132	+ {
	2133	+ public void mouseClicked(MouseEvent e)
	2134	+ {
	2135	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2136	+ cMaterial material = object.material;
	2137	+
	2138	+ diffusenessField.setFloat(material.factor);
	2139	+ selfshadowField.setFloat(material.diffuseness);
	2140	+
	2141	+ materialtouched = true;
	2142	+ applySelf();
	2143	+ }
	2144	+ });
	2145	+ presetpanel.add(diffusemoon2);
	2146	+
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2148	+ diffusemoon3.setToolTipText("Moon3");
	2149	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2150	+ {
	2151	+ public void mouseClicked(MouseEvent e)
	2152	+ {
	2153	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2154	+ cMaterial material = object.material;
	2155	+
	2156	+ diffusenessField.setFloat(material.factor);
	2157	+ selfshadowField.setFloat(material.diffuseness);
	2158	+
	2159	+ materialtouched = true;
	2160	+ applySelf();
	2161	+ }
	2162	+ });
	2163	+ presetpanel.add(diffusemoon3);
	2164	+
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2166	+ diffusesheen.setToolTipText("Sheen");
	2167	+ diffusesheen.addMouseListener(new MouseAdapter()
	2168	+ {
	2169	+ public void mouseClicked(MouseEvent e)
	2170	+ {
	2171	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2172	+ cMaterial material = object.material;
	2173	+
	2174	+ sheenField.setFloat(material.sheen);
	2175	+
	2176	+ materialtouched = true;
	2177	+ applySelf();
	2178	+ }
	2179	+ });
	2180	+ presetpanel.add(diffusesheen);
	2181	+
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2183	+ rough.setToolTipText("Rough metal");
	2184	+ rough.addMouseListener(new MouseAdapter()
	2185	+ {
	2186	+ public void mouseClicked(MouseEvent e)
	2187	+ {
	2188	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2189	+ cMaterial material = object.material;
	2190	+
	2191	+ shininessField.setFloat(material.shininess);
	2192	+ velvetField.setFloat(material.velvet);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(rough);
	2199	+
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2201	+ rough2.setToolTipText("Medium metal");
	2202	+ rough2.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2207	+ cMaterial material = object.material;
	2208	+
	2209	+ shininessField.setFloat(material.shininess);
	2210	+ lightareaField.setFloat(material.lightarea);
	2211	+
	2212	+ materialtouched = true;
	2213	+ applySelf();
	2214	+ }
	2215	+ });
	2216	+ presetpanel.add(rough2);
	2217	+
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2219	+ shini0.setToolTipText("Shiny");
	2220	+ shini0.addMouseListener(new MouseAdapter()
	2221	+ {
	2222	+ public void mouseClicked(MouseEvent e)
	2223	+ {
	2224	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2225	+ cMaterial material = object.material;
	2226	+
	2227	+ shininessField.setFloat(material.shininess);
	2228	+ lightareaField.setFloat(material.lightarea);
	2229	+
	2230	+ materialtouched = true;
	2231	+ applySelf();
	2232	+ }
	2233	+ });
	2234	+ presetpanel.add(shini0);
	2235	+
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2237	+ shini1.setToolTipText("Shiny2");
	2238	+ shini1.addMouseListener(new MouseAdapter()
	2239	+ {
	2240	+ public void mouseClicked(MouseEvent e)
	2241	+ {
	2242	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2243	+ cMaterial material = object.material;
	2244	+
	2245	+ shininessField.setFloat(material.shininess);
	2246	+ lightareaField.setFloat(material.lightarea);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(shini1);
	2253	+
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2255	+ shini2.setToolTipText("Shiny3");
	2256	+ shini2.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2261	+ cMaterial material = object.material;
	2262	+
	2263	+ shininessField.setFloat(material.shininess);
	2264	+ lightareaField.setFloat(material.lightarea);
	2265	+
	2266	+ materialtouched = true;
	2267	+ applySelf();
	2268	+ }
	2269	+ });
	2270	+ presetpanel.add(shini2);
	2271	+
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2273	+ aniso.setToolTipText("AnisoU");
	2274	+ aniso.addMouseListener(new MouseAdapter()
	2275	+ {
	2276	+ public void mouseClicked(MouseEvent e)
	2277	+ {
	2278	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2279	+ cMaterial material = object.material;
	2280	+
	2281	+ anisoField.setFloat(material.aniso);
	2282	+ anisoVField.setFloat(material.anisoV);
	2283	+
	2284	+ materialtouched = true;
	2285	+ applySelf();
	2286	+ }
	2287	+ });
	2288	+ presetpanel.add(aniso);
	2289	+
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2291	+ aniso2.setToolTipText("AnisoV");
	2292	+ aniso2.addMouseListener(new MouseAdapter()
	2293	+ {
	2294	+ public void mouseClicked(MouseEvent e)
	2295	+ {
	2296	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2297	+ cMaterial material = object.material;
	2298	+
	2299	+ anisoField.setFloat(material.aniso);
	2300	+ anisoVField.setFloat(material.anisoV);
	2301	+
	2302	+ materialtouched = true;
	2303	+ applySelf();
	2304	+ }
	2305	+ });
	2306	+ presetpanel.add(aniso2);
	2307	+
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2309	+ aniso3.setToolTipText("AnisoUV");
	2310	+ aniso3.addMouseListener(new MouseAdapter()
	2311	+ {
	2312	+ public void mouseClicked(MouseEvent e)
	2313	+ {
	2314	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2315	+ cMaterial material = object.material;
	2316	+
	2317	+ anisoField.setFloat(material.aniso);
	2318	+ anisoVField.setFloat(material.anisoV);
	2319	+
	2320	+ materialtouched = true;
	2321	+ applySelf();
	2322	+ }
	2323	+ });
	2324	+ presetpanel.add(aniso3);
	2325	+
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2327	+ velvet0.setToolTipText("Velvet");
	2328	+ velvet0.addMouseListener(new MouseAdapter()
	2329	+ {
	2330	+ public void mouseClicked(MouseEvent e)
	2331	+ {
	2332	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2333	+ cMaterial material = object.material;
	2334	+
	2335	+ diffusenessField.setFloat(material.factor);
	2336	+ selfshadowField.setFloat(material.diffuseness);
	2337	+ sheenField.setFloat(material.sheen);
	2338	+ shininessField.setFloat(material.shininess);
	2339	+ velvetField.setFloat(material.velvet);
	2340	+ shiftField.setFloat(material.shift);
	2341	+
	2342	+ materialtouched = true;
	2343	+ applySelf();
	2344	+ }
	2345	+ });
	2346	+ presetpanel.add(velvet0);
	2347	+
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2349	+ bump0.setToolTipText("Bump texture");
	2350	+ bump0.addMouseListener(new MouseAdapter()
	2351	+ {
	2352	+ public void mouseClicked(MouseEvent e)
	2353	+ {
	2354	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2355	+ cMaterial material = object.material;
	2356	+
	2357	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2358	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2359	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2360	+
	2361	+ materialtouched = true;
	2362	+ applySelf();
	2363	+ }
	2364	+ });
	2365	+ presetpanel.add(bump0);
	2366	+
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2368	+ borderShader.setToolTipText("Border fade");
	2369	+ borderShader.addMouseListener(new MouseAdapter()
	2370	+ {
	2371	+ public void mouseClicked(MouseEvent e)
	2372	+ {
	2373	+ borderfadeField.setFloat(0.4);
	2374	+ opacityField.setFloat(0.75);
	2375	+
	2376	+ materialtouched = true;
	2377	+ applySelf();
	2378	+ }
	2379	+ });
	2380	+ presetpanel.add(borderShader);
	2381	+
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2383	+ halo.setToolTipText("Halo");
	2384	+ halo.addMouseListener(new MouseAdapter()
	2385	+ {
	2386	+ public void mouseClicked(MouseEvent e)
	2387	+ {
	2388	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2389	+ cMaterial material = object.material;
	2390	+
	2391	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2392	+
	2393	+ materialtouched = true;
	2394	+ applySelf();
	2395	+ }
	2396	+ });
	2397	+ presetpanel.add(halo);
	2398	+
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2400	+ candle.setToolTipText("Candle");
	2401	+ candle.addMouseListener(new MouseAdapter()
	2402	+ {
	2403	+ public void mouseClicked(MouseEvent e)
	2404	+ {
	2405	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2406	+ cMaterial material = object.material;
	2407	+
	2408	+ subsurfaceField.setFloat(material.subsurface);
	2409	+ shadowbiasField.setFloat(material.shadowbias);
	2410	+ ambientField.setFloat(material.ambient);
	2411	+ specularField.setFloat(material.specular);
	2412	+ lightareaField.setFloat(material.lightarea);
	2413	+ shininessField.setFloat(material.shininess);
	2414	+
	2415	+ materialtouched = true;
	2416	+ applySelf();
	2417	+ }
	2418	+ });
	2419	+ presetpanel.add(candle);
	2420	+
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2422	+ shadowShader.setToolTipText("Shadow");
	2423	+ shadowShader.addMouseListener(new MouseAdapter()
	2424	+ {
	2425	+ public void mouseClicked(MouseEvent e)
	2426	+ {
	2427	+ diffuseField.setFloat(0.001);
	2428	+ ambientField.setFloat(0.001);
	2429	+ cameraField.setFloat(0.001);
	2430	+ specularField.setFloat(0.001);
	2431	+ fakedepthField.setFloat(0.001);
	2432	+ opacityField.setFloat(0.6);
	2433	+
	2434	+ materialtouched = true;
	2435	+ applySelf();
	2436	+ }
	2437	+ });
	2438	+ presetpanel.add(shadowShader);
	2439	+
	2440	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2441	+ para0.setToolTipText("No parallax");
	2442	+ para0.addMouseListener(new MouseAdapter()
	2443	+ {
	2444	+ public void mouseClicked(MouseEvent e)
	2445	+ {
	2446	+ parallaxField.setFloat(0.125);
	2447	+
	2448	+ materialtouched = true;
	2449	+ applySelf();
	2450	+ }
	2451	+ });
	2452	+ presetpanel.add(para0);
	2453	+
	2454	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2455	+ para1.setToolTipText("With parallax");
	2456	+ para1.addMouseListener(new MouseAdapter()
	2457	+ {
	2458	+ public void mouseClicked(MouseEvent e)
	2459	+ {
	2460	+ parallaxField.setFloat(0.13);
	2461	+
	2462	+ materialtouched = true;
	2463	+ applySelf();
	2464	+ }
	2465	+ });
	2466	+ presetpanel.add(para1);
	2467	+
	2468	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2469	+ para2.setToolTipText("Reset parallax");
	2470	+ para2.addMouseListener(new MouseAdapter()
	2471	+ {
	2472	+ public void mouseClicked(MouseEvent e)
	2473	+ {
	2474	+ parallaxField.setFloat(0.14);
	2475	+
	2476	+ materialtouched = true;
	2477	+ applySelf();
	2478	+ }
	2479	+ });
	2480	+ presetpanel.add(para2);
	2481	+
	2482	+ cGridBag panel = new cGridBag().setVertical(true);
	2483	+
	2484	+ presetpanel.preferredWidth = 1;
	2485	+
	2486	+ materialpanel.add(presetpanel);
	2487	+ materialpanel.add(panel);
	2488	+
	2489	+ panel.preferredWidth = 8;
	2490	+
	2491	+ /*
1707	2492	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1708	2493	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- */
	2494	+ */
1710	2495
1711	2496	cGridBag editBar = new cGridBag().setVertical(false);
1712	2497
1713		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2498	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1714	2499	createMaterialButton.setToolTipText("Create material");
1715	2500
1716	2501	/*
1717	2502	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1718	2503	*/
1719	2504
1720		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2505	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1721	2506	clearMaterialButton.setToolTipText("Clear material");
1722	2507
1723	2508	if (Globals.ADVANCED)
1724	2509	{
1725		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2510	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1726	2511	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1727	2512	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1728	2513	}
..	..	@@ -1740,27 +2525,61 @@
1740	2525	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1741	2526
1742	2527	cGridBag colorSection = new cGridBag().setVertical(true);
	2528	+
	2529	+ cGridBag huepanel = new cGridBag();
	2530	+ cGridBag huelabel = new cGridBag();
	2531	+ cLabel hue = GetLabel("icons/hue.png", false);
	2532	+ hue.fit = true;
	2533	+
	2534	+ hue.addMouseListener(new MouseAdapter()
	2535	+ {
	2536	+ public void mousePressed(MouseEvent e)
	2537	+ {
	2538	+ int x = e.getX();
	2539	+
	2540	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2541	+ }
	2542	+ });
	2543	+
	2544	+ huelabel.add(hue);
	2545	+ huelabel.preferredWidth = 20;
	2546	+ huepanel.add(new cGridBag()); // Label
	2547	+ huepanel.add(huelabel); // Field/slider
	2548	+
	2549	+ huepanel.preferredHeight = 7;
	2550	+
	2551	+ colorSection.add(huepanel);
1743	2552
1744	2553	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);
	2554	+
	2555	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2556	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2557	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2558	+
1748	2559	//colorField.preferredWidth = 200;
1749	2560	colorSection.add(color);
1750	2561
1751	2562	cGridBag modulation = new cGridBag();
1752	2563	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1753	2564	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1754		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2565	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1755	2566	colorSection.add(modulation);
1756	2567
	2568	+ cGridBag opacity = new cGridBag();
	2569	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2570	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2571	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2572	+ colorSection.add(opacity);
	2573	+
	2574	+ colorSection.add(GetSeparator());
	2575	+
1757	2576	cGridBag texture = new cGridBag();
1758	2577	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1759	2578	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760	2579	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1761	2580	colorSection.add(texture);
1762	2581
1763		- panel.add(new JSeparator());
	2582	+ panel.add(GetSeparator());
1764	2583
1765	2584	panel.add(colorSection);
1766	2585
..	..	@@ -1816,7 +2635,7 @@
1816	2635	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1817	2636	diffuseSection.add(shadowbias);
1818	2637
1819		- panel.add(new JSeparator());
	2638	+ panel.add(GetSeparator());
1820	2639
1821	2640	panel.add(diffuseSection);
1822	2641
..	..	@@ -1879,7 +2698,7 @@
1879	2698	specularSection.add(anisoV);
1880	2699
1881	2700
1882		- panel.add(new JSeparator());
	2701	+ panel.add(GetSeparator());
1883	2702
1884	2703	panel.add(specularSection);
1885	2704
..	..	@@ -1905,12 +2724,12 @@
1905	2724	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1906	2725	colorSection.add(backlit);
1907	2726
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		-
	2727	+ cGridBag parallax = new cGridBag();
	2728	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2729	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2730	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2731	+ colorSection.add(parallax);
	2732	+
1914	2733	//panel.add(new JSeparator());
1915	2734
1916	2735	//panel.add(globalSection);
..	..	@@ -1955,7 +2774,7 @@
1955	2774	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1956	2775	textureSection.add(opacityPower);
1957	2776
1958		- panel.add(new JSeparator());
	2777	+ panel.add(GetSeparator());
1959	2778
1960	2779	panel.add(textureSection);
1961	2780
..	..	@@ -2942,7 +3761,7 @@
2942	3761
2943	3762	freezematerial = true;
2944	3763	colorField.setFloat(mat.color);
2945		- modulationField.setFloat(mat.modulation);
	3764	+ saturationField.setFloat(mat.modulation);
2946	3765	metalnessField.setFloat(mat.metalness);
2947	3766	diffuseField.setFloat(mat.diffuse);
2948	3767	specularField.setFloat(mat.specular);
..	..	@@ -2962,6 +3781,7 @@
2962	3781	shadowField.setFloat(mat.shadow);
2963	3782	textureField.setFloat(mat.texture);
2964	3783	opacityField.setFloat(mat.opacity);
	3784	+ parallaxField.setFloat(mat.parallax + 0.125f);
2965	3785	fakedepthField.setFloat(mat.fakedepth);
2966	3786	shadowbiasField.setFloat(mat.shadowbias);
2967	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -3004,32 +3824,8 @@
3004	3824
3005	3825	if (multiplyToggle != null)
3006	3826	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		- }
	3827	+
	3828	+ AllocProjectedVertices(object);
3033	3829
3034	3830	SetMaterial(mat, object.projectedVertices);
3035	3831	}
..	..	@@ -3149,6 +3945,17 @@
3149	3945	public void itemStateChanged(ItemEvent event)
3150	3946	{
3151	3947	// System.out.println("Propagate = " + propagate);
	3948	+ if (event.getSource() == pinButton)
	3949	+ {
	3950	+ copy.pinned ^= true;
	3951	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3952	+ {
	3953	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3954	+ copy.CloseUI();
	3955	+ //copy.editWindow.refreshContents();
	3956	+ }
	3957	+ }
	3958	+ else
3152	3959	if (event.getSource() == propagateToggle)
3153	3960	{
3154	3961	propagate ^= true;
..	..	@@ -3253,8 +4060,9 @@
3253	4060	} else if (event.getSource() == liveCB)
3254	4061	{
3255	4062	copy.live ^= true;
	4063	+ objEditor.refreshContents(true); // To show item colors
3256	4064	return;
3257		- } else if (event.getSource() == selectCB)
	4065	+ } else if (event.getSource() == selectableCB)
3258	4066	{
3259	4067	copy.dontselect ^= true;
3260	4068	return;
..	..	@@ -3262,7 +4070,7 @@
3262	4070	{
3263	4071	copy.hide ^= true;
3264	4072	copy.Touch(); // display list issue
3265		- objEditor.refreshContents();
	4073	+ objEditor.refreshContents(true); // To show item colors
3266	4074	return;
3267	4075	} else if (event.getSource() == link2masterCB)
3268	4076	{
..	..	@@ -3327,7 +4135,7 @@
3327	4135	//System.out.println("ObjEditor " + event);
3328	4136	applySelf0(true);
3329	4137	//parent.applySelf();
3330		- objEditor.refreshContents();
	4138	+ // conflicts with requestFocus objEditor.refreshContents();
3331	4139	} else if (source == resetButton)
3332	4140	{
3333	4141	CameraPane.fullreset = true;
..	..	@@ -3507,17 +4315,25 @@
3507	4315
3508	4316	void New()
3509	4317	{
3510		- while (copy.Size() > 1)
	4318	+ while (copy.Size() > 0)
3511	4319	{
3512		- copy.remove(1);
	4320	+ copy.remove(0);
3513	4321	}
3514	4322
	4323	+ copy.selection.clear();
	4324	+
	4325	+ if (copy == Grafreed.grafreed.universe)
	4326	+ {
	4327	+ CreateCameras();
	4328	+ cameraView.SetCamera(GetCamera(copy, 0));
	4329	+ }
3515	4330	ResetModel();
3516	4331	objEditor.refreshContents();
3517	4332	}
3518	4333
3519	4334	static public byte[] Compress(Object3D o)
3520	4335	{
	4336	+ // Slower to actually compress.
3521	4337	try
3522	4338	{
3523	4339	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3619,6 +4435,7 @@
3619	4435	{
3620	4436	//Save(true);
3621	4437	Replace();
	4438	+ SetVersionStates();
3622	4439	}
3623	4440
3624	4441	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3637,31 +4454,50 @@
3637	4454	return true;
3638	4455	}
3639	4456
3640		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4457	+ void DeleteVersion()
	4458	+ {
	4459	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4460	+ {
	4461	+ copy.versionlist[i] = copy.versionlist[i+1];
	4462	+ }
	4463	+
	4464	+ if (copy.versionlist[copy.versionindex] == null)
	4465	+ copy.versionindex -= 1;
	4466	+
	4467	+ if (copy.versionindex != -1)
	4468	+ CopyChanged();
	4469	+
	4470	+ SetVersionStates();
	4471	+ }
3641	4472
3642	4473	public boolean Save(boolean user)
3643	4474	{
3644	4475	System.err.println("Save");
	4476	+ Replace();
3645	4477
3646		- cRadio tab = GetCurrentTab();
	4478	+ //cRadio tab = GetCurrentTab();
3647	4479
3648		- byte[] compress = CompressCopy();
	4480	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3649	4481
3650	4482	boolean thesame = false;
3651	4483
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		- }
	4484	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4485	+// {
	4486	+// thesame = true;
	4487	+// }
3657	4488
3658	4489	//EditorFrame.m_MainFrame.requestFocusInWindow();
3659	4490	if (!thesame)
3660	4491	{
	4492	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4493	+ {
	4494	+ copy.versionlist[i] = copy.versionlist[i-1];
	4495	+ }
	4496	+
3661	4497	//tab.user[tab.versionindex] = user;
3662	4498	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3663	4499
3664		- copy.versions[++copy.versionindex] = compress;
	4500	+ copy.versionlist[++copy.versionindex] = compress;
3665	4501
3666	4502	// if (increment)
3667	4503	// tab.versionindex++;
..	..	@@ -3671,13 +4507,13 @@
3671	4507
3672	4508	//assert(hashtable.isEmpty());
3673	4509
3674		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3675		- {
3676		- //tab.user[i] = false;
3677		- copy.versions[i] = null;
3678		- }
	4510	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4511	+// {
	4512	+// //tab.user[i] = false;
	4513	+// copy.versionlist[i] = null;
	4514	+// }
3679	4515
3680		- SetUndoStates();
	4516	+ SetVersionStates();
3681	4517
3682	4518	// test save
3683	4519	if (false)
..	..	@@ -3700,27 +4536,65 @@
3700	4536
3701	4537	return !thesame;
3702	4538	}
3703		-
3704		- void CopyChanged(Object3D obj)
	4539	+
	4540	+ boolean flashIt = true;
	4541	+
	4542	+ void RefreshSelection()
3705	4543	{
3706		- SetUndoStates();
	4544	+ Object3D selection = new Object3D();
	4545	+
	4546	+ for (int i = 0; i < copy.selection.size(); i++)
	4547	+ {
	4548	+ Object3D elem = copy.selection.elementAt(i);
	4549	+
	4550	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4551	+
	4552	+ if (obj == null)
	4553	+ {
	4554	+ copy.selection.remove(i--);
	4555	+ }
	4556	+ else
	4557	+ {
	4558	+ selection.add(obj);
	4559	+ copy.selection.setElementAt(obj, i);
	4560	+ }
	4561	+ }
	4562	+
	4563	+ flashIt = false;
	4564	+ GetTree().clearSelection();
	4565	+ for (int i = 0; i < selection.size(); i++)
	4566	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4567	+ flashIt = true;
	4568	+
	4569	+ //refreshContents(false);
	4570	+ }
	4571	+
	4572	+ void CopyChanged()
	4573	+ {
	4574	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4575	+
	4576	+ SetVersionStates();
3707	4577
3708	4578	boolean temp = CameraPane.SWITCH;
3709	4579	CameraPane.SWITCH = false;
3710	4580
3711		- copy.ExtractBigData(versiontable);
	4581	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3712	4582
3713	4583	copy.clear();
3714	4584
	4585	+ copy.skyboxname = obj.skyboxname;
	4586	+ copy.skyboxext = obj.skyboxext;
	4587	+
3715	4588	for (int i=0; i<obj.Size(); i++)
3716	4589	{
3717	4590	copy.add(obj.get(i));
3718	4591	}
3719	4592
3720		- copy.RestoreBigData(versiontable);
	4593	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3721	4594
3722	4595	CameraPane.SWITCH = temp;
3723	4596
	4597	+ RefreshSelection();
3724	4598	//assert(hashtable.isEmpty());
3725	4599
3726	4600	copy.Touch();
..	..	@@ -3741,13 +4615,15 @@
3741	4615	}
3742	4616	}
3743	4617
3744		- refreshContents();
	4618	+ refreshContents(true);
3745	4619	}
3746	4620
3747		- cButton undoButton;
	4621	+ cButton previousVersionButton;
3748	4622	cButton restoreButton;
3749	4623	cButton replaceButton;
3750		- cButton redoButton;
	4624	+ cButton nextVersionButton;
	4625	+ cButton saveVersionButton;
	4626	+ cButton deleteVersionButton;
3751	4627
3752	4628	boolean muteSlider;
3753	4629
..	..	@@ -3755,39 +4631,64 @@
3755	4631	{
3756	4632	int count = 0;
3757	4633
3758		- for (int i = copy.versions.length; --i >= 0;)
	4634	+ for (int i = copy.versionlist.length; --i >= 0;)
3759	4635	{
3760		- if (copy.versions[i] != null)
	4636	+ if (copy.versionlist[i] != null)
3761	4637	count++;
3762	4638	}
3763	4639
3764	4640	return count;
3765	4641	}
3766	4642
3767		- void SetUndoStates()
	4643	+ public cGridBag versionSliderPane;
	4644	+
	4645	+ void SetVersionStates()
3768	4646	{
3769		- cRadio tab = GetCurrentTab();
	4647	+ //if (true)
	4648	+ // return;
	4649	+
	4650	+ //cRadio tab = GetCurrentTab();
3770	4651
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;
	4652	+ if (copy.versionlist == null)
	4653	+ {
	4654	+ saveVersionButton.setEnabled(false);
	4655	+ restoreButton.setEnabled(false);
	4656	+ replaceButton.setEnabled(false);
	4657	+ previousVersionButton.setEnabled(false);
	4658	+ nextVersionButton.setEnabled(false);
	4659	+ deleteVersionButton.setEnabled(false);
	4660	+ versionSliderPane.setVisible(false);
	4661	+ }
	4662	+ else
	4663	+ {
	4664	+ restoreButton.setEnabled(copy.versionindex != -1);
	4665	+ replaceButton.setEnabled(copy.versionindex != -1);
	4666	+
	4667	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4668	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4669	+
	4670	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4671	+ //copy.versionlist[copy.versionindex + 1] != null);
	4672	+
	4673	+ muteSlider = true;
	4674	+ versionSlider.setMinimum(0);
	4675	+ versionSlider.setMaximum(VersionCount() - 1);
	4676	+ versionSlider.setInteger(copy.versionindex);
	4677	+ versionSlider.setEnabled(copy.versionindex != -1);
	4678	+ muteSlider = false;
	4679	+
	4680	+ versionSliderPane.setVisible(true);
	4681	+ }
3781	4682	}
3782	4683
3783		- public boolean Undo()
	4684	+ public boolean PreviousVersion()
3784	4685	{
3785	4686	// Option?
3786	4687	Replace();
3787	4688
3788	4689	System.err.println("Undo");
3789	4690
3790		- cRadio tab = GetCurrentTab();
	4691	+ //cRadio tab = GetCurrentTab();
3791	4692
3792	4693	if (copy.versionindex == 0)
3793	4694	{
..	..	@@ -3810,7 +4711,7 @@
3810	4711
3811	4712	copy.versionindex -= 1;
3812	4713
3813		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4714	+ CopyChanged();
3814	4715
3815	4716	return true;
3816	4717	}
..	..	@@ -3819,44 +4720,45 @@
3819	4720	{
3820	4721	System.err.println("Restore");
3821	4722
3822		- cRadio tab = GetCurrentTab();
	4723	+ //cRadio tab = GetCurrentTab();
3823	4724
3824		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4725	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3825	4726	{
3826	4727	java.awt.Toolkit.getDefaultToolkit().beep();
3827	4728	return false;
3828	4729	}
3829	4730
3830		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4731	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4732	+ CopyChanged();
3831	4733
3832	4734	return true;
3833	4735	}
3834	4736
3835	4737	public boolean Replace()
3836	4738	{
3837		- System.err.println("Replace");
	4739	+ //System.err.println("Replace");
3838	4740
3839		- cRadio tab = GetCurrentTab();
	4741	+ //cRadio tab = GetCurrentTab();
3840	4742
3841		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4743	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3842	4744	{
3843	4745	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3844	4746	return false;
3845	4747	}
3846	4748
3847		- copy.versions[copy.versionindex] = CompressCopy();
	4749	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3848	4750
3849	4751	return true;
3850	4752	}
3851	4753
3852		- public void Redo()
	4754	+ public void NextVersion()
3853	4755	{
3854	4756	// Option?
3855	4757	Replace();
3856	4758
3857		- cRadio tab = GetCurrentTab();
	4759	+ //cRadio tab = GetCurrentTab();
3858	4760
3859		- if (copy.versions[copy.versionindex + 1] == null)
	4761	+ if (copy.versionlist[copy.versionindex + 1] == null)
3860	4762	{
3861	4763	java.awt.Toolkit.getDefaultToolkit().beep();
3862	4764	return;
..	..	@@ -3864,7 +4766,7 @@
3864	4766
3865	4767	copy.versionindex += 1;
3866	4768
3867		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4769	+ CopyChanged();
3868	4770
3869	4771	//if (!tab.user[tab.versionindex])
3870	4772	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4061,6 +4963,12 @@
4061	4963	// else
4062	4964	// applySelf(true);
4063	4965	// }
	4966	+
	4967	+ boolean Equal(double a, double b)
	4968	+ {
	4969	+ return Math.abs(a - b) < 0.001;
	4970	+ }
	4971	+
4064	4972	void applySelf0(boolean name)
4065	4973	{
4066	4974	if (name)
..	..	@@ -4078,7 +4986,7 @@
4078	4986	//copy.material = new cMaterial(copy.GetMaterial());
4079	4987
4080	4988	current.color = (float) colorField.getFloat();
4081		- current.modulation = (float) modulationField.getFloat();
	4989	+ current.modulation = (float) saturationField.getFloat();
4082	4990	current.metalness = (float) metalnessField.getFloat();
4083	4991	current.diffuse = (float) diffuseField.getFloat();
4084	4992	current.specular = (float) specularField.getFloat();
..	..	@@ -4098,6 +5006,7 @@
4098	5006	current.shadow = (float) shadowField.getFloat();
4099	5007	current.texture = (float) textureField.getFloat();
4100	5008	current.opacity = (float) opacityField.getFloat();
	5009	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4101	5010	current.fakedepth = (float) fakedepthField.getFloat();
4102	5011	current.shadowbias = (float) shadowbiasField.getFloat();
4103	5012
..	..	@@ -4110,29 +5019,54 @@
4110	5019	{
4111	5020	cMaterial mat = copy.material;
4112	5021
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));
	5022	+ if (!Equal(colorField.getFloat(), mat.color))
	5023	+ colorField.SetToolTipValue((mat.color));
	5024	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5025	+ saturationField.SetToolTipValue((mat.modulation));
	5026	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5027	+ metalnessField.SetToolTipValue((mat.metalness));
	5028	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5029	+ diffuseField.SetToolTipValue((mat.diffuse));
	5030	+ if (!Equal(specularField.getFloat(), mat.specular))
	5031	+ specularField.SetToolTipValue((mat.specular));
	5032	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5033	+ shininessField.SetToolTipValue((mat.shininess));
	5034	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5035	+ shiftField.SetToolTipValue((mat.shift));
	5036	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5037	+ ambientField.SetToolTipValue((mat.ambient));
	5038	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5039	+ lightareaField.SetToolTipValue((mat.lightarea));
	5040	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5041	+ diffusenessField.SetToolTipValue((mat.factor));
	5042	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5043	+ velvetField.SetToolTipValue((mat.velvet));
	5044	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5045	+ sheenField.SetToolTipValue((mat.sheen));
	5046	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5047	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5048	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5049	+ backlitField.SetToolTipValue((mat.bump));
	5050	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5051	+ anisoField.SetToolTipValue((mat.aniso));
	5052	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5053	+ anisoVField.SetToolTipValue((mat.anisoV));
	5054	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5055	+ cameraField.SetToolTipValue((mat.cameralight));
	5056	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5057	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5058	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5059	+ shadowField.SetToolTipValue((mat.shadow));
	5060	+ if (!Equal(textureField.getFloat(), mat.texture))
	5061	+ textureField.SetToolTipValue((mat.texture));
	5062	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5063	+ opacityField.SetToolTipValue((mat.opacity));
	5064	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5065	+ parallaxField.SetToolTipValue((mat.parallax));
	5066	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5067	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5068	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5069	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4136	5070	}
4137	5071
4138	5072	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4167,17 +5101,20 @@
4167	5101
4168	5102	public void stateChanged(ChangeEvent e)
4169	5103	{
4170		- // assert(false);
	5104	+ // assert(false);
4171	5105	if (e.getSource() == versionSlider)
4172	5106	{
4173	5107	if (muteSlider)
4174	5108	return;
4175	5109
	5110	+ Replace();
	5111	+
4176	5112	int version = versionSlider.getInteger();
4177	5113
4178		- if (copy.versions[version] != null)
	5114	+ if (version != -1 && copy.versionlist[version] != null)
4179	5115	{
4180		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	5116	+ copy.versionindex = version;
	5117	+ CopyChanged();
4181	5118	}
4182	5119
4183	5120	return;
..	..	@@ -4217,6 +5154,12 @@
4217	5154	{
4218	5155	//System.out.println("stateChanged = " + this);
4219	5156	materialtouched = true;
	5157	+
	5158	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5159	+ {
	5160	+ saturationField.setFloat(1);
	5161	+ }
	5162	+
4220	5163	applySelf();
4221	5164	//System.out.println("this = " + this);
4222	5165	//System.out.println("PARENT = " + parent);
..	..	@@ -4516,6 +5459,7 @@
4516	5459	{
4517	5460	if (GetTree() != null)
4518	5461	{
	5462	+ GetTree().revalidate();
4519	5463	GetTree().repaint();
4520	5464	}
4521	5465
..	..	@@ -4524,6 +5468,11 @@
4524	5468	ctrlPanel.validate(); // ? new
4525	5469	ctrlPanel.repaint();
4526	5470	}
	5471	+
	5472	+ if (previousVersionButton != null && copy.versionlist != null)
	5473	+ SetVersionStates();
	5474	+
	5475	+ cameraView.requestFocusInWindow();
4527	5476	}
4528	5477
4529	5478	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4555,7 +5504,7 @@
4555	5504	// group = (Composite) group.get(0);
4556	5505	// }
4557	5506
4558		- System.out.println("makeSomething of " + thing);
	5507	+ //System.out.println("makeSomething of " + thing);
4559	5508
4560	5509	/*
4561	5510	if (deselect && jList != null)
..	..	@@ -4772,7 +5721,9 @@
4772	5721	readobj.ResetDisplayList();
4773	5722	} catch (Exception e)
4774	5723	{
4775		- //e.printStackTrace();
	5724	+ if (!e.toString().contains("GZIP"))
	5725	+ e.printStackTrace();
	5726	+
4776	5727	try
4777	5728	{
4778	5729	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4852,6 +5803,8 @@
4852	5803	{
4853	5804	//readobj.deepCopySelf(copy);
4854	5805	copy.clear(); // june 2014
	5806	+ copy.skyboxname = readobj.skyboxname;
	5807	+ copy.skyboxext = readobj.skyboxext;
4855	5808	for (int i = 0; i < readobj.size(); i++)
4856	5809	{
4857	5810	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4892,6 +5845,7 @@
4892	5845	}
4893	5846	} catch (ClassCastException e)
4894	5847	{
	5848	+ e.printStackTrace();
4895	5849	assert (false);
4896	5850	Composite c = (Composite) copy;
4897	5851	c.children.clear();
..	..	@@ -4902,13 +5856,17 @@
4902	5856	c.addChild(csg);
4903	5857	}
4904	5858
4905		- copy.versions = readobj.versions;
	5859	+ copy.versionlist = readobj.versionlist;
4906	5860	copy.versionindex = readobj.versionindex;
	5861	+ copy.versiontable = readobj.versiontable;
4907	5862
4908		- if (copy.versions == null)
	5863	+ if (copy.versionlist == null)
4909	5864	{
4910		- copy.versions = new byte[100][];
	5865	+ // Backward compatibility
	5866	+ copy.versionlist = new Object3D[100];
4911	5867	copy.versionindex = -1;
	5868	+
	5869	+ //Save(true);
4912	5870	}
4913	5871
4914	5872	//? SetUndoStates();
..	..	@@ -4923,7 +5881,7 @@
4923	5881	{
4924	5882	if (Grafreed.standAlone)
4925	5883	{
4926		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5884	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4927	5885	browser.show();
4928	5886	String filename = browser.getFile();
4929	5887	if (filename != null && filename.length() > 0)
..	..	@@ -5000,6 +5958,8 @@
5000	5958
5001	5959	void save()
5002	5960	{
	5961	+ Replace();
	5962	+
5003	5963	if (lastname == null)
5004	5964	{
5005	5965	return;
..	..	@@ -5022,6 +5982,7 @@
5022	5982	//ps.print(buffer.toString());
5023	5983	} catch (IOException e)
5024	5984	{
	5985	+ e.printStackTrace();
5025	5986	}
5026	5987	}
5027	5988
..	..	@@ -5241,6 +6202,7 @@
5241	6202	ButtonGroup buttonGroup;
5242	6203
5243	6204	cGridBag toolboxPanel;
	6205	+ cGridBag skyboxPanel;
5244	6206	cGridBag materialPanel;
5245	6207	cGridBag ctrlPanel;
5246	6208
..	..	@@ -5252,6 +6214,7 @@
5252	6214	boolean materialFlushed;
5253	6215	Object3D latestObject;
5254	6216
	6217	+ cGridBag transformPanel;
5255	6218	cGridBag XYZPanel;
5256	6219
5257	6220	JSplitPane gridPanel;
..	..	@@ -5314,7 +6277,7 @@
5314	6277	JLabel colorLabel;
5315	6278	cNumberSlider colorField;
5316	6279	JLabel modulationLabel;
5317		- cNumberSlider modulationField;
	6280	+ cNumberSlider saturationField;
5318	6281	JLabel metalnessLabel;
5319	6282	cNumberSlider metalnessField;
5320	6283	JLabel diffuseLabel;
..	..	@@ -5345,6 +6308,7 @@
5345	6308	cNumberSlider anisoField;
5346	6309	JLabel anisoVLabel;
5347	6310	cNumberSlider anisoVField;
	6311	+
5348	6312	JLabel cameraLabel;
5349	6313	cNumberSlider cameraField;
5350	6314	JLabel selfshadowLabel;
..	..	@@ -5355,10 +6319,13 @@
5355	6319	cNumberSlider textureField;
5356	6320	JLabel opacityLabel;
5357	6321	cNumberSlider opacityField;
	6322	+ JLabel parallaxLabel;
	6323	+ cNumberSlider parallaxField;
5358	6324	JLabel fakedepthLabel;
5359	6325	cNumberSlider fakedepthField;
5360	6326	JLabel shadowbiasLabel;
5361	6327	cNumberSlider shadowbiasField;
	6328	+
5362	6329	JLabel bumpLabel;
5363	6330	cNumberSlider bumpField;
5364	6331	JLabel noiseLabel;