~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -34,6 +34,7 @@
34	34	iSendInfo
35	35	//KeyListener
36	36	{
	37	+ public cToggleButton pinButton;
37	38	boolean timeline;
38	39	boolean wasFullScreen;
39	40
..	..	@@ -41,64 +42,137 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
	90	+ public cGridBag GetSeparator()
	91	+ {
	92	+ cGridBag separator = new cGridBag();
	93	+ separator.add(new JSeparator());
	94	+ separator.preferredHeight = 5;
	95	+ return separator;
	96	+ }
44	97
45	98	cButton GetButton(String name, boolean border)
46	99	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
	100	+ ImageIcon icon = GetIcon(name);
	101	+ if (icon != null \|\| name.contains("/"))
50	102	return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
	103	+ else
54	104	return new cButton(name, border);
55		- }
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
56	111	}
57	112
58	113	cToggleButton GetToggleButton(String name, boolean border)
59	114	{
60		- try
61		- {
62		- ImageIcon icon = GetIcon(name);
63		- return new cToggleButton(icon, border);
64		- }
65		- catch (Exception e)
66		- {
67		- return new cToggleButton(name, border);
68		- }
	115	+ ImageIcon icon = GetIcon(name);
	116	+ return new cToggleButton(icon, border);
69	117	}
70	118
71	119	cCheckBox GetCheckBox(String name, boolean border)
72	120	{
	121	+ ImageIcon icon = GetIcon(name);
	122	+ return new cCheckBox(icon, border);
	123	+ }
	124	+
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
	128	+ {
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
73	135	try
74	136	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	138	+
	139	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	140	+// {
	141	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	142	+// Graphics2D g = resized.createGraphics();
	143	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	144	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	145	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	146	+// g.dispose();
	147	+//
	148	+// image = resized;
	149	+// }
	150	+
	151	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	152	+
	153	+ icons.put(name, icon);
	154	+
	155	+ return icon;
77	156	}
78	157	catch (Exception e)
79	158	{
80		- return new cCheckBox(name, border);
	159	+ //icons.put(name, null);
	160	+ return null;
81	161	}
82	162	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	163	+
	164	+ BufferedImage GetImage(String name)
85	165	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	166	+ try
89	167	{
90		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91		- Graphics2D g = resized.createGraphics();
92		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95		- g.dispose();
96		-
97		- image = resized;
	168	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	169	+
	170	+ return image;
98	171	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	172	+ catch (Exception e)
	173	+ {
	174	+ return null;
	175	+ }
102	176	}
103	177
104	178	// SCRIPT
..	..	@@ -282,6 +356,14 @@
282	356	client = inClient;
283	357	copy = client;
284	358
	359	+// if (copy.versionlist == null)
	360	+// {
	361	+// copy.versionlist = new Object3D[100];
	362	+// copy.versionindex = -1;
	363	+//
	364	+// callee.Save(true);
	365	+// }
	366	+
285	367	// "this" is not called: SetupUI2(objEditor);
286	368	}
287	369
..	..	@@ -295,6 +377,14 @@
295	377	client = inClient;
296	378	copy = client;
297	379
	380	+ if (copy.versionlist == null)
	381	+ {
	382	+ copy.versionlist = new Object3D[100];
	383	+ copy.versionindex = -1;
	384	+
	385	+// Save(true);
	386	+ }
	387	+
298	388	SetupUI2(callee.GetEditor());
299	389	}
300	390
..	..	@@ -316,7 +406,8 @@
316	406	//parent = p;
317	407
318	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
319		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
320	411	//gd.setFullScreenWindow(this);
321	412	//setResizable(false);
322	413	//if (!isDisplayable())
..	..	@@ -327,6 +418,14 @@
327	418	copy = localCopy;
328	419	copy.editWindow = this;
329	420
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
	424	+// copy.versionindex = -1;
	425	+//
	426	+// Save(true);
	427	+// }
	428	+
330	429	SetupMenu();
331	430
332	431	//SetupName(objEditor); // new
..	..	@@ -345,6 +444,9 @@
345	444
346	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
348	450	void SetupMenu()
349	451	{
350	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -358,8 +460,11 @@
358	460	importOBJItem.addActionListener(this);
359	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
360	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
361	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
362	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
363	468	menu.add("-");
364	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
365	470	importGFDItem.addActionListener(this);
..	..	@@ -394,6 +499,8 @@
394	499
395	500	ChangeListener changeListener = new ChangeListener()
396	501	{
	502	+ //String name;
	503	+
397	504	public void stateChanged(ChangeEvent changeEvent)
398	505	{
399	506	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -412,18 +519,49 @@
412	519	// EditSelection(false);
413	520	// }
414	521
415		- refreshContents(false); // To refresh Info tab
	522	+// if (objectPanel.getSelectedIndex() == 4)
	523	+// {
	524	+// name = copy.skyboxname;
	525	+//
	526	+// if (name == null)
	527	+// {
	528	+// name = "";
	529	+// }
	530	+//
	531	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	532	+// copy.skyboxext = "jpg";
	533	+// }
	534	+// else
	535	+// {
	536	+// if (name != null)
	537	+// {
	538	+// if (name.equals(""))
	539	+// {
	540	+// copy.skyboxname = null;
	541	+// copy.skyboxext = null;
	542	+// }
	543	+// else
	544	+// {
	545	+// copy.skyboxname = name;
	546	+// }
	547	+// }
	548	+// }
	549	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	550	+
	551	+// refreshContents(false); // To refresh Info tab
	552	+ cameraView.repaint();
416	553	}
417	554	};
418	555	objectPanel.addChangeListener(changeListener);
419	556
420	557	toolbarPanel = new JPanel();
421	558	toolbarPanel.setName("Toolbar");
	559	+
422	560	treePanel = new cGridBag();
423	561	treePanel.setName("Tree");
424	562
425	563	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	564	+ //editPanel.setName("Edit");
427	565
428	566	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	567
..	..	@@ -431,11 +569,13 @@
431	569	editPanel.add(editCommandsPanel);
432	570	editPanel.add(ctrlPanel);
433	571
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	572	+ toolboxPanel = new cGridBag().setVertical(true);
	573	+ //toolboxPanel.setName("Toolbox");
436	574
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	575	+ skyboxPanel = new cGridBag().setVertical(true);
	576	+
	577	+ materialPanel = new cGridBag().setVertical(false);
	578	+ //materialPanel.setName("Material");
439	579
440	580	/JTextPane/
441	581	infoarea = createTextPane();
..	..	@@ -443,6 +583,7 @@
443	583
444	584	infoarea.setEditable(true);
445	585	SetText();
	586	+
446	587	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	588	// infoarea.setOpaque(false);
448	589	// //infoarea.setForeground(textcolor);
..	..	@@ -450,7 +591,7 @@
450	591	// TEXTAREA infoarea.setWrapStyleWord(true);
451	592	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452	593	infoPanel.setPreferredSize(new Dimension(1, 1));
453		- infoPanel.setName("Info");
	594	+ //infoPanel.setName("Info");
454	595	//infoPanel.setLayout(new BorderLayout());
455	596	//infoPanel.add(createTextPane());
456	597
..	..	@@ -717,6 +858,7 @@
717	858	boolean maximized;
718	859
719	860	cButton fullscreenLayout;
	861	+ cButton expandedLayout;
720	862
721	863	void Minimize()
722	864	{
..	..	@@ -756,10 +898,12 @@
756	898	cButton minButton;
757	899	cButton maxButton;
758	900	cButton fullButton;
	901	+ cButton collapseButton;
	902	+ cButton maximize3DButton;
759	903
760	904	void ToggleFullScreen()
761	905	{
762		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	906	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763	907
764	908	cameraView.ToggleFullScreen();
765	909
..	..	@@ -780,13 +924,13 @@
780	924	// X frame.getContentPane().remove(/"Center",/bigThree);
781	925	// X framePanel.add(bigThree);
782	926	// X frame.getContentPane().add(/"Center",/framePanel);
783		- framePanel.setDividerLocation(46);
	927	+// framePanel.setDividerLocation(46); // icons are 24x24
784	928
785	929	//frame.setVisible(true);
786		- radio.layout = keepButton;
	930	+// radio.layout = keepButton;
787	931	//theFrame = null;
788	932	keepButton = null;
789		- radio.layout.doClick();
	933	+// radio.layout.doClick();
790	934
791	935	} else
792	936	{
..	..	@@ -807,14 +951,58 @@
807	951	// X frame.getContentPane().remove(/"Center",/framePanel);
808	952	// X framePanel.remove(bigThree);
809	953	// X frame.getContentPane().add(/"Center",/bigThree);
810		- framePanel.setDividerLocation(0);
	954	+// framePanel.setDividerLocation(0);
811	955
812		- radio.layout = fullscreenLayout;
813		- radio.layout.doClick();
	956	+// radio.layout = fullscreenLayout;
	957	+// radio.layout.doClick();
814	958	//frame.setVisible(true);
815	959	}
816	960	frame.validate();
	961	+
	962	+ cameraView.requestFocusInWindow();
817	963	}
	964	+
	965	+ void CollapseToolbar()
	966	+ {
	967	+ framePanel.setDividerLocation(0);
	968	+ //frame.validate();
	969	+
	970	+ cameraView.requestFocusInWindow();
	971	+ }
	972	+
	973	+ private Object3D Duplicate(Object3D object)
	974	+ {
	975	+ boolean temp = CameraPane.SWITCH;
	976	+ CameraPane.SWITCH = false;
	977	+
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	982	+ // if (copy == client)
	983	+
	984	+ Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	986	+ object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
	991	+
	992	+ //byte[] compress = Compress(copy);
	993	+ Object3D compress = (Object3D)Grafreed.clone(object);
	994	+
	995	+ object.parent = parent;
	996	+
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	1001	+
	1002	+ CameraPane.SWITCH = temp;
	1003	+
	1004	+ return compress;
	1005	+ }
818	1006
819	1007	private JTextPane createTextPane()
820	1008	{
..	..	@@ -937,6 +1125,7 @@
937	1125	{
938	1126	SetupMaterial(materialPanel);
939	1127	}
	1128	+
940	1129	//SetupName();
941	1130	//SetupViews();
942	1131	}
..	..	@@ -946,7 +1135,7 @@
946	1135	// NumberSlider vDivsField;
947	1136	// JCheckBox endcaps;
948	1137	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1138	+ JCheckBox selectableCB;
950	1139	JCheckBox hideCB;
951	1140	JCheckBox link2masterCB;
952	1141	JCheckBox markCB;
..	..	@@ -1145,6 +1334,18 @@
1145	1334
1146	1335	namePanel = new cGridBag();
1147	1336
	1337	+ //if (copy.pinned)
	1338	+ {
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1340	+ pinButton.setSelected(copy.pinned);
	1341	+ cGridBag t = new cGridBag();
	1342	+ t.preferredWidth = 2;
	1343	+ t.add(pinButton);
	1344	+ namePanel.add(t);
	1345	+
	1346	+ pinButton.addItemListener(this);
	1347	+ }
	1348	+
1148	1349	nameField = AddText(namePanel, copy.GetName());
1149	1350	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1150	1351	oe.ctrlPanel.add(namePanel);
..	..	@@ -1158,13 +1359,16 @@
1158	1359
1159	1360	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1361	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1362	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1363	+ markCB.setToolTipText("Set target transform");
	1364	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1365	+ selectableCB.setToolTipText("Make object selectable");
1163	1366	// Return();
	1367	+
1164	1368	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1369	hideCB.setToolTipText("Hide object");
1166		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167		- markCB.setToolTipText("As animation target transform");
	1370	+
	1371	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1372
1169	1373	setupPanel2 = new cGridBag().setVertical(false);
1170	1374
..	..	@@ -1364,22 +1568,9 @@
1364	1568
1365	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1366	1570	{
1367		- System.out.println("CREATE CAMERAS");
1368		- cams = new cTemplate();
1369		- cams.name = "Cameras";
1370		- copy.insertElementAt(cams, 0);
1371		- //cams.parent = copy;
1372		-
1373		- cam = new Camera(); // LA.newVector(3, 2, 1));
1374		- cams.addChild(cam);
1375		- cam = new Camera(1);
1376		- cams.addChild(cam);
1377		- cam = new Camera(2);
1378		- cams.addChild(cam);
1379		- cam = new Camera(3);
1380		- cams.addChild(cam);
1381		- cam = new Camera(4); // Light
1382		- cams.addChild(cam);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1383	1574	} else
1384	1575	{
1385	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1445,6 +1636,45 @@
1445	1636	//frontView.object = copy;
1446	1637	//sideView.object = copy;
1447	1638
	1639	+ transformPanel = new cGridBag().setVertical(true);
	1640	+
	1641	+ cGridBag resetTransformPanel = new cGridBag();
	1642	+
	1643	+ resetTransformPanel.preferredHeight = 2;
	1644	+
	1645	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1646	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1647	+ resetTransform.addMouseListener(new MouseAdapter()
	1648	+ {
	1649	+ public void mouseClicked(MouseEvent e)
	1650	+ {
	1651	+ ResetTransform();
	1652	+ }
	1653	+ });
	1654	+ resetTransformPanel.add(resetTransform);
	1655	+
	1656	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1657	+ resetTransform.setToolTipText("Reset Translation only");
	1658	+ resetTransform.addMouseListener(new MouseAdapter()
	1659	+ {
	1660	+ public void mouseClicked(MouseEvent e)
	1661	+ {
	1662	+ ResetTransform(1);
	1663	+ }
	1664	+ });
	1665	+ resetTransformPanel.add(resetTransform);
	1666	+
	1667	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1668	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1669	+ resetTransform.addMouseListener(new MouseAdapter()
	1670	+ {
	1671	+ public void mouseClicked(MouseEvent e)
	1672	+ {
	1673	+ ResetTransform(2);
	1674	+ }
	1675	+ });
	1676	+ resetTransformPanel.add(resetTransform);
	1677	+
1448	1678	XYZPanel = new cGridBag().setVertical(true);
1449	1679	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1450	1680
..	..	@@ -1452,7 +1682,11 @@
1452	1682	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1453	1683	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1454	1684	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1685	+ //XYZPanel.setName("XYZ");
1455	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1456	1690	/*
1457	1691	gridPanel = new JPanel(); //new BorderLayout());
1458	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1460,12 +1694,12 @@
1460	1694	gridPanel.add(cameraView);
1461	1695	gridPanel.add(XYZPanel);
1462	1696	*/
1463		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1464		- gridPanel.setContinuousLayout(true);
1465		- gridPanel.setOneTouchExpandable(true);
1466		- gridPanel.setDividerLocation(1.0);
1467		- gridPanel.setDividerSize(9);
1468		- gridPanel.setResizeWeight(0.85);
	1697	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1698	+// gridPanel.setContinuousLayout(true);
	1699	+// gridPanel.setOneTouchExpandable(true);
	1700	+// gridPanel.setDividerLocation(1.0);
	1701	+// gridPanel.setDividerSize(9);
	1702	+// gridPanel.setResizeWeight(0.85);
1469	1703
1470	1704	// aConstraints.weighty = 0;
1471	1705	//System.out.println("THIS = " + this);
..	..	@@ -1488,18 +1722,34 @@
1488	1722
1489	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1490	1724	//tmp.setName("Edit");
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
	1729	+ objectPanel.add(toolboxPanel);
	1730	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1731	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1732	+
1491	1733	objectPanel.add(materialPanel);
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
	1736	+
1492	1737	// JPanel north = new JPanel(new BorderLayout());
1493	1738	// north.setName("Edit");
1494	1739	// north.add(ctrlPanel, BorderLayout.NORTH);
1495	1740	// objectPanel.add(north);
1496	1741	objectPanel.add(editPanel);
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1743	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1497	1744
1498		- //if (Globals.ADVANCED)
1499		- objectPanel.add(infoPanel);
	1745	+ objectPanel.add(transformPanel);
	1746	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1500	1748
1501		- objectPanel.add(toolboxPanel);
1502		-
	1749	+ patchMaterial = true;
	1750	+ cameraView.patchMaterial = this;
	1751	+ objectPanel.setSelectedIndex(2);
	1752	+
1503	1753	/*
1504	1754	aConstraints.gridx = 0;
1505	1755	aConstraints.gridwidth = 1;
..	..	@@ -1530,11 +1780,108 @@
1530	1780
1531	1781	AddOptions(optionsPanel); //, aConstraints);
1532	1782
1533		- tabbedPane.add(optionsPanel);
1534		-
1535	1783	tabbedPane.add(FSPane = new cFileSystemPane(this));
1536	1784
	1785	+ tabbedPane.add(optionsPanel);
	1786	+
1537	1787	scenePanel.add(tabbedPane);
	1788	+
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
	1791	+
	1792	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1793	+ creditsPanel.add(ogaLabel);
	1794	+
	1795	+ cButton creditButton;
	1796	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1797	+ creditButton.setToolTipText("https://opengameart.org");
	1798	+
	1799	+ creditButton.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ try
	1804	+ {
	1805	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1806	+ } catch (Exception e1)
	1807	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1808	+ {
	1809	+ e1.printStackTrace();
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
	1814	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1815	+ creditsPanel.add(ogaLabel);
	1816	+
	1817	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1818	+ creditButton.setToolTipText("https://3delicious.net");
	1819	+
	1820	+ creditButton.addMouseListener(new MouseAdapter()
	1821	+ {
	1822	+ public void mouseClicked(MouseEvent e)
	1823	+ {
	1824	+ try
	1825	+ {
	1826	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1827	+ } catch (Exception e1)
	1828	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1829	+ {
	1830	+ e1.printStackTrace();
	1831	+ }
	1832	+ }
	1833	+ });
	1834	+
	1835	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1836	+ creditButton.setToolTipText("https://archive3d.net");
	1837	+
	1838	+ creditButton.addMouseListener(new MouseAdapter()
	1839	+ {
	1840	+ public void mouseClicked(MouseEvent e)
	1841	+ {
	1842	+ try
	1843	+ {
	1844	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1845	+ } catch (Exception e1)
	1846	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1847	+ {
	1848	+ e1.printStackTrace();
	1849	+ }
	1850	+ }
	1851	+ });
	1852	+
	1853	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1854	+ creditButton.setToolTipText("https://turbosquid.com");
	1855	+
	1856	+ creditButton.addMouseListener(new MouseAdapter()
	1857	+ {
	1858	+ public void mouseClicked(MouseEvent e)
	1859	+ {
	1860	+ try
	1861	+ {
	1862	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1863	+ } catch (Exception e1)
	1864	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1865	+ {
	1866	+ e1.printStackTrace();
	1867	+ }
	1868	+ }
	1869	+ });
	1870	+
	1871	+ for (int i=6; --i>=0;)
	1872	+ {
	1873	+ creditsPanel.add(new cGridBag());
	1874	+ }
	1875	+
	1876	+ tabbedPane.add(creditsPanel);
	1877	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1878	+
	1879	+ if (Globals.ADVANCED)
	1880	+ {
	1881	+ tabbedPane.add(infoPanel);
	1882	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1883	+ tabbedPane.setToolTipTextAt(4, "Information");
	1884	+ }
1538	1885
1539	1886	/*
1540	1887	cTree jTree = new cTree(null);
..	..	@@ -1556,13 +1903,13 @@
1556	1903	jtp.add(tree);
1557	1904	*/
1558	1905
1559		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1560		- bigPanel.setContinuousLayout(true);
1561		- bigPanel.setOneTouchExpandable(true);
1562		- bigPanel.setDividerLocation(0.8);
1563		- bigPanel.setDividerSize(15);
1564		- bigPanel.setResizeWeight(0.15);
1565		- bigPanel.setName("Scene");
	1906	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1907	+// bigPanel.setContinuousLayout(true);
	1908	+// bigPanel.setOneTouchExpandable(true);
	1909	+// bigPanel.setDividerLocation(0.8);
	1910	+// bigPanel.setDividerSize(15);
	1911	+// bigPanel.setResizeWeight(0.15);
	1912	+// bigPanel.setName("Scene");
1566	1913
1567	1914	//bigPanel.setLayout(new BorderLayout());
1568	1915	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1597,7 +1944,7 @@
1597	1944	bigThree = new cGridBag();
1598	1945	bigThree.addComponent(scenePanel);
1599	1946	bigThree.addComponent(centralPanel);
1600		- bigThree.addComponent(XYZPanel);
	1947	+ //bigThree.addComponent(XYZPanel);
1601	1948
1602	1949	// // SIDE EFFECT!!!
1603	1950	// aConstraints.gridx = 0;
..	..	@@ -1606,6 +1953,23 @@
1606	1953	// aConstraints.gridheight = 1;
1607	1954
1608	1955	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1956	+
	1957	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1958	+ new java.beans.PropertyChangeListener()
	1959	+ {
	1960	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1961	+ {
	1962	+ if ((Integer)pce.getOldValue() == 1)
	1963	+ {
	1964	+ if (radio.layout != expandedLayout)
	1965	+ {
	1966	+ radio.layout = expandedLayout;
	1967	+ radio.layout.doClick();
	1968	+ }
	1969	+ }
	1970	+ }
	1971	+ });
	1972	+
1609	1973	framePanel.setContinuousLayout(false);
1610	1974	framePanel.setOneTouchExpandable(false);
1611	1975	//.setDividerLocation(0.8);
..	..	@@ -1615,7 +1979,7 @@
1615	1979
1616	1980	frame.getContentPane().setLayout(new BorderLayout());
1617	1981	/**/
1618		- JTabbedPane worldPane = new JTabbedPane();
	1982	+ //JTabbedPane worldPane = new JTabbedPane();
1619	1983	//worldPane.add(bigPanel);
1620	1984	//worldPane.add(worldPanel);
1621	1985	/**/
..	..	@@ -1629,7 +1993,7 @@
1629	1993
1630	1994	cameraView.requestFocusInWindow();
1631	1995
1632		- gridPanel.setDividerLocation(1.0);
	1996	+// gridPanel.setDividerLocation(1.0);
1633	1997
1634	1998	frame.validate();
1635	1999
..	..	@@ -1638,7 +2002,6 @@
1638	2002	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1639	2003	frame.addWindowListener(new WindowAdapter()
1640	2004	{
1641		-
1642	2005	public void windowClosing(WindowEvent e)
1643	2006	{
1644	2007	Close();
..	..	@@ -1661,28 +2024,442 @@
1661	2024	ctrlPanel.removeAll();
1662	2025	}
1663	2026
1664		- void SetupMaterial(cGridBag panel)
	2027	+ void SetupMaterial(cGridBag materialpanel)
1665	2028	{
1666		- /*
	2029	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2030	+
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2032	+ skin.setToolTipText("Skin");
	2033	+ skin.addMouseListener(new MouseAdapter()
	2034	+ {
	2035	+ public void mouseClicked(MouseEvent e)
	2036	+ {
	2037	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2038	+ cMaterial material = object.material;
	2039	+
	2040	+ // Skin
	2041	+ colorField.setFloat(material.color);
	2042	+ float saturation = material.modulation;
	2043	+
	2044	+ if (!cameraView.Skinshader)
	2045	+ {
	2046	+ saturation /= 1.5;
	2047	+ }
	2048	+
	2049	+ saturationField.setFloat(saturation);
	2050	+
	2051	+ subsurfaceField.setFloat(material.subsurface);
	2052	+ selfshadowField.setFloat(material.diffuseness);
	2053	+ diffusenessField.setFloat(material.factor);
	2054	+ shininessField.setFloat(material.shininess);
	2055	+ shadowbiasField.setFloat(material.shadowbias);
	2056	+ diffuseField.setFloat(material.diffuse);
	2057	+ specularField.setFloat(material.specular);
	2058	+
	2059	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2060	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2061	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2062	+
	2063	+ materialtouched = true;
	2064	+ applySelf();
	2065	+ }
	2066	+ });
	2067	+ presetpanel.add(skin);
	2068	+
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2070	+ lambert.setToolTipText("Diffuse");
	2071	+ lambert.addMouseListener(new MouseAdapter()
	2072	+ {
	2073	+ public void mouseClicked(MouseEvent e)
	2074	+ {
	2075	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2076	+ cMaterial material = object.material;
	2077	+
	2078	+ diffusenessField.setFloat(material.factor);
	2079	+ selfshadowField.setFloat(material.diffuseness);
	2080	+
	2081	+ materialtouched = true;
	2082	+ applySelf();
	2083	+ }
	2084	+ });
	2085	+ presetpanel.add(lambert);
	2086	+
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2088	+ diffuse2.setToolTipText("Diffuse2");
	2089	+ diffuse2.addMouseListener(new MouseAdapter()
	2090	+ {
	2091	+ public void mouseClicked(MouseEvent e)
	2092	+ {
	2093	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2094	+ cMaterial material = object.material;
	2095	+
	2096	+ diffusenessField.setFloat(material.factor);
	2097	+ selfshadowField.setFloat(material.diffuseness);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(diffuse2);
	2104	+
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2106	+ diffusemoon.setToolTipText("Moon");
	2107	+ diffusemoon.addMouseListener(new MouseAdapter()
	2108	+ {
	2109	+ public void mouseClicked(MouseEvent e)
	2110	+ {
	2111	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2112	+ cMaterial material = object.material;
	2113	+
	2114	+ diffusenessField.setFloat(material.factor);
	2115	+ selfshadowField.setFloat(material.diffuseness);
	2116	+
	2117	+ materialtouched = true;
	2118	+ applySelf();
	2119	+ }
	2120	+ });
	2121	+ presetpanel.add(diffusemoon);
	2122	+
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2124	+ diffusemoon2.setToolTipText("Moon2");
	2125	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2126	+ {
	2127	+ public void mouseClicked(MouseEvent e)
	2128	+ {
	2129	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2130	+ cMaterial material = object.material;
	2131	+
	2132	+ diffusenessField.setFloat(material.factor);
	2133	+ selfshadowField.setFloat(material.diffuseness);
	2134	+
	2135	+ materialtouched = true;
	2136	+ applySelf();
	2137	+ }
	2138	+ });
	2139	+ presetpanel.add(diffusemoon2);
	2140	+
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2142	+ diffusemoon3.setToolTipText("Moon3");
	2143	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2144	+ {
	2145	+ public void mouseClicked(MouseEvent e)
	2146	+ {
	2147	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2148	+ cMaterial material = object.material;
	2149	+
	2150	+ diffusenessField.setFloat(material.factor);
	2151	+ selfshadowField.setFloat(material.diffuseness);
	2152	+
	2153	+ materialtouched = true;
	2154	+ applySelf();
	2155	+ }
	2156	+ });
	2157	+ presetpanel.add(diffusemoon3);
	2158	+
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2160	+ diffusesheen.setToolTipText("Sheen");
	2161	+ diffusesheen.addMouseListener(new MouseAdapter()
	2162	+ {
	2163	+ public void mouseClicked(MouseEvent e)
	2164	+ {
	2165	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2166	+ cMaterial material = object.material;
	2167	+
	2168	+ sheenField.setFloat(material.sheen);
	2169	+
	2170	+ materialtouched = true;
	2171	+ applySelf();
	2172	+ }
	2173	+ });
	2174	+ presetpanel.add(diffusesheen);
	2175	+
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2177	+ rough.setToolTipText("Rough metal");
	2178	+ rough.addMouseListener(new MouseAdapter()
	2179	+ {
	2180	+ public void mouseClicked(MouseEvent e)
	2181	+ {
	2182	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2183	+ cMaterial material = object.material;
	2184	+
	2185	+ shininessField.setFloat(material.shininess);
	2186	+ velvetField.setFloat(material.velvet);
	2187	+
	2188	+ materialtouched = true;
	2189	+ applySelf();
	2190	+ }
	2191	+ });
	2192	+ presetpanel.add(rough);
	2193	+
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2195	+ rough2.setToolTipText("Medium metal");
	2196	+ rough2.addMouseListener(new MouseAdapter()
	2197	+ {
	2198	+ public void mouseClicked(MouseEvent e)
	2199	+ {
	2200	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2201	+ cMaterial material = object.material;
	2202	+
	2203	+ shininessField.setFloat(material.shininess);
	2204	+ lightareaField.setFloat(material.lightarea);
	2205	+
	2206	+ materialtouched = true;
	2207	+ applySelf();
	2208	+ }
	2209	+ });
	2210	+ presetpanel.add(rough2);
	2211	+
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2213	+ shini0.setToolTipText("Shiny");
	2214	+ shini0.addMouseListener(new MouseAdapter()
	2215	+ {
	2216	+ public void mouseClicked(MouseEvent e)
	2217	+ {
	2218	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2219	+ cMaterial material = object.material;
	2220	+
	2221	+ shininessField.setFloat(material.shininess);
	2222	+ lightareaField.setFloat(material.lightarea);
	2223	+
	2224	+ materialtouched = true;
	2225	+ applySelf();
	2226	+ }
	2227	+ });
	2228	+ presetpanel.add(shini0);
	2229	+
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2231	+ shini1.setToolTipText("Shiny2");
	2232	+ shini1.addMouseListener(new MouseAdapter()
	2233	+ {
	2234	+ public void mouseClicked(MouseEvent e)
	2235	+ {
	2236	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2237	+ cMaterial material = object.material;
	2238	+
	2239	+ shininessField.setFloat(material.shininess);
	2240	+ lightareaField.setFloat(material.lightarea);
	2241	+
	2242	+ materialtouched = true;
	2243	+ applySelf();
	2244	+ }
	2245	+ });
	2246	+ presetpanel.add(shini1);
	2247	+
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2249	+ shini2.setToolTipText("Shiny3");
	2250	+ shini2.addMouseListener(new MouseAdapter()
	2251	+ {
	2252	+ public void mouseClicked(MouseEvent e)
	2253	+ {
	2254	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2255	+ cMaterial material = object.material;
	2256	+
	2257	+ shininessField.setFloat(material.shininess);
	2258	+ lightareaField.setFloat(material.lightarea);
	2259	+
	2260	+ materialtouched = true;
	2261	+ applySelf();
	2262	+ }
	2263	+ });
	2264	+ presetpanel.add(shini2);
	2265	+
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2267	+ aniso.setToolTipText("AnisoU");
	2268	+ aniso.addMouseListener(new MouseAdapter()
	2269	+ {
	2270	+ public void mouseClicked(MouseEvent e)
	2271	+ {
	2272	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2273	+ cMaterial material = object.material;
	2274	+
	2275	+ anisoField.setFloat(material.aniso);
	2276	+ anisoVField.setFloat(material.anisoV);
	2277	+
	2278	+ materialtouched = true;
	2279	+ applySelf();
	2280	+ }
	2281	+ });
	2282	+ presetpanel.add(aniso);
	2283	+
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2285	+ aniso2.setToolTipText("AnisoV");
	2286	+ aniso2.addMouseListener(new MouseAdapter()
	2287	+ {
	2288	+ public void mouseClicked(MouseEvent e)
	2289	+ {
	2290	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2291	+ cMaterial material = object.material;
	2292	+
	2293	+ anisoField.setFloat(material.aniso);
	2294	+ anisoVField.setFloat(material.anisoV);
	2295	+
	2296	+ materialtouched = true;
	2297	+ applySelf();
	2298	+ }
	2299	+ });
	2300	+ presetpanel.add(aniso2);
	2301	+
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2303	+ aniso3.setToolTipText("AnisoUV");
	2304	+ aniso3.addMouseListener(new MouseAdapter()
	2305	+ {
	2306	+ public void mouseClicked(MouseEvent e)
	2307	+ {
	2308	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2309	+ cMaterial material = object.material;
	2310	+
	2311	+ anisoField.setFloat(material.aniso);
	2312	+ anisoVField.setFloat(material.anisoV);
	2313	+
	2314	+ materialtouched = true;
	2315	+ applySelf();
	2316	+ }
	2317	+ });
	2318	+ presetpanel.add(aniso3);
	2319	+
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2321	+ velvet0.setToolTipText("Velvet");
	2322	+ velvet0.addMouseListener(new MouseAdapter()
	2323	+ {
	2324	+ public void mouseClicked(MouseEvent e)
	2325	+ {
	2326	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2327	+ cMaterial material = object.material;
	2328	+
	2329	+ diffusenessField.setFloat(material.factor);
	2330	+ selfshadowField.setFloat(material.diffuseness);
	2331	+ sheenField.setFloat(material.sheen);
	2332	+ shininessField.setFloat(material.shininess);
	2333	+ velvetField.setFloat(material.velvet);
	2334	+ shiftField.setFloat(material.shift);
	2335	+
	2336	+ materialtouched = true;
	2337	+ applySelf();
	2338	+ }
	2339	+ });
	2340	+ presetpanel.add(velvet0);
	2341	+
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2343	+ bump0.setToolTipText("Bump texture");
	2344	+ bump0.addMouseListener(new MouseAdapter()
	2345	+ {
	2346	+ public void mouseClicked(MouseEvent e)
	2347	+ {
	2348	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2349	+ cMaterial material = object.material;
	2350	+
	2351	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2352	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2353	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2354	+
	2355	+ materialtouched = true;
	2356	+ applySelf();
	2357	+ }
	2358	+ });
	2359	+ presetpanel.add(bump0);
	2360	+
	2361	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2362	+ borderShader.setToolTipText("Border fade");
	2363	+ borderShader.addMouseListener(new MouseAdapter()
	2364	+ {
	2365	+ public void mouseClicked(MouseEvent e)
	2366	+ {
	2367	+ borderfadeField.setFloat(0.5);
	2368	+ opacityField.setFloat(0.75);
	2369	+
	2370	+ materialtouched = true;
	2371	+ applySelf();
	2372	+ }
	2373	+ });
	2374	+ presetpanel.add(borderShader);
	2375	+
	2376	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2377	+ halo.setToolTipText("Halo");
	2378	+ halo.addMouseListener(new MouseAdapter()
	2379	+ {
	2380	+ public void mouseClicked(MouseEvent e)
	2381	+ {
	2382	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2383	+ cMaterial material = object.material;
	2384	+
	2385	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2386	+
	2387	+ materialtouched = true;
	2388	+ applySelf();
	2389	+ }
	2390	+ });
	2391	+ presetpanel.add(halo);
	2392	+
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2394	+ candle.setToolTipText("Candle");
	2395	+ candle.addMouseListener(new MouseAdapter()
	2396	+ {
	2397	+ public void mouseClicked(MouseEvent e)
	2398	+ {
	2399	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2400	+ cMaterial material = object.material;
	2401	+
	2402	+ subsurfaceField.setFloat(material.subsurface);
	2403	+ shadowbiasField.setFloat(material.shadowbias);
	2404	+ ambientField.setFloat(material.ambient);
	2405	+ specularField.setFloat(material.specular);
	2406	+ lightareaField.setFloat(material.lightarea);
	2407	+ shininessField.setFloat(material.shininess);
	2408	+
	2409	+ materialtouched = true;
	2410	+ applySelf();
	2411	+ }
	2412	+ });
	2413	+ presetpanel.add(candle);
	2414	+
	2415	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2416	+ shadowShader.setToolTipText("Shadow");
	2417	+ shadowShader.addMouseListener(new MouseAdapter()
	2418	+ {
	2419	+ public void mouseClicked(MouseEvent e)
	2420	+ {
	2421	+ diffuseField.setFloat(0.001);
	2422	+ ambientField.setFloat(0.001);
	2423	+ cameraField.setFloat(0.001);
	2424	+ specularField.setFloat(0.001);
	2425	+ fakedepthField.setFloat(0.001);
	2426	+ opacityField.setFloat(0.6);
	2427	+
	2428	+ materialtouched = true;
	2429	+ applySelf();
	2430	+ }
	2431	+ });
	2432	+ presetpanel.add(shadowShader);
	2433	+
	2434	+ cGridBag panel = new cGridBag().setVertical(true);
	2435	+
	2436	+ presetpanel.preferredWidth = 1;
	2437	+
	2438	+ materialpanel.add(presetpanel);
	2439	+ materialpanel.add(panel);
	2440	+
	2441	+ panel.preferredWidth = 8;
	2442	+
	2443	+ /*
1667	2444	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1668	2445	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1669		- */
	2446	+ */
1670	2447
1671	2448	cGridBag editBar = new cGridBag().setVertical(false);
1672	2449
1673		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1674	2451	createMaterialButton.setToolTipText("Create material");
1675	2452
1676	2453	/*
1677	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1678	2455	*/
1679	2456
1680		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1681	2458	clearMaterialButton.setToolTipText("Clear material");
1682	2459
1683	2460	if (Globals.ADVANCED)
1684	2461	{
1685		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1686	2463	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1687	2464	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1688	2465	}
..	..	@@ -1700,27 +2477,61 @@
1700	2477	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1701	2478
1702	2479	cGridBag colorSection = new cGridBag().setVertical(true);
	2480	+
	2481	+ cGridBag huepanel = new cGridBag();
	2482	+ cGridBag huelabel = new cGridBag();
	2483	+ cLabel hue = GetLabel("icons/hue.png", false);
	2484	+ hue.fit = true;
	2485	+
	2486	+ hue.addMouseListener(new MouseAdapter()
	2487	+ {
	2488	+ public void mousePressed(MouseEvent e)
	2489	+ {
	2490	+ int x = e.getX();
	2491	+
	2492	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2493	+ }
	2494	+ });
	2495	+
	2496	+ huelabel.add(hue);
	2497	+ huelabel.preferredWidth = 20;
	2498	+ huepanel.add(new cGridBag()); // Label
	2499	+ huepanel.add(huelabel); // Field/slider
	2500	+
	2501	+ huepanel.preferredHeight = 7;
	2502	+
	2503	+ colorSection.add(huepanel);
1703	2504
1704	2505	cGridBag color = new cGridBag();
1705		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1706		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1707		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2506	+
	2507	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2508	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2509	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2510	+
1708	2511	//colorField.preferredWidth = 200;
1709	2512	colorSection.add(color);
1710	2513
1711	2514	cGridBag modulation = new cGridBag();
1712	2515	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1713	2516	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2517	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1715	2518	colorSection.add(modulation);
1716	2519
	2520	+ cGridBag opacity = new cGridBag();
	2521	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2522	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2523	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2524	+ colorSection.add(opacity);
	2525	+
	2526	+ colorSection.add(GetSeparator());
	2527	+
1717	2528	cGridBag texture = new cGridBag();
1718	2529	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1719	2530	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1720	2531	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1721	2532	colorSection.add(texture);
1722	2533
1723		- panel.add(new JSeparator());
	2534	+ panel.add(GetSeparator());
1724	2535
1725	2536	panel.add(colorSection);
1726	2537
..	..	@@ -1776,7 +2587,7 @@
1776	2587	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1777	2588	diffuseSection.add(shadowbias);
1778	2589
1779		- panel.add(new JSeparator());
	2590	+ panel.add(GetSeparator());
1780	2591
1781	2592	panel.add(diffuseSection);
1782	2593
..	..	@@ -1839,7 +2650,7 @@
1839	2650	specularSection.add(anisoV);
1840	2651
1841	2652
1842		- panel.add(new JSeparator());
	2653	+ panel.add(GetSeparator());
1843	2654
1844	2655	panel.add(specularSection);
1845	2656
..	..	@@ -1864,12 +2675,6 @@
1864	2675	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1865	2676	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1866	2677	colorSection.add(backlit);
1867		-
1868		- cGridBag opacity = new cGridBag();
1869		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1870		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1871		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1872		- colorSection.add(opacity);
1873	2678
1874	2679	//panel.add(new JSeparator());
1875	2680
..	..	@@ -1915,7 +2720,7 @@
1915	2720	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1916	2721	textureSection.add(opacityPower);
1917	2722
1918		- panel.add(new JSeparator());
	2723	+ panel.add(GetSeparator());
1919	2724
1920	2725	panel.add(textureSection);
1921	2726
..	..	@@ -2902,7 +3707,7 @@
2902	3707
2903	3708	freezematerial = true;
2904	3709	colorField.setFloat(mat.color);
2905		- modulationField.setFloat(mat.modulation);
	3710	+ saturationField.setFloat(mat.modulation);
2906	3711	metalnessField.setFloat(mat.metalness);
2907	3712	diffuseField.setFloat(mat.diffuse);
2908	3713	specularField.setFloat(mat.specular);
..	..	@@ -2964,32 +3769,8 @@
2964	3769
2965	3770	if (multiplyToggle != null)
2966	3771	multiplyToggle.setSelected(mat.multiply);
2967		-
2968		- assert (object.projectedVertices != null);
2969		-
2970		- if (object.projectedVertices.length <= 2)
2971		- {
2972		- // Side effect...
2973		- Object3D.cVector2[] keep = object.projectedVertices;
2974		- object.projectedVertices = new Object3D.cVector2[3];
2975		- for (int i = 0; i < 3; i++)
2976		- {
2977		- if (i < keep.length)
2978		- {
2979		- object.projectedVertices[i] = keep[i];
2980		- } else
2981		- {
2982		- object.projectedVertices[i] = new Object3D.cVector2();
2983		- }
2984		- /*
2985		- if(keep.length == 0)
2986		- object.projectedVertices[0] = new Object3D.cVector2();
2987		- else
2988		- object.projectedVertices[0] = keep[0];
2989		- object.projectedVertices[1] = new Object3D.cVector2();
2990		- */
2991		- }
2992		- }
	3772	+
	3773	+ AllocProjectedVertices(object);
2993	3774
2994	3775	SetMaterial(mat, object.projectedVertices);
2995	3776	}
..	..	@@ -3109,6 +3890,17 @@
3109	3890	public void itemStateChanged(ItemEvent event)
3110	3891	{
3111	3892	// System.out.println("Propagate = " + propagate);
	3893	+ if (event.getSource() == pinButton)
	3894	+ {
	3895	+ copy.pinned ^= true;
	3896	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3897	+ {
	3898	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3899	+ copy.CloseUI();
	3900	+ //copy.editWindow.refreshContents();
	3901	+ }
	3902	+ }
	3903	+ else
3112	3904	if (event.getSource() == propagateToggle)
3113	3905	{
3114	3906	propagate ^= true;
..	..	@@ -3213,8 +4005,9 @@
3213	4005	} else if (event.getSource() == liveCB)
3214	4006	{
3215	4007	copy.live ^= true;
	4008	+ objEditor.refreshContents(true); // To show item colors
3216	4009	return;
3217		- } else if (event.getSource() == selectCB)
	4010	+ } else if (event.getSource() == selectableCB)
3218	4011	{
3219	4012	copy.dontselect ^= true;
3220	4013	return;
..	..	@@ -3222,7 +4015,7 @@
3222	4015	{
3223	4016	copy.hide ^= true;
3224	4017	copy.Touch(); // display list issue
3225		- objEditor.refreshContents();
	4018	+ objEditor.refreshContents(true); // To show item colors
3226	4019	return;
3227	4020	} else if (event.getSource() == link2masterCB)
3228	4021	{
..	..	@@ -3287,7 +4080,7 @@
3287	4080	//System.out.println("ObjEditor " + event);
3288	4081	applySelf0(true);
3289	4082	//parent.applySelf();
3290		- objEditor.refreshContents();
	4083	+ // conflicts with requestFocus objEditor.refreshContents();
3291	4084	} else if (source == resetButton)
3292	4085	{
3293	4086	CameraPane.fullreset = true;
..	..	@@ -3467,17 +4260,25 @@
3467	4260
3468	4261	void New()
3469	4262	{
3470		- while (copy.Size() > 1)
	4263	+ while (copy.Size() > 0)
3471	4264	{
3472		- copy.remove(1);
	4265	+ copy.remove(0);
3473	4266	}
3474	4267
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
3475	4275	ResetModel();
3476	4276	objEditor.refreshContents();
3477	4277	}
3478	4278
3479	4279	static public byte[] Compress(Object3D o)
3480	4280	{
	4281	+ // Slower to actually compress.
3481	4282	try
3482	4283	{
3483	4284	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3574,11 +4375,12 @@
3574	4375	return null;
3575	4376	}
3576	4377
3577		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3578	4378
3579	4379	public void Save()
3580	4380	{
3581		- Save(true);
	4381	+ //Save(true);
	4382	+ Replace();
	4383	+ SetVersionStates();
3582	4384	}
3583	4385
3584	4386	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3597,59 +4399,73 @@
3597	4399	return true;
3598	4400	}
3599	4401
	4402	+ void DeleteVersion()
	4403	+ {
	4404	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4405	+ {
	4406	+ copy.versionlist[i] = copy.versionlist[i+1];
	4407	+ }
	4408	+
	4409	+ if (copy.versionlist[copy.versionindex] == null)
	4410	+ copy.versionindex -= 1;
	4411	+
	4412	+ if (copy.versionindex != -1)
	4413	+ CopyChanged();
	4414	+
	4415	+ SetVersionStates();
	4416	+ }
	4417	+
3600	4418	public boolean Save(boolean user)
3601	4419	{
3602	4420	System.err.println("Save");
	4421	+ Replace();
3603	4422
3604		- cRadio tab = GetCurrentTab();
	4423	+ //cRadio tab = GetCurrentTab();
3605	4424
3606		- boolean temp = CameraPane.SWITCH;
3607		- CameraPane.SWITCH = false;
3608		-
3609		- copy.ExtractBigData(hashtable);
3610		-
3611		- byte[] compress = Compress(copy);
3612		-
3613		- CameraPane.SWITCH = temp;
	4425	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3614	4426
3615	4427	boolean thesame = false;
3616	4428
3617		- // Quick heuristic using length. Works only when stream is compressed.
3618		- if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
3619		- {
3620		- thesame = true;
3621		- }
	4429	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4430	+// {
	4431	+// thesame = true;
	4432	+// }
3622	4433
3623	4434	//EditorFrame.m_MainFrame.requestFocusInWindow();
3624	4435	if (!thesame)
3625	4436	{
3626		- //tab.user[tab.undoindex] = user;
3627		- boolean increment = tab.graphs[tab.undoindex] == null;
	4437	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4438	+ {
	4439	+ copy.versionlist[i] = copy.versionlist[i-1];
	4440	+ }
3628	4441
3629		- tab.graphs[tab.undoindex] = compress;
	4442	+ //tab.user[tab.versionindex] = user;
	4443	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3630	4444
3631		- if (increment)
3632		- tab.undoindex++;
	4445	+ copy.versionlist[++copy.versionindex] = compress;
	4446	+
	4447	+ // if (increment)
	4448	+ // tab.versionindex++;
3633	4449	}
3634	4450
3635		- copy.RestoreBigData(hashtable);
	4451	+ //copy.RestoreBigData(versiontable);
3636	4452
3637	4453	//assert(hashtable.isEmpty());
3638	4454
3639		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3640		- {
3641		- //tab.user[i] = false;
3642		- // tab.graphs[i] = null;
3643		- }
	4455	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4456	+// {
	4457	+// //tab.user[i] = false;
	4458	+// copy.versionlist[i] = null;
	4459	+// }
3644	4460
3645		- SetUndoStates();
	4461	+ SetVersionStates();
3646	4462
3647	4463	// test save
3648	4464	if (false)
3649	4465	{
3650	4466	try
3651	4467	{
3652		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4468	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3653	4469	ObjectOutputStream p = new ObjectOutputStream(ostream);
3654	4470
3655	4471	p.writeObject(copy);
..	..	@@ -3665,27 +4481,65 @@
3665	4481
3666	4482	return !thesame;
3667	4483	}
3668		-
3669		- void CopyChanged(Object3D obj)
	4484	+
	4485	+ boolean flashIt = true;
	4486	+
	4487	+ void RefreshSelection()
3670	4488	{
3671		- SetUndoStates();
	4489	+ Object3D selection = new Object3D();
	4490	+
	4491	+ for (int i = 0; i < copy.selection.size(); i++)
	4492	+ {
	4493	+ Object3D elem = copy.selection.elementAt(i);
	4494	+
	4495	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4496	+
	4497	+ if (obj == null)
	4498	+ {
	4499	+ copy.selection.remove(i--);
	4500	+ }
	4501	+ else
	4502	+ {
	4503	+ selection.add(obj);
	4504	+ copy.selection.setElementAt(obj, i);
	4505	+ }
	4506	+ }
	4507	+
	4508	+ flashIt = false;
	4509	+ GetTree().clearSelection();
	4510	+ for (int i = 0; i < selection.size(); i++)
	4511	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4512	+ flashIt = true;
	4513	+
	4514	+ //refreshContents(false);
	4515	+ }
	4516	+
	4517	+ void CopyChanged()
	4518	+ {
	4519	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4520	+
	4521	+ SetVersionStates();
3672	4522
3673	4523	boolean temp = CameraPane.SWITCH;
3674	4524	CameraPane.SWITCH = false;
3675	4525
3676		- copy.ExtractBigData(hashtable);
	4526	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3677	4527
3678	4528	copy.clear();
3679	4529
	4530	+ copy.skyboxname = obj.skyboxname;
	4531	+ copy.skyboxext = obj.skyboxext;
	4532	+
3680	4533	for (int i=0; i<obj.Size(); i++)
3681	4534	{
3682	4535	copy.add(obj.get(i));
3683	4536	}
3684	4537
3685		- copy.RestoreBigData(hashtable);
	4538	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3686	4539
3687	4540	CameraPane.SWITCH = temp;
3688	4541
	4542	+ RefreshSelection();
3689	4543	//assert(hashtable.isEmpty());
3690	4544
3691	4545	copy.Touch();
..	..	@@ -3706,68 +4560,161 @@
3706	4560	}
3707	4561	}
3708	4562
3709		- refreshContents();
	4563	+ refreshContents(true);
3710	4564	}
3711	4565
3712		- cButton undoButton;
3713		- cButton redoButton;
	4566	+ cButton previousVersionButton;
	4567	+ cButton restoreButton;
	4568	+ cButton replaceButton;
	4569	+ cButton nextVersionButton;
	4570	+ cButton saveVersionButton;
	4571	+ cButton deleteVersionButton;
3714	4572
3715		- void SetUndoStates()
	4573	+ boolean muteSlider;
	4574	+
	4575	+ int VersionCount()
3716	4576	{
3717		- cRadio tab = GetCurrentTab();
	4577	+ int count = 0;
3718	4578
3719		- undoButton.setEnabled(tab.undoindex > 0);
3720		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4579	+ for (int i = copy.versionlist.length; --i >= 0;)
	4580	+ {
	4581	+ if (copy.versionlist[i] != null)
	4582	+ count++;
	4583	+ }
	4584	+
	4585	+ return count;
3721	4586	}
3722	4587
3723		- public boolean Undo()
	4588	+ public cGridBag versionSliderPane;
	4589	+
	4590	+ void SetVersionStates()
3724	4591	{
	4592	+ //if (true)
	4593	+ // return;
	4594	+
	4595	+ //cRadio tab = GetCurrentTab();
	4596	+
	4597	+ if (copy.versionlist == null)
	4598	+ {
	4599	+ saveVersionButton.setEnabled(false);
	4600	+ restoreButton.setEnabled(false);
	4601	+ replaceButton.setEnabled(false);
	4602	+ previousVersionButton.setEnabled(false);
	4603	+ nextVersionButton.setEnabled(false);
	4604	+ deleteVersionButton.setEnabled(false);
	4605	+ versionSliderPane.setVisible(false);
	4606	+ }
	4607	+ else
	4608	+ {
	4609	+ restoreButton.setEnabled(copy.versionindex != -1);
	4610	+ replaceButton.setEnabled(copy.versionindex != -1);
	4611	+
	4612	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4613	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4614	+
	4615	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4616	+ //copy.versionlist[copy.versionindex + 1] != null);
	4617	+
	4618	+ muteSlider = true;
	4619	+ versionSlider.setMinimum(0);
	4620	+ versionSlider.setMaximum(VersionCount() - 1);
	4621	+ versionSlider.setInteger(copy.versionindex);
	4622	+ versionSlider.setEnabled(copy.versionindex != -1);
	4623	+ muteSlider = false;
	4624	+
	4625	+ versionSliderPane.setVisible(true);
	4626	+ }
	4627	+ }
	4628	+
	4629	+ public boolean PreviousVersion()
	4630	+ {
	4631	+ // Option?
	4632	+ Replace();
	4633	+
3725	4634	System.err.println("Undo");
3726	4635
3727		- cRadio tab = GetCurrentTab();
	4636	+ //cRadio tab = GetCurrentTab();
3728	4637
3729		- if (tab.undoindex == 0)
	4638	+ if (copy.versionindex == 0)
3730	4639	{
3731	4640	java.awt.Toolkit.getDefaultToolkit().beep();
3732	4641	return false;
3733	4642	}
3734	4643
3735		- if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
3736		- {
3737		- if (Save(false))
3738		- tab.undoindex -= 1;
3739		- else
3740		- {
3741		- if (tab.undoindex <= 0)
3742		- return false;
3743		- else
3744		- tab.undoindex -= 1;
3745		- }
3746		- }
	4644	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4645	+// {
	4646	+// if (Save(false))
	4647	+// tab.versionindex -= 1;
	4648	+// else
	4649	+// {
	4650	+// if (tab.versionindex <= 0)
	4651	+// return false;
	4652	+// else
	4653	+// tab.versionindex -= 1;
	4654	+// }
	4655	+// }
3747	4656
3748		- tab.undoindex -= 1;
	4657	+ copy.versionindex -= 1;
3749	4658
3750		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4659	+ CopyChanged();
3751	4660
3752	4661	return true;
3753	4662	}
3754	4663
3755		- public void Redo()
	4664	+ public boolean Restore()
3756	4665	{
3757		- cRadio tab = GetCurrentTab();
	4666	+ System.err.println("Restore");
3758	4667
3759		- if (tab.graphs[tab.undoindex + 1] == null)
	4668	+ //cRadio tab = GetCurrentTab();
	4669	+
	4670	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4671	+ {
	4672	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4673	+ return false;
	4674	+ }
	4675	+
	4676	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4677	+ CopyChanged();
	4678	+
	4679	+ return true;
	4680	+ }
	4681	+
	4682	+ public boolean Replace()
	4683	+ {
	4684	+ //System.err.println("Replace");
	4685	+
	4686	+ //cRadio tab = GetCurrentTab();
	4687	+
	4688	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4689	+ {
	4690	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4691	+ return false;
	4692	+ }
	4693	+
	4694	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4695	+
	4696	+ return true;
	4697	+ }
	4698	+
	4699	+ public void NextVersion()
	4700	+ {
	4701	+ // Option?
	4702	+ Replace();
	4703	+
	4704	+ //cRadio tab = GetCurrentTab();
	4705	+
	4706	+ if (copy.versionlist[copy.versionindex + 1] == null)
3760	4707	{
3761	4708	java.awt.Toolkit.getDefaultToolkit().beep();
3762	4709	return;
3763	4710	}
3764	4711
3765		- tab.undoindex += 1;
	4712	+ copy.versionindex += 1;
3766	4713
3767		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4714	+ CopyChanged();
3768	4715
3769		- //if (!tab.user[tab.undoindex])
3770		- // tab.graphs[tab.undoindex] = null;
	4716	+ //if (!tab.user[tab.versionindex])
	4717	+ // tab.graphs[tab.versionindex] = null;
3771	4718	}
3772	4719
3773	4720	void ImportGFD()
..	..	@@ -3961,6 +4908,12 @@
3961	4908	// else
3962	4909	// applySelf(true);
3963	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
3964	4917	void applySelf0(boolean name)
3965	4918	{
3966	4919	if (name)
..	..	@@ -3978,7 +4931,7 @@
3978	4931	//copy.material = new cMaterial(copy.GetMaterial());
3979	4932
3980	4933	current.color = (float) colorField.getFloat();
3981		- current.modulation = (float) modulationField.getFloat();
	4934	+ current.modulation = (float) saturationField.getFloat();
3982	4935	current.metalness = (float) metalnessField.getFloat();
3983	4936	current.diffuse = (float) diffuseField.getFloat();
3984	4937	current.specular = (float) specularField.getFloat();
..	..	@@ -4010,29 +4963,52 @@
4010	4963	{
4011	4964	cMaterial mat = copy.material;
4012	4965
4013		- colorField.SetToolTipValue((mat.color));
4014		- modulationField.SetToolTipValue((mat.modulation));
4015		- metalnessField.SetToolTipValue((mat.metalness));
4016		- diffuseField.SetToolTipValue((mat.diffuse));
4017		- specularField.SetToolTipValue((mat.specular));
4018		- shininessField.SetToolTipValue((mat.shininess));
4019		- shiftField.SetToolTipValue((mat.shift));
4020		- ambientField.SetToolTipValue((mat.ambient));
4021		- lightareaField.SetToolTipValue((mat.lightarea));
4022		- diffusenessField.SetToolTipValue((mat.factor));
4023		- velvetField.SetToolTipValue((mat.velvet));
4024		- sheenField.SetToolTipValue((mat.sheen));
4025		- subsurfaceField.SetToolTipValue((mat.subsurface));
4026		- backlitField.SetToolTipValue((mat.bump));
4027		- anisoField.SetToolTipValue((mat.aniso));
4028		- anisoVField.SetToolTipValue((mat.anisoV));
4029		- cameraField.SetToolTipValue((mat.cameralight));
4030		- selfshadowField.SetToolTipValue((mat.diffuseness));
4031		- shadowField.SetToolTipValue((mat.shadow));
4032		- textureField.SetToolTipValue((mat.texture));
4033		- opacityField.SetToolTipValue((mat.opacity));
4034		- fakedepthField.SetToolTipValue((mat.fakedepth));
4035		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4966	+ if (!Equal(colorField.getFloat(), mat.color))
	4967	+ colorField.SetToolTipValue((mat.color));
	4968	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4969	+ saturationField.SetToolTipValue((mat.modulation));
	4970	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4971	+ metalnessField.SetToolTipValue((mat.metalness));
	4972	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4973	+ diffuseField.SetToolTipValue((mat.diffuse));
	4974	+ if (!Equal(specularField.getFloat(), mat.specular))
	4975	+ specularField.SetToolTipValue((mat.specular));
	4976	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4977	+ shininessField.SetToolTipValue((mat.shininess));
	4978	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4979	+ shiftField.SetToolTipValue((mat.shift));
	4980	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4981	+ ambientField.SetToolTipValue((mat.ambient));
	4982	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4983	+ lightareaField.SetToolTipValue((mat.lightarea));
	4984	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4985	+ diffusenessField.SetToolTipValue((mat.factor));
	4986	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4987	+ velvetField.SetToolTipValue((mat.velvet));
	4988	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4989	+ sheenField.SetToolTipValue((mat.sheen));
	4990	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4991	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4992	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4993	+ backlitField.SetToolTipValue((mat.bump));
	4994	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4995	+ anisoField.SetToolTipValue((mat.aniso));
	4996	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4997	+ anisoVField.SetToolTipValue((mat.anisoV));
	4998	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4999	+ cameraField.SetToolTipValue((mat.cameralight));
	5000	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5001	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5002	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5003	+ shadowField.SetToolTipValue((mat.shadow));
	5004	+ if (!Equal(textureField.getFloat(), mat.texture))
	5005	+ textureField.SetToolTipValue((mat.texture));
	5006	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5007	+ opacityField.SetToolTipValue((mat.opacity));
	5008	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5009	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5010	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5011	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4036	5012	}
4037	5013
4038	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4063,9 +5039,28 @@
4063	5039	//copy.Touch();
4064	5040	}
4065	5041
	5042	+ cNumberSlider versionSlider;
	5043	+
4066	5044	public void stateChanged(ChangeEvent e)
4067	5045	{
4068		- // assert(false);
	5046	+ // assert(false);
	5047	+ if (e.getSource() == versionSlider)
	5048	+ {
	5049	+ if (muteSlider)
	5050	+ return;
	5051	+
	5052	+ Replace();
	5053	+
	5054	+ int version = versionSlider.getInteger();
	5055	+
	5056	+ if (version != -1 && copy.versionlist[version] != null)
	5057	+ {
	5058	+ copy.versionindex = version;
	5059	+ CopyChanged();
	5060	+ }
	5061	+
	5062	+ return;
	5063	+ }
4069	5064
4070	5065	if (freezematerial)
4071	5066	{
..	..	@@ -4101,6 +5096,12 @@
4101	5096	{
4102	5097	//System.out.println("stateChanged = " + this);
4103	5098	materialtouched = true;
	5099	+
	5100	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5101	+ {
	5102	+ saturationField.setFloat(1);
	5103	+ }
	5104	+
4104	5105	applySelf();
4105	5106	//System.out.println("this = " + this);
4106	5107	//System.out.println("PARENT = " + parent);
..	..	@@ -4400,6 +5401,7 @@
4400	5401	{
4401	5402	if (GetTree() != null)
4402	5403	{
	5404	+ GetTree().revalidate();
4403	5405	GetTree().repaint();
4404	5406	}
4405	5407
..	..	@@ -4408,13 +5410,18 @@
4408	5410	ctrlPanel.validate(); // ? new
4409	5411	ctrlPanel.repaint();
4410	5412	}
	5413	+
	5414	+ if (previousVersionButton != null && copy.versionlist != null)
	5415	+ SetVersionStates();
	5416	+
	5417	+ cameraView.requestFocusInWindow();
4411	5418	}
4412	5419
4413	5420	static TweenManager tweenManager = new TweenManager();
4414	5421
4415	5422	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4416	5423	{
4417		- if (Globals.SAVEONMAKE) // && resetmodel)
	5424	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4418	5425	Save();
4419	5426	//Tween.set(thing, 0).target(1).start(tweenManager);
4420	5427	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4439,7 +5446,7 @@
4439	5446	// group = (Composite) group.get(0);
4440	5447	// }
4441	5448
4442		- System.out.println("makeSomething of " + thing);
	5449	+ //System.out.println("makeSomething of " + thing);
4443	5450
4444	5451	/*
4445	5452	if (deselect && jList != null)
..	..	@@ -4656,7 +5663,9 @@
4656	5663	readobj.ResetDisplayList();
4657	5664	} catch (Exception e)
4658	5665	{
4659		- //e.printStackTrace();
	5666	+ if (!e.toString().contains("GZIP"))
	5667	+ e.printStackTrace();
	5668	+
4660	5669	try
4661	5670	{
4662	5671	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4736,6 +5745,8 @@
4736	5745	{
4737	5746	//readobj.deepCopySelf(copy);
4738	5747	copy.clear(); // june 2014
	5748	+ copy.skyboxname = readobj.skyboxname;
	5749	+ copy.skyboxext = readobj.skyboxext;
4739	5750	for (int i = 0; i < readobj.size(); i++)
4740	5751	{
4741	5752	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4776,6 +5787,7 @@
4776	5787	}
4777	5788	} catch (ClassCastException e)
4778	5789	{
	5790	+ e.printStackTrace();
4779	5791	assert (false);
4780	5792	Composite c = (Composite) copy;
4781	5793	c.children.clear();
..	..	@@ -4786,6 +5798,21 @@
4786	5798	c.addChild(csg);
4787	5799	}
4788	5800
	5801	+ copy.versionlist = readobj.versionlist;
	5802	+ copy.versionindex = readobj.versionindex;
	5803	+ copy.versiontable = readobj.versiontable;
	5804	+
	5805	+ if (copy.versionlist == null)
	5806	+ {
	5807	+ // Backward compatibility
	5808	+ copy.versionlist = new Object3D[100];
	5809	+ copy.versionindex = -1;
	5810	+
	5811	+ //Save(true);
	5812	+ }
	5813	+
	5814	+ //? SetUndoStates();
	5815	+
4789	5816	ResetModel();
4790	5817	copy.HardTouch(); // recompile?
4791	5818	refreshContents();
..	..	@@ -4796,7 +5823,7 @@
4796	5823	{
4797	5824	if (Grafreed.standAlone)
4798	5825	{
4799		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5826	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4800	5827	browser.show();
4801	5828	String filename = browser.getFile();
4802	5829	if (filename != null && filename.length() > 0)
..	..	@@ -4873,6 +5900,8 @@
4873	5900
4874	5901	void save()
4875	5902	{
	5903	+ Replace();
	5904	+
4876	5905	if (lastname == null)
4877	5906	{
4878	5907	return;
..	..	@@ -4895,6 +5924,7 @@
4895	5924	//ps.print(buffer.toString());
4896	5925	} catch (IOException e)
4897	5926	{
	5927	+ e.printStackTrace();
4898	5928	}
4899	5929	}
4900	5930
..	..	@@ -5114,6 +6144,7 @@
5114	6144	ButtonGroup buttonGroup;
5115	6145
5116	6146	cGridBag toolboxPanel;
	6147	+ cGridBag skyboxPanel;
5117	6148	cGridBag materialPanel;
5118	6149	cGridBag ctrlPanel;
5119	6150
..	..	@@ -5125,6 +6156,7 @@
5125	6156	boolean materialFlushed;
5126	6157	Object3D latestObject;
5127	6158
	6159	+ cGridBag transformPanel;
5128	6160	cGridBag XYZPanel;
5129	6161
5130	6162	JSplitPane gridPanel;
..	..	@@ -5187,7 +6219,7 @@
5187	6219	JLabel colorLabel;
5188	6220	cNumberSlider colorField;
5189	6221	JLabel modulationLabel;
5190		- cNumberSlider modulationField;
	6222	+ cNumberSlider saturationField;
5191	6223	JLabel metalnessLabel;
5192	6224	cNumberSlider metalnessField;
5193	6225	JLabel diffuseLabel;
..	..	@@ -5218,6 +6250,7 @@
5218	6250	cNumberSlider anisoField;
5219	6251	JLabel anisoVLabel;
5220	6252	cNumberSlider anisoVField;
	6253	+
5221	6254	JLabel cameraLabel;
5222	6255	cNumberSlider cameraField;
5223	6256	JLabel selfshadowLabel;
..	..	@@ -5232,6 +6265,7 @@
5232	6265	cNumberSlider fakedepthField;
5233	6266	JLabel shadowbiasLabel;
5234	6267	cNumberSlider shadowbiasField;
	6268	+
5235	6269	JLabel bumpLabel;
5236	6270	cNumberSlider bumpField;
5237	6271	JLabel noiseLabel;