~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,119 @@
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 cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
44	82
45	83	cButton GetButton(String name, boolean border)
46	84	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
50		- return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
54		- return new cButton(name, border);
55		- }
	85	+ ImageIcon icon = GetIcon(name);
	86	+ return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
56	93	}
57	94
58	95	cToggleButton GetToggleButton(String name, boolean border)
59	96	{
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		- }
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
69	99	}
70	100
71	101	cCheckBox GetCheckBox(String name, boolean border)
72	102	{
	103	+ ImageIcon icon = GetIcon(name);
	104	+ return new cCheckBox(icon, border);
	105	+ }
	106	+
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
	109	+ static ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
73	117	try
74	118	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	119	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	120	+
	121	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	122	+// {
	123	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	124	+// Graphics2D g = resized.createGraphics();
	125	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	126	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	127	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	128	+// g.dispose();
	129	+//
	130	+// image = resized;
	131	+// }
	132	+
	133	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
	137	+ return icon;
77	138	}
78	139	catch (Exception e)
79	140	{
80		- return new cCheckBox(name, border);
	141	+ //icons.put(name, null);
	142	+ return null;
81	143	}
82	144	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	145	+
	146	+ BufferedImage GetImage(String name)
85	147	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	148	+ try
89	149	{
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;
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
98	153	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
102	158	}
103	159
104	160	// SCRIPT
..	..	@@ -282,6 +338,14 @@
282	338	client = inClient;
283	339	copy = client;
284	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
285	349	// "this" is not called: SetupUI2(objEditor);
286	350	}
287	351
..	..	@@ -295,6 +359,14 @@
295	359	client = inClient;
296	360	copy = client;
297	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
298	370	SetupUI2(callee.GetEditor());
299	371	}
300	372
..	..	@@ -316,7 +388,8 @@
316	388	//parent = p;
317	389
318	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
319		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
320	393	//gd.setFullScreenWindow(this);
321	394	//setResizable(false);
322	395	//if (!isDisplayable())
..	..	@@ -327,6 +400,14 @@
327	400	copy = localCopy;
328	401	copy.editWindow = this;
329	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
330	411	SetupMenu();
331	412
332	413	//SetupName(objEditor); // new
..	..	@@ -345,6 +426,9 @@
345	426
346	427	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347	428
	429	+ // This is to refresh the UI of the material panel.
	430	+ boolean patchMaterial;
	431	+
348	432	void SetupMenu()
349	433	{
350	434	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -394,6 +478,8 @@
394	478
395	479	ChangeListener changeListener = new ChangeListener()
396	480	{
	481	+ //String name;
	482	+
397	483	public void stateChanged(ChangeEvent changeEvent)
398	484	{
399	485	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -412,18 +498,49 @@
412	498	// EditSelection(false);
413	499	// }
414	500
415		- refreshContents(false); // To refresh Info tab
	501	+// if (objectPanel.getSelectedIndex() == 4)
	502	+// {
	503	+// name = copy.skyboxname;
	504	+//
	505	+// if (name == null)
	506	+// {
	507	+// name = "";
	508	+// }
	509	+//
	510	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	511	+// copy.skyboxext = "jpg";
	512	+// }
	513	+// else
	514	+// {
	515	+// if (name != null)
	516	+// {
	517	+// if (name.equals(""))
	518	+// {
	519	+// copy.skyboxname = null;
	520	+// copy.skyboxext = null;
	521	+// }
	522	+// else
	523	+// {
	524	+// copy.skyboxname = name;
	525	+// }
	526	+// }
	527	+// }
	528	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	529	+
	530	+// refreshContents(false); // To refresh Info tab
	531	+ cameraView.repaint();
416	532	}
417	533	};
418	534	objectPanel.addChangeListener(changeListener);
419	535
420	536	toolbarPanel = new JPanel();
421	537	toolbarPanel.setName("Toolbar");
	538	+
422	539	treePanel = new cGridBag();
423	540	treePanel.setName("Tree");
424	541
425	542	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	543	+ //editPanel.setName("Edit");
427	544
428	545	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	546
..	..	@@ -431,11 +548,13 @@
431	548	editPanel.add(editCommandsPanel);
432	549	editPanel.add(ctrlPanel);
433	550
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	551	+ toolboxPanel = new cGridBag().setVertical(true);
	552	+ //toolboxPanel.setName("Toolbox");
436	553
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	554	+ skyboxPanel = new cGridBag().setVertical(true);
	555	+
	556	+ materialPanel = new cGridBag().setVertical(false);
	557	+ //materialPanel.setName("Material");
439	558
440	559	/JTextPane/
441	560	infoarea = createTextPane();
..	..	@@ -443,6 +562,7 @@
443	562
444	563	infoarea.setEditable(true);
445	564	SetText();
	565	+
446	566	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	567	// infoarea.setOpaque(false);
448	568	// //infoarea.setForeground(textcolor);
..	..	@@ -450,7 +570,7 @@
450	570	// TEXTAREA infoarea.setWrapStyleWord(true);
451	571	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452	572	infoPanel.setPreferredSize(new Dimension(1, 1));
453		- infoPanel.setName("Info");
	573	+ //infoPanel.setName("Info");
454	574	//infoPanel.setLayout(new BorderLayout());
455	575	//infoPanel.add(createTextPane());
456	576
..	..	@@ -717,6 +837,7 @@
717	837	boolean maximized;
718	838
719	839	cButton fullscreenLayout;
	840	+ cButton expandedLayout;
720	841
721	842	void Minimize()
722	843	{
..	..	@@ -756,10 +877,12 @@
756	877	cButton minButton;
757	878	cButton maxButton;
758	879	cButton fullButton;
	880	+ cButton collapseButton;
	881	+ cButton maximize3DButton;
759	882
760	883	void ToggleFullScreen()
761	884	{
762		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	885	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763	886
764	887	cameraView.ToggleFullScreen();
765	888
..	..	@@ -780,13 +903,13 @@
780	903	// X frame.getContentPane().remove(/"Center",/bigThree);
781	904	// X framePanel.add(bigThree);
782	905	// X frame.getContentPane().add(/"Center",/framePanel);
783		- framePanel.setDividerLocation(46);
	906	+// framePanel.setDividerLocation(46); // icons are 24x24
784	907
785	908	//frame.setVisible(true);
786		- radio.layout = keepButton;
	909	+// radio.layout = keepButton;
787	910	//theFrame = null;
788	911	keepButton = null;
789		- radio.layout.doClick();
	912	+// radio.layout.doClick();
790	913
791	914	} else
792	915	{
..	..	@@ -807,14 +930,53 @@
807	930	// X frame.getContentPane().remove(/"Center",/framePanel);
808	931	// X framePanel.remove(bigThree);
809	932	// X frame.getContentPane().add(/"Center",/bigThree);
810		- framePanel.setDividerLocation(0);
	933	+// framePanel.setDividerLocation(0);
811	934
812		- radio.layout = fullscreenLayout;
813		- radio.layout.doClick();
	935	+// radio.layout = fullscreenLayout;
	936	+// radio.layout.doClick();
814	937	//frame.setVisible(true);
815	938	}
816	939	frame.validate();
	940	+
	941	+ cameraView.requestFocusInWindow();
817	942	}
	943	+
	944	+ void CollapseToolbar()
	945	+ {
	946	+ framePanel.setDividerLocation(0);
	947	+ //frame.validate();
	948	+
	949	+ cameraView.requestFocusInWindow();
	950	+ }
	951	+
	952	+ private Object3D Duplicate(Object3D object)
	953	+ {
	954	+ boolean temp = CameraPane.SWITCH;
	955	+ CameraPane.SWITCH = false;
	956	+
	957	+ if (Grafreed.grafreed.universe.versiontable == null)
	958	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	959	+
	960	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	961	+ // if (copy == client)
	962	+
	963	+ Object3D versions[] = object.versionlist;
	964	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	965	+ object.versionlist = null;
	966	+ object.versiontable = null;
	967	+
	968	+ //byte[] compress = Compress(copy);
	969	+ Object3D compress = (Object3D)Grafreed.clone(object);
	970	+
	971	+ object.versionlist = versions;
	972	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	973	+
	974	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	975	+
	976	+ CameraPane.SWITCH = temp;
	977	+
	978	+ return compress;
	979	+ }
818	980
819	981	private JTextPane createTextPane()
820	982	{
..	..	@@ -937,6 +1099,7 @@
937	1099	{
938	1100	SetupMaterial(materialPanel);
939	1101	}
	1102	+
940	1103	//SetupName();
941	1104	//SetupViews();
942	1105	}
..	..	@@ -946,7 +1109,7 @@
946	1109	// NumberSlider vDivsField;
947	1110	// JCheckBox endcaps;
948	1111	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1112	+ JCheckBox selectableCB;
950	1113	JCheckBox hideCB;
951	1114	JCheckBox link2masterCB;
952	1115	JCheckBox markCB;
..	..	@@ -1145,6 +1308,18 @@
1145	1308
1146	1309	namePanel = new cGridBag();
1147	1310
	1311	+ //if (copy.pinned)
	1312	+ {
	1313	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1314	+ pinButton.setSelected(copy.pinned);
	1315	+ cGridBag t = new cGridBag();
	1316	+ t.preferredWidth = 2;
	1317	+ t.add(pinButton);
	1318	+ namePanel.add(t);
	1319	+
	1320	+ pinButton.addItemListener(this);
	1321	+ }
	1322	+
1148	1323	nameField = AddText(namePanel, copy.GetName());
1149	1324	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1150	1325	oe.ctrlPanel.add(namePanel);
..	..	@@ -1158,13 +1333,16 @@
1158	1333
1159	1334	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1335	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1336	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1337	+ markCB.setToolTipText("Set target transform");
	1338	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1339	+ selectableCB.setToolTipText("Make object selectable");
1163	1340	// Return();
	1341	+
1164	1342	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1343	hideCB.setToolTipText("Hide object");
1166		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167		- markCB.setToolTipText("As animation target transform");
	1344	+
	1345	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1346
1169	1347	setupPanel2 = new cGridBag().setVertical(false);
1170	1348
..	..	@@ -1174,10 +1352,11 @@
1174	1352	randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1175	1353	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1176	1354
	1355	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1356	+ link2masterCB.setToolTipText("Attach to support");
	1357	+
1177	1358	if (Globals.ADVANCED)
1178	1359	{
1179		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180		- link2masterCB.setToolTipText("Attach to support");
1181	1360	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1182	1361	speedupCB.setToolTipText("Option motion capture");
1183	1362	}
..	..	@@ -1363,6 +1542,7 @@
1363	1542
1364	1543	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1365	1544	{
	1545	+ if (Globals.DEBUG)
1366	1546	System.out.println("CREATE CAMERAS");
1367	1547	cams = new cTemplate();
1368	1548	cams.name = "Cameras";
..	..	@@ -1451,6 +1631,7 @@
1451	1631	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1452	1632	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1453	1633	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1634	+ //XYZPanel.setName("XYZ");
1454	1635
1455	1636	/*
1456	1637	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1487,18 +1668,34 @@
1487	1668
1488	1669	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1489	1670	//tmp.setName("Edit");
	1671	+ objectPanel.add(toolboxPanel);
	1672	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1673	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1674	+
1490	1675	objectPanel.add(materialPanel);
	1676	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1677	+ objectPanel.setToolTipTextAt(1, "Material");
	1678	+
	1679	+ objectPanel.add(skyboxPanel);
	1680	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1681	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1682	+
1491	1683	// JPanel north = new JPanel(new BorderLayout());
1492	1684	// north.setName("Edit");
1493	1685	// north.add(ctrlPanel, BorderLayout.NORTH);
1494	1686	// objectPanel.add(north);
1495	1687	objectPanel.add(editPanel);
	1688	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1689	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1496	1690
1497		- //if (Globals.ADVANCED)
1498		- objectPanel.add(infoPanel);
	1691	+ objectPanel.add(XYZPanel);
	1692	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1693	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1499	1694
1500		- objectPanel.add(toolboxPanel);
1501		-
	1695	+ patchMaterial = true;
	1696	+ cameraView.patchMaterial = this;
	1697	+ objectPanel.setSelectedIndex(1);
	1698	+
1502	1699	/*
1503	1700	aConstraints.gridx = 0;
1504	1701	aConstraints.gridwidth = 1;
..	..	@@ -1535,6 +1732,11 @@
1535	1732
1536	1733	scenePanel.add(tabbedPane);
1537	1734
	1735	+ //if (Globals.ADVANCED)
	1736	+// tabbedPane.add(infoPanel);
	1737	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1738	+// tabbedPane.setToolTipTextAt(3, "Information");
	1739	+
1538	1740	/*
1539	1741	cTree jTree = new cTree(null);
1540	1742	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1596,7 +1798,7 @@
1596	1798	bigThree = new cGridBag();
1597	1799	bigThree.addComponent(scenePanel);
1598	1800	bigThree.addComponent(centralPanel);
1599		- bigThree.addComponent(XYZPanel);
	1801	+ //bigThree.addComponent(XYZPanel);
1600	1802
1601	1803	// // SIDE EFFECT!!!
1602	1804	// aConstraints.gridx = 0;
..	..	@@ -1605,6 +1807,23 @@
1605	1807	// aConstraints.gridheight = 1;
1606	1808
1607	1809	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1810	+
	1811	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1812	+ new java.beans.PropertyChangeListener()
	1813	+ {
	1814	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1815	+ {
	1816	+ if ((Integer)pce.getOldValue() == 1)
	1817	+ {
	1818	+ if (radio.layout != expandedLayout)
	1819	+ {
	1820	+ radio.layout = expandedLayout;
	1821	+ radio.layout.doClick();
	1822	+ }
	1823	+ }
	1824	+ }
	1825	+ });
	1826	+
1608	1827	framePanel.setContinuousLayout(false);
1609	1828	framePanel.setOneTouchExpandable(false);
1610	1829	//.setDividerLocation(0.8);
..	..	@@ -1614,7 +1833,7 @@
1614	1833
1615	1834	frame.getContentPane().setLayout(new BorderLayout());
1616	1835	/**/
1617		- JTabbedPane worldPane = new JTabbedPane();
	1836	+ //JTabbedPane worldPane = new JTabbedPane();
1618	1837	//worldPane.add(bigPanel);
1619	1838	//worldPane.add(worldPanel);
1620	1839	/**/
..	..	@@ -1637,7 +1856,6 @@
1637	1856	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1638	1857	frame.addWindowListener(new WindowAdapter()
1639	1858	{
1640		-
1641	1859	public void windowClosing(WindowEvent e)
1642	1860	{
1643	1861	Close();
..	..	@@ -1660,12 +1878,426 @@
1660	1878	ctrlPanel.removeAll();
1661	1879	}
1662	1880
1663		- void SetupMaterial(cGridBag panel)
	1881	+ void SetupMaterial(cGridBag materialpanel)
1664	1882	{
1665		- /*
	1883	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1884	+
	1885	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1886	+ skin.setToolTipText("Skin");
	1887	+ skin.addMouseListener(new MouseAdapter()
	1888	+ {
	1889	+ public void mouseClicked(MouseEvent e)
	1890	+ {
	1891	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1892	+ cMaterial material = object.material;
	1893	+
	1894	+ // Skin
	1895	+ colorField.setFloat(material.color);
	1896	+ float saturation = material.modulation;
	1897	+
	1898	+ if (!cameraView.Skinshader)
	1899	+ {
	1900	+ saturation /= 1.5;
	1901	+ }
	1902	+
	1903	+ saturationField.setFloat(saturation);
	1904	+
	1905	+ subsurfaceField.setFloat(material.subsurface);
	1906	+ selfshadowField.setFloat(material.diffuseness);
	1907	+ diffusenessField.setFloat(material.factor);
	1908	+ shininessField.setFloat(material.shininess);
	1909	+ shadowbiasField.setFloat(material.shadowbias);
	1910	+ diffuseField.setFloat(material.diffuse);
	1911	+ specularField.setFloat(material.specular);
	1912	+
	1913	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1914	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1915	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1916	+
	1917	+ materialtouched = true;
	1918	+ applySelf();
	1919	+ }
	1920	+ });
	1921	+ presetpanel.add(skin);
	1922	+
	1923	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1924	+ lambert.setToolTipText("Diffuse");
	1925	+ lambert.addMouseListener(new MouseAdapter()
	1926	+ {
	1927	+ public void mouseClicked(MouseEvent e)
	1928	+ {
	1929	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1930	+ cMaterial material = object.material;
	1931	+
	1932	+ diffusenessField.setFloat(material.factor);
	1933	+ selfshadowField.setFloat(material.diffuseness);
	1934	+
	1935	+ materialtouched = true;
	1936	+ applySelf();
	1937	+ }
	1938	+ });
	1939	+ presetpanel.add(lambert);
	1940	+
	1941	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1942	+ diffuse2.setToolTipText("Diffuse2");
	1943	+ diffuse2.addMouseListener(new MouseAdapter()
	1944	+ {
	1945	+ public void mouseClicked(MouseEvent e)
	1946	+ {
	1947	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1948	+ cMaterial material = object.material;
	1949	+
	1950	+ diffusenessField.setFloat(material.factor);
	1951	+ selfshadowField.setFloat(material.diffuseness);
	1952	+
	1953	+ materialtouched = true;
	1954	+ applySelf();
	1955	+ }
	1956	+ });
	1957	+ presetpanel.add(diffuse2);
	1958	+
	1959	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1960	+ diffusemoon.setToolTipText("Moon");
	1961	+ diffusemoon.addMouseListener(new MouseAdapter()
	1962	+ {
	1963	+ public void mouseClicked(MouseEvent e)
	1964	+ {
	1965	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1966	+ cMaterial material = object.material;
	1967	+
	1968	+ diffusenessField.setFloat(material.factor);
	1969	+ selfshadowField.setFloat(material.diffuseness);
	1970	+
	1971	+ materialtouched = true;
	1972	+ applySelf();
	1973	+ }
	1974	+ });
	1975	+ presetpanel.add(diffusemoon);
	1976	+
	1977	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1978	+ diffusemoon2.setToolTipText("Moon2");
	1979	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1980	+ {
	1981	+ public void mouseClicked(MouseEvent e)
	1982	+ {
	1983	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1984	+ cMaterial material = object.material;
	1985	+
	1986	+ diffusenessField.setFloat(material.factor);
	1987	+ selfshadowField.setFloat(material.diffuseness);
	1988	+
	1989	+ materialtouched = true;
	1990	+ applySelf();
	1991	+ }
	1992	+ });
	1993	+ presetpanel.add(diffusemoon2);
	1994	+
	1995	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1996	+ diffusemoon3.setToolTipText("Moon3");
	1997	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1998	+ {
	1999	+ public void mouseClicked(MouseEvent e)
	2000	+ {
	2001	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2002	+ cMaterial material = object.material;
	2003	+
	2004	+ diffusenessField.setFloat(material.factor);
	2005	+ selfshadowField.setFloat(material.diffuseness);
	2006	+
	2007	+ materialtouched = true;
	2008	+ applySelf();
	2009	+ }
	2010	+ });
	2011	+ presetpanel.add(diffusemoon3);
	2012	+
	2013	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2014	+ diffusesheen.setToolTipText("Sheen");
	2015	+ diffusesheen.addMouseListener(new MouseAdapter()
	2016	+ {
	2017	+ public void mouseClicked(MouseEvent e)
	2018	+ {
	2019	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2020	+ cMaterial material = object.material;
	2021	+
	2022	+ sheenField.setFloat(material.sheen);
	2023	+
	2024	+ materialtouched = true;
	2025	+ applySelf();
	2026	+ }
	2027	+ });
	2028	+ presetpanel.add(diffusesheen);
	2029	+
	2030	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2031	+ rough.setToolTipText("Rough metal");
	2032	+ rough.addMouseListener(new MouseAdapter()
	2033	+ {
	2034	+ public void mouseClicked(MouseEvent e)
	2035	+ {
	2036	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2037	+ cMaterial material = object.material;
	2038	+
	2039	+ shininessField.setFloat(material.shininess);
	2040	+ velvetField.setFloat(material.velvet);
	2041	+
	2042	+ materialtouched = true;
	2043	+ applySelf();
	2044	+ }
	2045	+ });
	2046	+ presetpanel.add(rough);
	2047	+
	2048	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2049	+ rough2.setToolTipText("Medium metal");
	2050	+ rough2.addMouseListener(new MouseAdapter()
	2051	+ {
	2052	+ public void mouseClicked(MouseEvent e)
	2053	+ {
	2054	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2055	+ cMaterial material = object.material;
	2056	+
	2057	+ shininessField.setFloat(material.shininess);
	2058	+ lightareaField.setFloat(material.lightarea);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(rough2);
	2065	+
	2066	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2067	+ shini0.setToolTipText("Shiny");
	2068	+ shini0.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ shininessField.setFloat(material.shininess);
	2076	+ lightareaField.setFloat(material.lightarea);
	2077	+
	2078	+ materialtouched = true;
	2079	+ applySelf();
	2080	+ }
	2081	+ });
	2082	+ presetpanel.add(shini0);
	2083	+
	2084	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2085	+ shini1.setToolTipText("Shiny2");
	2086	+ shini1.addMouseListener(new MouseAdapter()
	2087	+ {
	2088	+ public void mouseClicked(MouseEvent e)
	2089	+ {
	2090	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2091	+ cMaterial material = object.material;
	2092	+
	2093	+ shininessField.setFloat(material.shininess);
	2094	+ lightareaField.setFloat(material.lightarea);
	2095	+
	2096	+ materialtouched = true;
	2097	+ applySelf();
	2098	+ }
	2099	+ });
	2100	+ presetpanel.add(shini1);
	2101	+
	2102	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2103	+ shini2.setToolTipText("Shiny3");
	2104	+ shini2.addMouseListener(new MouseAdapter()
	2105	+ {
	2106	+ public void mouseClicked(MouseEvent e)
	2107	+ {
	2108	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2109	+ cMaterial material = object.material;
	2110	+
	2111	+ shininessField.setFloat(material.shininess);
	2112	+ lightareaField.setFloat(material.lightarea);
	2113	+
	2114	+ materialtouched = true;
	2115	+ applySelf();
	2116	+ }
	2117	+ });
	2118	+ presetpanel.add(shini2);
	2119	+
	2120	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2121	+ aniso.setToolTipText("AnisoU");
	2122	+ aniso.addMouseListener(new MouseAdapter()
	2123	+ {
	2124	+ public void mouseClicked(MouseEvent e)
	2125	+ {
	2126	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2127	+ cMaterial material = object.material;
	2128	+
	2129	+ anisoField.setFloat(material.aniso);
	2130	+ anisoVField.setFloat(material.anisoV);
	2131	+
	2132	+ materialtouched = true;
	2133	+ applySelf();
	2134	+ }
	2135	+ });
	2136	+ presetpanel.add(aniso);
	2137	+
	2138	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2139	+ aniso2.setToolTipText("AnisoV");
	2140	+ aniso2.addMouseListener(new MouseAdapter()
	2141	+ {
	2142	+ public void mouseClicked(MouseEvent e)
	2143	+ {
	2144	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2145	+ cMaterial material = object.material;
	2146	+
	2147	+ anisoField.setFloat(material.aniso);
	2148	+ anisoVField.setFloat(material.anisoV);
	2149	+
	2150	+ materialtouched = true;
	2151	+ applySelf();
	2152	+ }
	2153	+ });
	2154	+ presetpanel.add(aniso2);
	2155	+
	2156	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2157	+ aniso3.setToolTipText("AnisoUV");
	2158	+ aniso3.addMouseListener(new MouseAdapter()
	2159	+ {
	2160	+ public void mouseClicked(MouseEvent e)
	2161	+ {
	2162	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2163	+ cMaterial material = object.material;
	2164	+
	2165	+ anisoField.setFloat(material.aniso);
	2166	+ anisoVField.setFloat(material.anisoV);
	2167	+
	2168	+ materialtouched = true;
	2169	+ applySelf();
	2170	+ }
	2171	+ });
	2172	+ presetpanel.add(aniso3);
	2173	+
	2174	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2175	+ velvet0.setToolTipText("Velvet");
	2176	+ velvet0.addMouseListener(new MouseAdapter()
	2177	+ {
	2178	+ public void mouseClicked(MouseEvent e)
	2179	+ {
	2180	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2181	+ cMaterial material = object.material;
	2182	+
	2183	+ diffusenessField.setFloat(material.factor);
	2184	+ selfshadowField.setFloat(material.diffuseness);
	2185	+ sheenField.setFloat(material.sheen);
	2186	+ shininessField.setFloat(material.shininess);
	2187	+ velvetField.setFloat(material.velvet);
	2188	+ shiftField.setFloat(material.shift);
	2189	+
	2190	+ materialtouched = true;
	2191	+ applySelf();
	2192	+ }
	2193	+ });
	2194	+ presetpanel.add(velvet0);
	2195	+
	2196	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2197	+ bump0.setToolTipText("Bump texture");
	2198	+ bump0.addMouseListener(new MouseAdapter()
	2199	+ {
	2200	+ public void mouseClicked(MouseEvent e)
	2201	+ {
	2202	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2203	+ cMaterial material = object.material;
	2204	+
	2205	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2206	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2207	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2208	+
	2209	+ materialtouched = true;
	2210	+ applySelf();
	2211	+ }
	2212	+ });
	2213	+ presetpanel.add(bump0);
	2214	+
	2215	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2216	+ borderShader.setToolTipText("Border fade");
	2217	+ borderShader.addMouseListener(new MouseAdapter()
	2218	+ {
	2219	+ public void mouseClicked(MouseEvent e)
	2220	+ {
	2221	+ borderfadeField.setFloat(0.5);
	2222	+ opacityField.setFloat(0.75);
	2223	+
	2224	+ materialtouched = true;
	2225	+ applySelf();
	2226	+ }
	2227	+ });
	2228	+ presetpanel.add(borderShader);
	2229	+
	2230	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2231	+ halo.setToolTipText("Halo");
	2232	+ halo.addMouseListener(new MouseAdapter()
	2233	+ {
	2234	+ public void mouseClicked(MouseEvent e)
	2235	+ {
	2236	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2237	+ cMaterial material = object.material;
	2238	+
	2239	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2240	+
	2241	+ materialtouched = true;
	2242	+ applySelf();
	2243	+ }
	2244	+ });
	2245	+ presetpanel.add(halo);
	2246	+
	2247	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2248	+ candle.setToolTipText("Candle");
	2249	+ candle.addMouseListener(new MouseAdapter()
	2250	+ {
	2251	+ public void mouseClicked(MouseEvent e)
	2252	+ {
	2253	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2254	+ cMaterial material = object.material;
	2255	+
	2256	+ subsurfaceField.setFloat(material.subsurface);
	2257	+ shadowbiasField.setFloat(material.shadowbias);
	2258	+ ambientField.setFloat(material.ambient);
	2259	+ specularField.setFloat(material.specular);
	2260	+ lightareaField.setFloat(material.lightarea);
	2261	+ shininessField.setFloat(material.shininess);
	2262	+
	2263	+ materialtouched = true;
	2264	+ applySelf();
	2265	+ }
	2266	+ });
	2267	+ presetpanel.add(candle);
	2268	+
	2269	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2270	+ shadowShader.setToolTipText("Shadow");
	2271	+ shadowShader.addMouseListener(new MouseAdapter()
	2272	+ {
	2273	+ public void mouseClicked(MouseEvent e)
	2274	+ {
	2275	+ diffuseField.setFloat(0.001);
	2276	+ ambientField.setFloat(0.001);
	2277	+ cameraField.setFloat(0.001);
	2278	+ specularField.setFloat(0.001);
	2279	+ fakedepthField.setFloat(0.001);
	2280	+ opacityField.setFloat(0.6);
	2281	+
	2282	+ materialtouched = true;
	2283	+ applySelf();
	2284	+ }
	2285	+ });
	2286	+ presetpanel.add(shadowShader);
	2287	+
	2288	+ cGridBag panel = new cGridBag().setVertical(true);
	2289	+
	2290	+ presetpanel.preferredWidth = 1;
	2291	+
	2292	+ materialpanel.add(presetpanel);
	2293	+ materialpanel.add(panel);
	2294	+
	2295	+ panel.preferredWidth = 8;
	2296	+
	2297	+ /*
1666	2298	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1667	2299	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668		- */
	2300	+ */
1669	2301
1670	2302	cGridBag editBar = new cGridBag().setVertical(false);
1671	2303
..	..	@@ -1699,27 +2331,61 @@
1699	2331	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1700	2332
1701	2333	cGridBag colorSection = new cGridBag().setVertical(true);
	2334	+
	2335	+ cGridBag huepanel = new cGridBag();
	2336	+ cGridBag huelabel = new cGridBag();
	2337	+ cLabel hue = GetLabel("icons/hue.png", false);
	2338	+ hue.fit = true;
	2339	+
	2340	+ hue.addMouseListener(new MouseAdapter()
	2341	+ {
	2342	+ public void mousePressed(MouseEvent e)
	2343	+ {
	2344	+ int x = e.getX();
	2345	+
	2346	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2347	+ }
	2348	+ });
	2349	+
	2350	+ huelabel.add(hue);
	2351	+ huelabel.preferredWidth = 20;
	2352	+ huepanel.add(new cGridBag()); // Label
	2353	+ huepanel.add(huelabel); // Field/slider
	2354	+
	2355	+ huepanel.preferredHeight = 7;
	2356	+
	2357	+ colorSection.add(huepanel);
1702	2358
1703	2359	cGridBag color = new cGridBag();
1704		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1705		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2360	+
	2361	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2362	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2363	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2364	+
1707	2365	//colorField.preferredWidth = 200;
1708	2366	colorSection.add(color);
1709	2367
1710	2368	cGridBag modulation = new cGridBag();
1711	2369	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1712	2370	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2371	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1714	2372	colorSection.add(modulation);
1715	2373
	2374	+ cGridBag opacity = new cGridBag();
	2375	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2376	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2377	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2378	+ colorSection.add(opacity);
	2379	+
	2380	+ colorSection.add(GetSeparator());
	2381	+
1716	2382	cGridBag texture = new cGridBag();
1717	2383	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1718	2384	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1719	2385	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1720	2386	colorSection.add(texture);
1721	2387
1722		- panel.add(new JSeparator());
	2388	+ panel.add(GetSeparator());
1723	2389
1724	2390	panel.add(colorSection);
1725	2391
..	..	@@ -1775,7 +2441,7 @@
1775	2441	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1776	2442	diffuseSection.add(shadowbias);
1777	2443
1778		- panel.add(new JSeparator());
	2444	+ panel.add(GetSeparator());
1779	2445
1780	2446	panel.add(diffuseSection);
1781	2447
..	..	@@ -1838,7 +2504,7 @@
1838	2504	specularSection.add(anisoV);
1839	2505
1840	2506
1841		- panel.add(new JSeparator());
	2507	+ panel.add(GetSeparator());
1842	2508
1843	2509	panel.add(specularSection);
1844	2510
..	..	@@ -1863,12 +2529,6 @@
1863	2529	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1864	2530	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1865	2531	colorSection.add(backlit);
1866		-
1867		- cGridBag opacity = new cGridBag();
1868		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1869		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1870		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1871		- colorSection.add(opacity);
1872	2532
1873	2533	//panel.add(new JSeparator());
1874	2534
..	..	@@ -1914,7 +2574,7 @@
1914	2574	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1915	2575	textureSection.add(opacityPower);
1916	2576
1917		- panel.add(new JSeparator());
	2577	+ panel.add(GetSeparator());
1918	2578
1919	2579	panel.add(textureSection);
1920	2580
..	..	@@ -2901,7 +3561,7 @@
2901	3561
2902	3562	freezematerial = true;
2903	3563	colorField.setFloat(mat.color);
2904		- modulationField.setFloat(mat.modulation);
	3564	+ saturationField.setFloat(mat.modulation);
2905	3565	metalnessField.setFloat(mat.metalness);
2906	3566	diffuseField.setFloat(mat.diffuse);
2907	3567	specularField.setFloat(mat.specular);
..	..	@@ -2963,32 +3623,8 @@
2963	3623
2964	3624	if (multiplyToggle != null)
2965	3625	multiplyToggle.setSelected(mat.multiply);
2966		-
2967		- assert (object.projectedVertices != null);
2968		-
2969		- if (object.projectedVertices.length <= 2)
2970		- {
2971		- // Side effect...
2972		- Object3D.cVector2[] keep = object.projectedVertices;
2973		- object.projectedVertices = new Object3D.cVector2[3];
2974		- for (int i = 0; i < 3; i++)
2975		- {
2976		- if (i < keep.length)
2977		- {
2978		- object.projectedVertices[i] = keep[i];
2979		- } else
2980		- {
2981		- object.projectedVertices[i] = new Object3D.cVector2();
2982		- }
2983		- /*
2984		- if(keep.length == 0)
2985		- object.projectedVertices[0] = new Object3D.cVector2();
2986		- else
2987		- object.projectedVertices[0] = keep[0];
2988		- object.projectedVertices[1] = new Object3D.cVector2();
2989		- */
2990		- }
2991		- }
	3626	+
	3627	+ AllocProjectedVertices(object);
2992	3628
2993	3629	SetMaterial(mat, object.projectedVertices);
2994	3630	}
..	..	@@ -3108,6 +3744,17 @@
3108	3744	public void itemStateChanged(ItemEvent event)
3109	3745	{
3110	3746	// System.out.println("Propagate = " + propagate);
	3747	+ if (event.getSource() == pinButton)
	3748	+ {
	3749	+ copy.pinned ^= true;
	3750	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3751	+ {
	3752	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3753	+ copy.CloseUI();
	3754	+ //copy.editWindow.refreshContents();
	3755	+ }
	3756	+ }
	3757	+ else
3111	3758	if (event.getSource() == propagateToggle)
3112	3759	{
3113	3760	propagate ^= true;
..	..	@@ -3212,8 +3859,9 @@
3212	3859	} else if (event.getSource() == liveCB)
3213	3860	{
3214	3861	copy.live ^= true;
	3862	+ objEditor.refreshContents(true); // To show item colors
3215	3863	return;
3216		- } else if (event.getSource() == selectCB)
	3864	+ } else if (event.getSource() == selectableCB)
3217	3865	{
3218	3866	copy.dontselect ^= true;
3219	3867	return;
..	..	@@ -3221,7 +3869,7 @@
3221	3869	{
3222	3870	copy.hide ^= true;
3223	3871	copy.Touch(); // display list issue
3224		- objEditor.refreshContents();
	3872	+ objEditor.refreshContents(true); // To show item colors
3225	3873	return;
3226	3874	} else if (event.getSource() == link2masterCB)
3227	3875	{
..	..	@@ -3286,7 +3934,7 @@
3286	3934	//System.out.println("ObjEditor " + event);
3287	3935	applySelf0(true);
3288	3936	//parent.applySelf();
3289		- objEditor.refreshContents();
	3937	+ // conflicts with requestFocus objEditor.refreshContents();
3290	3938	} else if (source == resetButton)
3291	3939	{
3292	3940	CameraPane.fullreset = true;
..	..	@@ -3477,11 +4125,12 @@
3477	4125
3478	4126	static public byte[] Compress(Object3D o)
3479	4127	{
	4128	+ // Slower to actually compress.
3480	4129	try
3481	4130	{
3482	4131	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3483		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3484		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4132	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4133	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3485	4134
3486	4135	Object3D parent = o.parent;
3487	4136	o.parent = null;
..	..	@@ -3492,10 +4141,14 @@
3492	4141
3493	4142	out.flush();
3494	4143
3495		- zstream.close();
	4144	+ baos //zstream
	4145	+ .close();
3496	4146	out.close();
3497	4147
3498		- return baos.toByteArray();
	4148	+ byte[] bytes = baos.toByteArray();
	4149	+
	4150	+ System.out.println("save #bytes = " + bytes.length);
	4151	+ return bytes;
3499	4152	} catch (Exception e)
3500	4153	{
3501	4154	System.err.println(e);
..	..	@@ -3505,13 +4158,16 @@
3505	4158
3506	4159	static public Object Uncompress(byte[] bytes)
3507	4160	{
3508		- System.out.println("#bytes = " + bytes.length);
	4161	+ System.out.println("restore #bytes = " + bytes.length);
3509	4162	try
3510	4163	{
3511	4164	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3512		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3513		- ObjectInputStream in = new ObjectInputStream(istream);
	4165	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4166	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3514	4167	Object obj = in.readObject();
	4168	+
	4169	+ bais //istream
	4170	+ .close();
3515	4171	in.close();
3516	4172
3517	4173	return obj;
..	..	@@ -3566,12 +4222,12 @@
3566	4222	return null;
3567	4223	}
3568	4224
3569		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3570	4225
3571	4226	public void Save()
3572	4227	{
3573		- // Default reduces the probability of heuristics errors.
3574		- Save(true);
	4228	+ //Save(true);
	4229	+ Replace();
	4230	+ SetVersionStates();
3575	4231	}
3576	4232
3577	4233	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3590,54 +4246,73 @@
3590	4246	return true;
3591	4247	}
3592	4248
	4249	+ void DeleteVersion()
	4250	+ {
	4251	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4252	+ {
	4253	+ copy.versionlist[i] = copy.versionlist[i+1];
	4254	+ }
	4255	+
	4256	+ if (copy.versionlist[copy.versionindex] == null)
	4257	+ copy.versionindex -= 1;
	4258	+
	4259	+ if (copy.versionindex != -1)
	4260	+ CopyChanged();
	4261	+
	4262	+ SetVersionStates();
	4263	+ }
	4264	+
3593	4265	public boolean Save(boolean user)
3594	4266	{
3595	4267	System.err.println("Save");
	4268	+ Replace();
3596	4269
3597		- cRadio tab = GetCurrentTab();
	4270	+ //cRadio tab = GetCurrentTab();
3598	4271
3599		- boolean temp = CameraPane.SWITCH;
3600		- CameraPane.SWITCH = false;
3601		-
3602		- copy.ExtractBigData(hashtable);
3603		-
3604		- byte[] compress = Compress(copy);
3605		-
3606		- CameraPane.SWITCH = temp;
	4272	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3607	4273
3608	4274	boolean thesame = false;
3609	4275
3610		- // Quick heuristic using length. Works only when stream is compressed.
3611		- if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
3612		- {
3613		- thesame = true;
3614		- }
	4276	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4277	+// {
	4278	+// thesame = true;
	4279	+// }
3615	4280
3616	4281	//EditorFrame.m_MainFrame.requestFocusInWindow();
3617	4282	if (!thesame)
3618	4283	{
3619		- tab.user[tab.undoindex] = user;
3620		- tab.graphs[tab.undoindex++] = compress;
	4284	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4285	+ {
	4286	+ copy.versionlist[i] = copy.versionlist[i-1];
	4287	+ }
	4288	+
	4289	+ //tab.user[tab.versionindex] = user;
	4290	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4291	+
	4292	+ copy.versionlist[++copy.versionindex] = compress;
	4293	+
	4294	+ // if (increment)
	4295	+ // tab.versionindex++;
3621	4296	}
3622	4297
3623		- copy.RestoreBigData(hashtable);
	4298	+ //copy.RestoreBigData(versiontable);
3624	4299
3625	4300	//assert(hashtable.isEmpty());
3626	4301
3627		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3628		- {
3629		- tab.user[i] = false;
3630		- tab.graphs[i] = null;
3631		- }
	4302	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4303	+// {
	4304	+// //tab.user[i] = false;
	4305	+// copy.versionlist[i] = null;
	4306	+// }
3632	4307
3633		- SetUndoStates();
	4308	+ SetVersionStates();
3634	4309
3635	4310	// test save
3636	4311	if (false)
3637	4312	{
3638	4313	try
3639	4314	{
3640		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4315	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3641	4316	ObjectOutputStream p = new ObjectOutputStream(ostream);
3642	4317
3643	4318	p.writeObject(copy);
..	..	@@ -3653,27 +4328,65 @@
3653	4328
3654	4329	return !thesame;
3655	4330	}
3656		-
3657		- void CopyChanged(Object3D obj)
	4331	+
	4332	+ boolean flashIt = true;
	4333	+
	4334	+ void RefreshSelection()
3658	4335	{
3659		- SetUndoStates();
	4336	+ Object3D selection = new Object3D();
	4337	+
	4338	+ for (int i = 0; i < copy.selection.size(); i++)
	4339	+ {
	4340	+ Object3D elem = copy.selection.elementAt(i);
	4341	+
	4342	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4343	+
	4344	+ if (obj == null)
	4345	+ {
	4346	+ copy.selection.remove(i--);
	4347	+ }
	4348	+ else
	4349	+ {
	4350	+ selection.add(obj);
	4351	+ copy.selection.setElementAt(obj, i);
	4352	+ }
	4353	+ }
	4354	+
	4355	+ flashIt = false;
	4356	+ GetTree().clearSelection();
	4357	+ for (int i = 0; i < selection.size(); i++)
	4358	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4359	+ flashIt = true;
	4360	+
	4361	+ //refreshContents(false);
	4362	+ }
	4363	+
	4364	+ void CopyChanged()
	4365	+ {
	4366	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4367	+
	4368	+ SetVersionStates();
3660	4369
3661	4370	boolean temp = CameraPane.SWITCH;
3662	4371	CameraPane.SWITCH = false;
3663	4372
3664		- copy.ExtractBigData(hashtable);
	4373	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3665	4374
3666	4375	copy.clear();
3667	4376
	4377	+ copy.skyboxname = obj.skyboxname;
	4378	+ copy.skyboxext = obj.skyboxext;
	4379	+
3668	4380	for (int i=0; i<obj.Size(); i++)
3669	4381	{
3670	4382	copy.add(obj.get(i));
3671	4383	}
3672	4384
3673		- copy.RestoreBigData(hashtable);
	4385	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3674	4386
3675	4387	CameraPane.SWITCH = temp;
3676	4388
	4389	+ RefreshSelection();
3677	4390	//assert(hashtable.isEmpty());
3678	4391
3679	4392	copy.Touch();
..	..	@@ -3694,68 +4407,144 @@
3694	4407	}
3695	4408	}
3696	4409
3697		- refreshContents();
	4410	+ refreshContents(true);
3698	4411	}
3699	4412
3700		- cButton undoButton;
3701		- cButton redoButton;
	4413	+ cButton previousVersionButton;
	4414	+ cButton restoreButton;
	4415	+ cButton replaceButton;
	4416	+ cButton nextVersionButton;
	4417	+ cButton saveVersionButton;
	4418	+ cButton deleteVersionButton;
3702	4419
3703		- void SetUndoStates()
	4420	+ boolean muteSlider;
	4421	+
	4422	+ int VersionCount()
3704	4423	{
3705		- cRadio tab = GetCurrentTab();
	4424	+ int count = 0;
3706	4425
3707		- undoButton.setEnabled(tab.undoindex > 0);
3708		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4426	+ for (int i = copy.versionlist.length; --i >= 0;)
	4427	+ {
	4428	+ if (copy.versionlist[i] != null)
	4429	+ count++;
	4430	+ }
	4431	+
	4432	+ return count;
3709	4433	}
3710	4434
3711		- public boolean Undo()
	4435	+ void SetVersionStates()
3712	4436	{
	4437	+ //if (true)
	4438	+ // return;
	4439	+
	4440	+ //cRadio tab = GetCurrentTab();
	4441	+
	4442	+ restoreButton.setEnabled(copy.versionindex != -1);
	4443	+ replaceButton.setEnabled(copy.versionindex != -1);
	4444	+
	4445	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4446	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4447	+
	4448	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4449	+ //copy.versionlist[copy.versionindex + 1] != null);
	4450	+
	4451	+ muteSlider = true;
	4452	+ versionSlider.setMinimum(0);
	4453	+ versionSlider.setMaximum(VersionCount() - 1);
	4454	+ versionSlider.setInteger(copy.versionindex);
	4455	+ versionSlider.setEnabled(copy.versionindex != -1);
	4456	+ muteSlider = false;
	4457	+ }
	4458	+
	4459	+ public boolean PreviousVersion()
	4460	+ {
	4461	+ // Option?
	4462	+ Replace();
	4463	+
3713	4464	System.err.println("Undo");
3714	4465
3715		- cRadio tab = GetCurrentTab();
	4466	+ //cRadio tab = GetCurrentTab();
3716	4467
3717		- if (tab.undoindex == 0)
	4468	+ if (copy.versionindex == 0)
3718	4469	{
3719	4470	java.awt.Toolkit.getDefaultToolkit().beep();
3720	4471	return false;
3721	4472	}
3722	4473
3723		- if (tab.graphs[tab.undoindex] == null \|\| !tab.user[tab.undoindex])
3724		- {
3725		- if (Save(false))
3726		- tab.undoindex -= 1;
3727		- else
3728		- {
3729		- if (tab.undoindex <= 0)
3730		- return false;
3731		- else
3732		- tab.undoindex -= 1;
3733		- }
3734		- }
	4474	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4475	+// {
	4476	+// if (Save(false))
	4477	+// tab.versionindex -= 1;
	4478	+// else
	4479	+// {
	4480	+// if (tab.versionindex <= 0)
	4481	+// return false;
	4482	+// else
	4483	+// tab.versionindex -= 1;
	4484	+// }
	4485	+// }
3735	4486
3736		- tab.undoindex -= 1;
	4487	+ copy.versionindex -= 1;
3737	4488
3738		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4489	+ CopyChanged();
3739	4490
3740	4491	return true;
3741	4492	}
3742	4493
3743		- public void Redo()
	4494	+ public boolean Restore()
3744	4495	{
3745		- cRadio tab = GetCurrentTab();
	4496	+ System.err.println("Restore");
3746	4497
3747		- if (tab.graphs[tab.undoindex + 1] == null)
	4498	+ //cRadio tab = GetCurrentTab();
	4499	+
	4500	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4501	+ {
	4502	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4503	+ return false;
	4504	+ }
	4505	+
	4506	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4507	+ CopyChanged();
	4508	+
	4509	+ return true;
	4510	+ }
	4511	+
	4512	+ public boolean Replace()
	4513	+ {
	4514	+ //System.err.println("Replace");
	4515	+
	4516	+ //cRadio tab = GetCurrentTab();
	4517	+
	4518	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4519	+ {
	4520	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4521	+ return false;
	4522	+ }
	4523	+
	4524	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4525	+
	4526	+ return true;
	4527	+ }
	4528	+
	4529	+ public void NextVersion()
	4530	+ {
	4531	+ // Option?
	4532	+ Replace();
	4533	+
	4534	+ //cRadio tab = GetCurrentTab();
	4535	+
	4536	+ if (copy.versionlist[copy.versionindex + 1] == null)
3748	4537	{
3749	4538	java.awt.Toolkit.getDefaultToolkit().beep();
3750	4539	return;
3751	4540	}
3752	4541
3753		- tab.undoindex += 1;
	4542	+ copy.versionindex += 1;
3754	4543
3755		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4544	+ CopyChanged();
3756	4545
3757		- if (!tab.user[tab.undoindex])
3758		- tab.graphs[tab.undoindex] = null;
	4546	+ //if (!tab.user[tab.versionindex])
	4547	+ // tab.graphs[tab.versionindex] = null;
3759	4548	}
3760	4549
3761	4550	void ImportGFD()
..	..	@@ -3949,6 +4738,12 @@
3949	4738	// else
3950	4739	// applySelf(true);
3951	4740	// }
	4741	+
	4742	+ boolean Equal(double a, double b)
	4743	+ {
	4744	+ return Math.abs(a - b) < 0.001;
	4745	+ }
	4746	+
3952	4747	void applySelf0(boolean name)
3953	4748	{
3954	4749	if (name)
..	..	@@ -3966,7 +4761,7 @@
3966	4761	//copy.material = new cMaterial(copy.GetMaterial());
3967	4762
3968	4763	current.color = (float) colorField.getFloat();
3969		- current.modulation = (float) modulationField.getFloat();
	4764	+ current.modulation = (float) saturationField.getFloat();
3970	4765	current.metalness = (float) metalnessField.getFloat();
3971	4766	current.diffuse = (float) diffuseField.getFloat();
3972	4767	current.specular = (float) specularField.getFloat();
..	..	@@ -3998,29 +4793,52 @@
3998	4793	{
3999	4794	cMaterial mat = copy.material;
4000	4795
4001		- colorField.SetToolTipValue((mat.color));
4002		- modulationField.SetToolTipValue((mat.modulation));
4003		- metalnessField.SetToolTipValue((mat.metalness));
4004		- diffuseField.SetToolTipValue((mat.diffuse));
4005		- specularField.SetToolTipValue((mat.specular));
4006		- shininessField.SetToolTipValue((mat.shininess));
4007		- shiftField.SetToolTipValue((mat.shift));
4008		- ambientField.SetToolTipValue((mat.ambient));
4009		- lightareaField.SetToolTipValue((mat.lightarea));
4010		- diffusenessField.SetToolTipValue((mat.factor));
4011		- velvetField.SetToolTipValue((mat.velvet));
4012		- sheenField.SetToolTipValue((mat.sheen));
4013		- subsurfaceField.SetToolTipValue((mat.subsurface));
4014		- backlitField.SetToolTipValue((mat.bump));
4015		- anisoField.SetToolTipValue((mat.aniso));
4016		- anisoVField.SetToolTipValue((mat.anisoV));
4017		- cameraField.SetToolTipValue((mat.cameralight));
4018		- selfshadowField.SetToolTipValue((mat.diffuseness));
4019		- shadowField.SetToolTipValue((mat.shadow));
4020		- textureField.SetToolTipValue((mat.texture));
4021		- opacityField.SetToolTipValue((mat.opacity));
4022		- fakedepthField.SetToolTipValue((mat.fakedepth));
4023		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4796	+ if (!Equal(colorField.getFloat(), mat.color))
	4797	+ colorField.SetToolTipValue((mat.color));
	4798	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4799	+ saturationField.SetToolTipValue((mat.modulation));
	4800	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4801	+ metalnessField.SetToolTipValue((mat.metalness));
	4802	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4803	+ diffuseField.SetToolTipValue((mat.diffuse));
	4804	+ if (!Equal(specularField.getFloat(), mat.specular))
	4805	+ specularField.SetToolTipValue((mat.specular));
	4806	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4807	+ shininessField.SetToolTipValue((mat.shininess));
	4808	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4809	+ shiftField.SetToolTipValue((mat.shift));
	4810	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4811	+ ambientField.SetToolTipValue((mat.ambient));
	4812	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4813	+ lightareaField.SetToolTipValue((mat.lightarea));
	4814	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4815	+ diffusenessField.SetToolTipValue((mat.factor));
	4816	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4817	+ velvetField.SetToolTipValue((mat.velvet));
	4818	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4819	+ sheenField.SetToolTipValue((mat.sheen));
	4820	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4821	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4822	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4823	+ backlitField.SetToolTipValue((mat.bump));
	4824	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4825	+ anisoField.SetToolTipValue((mat.aniso));
	4826	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4827	+ anisoVField.SetToolTipValue((mat.anisoV));
	4828	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4829	+ cameraField.SetToolTipValue((mat.cameralight));
	4830	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4831	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4832	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4833	+ shadowField.SetToolTipValue((mat.shadow));
	4834	+ if (!Equal(textureField.getFloat(), mat.texture))
	4835	+ textureField.SetToolTipValue((mat.texture));
	4836	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4837	+ opacityField.SetToolTipValue((mat.opacity));
	4838	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4839	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4840	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4841	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4024	4842	}
4025	4843
4026	4844	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4051,9 +4869,28 @@
4051	4869	//copy.Touch();
4052	4870	}
4053	4871
	4872	+ cNumberSlider versionSlider;
	4873	+
4054	4874	public void stateChanged(ChangeEvent e)
4055	4875	{
4056	4876	// assert(false);
	4877	+ if (e.getSource() == versionSlider)
	4878	+ {
	4879	+ if (muteSlider)
	4880	+ return;
	4881	+
	4882	+ Replace();
	4883	+
	4884	+ int version = versionSlider.getInteger();
	4885	+
	4886	+ if (version != -1 && copy.versionlist[version] != null)
	4887	+ {
	4888	+ copy.versionindex = version;
	4889	+ CopyChanged();
	4890	+ }
	4891	+
	4892	+ return;
	4893	+ }
4057	4894
4058	4895	if (freezematerial)
4059	4896	{
..	..	@@ -4089,6 +4926,12 @@
4089	4926	{
4090	4927	//System.out.println("stateChanged = " + this);
4091	4928	materialtouched = true;
	4929	+
	4930	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4931	+ {
	4932	+ saturationField.setFloat(1);
	4933	+ }
	4934	+
4092	4935	applySelf();
4093	4936	//System.out.println("this = " + this);
4094	4937	//System.out.println("PARENT = " + parent);
..	..	@@ -4388,6 +5231,7 @@
4388	5231	{
4389	5232	if (GetTree() != null)
4390	5233	{
	5234	+ GetTree().revalidate();
4391	5235	GetTree().repaint();
4392	5236	}
4393	5237
..	..	@@ -4396,13 +5240,18 @@
4396	5240	ctrlPanel.validate(); // ? new
4397	5241	ctrlPanel.repaint();
4398	5242	}
	5243	+
	5244	+ if (previousVersionButton != null && copy.versionlist != null)
	5245	+ SetVersionStates();
	5246	+
	5247	+ cameraView.requestFocusInWindow();
4399	5248	}
4400	5249
4401	5250	static TweenManager tweenManager = new TweenManager();
4402	5251
4403	5252	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4404	5253	{
4405		- if (Globals.SAVEONMAKE) // && resetmodel)
	5254	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4406	5255	Save();
4407	5256	//Tween.set(thing, 0).target(1).start(tweenManager);
4408	5257	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4427,7 +5276,7 @@
4427	5276	// group = (Composite) group.get(0);
4428	5277	// }
4429	5278
4430		- System.out.println("makeSomething of " + thing);
	5279	+ //System.out.println("makeSomething of " + thing);
4431	5280
4432	5281	/*
4433	5282	if (deselect && jList != null)
..	..	@@ -4644,7 +5493,9 @@
4644	5493	readobj.ResetDisplayList();
4645	5494	} catch (Exception e)
4646	5495	{
4647		- //e.printStackTrace();
	5496	+ if (!e.toString().contains("GZIP"))
	5497	+ e.printStackTrace();
	5498	+
4648	5499	try
4649	5500	{
4650	5501	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4718,12 +5569,14 @@
4718	5569
4719	5570	if (readobj != null)
4720	5571	{
4721		- if (Globals.SAVEONMAKE)
4722		- Save();
	5572	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5573	+ // Save();
4723	5574	try
4724	5575	{
4725	5576	//readobj.deepCopySelf(copy);
4726	5577	copy.clear(); // june 2014
	5578	+ copy.skyboxname = readobj.skyboxname;
	5579	+ copy.skyboxext = readobj.skyboxext;
4727	5580	for (int i = 0; i < readobj.size(); i++)
4728	5581	{
4729	5582	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4764,6 +5617,7 @@
4764	5617	}
4765	5618	} catch (ClassCastException e)
4766	5619	{
	5620	+ e.printStackTrace();
4767	5621	assert (false);
4768	5622	Composite c = (Composite) copy;
4769	5623	c.children.clear();
..	..	@@ -4774,6 +5628,21 @@
4774	5628	c.addChild(csg);
4775	5629	}
4776	5630
	5631	+ copy.versionlist = readobj.versionlist;
	5632	+ copy.versionindex = readobj.versionindex;
	5633	+ copy.versiontable = readobj.versiontable;
	5634	+
	5635	+ if (copy.versionlist == null)
	5636	+ {
	5637	+ // Backward compatibility
	5638	+ copy.versionlist = new Object3D[100];
	5639	+ copy.versionindex = -1;
	5640	+
	5641	+ //Save(true);
	5642	+ }
	5643	+
	5644	+ //? SetUndoStates();
	5645	+
4777	5646	ResetModel();
4778	5647	copy.HardTouch(); // recompile?
4779	5648	refreshContents();
..	..	@@ -4784,7 +5653,7 @@
4784	5653	{
4785	5654	if (Grafreed.standAlone)
4786	5655	{
4787		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5656	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4788	5657	browser.show();
4789	5658	String filename = browser.getFile();
4790	5659	if (filename != null && filename.length() > 0)
..	..	@@ -4861,6 +5730,8 @@
4861	5730
4862	5731	void save()
4863	5732	{
	5733	+ Replace();
	5734	+
4864	5735	if (lastname == null)
4865	5736	{
4866	5737	return;
..	..	@@ -4883,6 +5754,7 @@
4883	5754	//ps.print(buffer.toString());
4884	5755	} catch (IOException e)
4885	5756	{
	5757	+ e.printStackTrace();
4886	5758	}
4887	5759	}
4888	5760
..	..	@@ -5102,6 +5974,7 @@
5102	5974	ButtonGroup buttonGroup;
5103	5975
5104	5976	cGridBag toolboxPanel;
	5977	+ cGridBag skyboxPanel;
5105	5978	cGridBag materialPanel;
5106	5979	cGridBag ctrlPanel;
5107	5980
..	..	@@ -5175,7 +6048,7 @@
5175	6048	JLabel colorLabel;
5176	6049	cNumberSlider colorField;
5177	6050	JLabel modulationLabel;
5178		- cNumberSlider modulationField;
	6051	+ cNumberSlider saturationField;
5179	6052	JLabel metalnessLabel;
5180	6053	cNumberSlider metalnessField;
5181	6054	JLabel diffuseLabel;
..	..	@@ -5206,6 +6079,7 @@
5206	6079	cNumberSlider anisoField;
5207	6080	JLabel anisoVLabel;
5208	6081	cNumberSlider anisoVField;
	6082	+
5209	6083	JLabel cameraLabel;
5210	6084	cNumberSlider cameraField;
5211	6085	JLabel selfshadowLabel;
..	..	@@ -5220,6 +6094,7 @@
5220	6094	cNumberSlider fakedepthField;
5221	6095	JLabel shadowbiasLabel;
5222	6096	cNumberSlider shadowbiasField;
	6097	+
5223	6098	JLabel bumpLabel;
5224	6099	cNumberSlider bumpField;
5225	6100	JLabel noiseLabel;