~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.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -31,6 +37,70 @@
31	37	boolean timeline;
32	38	boolean wasFullScreen;
33	39
	40	+ GroupEditor callee;
	41	+ JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	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	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	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	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	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;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
	103	+
34	104	// SCRIPT
35	105
36	106	transient JFrame textpanel = null;
..	..	@@ -121,51 +191,62 @@
121	191	void keyPressed(int key, int modifiers)
122	192	{
123	193	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	194	+ Globals.theRenderer.keyPressed(key, modifiers);
125	195	}
126	196	*/
127	197
128	198	static GridBagConstraints aConstraints;
129	199	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	200	+
132	201	static int GRIDWIDTH = 100; // 4;
133	202
134	203	public void closeUI()
135	204	{
136	205	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
139	208	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
141	210
142		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
143	214	return;
144	215
145		- objEditor.ctrlPanel.remove(liveCB);
146		- objEditor.ctrlPanel.remove(hideCB);
147		- objEditor.ctrlPanel.remove(markCB);
148		-
149		- objEditor.ctrlPanel.remove(randomCB);
150		- objEditor.ctrlPanel.remove(speedupCB);
151		- objEditor.ctrlPanel.remove(rewindCB);
152		-
153		- objEditor.ctrlPanel.remove(resetButton);
154		- objEditor.ctrlPanel.remove(stepButton);
155		-// objEditor.ctrlPanel.remove(stepAllButton);
156		-// objEditor.ctrlPanel.remove(resetAllButton);
157		- objEditor.ctrlPanel.remove(link2masterCB);
158		- //objEditor.ctrlPanel.remove(flipVCB);
159		- //objEditor.ctrlPanel.remove(texresMenu);
160		- objEditor.ctrlPanel.remove(slowerButton);
161		- objEditor.ctrlPanel.remove(fasterButton);
162		- objEditor.ctrlPanel.remove(remarkButton);
	216	+// objEditor.ctrlPanel.remove(liveCB);
	217	+// objEditor.ctrlPanel.remove(hideCB);
	218	+// objEditor.ctrlPanel.remove(markCB);
	219	+//
	220	+// objEditor.ctrlPanel.remove(randomCB);
	221	+// objEditor.ctrlPanel.remove(speedupCB);
	222	+// objEditor.ctrlPanel.remove(rewindCB);
	223	+//
	224	+// objEditor.ctrlPanel.remove(resetButton);
	225	+// objEditor.ctrlPanel.remove(stepButton);
	226	+//// objEditor.ctrlPanel.remove(stepAllButton);
	227	+//// objEditor.ctrlPanel.remove(resetAllButton);
	228	+// objEditor.ctrlPanel.remove(link2masterCB);
	229	+// //objEditor.ctrlPanel.remove(flipVCB);
	230	+// //objEditor.ctrlPanel.remove(texresMenu);
	231	+// objEditor.ctrlPanel.remove(slowerButton);
	232	+// objEditor.ctrlPanel.remove(fasterButton);
	233	+// objEditor.ctrlPanel.remove(remarkButton);
	234	+
	235	+ objEditor.ctrlPanel.remove(setupPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	238	+ objEditor.ctrlPanel.remove(pushPanel);
	239	+ //objEditor.ctrlPanel.remove(fillPanel);
	240	+
	241	+ //Remove(normalpushField);
163	242	}
164	243
165	244	public ObjEditor GetEditor()
166	245	{
167	246	return objEditor; //.GetEditor();
168	247	}
	248	+
	249	+ // Sometimes myself, sometimes my callee's.
169	250	ObjEditor objEditor;
170	251
171	252	/*
..	..	@@ -228,6 +309,7 @@
228	309	//localCopy.parent = null;
229	310
230	311	frame = new JFrame();
	312	+ frame.setUndecorated(true);
231	313	objEditor = this;
232	314	this.callee = callee;
233	315
..	..	@@ -258,27 +340,48 @@
258	340	return frame.action(event, obj);
259	341	}
260	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
261	348	void SetupMenu()
262	349	{
263	350	frame.setMenuBar(menuBar = new MenuBar());
264		- menuBar.add(windowMenu = new Menu("File"));
265		- windowMenu.add(loadItem = new MenuItem("Load..."));
266		- windowMenu.add("-");
267		- windowMenu.add(saveItem = new MenuItem("Save"));
268		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
269	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
270		- windowMenu.add("-");
271		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
272		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
273		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
274	376	if (client.parent != null)
275	377	{
276		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
277	379	} else
278	380	{
279		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
280	382	}
281	383
	384	+ newItem.addActionListener(this);
282	385	loadItem.addActionListener(this);
283	386	saveItem.addActionListener(this);
284	387	saveAsItem.addActionListener(this);
..	..	@@ -287,79 +390,64 @@
287	390	//povItem.addActionListener(this);
288	391	closeItem.addActionListener(this);
289	392
290		- menuBar.add(cameraMenu = new Menu("View"));
291		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
292		- //zBufferItem.addActionListener(this);
293		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
294		- //normalLensItem.addActionListener(this);
295		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
296		- revertCameraItem.addActionListener(this);
297		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
298		- toggleTimelineItem.addItemListener(this);
299		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
300		- toggleFullScreenItem.addItemListener(this);
301		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
302		- cameraMenu.add("-");
303		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
304		- toggleTextureItem.addItemListener(this);
305		- toggleTextureItem.setState(CameraPane.textureon);
306		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
307		- toggleLiveItem.addItemListener(this);
308		- toggleLiveItem.setState(CameraPane.isLIVE());
309		- cameraMenu.add(stepItem = new MenuItem("Step"));
310		- stepItem.addActionListener(this);
311		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
312		-// toggleDLItem.addItemListener(this);
313		-// toggleDLItem.setState(false);
314		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
315		- toggleRenderItem.addItemListener(this);
316		- toggleRenderItem.setState(!CameraPane.frozen);
317		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
318		- toggleDebugItem.addItemListener(this);
319		- toggleDebugItem.setState(CameraPane.DEBUG);
320		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
321		- toggleFrustumItem.addItemListener(this);
322		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
323		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
324		- toggleFootContactItem.addItemListener(this);
325		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
326		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
327		- toggleRandomItem.addItemListener(this);
328		- toggleRandomItem.setState(CameraPane.RANDOM);
329		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
330		- toggleHandleItem.addItemListener(this);
331		- toggleHandleItem.setState(CameraPane.HANDLES);
332		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
333		- togglePaintItem.addItemListener(this);
334		- togglePaintItem.setState(CameraPane.PAINTMODE);
335		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
336		-// toggleRootItem.addItemListener(this);
337		-// toggleRootItem.setState(false);
338		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
339		-// animationItem.addItemListener(this);
340		-// animationItem.setState(CameraPane.ANIMATION);
341		- cameraMenu.add("-");
342		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
343		- editCameraItem.addActionListener(this);
344		-
345	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
346	420	toolbarPanel = new JPanel();
347	421	toolbarPanel.setName("Toolbar");
348		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
349	423	treePanel.setName("Tree");
350		- ctrlPanel = new JPanel(); // new GridBagLayout());
351		- ctrlPanel.setName("Edit");
352		- materialPanel = new JPanel();
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
	428	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
	437	+ materialPanel = new cGridBag().setVertical(true);
353	438	materialPanel.setName("Material");
	439	+
354	440	/JTextPane/
355	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
356	444	infoarea.setEditable(true);
357	445	SetText();
358	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
359	447	// infoarea.setOpaque(false);
360	448	// //infoarea.setForeground(textcolor);
361		- infoarea.setLineWrap(true);
362		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
363	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
364	452	infoPanel.setPreferredSize(new Dimension(50, 200));
365	453	infoPanel.setName("Info");
..	..	@@ -370,16 +458,22 @@
370	458	mainPanel.setName("Main");
371	459	mainPanel.setContinuousLayout(true);
372	460	mainPanel.setOneTouchExpandable(true);
373		- mainPanel.setDividerLocation(1.0);
374	461	mainPanel.setDividerSize(9);
375		- mainPanel.setResizeWeight(0);
376		-
	462	+ mainPanel.setDividerLocation(0.5); //1.0);
	463	+ mainPanel.setResizeWeight(0.5);
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+// BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+// divider.setDividerSize(15);
	468	+// divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+
377	471	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
378	472	//mainPanel.setLayout(new GridBagLayout());
379	473	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
380		- treePanel.setLayout(new GridBagLayout());
381		- ctrlPanel.setLayout(new GridBagLayout());
382		- materialPanel.setLayout(new GridBagLayout());
	474	+// treePanel.setLayout(new GridBagLayout());
	475	+ //ctrlPanel.setLayout(new GridBagLayout());
	476	+ //materialPanel.setLayout(new GridBagLayout());
383	477
384	478	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
385	479	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -418,7 +512,7 @@
418	512	static String newline = "\n";
419	513	protected static final String buttonString = "JButton";
420	514	StyledDocument doc;
421		- JTextArea infoarea;
	515	+ JTextPane infoarea;
422	516
423	517	void ClearInfo()
424	518	{
..	..	@@ -441,10 +535,10 @@
441	535	e.printStackTrace();
442	536	}
443	537
444		- String selection = infoarea.getText();
445		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
446		- java.awt.datatransfer.Clipboard clipboard =
447		- Toolkit.getDefaultToolkit().getSystemClipboard();
	538	+// String selection = infoarea.getText();
	539	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	540	+// java.awt.datatransfer.Clipboard clipboard =
	541	+// Toolkit.getDefaultToolkit().getSystemClipboard();
448	542	//clipboard.setContents(data, data);
449	543	}
450	544
..	..	@@ -467,13 +561,13 @@
467	561	//SendInfo("Name:", "bold");
468	562	if (sel.GetTextures() != null \|\| debug)
469	563	{
470		- si.SendInfo(sel.toString(), "bold");
	564	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
471	565	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
472	566	if (sel.Size() > 0)
473	567	{
474	568	si.SendInfo("#children = " + sel.Size(), "regular");
475	569	}
476		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	570	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
477	571	if (debug)
478	572	{
479	573	try
..	..	@@ -485,7 +579,10 @@
485	579	}
486	580
487	581	if (full)
488		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	582	+ {
	583	+ si.SendInfo(" BBox min: " + minima, "regular");
	584	+ si.SendInfo(" BBox max: " + maxima, "regular");
	585	+ }
489	586
490	587	if (sel.bRep != null)
491	588	{
..	..	@@ -512,7 +609,7 @@
512	609	}
513	610	if (sel.support != null)
514	611	{
515		- si.SendInfo(" support: " + sel.support, "regular");
	612	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
516	613	}
517	614	if (sel.scriptnode != null)
518	615	{
..	..	@@ -583,6 +680,9 @@
583	680	{
584	681	CameraPane.pointflow = (PointFlow) sel;
585	682	}
	683	+
	684	+ si.SendInfo("_____________________", "regular");
	685	+ si.SendInfo("", "regular");
586	686	}
587	687	}
588	688
..	..	@@ -598,68 +698,140 @@
598	698	}
599	699	}
600	700
	701	+static GraphicsDevice device = GraphicsEnvironment
	702	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	703	+
	704	+ Rectangle keeprect;
	705	+ cRadio radio;
	706	+
	707	+cButton keepButton;
	708	+ cButton twoButton; // Full 3D
	709	+ cButton sixButton;
	710	+ cButton threeButton;
	711	+ cButton sevenButton;
	712	+ cButton fourButton; // full panel
	713	+ cButton oneButton; // full XYZ
	714	+ //cButton currentLayout;
	715	+
	716	+ boolean maximized;
	717	+
	718	+ cButton fullscreenLayout;
	719	+
	720	+ void Minimize()
	721	+ {
	722	+ frame.setState(Frame.ICONIFIED);
	723	+ }
	724	+
	725	+ void Maximize()
	726	+ {
	727	+ if (maximized)
	728	+ {
	729	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	730	+ }
	731	+ else
	732	+ {
	733	+ keeprect = frame.getBounds();
	734	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	735	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	736	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	737	+// frame.setState(Frame.MAXIMIZED_BOTH);
	738	+ }
	739	+
	740	+ maximized ^= true;
	741	+ }
	742	+
601	743	void ToggleFullScreen()
602	744	{
603		- if (CameraPane.FULLSCREEN)
	745	+ cameraView.ToggleFullScreen();
	746	+
	747	+ if (!CameraPane.FULLSCREEN)
604	748	{
605		- frame.getContentPane().remove(/"Center",/bigThree);
606		- framePanel.add(bigThree);
607		- frame.getContentPane().add(/"Center",/framePanel);
	749	+ device.setFullScreenWindow(null);
	750	+ //frame.setVisible(false);
	751	+// frame.removeNotify();
	752	+// frame.setUndecorated(false);
	753	+// frame.addNotify();
	754	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	755	+
	756	+// X frame.getContentPane().remove(/"Center",/bigThree);
	757	+// X framePanel.add(bigThree);
	758	+// X frame.getContentPane().add(/"Center",/framePanel);
	759	+ framePanel.setDividerLocation(1);
	760	+
	761	+ //frame.setVisible(true);
	762	+ radio.layout = keepButton;
	763	+ //theFrame = null;
	764	+ keepButton = null;
	765	+ radio.layout.doClick();
	766	+
608	767	} else
609	768	{
610		- frame.getContentPane().remove(/"Center",/framePanel);
611		- framePanel.remove(bigThree);
612		- frame.getContentPane().add(/"Center",/bigThree);
	769	+ keepButton = radio.layout;
	770	+ //keeprect = frame.getBounds();
	771	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	772	+// frame.getToolkit().getScreenSize().height);
	773	+ //frame.setVisible(false);
	774	+ device.setFullScreenWindow(frame);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(true);
	777	+// frame.addNotify();
	778	+// X frame.getContentPane().remove(/"Center",/framePanel);
	779	+// X framePanel.remove(bigThree);
	780	+// X frame.getContentPane().add(/"Center",/bigThree);
	781	+ framePanel.setDividerLocation(0);
	782	+
	783	+ radio.layout = fullscreenLayout;
	784	+ radio.layout.doClick();
	785	+ //frame.setVisible(true);
613	786	}
614		- cameraView.ToggleFullScreen();
615	787	}
616	788
617		- private JTextArea createTextPane()
	789	+ private JTextPane createTextPane()
618	790	{
619		- String[] initString =
620		- {
621		- "This is an editable JTextPane, ", //regular
622		- "another ", //italic
623		- "styled ", //bold
624		- "text ", //small
625		- "component, ", //large
626		- "which supports embedded components..." + newline,//regular
627		- " " + newline, //button
628		- "...and embedded icons..." + newline, //regular
629		- " ", //icon
630		- newline + "JTextPane is a subclass of JEditorPane that "
631		- + "uses a StyledEditorKit and StyledDocument, and provides "
632		- + "cover methods for interacting with those objects."
633		- };
	791	+// TEXTAREA String[] initString =
	792	+// {
	793	+// "This is an editable JTextPane, ", //regular
	794	+// "another ", //italic
	795	+// "styled ", //bold
	796	+// "text ", //small
	797	+// "component, ", //large
	798	+// "which supports embedded components..." + newline,//regular
	799	+// " " + newline, //button
	800	+// "...and embedded icons..." + newline, //regular
	801	+// " ", //icon
	802	+// newline + "JTextPane is a subclass of JEditorPane that "
	803	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	804	+// + "cover methods for interacting with those objects."
	805	+// };
	806	+//
	807	+// String[] initStyles =
	808	+// {
	809	+// "regular", "italic", "bold", "small", "large",
	810	+// "regular", "button", "regular", "icon",
	811	+// "regular"
	812	+// };
	813	+//
	814	+// JTextPane textPane = new JTextPane();
	815	+// textPane.setEditable(true);
	816	+// /StyledDocument/ doc = textPane.getStyledDocument();
	817	+// addStylesToDocument(doc);
	818	+//
	819	+// try
	820	+// {
	821	+// for (int j = 0; j < 2; j++)
	822	+// {
	823	+// for (int i = 0; i < initString.length; i++)
	824	+// {
	825	+// doc.insertString(doc.getLength(), initString[i],
	826	+// doc.getStyle(initStyles[i]));
	827	+// }
	828	+// }
	829	+// } catch (BadLocationException ble)
	830	+// {
	831	+// System.err.println("Couldn't insert initial text into text pane.");
	832	+// }
634	833
635		- String[] initStyles =
636		- {
637		- "regular", "italic", "bold", "small", "large",
638		- "regular", "button", "regular", "icon",
639		- "regular"
640		- };
641		-
642		- JTextPane textPane = new JTextPane();
643		- textPane.setEditable(true);
644		- /StyledDocument/ doc = textPane.getStyledDocument();
645		- addStylesToDocument(doc);
646		-
647		- try
648		- {
649		- for (int j = 0; j < 2; j++)
650		- {
651		- for (int i = 0; i < initString.length; i++)
652		- {
653		- doc.insertString(doc.getLength(), initString[i],
654		- doc.getStyle(initStyles[i]));
655		- }
656		- }
657		- } catch (BadLocationException ble)
658		- {
659		- System.err.println("Couldn't insert initial text into text pane.");
660		- }
661		-
662		- return new JTextArea(); // textPane;
	834	+ return new JTextPane(); // textPane;
663	835	}
664	836
665	837	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -712,7 +884,7 @@
712	884	protected static ImageIcon createImageIcon(String path,
713	885	String description)
714	886	{
715		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	887	+ java.net.URL imgURL = Grafreed.class.getResource(path);
716	888	if (imgURL != null)
717	889	{
718	890	return new ImageIcon(imgURL, description);
..	..	@@ -744,6 +916,7 @@
744	916	// NumberSlider vDivsField;
745	917	// JCheckBox endcaps;
746	918	JCheckBox liveCB;
	919	+ JCheckBox selectCB;
747	920	JCheckBox hideCB;
748	921	JCheckBox link2masterCB;
749	922	JCheckBox markCB;
..	..	@@ -751,7 +924,12 @@
751	924	JCheckBox speedupCB;
752	925	JCheckBox rewindCB;
753	926	JCheckBox flipVCB;
	927	+
	928	+ cCheckBox toggleTextureCB;
	929	+ cCheckBox toggleSwitchCB;
	930	+
754	931	JComboBox texresMenu;
	932	+
755	933	JButton resetButton;
756	934	JButton stepButton;
757	935	JButton stepAllButton;
..	..	@@ -759,115 +937,87 @@
759	937	JButton slowerButton;
760	938	JButton fasterButton;
761	939	JButton remarkButton;
	940	+
	941	+ cGridBag editPanel;
	942	+ cGridBag editCommandsPanel;
	943	+
	944	+ cGridBag namePanel;
	945	+ cGridBag setupPanel;
	946	+ cGridBag setupPanel2;
	947	+ cGridBag objectCommandsPanel;
	948	+ cGridBag pushPanel;
	949	+ cGridBag fillPanel;
762	950
763		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	951	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
764	952	{
765	953	JCheckBox cb;
766	954
767		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
768		- oe.aConstraints.gridwidth = 1; // 3;
769		-// oe.aConstraints.weightx = 1;
770		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
771		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	955	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
772	956	cb.addItemListener(this);
773		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
774		- oe.aConstraints.gridwidth = 1;
775		- oe.aConstraints.gridx += 1;
776	957
777	958	return cb;
778	959	}
779	960
780		- cButton AddButton(ObjEditor oe, String label)
	961	+ cButton AddButton(cGridBag panel, String label)
781	962	{
782	963	cButton cb;
783	964
784		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
785		- oe.aConstraints.gridwidth = 1;
786		-// oe.aConstraints.weightx = 1;
787		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
788		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	965	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
789	966	cb.addActionListener(this);
790		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
791		- oe.aConstraints.gridwidth = 1;
792		- oe.aConstraints.gridx += 1;
793	967
794	968	return cb;
795	969	}
796	970
797		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	971	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
798	972	{
799	973	JComboBox combo;
800	974
801		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
802		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- oe.aConstraints.gridx += 1;
	975	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
804	976	combo.addActionListener(this);
805	977
806	978	return combo;
807	979	}
808	980
809		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	981	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
810	982	{
811		- NumberSlider combo;
	983	+ cGridBag control = new cGridBag();
	984	+
	985	+ cNumberSlider combo;
812	986
813	987	JLabel jlabel = new JLabel(label);
814		-
815		- aConstraints.fill = GridBagConstraints.VERTICAL;
816	988	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
817		- aConstraints.gridwidth = 2;
818		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
819		- aConstraints.gridx += 1;
820		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
822		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.gridwidth = 1;
825		-
	989	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	990	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826	991	combo.setFloat(current);
827		-
828		- combo.label = jlabel;
829		-
830		- combo.addChangeListener(this);
831		-
832		- return combo;
	992	+
	993	+ panel.add(control);
	994	+
	995	+ return control;
833	996	}
834	997
835		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	998	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
836	999	{
837		- NumberSlider combo;
	1000	+ cGridBag control = new cGridBag();
	1001	+
	1002	+ cNumberSlider combo;
838	1003
839	1004	JLabel jlabel = new JLabel(label);
840		-
841		- aConstraints.fill = GridBagConstraints.VERTICAL;
842	1005	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
843		- aConstraints.gridwidth = 2;
844		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
845		- aConstraints.gridx += 1;
846		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
847		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
848		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851		-
	1006	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1007	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
852	1008	combo.setInteger(current);
853	1009
854		- combo.label = jlabel;
855		-
856		- combo.addChangeListener(this);
857		-
858		- return combo;
	1010	+ panel.add(control);
	1011	+
	1012	+ return control;
859	1013	}
860	1014
861		- JTextArea AddText(JPanel ctrlPanel, String name)
	1015	+ JTextArea AddText(cGridBag ctrlPanel, String name)
862	1016	{
863	1017	JTextArea text;
864	1018
865		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
866		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
867		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1019	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
868	1020	text.addCaretListener(this);
869		- aConstraints.gridx += 1;
870		- aConstraints.gridwidth = 1;
871	1021
872	1022	return text;
873	1023	}
..	..	@@ -897,9 +1047,16 @@
897	1047	objEditor.ctrlPanel.remove(j);
898	1048	}
899	1049
	1050	+ void Remove(cNumberSlider j)
	1051	+ {
	1052	+ j.removeChangeListener(this);
	1053	+ //objEditor.ctrlPanel.remove(j.label);
	1054	+ objEditor.ctrlPanel.remove(j);
	1055	+ }
	1056	+
900	1057	/*
901	1058	*/
902		- void Return() // ObjEditor oe)
	1059	+ void Return0() // ObjEditor oe)
903	1060	{
904	1061	aConstraints.gridy += 1;
905	1062	aConstraints.gridx = 0;
..	..	@@ -954,35 +1111,77 @@
954	1111
955	1112	void SetupUI2(ObjEditor oe)
956	1113	{
957		-// oe.aConstraints.weightx = 0;
958		-// oe.aConstraints.weighty = 0;
959		-// oe.aConstraints.gridx = 0;
960		-// oe.aConstraints.gridy = 0;
961		- SetupName(oe);
	1114	+ //SetupName(oe);
962	1115
963		- if (!GroupEditor.allparams)
	1116	+ namePanel = new cGridBag();
	1117	+
	1118	+ nameField = AddText(namePanel, copy.GetName());
	1119	+ namePanel.add(nameField);
	1120	+ oe.ctrlPanel.add(namePanel);
	1121	+
	1122	+ oe.ctrlPanel.Return();
	1123	+
	1124	+ if (!allparams)
964	1125	return;
965	1126
966		- liveCB = AddCheckBox(oe, "Live", copy.live);
967		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
968		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1127	+ setupPanel = new cGridBag().setVertical(false);
	1128	+
	1129	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1130	+ liveCB.setToolTipText("Animate object");
	1131	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1132	+ selectCB.setToolTipText("Make object selectable");
969	1133	// Return();
970		- markCB = AddCheckBox(oe, "Mark", copy.marked);
971		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
972		- randomCB = AddCheckBox(oe, "Rand", copy.random);
973		- Return();
974		- resetButton = AddButton(oe, "Reset");
975		- stepButton = AddButton(oe, "Step");
	1134	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1135	+ hideCB.setToolTipText("Hide object");
	1136	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1137	+ markCB.setToolTipText("As animation target transform");
	1138	+
	1139	+ setupPanel2 = new cGridBag().setVertical(false);
	1140	+
	1141	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1142	+ rewindCB.setToolTipText("Rewind animation");
	1143	+
	1144	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1145	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1146	+
	1147	+ if (Globals.ADVANCED)
	1148	+ {
	1149	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1150	+ link2masterCB.setToolTipText("Attach to support");
	1151	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1152	+ speedupCB.setToolTipText("Option motion capture");
	1153	+ }
	1154	+
	1155	+ oe.ctrlPanel.add(setupPanel);
	1156	+ oe.ctrlPanel.Return();
	1157	+ oe.ctrlPanel.add(setupPanel2);
	1158	+ oe.ctrlPanel.Return();
	1159	+
	1160	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1161	+
	1162	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1163	+ resetButton.setToolTipText("Jump to frame zero");
	1164	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1165	+ stepButton.setToolTipText("Step one frame");
976	1166	// resetAllButton = AddButton(oe, "Reset All");
977	1167	// stepAllButton = AddButton(oe, "Step All");
978		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
979	1168	// Return();
980		- slowerButton = AddButton(oe, "Slow");
981		- fasterButton = AddButton(oe, "Fast");
982		- remarkButton = AddButton(oe, "Rem");
	1169	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1170	+ slowerButton.setToolTipText("Decrease animation speed");
	1171	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1172	+ fasterButton.setToolTipText("Increase animation speed");
	1173	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1174	+ remarkButton.setToolTipText("Set the current transform as the target");
983	1175
984		- Return();
	1176	+ oe.ctrlPanel.add(objectCommandsPanel);
	1177	+ oe.ctrlPanel.Return();
985	1178
	1179	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1180	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1181	+ //Return();
	1182	+
	1183	+ oe.ctrlPanel.Return();
	1184	+
986	1185	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1186	// ObjEditor.aConstraints.gridx += 1;
988	1187
..	..	@@ -1076,7 +1275,7 @@
1076	1275	oe.aConstraints.gridwidth = 1;
1077	1276	/**/
1078	1277	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1278	+ oe.ctrlPanel.Return();
1080	1279
1081	1280	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1281	//textureButton.setEnabled(false);
..	..	@@ -1178,11 +1377,25 @@
1178	1377	//JPanel worldPanel =
1179	1378	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1180	1379	//worldPanel.setName("World");
1181		- centralPanel = new JPanel(new BorderLayout());
1182		- timelinePanel = new JPanel(new BorderLayout());
1183		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1380	+ centralPanel = new cGridBag();
	1381	+ centralPanel.preferredWidth = 20;
	1382	+
	1383	+ if (Globals.ADVANCED)
	1384	+ {
	1385	+ timelinePanel = new JPanel(new BorderLayout());
	1386	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1184	1387
	1388	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1389	+ cameraPanel.setContinuousLayout(true);
	1390	+ cameraPanel.setOneTouchExpandable(true);
	1391	+// cameraPanel.setDividerLocation(0.9);
	1392	+// cameraPanel.setDividerSize(9);
	1393	+ cameraPanel.setResizeWeight(1.0);
	1394	+
	1395	+ }
	1396	+
1185	1397	centralPanel.add(cameraView);
	1398	+ centralPanel.setFocusable(true);
1186	1399	//frame.setJMenuBar(timelineMenubar);
1187	1400	//centralPanel.add(timelinePanel);
1188	1401
..	..	@@ -1201,12 +1414,13 @@
1201	1414	//frontView.object = copy;
1202	1415	//sideView.object = copy;
1203	1416
1204		- XYZPanel = new JPanel();
1205		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1417	+ XYZPanel = new cGridBag().setVertical(true);
	1418	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1206	1419
1207		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1208		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1209		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1420	+ XYZPanel.preferredWidth = 5;
	1421	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1422	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1423	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1210	1424
1211	1425	/*
1212	1426	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1244,11 +1458,13 @@
1244	1458	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1245	1459	//tmp.setName("Edit");
1246	1460	objectPanel.add(materialPanel);
1247		- JPanel north = new JPanel(new BorderLayout());
1248		- north.setName("Edit");
1249		- north.add(ctrlPanel, BorderLayout.NORTH);
1250		- objectPanel.add(north);
	1461	+// JPanel north = new JPanel(new BorderLayout());
	1462	+// north.setName("Edit");
	1463	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1464	+// objectPanel.add(north);
	1465	+ objectPanel.add(editPanel);
1251	1466	objectPanel.add(infoPanel);
	1467	+ objectPanel.add(toolboxPanel);
1252	1468
1253	1469	/*
1254	1470	aConstraints.gridx = 0;
..	..	@@ -1257,7 +1473,7 @@
1257	1473	aConstraints.gridy += 1;
1258	1474	aConstraints.gridwidth = 1;
1259	1475	mainPanel.add(objectPanel, aConstraints);
1260		- */
	1476	+ */
1261	1477
1262	1478	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1263	1479	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1268,16 +1484,23 @@
1268	1484	scrollpane.setWheelScrollingEnabled(true);
1269	1485	scrollpane.addMouseWheelListener(this); // Default not fast enough
1270	1486
1271		- /JTabbedPane/ scenePanel = new JTabbedPane();
1272		- scenePanel.add(scrollpane);
	1487	+ /JTabbedPane/ scenePanel = new cGridBag();
	1488	+ scenePanel.preferredWidth = 6;
	1489	+
	1490	+ JTabbedPane tabbedPane = new JTabbedPane();
	1491	+ tabbedPane.add(scrollpane);
1273	1492
1274		- scenePanel.add(FSPane = new cFileSystemPane(this));
1275		-
1276		- optionsPanel = new JPanel(new GridBagLayout());
	1493	+ optionsPanel = new cGridBag().setVertical(false);
1277	1494
1278	1495	optionsPanel.setName("Options");
1279		- scenePanel.add(optionsPanel);
	1496	+
	1497	+ AddOptions(optionsPanel); //, aConstraints);
	1498	+
	1499	+ tabbedPane.add(optionsPanel);
	1500	+
	1501	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1280	1502
	1503	+ scenePanel.add(tabbedPane);
1281	1504
1282	1505	/*
1283	1506	cTree jTree = new cTree(null);
..	..	@@ -1311,6 +1534,7 @@
1311	1534	//bigPanel.setSize(new Dimension(10,10));
1312	1535	//bigPanel.add(ctrlPanel);
1313	1536	//bigPanel.add(gridPanel);
	1537	+ /**
1314	1538	bigThree = new JPanel();
1315	1539	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1316	1540	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1334,7 +1558,13 @@
1334	1558	// aConstraints.gridheight = 3;
1335	1559	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1336	1560	bigThree.add(XYZPanel, aWindowConstraints);
	1561	+ /**/
1337	1562
	1563	+ bigThree = new cGridBag();
	1564	+ bigThree.addComponent(scenePanel);
	1565	+ bigThree.addComponent(centralPanel);
	1566	+ bigThree.addComponent(XYZPanel);
	1567	+
1338	1568	// // SIDE EFFECT!!!
1339	1569	// aConstraints.gridx = 0;
1340	1570	// aConstraints.gridy = 0;
..	..	@@ -1355,14 +1585,19 @@
1355	1585	//worldPane.add(bigPanel);
1356	1586	//worldPane.add(worldPanel);
1357	1587	/**/
1358		- frame.getContentPane().add(/"Center",/framePanel);
	1588	+ //frame.getContentPane().add(/"Center",/framePanel);
	1589	+ frame.add(/"Center",/framePanel);
1359	1590	//frame.getContentPane().add(/"Center",/ worldPane);
1360	1591
1361	1592	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1362	1593
1363		- frame.setSize(1024, 768);
1364		- frame.show();
	1594	+ frame.setSize(1280, 860);
	1595	+
	1596	+ frame.validate();
	1597	+ frame.setVisible(true);
1365	1598
	1599	+ cameraView.requestFocusInWindow();
	1600	+
1366	1601	gridPanel.setDividerLocation(1.0);
1367	1602
1368	1603	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1376,6 +1611,10 @@
1376	1611	});
1377	1612	}
1378	1613
	1614	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1615	+ {
	1616	+ }
	1617	+
1379	1618	JTree GetTree()
1380	1619	{
1381	1620	return objEditor.jTree;
..	..	@@ -1387,260 +1626,173 @@
1387	1626	ctrlPanel.removeAll();
1388	1627	}
1389	1628
1390		- void SetupMaterial(JPanel ctrlPanel)
	1629	+ void SetupMaterial(cGridBag panel)
1391	1630	{
1392		- aConstraints.weighty = 0;
1393		- //aConstraints.weightx = 1;
1394		- /*
	1631	+ /*
1395	1632	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1396	1633	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1397		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1398		- aConstraints.gridx += 1;
1399	1634	*/
1400	1635
1401		- aConstraints.gridwidth = 1;
1402		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1403		- aConstraints.gridx += 1;
1404		- aConstraints.weighty = 0;
1405		- aConstraints.gridwidth = 1;
	1636	+ cGridBag editBar = new cGridBag().setVertical(false);
	1637	+
	1638	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1639	+ createMaterialButton.setToolTipText("Create material");
1406	1640
1407	1641	/*
1408	1642	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1409		- aConstraints.gridx += 1;
1410		- aConstraints.weighty = 0;
1411		- aConstraints.gridwidth = 1;
1412	1643	*/
1413	1644
1414		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1415		- aConstraints.gridx += 1;
	1645	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1646	+ clearMaterialButton.setToolTipText("Clear material");
	1647	+
	1648	+ if (Globals.ADVANCED)
	1649	+ {
	1650	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1651	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1652	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1653	+ }
1416	1654
1417		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1418		-
1419		- aConstraints.gridx += 1;
1420		-
1421		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1422		-
1423		- aConstraints.gridx += 1;
1424		-
1425		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1426		-
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.weighty = 0;
1430		- aConstraints.gridwidth = 1;
	1655	+ editBar.preferredHeight = 15;
	1656	+
	1657	+ panel.add(editBar);
	1658	+
1431	1659	/**/
1432	1660	//aConstraints.weighty = 0;
1433	1661	////aConstraints.weightx = 1;
1434	1662	//aConstraints.weighty = 1;
1435	1663	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1436	1664	//aConstraints.gridx += 1;
1437		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1438		- aConstraints.weighty = 0;
1439		- aConstraints.gridx = 0;
1440		- aConstraints.gridy += 1;
1441		- aConstraints.gridwidth = 1;
	1665	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1442	1666
1443		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1444		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1445		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1446		- aConstraints.gridx += 1;
1447		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1448		- //aConstraints.weightx = 0;
1449		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1450		- aConstraints.gridx = 0;
1451		- aConstraints.gridy += 1;
1452		- aConstraints.gridwidth = 1;
	1667	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1668	+
	1669	+ cGridBag color = new cGridBag();
	1670	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1671	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1672	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1673	+ //colorField.preferredWidth = 200;
	1674	+ colorSection.add(color);
1453	1675
1454		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1455		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1456		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1457		- aConstraints.gridx += 1;
1458		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.gridwidth = 1;
	1676	+ cGridBag modulation = new cGridBag();
	1677	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1678	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1679	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1680	+ colorSection.add(modulation);
1463	1681
1464		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1465		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1467		- aConstraints.gridx += 1;
1468		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1470		- aConstraints.gridx = 0;
1471		- aConstraints.gridy += 1;
1472		- aConstraints.gridwidth = 1;
	1682	+ cGridBag texture = new cGridBag();
	1683	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1684	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1685	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1686	+ colorSection.add(texture);
1473	1687
1474		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1477		- aConstraints.gridx += 1;
1478		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1480		- aConstraints.gridx = 0;
1481		- aConstraints.gridy += 1;
1482		- aConstraints.gridwidth = 1;
	1688	+ cGridBag anisoU = new cGridBag();
	1689	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1690	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1691	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1692	+ colorSection.add(anisoU);
1483	1693
1484		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1485		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1486		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1487		- aConstraints.gridx += 1;
1488		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1490		- aConstraints.gridx = 0;
1491		- aConstraints.gridy += 1;
1492		- aConstraints.gridwidth = 1;
	1694	+ cGridBag anisoV = new cGridBag();
	1695	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1696	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1697	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1698	+ colorSection.add(anisoV);
1493	1699
1494		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1497		- aConstraints.gridx += 1;
1498		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1499		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1500		- aConstraints.gridx = 0;
1501		- aConstraints.gridy += 1;
1502		- aConstraints.gridwidth = 1;
	1700	+ cGridBag shadowbias = new cGridBag();
	1701	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1702	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1703	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1704	+ colorSection.add(shadowbias);
1503	1705
1504		- //aConstraints.weighty = 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1506		- //aConstraints.gridx += 1;
1507		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1508		- aConstraints.weighty = 0;
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	1706	+ panel.add(new JSeparator());
	1707	+
	1708	+ panel.add(colorSection);
	1709	+
	1710	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1711	+
	1712	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1713	+
	1714	+ cGridBag diffuse = new cGridBag();
	1715	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1716	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1717	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1718	+ diffuseSection.add(diffuse);
1512	1719
1513		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1514		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	1720	+ cGridBag diffuseness = new cGridBag();
	1721	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1722	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1723	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1724	+ diffuseSection.add(diffuseness);
1522	1725
1523		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1524		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	1726	+ cGridBag selfshadow = new cGridBag();
	1727	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1728	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1729	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1730	+ diffuseSection.add(selfshadow);
1532	1731
1533		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1534		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	1732	+ cGridBag sheen = new cGridBag();
	1733	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1734	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1735	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1736	+ diffuseSection.add(sheen);
1542	1737
1543		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1544		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1545		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1546		- aConstraints.gridx += 1;
1547		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1548		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1549		- aConstraints.gridx = 0;
1550		- aConstraints.gridy += 1;
1551		- aConstraints.gridwidth = 1;
	1738	+ cGridBag subsurface = new cGridBag();
	1739	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1740	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1741	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1742	+ diffuseSection.add(subsurface);
1552	1743
1553		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1554		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1555		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1556		- aConstraints.gridx += 1;
1557		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1559		- aConstraints.gridx = 0;
1560		- aConstraints.gridy += 1;
1561		- aConstraints.gridwidth = 1;
	1744	+ cGridBag shadow = new cGridBag();
	1745	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1746	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1747	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1748	+ diffuseSection.add(shadow);
1562	1749
1563		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1564		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1565		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1566		- aConstraints.gridx += 1;
1567		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1568		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1569		- aConstraints.gridx = 0;
1570		- aConstraints.gridy += 1;
1571		- aConstraints.gridwidth = 1;
	1750	+ cGridBag fakedepth = new cGridBag();
	1751	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1752	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1753	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1754	+ diffuseSection.add(fakedepth);
1572	1755
1573		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1574		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1575		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1576		- aConstraints.gridx += 1;
1577		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1578		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1579		- aConstraints.gridx = 0;
1580		- aConstraints.gridy += 1;
1581		- aConstraints.gridwidth = 1;
	1756	+ panel.add(new JSeparator());
	1757	+
	1758	+ panel.add(diffuseSection);
	1759	+
	1760	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1761	+
	1762	+ cGridBag specularSection = new cGridBag().setVertical(true);
1582	1763
1583		- //aConstraints.weighty = 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1585		- //aConstraints.gridx += 1;
1586		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1587		- aConstraints.weighty = 0;
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	1764	+ cGridBag specular = new cGridBag();
	1765	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1766	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1767	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1768	+ specularSection.add(specular);
1591	1769
1592		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1593		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	1770	+ cGridBag lightarea = new cGridBag();
	1771	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1772	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1773	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1774	+ specularSection.add(lightarea);
1601	1775
1602		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1603		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	1776	+ cGridBag shininess = new cGridBag();
	1777	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1778	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1779	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1780	+ specularSection.add(shininess);
1611	1781
1612		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1613		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
	1782	+ cGridBag metalness = new cGridBag();
	1783	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1784	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1785	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1786	+ specularSection.add(metalness);
1621	1787
1622		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1623		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1625		- aConstraints.gridx += 1;
1626		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1628		- aConstraints.gridx = 0;
1629		- aConstraints.gridy += 1;
1630		- aConstraints.gridwidth = 1;
	1788	+ cGridBag velvet = new cGridBag();
	1789	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1790	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1791	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1792	+ specularSection.add(velvet);
1631	1793
1632		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1633		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1634		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1635		- aConstraints.gridx += 1;
1636		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1637		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1638		- aConstraints.gridx = 0;
1639		- aConstraints.gridy += 1;
1640		- aConstraints.gridwidth = 1;
1641		-
1642		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1643		- Return();
	1794	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1795	+ //Return();
1644	1796	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1645	1797	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1646	1798	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1651,130 +1803,93 @@
1651	1803	// aConstraints.gridy += 1;
1652	1804	// aConstraints.gridwidth = 1;
1653	1805
1654		- //aConstraints.weighty = 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1656		- //aConstraints.gridx += 1;
1657		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1658		- aConstraints.weighty = 0;
1659		- aConstraints.gridx = 0;
1660		- aConstraints.gridy += 1;
1661		- aConstraints.gridwidth = 1;
1662	1806
1663		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1664		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1666		- aConstraints.gridx += 1;
1667		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1668		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1669		- aConstraints.gridx = 0;
1670		- aConstraints.gridy += 1;
1671		- aConstraints.gridwidth = 1;
	1807	+ panel.add(new JSeparator());
	1808	+
	1809	+ panel.add(specularSection);
	1810	+
	1811	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1812	+
	1813	+ cGridBag globalSection = new cGridBag().setVertical(true);
1672	1814
1673		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1674		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1675		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1676		- aConstraints.gridx += 1;
1677		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1678		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1679		- aConstraints.gridx = 0;
1680		- aConstraints.gridy += 1;
1681		- aConstraints.gridwidth = 1;
	1815	+ cGridBag camera = new cGridBag();
	1816	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1817	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1818	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1819	+ globalSection.add(camera);
1682	1820
1683		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1684		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1686		- aConstraints.gridx += 1;
1687		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1688		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1689		- aConstraints.gridx = 0;
1690		- aConstraints.gridy += 1;
1691		- aConstraints.gridwidth = 1;
	1821	+ cGridBag ambient = new cGridBag();
	1822	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1823	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1824	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1825	+ globalSection.add(ambient);
1692	1826
1693		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1694		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1695		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1696		- aConstraints.gridx += 1;
1697		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1699		- aConstraints.gridx = 0;
1700		- aConstraints.gridy += 1;
1701		- aConstraints.gridwidth = 1;
1702		- aConstraints.weighty = 0;
	1827	+ cGridBag backlit = new cGridBag();
	1828	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1829	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1830	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1831	+ globalSection.add(backlit);
1703	1832
1704		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1705		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1707		- aConstraints.gridx += 1;
1708		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1709		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1710		- aConstraints.gridx = 0;
1711		- aConstraints.gridy += 1;
1712		- aConstraints.gridwidth = 1;
	1833	+ cGridBag opacity = new cGridBag();
	1834	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1835	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1836	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1837	+ globalSection.add(opacity);
1713	1838
1714		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1715		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1717		- aConstraints.gridx += 1;
1718		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1719		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1720		- aConstraints.gridx = 0;
1721		- aConstraints.gridy += 1;
1722		- aConstraints.gridwidth = 1;
	1839	+ panel.add(new JSeparator());
	1840	+
	1841	+ panel.add(globalSection);
	1842	+
	1843	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1844	+
	1845	+ cGridBag textureSection = new cGridBag().setVertical(true);
1723	1846
1724		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1725		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1726		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1727		- aConstraints.gridx += 1;
1728		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1729		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1730		- aConstraints.gridx = 0;
1731		- aConstraints.gridy += 1;
1732		- aConstraints.gridwidth = 1;
	1847	+ cGridBag bump = new cGridBag();
	1848	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1849	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1850	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1851	+ textureSection.add(bump);
1733	1852
1734		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1735		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1737		- aConstraints.gridx += 1;
1738		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1739		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1740		- aConstraints.gridx = 0;
1741		- aConstraints.gridy += 1;
1742		- aConstraints.gridwidth = 1;
	1853	+ cGridBag noise = new cGridBag();
	1854	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1855	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1856	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1857	+ textureSection.add(noise);
1743	1858
1744		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1745		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1747		- aConstraints.gridx += 1;
1748		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1749		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1750		- aConstraints.gridx = 0;
1751		- aConstraints.gridy += 1;
1752		- aConstraints.gridwidth = 1;
	1859	+ cGridBag power = new cGridBag();
	1860	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1861	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1862	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1863	+ textureSection.add(power);
1753	1864
1754		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1755		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1756		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1757		- aConstraints.gridx += 1;
1758		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1759		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1760		- aConstraints.gridx = 0;
1761		- aConstraints.gridy += 1;
1762		- aConstraints.gridwidth = 1;
	1865	+ cGridBag borderfade = new cGridBag();
	1866	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1867	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1868	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1869	+ textureSection.add(borderfade);
1763	1870
1764		- //aConstraints.weighty = 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1766		- //aConstraints.gridx += 1;
1767		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1768		- aConstraints.weighty = 0;
	1871	+ cGridBag fog = new cGridBag();
	1872	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1873	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1874	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1875	+ textureSection.add(fog);
1769	1876
1770		- aConstraints.gridx = 0;
1771		- aConstraints.gridy = 0;
1772		- aConstraints.gridwidth = 1;
	1877	+ cGridBag opacityPower = new cGridBag();
	1878	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1879	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1880	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1881	+ textureSection.add(opacityPower);
	1882	+
	1883	+ panel.add(new JSeparator());
	1884	+
	1885	+ panel.add(textureSection);
	1886	+
	1887	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1773	1888
1774	1889	SetMaterial(copy); // .GetMaterial());
1775	1890
1776		- colorField.addChangeListener(this);
1777		- modulationField.addChangeListener(this);
	1891	+ //colorField.addChangeListener(this);
	1892	+// modulationField.addChangeListener(this);
1778	1893	metalnessField.addChangeListener(this);
1779	1894	diffuseField.addChangeListener(this);
1780	1895	specularField.addChangeListener(this);
..	..	@@ -1804,12 +1919,15 @@
1804	1919	opacityPowerField.addChangeListener(this);
1805	1920	/**/
1806	1921
1807		- resetSlidersButton.addActionListener(this);
1808	1922	clearMaterialButton.addActionListener(this);
1809	1923	createMaterialButton.addActionListener(this);
1810		-
1811		- propagateToggle.addItemListener(this);
1812		- multiplyToggle.addItemListener(this);
	1924	+
	1925	+ if (Globals.ADVANCED)
	1926	+ {
	1927	+ resetSlidersButton.addActionListener(this);
	1928	+ propagateToggle.addItemListener(this);
	1929	+ multiplyToggle.addItemListener(this);
	1930	+ }
1813	1931	}
1814	1932
1815	1933	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1980,7 +2098,7 @@
1980	2098
1981	2099	//? flashIt = false;
1982	2100	CameraPane pane = (CameraPane) cameraView;
1983		- pane.clickStart(location.x, location.y, 0);
	2101	+ pane.clickStart(location.x, location.y, 0, 0);
1984	2102	pane.clickEnd(location.x, location.y, 0, true);
1985	2103
1986	2104	if (group.selection.size() == 1)
..	..	@@ -2029,6 +2147,7 @@
2029	2147	e2.printStackTrace();
2030	2148	}
2031	2149	}
	2150	+
2032	2151	LoadJMEThread loadThread;
2033	2152
2034	2153	class LoadJMEThread extends Thread
..	..	@@ -2086,6 +2205,7 @@
2086	2205	//LoadFile0(filename, converter);
2087	2206	}
2088	2207	}
	2208	+
2089	2209	LoadOBJThread loadObjThread;
2090	2210
2091	2211	class LoadOBJThread extends Thread
..	..	@@ -2164,19 +2284,19 @@
2164	2284
2165	2285	void LoadObjFile(String fullname)
2166	2286	{
2167		- /*
	2287	+ System.out.println("Loading " + fullname);
	2288	+ /**/
2168	2289	//lastFilename = fullname;
2169	2290	if(loadObjThread == null)
2170	2291	{
2171		- loadObjThread = new LoadOBJThread();
2172		- loadObjThread.start();
	2292	+ loadObjThread = new LoadOBJThread();
	2293	+ loadObjThread.start();
2173	2294	}
2174	2295
2175	2296	loadObjThread.add(fullname);
2176		- */
	2297	+ /**/
2177	2298
2178		- System.out.println("Loading " + fullname);
2179		- makeSomething(new FileObject(fullname, true), true);
	2299	+ //makeSomething(new FileObject(fullname, true), true);
2180	2300	}
2181	2301
2182	2302	void LoadGFDFile(String fullname)
..	..	@@ -2437,11 +2557,11 @@
2437	2557
2438	2558	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2439	2559	{
2440		- if (GrafreeD.standAlone)
	2560	+ if (Grafreed.standAlone)
2441	2561	{
2442	2562	/**/
2443	2563	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2444		- browser.show();
	2564	+ browser.setVisible(true);
2445	2565	String filename = browser.getFile();
2446	2566	if (filename != null && filename.length() > 0)
2447	2567	{
..	..	@@ -2586,6 +2706,7 @@
2586	2706	}
2587	2707	if (input == null)
2588	2708	{
	2709	+ new Exception().printStackTrace();
2589	2710	System.exit(0);
2590	2711	}
2591	2712
..	..	@@ -2792,6 +2913,8 @@
2792	2913
2793	2914	void SetMaterial(Object3D object)
2794	2915	{
	2916	+ latestObject = object;
	2917	+
2795	2918	cMaterial mat = object.material;
2796	2919
2797	2920	if (mat == null)
..	..	@@ -2800,7 +2923,8 @@
2800	2923	return;
2801	2924	}
2802	2925
2803		- multiplyToggle.setSelected(mat.multiply);
	2926	+ if (multiplyToggle != null)
	2927	+ multiplyToggle.setSelected(mat.multiply);
2804	2928
2805	2929	assert (object.projectedVertices != null);
2806	2930
..	..	@@ -2902,12 +3026,17 @@
2902	3026	// }
2903	3027
2904	3028	/**/
2905		- if (deselect)
	3029	+ if (deselect \|\| child == null)
2906	3030	{
2907	3031	//group.deselectAll();
2908	3032	//freeze = true;
2909	3033	GetTree().clearSelection();
2910	3034	//freeze = false;
	3035	+
	3036	+ if (child == null)
	3037	+ {
	3038	+ return;
	3039	+ }
2911	3040	}
2912	3041
2913	3042	//group.addSelectee(child);
..	..	@@ -2976,7 +3105,7 @@
2976	3105	cameraView.ToggleDL();
2977	3106	cameraView.repaint();
2978	3107	return;
2979		- } else if (event.getSource() == toggleTextureItem)
	3108	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2980	3109	{
2981	3110	cameraView.ToggleTexture();
2982	3111	// june 2013 copy.HardTouch();
..	..	@@ -2989,7 +3118,8 @@
2989	3118	if (timeline)
2990	3119	{
2991	3120	centralPanel.remove(cameraView);
2992		- centralPanel.add(timelinePanel);
	3121	+ cameraPanel.add(cameraView);
	3122	+ centralPanel.add(cameraPanel);
2993	3123	frame.setJMenuBar(timelineMenubar);
2994	3124	wasFullScreen = CameraPane.FULLSCREEN;
2995	3125	if (!CameraPane.FULLSCREEN)
..	..	@@ -2998,7 +3128,7 @@
2998	3128	}
2999	3129	else
3000	3130	{
3001		- centralPanel.remove(timelinePanel);
	3131	+ centralPanel.remove(cameraPanel);
3002	3132	centralPanel.add(cameraView);
3003	3133	frame.setJMenuBar(null);
3004	3134	if (!wasFullScreen)
..	..	@@ -3014,9 +3144,9 @@
3014	3144	frame.validate();
3015	3145
3016	3146	return;
3017		- } else if (event.getSource() == toggleRandomItem)
	3147	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3018	3148	{
3019		- cameraView.ToggleRandom();
	3149	+ cameraView.ToggleSwitch();
3020	3150	cameraView.repaint();
3021	3151	return;
3022	3152	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3045,6 +3175,10 @@
3045	3175	{
3046	3176	copy.live ^= true;
3047	3177	return;
	3178	+ } else if (event.getSource() == selectCB)
	3179	+ {
	3180	+ copy.dontselect ^= true;
	3181	+ return;
3048	3182	} else if (event.getSource() == hideCB)
3049	3183	{
3050	3184	copy.hide ^= true;
..	..	@@ -3059,6 +3193,7 @@
3059	3193	if (event.getSource() == randomCB)
3060	3194	{
3061	3195	copy.random ^= true;
	3196	+ objEditor.refreshContents();
3062	3197	return;
3063	3198	}
3064	3199	if (event.getSource() == speedupCB)
..	..	@@ -3082,8 +3217,9 @@
3082	3217
3083	3218	public void actionPerformed(ActionEvent event)
3084	3219	{
	3220	+ Object source = event.getSource();
3085	3221	// SCRIPT DIALOG
3086		- if (event.getSource() == okbutton)
	3222	+ if (source == okbutton)
3087	3223	{
3088	3224	textpanel.setVisible(false);
3089	3225	textpanel.remove(textarea);
..	..	@@ -3095,7 +3231,7 @@
3095	3231	textarea = null;
3096	3232	textpanel = null;
3097	3233	}
3098		- if (event.getSource() == cancelbutton)
	3234	+ if (source == cancelbutton)
3099	3235	{
3100	3236	textpanel.setVisible(false);
3101	3237	textpanel.remove(textarea);
..	..	@@ -3107,49 +3243,50 @@
3107	3243	//applySelf();
3108	3244	//client.refreshEditWindow();
3109	3245	//refreshContents();
3110		- if (event.getSource() == nameField)
	3246	+ if (source == nameField)
3111	3247	{
3112	3248	//System.out.println("ObjEditor " + event);
3113	3249	applySelf0(true);
3114	3250	//parent.applySelf();
3115	3251	objEditor.refreshContents();
3116		- } else if (event.getSource() == resetButton)
	3252	+ } else if (source == resetButton)
3117	3253	{
3118	3254	CameraPane.fullreset = true;
3119	3255	copy.Reset(); // ResetMeshes();
3120	3256	copy.Touch();
3121	3257	objEditor.refreshContents();
3122		- } else if (event.getSource() == stepItem)
	3258	+ } else if (source == stepItem)
3123	3259	{
3124		- cameraView.ONESTEP = true;
	3260	+ //cameraView.ONESTEP = true;
	3261	+ Globals.ONESTEP = true;
3125	3262	cameraView.repaint();
3126	3263	return;
3127		- } else if (event.getSource() == stepButton)
	3264	+ } else if (source == stepButton)
3128	3265	{
3129	3266	copy.Step();
3130	3267	copy.Touch();
3131	3268	objEditor.refreshContents();
3132		- } else if (event.getSource() == slowerButton)
	3269	+ } else if (source == slowerButton)
3133	3270	{
3134	3271	copy.Slower();
3135	3272	copy.Touch();
3136	3273	objEditor.refreshContents();
3137		- } else if (event.getSource() == fasterButton)
	3274	+ } else if (source == fasterButton)
3138	3275	{
3139	3276	copy.Faster();
3140	3277	copy.Touch();
3141	3278	objEditor.refreshContents();
3142		- } else if (event.getSource() == remarkButton)
	3279	+ } else if (source == remarkButton)
3143	3280	{
3144	3281	copy.Remark();
3145	3282	copy.Touch();
3146	3283	objEditor.refreshContents();
3147		- } else if (event.getSource() == stepAllButton)
	3284	+ } else if (source == stepAllButton)
3148	3285	{
3149	3286	copy.StepAll();
3150	3287	copy.Touch();
3151	3288	objEditor.refreshContents();
3152		- } else if (event.getSource() == resetAllButton)
	3289	+ } else if (source == resetAllButton)
3153	3290	{
3154	3291	//CameraPane.fullreset = true;
3155	3292	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3182,53 +3319,75 @@
3182	3319	// Close();
3183	3320	// }
3184	3321	// else
3185		- if (event.getSource() == resetSlidersButton)
	3322	+ if (source == resetSlidersButton)
3186	3323	{
3187	3324	ResetSliders();
3188		- } else if (event.getSource() == clearMaterialButton)
	3325	+ } else if (source == clearMaterialButton)
3189	3326	{
3190	3327	ClearMaterial();
3191		- } else if (event.getSource() == createMaterialButton)
	3328	+ } else if (source == createMaterialButton)
3192	3329	{
3193	3330	CreateMaterial();
3194		- } else if (event.getSource() == clearPanelButton)
	3331	+ } else if (source == clearPanelButton)
3195	3332	{
3196	3333	copy.ClearUI();
3197	3334	refreshContents(true);
3198		- } /*
3199		- }
3200		-
3201		- public boolean action(Event event, Object arg)
3202		- {
3203		- */ else if (event.getSource() == closeItem)
	3335	+ } else if (source == importGFDItem)
	3336	+ {
	3337	+ ImportGFD();
	3338	+ } else
	3339	+ if (source == importVRMLX3DItem)
	3340	+ {
	3341	+ ImportVRMLX3D();
	3342	+ } else
	3343	+ if (source == import3DSItem)
	3344	+ {
	3345	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3346	+ } else
	3347	+ if (source == importOBJItem)
	3348	+ {
	3349	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3350	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3351	+ browser.setVisible(true);
	3352	+ String filename = browser.getFile();
	3353	+ if (filename != null && filename.length() > 0)
	3354	+ {
	3355	+ String fullname = browser.getDirectory() + filename;
	3356	+ makeSomething(ReadOBJ(fullname), true);
	3357	+ }
	3358	+ } else
	3359	+ if (source == closeItem)
3204	3360	{
3205	3361	Close();
3206	3362	//return true;
3207		- } else if (event.getSource() == loadItem)
	3363	+ } else if (source == loadItem)
3208	3364	{
3209	3365	load();
3210	3366	//return true;
3211		- } else if (event.getSource() == saveItem)
	3367	+ } else if (source == newItem)
	3368	+ {
	3369	+ New();
	3370	+ } else if (source == saveItem)
3212	3371	{
3213	3372	save();
3214	3373	//return true;
3215		- } else if (event.getSource() == saveAsItem)
	3374	+ } else if (source == saveAsItem)
3216	3375	{
3217	3376	saveAs();
3218	3377	//return true;
3219		- } else if (event.getSource() == reexportItem)
	3378	+ } else if (source == reexportItem)
3220	3379	{
3221	3380	reexport();
3222	3381	//return true;
3223		- } else if (event.getSource() == exportAsItem)
	3382	+ } else if (source == exportAsItem)
3224	3383	{
3225	3384	export();
3226	3385	//return true;
3227		- } else if (event.getSource() == povItem)
	3386	+ } else if (source == povItem)
3228	3387	{
3229	3388	generatePOV();
3230	3389	//return true;
3231		- } else if (event.getSource() == zBufferItem)
	3390	+ } else if (source == zBufferItem)
3232	3391	{
3233	3392	try
3234	3393	{
..	..	@@ -3250,21 +3409,8 @@
3250	3409	cameraView.repaint();
3251	3410	//return true;
3252	3411	}
3253		- */ else if (event.getSource() == editCameraItem)
3254		- {
3255		- cameraView.ProtectCamera();
3256		- cameraView.repaint();
3257		- return;
3258		- } else if (event.getSource() == revertCameraItem)
3259		- {
3260		- cameraView.RevertCamera();
3261		- cameraView.repaint();
3262		- return;
3263		-// } else if (event.getSource() == textureButton)
3264		-// {
3265		-// return; // true;
3266		- } else // combos...
3267		- if (event.getSource() == texresMenu)
	3412	+ */ else // combos...
	3413	+ if (source == texresMenu)
3268	3414	{
3269	3415	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3270	3416	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3276,27 +3422,302 @@
3276	3422	}
3277	3423	}
3278	3424
3279		- void ToggleAnimation()
	3425	+ void New()
3280	3426	{
3281		- if (!CameraPane.ANIMATION)
	3427	+ while (copy.Size() > 1)
3282	3428	{
3283		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3429	+ copy.remove(1);
	3430	+ }
	3431	+
	3432	+ ResetModel();
	3433	+ objEditor.refreshContents();
	3434	+ }
	3435	+
	3436	+ static public byte[] Compress(Object3D o)
	3437	+ {
	3438	+ try
	3439	+ {
	3440	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3441	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3442	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3443	+
	3444	+ Object3D parent = o.parent;
	3445	+ o.parent = null;
	3446	+
	3447	+ out.writeObject(o);
	3448	+
	3449	+ o.parent = parent;
	3450	+
	3451	+ out.flush();
	3452	+
	3453	+ zstream.close();
	3454	+ out.close();
	3455	+
	3456	+ return baos.toByteArray();
	3457	+ } catch (Exception e)
	3458	+ {
	3459	+ System.err.println(e);
	3460	+ return null;
	3461	+ }
	3462	+ }
	3463	+
	3464	+ static public Object Uncompress(byte[] bytes)
	3465	+ {
	3466	+ System.out.println("#bytes = " + bytes.length);
	3467	+ try
	3468	+ {
	3469	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3470	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3471	+ ObjectInputStream in = new ObjectInputStream(istream);
	3472	+ Object obj = in.readObject();
	3473	+ in.close();
	3474	+
	3475	+ return obj;
	3476	+ } catch (Exception e)
	3477	+ {
	3478	+ System.err.println(e);
	3479	+ return null;
	3480	+ }
	3481	+ }
	3482	+
	3483	+ static public Object clone(Object o)
	3484	+ {
	3485	+ try
	3486	+ {
	3487	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3488	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3489	+
	3490	+ out.writeObject(o);
	3491	+
	3492	+ out.flush();
	3493	+ out.close();
	3494	+
	3495	+ byte[] bytes = baos.toByteArray();
	3496	+
	3497	+ System.out.println("clone = " + bytes.length);
	3498	+
	3499	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3500	+ ObjectInputStream in = new ObjectInputStream(bais);
	3501	+ Object obj = in.readObject();
	3502	+ in.close();
	3503	+
	3504	+ return obj;
	3505	+ } catch (Exception e)
	3506	+ {
	3507	+ System.err.println(e);
	3508	+ return null;
	3509	+ }
	3510	+ }
	3511	+
	3512	+ cRadio GetCurrentTab()
	3513	+ {
	3514	+ cRadio ab;
	3515	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3516	+ {
	3517	+ ab = (cRadio)e.nextElement();
	3518	+ if(ab.GetObject() == copy)
	3519	+ {
	3520	+ return ab;
	3521	+ }
	3522	+ }
	3523	+
	3524	+ return null;
	3525	+ }
	3526	+
	3527	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3528	+
	3529	+ public void Save()
	3530	+ {
	3531	+ System.err.println("Save");
	3532	+
	3533	+ cRadio tab = GetCurrentTab();
	3534	+
	3535	+ boolean temp = CameraPane.SWITCH;
	3536	+ CameraPane.SWITCH = false;
	3537	+
	3538	+ copy.ExtractBigData(hashtable);
	3539	+
	3540	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3541	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3542	+
	3543	+ copy.RestoreBigData(hashtable);
	3544	+
	3545	+ CameraPane.SWITCH = temp;
	3546	+
	3547	+ //assert(hashtable.isEmpty());
	3548	+
	3549	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3550	+ {
	3551	+ tab.graphs[i] = null;
	3552	+ }
	3553	+
	3554	+ SetUndoStates();
	3555	+
	3556	+ // test save
	3557	+ if (false)
	3558	+ {
	3559	+ try
	3560	+ {
	3561	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3562	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3563	+
	3564	+ p.writeObject(copy);
	3565	+
	3566	+ p.flush();
	3567	+
	3568	+ ostream.close();
	3569	+ } catch (Exception e)
	3570	+ {
	3571	+ e.printStackTrace();
	3572	+ }
	3573	+ }
	3574	+ }
	3575	+
	3576	+ void CopyChanged(Object3D obj)
	3577	+ {
	3578	+ SetUndoStates();
	3579	+
	3580	+ boolean temp = CameraPane.SWITCH;
	3581	+ CameraPane.SWITCH = false;
	3582	+
	3583	+ copy.ExtractBigData(hashtable);
	3584	+
	3585	+ copy.clear();
	3586	+
	3587	+ for (int i=0; i<obj.Size(); i++)
	3588	+ {
	3589	+ copy.add(obj.get(i));
	3590	+ }
	3591	+
	3592	+ copy.RestoreBigData(hashtable);
	3593	+
	3594	+ CameraPane.SWITCH = temp;
	3595	+
	3596	+ //assert(hashtable.isEmpty());
	3597	+
	3598	+ copy.Touch();
	3599	+
	3600	+ ResetModel();
	3601	+ copy.HardTouch(); // recompile?
	3602	+
	3603	+ cRadio ab;
	3604	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3605	+ {
	3606	+ ab = (cRadio)e.nextElement();
	3607	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3608	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3609	+ if (test != null)
	3610	+ {
	3611	+ test.editWindow = ab.object.editWindow;
	3612	+ ab.object = test;
	3613	+ }
	3614	+ }
	3615	+
	3616	+ refreshContents();
	3617	+ }
	3618	+
	3619	+ cButton undoButton;
	3620	+ cButton redoButton;
	3621	+
	3622	+ void SetUndoStates()
	3623	+ {
	3624	+ cRadio tab = GetCurrentTab();
	3625	+
	3626	+ undoButton.setEnabled(tab.undoindex > 0);
	3627	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3628	+ }
	3629	+
	3630	+ public void Undo()
	3631	+ {
	3632	+ System.err.println("Undo");
	3633	+
	3634	+ cRadio tab = GetCurrentTab();
	3635	+
	3636	+ if (tab.undoindex == 0)
	3637	+ {
	3638	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3639	+ return;
	3640	+ }
	3641	+
	3642	+ if (tab.graphs[tab.undoindex] == null)
	3643	+ {
	3644	+ Save();
	3645	+ tab.undoindex -= 1;
	3646	+ }
	3647	+
	3648	+ tab.undoindex -= 1;
	3649	+
	3650	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3651	+ }
	3652	+
	3653	+ public void Redo()
	3654	+ {
	3655	+ cRadio tab = GetCurrentTab();
	3656	+
	3657	+ if (tab.graphs[tab.undoindex + 1] == null)
	3658	+ {
	3659	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3660	+ return;
	3661	+ }
	3662	+
	3663	+ tab.undoindex += 1;
	3664	+
	3665	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3666	+ }
	3667	+
	3668	+ void ImportGFD()
	3669	+ {
	3670	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3284	3671	browser.show();
3285	3672	String filename = browser.getFile();
3286	3673	if (filename != null && filename.length() > 0)
3287	3674	{
3288		- CameraPane.filename = browser.getDirectory() + filename;
	3675	+ String fullname = browser.getDirectory() + filename;
	3676	+
	3677	+ //Object3D readobj =
	3678	+ objEditor.ReadGFD(fullname, objEditor);
	3679	+ //makeSomething(readobj);
	3680	+ }
	3681	+ }
	3682	+
	3683	+ void ImportVRMLX3D()
	3684	+ {
	3685	+ if (Grafreed.standAlone)
	3686	+ {
	3687	+ /**/
	3688	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3689	+ browser.show();
	3690	+ String filename = browser.getFile();
	3691	+ if (filename != null && filename.length() > 0)
	3692	+ {
	3693	+ String fullname = browser.getDirectory() + filename;
	3694	+ LoadVRMLX3D(fullname);
	3695	+ }
	3696	+ /**/
	3697	+ }
	3698	+ }
	3699	+
	3700	+ void ToggleAnimation()
	3701	+ {
	3702	+ if (!Globals.ANIMATION)
	3703	+ {
	3704	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3705	+ browser.setVisible(true);
	3706	+ String filename = browser.getFile();
	3707	+ if (filename != null && filename.length() > 0)
	3708	+ {
	3709	+ Globals.filename = browser.getDirectory() + filename;
3289	3710	//CameraPane.framecount = 0;
3290		- CameraPane.imagecount = 0;
	3711	+ Globals.imagecount = 0;
3291	3712
3292		- CameraPane.ANIMATION ^= true;
	3713	+ Globals.ANIMATION ^= true;
3293	3714
3294		- GrafreeD.wav.cursor = 0;
3295		- GrafreeD.wav.loop = 0;
	3715	+ Grafreed.wav.cursor = 0;
	3716	+ Grafreed.wav.loop = 0;
3296	3717	}
3297	3718	} else
3298	3719	{
3299		- CameraPane.ANIMATION ^= true;
	3720	+ Globals.ANIMATION ^= true;
3300	3721	}
3301	3722	}
3302	3723
..	..	@@ -3342,7 +3763,7 @@
3342	3763	void CreateMaterial()
3343	3764	{
3344	3765	//copy.ClearMaterial(); // PATCH
3345		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3766	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3346	3767	if (copy.selection.size() > 0)
3347	3768	//SetMaterial(copy);
3348	3769	{
..	..	@@ -3393,7 +3814,7 @@
3393	3814	assert false;
3394	3815	}
3395	3816
3396		- void EditSelection()
	3817	+ void EditSelection(boolean newWindow)
3397	3818	{
3398	3819	}
3399	3820
..	..	@@ -3401,11 +3822,11 @@
3401	3822	{
3402	3823	copy.ResetBlockLoop(); // temporary problem
3403	3824
3404		- boolean random = CameraPane.RANDOM;
3405		- CameraPane.RANDOM = false; // parse everything
	3825	+ boolean random = CameraPane.SWITCH;
	3826	+ CameraPane.SWITCH = false; // parse everything
3406	3827	copy.ResetDisplayList();
3407	3828	copy.HardTouch();
3408		- CameraPane.RANDOM = random;
	3829	+ CameraPane.SWITCH = random;
3409	3830	}
3410	3831
3411	3832	// public void applySelf()
..	..	@@ -3475,10 +3896,40 @@
3475	3896	current.fakedepth = (float) fakedepthField.getFloat();
3476	3897	current.shadowbias = (float) shadowbiasField.getFloat();
3477	3898
3478		- if (!NumberSlider.frozen)
	3899	+ if (!cNumberSlider.frozen)
3479	3900	{
3480	3901	//System.out.println("Propagate = " + propagate);
3481	3902	copy.UpdateMaterial(anchor, current, propagate);
	3903	+
	3904	+ if (copy.material != null)
	3905	+ {
	3906	+ cMaterial mat = copy.material;
	3907	+
	3908	+ colorField.SetToolTipValue((mat.color));
	3909	+ modulationField.SetToolTipValue((mat.modulation));
	3910	+ metalnessField.SetToolTipValue((mat.metalness));
	3911	+ diffuseField.SetToolTipValue((mat.diffuse));
	3912	+ specularField.SetToolTipValue((mat.specular));
	3913	+ shininessField.SetToolTipValue((mat.shininess));
	3914	+ shiftField.SetToolTipValue((mat.shift));
	3915	+ ambientField.SetToolTipValue((mat.ambient));
	3916	+ lightareaField.SetToolTipValue((mat.lightarea));
	3917	+ diffusenessField.SetToolTipValue((mat.factor));
	3918	+ velvetField.SetToolTipValue((mat.velvet));
	3919	+ sheenField.SetToolTipValue((mat.sheen));
	3920	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3921	+ backlitField.SetToolTipValue((mat.bump));
	3922	+ anisoField.SetToolTipValue((mat.aniso));
	3923	+ anisoVField.SetToolTipValue((mat.anisoV));
	3924	+ cameraField.SetToolTipValue((mat.cameralight));
	3925	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3926	+ shadowField.SetToolTipValue((mat.shadow));
	3927	+ textureField.SetToolTipValue((mat.texture));
	3928	+ opacityField.SetToolTipValue((mat.opacity));
	3929	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3930	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3931	+ }
	3932	+
3482	3933	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3483	3934	{
3484	3935	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3523,6 +3974,7 @@
3523	3974	\|\| e.getSource() == apertureField
3524	3975	\|\| e.getSource() == shadowblurField)
3525	3976	{
	3977	+ new Exception().printStackTrace();
3526	3978	System.exit(0);
3527	3979	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3528	3980	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3549,7 +4001,13 @@
3549	4001	//System.out.println("PARENT = " + parent);
3550	4002	//if (parent != null)
3551	4003	// parent.applySelf();
3552		- refreshContents();
	4004	+ if (e.getSource() == normalpushField)
	4005	+ {
	4006	+ objEditor.refreshContents();
	4007	+ //Refresh();
	4008	+ }
	4009	+ else
	4010	+ refreshContents();
3553	4011	// ??? client.refreshEditWindow();
3554	4012	}
3555	4013	//else
..	..	@@ -3561,7 +4019,7 @@
3561	4019	//group.name = nameField.getText();
3562	4020	//objEditor.applySelf();
3563	4021
3564		- assert (objEditor == this);
	4022	+ // OCT2018: assert (objEditor == this);
3565	4023	if (copy.selection == null \|\| copy.selection.size() == 0)
3566	4024	//super.applySelf()
3567	4025	; else
..	..	@@ -3585,6 +4043,9 @@
3585	4043	objEditor.copy = keep;
3586	4044	}
3587	4045	}
	4046	+
	4047	+ if (normalpushField != null)
	4048	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3588	4049	}
3589	4050
3590	4051	void SnapObject()
..	..	@@ -3839,7 +4300,7 @@
3839	4300
3840	4301	radioPanel.revalidate();
3841	4302	radioPanel.repaint();
3842		- ctrlPanel.revalidate(); // ? new
	4303	+ ctrlPanel.validate(); // ? new
3843	4304	ctrlPanel.repaint();
3844	4305	}
3845	4306	}
..	..	@@ -3848,6 +4309,8 @@
3848	4309
3849	4310	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3850	4311	{
	4312	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4313	+ Save();
3851	4314	//Tween.set(thing, 0).target(1).start(tweenManager);
3852	4315	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3853	4316	// if (thing instanceof GenericJointDemo)
..	..	@@ -3934,6 +4397,12 @@
3934	4397	{
3935	4398	ResetModel();
3936	4399	Select(thing.GetTreePath(), true, false); // unselect... false);
	4400	+
	4401	+ if (thing.Size() == 0)
	4402	+ {
	4403	+ //EditSelection(false);
	4404	+ }
	4405	+
3937	4406	refreshContents();
3938	4407	}
3939	4408
..	..	@@ -4051,6 +4520,7 @@
4051	4520	}
4052	4521	}
4053	4522	}
	4523	+
4054	4524	LoadGFDThread loadGFDThread;
4055	4525
4056	4526	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4070,8 +4540,10 @@
4070	4540
4071	4541	try
4072	4542	{
	4543	+ // Try compressed version first.
4073	4544	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4074		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4545	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4546	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4075	4547
4076	4548	readobj = (Object3D) p.readObject();
4077	4549	istream.close();
..	..	@@ -4079,7 +4551,20 @@
4079	4551	readobj.ResetDisplayList();
4080	4552	} catch (Exception e)
4081	4553	{
4082		- e.printStackTrace();
	4554	+ //e.printStackTrace();
	4555	+ try
	4556	+ {
	4557	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4558	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4559	+
	4560	+ readobj = (Object3D) p.readObject();
	4561	+ istream.close();
	4562	+
	4563	+ readobj.ResetDisplayList();
	4564	+ } catch (Exception e2)
	4565	+ {
	4566	+ e2.printStackTrace();
	4567	+ }
4083	4568	}
4084	4569	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4085	4570	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4125,6 +4610,12 @@
4125	4610
4126	4611	void LoadIt(Object obj)
4127	4612	{
	4613	+ if (obj == null)
	4614	+ {
	4615	+ // Invalid file
	4616	+ return;
	4617	+ }
	4618	+
4128	4619	System.out.println("Loaded " + obj);
4129	4620	//new Exception().printStackTrace();
4130	4621	Object3D readobj = (Object3D) obj;
..	..	@@ -4134,6 +4625,8 @@
4134	4625
4135	4626	if (readobj != null)
4136	4627	{
	4628	+ if (Globals.SAVEONMAKE)
	4629	+ Save();
4137	4630	try
4138	4631	{
4139	4632	//readobj.deepCopySelf(copy);
..	..	@@ -4196,7 +4689,7 @@
4196	4689
4197	4690	void load() // throws ClassNotFoundException
4198	4691	{
4199		- if (GrafreeD.standAlone)
	4692	+ if (Grafreed.standAlone)
4200	4693	{
4201	4694	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4202	4695	browser.show();
..	..	@@ -4283,11 +4776,13 @@
4283	4776	try
4284	4777	{
4285	4778	FileOutputStream ostream = new FileOutputStream(lastname);
4286		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4779	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4780	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4287	4781
4288	4782	p.writeObject(copy);
4289	4783	p.flush();
4290	4784
	4785	+ zstream.close();
4291	4786	ostream.close();
4292	4787
4293	4788	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4297,17 +4792,20 @@
4297	4792	{
4298	4793	}
4299	4794	}
	4795	+
4300	4796	String lastname;
4301	4797
4302	4798	void saveAs()
4303	4799	{
4304		- if (GrafreeD.standAlone)
	4800	+ if (Grafreed.standAlone)
4305	4801	{
4306	4802	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4307	4803	browser.setVisible(true);
4308	4804	String filename = browser.getFile();
4309	4805	if (filename != null && filename.length() > 0)
4310	4806	{
	4807	+ if (!filename.endsWith(".gfd"))
	4808	+ filename += ".gfd";
4311	4809	lastname = browser.getDirectory() + filename;
4312	4810	save();
4313	4811	}
..	..	@@ -4406,13 +4904,13 @@
4406	4904	try
4407	4905	{
4408	4906	FileOutputStream ostream = new FileOutputStream(filename);
4409		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4410		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4907	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4908	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4411	4909
4412	4910	Object3D objectparent = obj.parent;
4413	4911	obj.parent = null;
4414	4912
4415		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4913	+ Object3D object = (Object3D) Grafreed.clone(obj);
4416	4914
4417	4915	obj.parent = objectparent;
4418	4916
..	..	@@ -4424,8 +4922,8 @@
4424	4922	p.writeObject(object);
4425	4923	p.flush();
4426	4924
	4925	+ zstream.close();
4427	4926	ostream.close();
4428		- // zstream.close();
4429	4927
4430	4928	// group.selection.get(0).parent = parent;
4431	4929	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4446,7 +4944,7 @@
4446	4944	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4447	4945	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4448	4946	copy.generatePOV(buffer);
4449		- if (GrafreeD.standAlone)
	4947	+ if (Grafreed.standAlone)
4450	4948	{
4451	4949	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4452	4950	browser.show();
..	..	@@ -4472,7 +4970,8 @@
4472	4970	Object3D client;
4473	4971	Object3D copy;
4474	4972	MenuBar menuBar;
4475		- Menu windowMenu;
	4973	+ Menu fileMenu;
	4974	+ MenuItem newItem;
4476	4975	MenuItem loadItem;
4477	4976	MenuItem saveItem;
4478	4977	MenuItem saveAsItem;
..	..	@@ -4480,13 +4979,11 @@
4480	4979	MenuItem reexportItem;
4481	4980	MenuItem povItem;
4482	4981	MenuItem closeItem;
4483		- Menu cameraMenu;
	4982	+
4484	4983	CheckboxMenuItem zBufferItem;
4485	4984	//MenuItem normalLensItem;
4486		- MenuItem editCameraItem;
4487		- MenuItem revertCameraItem;
4488		- CheckboxMenuItem toggleLiveItem;
4489	4985	MenuItem stepItem;
	4986	+ CheckboxMenuItem toggleLiveItem;
4490	4987	CheckboxMenuItem toggleFullScreenItem;
4491	4988	CheckboxMenuItem toggleTimelineItem;
4492	4989	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4495,28 +4992,42 @@
4495	4992	CheckboxMenuItem toggleFootContactItem;
4496	4993	CheckboxMenuItem toggleDLItem;
4497	4994	CheckboxMenuItem toggleTextureItem;
4498		- CheckboxMenuItem toggleRandomItem;
	4995	+ CheckboxMenuItem toggleSwitchItem;
4499	4996	CheckboxMenuItem toggleRootItem;
4500	4997	CheckboxMenuItem animationItem;
4501	4998	CheckboxMenuItem toggleHandleItem;
4502	4999	CheckboxMenuItem togglePaintItem;
4503	5000	JSplitPane mainPanel;
4504	5001	JScrollPane scrollpane;
	5002	+
4505	5003	JPanel toolbarPanel;
4506		- JPanel treePanel;
	5004	+
	5005	+ cGridBag treePanel;
	5006	+
4507	5007	JPanel radioPanel;
4508	5008	ButtonGroup buttonGroup;
4509		- JPanel ctrlPanel;
4510		- JPanel materialPanel;
	5009	+
	5010	+ cGridBag toolboxPanel;
	5011	+ cGridBag materialPanel;
	5012	+ cGridBag ctrlPanel;
	5013	+
4511	5014	JScrollPane infoPanel;
4512		- JPanel optionsPanel;
	5015	+
	5016	+ cGridBag optionsPanel;
	5017	+
4513	5018	JTabbedPane objectPanel;
4514		- JPanel XYZPanel;
	5019	+ boolean materialFlushed;
	5020	+ Object3D latestObject;
	5021	+
	5022	+ cGridBag XYZPanel;
	5023	+
4515	5024	JSplitPane gridPanel;
4516	5025	JSplitPane bigPanel;
4517		- JPanel bigThree;
4518		- JTabbedPane scenePanel;
4519		- JPanel centralPanel;
	5026	+
	5027	+ cGridBag bigThree;
	5028	+ cGridBag scenePanel;
	5029	+ cGridBag centralPanel;
	5030	+ JSplitPane cameraPanel;
4520	5031	JPanel timelinePanel;
4521	5032	JMenuBar timelineMenubar;
4522	5033	JSplitPane framePanel;
..	..	@@ -4568,65 +5079,72 @@
4568	5079	// MATERIAL
4569	5080	JLabel materialLabel;
4570	5081	JLabel colorLabel;
4571		- NumberSlider colorField;
	5082	+ cNumberSlider colorField;
4572	5083	JLabel modulationLabel;
4573		- NumberSlider modulationField;
	5084	+ cNumberSlider modulationField;
4574	5085	JLabel metalnessLabel;
4575		- NumberSlider metalnessField;
	5086	+ cNumberSlider metalnessField;
4576	5087	JLabel diffuseLabel;
4577		- NumberSlider diffuseField;
	5088	+ cNumberSlider diffuseField;
4578	5089	JLabel specularLabel;
4579		- NumberSlider specularField;
	5090	+ cNumberSlider specularField;
4580	5091	JLabel shininessLabel;
4581		- NumberSlider shininessField;
	5092	+ cNumberSlider shininessField;
4582	5093	JLabel shiftLabel;
4583		- NumberSlider shiftField;
	5094	+ cNumberSlider shiftField;
4584	5095	JLabel ambientLabel;
4585		- NumberSlider ambientField;
	5096	+ cNumberSlider ambientField;
4586	5097	JLabel lightareaLabel;
4587		- NumberSlider lightareaField;
	5098	+ cNumberSlider lightareaField;
4588	5099	JLabel diffusenessLabel;
4589		- NumberSlider diffusenessField;
	5100	+ cNumberSlider diffusenessField;
4590	5101	JLabel velvetLabel;
4591		- NumberSlider velvetField;
	5102	+ cNumberSlider velvetField;
4592	5103	JLabel sheenLabel;
4593		- NumberSlider sheenField;
	5104	+ cNumberSlider sheenField;
4594	5105	JLabel subsurfaceLabel;
4595		- NumberSlider subsurfaceField;
	5106	+ cNumberSlider subsurfaceField;
4596	5107	//JLabel bumpLabel;
4597	5108	//NumberSlider bumpField;
4598	5109	JLabel backlitLabel;
4599		- NumberSlider backlitField;
	5110	+ cNumberSlider backlitField;
4600	5111	JLabel anisoLabel;
4601		- NumberSlider anisoField;
	5112	+ cNumberSlider anisoField;
4602	5113	JLabel anisoVLabel;
4603		- NumberSlider anisoVField;
	5114	+ cNumberSlider anisoVField;
4604	5115	JLabel cameraLabel;
4605		- NumberSlider cameraField;
	5116	+ cNumberSlider cameraField;
4606	5117	JLabel selfshadowLabel;
4607		- NumberSlider selfshadowField;
	5118	+ cNumberSlider selfshadowField;
4608	5119	JLabel shadowLabel;
4609		- NumberSlider shadowField;
	5120	+ cNumberSlider shadowField;
4610	5121	JLabel textureLabel;
4611		- NumberSlider textureField;
	5122	+ cNumberSlider textureField;
4612	5123	JLabel opacityLabel;
4613		- NumberSlider opacityField;
	5124	+ cNumberSlider opacityField;
4614	5125	JLabel fakedepthLabel;
4615		- NumberSlider fakedepthField;
	5126	+ cNumberSlider fakedepthField;
4616	5127	JLabel shadowbiasLabel;
4617		- NumberSlider shadowbiasField;
	5128	+ cNumberSlider shadowbiasField;
4618	5129	JLabel bumpLabel;
4619		- NumberSlider bumpField;
	5130	+ cNumberSlider bumpField;
4620	5131	JLabel noiseLabel;
4621		- NumberSlider noiseField;
	5132	+ cNumberSlider noiseField;
4622	5133	JLabel powerLabel;
4623		- NumberSlider powerField;
	5134	+ cNumberSlider powerField;
4624	5135	JLabel borderfadeLabel;
4625		- NumberSlider borderfadeField;
	5136	+ cNumberSlider borderfadeField;
4626	5137	JLabel fogLabel;
4627		- NumberSlider fogField;
	5138	+ cNumberSlider fogField;
4628	5139	JLabel opacityPowerLabel;
4629		- NumberSlider opacityPowerField;
4630		- JTree jTree;
	5140	+ cNumberSlider opacityPowerField;
	5141	+ cTree jTree;
4631	5142	//ObjectUI parent;
	5143	+
	5144	+ cNumberSlider normalpushField;
	5145	+
	5146	+ private MenuItem importGFDItem;
	5147	+ private MenuItem importVRMLX3DItem;
	5148	+ private MenuItem import3DSItem;
	5149	+ private MenuItem importOBJItem;
4632	5150	}