~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -30,6 +34,7 @@
30	34	iSendInfo
31	35	//KeyListener
32	36	{
	37	+ public cToggleButton pinButton;
33	38	boolean timeline;
34	39	boolean wasFullScreen;
35	40
..	..	@@ -37,6 +42,120 @@
37	42	JFrame frame;
38	43
39	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	+ }
	82	+
	83	+ cButton GetButton(String name, boolean border)
	84	+ {
	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);
	93	+ }
	94	+
	95	+ cToggleButton GetToggleButton(String name, boolean border)
	96	+ {
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
	99	+ }
	100	+
	101	+ cCheckBox GetCheckBox(String name, boolean border)
	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	+ ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
	117	+ try
	118	+ {
	119	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().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;
	138	+ }
	139	+ catch (Exception e)
	140	+ {
	141	+ //icons.put(name, null);
	142	+ return null;
	143	+ }
	144	+ }
	145	+
	146	+ BufferedImage GetImage(String name)
	147	+ {
	148	+ try
	149	+ {
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
	153	+ }
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
	158	+ }
40	159
41	160	// SCRIPT
42	161
..	..	@@ -147,7 +266,7 @@
147	266
148	267	objEditor.ctrlPanel.remove(namePanel);
149	268
150		- if (!GroupEditor.allparams)
	269	+ if (!allparams)
151	270	return;
152	271
153	272	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -171,7 +290,7 @@
171	290
172	291	objEditor.ctrlPanel.remove(setupPanel);
173	292	objEditor.ctrlPanel.remove(setupPanel2);
174		- objEditor.ctrlPanel.remove(commandsPanel);
	293	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
175	294	objEditor.ctrlPanel.remove(pushPanel);
176	295	//objEditor.ctrlPanel.remove(fillPanel);
177	296
..	..	@@ -219,6 +338,14 @@
219	338	client = inClient;
220	339	copy = client;
221	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
222	349	// "this" is not called: SetupUI2(objEditor);
223	350	}
224	351
..	..	@@ -232,6 +359,14 @@
232	359	client = inClient;
233	360	copy = client;
234	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
235	370	SetupUI2(callee.GetEditor());
236	371	}
237	372
..	..	@@ -246,14 +381,15 @@
246	381	//localCopy.parent = null;
247	382
248	383	frame = new JFrame();
249		- frame.setUndecorated(true);
	384	+ frame.setUndecorated(false);
250	385	objEditor = this;
251	386	this.callee = callee;
252	387
253	388	//parent = p;
254	389
255	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
256		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
257	393	//gd.setFullScreenWindow(this);
258	394	//setResizable(false);
259	395	//if (!isDisplayable())
..	..	@@ -264,6 +400,14 @@
264	400	copy = localCopy;
265	401	copy.editWindow = this;
266	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
267	411	SetupMenu();
268	412
269	413	//SetupName(objEditor); // new
..	..	@@ -277,12 +421,17 @@
277	421	return frame.action(event, obj);
278	422	}
279	423
	424	+ // Cannot work without static
	425	+ static boolean allparams = true;
	426	+
	427	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	428	+
280	429	void SetupMenu()
281	430	{
282	431	frame.setMenuBar(menuBar = new MenuBar());
283	432	menuBar.add(fileMenu = new Menu("File"));
284	433	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	434	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	435
287	436	//oe.menuBar.add(menu = new Menu("Include"));
288	437	Menu menu = new Menu("Import");
..	..	@@ -314,7 +463,7 @@
314	463	}
315	464
316	465	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	466	+ openItem.addActionListener(this);
318	467	saveItem.addActionListener(this);
319	468	saveAsItem.addActionListener(this);
320	469	exportAsItem.addActionListener(this);
..	..	@@ -323,28 +472,102 @@
323	472	closeItem.addActionListener(this);
324	473
325	474	objectPanel = new JTabbedPane();
	475	+
	476	+ ChangeListener changeListener = new ChangeListener()
	477	+ {
	478	+ //String name;
	479	+
	480	+ public void stateChanged(ChangeEvent changeEvent)
	481	+ {
	482	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	483	+// {
	484	+// if (latestObject != null)
	485	+// {
	486	+// refreshContents(true);
	487	+// SetMaterial(latestObject);
	488	+// }
	489	+//
	490	+// materialFlushed = true;
	491	+// }
	492	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	493	+// {
	494	+// if (listUI.size() == 0)
	495	+// EditSelection(false);
	496	+// }
	497	+
	498	+// if (objectPanel.getSelectedIndex() == 4)
	499	+// {
	500	+// name = copy.skyboxname;
	501	+//
	502	+// if (name == null)
	503	+// {
	504	+// name = "";
	505	+// }
	506	+//
	507	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	508	+// copy.skyboxext = "jpg";
	509	+// }
	510	+// else
	511	+// {
	512	+// if (name != null)
	513	+// {
	514	+// if (name.equals(""))
	515	+// {
	516	+// copy.skyboxname = null;
	517	+// copy.skyboxext = null;
	518	+// }
	519	+// else
	520	+// {
	521	+// copy.skyboxname = name;
	522	+// }
	523	+// }
	524	+// }
	525	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	526	+
	527	+// refreshContents(false); // To refresh Info tab
	528	+ cameraView.repaint();
	529	+ }
	530	+ };
	531	+ objectPanel.addChangeListener(changeListener);
	532	+
326	533	toolbarPanel = new JPanel();
327	534	toolbarPanel.setName("Toolbar");
	535	+
328	536	treePanel = new cGridBag();
329	537	treePanel.setName("Tree");
	538	+
	539	+ editPanel = new cGridBag().setVertical(true);
	540	+ //editPanel.setName("Edit");
	541	+
330	542	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331		- ctrlPanel.setName("Edit");
332		- materialPanel = new cGridBag().setVertical(true);
333		- materialPanel.setName("Material");
	543	+
	544	+ editCommandsPanel = new cGridBag();
	545	+ editPanel.add(editCommandsPanel);
	546	+ editPanel.add(ctrlPanel);
	547	+
	548	+ toolboxPanel = new cGridBag().setVertical(true);
	549	+ //toolboxPanel.setName("Toolbox");
	550	+
	551	+ skyboxPanel = new cGridBag().setVertical(true);
	552	+
	553	+ materialPanel = new cGridBag().setVertical(false);
	554	+ //materialPanel.setName("Material");
	555	+
334	556	/JTextPane/
335	557	infoarea = createTextPane();
336	558	doc = infoarea.getStyledDocument();
337	559
338	560	infoarea.setEditable(true);
339	561	SetText();
	562	+
340	563	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
341	564	// infoarea.setOpaque(false);
342	565	// //infoarea.setForeground(textcolor);
343	566	// TEXTAREA infoarea.setLineWrap(true);
344	567	// TEXTAREA infoarea.setWrapStyleWord(true);
345	568	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
346		- infoPanel.setPreferredSize(new Dimension(50, 200));
347		- infoPanel.setName("Info");
	569	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	570	+ //infoPanel.setName("Info");
348	571	//infoPanel.setLayout(new BorderLayout());
349	572	//infoPanel.add(createTextPane());
350	573
..	..	@@ -355,7 +578,14 @@
355	578	mainPanel.setDividerSize(9);
356	579	mainPanel.setDividerLocation(0.5); //1.0);
357	580	mainPanel.setResizeWeight(0.5);
358		-
	581	+
	582	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	583	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	584	+ divider.setDividerSize(15);
	585	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	586	+
	587	+ mainPanel.setUI(new BasicSplitPaneUI());
	588	+
359	589	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
360	590	//mainPanel.setLayout(new GridBagLayout());
361	591	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -586,8 +816,8 @@
586	816	}
587	817	}
588	818
589		-static GraphicsDevice device = GraphicsEnvironment
590		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	819	+//static GraphicsDevice device = GraphicsEnvironment
	820	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
591	821
592	822	Rectangle keeprect;
593	823	cRadio radio;
..	..	@@ -603,13 +833,25 @@
603	833
604	834	boolean maximized;
605	835
	836	+ cButton fullscreenLayout;
	837	+ cButton expandedLayout;
	838	+
606	839	void Minimize()
607	840	{
608	841	frame.setState(Frame.ICONIFIED);
	842	+ frame.validate();
609	843	}
610	844
	845	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	846	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	847	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
611	848	void Maximize()
612	849	{
	850	+ if (CameraPane.FULLSCREEN)
	851	+ {
	852	+ ToggleFullScreen();
	853	+ }
	854	+
613	855	if (maximized)
614	856	{
615	857	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -617,20 +859,38 @@
617	859	else
618	860	{
619	861	keeprect = frame.getBounds();
620		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
621		- Dimension rect2 = frame.getToolkit().getScreenSize();
622		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	862	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	863	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	864	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
623	865	// frame.setState(Frame.MAXIMIZED_BOTH);
	866	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
624	867	}
625	868
626	869	maximized ^= true;
	870	+
	871	+ frame.validate();
627	872	}
	873	+
	874	+ cButton minButton;
	875	+ cButton maxButton;
	876	+ cButton fullButton;
	877	+ cButton collapseButton;
	878	+ cButton maximize3DButton;
628	879
629	880	void ToggleFullScreen()
630	881	{
631		- if (CameraPane.FULLSCREEN)
	882	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	883	+
	884	+ cameraView.ToggleFullScreen();
	885	+
	886	+ if (!CameraPane.FULLSCREEN)
632	887	{
633	888	device.setFullScreenWindow(null);
	889	+ frame.dispose();
	890	+ frame.setUndecorated(false);
	891	+ frame.validate();
	892	+ frame.setVisible(true);
	893	+
634	894	//frame.setVisible(false);
635	895	// frame.removeNotify();
636	896	// frame.setUndecorated(false);
..	..	@@ -640,13 +900,13 @@
640	900	// X frame.getContentPane().remove(/"Center",/bigThree);
641	901	// X framePanel.add(bigThree);
642	902	// X frame.getContentPane().add(/"Center",/framePanel);
643		- framePanel.setDividerLocation(1);
	903	+// framePanel.setDividerLocation(46); // icons are 24x24
644	904
645	905	//frame.setVisible(true);
646		- radio.layout = keepButton;
	906	+// radio.layout = keepButton;
647	907	//theFrame = null;
648	908	keepButton = null;
649		- radio.layout.doClick();
	909	+// radio.layout.doClick();
650	910
651	911	} else
652	912	{
..	..	@@ -655,22 +915,65 @@
655	915	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
656	916	// frame.getToolkit().getScreenSize().height);
657	917	//frame.setVisible(false);
	918	+
	919	+ frame.dispose();
	920	+ frame.setUndecorated(true);
658	921	device.setFullScreenWindow(frame);
	922	+ frame.validate();
	923	+ frame.setVisible(true);
659	924	// frame.removeNotify();
660	925	// frame.setUndecorated(true);
661	926	// frame.addNotify();
662	927	// X frame.getContentPane().remove(/"Center",/framePanel);
663	928	// X framePanel.remove(bigThree);
664	929	// X frame.getContentPane().add(/"Center",/bigThree);
665		- framePanel.setDividerLocation(0);
	930	+// framePanel.setDividerLocation(0);
666	931
667		- radio.layout = twoButton;
668		- radio.layout.doClick();
	932	+// radio.layout = fullscreenLayout;
	933	+// radio.layout.doClick();
669	934	//frame.setVisible(true);
670	935	}
671		-
672		- cameraView.ToggleFullScreen();
	936	+ frame.validate();
	937	+
	938	+ cameraView.requestFocusInWindow();
673	939	}
	940	+
	941	+ void CollapseToolbar()
	942	+ {
	943	+ framePanel.setDividerLocation(0);
	944	+ //frame.validate();
	945	+
	946	+ cameraView.requestFocusInWindow();
	947	+ }
	948	+
	949	+ private Object3D Duplicate(Object3D object)
	950	+ {
	951	+ boolean temp = CameraPane.SWITCH;
	952	+ CameraPane.SWITCH = false;
	953	+
	954	+ if (Grafreed.grafreed.universe.versiontable == null)
	955	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	956	+
	957	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	958	+ // if (copy == client)
	959	+
	960	+ Object3D versions[] = object.versionlist;
	961	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	962	+ object.versionlist = null;
	963	+ object.versiontable = null;
	964	+
	965	+ //byte[] compress = Compress(copy);
	966	+ Object3D compress = (Object3D)Grafreed.clone(object);
	967	+
	968	+ object.versionlist = versions;
	969	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	970	+
	971	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	972	+
	973	+ CameraPane.SWITCH = temp;
	974	+
	975	+ return compress;
	976	+ }
674	977
675	978	private JTextPane createTextPane()
676	979	{
..	..	@@ -793,6 +1096,7 @@
793	1096	{
794	1097	SetupMaterial(materialPanel);
795	1098	}
	1099	+
796	1100	//SetupName();
797	1101	//SetupViews();
798	1102	}
..	..	@@ -802,7 +1106,7 @@
802	1106	// NumberSlider vDivsField;
803	1107	// JCheckBox endcaps;
804	1108	JCheckBox liveCB;
805		- JCheckBox selectCB;
	1109	+ JCheckBox selectableCB;
806	1110	JCheckBox hideCB;
807	1111	JCheckBox link2masterCB;
808	1112	JCheckBox markCB;
..	..	@@ -810,7 +1114,12 @@
810	1114	JCheckBox speedupCB;
811	1115	JCheckBox rewindCB;
812	1116	JCheckBox flipVCB;
	1117	+
	1118	+ cCheckBox toggleTextureCB;
	1119	+ cCheckBox toggleSwitchCB;
	1120	+
813	1121	JComboBox texresMenu;
	1122	+
814	1123	JButton resetButton;
815	1124	JButton stepButton;
816	1125	JButton stepAllButton;
..	..	@@ -819,10 +1128,13 @@
819	1128	JButton fasterButton;
820	1129	JButton remarkButton;
821	1130
	1131	+ cGridBag editPanel;
	1132	+ cGridBag editCommandsPanel;
	1133	+
822	1134	cGridBag namePanel;
823	1135	cGridBag setupPanel;
824	1136	cGridBag setupPanel2;
825		- cGridBag commandsPanel;
	1137	+ cGridBag objectCommandsPanel;
826	1138	cGridBag pushPanel;
827	1139	cGridBag fillPanel;
828	1140
..	..	@@ -993,39 +1305,55 @@
993	1305
994	1306	namePanel = new cGridBag();
995	1307
	1308	+ //if (copy.pinned)
	1309	+ {
	1310	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1311	+ pinButton.setSelected(copy.pinned);
	1312	+ cGridBag t = new cGridBag();
	1313	+ t.preferredWidth = 2;
	1314	+ t.add(pinButton);
	1315	+ namePanel.add(t);
	1316	+
	1317	+ pinButton.addItemListener(this);
	1318	+ }
	1319	+
996	1320	nameField = AddText(namePanel, copy.GetName());
997		- namePanel.add(nameField);
	1321	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
998	1322	oe.ctrlPanel.add(namePanel);
999	1323
1000	1324	oe.ctrlPanel.Return();
1001	1325
1002		- if (!GroupEditor.allparams)
	1326	+ if (!allparams)
1003	1327	return;
1004	1328
1005	1329	setupPanel = new cGridBag().setVertical(false);
1006	1330
1007	1331	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1008	1332	liveCB.setToolTipText("Animate object");
1009		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1010		- selectCB.setToolTipText("Make object selectable");
	1333	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1334	+ markCB.setToolTipText("Set target transform");
	1335	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1336	+ selectableCB.setToolTipText("Make object selectable");
1011	1337	// Return();
	1338	+
1012	1339	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1013	1340	hideCB.setToolTipText("Hide object");
1014		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1015		- markCB.setToolTipText("Set the animation target transform");
	1341	+
	1342	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1016	1343
1017	1344	setupPanel2 = new cGridBag().setVertical(false);
1018	1345
1019	1346	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1020	1347	rewindCB.setToolTipText("Rewind animation");
1021	1348
1022		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1349	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1350	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1024	1351
	1352	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1353	+ link2masterCB.setToolTipText("Attach to support");
	1354	+
1025	1355	if (Globals.ADVANCED)
1026	1356	{
1027		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1028		- link2masterCB.setToolTipText("Attach to support");
1029	1357	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1030	1358	speedupCB.setToolTipText("Option motion capture");
1031	1359	}
..	..	@@ -1035,23 +1363,23 @@
1035	1363	oe.ctrlPanel.add(setupPanel2);
1036	1364	oe.ctrlPanel.Return();
1037	1365
1038		- commandsPanel = new cGridBag().setVertical(false);
	1366	+ objectCommandsPanel = new cGridBag().setVertical(false);
1039	1367
1040		- resetButton = AddButton(commandsPanel, "Reset");
	1368	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1041	1369	resetButton.setToolTipText("Jump to frame zero");
1042		- stepButton = AddButton(commandsPanel, "Step");
	1370	+ stepButton = AddButton(objectCommandsPanel, "Step");
1043	1371	stepButton.setToolTipText("Step one frame");
1044	1372	// resetAllButton = AddButton(oe, "Reset All");
1045	1373	// stepAllButton = AddButton(oe, "Step All");
1046	1374	// Return();
1047		- slowerButton = AddButton(commandsPanel, "Slow");
	1375	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1048	1376	slowerButton.setToolTipText("Decrease animation speed");
1049		- fasterButton = AddButton(commandsPanel, "Fast");
	1377	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1050	1378	fasterButton.setToolTipText("Increase animation speed");
1051		- remarkButton = AddButton(commandsPanel, "Remark");
	1379	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1052	1380	remarkButton.setToolTipText("Set the current transform as the target");
1053	1381
1054		- oe.ctrlPanel.add(commandsPanel);
	1382	+ oe.ctrlPanel.add(objectCommandsPanel);
1055	1383	oe.ctrlPanel.Return();
1056	1384
1057	1385	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1211,6 +1539,7 @@
1211	1539
1212	1540	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1213	1541	{
	1542	+ if (Globals.DEBUG)
1214	1543	System.out.println("CREATE CAMERAS");
1215	1544	cams = new cTemplate();
1216	1545	cams.name = "Cameras";
..	..	@@ -1299,6 +1628,7 @@
1299	1628	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1300	1629	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1301	1630	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1631	+ //XYZPanel.setName("XYZ");
1302	1632
1303	1633	/*
1304	1634	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1335,14 +1665,30 @@
1335	1665
1336	1666	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1337	1667	//tmp.setName("Edit");
	1668	+ objectPanel.add(toolboxPanel);
	1669	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1670	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1671	+
1338	1672	objectPanel.add(materialPanel);
	1673	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1674	+ objectPanel.setToolTipTextAt(1, "Material");
	1675	+
	1676	+ objectPanel.add(skyboxPanel);
	1677	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1678	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1679	+
1339	1680	// JPanel north = new JPanel(new BorderLayout());
1340	1681	// north.setName("Edit");
1341	1682	// north.add(ctrlPanel, BorderLayout.NORTH);
1342	1683	// objectPanel.add(north);
1343		- objectPanel.add(ctrlPanel);
1344		- objectPanel.add(infoPanel);
1345		-
	1684	+ objectPanel.add(editPanel);
	1685	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1686	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1687	+
	1688	+ objectPanel.add(XYZPanel);
	1689	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1690	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1691	+
1346	1692	/*
1347	1693	aConstraints.gridx = 0;
1348	1694	aConstraints.gridwidth = 1;
..	..	@@ -1350,7 +1696,7 @@
1350	1696	aConstraints.gridy += 1;
1351	1697	aConstraints.gridwidth = 1;
1352	1698	mainPanel.add(objectPanel, aConstraints);
1353		- */
	1699	+ */
1354	1700
1355	1701	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1356	1702	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1362,14 +1708,12 @@
1362	1708	scrollpane.addMouseWheelListener(this); // Default not fast enough
1363	1709
1364	1710	/JTabbedPane/ scenePanel = new cGridBag();
1365		- scenePanel.preferredWidth = 6;
	1711	+ scenePanel.preferredWidth = 5;
1366	1712
1367	1713	JTabbedPane tabbedPane = new JTabbedPane();
1368	1714	tabbedPane.add(scrollpane);
1369	1715
1370		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1371		-
1372		- optionsPanel = new cGridBag().setVertical(true);
	1716	+ optionsPanel = new cGridBag().setVertical(false);
1373	1717
1374	1718	optionsPanel.setName("Options");
1375	1719
..	..	@@ -1377,8 +1721,15 @@
1377	1721
1378	1722	tabbedPane.add(optionsPanel);
1379	1723
	1724	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1725	+
1380	1726	scenePanel.add(tabbedPane);
1381	1727
	1728	+ //if (Globals.ADVANCED)
	1729	+// tabbedPane.add(infoPanel);
	1730	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1731	+// tabbedPane.setToolTipTextAt(3, "Information");
	1732	+
1382	1733	/*
1383	1734	cTree jTree = new cTree(null);
1384	1735	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1440,7 +1791,7 @@
1440	1791	bigThree = new cGridBag();
1441	1792	bigThree.addComponent(scenePanel);
1442	1793	bigThree.addComponent(centralPanel);
1443		- bigThree.addComponent(XYZPanel);
	1794	+ //bigThree.addComponent(XYZPanel);
1444	1795
1445	1796	// // SIDE EFFECT!!!
1446	1797	// aConstraints.gridx = 0;
..	..	@@ -1449,16 +1800,33 @@
1449	1800	// aConstraints.gridheight = 1;
1450	1801
1451	1802	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1452		- framePanel.setContinuousLayout(true);
1453		- framePanel.setOneTouchExpandable(true);
1454		- framePanel.setDividerLocation(0.8);
	1803	+
	1804	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1805	+ new java.beans.PropertyChangeListener()
	1806	+ {
	1807	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1808	+ {
	1809	+ if ((Integer)pce.getOldValue() == 1)
	1810	+ {
	1811	+ if (radio.layout != expandedLayout)
	1812	+ {
	1813	+ radio.layout = expandedLayout;
	1814	+ radio.layout.doClick();
	1815	+ }
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ framePanel.setContinuousLayout(false);
	1821	+ framePanel.setOneTouchExpandable(false);
	1822	+ //.setDividerLocation(0.8);
1455	1823	//framePanel.setDividerSize(15);
1456	1824	//framePanel.setResizeWeight(0.15);
1457	1825	framePanel.setName("Frame");
1458	1826
1459	1827	frame.getContentPane().setLayout(new BorderLayout());
1460	1828	/**/
1461		- JTabbedPane worldPane = new JTabbedPane();
	1829	+ //JTabbedPane worldPane = new JTabbedPane();
1462	1830	//worldPane.add(bigPanel);
1463	1831	//worldPane.add(worldPanel);
1464	1832	/**/
..	..	@@ -1469,16 +1837,18 @@
1469	1837	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1470	1838
1471	1839	frame.setSize(1280, 860);
1472		- frame.setVisible(true);
1473		-
	1840	+
1474	1841	cameraView.requestFocusInWindow();
1475	1842
1476	1843	gridPanel.setDividerLocation(1.0);
	1844	+
	1845	+ frame.validate();
	1846	+
	1847	+ frame.setVisible(true);
1477	1848
1478	1849	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1479	1850	frame.addWindowListener(new WindowAdapter()
1480	1851	{
1481		-
1482	1852	public void windowClosing(WindowEvent e)
1483	1853	{
1484	1854	Close();
..	..	@@ -1501,12 +1871,418 @@
1501	1871	ctrlPanel.removeAll();
1502	1872	}
1503	1873
1504		- void SetupMaterial(cGridBag panel)
	1874	+ void SetupMaterial(cGridBag materialpanel)
1505	1875	{
1506		- /*
	1876	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1877	+
	1878	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1879	+ skin.setToolTipText("Skin");
	1880	+ skin.addMouseListener(new MouseAdapter()
	1881	+ {
	1882	+ public void mouseClicked(MouseEvent e)
	1883	+ {
	1884	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1885	+ cMaterial material = object.material;
	1886	+
	1887	+ // Skin
	1888	+ colorField.setFloat(material.color);
	1889	+ saturationField.setFloat(material.modulation);
	1890	+ subsurfaceField.setFloat(material.subsurface);
	1891	+ selfshadowField.setFloat(material.diffuseness);
	1892	+ diffusenessField.setFloat(material.factor);
	1893	+ shininessField.setFloat(material.shininess);
	1894	+ shadowbiasField.setFloat(material.shadowbias);
	1895	+ diffuseField.setFloat(material.diffuse);
	1896	+ specularField.setFloat(material.specular);
	1897	+
	1898	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1899	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1900	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1901	+
	1902	+ materialtouched = true;
	1903	+ applySelf();
	1904	+ }
	1905	+ });
	1906	+ presetpanel.add(skin);
	1907	+
	1908	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1909	+ lambert.setToolTipText("Diffuse");
	1910	+ lambert.addMouseListener(new MouseAdapter()
	1911	+ {
	1912	+ public void mouseClicked(MouseEvent e)
	1913	+ {
	1914	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1915	+ cMaterial material = object.material;
	1916	+
	1917	+ diffusenessField.setFloat(material.factor);
	1918	+ selfshadowField.setFloat(material.diffuseness);
	1919	+
	1920	+ materialtouched = true;
	1921	+ applySelf();
	1922	+ }
	1923	+ });
	1924	+ presetpanel.add(lambert);
	1925	+
	1926	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1927	+ diffuse2.setToolTipText("Diffuse2");
	1928	+ diffuse2.addMouseListener(new MouseAdapter()
	1929	+ {
	1930	+ public void mouseClicked(MouseEvent e)
	1931	+ {
	1932	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1933	+ cMaterial material = object.material;
	1934	+
	1935	+ diffusenessField.setFloat(material.factor);
	1936	+ selfshadowField.setFloat(material.diffuseness);
	1937	+
	1938	+ materialtouched = true;
	1939	+ applySelf();
	1940	+ }
	1941	+ });
	1942	+ presetpanel.add(diffuse2);
	1943	+
	1944	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1945	+ diffusemoon.setToolTipText("Moon");
	1946	+ diffusemoon.addMouseListener(new MouseAdapter()
	1947	+ {
	1948	+ public void mouseClicked(MouseEvent e)
	1949	+ {
	1950	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1951	+ cMaterial material = object.material;
	1952	+
	1953	+ diffusenessField.setFloat(material.factor);
	1954	+ selfshadowField.setFloat(material.diffuseness);
	1955	+
	1956	+ materialtouched = true;
	1957	+ applySelf();
	1958	+ }
	1959	+ });
	1960	+ presetpanel.add(diffusemoon);
	1961	+
	1962	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1963	+ diffusemoon2.setToolTipText("Moon2");
	1964	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1965	+ {
	1966	+ public void mouseClicked(MouseEvent e)
	1967	+ {
	1968	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1969	+ cMaterial material = object.material;
	1970	+
	1971	+ diffusenessField.setFloat(material.factor);
	1972	+ selfshadowField.setFloat(material.diffuseness);
	1973	+
	1974	+ materialtouched = true;
	1975	+ applySelf();
	1976	+ }
	1977	+ });
	1978	+ presetpanel.add(diffusemoon2);
	1979	+
	1980	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1981	+ diffusemoon3.setToolTipText("Moon3");
	1982	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1983	+ {
	1984	+ public void mouseClicked(MouseEvent e)
	1985	+ {
	1986	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1987	+ cMaterial material = object.material;
	1988	+
	1989	+ diffusenessField.setFloat(material.factor);
	1990	+ selfshadowField.setFloat(material.diffuseness);
	1991	+
	1992	+ materialtouched = true;
	1993	+ applySelf();
	1994	+ }
	1995	+ });
	1996	+ presetpanel.add(diffusemoon3);
	1997	+
	1998	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1999	+ diffusesheen.setToolTipText("Sheen");
	2000	+ diffusesheen.addMouseListener(new MouseAdapter()
	2001	+ {
	2002	+ public void mouseClicked(MouseEvent e)
	2003	+ {
	2004	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2005	+ cMaterial material = object.material;
	2006	+
	2007	+ sheenField.setFloat(material.sheen);
	2008	+
	2009	+ materialtouched = true;
	2010	+ applySelf();
	2011	+ }
	2012	+ });
	2013	+ presetpanel.add(diffusesheen);
	2014	+
	2015	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2016	+ rough.setToolTipText("Rough metal");
	2017	+ rough.addMouseListener(new MouseAdapter()
	2018	+ {
	2019	+ public void mouseClicked(MouseEvent e)
	2020	+ {
	2021	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2022	+ cMaterial material = object.material;
	2023	+
	2024	+ shininessField.setFloat(material.shininess);
	2025	+ velvetField.setFloat(material.velvet);
	2026	+
	2027	+ materialtouched = true;
	2028	+ applySelf();
	2029	+ }
	2030	+ });
	2031	+ presetpanel.add(rough);
	2032	+
	2033	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2034	+ rough2.setToolTipText("Medium metal");
	2035	+ rough2.addMouseListener(new MouseAdapter()
	2036	+ {
	2037	+ public void mouseClicked(MouseEvent e)
	2038	+ {
	2039	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2040	+ cMaterial material = object.material;
	2041	+
	2042	+ shininessField.setFloat(material.shininess);
	2043	+ lightareaField.setFloat(material.lightarea);
	2044	+
	2045	+ materialtouched = true;
	2046	+ applySelf();
	2047	+ }
	2048	+ });
	2049	+ presetpanel.add(rough2);
	2050	+
	2051	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2052	+ shini0.setToolTipText("Shiny");
	2053	+ shini0.addMouseListener(new MouseAdapter()
	2054	+ {
	2055	+ public void mouseClicked(MouseEvent e)
	2056	+ {
	2057	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2058	+ cMaterial material = object.material;
	2059	+
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ lightareaField.setFloat(material.lightarea);
	2062	+
	2063	+ materialtouched = true;
	2064	+ applySelf();
	2065	+ }
	2066	+ });
	2067	+ presetpanel.add(shini0);
	2068	+
	2069	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2070	+ shini1.setToolTipText("Shiny2");
	2071	+ shini1.addMouseListener(new MouseAdapter()
	2072	+ {
	2073	+ public void mouseClicked(MouseEvent e)
	2074	+ {
	2075	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2076	+ cMaterial material = object.material;
	2077	+
	2078	+ shininessField.setFloat(material.shininess);
	2079	+ lightareaField.setFloat(material.lightarea);
	2080	+
	2081	+ materialtouched = true;
	2082	+ applySelf();
	2083	+ }
	2084	+ });
	2085	+ presetpanel.add(shini1);
	2086	+
	2087	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2088	+ shini2.setToolTipText("Shiny3");
	2089	+ shini2.addMouseListener(new MouseAdapter()
	2090	+ {
	2091	+ public void mouseClicked(MouseEvent e)
	2092	+ {
	2093	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2094	+ cMaterial material = object.material;
	2095	+
	2096	+ shininessField.setFloat(material.shininess);
	2097	+ lightareaField.setFloat(material.lightarea);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(shini2);
	2104	+
	2105	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2106	+ aniso.setToolTipText("AnisoU");
	2107	+ aniso.addMouseListener(new MouseAdapter()
	2108	+ {
	2109	+ public void mouseClicked(MouseEvent e)
	2110	+ {
	2111	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2112	+ cMaterial material = object.material;
	2113	+
	2114	+ anisoField.setFloat(material.aniso);
	2115	+ anisoVField.setFloat(material.anisoV);
	2116	+
	2117	+ materialtouched = true;
	2118	+ applySelf();
	2119	+ }
	2120	+ });
	2121	+ presetpanel.add(aniso);
	2122	+
	2123	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2124	+ aniso2.setToolTipText("AnisoV");
	2125	+ aniso2.addMouseListener(new MouseAdapter()
	2126	+ {
	2127	+ public void mouseClicked(MouseEvent e)
	2128	+ {
	2129	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2130	+ cMaterial material = object.material;
	2131	+
	2132	+ anisoField.setFloat(material.aniso);
	2133	+ anisoVField.setFloat(material.anisoV);
	2134	+
	2135	+ materialtouched = true;
	2136	+ applySelf();
	2137	+ }
	2138	+ });
	2139	+ presetpanel.add(aniso2);
	2140	+
	2141	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2142	+ aniso3.setToolTipText("AnisoUV");
	2143	+ aniso3.addMouseListener(new MouseAdapter()
	2144	+ {
	2145	+ public void mouseClicked(MouseEvent e)
	2146	+ {
	2147	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2148	+ cMaterial material = object.material;
	2149	+
	2150	+ anisoField.setFloat(material.aniso);
	2151	+ anisoVField.setFloat(material.anisoV);
	2152	+
	2153	+ materialtouched = true;
	2154	+ applySelf();
	2155	+ }
	2156	+ });
	2157	+ presetpanel.add(aniso3);
	2158	+
	2159	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2160	+ velvet0.setToolTipText("Velvet");
	2161	+ velvet0.addMouseListener(new MouseAdapter()
	2162	+ {
	2163	+ public void mouseClicked(MouseEvent e)
	2164	+ {
	2165	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2166	+ cMaterial material = object.material;
	2167	+
	2168	+ diffusenessField.setFloat(material.factor);
	2169	+ selfshadowField.setFloat(material.diffuseness);
	2170	+ sheenField.setFloat(material.sheen);
	2171	+ shininessField.setFloat(material.shininess);
	2172	+ velvetField.setFloat(material.velvet);
	2173	+ shiftField.setFloat(material.shift);
	2174	+
	2175	+ materialtouched = true;
	2176	+ applySelf();
	2177	+ }
	2178	+ });
	2179	+ presetpanel.add(velvet0);
	2180	+
	2181	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2182	+ bump0.setToolTipText("Bump texture");
	2183	+ bump0.addMouseListener(new MouseAdapter()
	2184	+ {
	2185	+ public void mouseClicked(MouseEvent e)
	2186	+ {
	2187	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2188	+ cMaterial material = object.material;
	2189	+
	2190	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2191	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2192	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(bump0);
	2199	+
	2200	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2201	+ borderShader.setToolTipText("Border fade");
	2202	+ borderShader.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ borderfadeField.setFloat(0.5);
	2207	+ opacityField.setFloat(0.75);
	2208	+
	2209	+ materialtouched = true;
	2210	+ applySelf();
	2211	+ }
	2212	+ });
	2213	+ presetpanel.add(borderShader);
	2214	+
	2215	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2216	+ halo.setToolTipText("Halo");
	2217	+ halo.addMouseListener(new MouseAdapter()
	2218	+ {
	2219	+ public void mouseClicked(MouseEvent e)
	2220	+ {
	2221	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2222	+ cMaterial material = object.material;
	2223	+
	2224	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2225	+
	2226	+ materialtouched = true;
	2227	+ applySelf();
	2228	+ }
	2229	+ });
	2230	+ presetpanel.add(halo);
	2231	+
	2232	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2233	+ candle.setToolTipText("Candle");
	2234	+ candle.addMouseListener(new MouseAdapter()
	2235	+ {
	2236	+ public void mouseClicked(MouseEvent e)
	2237	+ {
	2238	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2239	+ cMaterial material = object.material;
	2240	+
	2241	+ subsurfaceField.setFloat(material.subsurface);
	2242	+ shadowbiasField.setFloat(material.shadowbias);
	2243	+ ambientField.setFloat(material.ambient);
	2244	+ specularField.setFloat(material.specular);
	2245	+ lightareaField.setFloat(material.lightarea);
	2246	+ shininessField.setFloat(material.shininess);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(candle);
	2253	+
	2254	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2255	+ shadowShader.setToolTipText("Shadow");
	2256	+ shadowShader.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ diffuseField.setFloat(0.001);
	2261	+ ambientField.setFloat(0.001);
	2262	+ cameraField.setFloat(0.001);
	2263	+ specularField.setFloat(0.001);
	2264	+ fakedepthField.setFloat(0.001);
	2265	+ opacityField.setFloat(0.6);
	2266	+
	2267	+ materialtouched = true;
	2268	+ applySelf();
	2269	+ }
	2270	+ });
	2271	+ presetpanel.add(shadowShader);
	2272	+
	2273	+ cGridBag panel = new cGridBag().setVertical(true);
	2274	+
	2275	+ presetpanel.preferredWidth = 1;
	2276	+
	2277	+ materialpanel.add(presetpanel);
	2278	+ materialpanel.add(panel);
	2279	+
	2280	+ panel.preferredWidth = 8;
	2281	+
	2282	+ /*
1507	2283	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1508	2284	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- */
	2285	+ */
1510	2286
1511	2287	cGridBag editBar = new cGridBag().setVertical(false);
1512	2288
..	..	@@ -1540,45 +2316,61 @@
1540	2316	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1541	2317
1542	2318	cGridBag colorSection = new cGridBag().setVertical(true);
	2319	+
	2320	+ cGridBag huepanel = new cGridBag();
	2321	+ cGridBag huelabel = new cGridBag();
	2322	+ cLabel hue = GetLabel("icons/hue.png", false);
	2323	+ hue.fit = true;
	2324	+
	2325	+ hue.addMouseListener(new MouseAdapter()
	2326	+ {
	2327	+ public void mousePressed(MouseEvent e)
	2328	+ {
	2329	+ int x = e.getX();
	2330	+
	2331	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2332	+ }
	2333	+ });
	2334	+
	2335	+ huelabel.add(hue);
	2336	+ huelabel.preferredWidth = 20;
	2337	+ huepanel.add(new cGridBag()); // Label
	2338	+ huepanel.add(huelabel); // Field/slider
	2339	+
	2340	+ huepanel.preferredHeight = 7;
	2341	+
	2342	+ colorSection.add(huepanel);
1543	2343
1544	2344	cGridBag color = new cGridBag();
1545		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1546		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2345	+
	2346	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2347	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2348	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2349	+
1548	2350	//colorField.preferredWidth = 200;
1549	2351	colorSection.add(color);
1550	2352
1551	2353	cGridBag modulation = new cGridBag();
1552	2354	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1553	2355	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2356	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1555	2357	colorSection.add(modulation);
1556	2358
	2359	+ cGridBag opacity = new cGridBag();
	2360	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2361	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2362	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2363	+ colorSection.add(opacity);
	2364	+
	2365	+ colorSection.add(GetSeparator());
	2366	+
1557	2367	cGridBag texture = new cGridBag();
1558	2368	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1559	2369	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1560	2370	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1561	2371	colorSection.add(texture);
1562	2372
1563		- cGridBag anisoU = new cGridBag();
1564		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1565		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1567		- colorSection.add(anisoU);
1568		-
1569		- cGridBag anisoV = new cGridBag();
1570		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1571		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573		- colorSection.add(anisoV);
1574		-
1575		- cGridBag shadowbias = new cGridBag();
1576		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1577		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1579		- colorSection.add(shadowbias);
1580		-
1581		- panel.add(new JSeparator());
	2373	+ panel.add(GetSeparator());
1582	2374
1583	2375	panel.add(colorSection);
1584	2376
..	..	@@ -1628,7 +2420,13 @@
1628	2420	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1629	2421	diffuseSection.add(fakedepth);
1630	2422
1631		- panel.add(new JSeparator());
	2423	+ cGridBag shadowbias = new cGridBag();
	2424	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2425	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2426	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2427	+ diffuseSection.add(shadowbias);
	2428	+
	2429	+ panel.add(GetSeparator());
1632	2430
1633	2431	panel.add(diffuseSection);
1634	2432
..	..	@@ -1678,42 +2476,48 @@
1678	2476	// aConstraints.gridy += 1;
1679	2477	// aConstraints.gridwidth = 1;
1680	2478
	2479	+ cGridBag anisoU = new cGridBag();
	2480	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2481	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2482	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2483	+ specularSection.add(anisoU);
1681	2484
1682		- panel.add(new JSeparator());
	2485	+ cGridBag anisoV = new cGridBag();
	2486	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2487	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2488	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2489	+ specularSection.add(anisoV);
	2490	+
	2491	+
	2492	+ panel.add(GetSeparator());
1683	2493
1684	2494	panel.add(specularSection);
1685	2495
1686	2496	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1687	2497
1688		- cGridBag globalSection = new cGridBag().setVertical(true);
	2498	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1689	2499
1690	2500	cGridBag camera = new cGridBag();
1691	2501	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1692	2502	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693	2503	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1694		- globalSection.add(camera);
	2504	+ colorSection.add(camera);
1695	2505
1696	2506	cGridBag ambient = new cGridBag();
1697	2507	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1698	2508	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699	2509	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1700		- globalSection.add(ambient);
	2510	+ colorSection.add(ambient);
1701	2511
1702	2512	cGridBag backlit = new cGridBag();
1703	2513	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1704	2514	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	2515	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(backlit);
	2516	+ colorSection.add(backlit);
1707	2517
1708		- cGridBag opacity = new cGridBag();
1709		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1710		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1712		- globalSection.add(opacity);
1713		-
1714		- panel.add(new JSeparator());
	2518	+ //panel.add(new JSeparator());
1715	2519
1716		- panel.add(globalSection);
	2520	+ //panel.add(globalSection);
1717	2521
1718	2522	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1719	2523
..	..	@@ -1755,7 +2559,7 @@
1755	2559	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1756	2560	textureSection.add(opacityPower);
1757	2561
1758		- panel.add(new JSeparator());
	2562	+ panel.add(GetSeparator());
1759	2563
1760	2564	panel.add(textureSection);
1761	2565
..	..	@@ -1820,8 +2624,9 @@
1820	2624	// 3D models
1821	2625	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1822	2626	{
1823		- lastConverter = new com.jmex.model.converters.MaxToJme();
1824		- LoadFile(filename, lastConverter);
	2627	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2628	+ //LoadFile(filename, lastConverter);
	2629	+ LoadObjFile(filename); // New 3ds loader
1825	2630	continue;
1826	2631	}
1827	2632	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2547,6 +3352,7 @@
2547	3352	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2548	3353	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2549	3354	}
	3355	+
2550	3356	//cJME.count++;
2551	3357	//cJME.count %= 12;
2552	3358	if (gc)
..	..	@@ -2730,6 +3536,7 @@
2730	3536	}
2731	3537	}
2732	3538	}
	3539	+
2733	3540	cFileSystemPane FSPane;
2734	3541
2735	3542	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2739,7 +3546,7 @@
2739	3546
2740	3547	freezematerial = true;
2741	3548	colorField.setFloat(mat.color);
2742		- modulationField.setFloat(mat.modulation);
	3549	+ saturationField.setFloat(mat.modulation);
2743	3550	metalnessField.setFloat(mat.metalness);
2744	3551	diffuseField.setFloat(mat.diffuse);
2745	3552	specularField.setFloat(mat.specular);
..	..	@@ -2783,11 +3590,14 @@
2783	3590	}
2784	3591	}
2785	3592	}
	3593	+
2786	3594	freezematerial = false;
2787	3595	}
2788	3596
2789	3597	void SetMaterial(Object3D object)
2790	3598	{
	3599	+ latestObject = object;
	3600	+
2791	3601	cMaterial mat = object.material;
2792	3602
2793	3603	if (mat == null)
..	..	@@ -2798,32 +3608,8 @@
2798	3608
2799	3609	if (multiplyToggle != null)
2800	3610	multiplyToggle.setSelected(mat.multiply);
2801		-
2802		- assert (object.projectedVertices != null);
2803		-
2804		- if (object.projectedVertices.length <= 2)
2805		- {
2806		- // Side effect...
2807		- Object3D.cVector2[] keep = object.projectedVertices;
2808		- object.projectedVertices = new Object3D.cVector2[3];
2809		- for (int i = 0; i < 3; i++)
2810		- {
2811		- if (i < keep.length)
2812		- {
2813		- object.projectedVertices[i] = keep[i];
2814		- } else
2815		- {
2816		- object.projectedVertices[i] = new Object3D.cVector2();
2817		- }
2818		- /*
2819		- if(keep.length == 0)
2820		- object.projectedVertices[0] = new Object3D.cVector2();
2821		- else
2822		- object.projectedVertices[0] = keep[0];
2823		- object.projectedVertices[1] = new Object3D.cVector2();
2824		- */
2825		- }
2826		- }
	3611	+
	3612	+ AllocProjectedVertices(object);
2827	3613
2828	3614	SetMaterial(mat, object.projectedVertices);
2829	3615	}
..	..	@@ -2899,12 +3685,17 @@
2899	3685	// }
2900	3686
2901	3687	/**/
2902		- if (deselect)
	3688	+ if (deselect \|\| child == null)
2903	3689	{
2904	3690	//group.deselectAll();
2905	3691	//freeze = true;
2906	3692	GetTree().clearSelection();
2907	3693	//freeze = false;
	3694	+
	3695	+ if (child == null)
	3696	+ {
	3697	+ return;
	3698	+ }
2908	3699	}
2909	3700
2910	3701	//group.addSelectee(child);
..	..	@@ -2938,6 +3729,17 @@
2938	3729	public void itemStateChanged(ItemEvent event)
2939	3730	{
2940	3731	// System.out.println("Propagate = " + propagate);
	3732	+ if (event.getSource() == pinButton)
	3733	+ {
	3734	+ copy.pinned ^= true;
	3735	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3736	+ {
	3737	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3738	+ copy.CloseUI();
	3739	+ //copy.editWindow.refreshContents();
	3740	+ }
	3741	+ }
	3742	+ else
2941	3743	if (event.getSource() == propagateToggle)
2942	3744	{
2943	3745	propagate ^= true;
..	..	@@ -2973,7 +3775,7 @@
2973	3775	cameraView.ToggleDL();
2974	3776	cameraView.repaint();
2975	3777	return;
2976		- } else if (event.getSource() == toggleTextureItem)
	3778	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2977	3779	{
2978	3780	cameraView.ToggleTexture();
2979	3781	// june 2013 copy.HardTouch();
..	..	@@ -3012,7 +3814,7 @@
3012	3814	frame.validate();
3013	3815
3014	3816	return;
3015		- } else if (event.getSource() == toggleSwitchItem)
	3817	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3016	3818	{
3017	3819	cameraView.ToggleSwitch();
3018	3820	cameraView.repaint();
..	..	@@ -3042,8 +3844,9 @@
3042	3844	} else if (event.getSource() == liveCB)
3043	3845	{
3044	3846	copy.live ^= true;
	3847	+ objEditor.refreshContents(true); // To show item colors
3045	3848	return;
3046		- } else if (event.getSource() == selectCB)
	3849	+ } else if (event.getSource() == selectableCB)
3047	3850	{
3048	3851	copy.dontselect ^= true;
3049	3852	return;
..	..	@@ -3051,7 +3854,7 @@
3051	3854	{
3052	3855	copy.hide ^= true;
3053	3856	copy.Touch(); // display list issue
3054		- objEditor.refreshContents();
	3857	+ objEditor.refreshContents(true); // To show item colors
3055	3858	return;
3056	3859	} else if (event.getSource() == link2masterCB)
3057	3860	{
..	..	@@ -3116,7 +3919,7 @@
3116	3919	//System.out.println("ObjEditor " + event);
3117	3920	applySelf0(true);
3118	3921	//parent.applySelf();
3119		- objEditor.refreshContents();
	3922	+ // conflicts with requestFocus objEditor.refreshContents();
3120	3923	} else if (source == resetButton)
3121	3924	{
3122	3925	CameraPane.fullreset = true;
..	..	@@ -3228,9 +4031,9 @@
3228	4031	{
3229	4032	Close();
3230	4033	//return true;
3231		- } else if (source == loadItem)
	4034	+ } else if (source == openItem)
3232	4035	{
3233		- load();
	4036	+ Open();
3234	4037	//return true;
3235	4038	} else if (source == newItem)
3236	4039	{
..	..	@@ -3255,6 +4058,10 @@
3255	4058	{
3256	4059	generatePOV();
3257	4060	//return true;
	4061	+ } else if (event.getSource() == archiveItem)
	4062	+ {
	4063	+ cTools.Archive(frame);
	4064	+ return;
3258	4065	} else if (source == zBufferItem)
3259	4066	{
3260	4067	try
..	..	@@ -3303,11 +4110,12 @@
3303	4110
3304	4111	static public byte[] Compress(Object3D o)
3305	4112	{
	4113	+ // Slower to actually compress.
3306	4114	try
3307	4115	{
3308	4116	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3309		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3310		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4117	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4118	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3311	4119
3312	4120	Object3D parent = o.parent;
3313	4121	o.parent = null;
..	..	@@ -3318,10 +4126,14 @@
3318	4126
3319	4127	out.flush();
3320	4128
3321		- zstream.close();
	4129	+ baos //zstream
	4130	+ .close();
3322	4131	out.close();
3323	4132
3324		- return baos.toByteArray();
	4133	+ byte[] bytes = baos.toByteArray();
	4134	+
	4135	+ System.out.println("save #bytes = " + bytes.length);
	4136	+ return bytes;
3325	4137	} catch (Exception e)
3326	4138	{
3327	4139	System.err.println(e);
..	..	@@ -3331,13 +4143,16 @@
3331	4143
3332	4144	static public Object Uncompress(byte[] bytes)
3333	4145	{
3334		- System.out.println("#bytes = " + bytes.length);
	4146	+ System.out.println("restore #bytes = " + bytes.length);
3335	4147	try
3336	4148	{
3337	4149	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3338		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3339		- ObjectInputStream in = new ObjectInputStream(istream);
	4150	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4151	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3340	4152	Object obj = in.readObject();
	4153	+
	4154	+ bais //istream
	4155	+ .close();
3341	4156	in.close();
3342	4157
3343	4158	return obj;
..	..	@@ -3392,37 +4207,97 @@
3392	4207	return null;
3393	4208	}
3394	4209
3395		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3396	4210
3397	4211	public void Save()
3398	4212	{
3399		- cRadio tab = GetCurrentTab();
	4213	+ //Save(true);
	4214	+ Replace();
	4215	+ SetVersionStates();
	4216	+ }
	4217	+
	4218	+ private boolean Equal(byte[] compress, byte[] name)
	4219	+ {
	4220	+ if (compress.length != name.length)
	4221	+ {
	4222	+ return false;
	4223	+ }
3400	4224
3401		- boolean temp = CameraPane.SWITCH;
3402		- CameraPane.SWITCH = false;
	4225	+ for (int i=compress.length; --i>=0;)
	4226	+ {
	4227	+ if (compress[i] != name[i])
	4228	+ return false;
	4229	+ }
3403	4230
3404		- copy.ExtractBigData(hashtable);
	4231	+ return true;
	4232	+ }
	4233	+
	4234	+ void DeleteVersion()
	4235	+ {
	4236	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4237	+ {
	4238	+ copy.versionlist[i] = copy.versionlist[i+1];
	4239	+ }
	4240	+
	4241	+ if (copy.versionlist[copy.versionindex] == null)
	4242	+ copy.versionindex -= 1;
	4243	+
	4244	+ if (copy.versionindex != -1)
	4245	+ CopyChanged();
	4246	+
	4247	+ SetVersionStates();
	4248	+ }
	4249	+
	4250	+ public boolean Save(boolean user)
	4251	+ {
	4252	+ System.err.println("Save");
	4253	+ Replace();
	4254	+
	4255	+ //cRadio tab = GetCurrentTab();
	4256	+
	4257	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4258	+
	4259	+ boolean thesame = false;
	4260	+
	4261	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4262	+// {
	4263	+// thesame = true;
	4264	+// }
3405	4265
3406	4266	//EditorFrame.m_MainFrame.requestFocusInWindow();
3407		- tab.graphs[tab.undoindex++] = Compress(copy);
3408		-
3409		- copy.RestoreBigData(hashtable);
3410		-
3411		- CameraPane.SWITCH = temp;
3412		-
3413		- //assert(hashtable.isEmpty());
3414		-
3415		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4267	+ if (!thesame)
3416	4268	{
3417		- tab.graphs[i] = null;
	4269	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4270	+ {
	4271	+ copy.versionlist[i] = copy.versionlist[i-1];
	4272	+ }
	4273	+
	4274	+ //tab.user[tab.versionindex] = user;
	4275	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4276	+
	4277	+ copy.versionlist[++copy.versionindex] = compress;
	4278	+
	4279	+ // if (increment)
	4280	+ // tab.versionindex++;
3418	4281	}
3419	4282
	4283	+ //copy.RestoreBigData(versiontable);
	4284	+
	4285	+ //assert(hashtable.isEmpty());
	4286	+
	4287	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4288	+// {
	4289	+// //tab.user[i] = false;
	4290	+// copy.versionlist[i] = null;
	4291	+// }
	4292	+
	4293	+ SetVersionStates();
	4294	+
3420	4295	// test save
3421	4296	if (false)
3422	4297	{
3423	4298	try
3424	4299	{
3425		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4300	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3426	4301	ObjectOutputStream p = new ObjectOutputStream(ostream);
3427	4302
3428	4303	p.writeObject(copy);
..	..	@@ -3435,26 +4310,68 @@
3435	4310	e.printStackTrace();
3436	4311	}
3437	4312	}
	4313	+
	4314	+ return !thesame;
	4315	+ }
	4316	+
	4317	+ boolean flashIt = true;
	4318	+
	4319	+ void RefreshSelection()
	4320	+ {
	4321	+ Object3D selection = new Object3D();
	4322	+
	4323	+ for (int i = 0; i < copy.selection.size(); i++)
	4324	+ {
	4325	+ Object3D elem = copy.selection.elementAt(i);
	4326	+
	4327	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4328	+
	4329	+ if (obj == null)
	4330	+ {
	4331	+ copy.selection.remove(i--);
	4332	+ }
	4333	+ else
	4334	+ {
	4335	+ selection.add(obj);
	4336	+ copy.selection.setElementAt(obj, i);
	4337	+ }
	4338	+ }
	4339	+
	4340	+ flashIt = false;
	4341	+ GetTree().clearSelection();
	4342	+ for (int i = 0; i < selection.size(); i++)
	4343	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4344	+ flashIt = true;
	4345	+
	4346	+ //refreshContents(false);
3438	4347	}
3439	4348
3440		- void CopyChanged(Object3D obj)
	4349	+ void CopyChanged()
3441	4350	{
	4351	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4352	+
	4353	+ SetVersionStates();
	4354	+
3442	4355	boolean temp = CameraPane.SWITCH;
3443	4356	CameraPane.SWITCH = false;
3444	4357
3445		- copy.ExtractBigData(hashtable);
	4358	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3446	4359
3447	4360	copy.clear();
3448	4361
	4362	+ copy.skyboxname = obj.skyboxname;
	4363	+ copy.skyboxext = obj.skyboxext;
	4364	+
3449	4365	for (int i=0; i<obj.Size(); i++)
3450	4366	{
3451	4367	copy.add(obj.get(i));
3452	4368	}
3453	4369
3454		- copy.RestoreBigData(hashtable);
	4370	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3455	4371
3456	4372	CameraPane.SWITCH = temp;
3457	4373
	4374	+ RefreshSelection();
3458	4375	//assert(hashtable.isEmpty());
3459	4376
3460	4377	copy.Touch();
..	..	@@ -3475,43 +4392,144 @@
3475	4392	}
3476	4393	}
3477	4394
3478		- refreshContents();
	4395	+ refreshContents(true);
3479	4396	}
3480	4397
3481		- public void Undo()
3482		- {
3483		- cRadio tab = GetCurrentTab();
	4398	+ cButton previousVersionButton;
	4399	+ cButton restoreButton;
	4400	+ cButton replaceButton;
	4401	+ cButton nextVersionButton;
	4402	+ cButton saveVersionButton;
	4403	+ cButton deleteVersionButton;
3484	4404
3485		- if (tab.undoindex == 0)
	4405	+ boolean muteSlider;
	4406	+
	4407	+ int VersionCount()
	4408	+ {
	4409	+ int count = 0;
	4410	+
	4411	+ for (int i = copy.versionlist.length; --i >= 0;)
	4412	+ {
	4413	+ if (copy.versionlist[i] != null)
	4414	+ count++;
	4415	+ }
	4416	+
	4417	+ return count;
	4418	+ }
	4419	+
	4420	+ void SetVersionStates()
	4421	+ {
	4422	+ //if (true)
	4423	+ // return;
	4424	+
	4425	+ //cRadio tab = GetCurrentTab();
	4426	+
	4427	+ restoreButton.setEnabled(copy.versionindex != -1);
	4428	+ replaceButton.setEnabled(copy.versionindex != -1);
	4429	+
	4430	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4431	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4432	+
	4433	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4434	+ //copy.versionlist[copy.versionindex + 1] != null);
	4435	+
	4436	+ muteSlider = true;
	4437	+ versionSlider.setMinimum(0);
	4438	+ versionSlider.setMaximum(VersionCount() - 1);
	4439	+ versionSlider.setInteger(copy.versionindex);
	4440	+ versionSlider.setEnabled(copy.versionindex != -1);
	4441	+ muteSlider = false;
	4442	+ }
	4443	+
	4444	+ public boolean PreviousVersion()
	4445	+ {
	4446	+ // Option?
	4447	+ Replace();
	4448	+
	4449	+ System.err.println("Undo");
	4450	+
	4451	+ //cRadio tab = GetCurrentTab();
	4452	+
	4453	+ if (copy.versionindex == 0)
3486	4454	{
3487	4455	java.awt.Toolkit.getDefaultToolkit().beep();
3488		- return;
	4456	+ return false;
3489	4457	}
3490	4458
3491		- if (tab.graphs[tab.undoindex] == null)
3492		- {
3493		- Save();
3494		- tab.undoindex -= 1;
3495		- }
	4459	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4460	+// {
	4461	+// if (Save(false))
	4462	+// tab.versionindex -= 1;
	4463	+// else
	4464	+// {
	4465	+// if (tab.versionindex <= 0)
	4466	+// return false;
	4467	+// else
	4468	+// tab.versionindex -= 1;
	4469	+// }
	4470	+// }
3496	4471
3497		- tab.undoindex -= 1;
	4472	+ copy.versionindex -= 1;
3498	4473
3499		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4474	+ CopyChanged();
	4475	+
	4476	+ return true;
3500	4477	}
3501	4478
3502		- public void Redo()
	4479	+ public boolean Restore()
3503	4480	{
3504		- cRadio tab = GetCurrentTab();
	4481	+ System.err.println("Restore");
3505	4482
3506		- if (tab.graphs[tab.undoindex + 1] == null)
	4483	+ //cRadio tab = GetCurrentTab();
	4484	+
	4485	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4486	+ {
	4487	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4488	+ return false;
	4489	+ }
	4490	+
	4491	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4492	+ CopyChanged();
	4493	+
	4494	+ return true;
	4495	+ }
	4496	+
	4497	+ public boolean Replace()
	4498	+ {
	4499	+ //System.err.println("Replace");
	4500	+
	4501	+ //cRadio tab = GetCurrentTab();
	4502	+
	4503	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4504	+ {
	4505	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4506	+ return false;
	4507	+ }
	4508	+
	4509	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4510	+
	4511	+ return true;
	4512	+ }
	4513	+
	4514	+ public void NextVersion()
	4515	+ {
	4516	+ // Option?
	4517	+ Replace();
	4518	+
	4519	+ //cRadio tab = GetCurrentTab();
	4520	+
	4521	+ if (copy.versionlist[copy.versionindex + 1] == null)
3507	4522	{
3508	4523	java.awt.Toolkit.getDefaultToolkit().beep();
3509	4524	return;
3510	4525	}
3511	4526
3512		- tab.undoindex += 1;
	4527	+ copy.versionindex += 1;
3513	4528
3514		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4529	+ CopyChanged();
	4530	+
	4531	+ //if (!tab.user[tab.versionindex])
	4532	+ // tab.graphs[tab.versionindex] = null;
3515	4533	}
3516	4534
3517	4535	void ImportGFD()
..	..	@@ -3663,7 +4681,7 @@
3663	4681	assert false;
3664	4682	}
3665	4683
3666		- void EditSelection()
	4684	+ void EditSelection(boolean newWindow)
3667	4685	{
3668	4686	}
3669	4687
..	..	@@ -3722,7 +4740,7 @@
3722	4740	//copy.material = new cMaterial(copy.GetMaterial());
3723	4741
3724	4742	current.color = (float) colorField.getFloat();
3725		- current.modulation = (float) modulationField.getFloat();
	4743	+ current.modulation = (float) saturationField.getFloat();
3726	4744	current.metalness = (float) metalnessField.getFloat();
3727	4745	current.diffuse = (float) diffuseField.getFloat();
3728	4746	current.specular = (float) specularField.getFloat();
..	..	@@ -3755,7 +4773,7 @@
3755	4773	cMaterial mat = copy.material;
3756	4774
3757	4775	colorField.SetToolTipValue((mat.color));
3758		- modulationField.SetToolTipValue((mat.modulation));
	4776	+ saturationField.SetToolTipValue((mat.modulation));
3759	4777	metalnessField.SetToolTipValue((mat.metalness));
3760	4778	diffuseField.SetToolTipValue((mat.diffuse));
3761	4779	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3807,9 +4825,28 @@
3807	4825	//copy.Touch();
3808	4826	}
3809	4827
	4828	+ cNumberSlider versionSlider;
	4829	+
3810	4830	public void stateChanged(ChangeEvent e)
3811	4831	{
3812	4832	// assert(false);
	4833	+ if (e.getSource() == versionSlider)
	4834	+ {
	4835	+ if (muteSlider)
	4836	+ return;
	4837	+
	4838	+ Replace();
	4839	+
	4840	+ int version = versionSlider.getInteger();
	4841	+
	4842	+ if (version != -1 && copy.versionlist[version] != null)
	4843	+ {
	4844	+ copy.versionindex = version;
	4845	+ CopyChanged();
	4846	+ }
	4847	+
	4848	+ return;
	4849	+ }
3813	4850
3814	4851	if (freezematerial)
3815	4852	{
..	..	@@ -3845,6 +4882,12 @@
3845	4882	{
3846	4883	//System.out.println("stateChanged = " + this);
3847	4884	materialtouched = true;
	4885	+
	4886	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4887	+ {
	4888	+ saturationField.setFloat(1);
	4889	+ }
	4890	+
3848	4891	applySelf();
3849	4892	//System.out.println("this = " + this);
3850	4893	//System.out.println("PARENT = " + parent);
..	..	@@ -4144,6 +5187,7 @@
4144	5187	{
4145	5188	if (GetTree() != null)
4146	5189	{
	5190	+ GetTree().revalidate();
4147	5191	GetTree().repaint();
4148	5192	}
4149	5193
..	..	@@ -4152,13 +5196,19 @@
4152	5196	ctrlPanel.validate(); // ? new
4153	5197	ctrlPanel.repaint();
4154	5198	}
	5199	+
	5200	+ if (previousVersionButton != null && copy.versionlist != null)
	5201	+ SetVersionStates();
	5202	+
	5203	+ cameraView.requestFocusInWindow();
4155	5204	}
4156	5205
4157	5206	static TweenManager tweenManager = new TweenManager();
4158	5207
4159	5208	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4160	5209	{
4161		- Save();
	5210	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5211	+ Save();
4162	5212	//Tween.set(thing, 0).target(1).start(tweenManager);
4163	5213	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4164	5214	// if (thing instanceof GenericJointDemo)
..	..	@@ -4182,7 +5232,7 @@
4182	5232	// group = (Composite) group.get(0);
4183	5233	// }
4184	5234
4185		- System.out.println("makeSomething of " + thing);
	5235	+ //System.out.println("makeSomething of " + thing);
4186	5236
4187	5237	/*
4188	5238	if (deselect && jList != null)
..	..	@@ -4245,6 +5295,12 @@
4245	5295	{
4246	5296	ResetModel();
4247	5297	Select(thing.GetTreePath(), true, false); // unselect... false);
	5298	+
	5299	+ if (thing.Size() == 0)
	5300	+ {
	5301	+ //EditSelection(false);
	5302	+ }
	5303	+
4248	5304	refreshContents();
4249	5305	}
4250	5306
..	..	@@ -4393,7 +5449,9 @@
4393	5449	readobj.ResetDisplayList();
4394	5450	} catch (Exception e)
4395	5451	{
4396		- //e.printStackTrace();
	5452	+ if (!e.toString().contains("GZIP"))
	5453	+ e.printStackTrace();
	5454	+
4397	5455	try
4398	5456	{
4399	5457	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4467,11 +5525,14 @@
4467	5525
4468	5526	if (readobj != null)
4469	5527	{
4470		- Save();
	5528	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5529	+ // Save();
4471	5530	try
4472	5531	{
4473	5532	//readobj.deepCopySelf(copy);
4474	5533	copy.clear(); // june 2014
	5534	+ copy.skyboxname = readobj.skyboxname;
	5535	+ copy.skyboxext = readobj.skyboxext;
4475	5536	for (int i = 0; i < readobj.size(); i++)
4476	5537	{
4477	5538	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4512,6 +5573,7 @@
4512	5573	}
4513	5574	} catch (ClassCastException e)
4514	5575	{
	5576	+ e.printStackTrace();
4515	5577	assert (false);
4516	5578	Composite c = (Composite) copy;
4517	5579	c.children.clear();
..	..	@@ -4522,17 +5584,32 @@
4522	5584	c.addChild(csg);
4523	5585	}
4524	5586
	5587	+ copy.versionlist = readobj.versionlist;
	5588	+ copy.versionindex = readobj.versionindex;
	5589	+ copy.versiontable = readobj.versiontable;
	5590	+
	5591	+ if (copy.versionlist == null)
	5592	+ {
	5593	+ // Backward compatibility
	5594	+ copy.versionlist = new Object3D[100];
	5595	+ copy.versionindex = -1;
	5596	+
	5597	+ //Save(true);
	5598	+ }
	5599	+
	5600	+ //? SetUndoStates();
	5601	+
4525	5602	ResetModel();
4526	5603	copy.HardTouch(); // recompile?
4527	5604	refreshContents();
4528	5605	}
4529	5606	}
4530	5607
4531		- void load() // throws ClassNotFoundException
	5608	+ void Open() // throws ClassNotFoundException
4532	5609	{
4533	5610	if (Grafreed.standAlone)
4534	5611	{
4535		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5612	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4536	5613	browser.show();
4537	5614	String filename = browser.getFile();
4538	5615	if (filename != null && filename.length() > 0)
..	..	@@ -4609,6 +5686,8 @@
4609	5686
4610	5687	void save()
4611	5688	{
	5689	+ Replace();
	5690	+
4612	5691	if (lastname == null)
4613	5692	{
4614	5693	return;
..	..	@@ -4631,6 +5710,7 @@
4631	5710	//ps.print(buffer.toString());
4632	5711	} catch (IOException e)
4633	5712	{
	5713	+ e.printStackTrace();
4634	5714	}
4635	5715	}
4636	5716
..	..	@@ -4645,6 +5725,8 @@
4645	5725	String filename = browser.getFile();
4646	5726	if (filename != null && filename.length() > 0)
4647	5727	{
	5728	+ if (!filename.endsWith(".gfd"))
	5729	+ filename += ".gfd";
4648	5730	lastname = browser.getDirectory() + filename;
4649	5731	save();
4650	5732	}
..	..	@@ -4811,7 +5893,7 @@
4811	5893	MenuBar menuBar;
4812	5894	Menu fileMenu;
4813	5895	MenuItem newItem;
4814		- MenuItem loadItem;
	5896	+ MenuItem openItem;
4815	5897	MenuItem saveItem;
4816	5898	MenuItem saveAsItem;
4817	5899	MenuItem exportAsItem;
..	..	@@ -4834,22 +5916,37 @@
4834	5916	CheckboxMenuItem toggleSwitchItem;
4835	5917	CheckboxMenuItem toggleRootItem;
4836	5918	CheckboxMenuItem animationItem;
	5919	+ MenuItem archiveItem;
4837	5920	CheckboxMenuItem toggleHandleItem;
4838	5921	CheckboxMenuItem togglePaintItem;
4839	5922	JSplitPane mainPanel;
4840	5923	JScrollPane scrollpane;
	5924	+
4841	5925	JPanel toolbarPanel;
	5926	+
4842	5927	cGridBag treePanel;
	5928	+
4843	5929	JPanel radioPanel;
4844	5930	ButtonGroup buttonGroup;
4845		- cGridBag ctrlPanel;
	5931	+
	5932	+ cGridBag toolboxPanel;
	5933	+ cGridBag skyboxPanel;
4846	5934	cGridBag materialPanel;
	5935	+ cGridBag ctrlPanel;
	5936	+
4847	5937	JScrollPane infoPanel;
	5938	+
4848	5939	cGridBag optionsPanel;
	5940	+
4849	5941	JTabbedPane objectPanel;
	5942	+ boolean materialFlushed;
	5943	+ Object3D latestObject;
	5944	+
4850	5945	cGridBag XYZPanel;
	5946	+
4851	5947	JSplitPane gridPanel;
4852	5948	JSplitPane bigPanel;
	5949	+
4853	5950	cGridBag bigThree;
4854	5951	cGridBag scenePanel;
4855	5952	cGridBag centralPanel;
..	..	@@ -4907,7 +6004,7 @@
4907	6004	JLabel colorLabel;
4908	6005	cNumberSlider colorField;
4909	6006	JLabel modulationLabel;
4910		- cNumberSlider modulationField;
	6007	+ cNumberSlider saturationField;
4911	6008	JLabel metalnessLabel;
4912	6009	cNumberSlider metalnessField;
4913	6010	JLabel diffuseLabel;
..	..	@@ -4938,6 +6035,7 @@
4938	6035	cNumberSlider anisoField;
4939	6036	JLabel anisoVLabel;
4940	6037	cNumberSlider anisoVField;
	6038	+
4941	6039	JLabel cameraLabel;
4942	6040	cNumberSlider cameraField;
4943	6041	JLabel selfshadowLabel;
..	..	@@ -4952,6 +6050,7 @@
4952	6050	cNumberSlider fakedepthField;
4953	6051	JLabel shadowbiasLabel;
4954	6052	cNumberSlider shadowbiasField;
	6053	+
4955	6054	JLabel bumpLabel;
4956	6055	cNumberSlider bumpField;
4957	6056	JLabel noiseLabel;
..	..	@@ -4964,7 +6063,7 @@
4964	6063	cNumberSlider fogField;
4965	6064	JLabel opacityPowerLabel;
4966	6065	cNumberSlider opacityPowerField;
4967		- JTree jTree;
	6066	+ cTree jTree;
4968	6067	//ObjectUI parent;
4969	6068
4970	6069	cNumberSlider normalpushField;