~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,47 +191,54 @@
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);
163	234
164		- Remove(normalpushField);
	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);
165	242	}
166	243
167	244	public ObjEditor GetEditor()
..	..	@@ -232,6 +309,7 @@
232	309	//localCopy.parent = null;
233	310
234	311	frame = new JFrame();
	312	+ frame.setUndecorated(true);
235	313	objEditor = this;
236	314	this.callee = callee;
237	315
..	..	@@ -262,27 +340,48 @@
262	340	return frame.action(event, obj);
263	341	}
264	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	+
265	348	void SetupMenu()
266	349	{
267	350	frame.setMenuBar(menuBar = new MenuBar());
268		- menuBar.add(windowMenu = new Menu("File"));
269		- windowMenu.add(loadItem = new MenuItem("Load..."));
270		- windowMenu.add("-");
271		- windowMenu.add(saveItem = new MenuItem("Save"));
272		- 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..."));
273	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
274		- windowMenu.add("-");
275		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
276		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
277		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
278	376	if (client.parent != null)
279	377	{
280		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
281	379	} else
282	380	{
283		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
284	382	}
285	383
	384	+ newItem.addActionListener(this);
286	385	loadItem.addActionListener(this);
287	386	saveItem.addActionListener(this);
288	387	saveAsItem.addActionListener(this);
..	..	@@ -291,79 +390,64 @@
291	390	//povItem.addActionListener(this);
292	391	closeItem.addActionListener(this);
293	392
294		- menuBar.add(cameraMenu = new Menu("View"));
295		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
296		- //zBufferItem.addActionListener(this);
297		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
298		- //normalLensItem.addActionListener(this);
299		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
300		- revertCameraItem.addActionListener(this);
301		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
302		- toggleTimelineItem.addItemListener(this);
303		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
304		- toggleFullScreenItem.addItemListener(this);
305		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
306		- cameraMenu.add("-");
307		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
308		- toggleTextureItem.addItemListener(this);
309		- toggleTextureItem.setState(CameraPane.textureon);
310		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311		- toggleLiveItem.addItemListener(this);
312		- toggleLiveItem.setState(CameraPane.isLIVE());
313		- cameraMenu.add(stepItem = new MenuItem("Step"));
314		- stepItem.addActionListener(this);
315		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
316		-// toggleDLItem.addItemListener(this);
317		-// toggleDLItem.setState(false);
318		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
319		- toggleRenderItem.addItemListener(this);
320		- toggleRenderItem.setState(!CameraPane.frozen);
321		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
322		- toggleDebugItem.addItemListener(this);
323		- toggleDebugItem.setState(CameraPane.DEBUG);
324		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
325		- toggleFrustumItem.addItemListener(this);
326		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
327		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
328		- toggleFootContactItem.addItemListener(this);
329		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
330		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
331		- toggleRandomItem.addItemListener(this);
332		- toggleRandomItem.setState(CameraPane.RANDOM);
333		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
334		- toggleHandleItem.addItemListener(this);
335		- toggleHandleItem.setState(CameraPane.HANDLES);
336		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
337		- togglePaintItem.addItemListener(this);
338		- togglePaintItem.setState(CameraPane.PAINTMODE);
339		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
340		-// toggleRootItem.addItemListener(this);
341		-// toggleRootItem.setState(false);
342		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
343		-// animationItem.addItemListener(this);
344		-// animationItem.setState(CameraPane.ANIMATION);
345		- cameraMenu.add("-");
346		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
347		- editCameraItem.addActionListener(this);
348		-
349	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	+
350	420	toolbarPanel = new JPanel();
351	421	toolbarPanel.setName("Toolbar");
352		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
353	423	treePanel.setName("Tree");
354		- ctrlPanel = new JPanel(); // new GridBagLayout());
355		- ctrlPanel.setName("Edit");
356		- 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);
357	438	materialPanel.setName("Material");
	439	+
358	440	/JTextPane/
359	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
360	444	infoarea.setEditable(true);
361	445	SetText();
362	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
363	447	// infoarea.setOpaque(false);
364	448	// //infoarea.setForeground(textcolor);
365		- infoarea.setLineWrap(true);
366		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
367	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
368	452	infoPanel.setPreferredSize(new Dimension(50, 200));
369	453	infoPanel.setName("Info");
..	..	@@ -374,16 +458,23 @@
374	458	mainPanel.setName("Main");
375	459	mainPanel.setContinuousLayout(true);
376	460	mainPanel.setOneTouchExpandable(true);
377		- mainPanel.setDividerLocation(1.0);
378	461	mainPanel.setDividerSize(9);
379		- mainPanel.setResizeWeight(0);
380		-
	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	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
381	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
382	473	//mainPanel.setLayout(new GridBagLayout());
383	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384		- treePanel.setLayout(new GridBagLayout());
385		- ctrlPanel.setLayout(new GridBagLayout());
386		- materialPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
	477	+ //materialPanel.setLayout(new GridBagLayout());
387	478
388	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389	480	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -422,7 +513,7 @@
422	513	static String newline = "\n";
423	514	protected static final String buttonString = "JButton";
424	515	StyledDocument doc;
425		- JTextArea infoarea;
	516	+ JTextPane infoarea;
426	517
427	518	void ClearInfo()
428	519	{
..	..	@@ -445,10 +536,10 @@
445	536	e.printStackTrace();
446	537	}
447	538
448		- String selection = infoarea.getText();
449		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
450		- java.awt.datatransfer.Clipboard clipboard =
451		- Toolkit.getDefaultToolkit().getSystemClipboard();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
452	543	//clipboard.setContents(data, data);
453	544	}
454	545
..	..	@@ -471,13 +562,13 @@
471	562	//SendInfo("Name:", "bold");
472	563	if (sel.GetTextures() != null \|\| debug)
473	564	{
474		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
475	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
476	567	if (sel.Size() > 0)
477	568	{
478	569	si.SendInfo("#children = " + sel.Size(), "regular");
479	570	}
480		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
481	572	if (debug)
482	573	{
483	574	try
..	..	@@ -489,7 +580,10 @@
489	580	}
490	581
491	582	if (full)
492		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
493	587
494	588	if (sel.bRep != null)
495	589	{
..	..	@@ -516,7 +610,7 @@
516	610	}
517	611	if (sel.support != null)
518	612	{
519		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
520	614	}
521	615	if (sel.scriptnode != null)
522	616	{
..	..	@@ -587,6 +681,9 @@
587	681	{
588	682	CameraPane.pointflow = (PointFlow) sel;
589	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
590	687	}
591	688	}
592	689
..	..	@@ -602,68 +699,140 @@
602	699	}
603	700	}
604	701
	702	+static GraphicsDevice device = GraphicsEnvironment
	703	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
	720	+
	721	+ void Minimize()
	722	+ {
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ }
	725	+
	726	+ void Maximize()
	727	+ {
	728	+ if (maximized)
	729	+ {
	730	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	731	+ }
	732	+ else
	733	+ {
	734	+ keeprect = frame.getBounds();
	735	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	736	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	737	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	738	+// frame.setState(Frame.MAXIMIZED_BOTH);
	739	+ }
	740	+
	741	+ maximized ^= true;
	742	+ }
	743	+
605	744	void ToggleFullScreen()
606	745	{
607		- if (CameraPane.FULLSCREEN)
	746	+ cameraView.ToggleFullScreen();
	747	+
	748	+ if (!CameraPane.FULLSCREEN)
608	749	{
609		- frame.getContentPane().remove(/"Center",/bigThree);
610		- framePanel.add(bigThree);
611		- frame.getContentPane().add(/"Center",/framePanel);
	750	+ device.setFullScreenWindow(null);
	751	+ //frame.setVisible(false);
	752	+// frame.removeNotify();
	753	+// frame.setUndecorated(false);
	754	+// frame.addNotify();
	755	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	756	+
	757	+// X frame.getContentPane().remove(/"Center",/bigThree);
	758	+// X framePanel.add(bigThree);
	759	+// X frame.getContentPane().add(/"Center",/framePanel);
	760	+ framePanel.setDividerLocation(1);
	761	+
	762	+ //frame.setVisible(true);
	763	+ radio.layout = keepButton;
	764	+ //theFrame = null;
	765	+ keepButton = null;
	766	+ radio.layout.doClick();
	767	+
612	768	} else
613	769	{
614		- frame.getContentPane().remove(/"Center",/framePanel);
615		- framePanel.remove(bigThree);
616		- frame.getContentPane().add(/"Center",/bigThree);
	770	+ keepButton = radio.layout;
	771	+ //keeprect = frame.getBounds();
	772	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	773	+// frame.getToolkit().getScreenSize().height);
	774	+ //frame.setVisible(false);
	775	+ device.setFullScreenWindow(frame);
	776	+// frame.removeNotify();
	777	+// frame.setUndecorated(true);
	778	+// frame.addNotify();
	779	+// X frame.getContentPane().remove(/"Center",/framePanel);
	780	+// X framePanel.remove(bigThree);
	781	+// X frame.getContentPane().add(/"Center",/bigThree);
	782	+ framePanel.setDividerLocation(0);
	783	+
	784	+ radio.layout = fullscreenLayout;
	785	+ radio.layout.doClick();
	786	+ //frame.setVisible(true);
617	787	}
618		- cameraView.ToggleFullScreen();
619	788	}
620	789
621		- private JTextArea createTextPane()
	790	+ private JTextPane createTextPane()
622	791	{
623		- String[] initString =
624		- {
625		- "This is an editable JTextPane, ", //regular
626		- "another ", //italic
627		- "styled ", //bold
628		- "text ", //small
629		- "component, ", //large
630		- "which supports embedded components..." + newline,//regular
631		- " " + newline, //button
632		- "...and embedded icons..." + newline, //regular
633		- " ", //icon
634		- newline + "JTextPane is a subclass of JEditorPane that "
635		- + "uses a StyledEditorKit and StyledDocument, and provides "
636		- + "cover methods for interacting with those objects."
637		- };
	792	+// TEXTAREA String[] initString =
	793	+// {
	794	+// "This is an editable JTextPane, ", //regular
	795	+// "another ", //italic
	796	+// "styled ", //bold
	797	+// "text ", //small
	798	+// "component, ", //large
	799	+// "which supports embedded components..." + newline,//regular
	800	+// " " + newline, //button
	801	+// "...and embedded icons..." + newline, //regular
	802	+// " ", //icon
	803	+// newline + "JTextPane is a subclass of JEditorPane that "
	804	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	805	+// + "cover methods for interacting with those objects."
	806	+// };
	807	+//
	808	+// String[] initStyles =
	809	+// {
	810	+// "regular", "italic", "bold", "small", "large",
	811	+// "regular", "button", "regular", "icon",
	812	+// "regular"
	813	+// };
	814	+//
	815	+// JTextPane textPane = new JTextPane();
	816	+// textPane.setEditable(true);
	817	+// /StyledDocument/ doc = textPane.getStyledDocument();
	818	+// addStylesToDocument(doc);
	819	+//
	820	+// try
	821	+// {
	822	+// for (int j = 0; j < 2; j++)
	823	+// {
	824	+// for (int i = 0; i < initString.length; i++)
	825	+// {
	826	+// doc.insertString(doc.getLength(), initString[i],
	827	+// doc.getStyle(initStyles[i]));
	828	+// }
	829	+// }
	830	+// } catch (BadLocationException ble)
	831	+// {
	832	+// System.err.println("Couldn't insert initial text into text pane.");
	833	+// }
638	834
639		- String[] initStyles =
640		- {
641		- "regular", "italic", "bold", "small", "large",
642		- "regular", "button", "regular", "icon",
643		- "regular"
644		- };
645		-
646		- JTextPane textPane = new JTextPane();
647		- textPane.setEditable(true);
648		- /StyledDocument/ doc = textPane.getStyledDocument();
649		- addStylesToDocument(doc);
650		-
651		- try
652		- {
653		- for (int j = 0; j < 2; j++)
654		- {
655		- for (int i = 0; i < initString.length; i++)
656		- {
657		- doc.insertString(doc.getLength(), initString[i],
658		- doc.getStyle(initStyles[i]));
659		- }
660		- }
661		- } catch (BadLocationException ble)
662		- {
663		- System.err.println("Couldn't insert initial text into text pane.");
664		- }
665		-
666		- return new JTextArea(); // textPane;
	835	+ return new JTextPane(); // textPane;
667	836	}
668	837
669	838	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -716,7 +885,7 @@
716	885	protected static ImageIcon createImageIcon(String path,
717	886	String description)
718	887	{
719		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	888	+ java.net.URL imgURL = Grafreed.class.getResource(path);
720	889	if (imgURL != null)
721	890	{
722	891	return new ImageIcon(imgURL, description);
..	..	@@ -748,6 +917,7 @@
748	917	// NumberSlider vDivsField;
749	918	// JCheckBox endcaps;
750	919	JCheckBox liveCB;
	920	+ JCheckBox selectCB;
751	921	JCheckBox hideCB;
752	922	JCheckBox link2masterCB;
753	923	JCheckBox markCB;
..	..	@@ -755,7 +925,12 @@
755	925	JCheckBox speedupCB;
756	926	JCheckBox rewindCB;
757	927	JCheckBox flipVCB;
	928	+
	929	+ cCheckBox toggleTextureCB;
	930	+ cCheckBox toggleSwitchCB;
	931	+
758	932	JComboBox texresMenu;
	933	+
759	934	JButton resetButton;
760	935	JButton stepButton;
761	936	JButton stepAllButton;
..	..	@@ -763,115 +938,87 @@
763	938	JButton slowerButton;
764	939	JButton fasterButton;
765	940	JButton remarkButton;
	941	+
	942	+ cGridBag editPanel;
	943	+ cGridBag editCommandsPanel;
	944	+
	945	+ cGridBag namePanel;
	946	+ cGridBag setupPanel;
	947	+ cGridBag setupPanel2;
	948	+ cGridBag objectCommandsPanel;
	949	+ cGridBag pushPanel;
	950	+ cGridBag fillPanel;
766	951
767		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	952	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
768	953	{
769	954	JCheckBox cb;
770	955
771		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
772		- oe.aConstraints.gridwidth = 1; // 3;
773		-// oe.aConstraints.weightx = 1;
774		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
775		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	956	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
776	957	cb.addItemListener(this);
777		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
778		- oe.aConstraints.gridwidth = 1;
779		- oe.aConstraints.gridx += 1;
780	958
781	959	return cb;
782	960	}
783	961
784		- cButton AddButton(ObjEditor oe, String label)
	962	+ cButton AddButton(cGridBag panel, String label)
785	963	{
786	964	cButton cb;
787	965
788		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
789		- oe.aConstraints.gridwidth = 1;
790		-// oe.aConstraints.weightx = 1;
791		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
792		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	966	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
793	967	cb.addActionListener(this);
794		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
795		- oe.aConstraints.gridwidth = 1;
796		- oe.aConstraints.gridx += 1;
797	968
798	969	return cb;
799	970	}
800	971
801		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	972	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
802	973	{
803	974	JComboBox combo;
804	975
805		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
806		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
807		- oe.aConstraints.gridx += 1;
	976	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	977	combo.addActionListener(this);
809	978
810	979	return combo;
811	980	}
812	981
813		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	982	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
814	983	{
815		- NumberSlider combo;
	984	+ cGridBag control = new cGridBag();
	985	+
	986	+ cNumberSlider combo;
816	987
817	988	JLabel jlabel = new JLabel(label);
818		-
819		- aConstraints.fill = GridBagConstraints.VERTICAL;
820	989	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
821		- aConstraints.gridwidth = 1;
822		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
825		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
826		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.gridwidth = 1;
829		-
	990	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	991	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830	992	combo.setFloat(current);
831		-
832		- combo.label = jlabel;
833		-
834		- combo.addChangeListener(this);
835		-
836		- return combo;
	993	+
	994	+ panel.add(control);
	995	+
	996	+ return control;
837	997	}
838	998
839		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	999	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
840	1000	{
841		- NumberSlider combo;
	1001	+ cGridBag control = new cGridBag();
	1002	+
	1003	+ cNumberSlider combo;
842	1004
843	1005	JLabel jlabel = new JLabel(label);
844		-
845		- aConstraints.fill = GridBagConstraints.VERTICAL;
846	1006	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
847		- aConstraints.gridwidth = 2;
848		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
851		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
852		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.gridwidth = 1;
855		-
	1007	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1008	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856	1009	combo.setInteger(current);
857	1010
858		- combo.label = jlabel;
859		-
860		- combo.addChangeListener(this);
861		-
862		- return combo;
	1011	+ panel.add(control);
	1012	+
	1013	+ return control;
863	1014	}
864	1015
865		- JTextArea AddText(JPanel ctrlPanel, String name)
	1016	+ JTextArea AddText(cGridBag ctrlPanel, String name)
866	1017	{
867	1018	JTextArea text;
868	1019
869		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
870		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1020	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872	1021	text.addCaretListener(this);
873		- aConstraints.gridx += 1;
874		- aConstraints.gridwidth = 1;
875	1022
876	1023	return text;
877	1024	}
..	..	@@ -901,9 +1048,16 @@
901	1048	objEditor.ctrlPanel.remove(j);
902	1049	}
903	1050
	1051	+ void Remove(cNumberSlider j)
	1052	+ {
	1053	+ j.removeChangeListener(this);
	1054	+ //objEditor.ctrlPanel.remove(j.label);
	1055	+ objEditor.ctrlPanel.remove(j);
	1056	+ }
	1057	+
904	1058	/*
905	1059	*/
906		- void Return() // ObjEditor oe)
	1060	+ void Return0() // ObjEditor oe)
907	1061	{
908	1062	aConstraints.gridy += 1;
909	1063	aConstraints.gridx = 0;
..	..	@@ -958,37 +1112,76 @@
958	1112
959	1113	void SetupUI2(ObjEditor oe)
960	1114	{
961		-// oe.aConstraints.weightx = 0;
962		-// oe.aConstraints.weighty = 0;
963		-// oe.aConstraints.gridx = 0;
964		-// oe.aConstraints.gridy = 0;
965		- SetupName(oe);
	1115	+ //SetupName(oe);
966	1116
967		- if (!GroupEditor.allparams)
	1117	+ namePanel = new cGridBag();
	1118	+
	1119	+ nameField = AddText(namePanel, copy.GetName());
	1120	+ namePanel.add(nameField);
	1121	+ oe.ctrlPanel.add(namePanel);
	1122	+
	1123	+ oe.ctrlPanel.Return();
	1124	+
	1125	+ if (!allparams)
968	1126	return;
969	1127
970		- liveCB = AddCheckBox(oe, "Live", copy.live);
971		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1128	+ setupPanel = new cGridBag().setVertical(false);
	1129	+
	1130	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1131	+ liveCB.setToolTipText("Animate object");
	1132	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1133	+ selectCB.setToolTipText("Make object selectable");
973	1134	// Return();
974		- markCB = AddCheckBox(oe, "Mark", copy.marked);
975		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
976		- randomCB = AddCheckBox(oe, "Rand", copy.random);
977		- Return();
978		- resetButton = AddButton(oe, "Reset");
979		- stepButton = AddButton(oe, "Step");
	1135	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1136	+ hideCB.setToolTipText("Hide object");
	1137	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1138	+ markCB.setToolTipText("As animation target transform");
	1139	+
	1140	+ setupPanel2 = new cGridBag().setVertical(false);
	1141	+
	1142	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1143	+ rewindCB.setToolTipText("Rewind animation");
	1144	+
	1145	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1146	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1147	+
	1148	+ if (Globals.ADVANCED)
	1149	+ {
	1150	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1151	+ link2masterCB.setToolTipText("Attach to support");
	1152	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1153	+ speedupCB.setToolTipText("Option motion capture");
	1154	+ }
	1155	+
	1156	+ oe.ctrlPanel.add(setupPanel);
	1157	+ oe.ctrlPanel.Return();
	1158	+ oe.ctrlPanel.add(setupPanel2);
	1159	+ oe.ctrlPanel.Return();
	1160	+
	1161	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1162	+
	1163	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1164	+ resetButton.setToolTipText("Jump to frame zero");
	1165	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1166	+ stepButton.setToolTipText("Step one frame");
980	1167	// resetAllButton = AddButton(oe, "Reset All");
981	1168	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
983	1169	// Return();
984		- slowerButton = AddButton(oe, "Slow");
985		- fasterButton = AddButton(oe, "Fast");
986		- remarkButton = AddButton(oe, "Rem");
	1170	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1171	+ slowerButton.setToolTipText("Decrease animation speed");
	1172	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1173	+ fasterButton.setToolTipText("Increase animation speed");
	1174	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1175	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1176
988		- Return();
	1177	+ oe.ctrlPanel.add(objectCommandsPanel);
	1178	+ oe.ctrlPanel.Return();
989	1179
990		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991		- Return();
	1180	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1181	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1182	+ //Return();
	1183	+
	1184	+ oe.ctrlPanel.Return();
992	1185
993	1186	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
994	1187	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1083,7 +1276,7 @@
1083	1276	oe.aConstraints.gridwidth = 1;
1084	1277	/**/
1085	1278	nameField = AddText(oe.ctrlPanel, copy.GetName());
1086		- Return();
	1279	+ oe.ctrlPanel.Return();
1087	1280
1088	1281	//ctrlPanel.add(textureButton = new Button("Texture..."));
1089	1282	//textureButton.setEnabled(false);
..	..	@@ -1185,11 +1378,25 @@
1185	1378	//JPanel worldPanel =
1186	1379	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187	1380	//worldPanel.setName("World");
1188		- centralPanel = new JPanel(new BorderLayout());
1189		- timelinePanel = new JPanel(new BorderLayout());
1190		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1381	+ centralPanel = new cGridBag();
	1382	+ centralPanel.preferredWidth = 20;
	1383	+
	1384	+ if (Globals.ADVANCED)
	1385	+ {
	1386	+ timelinePanel = new JPanel(new BorderLayout());
	1387	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191	1388
	1389	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1390	+ cameraPanel.setContinuousLayout(true);
	1391	+ cameraPanel.setOneTouchExpandable(true);
	1392	+// cameraPanel.setDividerLocation(0.9);
	1393	+// cameraPanel.setDividerSize(9);
	1394	+ cameraPanel.setResizeWeight(1.0);
	1395	+
	1396	+ }
	1397	+
1192	1398	centralPanel.add(cameraView);
	1399	+ centralPanel.setFocusable(true);
1193	1400	//frame.setJMenuBar(timelineMenubar);
1194	1401	//centralPanel.add(timelinePanel);
1195	1402
..	..	@@ -1208,12 +1415,13 @@
1208	1415	//frontView.object = copy;
1209	1416	//sideView.object = copy;
1210	1417
1211		- XYZPanel = new JPanel();
1212		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1418	+ XYZPanel = new cGridBag().setVertical(true);
	1419	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1213	1420
1214		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1215		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1216		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1421	+ XYZPanel.preferredWidth = 5;
	1422	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1423	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1424	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1217	1425
1218	1426	/*
1219	1427	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1251,11 +1459,13 @@
1251	1459	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1252	1460	//tmp.setName("Edit");
1253	1461	objectPanel.add(materialPanel);
1254		- JPanel north = new JPanel(new BorderLayout());
1255		- north.setName("Edit");
1256		- north.add(ctrlPanel, BorderLayout.NORTH);
1257		- objectPanel.add(north);
	1462	+// JPanel north = new JPanel(new BorderLayout());
	1463	+// north.setName("Edit");
	1464	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1465	+// objectPanel.add(north);
	1466	+ objectPanel.add(editPanel);
1258	1467	objectPanel.add(infoPanel);
	1468	+ objectPanel.add(toolboxPanel);
1259	1469
1260	1470	/*
1261	1471	aConstraints.gridx = 0;
..	..	@@ -1264,7 +1474,7 @@
1264	1474	aConstraints.gridy += 1;
1265	1475	aConstraints.gridwidth = 1;
1266	1476	mainPanel.add(objectPanel, aConstraints);
1267		- */
	1477	+ */
1268	1478
1269	1479	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1270	1480	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1275,16 +1485,23 @@
1275	1485	scrollpane.setWheelScrollingEnabled(true);
1276	1486	scrollpane.addMouseWheelListener(this); // Default not fast enough
1277	1487
1278		- /JTabbedPane/ scenePanel = new JTabbedPane();
1279		- scenePanel.add(scrollpane);
	1488	+ /JTabbedPane/ scenePanel = new cGridBag();
	1489	+ scenePanel.preferredWidth = 6;
	1490	+
	1491	+ JTabbedPane tabbedPane = new JTabbedPane();
	1492	+ tabbedPane.add(scrollpane);
1280	1493
1281		- scenePanel.add(FSPane = new cFileSystemPane(this));
1282		-
1283		- optionsPanel = new JPanel(new GridBagLayout());
	1494	+ optionsPanel = new cGridBag().setVertical(false);
1284	1495
1285	1496	optionsPanel.setName("Options");
1286		- scenePanel.add(optionsPanel);
	1497	+
	1498	+ AddOptions(optionsPanel); //, aConstraints);
	1499	+
	1500	+ tabbedPane.add(optionsPanel);
	1501	+
	1502	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1287	1503
	1504	+ scenePanel.add(tabbedPane);
1288	1505
1289	1506	/*
1290	1507	cTree jTree = new cTree(null);
..	..	@@ -1318,6 +1535,7 @@
1318	1535	//bigPanel.setSize(new Dimension(10,10));
1319	1536	//bigPanel.add(ctrlPanel);
1320	1537	//bigPanel.add(gridPanel);
	1538	+ /**
1321	1539	bigThree = new JPanel();
1322	1540	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1323	1541	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1341,7 +1559,13 @@
1341	1559	// aConstraints.gridheight = 3;
1342	1560	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1343	1561	bigThree.add(XYZPanel, aWindowConstraints);
	1562	+ /**/
1344	1563
	1564	+ bigThree = new cGridBag();
	1565	+ bigThree.addComponent(scenePanel);
	1566	+ bigThree.addComponent(centralPanel);
	1567	+ bigThree.addComponent(XYZPanel);
	1568	+
1345	1569	// // SIDE EFFECT!!!
1346	1570	// aConstraints.gridx = 0;
1347	1571	// aConstraints.gridy = 0;
..	..	@@ -1362,14 +1586,19 @@
1362	1586	//worldPane.add(bigPanel);
1363	1587	//worldPane.add(worldPanel);
1364	1588	/**/
1365		- frame.getContentPane().add(/"Center",/framePanel);
	1589	+ //frame.getContentPane().add(/"Center",/framePanel);
	1590	+ frame.add(/"Center",/framePanel);
1366	1591	//frame.getContentPane().add(/"Center",/ worldPane);
1367	1592
1368	1593	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1369	1594
1370		- frame.setSize(1024, 768);
1371		- frame.show();
	1595	+ frame.setSize(1280, 860);
	1596	+
	1597	+ frame.validate();
	1598	+ frame.setVisible(true);
1372	1599
	1600	+ cameraView.requestFocusInWindow();
	1601	+
1373	1602	gridPanel.setDividerLocation(1.0);
1374	1603
1375	1604	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1383,6 +1612,10 @@
1383	1612	});
1384	1613	}
1385	1614
	1615	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1616	+ {
	1617	+ }
	1618	+
1386	1619	JTree GetTree()
1387	1620	{
1388	1621	return objEditor.jTree;
..	..	@@ -1394,260 +1627,173 @@
1394	1627	ctrlPanel.removeAll();
1395	1628	}
1396	1629
1397		- void SetupMaterial(JPanel ctrlPanel)
	1630	+ void SetupMaterial(cGridBag panel)
1398	1631	{
1399		- aConstraints.weighty = 0;
1400		- //aConstraints.weightx = 1;
1401		- /*
	1632	+ /*
1402	1633	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1403	1634	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1404		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1405		- aConstraints.gridx += 1;
1406	1635	*/
1407	1636
1408		- aConstraints.gridwidth = 1;
1409		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1410		- aConstraints.gridx += 1;
1411		- aConstraints.weighty = 0;
1412		- aConstraints.gridwidth = 1;
	1637	+ cGridBag editBar = new cGridBag().setVertical(false);
	1638	+
	1639	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1640	+ createMaterialButton.setToolTipText("Create material");
1413	1641
1414	1642	/*
1415	1643	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1416		- aConstraints.gridx += 1;
1417		- aConstraints.weighty = 0;
1418		- aConstraints.gridwidth = 1;
1419	1644	*/
1420	1645
1421		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1422		- aConstraints.gridx += 1;
	1646	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1647	+ clearMaterialButton.setToolTipText("Clear material");
	1648	+
	1649	+ if (Globals.ADVANCED)
	1650	+ {
	1651	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1652	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1653	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1654	+ }
1423	1655
1424		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1425		-
1426		- aConstraints.gridx += 1;
1427		-
1428		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1429		-
1430		- aConstraints.gridx += 1;
1431		-
1432		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1433		-
1434		- aConstraints.gridx = 0;
1435		- aConstraints.gridy += 1;
1436		- aConstraints.weighty = 0;
1437		- aConstraints.gridwidth = 1;
	1656	+ editBar.preferredHeight = 15;
	1657	+
	1658	+ panel.add(editBar);
	1659	+
1438	1660	/**/
1439	1661	//aConstraints.weighty = 0;
1440	1662	////aConstraints.weightx = 1;
1441	1663	//aConstraints.weighty = 1;
1442	1664	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1443	1665	//aConstraints.gridx += 1;
1444		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1445		- aConstraints.weighty = 0;
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	1666	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1449	1667
1450		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1451		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- //aConstraints.weightx = 0;
1456		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1457		- aConstraints.gridx = 0;
1458		- aConstraints.gridy += 1;
1459		- aConstraints.gridwidth = 1;
	1668	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1669	+
	1670	+ cGridBag color = new cGridBag();
	1671	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1672	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1673	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1674	+ //colorField.preferredWidth = 200;
	1675	+ colorSection.add(color);
1460	1676
1461		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1462		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1463		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1464		- aConstraints.gridx += 1;
1465		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- aConstraints.gridwidth = 1;
	1677	+ cGridBag modulation = new cGridBag();
	1678	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1679	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1680	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1681	+ colorSection.add(modulation);
1470	1682
1471		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1472		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- aConstraints.gridwidth = 1;
	1683	+ cGridBag texture = new cGridBag();
	1684	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1685	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1686	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1687	+ colorSection.add(texture);
1480	1688
1481		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1482		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484		- aConstraints.gridx += 1;
1485		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487		- aConstraints.gridx = 0;
1488		- aConstraints.gridy += 1;
1489		- aConstraints.gridwidth = 1;
	1689	+ cGridBag anisoU = new cGridBag();
	1690	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1691	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1692	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1693	+ colorSection.add(anisoU);
1490	1694
1491		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1492		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494		- aConstraints.gridx += 1;
1495		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497		- aConstraints.gridx = 0;
1498		- aConstraints.gridy += 1;
1499		- aConstraints.gridwidth = 1;
	1695	+ cGridBag anisoV = new cGridBag();
	1696	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1697	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1698	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1699	+ colorSection.add(anisoV);
1500	1700
1501		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1502		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504		- aConstraints.gridx += 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1507		- aConstraints.gridx = 0;
1508		- aConstraints.gridy += 1;
1509		- aConstraints.gridwidth = 1;
	1701	+ cGridBag shadowbias = new cGridBag();
	1702	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1703	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1704	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1705	+ colorSection.add(shadowbias);
1510	1706
1511		- //aConstraints.weighty = 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1513		- //aConstraints.gridx += 1;
1514		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1515		- aConstraints.weighty = 0;
1516		- aConstraints.gridx = 0;
1517		- aConstraints.gridy += 1;
1518		- aConstraints.gridwidth = 1;
	1707	+ panel.add(new JSeparator());
	1708	+
	1709	+ panel.add(colorSection);
	1710	+
	1711	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1712	+
	1713	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1714	+
	1715	+ cGridBag diffuse = new cGridBag();
	1716	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1717	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1718	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1719	+ diffuseSection.add(diffuse);
1519	1720
1520		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1521		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1523		- aConstraints.gridx += 1;
1524		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1525		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- aConstraints.gridwidth = 1;
	1721	+ cGridBag diffuseness = new cGridBag();
	1722	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1723	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1724	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1725	+ diffuseSection.add(diffuseness);
1529	1726
1530		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1531		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- aConstraints.gridwidth = 1;
	1727	+ cGridBag selfshadow = new cGridBag();
	1728	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1729	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1730	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1731	+ diffuseSection.add(selfshadow);
1539	1732
1540		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1541		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- aConstraints.gridwidth = 1;
	1733	+ cGridBag sheen = new cGridBag();
	1734	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1735	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1736	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1737	+ diffuseSection.add(sheen);
1549	1738
1550		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1551		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- aConstraints.gridwidth = 1;
	1739	+ cGridBag subsurface = new cGridBag();
	1740	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1741	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1742	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1743	+ diffuseSection.add(subsurface);
1559	1744
1560		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1561		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563		- aConstraints.gridx += 1;
1564		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1566		- aConstraints.gridx = 0;
1567		- aConstraints.gridy += 1;
1568		- aConstraints.gridwidth = 1;
	1745	+ cGridBag shadow = new cGridBag();
	1746	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1747	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1748	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1749	+ diffuseSection.add(shadow);
1569	1750
1570		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1571		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573		- aConstraints.gridx += 1;
1574		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1576		- aConstraints.gridx = 0;
1577		- aConstraints.gridy += 1;
1578		- aConstraints.gridwidth = 1;
	1751	+ cGridBag fakedepth = new cGridBag();
	1752	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1753	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1754	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1755	+ diffuseSection.add(fakedepth);
1579	1756
1580		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1581		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583		- aConstraints.gridx += 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1586		- aConstraints.gridx = 0;
1587		- aConstraints.gridy += 1;
1588		- aConstraints.gridwidth = 1;
	1757	+ panel.add(new JSeparator());
	1758	+
	1759	+ panel.add(diffuseSection);
	1760	+
	1761	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1762	+
	1763	+ cGridBag specularSection = new cGridBag().setVertical(true);
1589	1764
1590		- //aConstraints.weighty = 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1592		- //aConstraints.gridx += 1;
1593		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1594		- aConstraints.weighty = 0;
1595		- aConstraints.gridx = 0;
1596		- aConstraints.gridy += 1;
1597		- aConstraints.gridwidth = 1;
	1765	+ cGridBag specular = new cGridBag();
	1766	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1767	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1768	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1769	+ specularSection.add(specular);
1598	1770
1599		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1600		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1601		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1602		- aConstraints.gridx += 1;
1603		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- aConstraints.gridwidth = 1;
	1771	+ cGridBag lightarea = new cGridBag();
	1772	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1773	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1774	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1775	+ specularSection.add(lightarea);
1608	1776
1609		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1610		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- aConstraints.gridwidth = 1;
	1777	+ cGridBag shininess = new cGridBag();
	1778	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1779	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1780	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1781	+ specularSection.add(shininess);
1618	1782
1619		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1620		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622		- aConstraints.gridx += 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1625		- aConstraints.gridx = 0;
1626		- aConstraints.gridy += 1;
1627		- aConstraints.gridwidth = 1;
	1783	+ cGridBag metalness = new cGridBag();
	1784	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1785	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1786	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1787	+ specularSection.add(metalness);
1628	1788
1629		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1630		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632		- aConstraints.gridx += 1;
1633		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
	1789	+ cGridBag velvet = new cGridBag();
	1790	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1791	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1792	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1793	+ specularSection.add(velvet);
1638	1794
1639		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1640		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
1648		-
1649		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1650		- Return();
	1795	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1796	+ //Return();
1651	1797	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1652	1798	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653	1799	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1658,130 +1804,93 @@
1658	1804	// aConstraints.gridy += 1;
1659	1805	// aConstraints.gridwidth = 1;
1660	1806
1661		- //aConstraints.weighty = 1;
1662		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1663		- //aConstraints.gridx += 1;
1664		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1665		- aConstraints.weighty = 0;
1666		- aConstraints.gridx = 0;
1667		- aConstraints.gridy += 1;
1668		- aConstraints.gridwidth = 1;
1669	1807
1670		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1671		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1673		- aConstraints.gridx += 1;
1674		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- aConstraints.gridwidth = 1;
	1808	+ panel.add(new JSeparator());
	1809	+
	1810	+ panel.add(specularSection);
	1811	+
	1812	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1813	+
	1814	+ cGridBag globalSection = new cGridBag().setVertical(true);
1679	1815
1680		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1681		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	1816	+ cGridBag camera = new cGridBag();
	1817	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1818	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1819	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1820	+ globalSection.add(camera);
1689	1821
1690		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1691		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
	1822	+ cGridBag ambient = new cGridBag();
	1823	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1824	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1825	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1826	+ globalSection.add(ambient);
1699	1827
1700		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1701		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
1709		- aConstraints.weighty = 0;
	1828	+ cGridBag backlit = new cGridBag();
	1829	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1830	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1831	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1832	+ globalSection.add(backlit);
1710	1833
1711		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1712		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1714		- aConstraints.gridx += 1;
1715		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1716		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1717		- aConstraints.gridx = 0;
1718		- aConstraints.gridy += 1;
1719		- aConstraints.gridwidth = 1;
	1834	+ cGridBag opacity = new cGridBag();
	1835	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1836	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1837	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1838	+ globalSection.add(opacity);
1720	1839
1721		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1722		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- aConstraints.gridwidth = 1;
	1840	+ panel.add(new JSeparator());
	1841	+
	1842	+ panel.add(globalSection);
	1843	+
	1844	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1845	+
	1846	+ cGridBag textureSection = new cGridBag().setVertical(true);
1730	1847
1731		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1732		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- aConstraints.gridwidth = 1;
	1848	+ cGridBag bump = new cGridBag();
	1849	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1850	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1851	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1852	+ textureSection.add(bump);
1740	1853
1741		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1742		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744		- aConstraints.gridx += 1;
1745		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy += 1;
1749		- aConstraints.gridwidth = 1;
	1854	+ cGridBag noise = new cGridBag();
	1855	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1856	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1857	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1858	+ textureSection.add(noise);
1750	1859
1751		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1752		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754		- aConstraints.gridx += 1;
1755		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1757		- aConstraints.gridx = 0;
1758		- aConstraints.gridy += 1;
1759		- aConstraints.gridwidth = 1;
	1860	+ cGridBag power = new cGridBag();
	1861	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1862	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1863	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1864	+ textureSection.add(power);
1760	1865
1761		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1762		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764		- aConstraints.gridx += 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1767		- aConstraints.gridx = 0;
1768		- aConstraints.gridy += 1;
1769		- aConstraints.gridwidth = 1;
	1866	+ cGridBag borderfade = new cGridBag();
	1867	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1868	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1869	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1870	+ textureSection.add(borderfade);
1770	1871
1771		- //aConstraints.weighty = 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1773		- //aConstraints.gridx += 1;
1774		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1775		- aConstraints.weighty = 0;
	1872	+ cGridBag fog = new cGridBag();
	1873	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1874	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1875	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1876	+ textureSection.add(fog);
1776	1877
1777		- aConstraints.gridx = 0;
1778		- aConstraints.gridy = 0;
1779		- aConstraints.gridwidth = 1;
	1878	+ cGridBag opacityPower = new cGridBag();
	1879	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1880	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1881	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1882	+ textureSection.add(opacityPower);
	1883	+
	1884	+ panel.add(new JSeparator());
	1885	+
	1886	+ panel.add(textureSection);
	1887	+
	1888	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1780	1889
1781	1890	SetMaterial(copy); // .GetMaterial());
1782	1891
1783		- colorField.addChangeListener(this);
1784		- modulationField.addChangeListener(this);
	1892	+ //colorField.addChangeListener(this);
	1893	+// modulationField.addChangeListener(this);
1785	1894	metalnessField.addChangeListener(this);
1786	1895	diffuseField.addChangeListener(this);
1787	1896	specularField.addChangeListener(this);
..	..	@@ -1811,12 +1920,15 @@
1811	1920	opacityPowerField.addChangeListener(this);
1812	1921	/**/
1813	1922
1814		- resetSlidersButton.addActionListener(this);
1815	1923	clearMaterialButton.addActionListener(this);
1816	1924	createMaterialButton.addActionListener(this);
1817		-
1818		- propagateToggle.addItemListener(this);
1819		- multiplyToggle.addItemListener(this);
	1925	+
	1926	+ if (Globals.ADVANCED)
	1927	+ {
	1928	+ resetSlidersButton.addActionListener(this);
	1929	+ propagateToggle.addItemListener(this);
	1930	+ multiplyToggle.addItemListener(this);
	1931	+ }
1820	1932	}
1821	1933
1822	1934	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1987,7 +2099,7 @@
1987	2099
1988	2100	//? flashIt = false;
1989	2101	CameraPane pane = (CameraPane) cameraView;
1990		- pane.clickStart(location.x, location.y, 0);
	2102	+ pane.clickStart(location.x, location.y, 0, 0);
1991	2103	pane.clickEnd(location.x, location.y, 0, true);
1992	2104
1993	2105	if (group.selection.size() == 1)
..	..	@@ -2036,6 +2148,7 @@
2036	2148	e2.printStackTrace();
2037	2149	}
2038	2150	}
	2151	+
2039	2152	LoadJMEThread loadThread;
2040	2153
2041	2154	class LoadJMEThread extends Thread
..	..	@@ -2093,6 +2206,7 @@
2093	2206	//LoadFile0(filename, converter);
2094	2207	}
2095	2208	}
	2209	+
2096	2210	LoadOBJThread loadObjThread;
2097	2211
2098	2212	class LoadOBJThread extends Thread
..	..	@@ -2171,19 +2285,19 @@
2171	2285
2172	2286	void LoadObjFile(String fullname)
2173	2287	{
2174		- /*
	2288	+ System.out.println("Loading " + fullname);
	2289	+ /**/
2175	2290	//lastFilename = fullname;
2176	2291	if(loadObjThread == null)
2177	2292	{
2178		- loadObjThread = new LoadOBJThread();
2179		- loadObjThread.start();
	2293	+ loadObjThread = new LoadOBJThread();
	2294	+ loadObjThread.start();
2180	2295	}
2181	2296
2182	2297	loadObjThread.add(fullname);
2183		- */
	2298	+ /**/
2184	2299
2185		- System.out.println("Loading " + fullname);
2186		- makeSomething(new FileObject(fullname, true), true);
	2300	+ //makeSomething(new FileObject(fullname, true), true);
2187	2301	}
2188	2302
2189	2303	void LoadGFDFile(String fullname)
..	..	@@ -2444,11 +2558,11 @@
2444	2558
2445	2559	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2446	2560	{
2447		- if (GrafreeD.standAlone)
	2561	+ if (Grafreed.standAlone)
2448	2562	{
2449	2563	/**/
2450	2564	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2451		- browser.show();
	2565	+ browser.setVisible(true);
2452	2566	String filename = browser.getFile();
2453	2567	if (filename != null && filename.length() > 0)
2454	2568	{
..	..	@@ -2593,6 +2707,7 @@
2593	2707	}
2594	2708	if (input == null)
2595	2709	{
	2710	+ new Exception().printStackTrace();
2596	2711	System.exit(0);
2597	2712	}
2598	2713
..	..	@@ -2799,6 +2914,8 @@
2799	2914
2800	2915	void SetMaterial(Object3D object)
2801	2916	{
	2917	+ latestObject = object;
	2918	+
2802	2919	cMaterial mat = object.material;
2803	2920
2804	2921	if (mat == null)
..	..	@@ -2807,7 +2924,8 @@
2807	2924	return;
2808	2925	}
2809	2926
2810		- multiplyToggle.setSelected(mat.multiply);
	2927	+ if (multiplyToggle != null)
	2928	+ multiplyToggle.setSelected(mat.multiply);
2811	2929
2812	2930	assert (object.projectedVertices != null);
2813	2931
..	..	@@ -2909,12 +3027,17 @@
2909	3027	// }
2910	3028
2911	3029	/**/
2912		- if (deselect)
	3030	+ if (deselect \|\| child == null)
2913	3031	{
2914	3032	//group.deselectAll();
2915	3033	//freeze = true;
2916	3034	GetTree().clearSelection();
2917	3035	//freeze = false;
	3036	+
	3037	+ if (child == null)
	3038	+ {
	3039	+ return;
	3040	+ }
2918	3041	}
2919	3042
2920	3043	//group.addSelectee(child);
..	..	@@ -2983,7 +3106,7 @@
2983	3106	cameraView.ToggleDL();
2984	3107	cameraView.repaint();
2985	3108	return;
2986		- } else if (event.getSource() == toggleTextureItem)
	3109	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2987	3110	{
2988	3111	cameraView.ToggleTexture();
2989	3112	// june 2013 copy.HardTouch();
..	..	@@ -2996,7 +3119,8 @@
2996	3119	if (timeline)
2997	3120	{
2998	3121	centralPanel.remove(cameraView);
2999		- centralPanel.add(timelinePanel);
	3122	+ cameraPanel.add(cameraView);
	3123	+ centralPanel.add(cameraPanel);
3000	3124	frame.setJMenuBar(timelineMenubar);
3001	3125	wasFullScreen = CameraPane.FULLSCREEN;
3002	3126	if (!CameraPane.FULLSCREEN)
..	..	@@ -3005,7 +3129,7 @@
3005	3129	}
3006	3130	else
3007	3131	{
3008		- centralPanel.remove(timelinePanel);
	3132	+ centralPanel.remove(cameraPanel);
3009	3133	centralPanel.add(cameraView);
3010	3134	frame.setJMenuBar(null);
3011	3135	if (!wasFullScreen)
..	..	@@ -3021,9 +3145,9 @@
3021	3145	frame.validate();
3022	3146
3023	3147	return;
3024		- } else if (event.getSource() == toggleRandomItem)
	3148	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3025	3149	{
3026		- cameraView.ToggleRandom();
	3150	+ cameraView.ToggleSwitch();
3027	3151	cameraView.repaint();
3028	3152	return;
3029	3153	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3052,6 +3176,10 @@
3052	3176	{
3053	3177	copy.live ^= true;
3054	3178	return;
	3179	+ } else if (event.getSource() == selectCB)
	3180	+ {
	3181	+ copy.dontselect ^= true;
	3182	+ return;
3055	3183	} else if (event.getSource() == hideCB)
3056	3184	{
3057	3185	copy.hide ^= true;
..	..	@@ -3066,6 +3194,7 @@
3066	3194	if (event.getSource() == randomCB)
3067	3195	{
3068	3196	copy.random ^= true;
	3197	+ objEditor.refreshContents();
3069	3198	return;
3070	3199	}
3071	3200	if (event.getSource() == speedupCB)
..	..	@@ -3089,8 +3218,9 @@
3089	3218
3090	3219	public void actionPerformed(ActionEvent event)
3091	3220	{
	3221	+ Object source = event.getSource();
3092	3222	// SCRIPT DIALOG
3093		- if (event.getSource() == okbutton)
	3223	+ if (source == okbutton)
3094	3224	{
3095	3225	textpanel.setVisible(false);
3096	3226	textpanel.remove(textarea);
..	..	@@ -3102,7 +3232,7 @@
3102	3232	textarea = null;
3103	3233	textpanel = null;
3104	3234	}
3105		- if (event.getSource() == cancelbutton)
	3235	+ if (source == cancelbutton)
3106	3236	{
3107	3237	textpanel.setVisible(false);
3108	3238	textpanel.remove(textarea);
..	..	@@ -3114,49 +3244,50 @@
3114	3244	//applySelf();
3115	3245	//client.refreshEditWindow();
3116	3246	//refreshContents();
3117		- if (event.getSource() == nameField)
	3247	+ if (source == nameField)
3118	3248	{
3119	3249	//System.out.println("ObjEditor " + event);
3120	3250	applySelf0(true);
3121	3251	//parent.applySelf();
3122	3252	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetButton)
	3253	+ } else if (source == resetButton)
3124	3254	{
3125	3255	CameraPane.fullreset = true;
3126	3256	copy.Reset(); // ResetMeshes();
3127	3257	copy.Touch();
3128	3258	objEditor.refreshContents();
3129		- } else if (event.getSource() == stepItem)
	3259	+ } else if (source == stepItem)
3130	3260	{
3131		- cameraView.ONESTEP = true;
	3261	+ //cameraView.ONESTEP = true;
	3262	+ Globals.ONESTEP = true;
3132	3263	cameraView.repaint();
3133	3264	return;
3134		- } else if (event.getSource() == stepButton)
	3265	+ } else if (source == stepButton)
3135	3266	{
3136	3267	copy.Step();
3137	3268	copy.Touch();
3138	3269	objEditor.refreshContents();
3139		- } else if (event.getSource() == slowerButton)
	3270	+ } else if (source == slowerButton)
3140	3271	{
3141	3272	copy.Slower();
3142	3273	copy.Touch();
3143	3274	objEditor.refreshContents();
3144		- } else if (event.getSource() == fasterButton)
	3275	+ } else if (source == fasterButton)
3145	3276	{
3146	3277	copy.Faster();
3147	3278	copy.Touch();
3148	3279	objEditor.refreshContents();
3149		- } else if (event.getSource() == remarkButton)
	3280	+ } else if (source == remarkButton)
3150	3281	{
3151	3282	copy.Remark();
3152	3283	copy.Touch();
3153	3284	objEditor.refreshContents();
3154		- } else if (event.getSource() == stepAllButton)
	3285	+ } else if (source == stepAllButton)
3155	3286	{
3156	3287	copy.StepAll();
3157	3288	copy.Touch();
3158	3289	objEditor.refreshContents();
3159		- } else if (event.getSource() == resetAllButton)
	3290	+ } else if (source == resetAllButton)
3160	3291	{
3161	3292	//CameraPane.fullreset = true;
3162	3293	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3189,53 +3320,75 @@
3189	3320	// Close();
3190	3321	// }
3191	3322	// else
3192		- if (event.getSource() == resetSlidersButton)
	3323	+ if (source == resetSlidersButton)
3193	3324	{
3194	3325	ResetSliders();
3195		- } else if (event.getSource() == clearMaterialButton)
	3326	+ } else if (source == clearMaterialButton)
3196	3327	{
3197	3328	ClearMaterial();
3198		- } else if (event.getSource() == createMaterialButton)
	3329	+ } else if (source == createMaterialButton)
3199	3330	{
3200	3331	CreateMaterial();
3201		- } else if (event.getSource() == clearPanelButton)
	3332	+ } else if (source == clearPanelButton)
3202	3333	{
3203	3334	copy.ClearUI();
3204	3335	refreshContents(true);
3205		- } /*
3206		- }
3207		-
3208		- public boolean action(Event event, Object arg)
3209		- {
3210		- */ else if (event.getSource() == closeItem)
	3336	+ } else if (source == importGFDItem)
	3337	+ {
	3338	+ ImportGFD();
	3339	+ } else
	3340	+ if (source == importVRMLX3DItem)
	3341	+ {
	3342	+ ImportVRMLX3D();
	3343	+ } else
	3344	+ if (source == import3DSItem)
	3345	+ {
	3346	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3347	+ } else
	3348	+ if (source == importOBJItem)
	3349	+ {
	3350	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3351	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3352	+ browser.setVisible(true);
	3353	+ String filename = browser.getFile();
	3354	+ if (filename != null && filename.length() > 0)
	3355	+ {
	3356	+ String fullname = browser.getDirectory() + filename;
	3357	+ makeSomething(ReadOBJ(fullname), true);
	3358	+ }
	3359	+ } else
	3360	+ if (source == closeItem)
3211	3361	{
3212	3362	Close();
3213	3363	//return true;
3214		- } else if (event.getSource() == loadItem)
	3364	+ } else if (source == loadItem)
3215	3365	{
3216	3366	load();
3217	3367	//return true;
3218		- } else if (event.getSource() == saveItem)
	3368	+ } else if (source == newItem)
	3369	+ {
	3370	+ New();
	3371	+ } else if (source == saveItem)
3219	3372	{
3220	3373	save();
3221	3374	//return true;
3222		- } else if (event.getSource() == saveAsItem)
	3375	+ } else if (source == saveAsItem)
3223	3376	{
3224	3377	saveAs();
3225	3378	//return true;
3226		- } else if (event.getSource() == reexportItem)
	3379	+ } else if (source == reexportItem)
3227	3380	{
3228	3381	reexport();
3229	3382	//return true;
3230		- } else if (event.getSource() == exportAsItem)
	3383	+ } else if (source == exportAsItem)
3231	3384	{
3232	3385	export();
3233	3386	//return true;
3234		- } else if (event.getSource() == povItem)
	3387	+ } else if (source == povItem)
3235	3388	{
3236	3389	generatePOV();
3237	3390	//return true;
3238		- } else if (event.getSource() == zBufferItem)
	3391	+ } else if (source == zBufferItem)
3239	3392	{
3240	3393	try
3241	3394	{
..	..	@@ -3257,21 +3410,8 @@
3257	3410	cameraView.repaint();
3258	3411	//return true;
3259	3412	}
3260		- */ else if (event.getSource() == editCameraItem)
3261		- {
3262		- cameraView.ProtectCamera();
3263		- cameraView.repaint();
3264		- return;
3265		- } else if (event.getSource() == revertCameraItem)
3266		- {
3267		- cameraView.RevertCamera();
3268		- cameraView.repaint();
3269		- return;
3270		-// } else if (event.getSource() == textureButton)
3271		-// {
3272		-// return; // true;
3273		- } else // combos...
3274		- if (event.getSource() == texresMenu)
	3413	+ */ else // combos...
	3414	+ if (source == texresMenu)
3275	3415	{
3276	3416	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3277	3417	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3283,27 +3423,302 @@
3283	3423	}
3284	3424	}
3285	3425
3286		- void ToggleAnimation()
	3426	+ void New()
3287	3427	{
3288		- if (!CameraPane.ANIMATION)
	3428	+ while (copy.Size() > 1)
3289	3429	{
3290		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3430	+ copy.remove(1);
	3431	+ }
	3432	+
	3433	+ ResetModel();
	3434	+ objEditor.refreshContents();
	3435	+ }
	3436	+
	3437	+ static public byte[] Compress(Object3D o)
	3438	+ {
	3439	+ try
	3440	+ {
	3441	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3442	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3443	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3444	+
	3445	+ Object3D parent = o.parent;
	3446	+ o.parent = null;
	3447	+
	3448	+ out.writeObject(o);
	3449	+
	3450	+ o.parent = parent;
	3451	+
	3452	+ out.flush();
	3453	+
	3454	+ zstream.close();
	3455	+ out.close();
	3456	+
	3457	+ return baos.toByteArray();
	3458	+ } catch (Exception e)
	3459	+ {
	3460	+ System.err.println(e);
	3461	+ return null;
	3462	+ }
	3463	+ }
	3464	+
	3465	+ static public Object Uncompress(byte[] bytes)
	3466	+ {
	3467	+ System.out.println("#bytes = " + bytes.length);
	3468	+ try
	3469	+ {
	3470	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3471	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3472	+ ObjectInputStream in = new ObjectInputStream(istream);
	3473	+ Object obj = in.readObject();
	3474	+ in.close();
	3475	+
	3476	+ return obj;
	3477	+ } catch (Exception e)
	3478	+ {
	3479	+ System.err.println(e);
	3480	+ return null;
	3481	+ }
	3482	+ }
	3483	+
	3484	+ static public Object clone(Object o)
	3485	+ {
	3486	+ try
	3487	+ {
	3488	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3489	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3490	+
	3491	+ out.writeObject(o);
	3492	+
	3493	+ out.flush();
	3494	+ out.close();
	3495	+
	3496	+ byte[] bytes = baos.toByteArray();
	3497	+
	3498	+ System.out.println("clone = " + bytes.length);
	3499	+
	3500	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3501	+ ObjectInputStream in = new ObjectInputStream(bais);
	3502	+ Object obj = in.readObject();
	3503	+ in.close();
	3504	+
	3505	+ return obj;
	3506	+ } catch (Exception e)
	3507	+ {
	3508	+ System.err.println(e);
	3509	+ return null;
	3510	+ }
	3511	+ }
	3512	+
	3513	+ cRadio GetCurrentTab()
	3514	+ {
	3515	+ cRadio ab;
	3516	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3517	+ {
	3518	+ ab = (cRadio)e.nextElement();
	3519	+ if(ab.GetObject() == copy)
	3520	+ {
	3521	+ return ab;
	3522	+ }
	3523	+ }
	3524	+
	3525	+ return null;
	3526	+ }
	3527	+
	3528	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3529	+
	3530	+ public void Save()
	3531	+ {
	3532	+ System.err.println("Save");
	3533	+
	3534	+ cRadio tab = GetCurrentTab();
	3535	+
	3536	+ boolean temp = CameraPane.SWITCH;
	3537	+ CameraPane.SWITCH = false;
	3538	+
	3539	+ copy.ExtractBigData(hashtable);
	3540	+
	3541	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3542	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3543	+
	3544	+ copy.RestoreBigData(hashtable);
	3545	+
	3546	+ CameraPane.SWITCH = temp;
	3547	+
	3548	+ //assert(hashtable.isEmpty());
	3549	+
	3550	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3551	+ {
	3552	+ tab.graphs[i] = null;
	3553	+ }
	3554	+
	3555	+ SetUndoStates();
	3556	+
	3557	+ // test save
	3558	+ if (false)
	3559	+ {
	3560	+ try
	3561	+ {
	3562	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3563	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3564	+
	3565	+ p.writeObject(copy);
	3566	+
	3567	+ p.flush();
	3568	+
	3569	+ ostream.close();
	3570	+ } catch (Exception e)
	3571	+ {
	3572	+ e.printStackTrace();
	3573	+ }
	3574	+ }
	3575	+ }
	3576	+
	3577	+ void CopyChanged(Object3D obj)
	3578	+ {
	3579	+ SetUndoStates();
	3580	+
	3581	+ boolean temp = CameraPane.SWITCH;
	3582	+ CameraPane.SWITCH = false;
	3583	+
	3584	+ copy.ExtractBigData(hashtable);
	3585	+
	3586	+ copy.clear();
	3587	+
	3588	+ for (int i=0; i<obj.Size(); i++)
	3589	+ {
	3590	+ copy.add(obj.get(i));
	3591	+ }
	3592	+
	3593	+ copy.RestoreBigData(hashtable);
	3594	+
	3595	+ CameraPane.SWITCH = temp;
	3596	+
	3597	+ //assert(hashtable.isEmpty());
	3598	+
	3599	+ copy.Touch();
	3600	+
	3601	+ ResetModel();
	3602	+ copy.HardTouch(); // recompile?
	3603	+
	3604	+ cRadio ab;
	3605	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3606	+ {
	3607	+ ab = (cRadio)e.nextElement();
	3608	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3609	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3610	+ if (test != null)
	3611	+ {
	3612	+ test.editWindow = ab.object.editWindow;
	3613	+ ab.object = test;
	3614	+ }
	3615	+ }
	3616	+
	3617	+ refreshContents();
	3618	+ }
	3619	+
	3620	+ cButton undoButton;
	3621	+ cButton redoButton;
	3622	+
	3623	+ void SetUndoStates()
	3624	+ {
	3625	+ cRadio tab = GetCurrentTab();
	3626	+
	3627	+ undoButton.setEnabled(tab.undoindex > 0);
	3628	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3629	+ }
	3630	+
	3631	+ public void Undo()
	3632	+ {
	3633	+ System.err.println("Undo");
	3634	+
	3635	+ cRadio tab = GetCurrentTab();
	3636	+
	3637	+ if (tab.undoindex == 0)
	3638	+ {
	3639	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3640	+ return;
	3641	+ }
	3642	+
	3643	+ if (tab.graphs[tab.undoindex] == null)
	3644	+ {
	3645	+ Save();
	3646	+ tab.undoindex -= 1;
	3647	+ }
	3648	+
	3649	+ tab.undoindex -= 1;
	3650	+
	3651	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3652	+ }
	3653	+
	3654	+ public void Redo()
	3655	+ {
	3656	+ cRadio tab = GetCurrentTab();
	3657	+
	3658	+ if (tab.graphs[tab.undoindex + 1] == null)
	3659	+ {
	3660	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3661	+ return;
	3662	+ }
	3663	+
	3664	+ tab.undoindex += 1;
	3665	+
	3666	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3667	+ }
	3668	+
	3669	+ void ImportGFD()
	3670	+ {
	3671	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3291	3672	browser.show();
3292	3673	String filename = browser.getFile();
3293	3674	if (filename != null && filename.length() > 0)
3294	3675	{
3295		- CameraPane.filename = browser.getDirectory() + filename;
	3676	+ String fullname = browser.getDirectory() + filename;
	3677	+
	3678	+ //Object3D readobj =
	3679	+ objEditor.ReadGFD(fullname, objEditor);
	3680	+ //makeSomething(readobj);
	3681	+ }
	3682	+ }
	3683	+
	3684	+ void ImportVRMLX3D()
	3685	+ {
	3686	+ if (Grafreed.standAlone)
	3687	+ {
	3688	+ /**/
	3689	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3690	+ browser.show();
	3691	+ String filename = browser.getFile();
	3692	+ if (filename != null && filename.length() > 0)
	3693	+ {
	3694	+ String fullname = browser.getDirectory() + filename;
	3695	+ LoadVRMLX3D(fullname);
	3696	+ }
	3697	+ /**/
	3698	+ }
	3699	+ }
	3700	+
	3701	+ void ToggleAnimation()
	3702	+ {
	3703	+ if (!Globals.ANIMATION)
	3704	+ {
	3705	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3706	+ browser.setVisible(true);
	3707	+ String filename = browser.getFile();
	3708	+ if (filename != null && filename.length() > 0)
	3709	+ {
	3710	+ Globals.filename = browser.getDirectory() + filename;
3296	3711	//CameraPane.framecount = 0;
3297		- CameraPane.imagecount = 0;
	3712	+ Globals.imagecount = 0;
3298	3713
3299		- CameraPane.ANIMATION ^= true;
	3714	+ Globals.ANIMATION ^= true;
3300	3715
3301		- GrafreeD.wav.cursor = 0;
3302		- GrafreeD.wav.loop = 0;
	3716	+ Grafreed.wav.cursor = 0;
	3717	+ Grafreed.wav.loop = 0;
3303	3718	}
3304	3719	} else
3305	3720	{
3306		- CameraPane.ANIMATION ^= true;
	3721	+ Globals.ANIMATION ^= true;
3307	3722	}
3308	3723	}
3309	3724
..	..	@@ -3349,7 +3764,7 @@
3349	3764	void CreateMaterial()
3350	3765	{
3351	3766	//copy.ClearMaterial(); // PATCH
3352		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3767	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3353	3768	if (copy.selection.size() > 0)
3354	3769	//SetMaterial(copy);
3355	3770	{
..	..	@@ -3400,7 +3815,7 @@
3400	3815	assert false;
3401	3816	}
3402	3817
3403		- void EditSelection()
	3818	+ void EditSelection(boolean newWindow)
3404	3819	{
3405	3820	}
3406	3821
..	..	@@ -3408,11 +3823,11 @@
3408	3823	{
3409	3824	copy.ResetBlockLoop(); // temporary problem
3410	3825
3411		- boolean random = CameraPane.RANDOM;
3412		- CameraPane.RANDOM = false; // parse everything
	3826	+ boolean random = CameraPane.SWITCH;
	3827	+ CameraPane.SWITCH = false; // parse everything
3413	3828	copy.ResetDisplayList();
3414	3829	copy.HardTouch();
3415		- CameraPane.RANDOM = random;
	3830	+ CameraPane.SWITCH = random;
3416	3831	}
3417	3832
3418	3833	// public void applySelf()
..	..	@@ -3482,10 +3897,40 @@
3482	3897	current.fakedepth = (float) fakedepthField.getFloat();
3483	3898	current.shadowbias = (float) shadowbiasField.getFloat();
3484	3899
3485		- if (!NumberSlider.frozen)
	3900	+ if (!cNumberSlider.frozen)
3486	3901	{
3487	3902	//System.out.println("Propagate = " + propagate);
3488	3903	copy.UpdateMaterial(anchor, current, propagate);
	3904	+
	3905	+ if (copy.material != null)
	3906	+ {
	3907	+ cMaterial mat = copy.material;
	3908	+
	3909	+ colorField.SetToolTipValue((mat.color));
	3910	+ modulationField.SetToolTipValue((mat.modulation));
	3911	+ metalnessField.SetToolTipValue((mat.metalness));
	3912	+ diffuseField.SetToolTipValue((mat.diffuse));
	3913	+ specularField.SetToolTipValue((mat.specular));
	3914	+ shininessField.SetToolTipValue((mat.shininess));
	3915	+ shiftField.SetToolTipValue((mat.shift));
	3916	+ ambientField.SetToolTipValue((mat.ambient));
	3917	+ lightareaField.SetToolTipValue((mat.lightarea));
	3918	+ diffusenessField.SetToolTipValue((mat.factor));
	3919	+ velvetField.SetToolTipValue((mat.velvet));
	3920	+ sheenField.SetToolTipValue((mat.sheen));
	3921	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3922	+ backlitField.SetToolTipValue((mat.bump));
	3923	+ anisoField.SetToolTipValue((mat.aniso));
	3924	+ anisoVField.SetToolTipValue((mat.anisoV));
	3925	+ cameraField.SetToolTipValue((mat.cameralight));
	3926	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3927	+ shadowField.SetToolTipValue((mat.shadow));
	3928	+ textureField.SetToolTipValue((mat.texture));
	3929	+ opacityField.SetToolTipValue((mat.opacity));
	3930	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3931	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3932	+ }
	3933	+
3489	3934	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3490	3935	{
3491	3936	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3530,6 +3975,7 @@
3530	3975	\|\| e.getSource() == apertureField
3531	3976	\|\| e.getSource() == shadowblurField)
3532	3977	{
	3978	+ new Exception().printStackTrace();
3533	3979	System.exit(0);
3534	3980	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3535	3981	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3600,7 +4046,7 @@
3600	4046	}
3601	4047
3602	4048	if (normalpushField != null)
3603		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4049	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3604	4050	}
3605	4051
3606	4052	void SnapObject()
..	..	@@ -3855,7 +4301,7 @@
3855	4301
3856	4302	radioPanel.revalidate();
3857	4303	radioPanel.repaint();
3858		- ctrlPanel.revalidate(); // ? new
	4304	+ ctrlPanel.validate(); // ? new
3859	4305	ctrlPanel.repaint();
3860	4306	}
3861	4307	}
..	..	@@ -3864,6 +4310,8 @@
3864	4310
3865	4311	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3866	4312	{
	4313	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4314	+ Save();
3867	4315	//Tween.set(thing, 0).target(1).start(tweenManager);
3868	4316	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3869	4317	// if (thing instanceof GenericJointDemo)
..	..	@@ -3950,6 +4398,12 @@
3950	4398	{
3951	4399	ResetModel();
3952	4400	Select(thing.GetTreePath(), true, false); // unselect... false);
	4401	+
	4402	+ if (thing.Size() == 0)
	4403	+ {
	4404	+ //EditSelection(false);
	4405	+ }
	4406	+
3953	4407	refreshContents();
3954	4408	}
3955	4409
..	..	@@ -4067,6 +4521,7 @@
4067	4521	}
4068	4522	}
4069	4523	}
	4524	+
4070	4525	LoadGFDThread loadGFDThread;
4071	4526
4072	4527	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4086,8 +4541,10 @@
4086	4541
4087	4542	try
4088	4543	{
	4544	+ // Try compressed version first.
4089	4545	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4090		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4546	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4547	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4091	4548
4092	4549	readobj = (Object3D) p.readObject();
4093	4550	istream.close();
..	..	@@ -4095,7 +4552,20 @@
4095	4552	readobj.ResetDisplayList();
4096	4553	} catch (Exception e)
4097	4554	{
4098		- e.printStackTrace();
	4555	+ //e.printStackTrace();
	4556	+ try
	4557	+ {
	4558	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4559	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4560	+
	4561	+ readobj = (Object3D) p.readObject();
	4562	+ istream.close();
	4563	+
	4564	+ readobj.ResetDisplayList();
	4565	+ } catch (Exception e2)
	4566	+ {
	4567	+ e2.printStackTrace();
	4568	+ }
4099	4569	}
4100	4570	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4101	4571	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4141,6 +4611,12 @@
4141	4611
4142	4612	void LoadIt(Object obj)
4143	4613	{
	4614	+ if (obj == null)
	4615	+ {
	4616	+ // Invalid file
	4617	+ return;
	4618	+ }
	4619	+
4144	4620	System.out.println("Loaded " + obj);
4145	4621	//new Exception().printStackTrace();
4146	4622	Object3D readobj = (Object3D) obj;
..	..	@@ -4150,6 +4626,8 @@
4150	4626
4151	4627	if (readobj != null)
4152	4628	{
	4629	+ if (Globals.SAVEONMAKE)
	4630	+ Save();
4153	4631	try
4154	4632	{
4155	4633	//readobj.deepCopySelf(copy);
..	..	@@ -4212,7 +4690,7 @@
4212	4690
4213	4691	void load() // throws ClassNotFoundException
4214	4692	{
4215		- if (GrafreeD.standAlone)
	4693	+ if (Grafreed.standAlone)
4216	4694	{
4217	4695	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4218	4696	browser.show();
..	..	@@ -4299,11 +4777,13 @@
4299	4777	try
4300	4778	{
4301	4779	FileOutputStream ostream = new FileOutputStream(lastname);
4302		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4780	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4781	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4303	4782
4304	4783	p.writeObject(copy);
4305	4784	p.flush();
4306	4785
	4786	+ zstream.close();
4307	4787	ostream.close();
4308	4788
4309	4789	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4313,17 +4793,20 @@
4313	4793	{
4314	4794	}
4315	4795	}
	4796	+
4316	4797	String lastname;
4317	4798
4318	4799	void saveAs()
4319	4800	{
4320		- if (GrafreeD.standAlone)
	4801	+ if (Grafreed.standAlone)
4321	4802	{
4322	4803	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4323	4804	browser.setVisible(true);
4324	4805	String filename = browser.getFile();
4325	4806	if (filename != null && filename.length() > 0)
4326	4807	{
	4808	+ if (!filename.endsWith(".gfd"))
	4809	+ filename += ".gfd";
4327	4810	lastname = browser.getDirectory() + filename;
4328	4811	save();
4329	4812	}
..	..	@@ -4422,13 +4905,13 @@
4422	4905	try
4423	4906	{
4424	4907	FileOutputStream ostream = new FileOutputStream(filename);
4425		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4426		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4908	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4909	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4427	4910
4428	4911	Object3D objectparent = obj.parent;
4429	4912	obj.parent = null;
4430	4913
4431		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4914	+ Object3D object = (Object3D) Grafreed.clone(obj);
4432	4915
4433	4916	obj.parent = objectparent;
4434	4917
..	..	@@ -4440,8 +4923,8 @@
4440	4923	p.writeObject(object);
4441	4924	p.flush();
4442	4925
	4926	+ zstream.close();
4443	4927	ostream.close();
4444		- // zstream.close();
4445	4928
4446	4929	// group.selection.get(0).parent = parent;
4447	4930	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4462,7 +4945,7 @@
4462	4945	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4463	4946	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4464	4947	copy.generatePOV(buffer);
4465		- if (GrafreeD.standAlone)
	4948	+ if (Grafreed.standAlone)
4466	4949	{
4467	4950	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4468	4951	browser.show();
..	..	@@ -4488,7 +4971,8 @@
4488	4971	Object3D client;
4489	4972	Object3D copy;
4490	4973	MenuBar menuBar;
4491		- Menu windowMenu;
	4974	+ Menu fileMenu;
	4975	+ MenuItem newItem;
4492	4976	MenuItem loadItem;
4493	4977	MenuItem saveItem;
4494	4978	MenuItem saveAsItem;
..	..	@@ -4496,13 +4980,11 @@
4496	4980	MenuItem reexportItem;
4497	4981	MenuItem povItem;
4498	4982	MenuItem closeItem;
4499		- Menu cameraMenu;
	4983	+
4500	4984	CheckboxMenuItem zBufferItem;
4501	4985	//MenuItem normalLensItem;
4502		- MenuItem editCameraItem;
4503		- MenuItem revertCameraItem;
4504		- CheckboxMenuItem toggleLiveItem;
4505	4986	MenuItem stepItem;
	4987	+ CheckboxMenuItem toggleLiveItem;
4506	4988	CheckboxMenuItem toggleFullScreenItem;
4507	4989	CheckboxMenuItem toggleTimelineItem;
4508	4990	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4511,28 +4993,42 @@
4511	4993	CheckboxMenuItem toggleFootContactItem;
4512	4994	CheckboxMenuItem toggleDLItem;
4513	4995	CheckboxMenuItem toggleTextureItem;
4514		- CheckboxMenuItem toggleRandomItem;
	4996	+ CheckboxMenuItem toggleSwitchItem;
4515	4997	CheckboxMenuItem toggleRootItem;
4516	4998	CheckboxMenuItem animationItem;
4517	4999	CheckboxMenuItem toggleHandleItem;
4518	5000	CheckboxMenuItem togglePaintItem;
4519	5001	JSplitPane mainPanel;
4520	5002	JScrollPane scrollpane;
	5003	+
4521	5004	JPanel toolbarPanel;
4522		- JPanel treePanel;
	5005	+
	5006	+ cGridBag treePanel;
	5007	+
4523	5008	JPanel radioPanel;
4524	5009	ButtonGroup buttonGroup;
4525		- JPanel ctrlPanel;
4526		- JPanel materialPanel;
	5010	+
	5011	+ cGridBag toolboxPanel;
	5012	+ cGridBag materialPanel;
	5013	+ cGridBag ctrlPanel;
	5014	+
4527	5015	JScrollPane infoPanel;
4528		- JPanel optionsPanel;
	5016	+
	5017	+ cGridBag optionsPanel;
	5018	+
4529	5019	JTabbedPane objectPanel;
4530		- JPanel XYZPanel;
	5020	+ boolean materialFlushed;
	5021	+ Object3D latestObject;
	5022	+
	5023	+ cGridBag XYZPanel;
	5024	+
4531	5025	JSplitPane gridPanel;
4532	5026	JSplitPane bigPanel;
4533		- JPanel bigThree;
4534		- JTabbedPane scenePanel;
4535		- JPanel centralPanel;
	5027	+
	5028	+ cGridBag bigThree;
	5029	+ cGridBag scenePanel;
	5030	+ cGridBag centralPanel;
	5031	+ JSplitPane cameraPanel;
4536	5032	JPanel timelinePanel;
4537	5033	JMenuBar timelineMenubar;
4538	5034	JSplitPane framePanel;
..	..	@@ -4584,67 +5080,72 @@
4584	5080	// MATERIAL
4585	5081	JLabel materialLabel;
4586	5082	JLabel colorLabel;
4587		- NumberSlider colorField;
	5083	+ cNumberSlider colorField;
4588	5084	JLabel modulationLabel;
4589		- NumberSlider modulationField;
	5085	+ cNumberSlider modulationField;
4590	5086	JLabel metalnessLabel;
4591		- NumberSlider metalnessField;
	5087	+ cNumberSlider metalnessField;
4592	5088	JLabel diffuseLabel;
4593		- NumberSlider diffuseField;
	5089	+ cNumberSlider diffuseField;
4594	5090	JLabel specularLabel;
4595		- NumberSlider specularField;
	5091	+ cNumberSlider specularField;
4596	5092	JLabel shininessLabel;
4597		- NumberSlider shininessField;
	5093	+ cNumberSlider shininessField;
4598	5094	JLabel shiftLabel;
4599		- NumberSlider shiftField;
	5095	+ cNumberSlider shiftField;
4600	5096	JLabel ambientLabel;
4601		- NumberSlider ambientField;
	5097	+ cNumberSlider ambientField;
4602	5098	JLabel lightareaLabel;
4603		- NumberSlider lightareaField;
	5099	+ cNumberSlider lightareaField;
4604	5100	JLabel diffusenessLabel;
4605		- NumberSlider diffusenessField;
	5101	+ cNumberSlider diffusenessField;
4606	5102	JLabel velvetLabel;
4607		- NumberSlider velvetField;
	5103	+ cNumberSlider velvetField;
4608	5104	JLabel sheenLabel;
4609		- NumberSlider sheenField;
	5105	+ cNumberSlider sheenField;
4610	5106	JLabel subsurfaceLabel;
4611		- NumberSlider subsurfaceField;
	5107	+ cNumberSlider subsurfaceField;
4612	5108	//JLabel bumpLabel;
4613	5109	//NumberSlider bumpField;
4614	5110	JLabel backlitLabel;
4615		- NumberSlider backlitField;
	5111	+ cNumberSlider backlitField;
4616	5112	JLabel anisoLabel;
4617		- NumberSlider anisoField;
	5113	+ cNumberSlider anisoField;
4618	5114	JLabel anisoVLabel;
4619		- NumberSlider anisoVField;
	5115	+ cNumberSlider anisoVField;
4620	5116	JLabel cameraLabel;
4621		- NumberSlider cameraField;
	5117	+ cNumberSlider cameraField;
4622	5118	JLabel selfshadowLabel;
4623		- NumberSlider selfshadowField;
	5119	+ cNumberSlider selfshadowField;
4624	5120	JLabel shadowLabel;
4625		- NumberSlider shadowField;
	5121	+ cNumberSlider shadowField;
4626	5122	JLabel textureLabel;
4627		- NumberSlider textureField;
	5123	+ cNumberSlider textureField;
4628	5124	JLabel opacityLabel;
4629		- NumberSlider opacityField;
	5125	+ cNumberSlider opacityField;
4630	5126	JLabel fakedepthLabel;
4631		- NumberSlider fakedepthField;
	5127	+ cNumberSlider fakedepthField;
4632	5128	JLabel shadowbiasLabel;
4633		- NumberSlider shadowbiasField;
	5129	+ cNumberSlider shadowbiasField;
4634	5130	JLabel bumpLabel;
4635		- NumberSlider bumpField;
	5131	+ cNumberSlider bumpField;
4636	5132	JLabel noiseLabel;
4637		- NumberSlider noiseField;
	5133	+ cNumberSlider noiseField;
4638	5134	JLabel powerLabel;
4639		- NumberSlider powerField;
	5135	+ cNumberSlider powerField;
4640	5136	JLabel borderfadeLabel;
4641		- NumberSlider borderfadeField;
	5137	+ cNumberSlider borderfadeField;
4642	5138	JLabel fogLabel;
4643		- NumberSlider fogField;
	5139	+ cNumberSlider fogField;
4644	5140	JLabel opacityPowerLabel;
4645		- NumberSlider opacityPowerField;
4646		- JTree jTree;
	5141	+ cNumberSlider opacityPowerField;
	5142	+ cTree jTree;
4647	5143	//ObjectUI parent;
4648	5144
4649		- NumberSlider normalpushField;
	5145	+ cNumberSlider normalpushField;
	5146	+
	5147	+ private MenuItem importGFDItem;
	5148	+ private MenuItem importVRMLX3DItem;
	5149	+ private MenuItem import3DSItem;
	5150	+ private MenuItem importOBJItem;
4650	5151	}