~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.*;
..	..	@@ -19,6 +20,8 @@
19	20	import //weka.core.
20	21	matrix.Matrix;
21	22
	23	+import grafeme.ui.*;
	24	+
22	25	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	26	ActionListener, ChangeListener,
24	27	InputMethodListener,
..	..	@@ -28,7 +31,73 @@
28	31	iSendInfo
29	32	//KeyListener
30	33	{
	34	+ boolean timeline;
	35	+ boolean wasFullScreen;
31	36
	37	+ GroupEditor callee;
	38	+ JFrame frame;
	39	+
	40	+ static ObjEditor theFrame;
	41	+
	42	+ cButton GetButton(String name, boolean border)
	43	+ {
	44	+ try
	45	+ {
	46	+ ImageIcon icon = GetIcon(name);
	47	+ return new cButton(icon, border);
	48	+ }
	49	+ catch (Exception e)
	50	+ {
	51	+ return new cButton(name, border);
	52	+ }
	53	+ }
	54	+
	55	+ cToggleButton GetToggleButton(String name, boolean border)
	56	+ {
	57	+ try
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cToggleButton(icon, border);
	61	+ }
	62	+ catch (Exception e)
	63	+ {
	64	+ return new cToggleButton(name, border);
	65	+ }
	66	+ }
	67	+
	68	+ cCheckBox GetCheckBox(String name, boolean border)
	69	+ {
	70	+ try
	71	+ {
	72	+ ImageIcon icon = GetIcon(name);
	73	+ return new cCheckBox(icon, border);
	74	+ }
	75	+ catch (Exception e)
	76	+ {
	77	+ return new cCheckBox(name, border);
	78	+ }
	79	+ }
	80	+
	81	+ private ImageIcon GetIcon(String name) throws IOException
	82	+ {
	83	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	84	+
	85	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	86	+ {
	87	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	88	+ Graphics2D g = resized.createGraphics();
	89	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	90	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	91	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	92	+ g.dispose();
	93	+
	94	+ image = resized;
	95	+ }
	96	+
	97	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	98	+ return icon;
	99	+ }
	100	+
32	101	// SCRIPT
33	102
34	103	transient JFrame textpanel = null;
..	..	@@ -119,51 +188,62 @@
119	188	void keyPressed(int key, int modifiers)
120	189	{
121	190	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	191	+ Globals.theRenderer.keyPressed(key, modifiers);
123	192	}
124	193	*/
125	194
126	195	static GridBagConstraints aConstraints;
127	196	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	197	+
130	198	static int GRIDWIDTH = 100; // 4;
131	199
132	200	public void closeUI()
133	201	{
134	202	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	203	+// System.out.println("this = " + this);
	204	+// System.out.println("objEditor = " + objEditor);
137	205	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	206	+// objEditor.ctrlPanel.remove(nameField);
	207	+
	208	+ objEditor.ctrlPanel.remove(namePanel);
139	209
140	210	if (!GroupEditor.allparams)
141	211	return;
142	212
143		- objEditor.ctrlPanel.remove(liveCB);
144		- objEditor.ctrlPanel.remove(hideCB);
145		- objEditor.ctrlPanel.remove(markCB);
146		-
147		- objEditor.ctrlPanel.remove(randomCB);
148		- objEditor.ctrlPanel.remove(speedupCB);
149		- objEditor.ctrlPanel.remove(rewindCB);
150		-
151		- objEditor.ctrlPanel.remove(resetButton);
152		- objEditor.ctrlPanel.remove(stepButton);
153		-// objEditor.ctrlPanel.remove(stepAllButton);
154		-// objEditor.ctrlPanel.remove(resetAllButton);
155		- objEditor.ctrlPanel.remove(link2masterCB);
156		- //objEditor.ctrlPanel.remove(flipVCB);
157		- //objEditor.ctrlPanel.remove(texresMenu);
158		- objEditor.ctrlPanel.remove(slowerButton);
159		- objEditor.ctrlPanel.remove(fasterButton);
160		- objEditor.ctrlPanel.remove(remarkButton);
	213	+// objEditor.ctrlPanel.remove(liveCB);
	214	+// objEditor.ctrlPanel.remove(hideCB);
	215	+// objEditor.ctrlPanel.remove(markCB);
	216	+//
	217	+// objEditor.ctrlPanel.remove(randomCB);
	218	+// objEditor.ctrlPanel.remove(speedupCB);
	219	+// objEditor.ctrlPanel.remove(rewindCB);
	220	+//
	221	+// objEditor.ctrlPanel.remove(resetButton);
	222	+// objEditor.ctrlPanel.remove(stepButton);
	223	+//// objEditor.ctrlPanel.remove(stepAllButton);
	224	+//// objEditor.ctrlPanel.remove(resetAllButton);
	225	+// objEditor.ctrlPanel.remove(link2masterCB);
	226	+// //objEditor.ctrlPanel.remove(flipVCB);
	227	+// //objEditor.ctrlPanel.remove(texresMenu);
	228	+// objEditor.ctrlPanel.remove(slowerButton);
	229	+// objEditor.ctrlPanel.remove(fasterButton);
	230	+// objEditor.ctrlPanel.remove(remarkButton);
	231	+
	232	+ objEditor.ctrlPanel.remove(setupPanel);
	233	+ objEditor.ctrlPanel.remove(setupPanel2);
	234	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	235	+ objEditor.ctrlPanel.remove(pushPanel);
	236	+ //objEditor.ctrlPanel.remove(fillPanel);
	237	+
	238	+ //Remove(normalpushField);
161	239	}
162	240
163	241	public ObjEditor GetEditor()
164	242	{
165	243	return objEditor; //.GetEditor();
166	244	}
	245	+
	246	+ // Sometimes myself, sometimes my callee's.
167	247	ObjEditor objEditor;
168	248
169	249	/*
..	..	@@ -226,6 +306,7 @@
226	306	//localCopy.parent = null;
227	307
228	308	frame = new JFrame();
	309	+ frame.setUndecorated(true);
229	310	objEditor = this;
230	311	this.callee = callee;
231	312
..	..	@@ -238,7 +319,7 @@
238	319	//if (!isDisplayable())
239	320	//setUndecorated(true);
240	321
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	322	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	323	client = inClient;
243	324	copy = localCopy;
244	325	copy.editWindow = this;
..	..	@@ -259,24 +340,40 @@
259	340	void SetupMenu()
260	341	{
261	342	frame.setMenuBar(menuBar = new MenuBar());
262		- menuBar.add(windowMenu = new Menu("File"));
263		- windowMenu.add(loadItem = new MenuItem("Load..."));
264		- windowMenu.add("-");
265		- windowMenu.add(saveItem = new MenuItem("Save"));
266		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	343	+ menuBar.add(fileMenu = new Menu("File"));
	344	+ fileMenu.add(newItem = new MenuItem("New"));
	345	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	346	+
	347	+ //oe.menuBar.add(menu = new Menu("Include"));
	348	+ Menu menu = new Menu("Import");
	349	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	350	+ importOBJItem.addActionListener(this);
	351	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	352	+ import3DSItem.addActionListener(this);
	353	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	354	+ importVRMLX3DItem.addActionListener(this);
	355	+ menu.add("-");
	356	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	357	+ importGFDItem.addActionListener(this);
	358	+ fileMenu.add(menu);
	359	+ fileMenu.add("-");
	360	+
	361	+ fileMenu.add(saveItem = new MenuItem("Save"));
	362	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	363	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
268		- windowMenu.add("-");
269		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
270		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
271		- windowMenu.add("-");
	364	+ fileMenu.add("-");
	365	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	366	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	367	+ fileMenu.add("-");
272	368	if (client.parent != null)
273	369	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	370	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	371	} else
276	372	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	373	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	374	}
279	375
	376	+ newItem.addActionListener(this);
280	377	loadItem.addActionListener(this);
281	378	saveItem.addActionListener(this);
282	379	saveAsItem.addActionListener(this);
..	..	@@ -285,77 +382,59 @@
285	382	//povItem.addActionListener(this);
286	383	closeItem.addActionListener(this);
287	384
288		- menuBar.add(cameraMenu = new Menu("View"));
289		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
290		- //zBufferItem.addActionListener(this);
291		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
292		- //normalLensItem.addActionListener(this);
293		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294		- revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
298		- cameraMenu.add("-");
299		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300		- toggleTextureItem.addItemListener(this);
301		- toggleTextureItem.setState(CameraPane.textureon);
302		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303		- toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
305		- cameraMenu.add(stepItem = new MenuItem("Step"));
306		- stepItem.addActionListener(this);
307		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
308		-// toggleDLItem.addItemListener(this);
309		-// toggleDLItem.setState(false);
310		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
311		- toggleRenderItem.addItemListener(this);
312		- toggleRenderItem.setState(!CameraPane.frozen);
313		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
314		- toggleDebugItem.addItemListener(this);
315		- toggleDebugItem.setState(CameraPane.DEBUG);
316		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
317		- toggleFrustumItem.addItemListener(this);
318		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
319		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
320		- toggleFootContactItem.addItemListener(this);
321		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
322		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
323		- toggleRandomItem.addItemListener(this);
324		- toggleRandomItem.setState(CameraPane.RANDOM);
325		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
326		- toggleHandleItem.addItemListener(this);
327		- toggleHandleItem.setState(CameraPane.HANDLES);
328		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
329		- togglePaintItem.addItemListener(this);
330		- togglePaintItem.setState(CameraPane.PAINTMODE);
331		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
332		-// toggleRootItem.addItemListener(this);
333		-// toggleRootItem.setState(false);
334		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
335		-// animationItem.addItemListener(this);
336		-// animationItem.setState(CameraPane.ANIMATION);
337		- cameraMenu.add("-");
338		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
339		- editCameraItem.addActionListener(this);
340		-
341	385	objectPanel = new JTabbedPane();
	386	+
	387	+ ChangeListener changeListener = new ChangeListener()
	388	+ {
	389	+ public void stateChanged(ChangeEvent changeEvent)
	390	+ {
	391	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	392	+// {
	393	+// if (latestObject != null)
	394	+// {
	395	+// refreshContents(true);
	396	+// SetMaterial(latestObject);
	397	+// }
	398	+//
	399	+// materialFlushed = true;
	400	+// }
	401	+
	402	+ refreshContents(false); // To refresh Info tab
	403	+ }
	404	+ };
	405	+ objectPanel.addChangeListener(changeListener);
	406	+
342	407	toolbarPanel = new JPanel();
343	408	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	409	+ treePanel = new cGridBag();
345	410	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	411	+
	412	+ editPanel = new cGridBag().setVertical(true);
	413	+ editPanel.setName("Edit");
	414	+
	415	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	416	+
	417	+ editCommandsPanel = new cGridBag();
	418	+ editPanel.add(editCommandsPanel);
	419	+ editPanel.add(ctrlPanel);
	420	+
	421	+ toolboxPanel = new cGridBag().setVertical(false);
	422	+ toolboxPanel.setName("Toolbox");
	423	+
	424	+ materialPanel = new cGridBag().setVertical(true);
349	425	materialPanel.setName("Material");
	426	+
350	427	/JTextPane/
351	428	infoarea = createTextPane();
	429	+ doc = infoarea.getStyledDocument();
	430	+
352	431	infoarea.setEditable(true);
353	432	SetText();
354	433	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	434	// infoarea.setOpaque(false);
356	435	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	436	+// TEXTAREA infoarea.setLineWrap(true);
	437	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	438	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360	439	infoPanel.setPreferredSize(new Dimension(50, 200));
361	440	infoPanel.setName("Info");
..	..	@@ -366,16 +445,16 @@
366	445	mainPanel.setName("Main");
367	446	mainPanel.setContinuousLayout(true);
368	447	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	448	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
	449	+ mainPanel.setDividerLocation(0.5); //1.0);
	450	+ mainPanel.setResizeWeight(0.5);
372	451
373	452	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	453	//mainPanel.setLayout(new GridBagLayout());
375	454	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	455	+// treePanel.setLayout(new GridBagLayout());
	456	+ //ctrlPanel.setLayout(new GridBagLayout());
	457	+ //materialPanel.setLayout(new GridBagLayout());
379	458
380	459	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	460	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +493,7 @@
414	493	static String newline = "\n";
415	494	protected static final String buttonString = "JButton";
416	495	StyledDocument doc;
417		- JTextArea infoarea;
	496	+ JTextPane infoarea;
418	497
419	498	void ClearInfo()
420	499	{
..	..	@@ -437,10 +516,10 @@
437	516	e.printStackTrace();
438	517	}
439	518
440		- String selection = infoarea.getText();
441		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
442		- java.awt.datatransfer.Clipboard clipboard =
443		- Toolkit.getDefaultToolkit().getSystemClipboard();
	519	+// String selection = infoarea.getText();
	520	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	521	+// java.awt.datatransfer.Clipboard clipboard =
	522	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	523	//clipboard.setContents(data, data);
445	524	}
446	525
..	..	@@ -463,13 +542,13 @@
463	542	//SendInfo("Name:", "bold");
464	543	if (sel.GetTextures() != null \|\| debug)
465	544	{
466		- si.SendInfo(sel.toString(), "bold");
	545	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	546	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	547	if (sel.Size() > 0)
469	548	{
470	549	si.SendInfo("#children = " + sel.Size(), "regular");
471	550	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	551	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	552	if (debug)
474	553	{
475	554	try
..	..	@@ -481,7 +560,10 @@
481	560	}
482	561
483	562	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	563	+ {
	564	+ si.SendInfo(" BBox min: " + minima, "regular");
	565	+ si.SendInfo(" BBox max: " + maxima, "regular");
	566	+ }
485	567
486	568	if (sel.bRep != null)
487	569	{
..	..	@@ -508,7 +590,7 @@
508	590	}
509	591	if (sel.support != null)
510	592	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	593	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	594	}
513	595	if (sel.scriptnode != null)
514	596	{
..	..	@@ -579,6 +661,9 @@
579	661	{
580	662	CameraPane.pointflow = (PointFlow) sel;
581	663	}
	664	+
	665	+ si.SendInfo("_____________________", "regular");
	666	+ si.SendInfo("", "regular");
582	667	}
583	668	}
584	669
..	..	@@ -594,52 +679,140 @@
594	679	}
595	680	}
596	681
597		- private JTextArea createTextPane()
598		- {
599		- String[] initString =
600		- {
601		- "This is an editable JTextPane, ", //regular
602		- "another ", //italic
603		- "styled ", //bold
604		- "text ", //small
605		- "component, ", //large
606		- "which supports embedded components..." + newline,//regular
607		- " " + newline, //button
608		- "...and embedded icons..." + newline, //regular
609		- " ", //icon
610		- newline + "JTextPane is a subclass of JEditorPane that "
611		- + "uses a StyledEditorKit and StyledDocument, and provides "
612		- + "cover methods for interacting with those objects."
613		- };
	682	+static GraphicsDevice device = GraphicsEnvironment
	683	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	684
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	685	+ Rectangle keeprect;
	686	+ cRadio radio;
	687	+
	688	+cButton keepButton;
	689	+ cButton twoButton; // Full 3D
	690	+ cButton sixButton;
	691	+ cButton threeButton;
	692	+ cButton sevenButton;
	693	+ cButton fourButton; // full panel
	694	+ cButton oneButton; // full XYZ
	695	+ //cButton currentLayout;
	696	+
	697	+ boolean maximized;
	698	+
	699	+ cButton fullscreenLayout;
621	700
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	701	+ void Minimize()
628	702	{
629		- for (int j = 0; j < 2; j++)
	703	+ frame.setState(Frame.ICONIFIED);
	704	+ }
	705	+
	706	+ void Maximize()
	707	+ {
	708	+ if (maximized)
630	709	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	710	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
636	711	}
637		- } catch (BadLocationException ble)
	712	+ else
	713	+ {
	714	+ keeprect = frame.getBounds();
	715	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	716	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	717	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	718	+// frame.setState(Frame.MAXIMIZED_BOTH);
	719	+ }
	720	+
	721	+ maximized ^= true;
	722	+ }
	723	+
	724	+ void ToggleFullScreen()
638	725	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	726	+ cameraView.ToggleFullScreen();
	727	+
	728	+ if (!CameraPane.FULLSCREEN)
	729	+ {
	730	+ device.setFullScreenWindow(null);
	731	+ //frame.setVisible(false);
	732	+// frame.removeNotify();
	733	+// frame.setUndecorated(false);
	734	+// frame.addNotify();
	735	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	736	+
	737	+// X frame.getContentPane().remove(/"Center",/bigThree);
	738	+// X framePanel.add(bigThree);
	739	+// X frame.getContentPane().add(/"Center",/framePanel);
	740	+ framePanel.setDividerLocation(1);
	741	+
	742	+ //frame.setVisible(true);
	743	+ radio.layout = keepButton;
	744	+ //theFrame = null;
	745	+ keepButton = null;
	746	+ radio.layout.doClick();
	747	+
	748	+ } else
	749	+ {
	750	+ keepButton = radio.layout;
	751	+ //keeprect = frame.getBounds();
	752	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	753	+// frame.getToolkit().getScreenSize().height);
	754	+ //frame.setVisible(false);
	755	+ device.setFullScreenWindow(frame);
	756	+// frame.removeNotify();
	757	+// frame.setUndecorated(true);
	758	+// frame.addNotify();
	759	+// X frame.getContentPane().remove(/"Center",/framePanel);
	760	+// X framePanel.remove(bigThree);
	761	+// X frame.getContentPane().add(/"Center",/bigThree);
	762	+ framePanel.setDividerLocation(0);
	763	+
	764	+ radio.layout = fullscreenLayout;
	765	+ radio.layout.doClick();
	766	+ //frame.setVisible(true);
	767	+ }
640	768	}
641	769
642		- return new JTextArea(); // textPane;
	770	+ private JTextPane createTextPane()
	771	+ {
	772	+// TEXTAREA String[] initString =
	773	+// {
	774	+// "This is an editable JTextPane, ", //regular
	775	+// "another ", //italic
	776	+// "styled ", //bold
	777	+// "text ", //small
	778	+// "component, ", //large
	779	+// "which supports embedded components..." + newline,//regular
	780	+// " " + newline, //button
	781	+// "...and embedded icons..." + newline, //regular
	782	+// " ", //icon
	783	+// newline + "JTextPane is a subclass of JEditorPane that "
	784	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	785	+// + "cover methods for interacting with those objects."
	786	+// };
	787	+//
	788	+// String[] initStyles =
	789	+// {
	790	+// "regular", "italic", "bold", "small", "large",
	791	+// "regular", "button", "regular", "icon",
	792	+// "regular"
	793	+// };
	794	+//
	795	+// JTextPane textPane = new JTextPane();
	796	+// textPane.setEditable(true);
	797	+// /StyledDocument/ doc = textPane.getStyledDocument();
	798	+// addStylesToDocument(doc);
	799	+//
	800	+// try
	801	+// {
	802	+// for (int j = 0; j < 2; j++)
	803	+// {
	804	+// for (int i = 0; i < initString.length; i++)
	805	+// {
	806	+// doc.insertString(doc.getLength(), initString[i],
	807	+// doc.getStyle(initStyles[i]));
	808	+// }
	809	+// }
	810	+// } catch (BadLocationException ble)
	811	+// {
	812	+// System.err.println("Couldn't insert initial text into text pane.");
	813	+// }
	814	+
	815	+ return new JTextPane(); // textPane;
643	816	}
644	817
645	818	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +865,7 @@
692	865	protected static ImageIcon createImageIcon(String path,
693	866	String description)
694	867	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	868	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	869	if (imgURL != null)
697	870	{
698	871	return new ImageIcon(imgURL, description);
..	..	@@ -724,6 +897,7 @@
724	897	// NumberSlider vDivsField;
725	898	// JCheckBox endcaps;
726	899	JCheckBox liveCB;
	900	+ JCheckBox selectCB;
727	901	JCheckBox hideCB;
728	902	JCheckBox link2masterCB;
729	903	JCheckBox markCB;
..	..	@@ -731,7 +905,12 @@
731	905	JCheckBox speedupCB;
732	906	JCheckBox rewindCB;
733	907	JCheckBox flipVCB;
	908	+
	909	+ cCheckBox toggleTextureCB;
	910	+ cCheckBox toggleSwitchCB;
	911	+
734	912	JComboBox texresMenu;
	913	+
735	914	JButton resetButton;
736	915	JButton stepButton;
737	916	JButton stepAllButton;
..	..	@@ -739,115 +918,87 @@
739	918	JButton slowerButton;
740	919	JButton fasterButton;
741	920	JButton remarkButton;
	921	+
	922	+ cGridBag editPanel;
	923	+ cGridBag editCommandsPanel;
	924	+
	925	+ cGridBag namePanel;
	926	+ cGridBag setupPanel;
	927	+ cGridBag setupPanel2;
	928	+ cGridBag objectCommandsPanel;
	929	+ cGridBag pushPanel;
	930	+ cGridBag fillPanel;
742	931
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	932	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	933	{
745	934	JCheckBox cb;
746	935
747		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
748		- oe.aConstraints.gridwidth = 1; // 3;
749		-// oe.aConstraints.weightx = 1;
750		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
751		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	936	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	937	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	938
757	939	return cb;
758	940	}
759	941
760		- cButton AddButton(ObjEditor oe, String label)
	942	+ cButton AddButton(cGridBag panel, String label)
761	943	{
762	944	cButton cb;
763	945
764		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
765		- oe.aConstraints.gridwidth = 1;
766		-// oe.aConstraints.weightx = 1;
767		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
768		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	946	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	947	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	948
774	949	return cb;
775	950	}
776	951
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	952	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	953	{
779	954	JComboBox combo;
780	955
781		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
782		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
783		- oe.aConstraints.gridx += 1;
	956	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	957	combo.addActionListener(this);
785	958
786	959	return combo;
787	960	}
788	961
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	962	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	963	{
791		- NumberSlider combo;
	964	+ cGridBag control = new cGridBag();
	965	+
	966	+ cNumberSlider combo;
792	967
793	968	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	969	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797		- aConstraints.gridwidth = 2;
798		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799		- aConstraints.gridx += 1;
800		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
801		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- aConstraints.gridx += 1;
804		- aConstraints.gridwidth = 1;
805		-
	970	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	971	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	972	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	973	+
	974	+ panel.add(control);
	975	+
	976	+ return control;
813	977	}
814	978
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	979	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	980	{
817		- NumberSlider combo;
	981	+ cGridBag control = new cGridBag();
	982	+
	983	+ cNumberSlider combo;
818	984
819	985	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	986	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 2;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	987	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	988	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	989	combo.setInteger(current);
833	990
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	991	+ panel.add(control);
	992	+
	993	+ return control;
839	994	}
840	995
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	996	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	997	{
843	998	JTextArea text;
844	999
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1000	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1001	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1002
852	1003	return text;
853	1004	}
..	..	@@ -877,9 +1028,16 @@
877	1028	objEditor.ctrlPanel.remove(j);
878	1029	}
879	1030
	1031	+ void Remove(cNumberSlider j)
	1032	+ {
	1033	+ j.removeChangeListener(this);
	1034	+ //objEditor.ctrlPanel.remove(j.label);
	1035	+ objEditor.ctrlPanel.remove(j);
	1036	+ }
	1037	+
880	1038	/*
881	1039	*/
882		- void Return() // ObjEditor oe)
	1040	+ void Return0() // ObjEditor oe)
883	1041	{
884	1042	aConstraints.gridy += 1;
885	1043	aConstraints.gridx = 0;
..	..	@@ -934,35 +1092,77 @@
934	1092
935	1093	void SetupUI2(ObjEditor oe)
936	1094	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1095	+ //SetupName(oe);
	1096	+
	1097	+ namePanel = new cGridBag();
	1098	+
	1099	+ nameField = AddText(namePanel, copy.GetName());
	1100	+ namePanel.add(nameField);
	1101	+ oe.ctrlPanel.add(namePanel);
	1102	+
	1103	+ oe.ctrlPanel.Return();
942	1104
943	1105	if (!GroupEditor.allparams)
944	1106	return;
945	1107
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1108	+ setupPanel = new cGridBag().setVertical(false);
	1109	+
	1110	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1111	+ liveCB.setToolTipText("Animate object");
	1112	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1113	+ selectCB.setToolTipText("Make object selectable");
949	1114	// Return();
950		- markCB = AddCheckBox(oe, "Mark", copy.marked);
951		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
952		- randomCB = AddCheckBox(oe, "Rand", copy.random);
953		- Return();
954		- resetButton = AddButton(oe, "Reset");
955		- stepButton = AddButton(oe, "Step");
	1115	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1116	+ hideCB.setToolTipText("Hide object");
	1117	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1118	+ markCB.setToolTipText("Set the animation target transform");
	1119	+
	1120	+ setupPanel2 = new cGridBag().setVertical(false);
	1121	+
	1122	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1123	+ rewindCB.setToolTipText("Rewind animation");
	1124	+
	1125	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1126	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1127	+
	1128	+ if (Globals.ADVANCED)
	1129	+ {
	1130	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1131	+ link2masterCB.setToolTipText("Attach to support");
	1132	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1133	+ speedupCB.setToolTipText("Option motion capture");
	1134	+ }
	1135	+
	1136	+ oe.ctrlPanel.add(setupPanel);
	1137	+ oe.ctrlPanel.Return();
	1138	+ oe.ctrlPanel.add(setupPanel2);
	1139	+ oe.ctrlPanel.Return();
	1140	+
	1141	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1142	+
	1143	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1144	+ resetButton.setToolTipText("Jump to frame zero");
	1145	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1146	+ stepButton.setToolTipText("Step one frame");
956	1147	// resetAllButton = AddButton(oe, "Reset All");
957	1148	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1149	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1150	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1151	+ slowerButton.setToolTipText("Decrease animation speed");
	1152	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1153	+ fasterButton.setToolTipText("Increase animation speed");
	1154	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1155	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1156
964		- Return();
	1157	+ oe.ctrlPanel.add(objectCommandsPanel);
	1158	+ oe.ctrlPanel.Return();
965	1159
	1160	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1161	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1162	+ //Return();
	1163	+
	1164	+ oe.ctrlPanel.Return();
	1165	+
966	1166	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1167	// ObjEditor.aConstraints.gridx += 1;
968	1168
..	..	@@ -1056,7 +1256,7 @@
1056	1256	oe.aConstraints.gridwidth = 1;
1057	1257	/**/
1058	1258	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1259	+ oe.ctrlPanel.Return();
1060	1260
1061	1261	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1262	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1358,28 @@
1158	1358	//JPanel worldPanel =
1159	1359	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1360	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1361	+ centralPanel = new cGridBag();
	1362	+ centralPanel.preferredWidth = 20;
	1363	+
	1364	+ if (Globals.ADVANCED)
	1365	+ {
	1366	+ timelinePanel = new JPanel(new BorderLayout());
	1367	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1368
	1369	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1370	+ cameraPanel.setContinuousLayout(true);
	1371	+ cameraPanel.setOneTouchExpandable(true);
	1372	+// cameraPanel.setDividerLocation(0.9);
	1373	+// cameraPanel.setDividerSize(9);
	1374	+ cameraPanel.setResizeWeight(1.0);
	1375	+
	1376	+ }
	1377	+
	1378	+ centralPanel.add(cameraView);
	1379	+ centralPanel.setFocusable(true);
	1380	+ //frame.setJMenuBar(timelineMenubar);
	1381	+ //centralPanel.add(timelinePanel);
	1382	+
1165	1383	//topView.camera = ;
1166	1384	//frontView.camera = new Camera(2);
1167	1385	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1395,13 @@
1177	1395	//frontView.object = copy;
1178	1396	//sideView.object = copy;
1179	1397
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1398	+ XYZPanel = new cGridBag().setVertical(true);
	1399	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1400
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1401	+ XYZPanel.preferredWidth = 5;
	1402	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1403	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1404	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1186	1405
1187	1406	/*
1188	1407	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1410,7 @@
1191	1410	gridPanel.add(cameraView);
1192	1411	gridPanel.add(XYZPanel);
1193	1412	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1413	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1414	gridPanel.setContinuousLayout(true);
1196	1415	gridPanel.setOneTouchExpandable(true);
1197	1416	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,10 +1439,12 @@
1220	1439	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1440	//tmp.setName("Edit");
1222	1441	objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- objectPanel.add(north);
	1442	+ objectPanel.add(toolboxPanel);
	1443	+// JPanel north = new JPanel(new BorderLayout());
	1444	+// north.setName("Edit");
	1445	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1446	+// objectPanel.add(north);
	1447	+ objectPanel.add(editPanel);
1227	1448	objectPanel.add(infoPanel);
1228	1449
1229	1450	/*
..	..	@@ -1244,16 +1465,23 @@
1244	1465	scrollpane.setWheelScrollingEnabled(true);
1245	1466	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1467
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1468	+ /JTabbedPane/ scenePanel = new cGridBag();
	1469	+ scenePanel.preferredWidth = 6;
	1470	+
	1471	+ JTabbedPane tabbedPane = new JTabbedPane();
	1472	+ tabbedPane.add(scrollpane);
1249	1473
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1474	+ optionsPanel = new cGridBag().setVertical(false);
1253	1475
1254	1476	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1477	+
	1478	+ AddOptions(optionsPanel); //, aConstraints);
	1479	+
	1480	+ tabbedPane.add(optionsPanel);
	1481	+
	1482	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1483
	1484	+ scenePanel.add(tabbedPane);
1257	1485
1258	1486	/*
1259	1487	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1503,7 @@
1275	1503	jtp.add(tree);
1276	1504	*/
1277	1505
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1506	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1507	bigPanel.setContinuousLayout(true);
1280	1508	bigPanel.setOneTouchExpandable(true);
1281	1509	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1515,7 @@
1287	1515	//bigPanel.setSize(new Dimension(10,10));
1288	1516	//bigPanel.add(ctrlPanel);
1289	1517	//bigPanel.add(gridPanel);
	1518	+ /**
1290	1519	bigThree = new JPanel();
1291	1520	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1521	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1526,26 @@
1297	1526	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1527	aWindowConstraints.weightx = 0;
1299	1528	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1529	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1530	aWindowConstraints.weightx = 1;
1302	1531	aWindowConstraints.gridwidth = 3;
1303	1532	// aConstraints.gridheight = 3;
1304	1533	aWindowConstraints.gridx = 1;
1305	1534	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1535	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1536	aWindowConstraints.weightx = 0;
1308	1537	aWindowConstraints.gridx = 4;
1309	1538	aWindowConstraints.gridwidth = 1;
1310	1539	// aConstraints.gridheight = 3;
1311	1540	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1541	bigThree.add(XYZPanel, aWindowConstraints);
	1542	+ /**/
1313	1543
	1544	+ bigThree = new cGridBag();
	1545	+ bigThree.addComponent(scenePanel);
	1546	+ bigThree.addComponent(centralPanel);
	1547	+ bigThree.addComponent(XYZPanel);
	1548	+
1314	1549	// // SIDE EFFECT!!!
1315	1550	// aConstraints.gridx = 0;
1316	1551	// aConstraints.gridy = 0;
..	..	@@ -1331,14 +1566,19 @@
1331	1566	//worldPane.add(bigPanel);
1332	1567	//worldPane.add(worldPanel);
1333	1568	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1569	+ //frame.getContentPane().add(/"Center",/framePanel);
	1570	+ frame.add(/"Center",/framePanel);
1335	1571	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1572
1337	1573	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1574
1339		- frame.setSize(1024, 768);
1340		- frame.show();
	1575	+ frame.setSize(1280, 860);
	1576	+
	1577	+ frame.validate();
	1578	+ frame.setVisible(true);
1341	1579
	1580	+ cameraView.requestFocusInWindow();
	1581	+
1342	1582	gridPanel.setDividerLocation(1.0);
1343	1583
1344	1584	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1352,6 +1592,10 @@
1352	1592	});
1353	1593	}
1354	1594
	1595	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1596	+ {
	1597	+ }
	1598	+
1355	1599	JTree GetTree()
1356	1600	{
1357	1601	return objEditor.jTree;
..	..	@@ -1363,260 +1607,173 @@
1363	1607	ctrlPanel.removeAll();
1364	1608	}
1365	1609
1366		- void SetupMaterial(JPanel ctrlPanel)
	1610	+ void SetupMaterial(cGridBag panel)
1367	1611	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1612	+ /*
1371	1613	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1614	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1615	*/
1376	1616
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	1617	+ cGridBag editBar = new cGridBag().setVertical(false);
	1618	+
	1619	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1620	+ createMaterialButton.setToolTipText("Create material");
1382	1621
1383	1622	/*
1384	1623	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1624	*/
1389	1625
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	1626	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1627	+ clearMaterialButton.setToolTipText("Clear material");
	1628	+
	1629	+ if (Globals.ADVANCED)
	1630	+ {
	1631	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1632	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1633	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1634	+ }
1392	1635
1393		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394		-
1395		- aConstraints.gridx += 1;
1396		-
1397		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398		-
1399		- aConstraints.gridx += 1;
1400		-
1401		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402		-
1403		- aConstraints.gridx = 0;
1404		- aConstraints.gridy += 1;
1405		- aConstraints.weighty = 0;
1406		- aConstraints.gridwidth = 1;
	1636	+ editBar.preferredHeight = 15;
	1637	+
	1638	+ panel.add(editBar);
	1639	+
1407	1640	/**/
1408	1641	//aConstraints.weighty = 0;
1409	1642	////aConstraints.weightx = 1;
1410	1643	//aConstraints.weighty = 1;
1411	1644	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1645	//aConstraints.gridx += 1;
1413		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414		- aConstraints.weighty = 0;
1415		- aConstraints.gridx = 0;
1416		- aConstraints.gridy += 1;
1417		- aConstraints.gridwidth = 1;
	1646	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1647
1419		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424		- //aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426		- aConstraints.gridx = 0;
1427		- aConstraints.gridy += 1;
1428		- aConstraints.gridwidth = 1;
	1648	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1649	+
	1650	+ cGridBag color = new cGridBag();
	1651	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1652	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1653	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1654	+ //colorField.preferredWidth = 200;
	1655	+ colorSection.add(color);
1429	1656
1430		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433		- aConstraints.gridx += 1;
1434		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436		- aConstraints.gridx = 0;
1437		- aConstraints.gridy += 1;
1438		- aConstraints.gridwidth = 1;
	1657	+ cGridBag modulation = new cGridBag();
	1658	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1659	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1660	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1661	+ colorSection.add(modulation);
1439	1662
1440		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443		- aConstraints.gridx += 1;
1444		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	1663	+ cGridBag texture = new cGridBag();
	1664	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1665	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1666	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1667	+ colorSection.add(texture);
1449	1668
1450		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- aConstraints.gridwidth = 1;
	1669	+ cGridBag anisoU = new cGridBag();
	1670	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1671	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1672	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1673	+ colorSection.add(anisoU);
1459	1674
1460		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.gridwidth = 1;
	1675	+ cGridBag anisoV = new cGridBag();
	1676	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1677	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1678	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1679	+ colorSection.add(anisoV);
1469	1680
1470		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473		- aConstraints.gridx += 1;
1474		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476		- aConstraints.gridx = 0;
1477		- aConstraints.gridy += 1;
1478		- aConstraints.gridwidth = 1;
	1681	+ cGridBag shadowbias = new cGridBag();
	1682	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1683	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1684	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1685	+ colorSection.add(shadowbias);
1479	1686
1480		- //aConstraints.weighty = 1;
1481		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482		- //aConstraints.gridx += 1;
1483		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484		- aConstraints.weighty = 0;
1485		- aConstraints.gridx = 0;
1486		- aConstraints.gridy += 1;
1487		- aConstraints.gridwidth = 1;
	1687	+ panel.add(new JSeparator());
	1688	+
	1689	+ panel.add(colorSection);
	1690	+
	1691	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1692	+
	1693	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1694	+
	1695	+ cGridBag diffuse = new cGridBag();
	1696	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1697	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1698	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1699	+ diffuseSection.add(diffuse);
1488	1700
1489		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492		- aConstraints.gridx += 1;
1493		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495		- aConstraints.gridx = 0;
1496		- aConstraints.gridy += 1;
1497		- aConstraints.gridwidth = 1;
	1701	+ cGridBag diffuseness = new cGridBag();
	1702	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1703	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1704	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1705	+ diffuseSection.add(diffuseness);
1498	1706
1499		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502		- aConstraints.gridx += 1;
1503		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505		- aConstraints.gridx = 0;
1506		- aConstraints.gridy += 1;
1507		- aConstraints.gridwidth = 1;
	1707	+ cGridBag selfshadow = new cGridBag();
	1708	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1709	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1710	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1711	+ diffuseSection.add(selfshadow);
1508	1712
1509		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512		- aConstraints.gridx += 1;
1513		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515		- aConstraints.gridx = 0;
1516		- aConstraints.gridy += 1;
1517		- aConstraints.gridwidth = 1;
	1713	+ cGridBag sheen = new cGridBag();
	1714	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1715	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1716	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1717	+ diffuseSection.add(sheen);
1518	1718
1519		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522		- aConstraints.gridx += 1;
1523		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525		- aConstraints.gridx = 0;
1526		- aConstraints.gridy += 1;
1527		- aConstraints.gridwidth = 1;
	1719	+ cGridBag subsurface = new cGridBag();
	1720	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1721	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1722	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1723	+ diffuseSection.add(subsurface);
1528	1724
1529		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532		- aConstraints.gridx += 1;
1533		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535		- aConstraints.gridx = 0;
1536		- aConstraints.gridy += 1;
1537		- aConstraints.gridwidth = 1;
	1725	+ cGridBag shadow = new cGridBag();
	1726	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1727	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1728	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1729	+ diffuseSection.add(shadow);
1538	1730
1539		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542		- aConstraints.gridx += 1;
1543		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545		- aConstraints.gridx = 0;
1546		- aConstraints.gridy += 1;
1547		- aConstraints.gridwidth = 1;
	1731	+ cGridBag fakedepth = new cGridBag();
	1732	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1733	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1734	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1735	+ diffuseSection.add(fakedepth);
1548	1736
1549		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552		- aConstraints.gridx += 1;
1553		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555		- aConstraints.gridx = 0;
1556		- aConstraints.gridy += 1;
1557		- aConstraints.gridwidth = 1;
	1737	+ panel.add(new JSeparator());
	1738	+
	1739	+ panel.add(diffuseSection);
	1740	+
	1741	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1742	+
	1743	+ cGridBag specularSection = new cGridBag().setVertical(true);
1558	1744
1559		- //aConstraints.weighty = 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561		- //aConstraints.gridx += 1;
1562		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563		- aConstraints.weighty = 0;
1564		- aConstraints.gridx = 0;
1565		- aConstraints.gridy += 1;
1566		- aConstraints.gridwidth = 1;
	1745	+ cGridBag specular = new cGridBag();
	1746	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1747	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1748	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1749	+ specularSection.add(specular);
1567	1750
1568		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571		- aConstraints.gridx += 1;
1572		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574		- aConstraints.gridx = 0;
1575		- aConstraints.gridy += 1;
1576		- aConstraints.gridwidth = 1;
	1751	+ cGridBag lightarea = new cGridBag();
	1752	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1753	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1754	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1755	+ specularSection.add(lightarea);
1577	1756
1578		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581		- aConstraints.gridx += 1;
1582		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584		- aConstraints.gridx = 0;
1585		- aConstraints.gridy += 1;
1586		- aConstraints.gridwidth = 1;
	1757	+ cGridBag shininess = new cGridBag();
	1758	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1759	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1760	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1761	+ specularSection.add(shininess);
1587	1762
1588		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591		- aConstraints.gridx += 1;
1592		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594		- aConstraints.gridx = 0;
1595		- aConstraints.gridy += 1;
1596		- aConstraints.gridwidth = 1;
	1763	+ cGridBag metalness = new cGridBag();
	1764	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1765	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1766	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1767	+ specularSection.add(metalness);
1597	1768
1598		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601		- aConstraints.gridx += 1;
1602		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604		- aConstraints.gridx = 0;
1605		- aConstraints.gridy += 1;
1606		- aConstraints.gridwidth = 1;
	1769	+ cGridBag velvet = new cGridBag();
	1770	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1771	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1772	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1773	+ specularSection.add(velvet);
1607	1774
1608		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611		- aConstraints.gridx += 1;
1612		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614		- aConstraints.gridx = 0;
1615		- aConstraints.gridy += 1;
1616		- aConstraints.gridwidth = 1;
1617		-
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	1775	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1776	+ //Return();
1620	1777	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1778	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1779	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1784,93 @@
1627	1784	// aConstraints.gridy += 1;
1628	1785	// aConstraints.gridwidth = 1;
1629	1786
1630		- //aConstraints.weighty = 1;
1631		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632		- //aConstraints.gridx += 1;
1633		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634		- aConstraints.weighty = 0;
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
1638	1787
1639		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
	1788	+ panel.add(new JSeparator());
	1789	+
	1790	+ panel.add(specularSection);
	1791	+
	1792	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1793	+
	1794	+ cGridBag globalSection = new cGridBag().setVertical(true);
1648	1795
1649		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- aConstraints.gridwidth = 1;
	1796	+ cGridBag camera = new cGridBag();
	1797	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1798	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1799	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1800	+ globalSection.add(camera);
1658	1801
1659		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662		- aConstraints.gridx += 1;
1663		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665		- aConstraints.gridx = 0;
1666		- aConstraints.gridy += 1;
1667		- aConstraints.gridwidth = 1;
	1802	+ cGridBag ambient = new cGridBag();
	1803	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1804	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1805	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1806	+ globalSection.add(ambient);
1668	1807
1669		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672		- aConstraints.gridx += 1;
1673		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675		- aConstraints.gridx = 0;
1676		- aConstraints.gridy += 1;
1677		- aConstraints.gridwidth = 1;
1678		- aConstraints.weighty = 0;
	1808	+ cGridBag backlit = new cGridBag();
	1809	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1810	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1811	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1812	+ globalSection.add(backlit);
1679	1813
1680		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	1814	+ cGridBag opacity = new cGridBag();
	1815	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1816	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1817	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1818	+ globalSection.add(opacity);
1689	1819
1690		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
	1820	+ panel.add(new JSeparator());
	1821	+
	1822	+ panel.add(globalSection);
	1823	+
	1824	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1825	+
	1826	+ cGridBag textureSection = new cGridBag().setVertical(true);
1699	1827
1700		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
	1828	+ cGridBag bump = new cGridBag();
	1829	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1830	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1831	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1832	+ textureSection.add(bump);
1709	1833
1710		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- aConstraints.gridwidth = 1;
	1834	+ cGridBag noise = new cGridBag();
	1835	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1836	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1837	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1838	+ textureSection.add(noise);
1719	1839
1720		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723		- aConstraints.gridx += 1;
1724		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726		- aConstraints.gridx = 0;
1727		- aConstraints.gridy += 1;
1728		- aConstraints.gridwidth = 1;
	1840	+ cGridBag power = new cGridBag();
	1841	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1842	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1843	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1844	+ textureSection.add(power);
1729	1845
1730		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733		- aConstraints.gridx += 1;
1734		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1736		- aConstraints.gridx = 0;
1737		- aConstraints.gridy += 1;
1738		- aConstraints.gridwidth = 1;
	1846	+ cGridBag borderfade = new cGridBag();
	1847	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1848	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1849	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1850	+ textureSection.add(borderfade);
1739	1851
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	1852	+ cGridBag fog = new cGridBag();
	1853	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1854	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1855	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1856	+ textureSection.add(fog);
1745	1857
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	1858	+ cGridBag opacityPower = new cGridBag();
	1859	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1860	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1861	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1862	+ textureSection.add(opacityPower);
	1863	+
	1864	+ panel.add(new JSeparator());
	1865	+
	1866	+ panel.add(textureSection);
	1867	+
	1868	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	1869
1750	1870	SetMaterial(copy); // .GetMaterial());
1751	1871
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	1872	+ //colorField.addChangeListener(this);
	1873	+// modulationField.addChangeListener(this);
1754	1874	metalnessField.addChangeListener(this);
1755	1875	diffuseField.addChangeListener(this);
1756	1876	specularField.addChangeListener(this);
..	..	@@ -1780,12 +1900,15 @@
1780	1900	opacityPowerField.addChangeListener(this);
1781	1901	/**/
1782	1902
1783		- resetSlidersButton.addActionListener(this);
1784	1903	clearMaterialButton.addActionListener(this);
1785	1904	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	1905	+
	1906	+ if (Globals.ADVANCED)
	1907	+ {
	1908	+ resetSlidersButton.addActionListener(this);
	1909	+ propagateToggle.addItemListener(this);
	1910	+ multiplyToggle.addItemListener(this);
	1911	+ }
1789	1912	}
1790	1913
1791	1914	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1956,7 +2079,7 @@
1956	2079
1957	2080	//? flashIt = false;
1958	2081	CameraPane pane = (CameraPane) cameraView;
1959		- pane.clickStart(location.x, location.y, 0);
	2082	+ pane.clickStart(location.x, location.y, 0, 0);
1960	2083	pane.clickEnd(location.x, location.y, 0, true);
1961	2084
1962	2085	if (group.selection.size() == 1)
..	..	@@ -2005,6 +2128,7 @@
2005	2128	e2.printStackTrace();
2006	2129	}
2007	2130	}
	2131	+
2008	2132	LoadJMEThread loadThread;
2009	2133
2010	2134	class LoadJMEThread extends Thread
..	..	@@ -2062,6 +2186,7 @@
2062	2186	//LoadFile0(filename, converter);
2063	2187	}
2064	2188	}
	2189	+
2065	2190	LoadOBJThread loadObjThread;
2066	2191
2067	2192	class LoadOBJThread extends Thread
..	..	@@ -2140,19 +2265,19 @@
2140	2265
2141	2266	void LoadObjFile(String fullname)
2142	2267	{
2143		- /*
	2268	+ System.out.println("Loading " + fullname);
	2269	+ /**/
2144	2270	//lastFilename = fullname;
2145	2271	if(loadObjThread == null)
2146	2272	{
2147		- loadObjThread = new LoadOBJThread();
2148		- loadObjThread.start();
	2273	+ loadObjThread = new LoadOBJThread();
	2274	+ loadObjThread.start();
2149	2275	}
2150	2276
2151	2277	loadObjThread.add(fullname);
2152		- */
	2278	+ /**/
2153	2279
2154		- System.out.println("Loading " + fullname);
2155		- makeSomething(new FileObject(fullname, true), true);
	2280	+ //makeSomething(new FileObject(fullname, true), true);
2156	2281	}
2157	2282
2158	2283	void LoadGFDFile(String fullname)
..	..	@@ -2413,11 +2538,11 @@
2413	2538
2414	2539	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2415	2540	{
2416		- if (GrafreeD.standAlone)
	2541	+ if (Grafreed.standAlone)
2417	2542	{
2418	2543	/**/
2419	2544	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2420		- browser.show();
	2545	+ browser.setVisible(true);
2421	2546	String filename = browser.getFile();
2422	2547	if (filename != null && filename.length() > 0)
2423	2548	{
..	..	@@ -2562,6 +2687,7 @@
2562	2687	}
2563	2688	if (input == null)
2564	2689	{
	2690	+ new Exception().printStackTrace();
2565	2691	System.exit(0);
2566	2692	}
2567	2693
..	..	@@ -2768,6 +2894,8 @@
2768	2894
2769	2895	void SetMaterial(Object3D object)
2770	2896	{
	2897	+ latestObject = object;
	2898	+
2771	2899	cMaterial mat = object.material;
2772	2900
2773	2901	if (mat == null)
..	..	@@ -2776,7 +2904,8 @@
2776	2904	return;
2777	2905	}
2778	2906
2779		- multiplyToggle.setSelected(mat.multiply);
	2907	+ if (multiplyToggle != null)
	2908	+ multiplyToggle.setSelected(mat.multiply);
2780	2909
2781	2910	assert (object.projectedVertices != null);
2782	2911
..	..	@@ -2952,31 +3081,48 @@
2952	3081	cameraView.ToggleDL();
2953	3082	cameraView.repaint();
2954	3083	return;
2955		- } else if (event.getSource() == toggleTextureItem)
	3084	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2956	3085	{
2957	3086	cameraView.ToggleTexture();
2958	3087	// june 2013 copy.HardTouch();
2959	3088	cameraView.repaint();
2960	3089	return;
2961		- } else if (event.getSource() == toggleFullItem)
	3090	+ } else if (event.getSource() == toggleTimelineItem)
2962	3091	{
2963		- if (CameraPane.FULLSCREEN)
	3092	+ timeline ^= true;
	3093	+
	3094	+ if (timeline)
2964	3095	{
2965		- frame.getContentPane().remove(/"Center",/bigThree);
2966		- framePanel.add(bigThree);
2967		- frame.getContentPane().add(/"Center",/framePanel);
2968		- } else
2969		- {
2970		- frame.getContentPane().remove(/"Center",/framePanel);
2971		- frame.getContentPane().add(/"Center",/bigThree);
	3096	+ centralPanel.remove(cameraView);
	3097	+ cameraPanel.add(cameraView);
	3098	+ centralPanel.add(cameraPanel);
	3099	+ frame.setJMenuBar(timelineMenubar);
	3100	+ wasFullScreen = CameraPane.FULLSCREEN;
	3101	+ if (!CameraPane.FULLSCREEN)
	3102	+ ToggleFullScreen();
	3103	+ toggleFullScreenItem.setEnabled(false);
2972	3104	}
	3105	+ else
	3106	+ {
	3107	+ centralPanel.remove(cameraPanel);
	3108	+ centralPanel.add(cameraView);
	3109	+ frame.setJMenuBar(null);
	3110	+ if (!wasFullScreen)
	3111	+ ToggleFullScreen();
	3112	+ toggleFullScreenItem.setEnabled(true);
	3113	+ }
	3114	+
2973	3115	frame.validate();
2974		- cameraView.ToggleFullScreen();
	3116	+ return;
	3117	+ } else if (event.getSource() == toggleFullScreenItem)
	3118	+ {
	3119	+ ToggleFullScreen();
	3120	+ frame.validate();
2975	3121
2976	3122	return;
2977		- } else if (event.getSource() == toggleRandomItem)
	3123	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2978	3124	{
2979		- cameraView.ToggleRandom();
	3125	+ cameraView.ToggleSwitch();
2980	3126	cameraView.repaint();
2981	3127	return;
2982	3128	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3005,6 +3151,10 @@
3005	3151	{
3006	3152	copy.live ^= true;
3007	3153	return;
	3154	+ } else if (event.getSource() == selectCB)
	3155	+ {
	3156	+ copy.dontselect ^= true;
	3157	+ return;
3008	3158	} else if (event.getSource() == hideCB)
3009	3159	{
3010	3160	copy.hide ^= true;
..	..	@@ -3019,6 +3169,7 @@
3019	3169	if (event.getSource() == randomCB)
3020	3170	{
3021	3171	copy.random ^= true;
	3172	+ objEditor.refreshContents();
3022	3173	return;
3023	3174	}
3024	3175	if (event.getSource() == speedupCB)
..	..	@@ -3042,8 +3193,9 @@
3042	3193
3043	3194	public void actionPerformed(ActionEvent event)
3044	3195	{
	3196	+ Object source = event.getSource();
3045	3197	// SCRIPT DIALOG
3046		- if (event.getSource() == okbutton)
	3198	+ if (source == okbutton)
3047	3199	{
3048	3200	textpanel.setVisible(false);
3049	3201	textpanel.remove(textarea);
..	..	@@ -3055,7 +3207,7 @@
3055	3207	textarea = null;
3056	3208	textpanel = null;
3057	3209	}
3058		- if (event.getSource() == cancelbutton)
	3210	+ if (source == cancelbutton)
3059	3211	{
3060	3212	textpanel.setVisible(false);
3061	3213	textpanel.remove(textarea);
..	..	@@ -3067,49 +3219,50 @@
3067	3219	//applySelf();
3068	3220	//client.refreshEditWindow();
3069	3221	//refreshContents();
3070		- if (event.getSource() == nameField)
	3222	+ if (source == nameField)
3071	3223	{
3072	3224	//System.out.println("ObjEditor " + event);
3073	3225	applySelf0(true);
3074	3226	//parent.applySelf();
3075	3227	objEditor.refreshContents();
3076		- } else if (event.getSource() == resetButton)
	3228	+ } else if (source == resetButton)
3077	3229	{
3078	3230	CameraPane.fullreset = true;
3079	3231	copy.Reset(); // ResetMeshes();
3080	3232	copy.Touch();
3081	3233	objEditor.refreshContents();
3082		- } else if (event.getSource() == stepItem)
	3234	+ } else if (source == stepItem)
3083	3235	{
3084		- cameraView.ONESTEP = true;
	3236	+ //cameraView.ONESTEP = true;
	3237	+ Globals.ONESTEP = true;
3085	3238	cameraView.repaint();
3086	3239	return;
3087		- } else if (event.getSource() == stepButton)
	3240	+ } else if (source == stepButton)
3088	3241	{
3089	3242	copy.Step();
3090	3243	copy.Touch();
3091	3244	objEditor.refreshContents();
3092		- } else if (event.getSource() == slowerButton)
	3245	+ } else if (source == slowerButton)
3093	3246	{
3094	3247	copy.Slower();
3095	3248	copy.Touch();
3096	3249	objEditor.refreshContents();
3097		- } else if (event.getSource() == fasterButton)
	3250	+ } else if (source == fasterButton)
3098	3251	{
3099	3252	copy.Faster();
3100	3253	copy.Touch();
3101	3254	objEditor.refreshContents();
3102		- } else if (event.getSource() == remarkButton)
	3255	+ } else if (source == remarkButton)
3103	3256	{
3104	3257	copy.Remark();
3105	3258	copy.Touch();
3106	3259	objEditor.refreshContents();
3107		- } else if (event.getSource() == stepAllButton)
	3260	+ } else if (source == stepAllButton)
3108	3261	{
3109	3262	copy.StepAll();
3110	3263	copy.Touch();
3111	3264	objEditor.refreshContents();
3112		- } else if (event.getSource() == resetAllButton)
	3265	+ } else if (source == resetAllButton)
3113	3266	{
3114	3267	//CameraPane.fullreset = true;
3115	3268	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3142,53 +3295,75 @@
3142	3295	// Close();
3143	3296	// }
3144	3297	// else
3145		- if (event.getSource() == resetSlidersButton)
	3298	+ if (source == resetSlidersButton)
3146	3299	{
3147	3300	ResetSliders();
3148		- } else if (event.getSource() == clearMaterialButton)
	3301	+ } else if (source == clearMaterialButton)
3149	3302	{
3150	3303	ClearMaterial();
3151		- } else if (event.getSource() == createMaterialButton)
	3304	+ } else if (source == createMaterialButton)
3152	3305	{
3153	3306	CreateMaterial();
3154		- } else if (event.getSource() == clearPanelButton)
	3307	+ } else if (source == clearPanelButton)
3155	3308	{
3156	3309	copy.ClearUI();
3157	3310	refreshContents(true);
3158		- } /*
3159		- }
3160		-
3161		- public boolean action(Event event, Object arg)
3162		- {
3163		- */ else if (event.getSource() == closeItem)
	3311	+ } else if (source == importGFDItem)
	3312	+ {
	3313	+ ImportGFD();
	3314	+ } else
	3315	+ if (source == importVRMLX3DItem)
	3316	+ {
	3317	+ ImportVRMLX3D();
	3318	+ } else
	3319	+ if (source == import3DSItem)
	3320	+ {
	3321	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3322	+ } else
	3323	+ if (source == importOBJItem)
	3324	+ {
	3325	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3326	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3327	+ browser.setVisible(true);
	3328	+ String filename = browser.getFile();
	3329	+ if (filename != null && filename.length() > 0)
	3330	+ {
	3331	+ String fullname = browser.getDirectory() + filename;
	3332	+ makeSomething(ReadOBJ(fullname), true);
	3333	+ }
	3334	+ } else
	3335	+ if (source == closeItem)
3164	3336	{
3165	3337	Close();
3166	3338	//return true;
3167		- } else if (event.getSource() == loadItem)
	3339	+ } else if (source == loadItem)
3168	3340	{
3169	3341	load();
3170	3342	//return true;
3171		- } else if (event.getSource() == saveItem)
	3343	+ } else if (source == newItem)
	3344	+ {
	3345	+ New();
	3346	+ } else if (source == saveItem)
3172	3347	{
3173	3348	save();
3174	3349	//return true;
3175		- } else if (event.getSource() == saveAsItem)
	3350	+ } else if (source == saveAsItem)
3176	3351	{
3177	3352	saveAs();
3178	3353	//return true;
3179		- } else if (event.getSource() == reexportItem)
	3354	+ } else if (source == reexportItem)
3180	3355	{
3181	3356	reexport();
3182	3357	//return true;
3183		- } else if (event.getSource() == exportAsItem)
	3358	+ } else if (source == exportAsItem)
3184	3359	{
3185	3360	export();
3186	3361	//return true;
3187		- } else if (event.getSource() == povItem)
	3362	+ } else if (source == povItem)
3188	3363	{
3189	3364	generatePOV();
3190	3365	//return true;
3191		- } else if (event.getSource() == zBufferItem)
	3366	+ } else if (source == zBufferItem)
3192	3367	{
3193	3368	try
3194	3369	{
..	..	@@ -3210,21 +3385,8 @@
3210	3385	cameraView.repaint();
3211	3386	//return true;
3212	3387	}
3213		- */ else if (event.getSource() == editCameraItem)
3214		- {
3215		- cameraView.ProtectCamera();
3216		- cameraView.repaint();
3217		- return;
3218		- } else if (event.getSource() == revertCameraItem)
3219		- {
3220		- cameraView.RevertCamera();
3221		- cameraView.repaint();
3222		- return;
3223		- } else if (event.getSource() == textureButton)
3224		- {
3225		- return; // true;
3226		- } else // combos...
3227		- if (event.getSource() == texresMenu)
	3388	+ */ else // combos...
	3389	+ if (source == texresMenu)
3228	3390	{
3229	3391	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3230	3392	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3236,27 +3398,287 @@
3236	3398	}
3237	3399	}
3238	3400
3239		- void ToggleAnimation()
	3401	+ void New()
3240	3402	{
3241		- if (!CameraPane.ANIMATION)
	3403	+ while (copy.Size() > 1)
3242	3404	{
3243		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3405	+ copy.remove(1);
	3406	+ }
	3407	+
	3408	+ ResetModel();
	3409	+ objEditor.refreshContents();
	3410	+ }
	3411	+
	3412	+ static public byte[] Compress(Object3D o)
	3413	+ {
	3414	+ try
	3415	+ {
	3416	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3417	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3418	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3419	+
	3420	+ Object3D parent = o.parent;
	3421	+ o.parent = null;
	3422	+
	3423	+ out.writeObject(o);
	3424	+
	3425	+ o.parent = parent;
	3426	+
	3427	+ out.flush();
	3428	+
	3429	+ zstream.close();
	3430	+ out.close();
	3431	+
	3432	+ return baos.toByteArray();
	3433	+ } catch (Exception e)
	3434	+ {
	3435	+ System.err.println(e);
	3436	+ return null;
	3437	+ }
	3438	+ }
	3439	+
	3440	+ static public Object Uncompress(byte[] bytes)
	3441	+ {
	3442	+ System.out.println("#bytes = " + bytes.length);
	3443	+ try
	3444	+ {
	3445	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3446	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3447	+ ObjectInputStream in = new ObjectInputStream(istream);
	3448	+ Object obj = in.readObject();
	3449	+ in.close();
	3450	+
	3451	+ return obj;
	3452	+ } catch (Exception e)
	3453	+ {
	3454	+ System.err.println(e);
	3455	+ return null;
	3456	+ }
	3457	+ }
	3458	+
	3459	+ static public Object clone(Object o)
	3460	+ {
	3461	+ try
	3462	+ {
	3463	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3464	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3465	+
	3466	+ out.writeObject(o);
	3467	+
	3468	+ out.flush();
	3469	+ out.close();
	3470	+
	3471	+ byte[] bytes = baos.toByteArray();
	3472	+
	3473	+ System.out.println("clone = " + bytes.length);
	3474	+
	3475	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3476	+ ObjectInputStream in = new ObjectInputStream(bais);
	3477	+ Object obj = in.readObject();
	3478	+ in.close();
	3479	+
	3480	+ return obj;
	3481	+ } catch (Exception e)
	3482	+ {
	3483	+ System.err.println(e);
	3484	+ return null;
	3485	+ }
	3486	+ }
	3487	+
	3488	+ cRadio GetCurrentTab()
	3489	+ {
	3490	+ cRadio ab;
	3491	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3492	+ {
	3493	+ ab = (cRadio)e.nextElement();
	3494	+ if(ab.GetObject() == copy)
	3495	+ {
	3496	+ return ab;
	3497	+ }
	3498	+ }
	3499	+
	3500	+ return null;
	3501	+ }
	3502	+
	3503	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3504	+
	3505	+ public void Save()
	3506	+ {
	3507	+ System.err.println("Save");
	3508	+
	3509	+ cRadio tab = GetCurrentTab();
	3510	+
	3511	+ boolean temp = CameraPane.SWITCH;
	3512	+ CameraPane.SWITCH = false;
	3513	+
	3514	+ copy.ExtractBigData(hashtable);
	3515	+
	3516	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3517	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3518	+
	3519	+ copy.RestoreBigData(hashtable);
	3520	+
	3521	+ CameraPane.SWITCH = temp;
	3522	+
	3523	+ //assert(hashtable.isEmpty());
	3524	+
	3525	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3526	+ {
	3527	+ tab.graphs[i] = null;
	3528	+ }
	3529	+
	3530	+ // test save
	3531	+ if (false)
	3532	+ {
	3533	+ try
	3534	+ {
	3535	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3536	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3537	+
	3538	+ p.writeObject(copy);
	3539	+
	3540	+ p.flush();
	3541	+
	3542	+ ostream.close();
	3543	+ } catch (Exception e)
	3544	+ {
	3545	+ e.printStackTrace();
	3546	+ }
	3547	+ }
	3548	+ }
	3549	+
	3550	+ void CopyChanged(Object3D obj)
	3551	+ {
	3552	+ boolean temp = CameraPane.SWITCH;
	3553	+ CameraPane.SWITCH = false;
	3554	+
	3555	+ copy.ExtractBigData(hashtable);
	3556	+
	3557	+ copy.clear();
	3558	+
	3559	+ for (int i=0; i<obj.Size(); i++)
	3560	+ {
	3561	+ copy.add(obj.get(i));
	3562	+ }
	3563	+
	3564	+ copy.RestoreBigData(hashtable);
	3565	+
	3566	+ CameraPane.SWITCH = temp;
	3567	+
	3568	+ //assert(hashtable.isEmpty());
	3569	+
	3570	+ copy.Touch();
	3571	+
	3572	+ ResetModel();
	3573	+ copy.HardTouch(); // recompile?
	3574	+
	3575	+ cRadio ab;
	3576	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3577	+ {
	3578	+ ab = (cRadio)e.nextElement();
	3579	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3580	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3581	+ if (test != null)
	3582	+ {
	3583	+ test.editWindow = ab.object.editWindow;
	3584	+ ab.object = test;
	3585	+ }
	3586	+ }
	3587	+
	3588	+ refreshContents();
	3589	+ }
	3590	+
	3591	+ public void Undo()
	3592	+ {
	3593	+ System.err.println("Undo");
	3594	+
	3595	+ cRadio tab = GetCurrentTab();
	3596	+
	3597	+ if (tab.undoindex == 0)
	3598	+ {
	3599	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3600	+ return;
	3601	+ }
	3602	+
	3603	+ if (tab.graphs[tab.undoindex] == null)
	3604	+ {
	3605	+ Save();
	3606	+ tab.undoindex -= 1;
	3607	+ }
	3608	+
	3609	+ tab.undoindex -= 1;
	3610	+
	3611	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3612	+ }
	3613	+
	3614	+ public void Redo()
	3615	+ {
	3616	+ cRadio tab = GetCurrentTab();
	3617	+
	3618	+ if (tab.graphs[tab.undoindex + 1] == null)
	3619	+ {
	3620	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3621	+ return;
	3622	+ }
	3623	+
	3624	+ tab.undoindex += 1;
	3625	+
	3626	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3627	+ }
	3628	+
	3629	+ void ImportGFD()
	3630	+ {
	3631	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3244	3632	browser.show();
3245	3633	String filename = browser.getFile();
3246	3634	if (filename != null && filename.length() > 0)
3247	3635	{
3248		- CameraPane.filename = browser.getDirectory() + filename;
	3636	+ String fullname = browser.getDirectory() + filename;
	3637	+
	3638	+ //Object3D readobj =
	3639	+ objEditor.ReadGFD(fullname, objEditor);
	3640	+ //makeSomething(readobj);
	3641	+ }
	3642	+ }
	3643	+
	3644	+ void ImportVRMLX3D()
	3645	+ {
	3646	+ if (Grafreed.standAlone)
	3647	+ {
	3648	+ /**/
	3649	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3650	+ browser.show();
	3651	+ String filename = browser.getFile();
	3652	+ if (filename != null && filename.length() > 0)
	3653	+ {
	3654	+ String fullname = browser.getDirectory() + filename;
	3655	+ LoadVRMLX3D(fullname);
	3656	+ }
	3657	+ /**/
	3658	+ }
	3659	+ }
	3660	+
	3661	+ void ToggleAnimation()
	3662	+ {
	3663	+ if (!Globals.ANIMATION)
	3664	+ {
	3665	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3666	+ browser.setVisible(true);
	3667	+ String filename = browser.getFile();
	3668	+ if (filename != null && filename.length() > 0)
	3669	+ {
	3670	+ Globals.filename = browser.getDirectory() + filename;
3249	3671	//CameraPane.framecount = 0;
3250		- CameraPane.imagecount = 0;
	3672	+ Globals.imagecount = 0;
3251	3673
3252		- CameraPane.ANIMATION ^= true;
	3674	+ Globals.ANIMATION ^= true;
3253	3675
3254		- GrafreeD.wav.cursor = 0;
3255		- GrafreeD.wav.loop = 0;
	3676	+ Grafreed.wav.cursor = 0;
	3677	+ Grafreed.wav.loop = 0;
3256	3678	}
3257	3679	} else
3258	3680	{
3259		- CameraPane.ANIMATION ^= true;
	3681	+ Globals.ANIMATION ^= true;
3260	3682	}
3261	3683	}
3262	3684
..	..	@@ -3302,7 +3724,7 @@
3302	3724	void CreateMaterial()
3303	3725	{
3304	3726	//copy.ClearMaterial(); // PATCH
3305		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3727	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3306	3728	if (copy.selection.size() > 0)
3307	3729	//SetMaterial(copy);
3308	3730	{
..	..	@@ -3353,7 +3775,7 @@
3353	3775	assert false;
3354	3776	}
3355	3777
3356		- void EditSelection()
	3778	+ void EditSelection(boolean newWindow)
3357	3779	{
3358	3780	}
3359	3781
..	..	@@ -3361,11 +3783,11 @@
3361	3783	{
3362	3784	copy.ResetBlockLoop(); // temporary problem
3363	3785
3364		- boolean random = CameraPane.RANDOM;
3365		- CameraPane.RANDOM = false; // parse everything
	3786	+ boolean random = CameraPane.SWITCH;
	3787	+ CameraPane.SWITCH = false; // parse everything
3366	3788	copy.ResetDisplayList();
3367	3789	copy.HardTouch();
3368		- CameraPane.RANDOM = random;
	3790	+ CameraPane.SWITCH = random;
3369	3791	}
3370	3792
3371	3793	// public void applySelf()
..	..	@@ -3435,10 +3857,40 @@
3435	3857	current.fakedepth = (float) fakedepthField.getFloat();
3436	3858	current.shadowbias = (float) shadowbiasField.getFloat();
3437	3859
3438		- if (!NumberSlider.frozen)
	3860	+ if (!cNumberSlider.frozen)
3439	3861	{
3440	3862	//System.out.println("Propagate = " + propagate);
3441	3863	copy.UpdateMaterial(anchor, current, propagate);
	3864	+
	3865	+ if (copy.material != null)
	3866	+ {
	3867	+ cMaterial mat = copy.material;
	3868	+
	3869	+ colorField.SetToolTipValue((mat.color));
	3870	+ modulationField.SetToolTipValue((mat.modulation));
	3871	+ metalnessField.SetToolTipValue((mat.metalness));
	3872	+ diffuseField.SetToolTipValue((mat.diffuse));
	3873	+ specularField.SetToolTipValue((mat.specular));
	3874	+ shininessField.SetToolTipValue((mat.shininess));
	3875	+ shiftField.SetToolTipValue((mat.shift));
	3876	+ ambientField.SetToolTipValue((mat.ambient));
	3877	+ lightareaField.SetToolTipValue((mat.lightarea));
	3878	+ diffusenessField.SetToolTipValue((mat.factor));
	3879	+ velvetField.SetToolTipValue((mat.velvet));
	3880	+ sheenField.SetToolTipValue((mat.sheen));
	3881	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3882	+ backlitField.SetToolTipValue((mat.bump));
	3883	+ anisoField.SetToolTipValue((mat.aniso));
	3884	+ anisoVField.SetToolTipValue((mat.anisoV));
	3885	+ cameraField.SetToolTipValue((mat.cameralight));
	3886	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3887	+ shadowField.SetToolTipValue((mat.shadow));
	3888	+ textureField.SetToolTipValue((mat.texture));
	3889	+ opacityField.SetToolTipValue((mat.opacity));
	3890	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3891	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3892	+ }
	3893	+
3442	3894	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3443	3895	{
3444	3896	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3483,6 +3935,7 @@
3483	3935	\|\| e.getSource() == apertureField
3484	3936	\|\| e.getSource() == shadowblurField)
3485	3937	{
	3938	+ new Exception().printStackTrace();
3486	3939	System.exit(0);
3487	3940	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3488	3941	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3509,7 +3962,13 @@
3509	3962	//System.out.println("PARENT = " + parent);
3510	3963	//if (parent != null)
3511	3964	// parent.applySelf();
3512		- refreshContents();
	3965	+ if (e.getSource() == normalpushField)
	3966	+ {
	3967	+ objEditor.refreshContents();
	3968	+ //Refresh();
	3969	+ }
	3970	+ else
	3971	+ refreshContents();
3513	3972	// ??? client.refreshEditWindow();
3514	3973	}
3515	3974	//else
..	..	@@ -3521,7 +3980,7 @@
3521	3980	//group.name = nameField.getText();
3522	3981	//objEditor.applySelf();
3523	3982
3524		- assert (objEditor == this);
	3983	+ // OCT2018: assert (objEditor == this);
3525	3984	if (copy.selection == null \|\| copy.selection.size() == 0)
3526	3985	//super.applySelf()
3527	3986	; else
..	..	@@ -3545,12 +4004,18 @@
3545	4004	objEditor.copy = keep;
3546	4005	}
3547	4006	}
	4007	+
	4008	+ if (normalpushField != null)
	4009	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3548	4010	}
3549	4011
3550	4012	void SnapObject()
3551	4013	{
3552		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3553		- SnapObject(obj);
	4014	+ if (copy.selection.size() > 0)
	4015	+ {
	4016	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4017	+ SnapObject(obj);
	4018	+ }
3554	4019	}
3555	4020
3556	4021	void SnapObject(Object3D obj)
..	..	@@ -3796,7 +4261,7 @@
3796	4261
3797	4262	radioPanel.revalidate();
3798	4263	radioPanel.repaint();
3799		- ctrlPanel.revalidate(); // ? new
	4264	+ ctrlPanel.validate(); // ? new
3800	4265	ctrlPanel.repaint();
3801	4266	}
3802	4267	}
..	..	@@ -3805,6 +4270,8 @@
3805	4270
3806	4271	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3807	4272	{
	4273	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4274	+ Save();
3808	4275	//Tween.set(thing, 0).target(1).start(tweenManager);
3809	4276	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3810	4277	// if (thing instanceof GenericJointDemo)
..	..	@@ -3891,6 +4358,12 @@
3891	4358	{
3892	4359	ResetModel();
3893	4360	Select(thing.GetTreePath(), true, false); // unselect... false);
	4361	+
	4362	+ if (thing.Size() == 0)
	4363	+ {
	4364	+ //EditSelection(false);
	4365	+ }
	4366	+
3894	4367	refreshContents();
3895	4368	}
3896	4369
..	..	@@ -4008,6 +4481,7 @@
4008	4481	}
4009	4482	}
4010	4483	}
	4484	+
4011	4485	LoadGFDThread loadGFDThread;
4012	4486
4013	4487	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4027,8 +4501,10 @@
4027	4501
4028	4502	try
4029	4503	{
	4504	+ // Try compressed version first.
4030	4505	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4031		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4506	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4507	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4032	4508
4033	4509	readobj = (Object3D) p.readObject();
4034	4510	istream.close();
..	..	@@ -4036,7 +4512,20 @@
4036	4512	readobj.ResetDisplayList();
4037	4513	} catch (Exception e)
4038	4514	{
4039		- e.printStackTrace();
	4515	+ //e.printStackTrace();
	4516	+ try
	4517	+ {
	4518	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4519	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4520	+
	4521	+ readobj = (Object3D) p.readObject();
	4522	+ istream.close();
	4523	+
	4524	+ readobj.ResetDisplayList();
	4525	+ } catch (Exception e2)
	4526	+ {
	4527	+ e2.printStackTrace();
	4528	+ }
4040	4529	}
4041	4530	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4042	4531	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4082,6 +4571,12 @@
4082	4571
4083	4572	void LoadIt(Object obj)
4084	4573	{
	4574	+ if (obj == null)
	4575	+ {
	4576	+ // Invalid file
	4577	+ return;
	4578	+ }
	4579	+
4085	4580	System.out.println("Loaded " + obj);
4086	4581	//new Exception().printStackTrace();
4087	4582	Object3D readobj = (Object3D) obj;
..	..	@@ -4091,6 +4586,8 @@
4091	4586
4092	4587	if (readobj != null)
4093	4588	{
	4589	+ if (Globals.SAVEONMAKE)
	4590	+ Save();
4094	4591	try
4095	4592	{
4096	4593	//readobj.deepCopySelf(copy);
..	..	@@ -4153,7 +4650,7 @@
4153	4650
4154	4651	void load() // throws ClassNotFoundException
4155	4652	{
4156		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4157	4654	{
4158	4655	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4159	4656	browser.show();
..	..	@@ -4240,11 +4737,13 @@
4240	4737	try
4241	4738	{
4242	4739	FileOutputStream ostream = new FileOutputStream(lastname);
4243		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4740	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4741	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4244	4742
4245	4743	p.writeObject(copy);
4246	4744	p.flush();
4247	4745
	4746	+ zstream.close();
4248	4747	ostream.close();
4249	4748
4250	4749	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4254,11 +4753,12 @@
4254	4753	{
4255	4754	}
4256	4755	}
	4756	+
4257	4757	String lastname;
4258	4758
4259	4759	void saveAs()
4260	4760	{
4261		- if (GrafreeD.standAlone)
	4761	+ if (Grafreed.standAlone)
4262	4762	{
4263	4763	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4264	4764	browser.setVisible(true);
..	..	@@ -4363,13 +4863,13 @@
4363	4863	try
4364	4864	{
4365	4865	FileOutputStream ostream = new FileOutputStream(filename);
4366		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4367		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4866	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4867	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4368	4868
4369	4869	Object3D objectparent = obj.parent;
4370	4870	obj.parent = null;
4371	4871
4372		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4872	+ Object3D object = (Object3D) Grafreed.clone(obj);
4373	4873
4374	4874	obj.parent = objectparent;
4375	4875
..	..	@@ -4381,8 +4881,8 @@
4381	4881	p.writeObject(object);
4382	4882	p.flush();
4383	4883
	4884	+ zstream.close();
4384	4885	ostream.close();
4385		- // zstream.close();
4386	4886
4387	4887	// group.selection.get(0).parent = parent;
4388	4888	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4403,7 +4903,7 @@
4403	4903	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4404	4904	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4405	4905	copy.generatePOV(buffer);
4406		- if (GrafreeD.standAlone)
	4906	+ if (Grafreed.standAlone)
4407	4907	{
4408	4908	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4409	4909	browser.show();
..	..	@@ -4429,7 +4929,8 @@
4429	4929	Object3D client;
4430	4930	Object3D copy;
4431	4931	MenuBar menuBar;
4432		- Menu windowMenu;
	4932	+ Menu fileMenu;
	4933	+ MenuItem newItem;
4433	4934	MenuItem loadItem;
4434	4935	MenuItem saveItem;
4435	4936	MenuItem saveAsItem;
..	..	@@ -4437,45 +4938,60 @@
4437	4938	MenuItem reexportItem;
4438	4939	MenuItem povItem;
4439	4940	MenuItem closeItem;
4440		- Menu cameraMenu;
	4941	+
4441	4942	CheckboxMenuItem zBufferItem;
4442	4943	//MenuItem normalLensItem;
4443		- MenuItem editCameraItem;
4444		- MenuItem revertCameraItem;
4445		- CheckboxMenuItem toggleLiveItem;
4446	4944	MenuItem stepItem;
4447		- CheckboxMenuItem toggleFullItem;
	4945	+ CheckboxMenuItem toggleLiveItem;
	4946	+ CheckboxMenuItem toggleFullScreenItem;
	4947	+ CheckboxMenuItem toggleTimelineItem;
4448	4948	CheckboxMenuItem toggleRenderItem;
4449	4949	CheckboxMenuItem toggleDebugItem;
4450	4950	CheckboxMenuItem toggleFrustumItem;
4451	4951	CheckboxMenuItem toggleFootContactItem;
4452	4952	CheckboxMenuItem toggleDLItem;
4453	4953	CheckboxMenuItem toggleTextureItem;
4454		- CheckboxMenuItem toggleRandomItem;
	4954	+ CheckboxMenuItem toggleSwitchItem;
4455	4955	CheckboxMenuItem toggleRootItem;
4456	4956	CheckboxMenuItem animationItem;
4457	4957	CheckboxMenuItem toggleHandleItem;
4458	4958	CheckboxMenuItem togglePaintItem;
4459	4959	JSplitPane mainPanel;
4460	4960	JScrollPane scrollpane;
	4961	+
4461	4962	JPanel toolbarPanel;
4462		- JPanel treePanel;
	4963	+
	4964	+ cGridBag treePanel;
	4965	+
4463	4966	JPanel radioPanel;
4464	4967	ButtonGroup buttonGroup;
4465		- JPanel ctrlPanel;
4466		- JPanel materialPanel;
	4968	+
	4969	+ cGridBag toolboxPanel;
	4970	+ cGridBag materialPanel;
	4971	+ cGridBag ctrlPanel;
	4972	+
4467	4973	JScrollPane infoPanel;
4468		- JPanel optionsPanel;
	4974	+
	4975	+ cGridBag optionsPanel;
	4976	+
4469	4977	JTabbedPane objectPanel;
4470		- JPanel XYZPanel;
	4978	+ boolean materialFlushed;
	4979	+ Object3D latestObject;
	4980	+
	4981	+ cGridBag XYZPanel;
	4982	+
4471	4983	JSplitPane gridPanel;
4472	4984	JSplitPane bigPanel;
4473		- JPanel bigThree;
4474		- JTabbedPane jtp;
4475		- JPanel cameraPanel;
	4985	+
	4986	+ cGridBag bigThree;
	4987	+ cGridBag scenePanel;
	4988	+ cGridBag centralPanel;
	4989	+ JSplitPane cameraPanel;
	4990	+ JPanel timelinePanel;
	4991	+ JMenuBar timelineMenubar;
4476	4992	JSplitPane framePanel;
4477	4993	JTextArea/Field/ nameField;
4478		- cButton textureButton;
	4994	+ //cButton textureButton;
4479	4995	cButton okButton;
4480	4996	cButton applyButton;
4481	4997	cButton cancelButton;
..	..	@@ -4522,65 +5038,72 @@
4522	5038	// MATERIAL
4523	5039	JLabel materialLabel;
4524	5040	JLabel colorLabel;
4525		- NumberSlider colorField;
	5041	+ cNumberSlider colorField;
4526	5042	JLabel modulationLabel;
4527		- NumberSlider modulationField;
	5043	+ cNumberSlider modulationField;
4528	5044	JLabel metalnessLabel;
4529		- NumberSlider metalnessField;
	5045	+ cNumberSlider metalnessField;
4530	5046	JLabel diffuseLabel;
4531		- NumberSlider diffuseField;
	5047	+ cNumberSlider diffuseField;
4532	5048	JLabel specularLabel;
4533		- NumberSlider specularField;
	5049	+ cNumberSlider specularField;
4534	5050	JLabel shininessLabel;
4535		- NumberSlider shininessField;
	5051	+ cNumberSlider shininessField;
4536	5052	JLabel shiftLabel;
4537		- NumberSlider shiftField;
	5053	+ cNumberSlider shiftField;
4538	5054	JLabel ambientLabel;
4539		- NumberSlider ambientField;
	5055	+ cNumberSlider ambientField;
4540	5056	JLabel lightareaLabel;
4541		- NumberSlider lightareaField;
	5057	+ cNumberSlider lightareaField;
4542	5058	JLabel diffusenessLabel;
4543		- NumberSlider diffusenessField;
	5059	+ cNumberSlider diffusenessField;
4544	5060	JLabel velvetLabel;
4545		- NumberSlider velvetField;
	5061	+ cNumberSlider velvetField;
4546	5062	JLabel sheenLabel;
4547		- NumberSlider sheenField;
	5063	+ cNumberSlider sheenField;
4548	5064	JLabel subsurfaceLabel;
4549		- NumberSlider subsurfaceField;
	5065	+ cNumberSlider subsurfaceField;
4550	5066	//JLabel bumpLabel;
4551	5067	//NumberSlider bumpField;
4552	5068	JLabel backlitLabel;
4553		- NumberSlider backlitField;
	5069	+ cNumberSlider backlitField;
4554	5070	JLabel anisoLabel;
4555		- NumberSlider anisoField;
	5071	+ cNumberSlider anisoField;
4556	5072	JLabel anisoVLabel;
4557		- NumberSlider anisoVField;
	5073	+ cNumberSlider anisoVField;
4558	5074	JLabel cameraLabel;
4559		- NumberSlider cameraField;
	5075	+ cNumberSlider cameraField;
4560	5076	JLabel selfshadowLabel;
4561		- NumberSlider selfshadowField;
	5077	+ cNumberSlider selfshadowField;
4562	5078	JLabel shadowLabel;
4563		- NumberSlider shadowField;
	5079	+ cNumberSlider shadowField;
4564	5080	JLabel textureLabel;
4565		- NumberSlider textureField;
	5081	+ cNumberSlider textureField;
4566	5082	JLabel opacityLabel;
4567		- NumberSlider opacityField;
	5083	+ cNumberSlider opacityField;
4568	5084	JLabel fakedepthLabel;
4569		- NumberSlider fakedepthField;
	5085	+ cNumberSlider fakedepthField;
4570	5086	JLabel shadowbiasLabel;
4571		- NumberSlider shadowbiasField;
	5087	+ cNumberSlider shadowbiasField;
4572	5088	JLabel bumpLabel;
4573		- NumberSlider bumpField;
	5089	+ cNumberSlider bumpField;
4574	5090	JLabel noiseLabel;
4575		- NumberSlider noiseField;
	5091	+ cNumberSlider noiseField;
4576	5092	JLabel powerLabel;
4577		- NumberSlider powerField;
	5093	+ cNumberSlider powerField;
4578	5094	JLabel borderfadeLabel;
4579		- NumberSlider borderfadeField;
	5095	+ cNumberSlider borderfadeField;
4580	5096	JLabel fogLabel;
4581		- NumberSlider fogField;
	5097	+ cNumberSlider fogField;
4582	5098	JLabel opacityPowerLabel;
4583		- NumberSlider opacityPowerField;
4584		- JTree jTree;
	5099	+ cNumberSlider opacityPowerField;
	5100	+ cTree jTree;
4585	5101	//ObjectUI parent;
	5102	+
	5103	+ cNumberSlider normalpushField;
	5104	+
	5105	+ private MenuItem importGFDItem;
	5106	+ private MenuItem importVRMLX3DItem;
	5107	+ private MenuItem import3DSItem;
	5108	+ private MenuItem importOBJItem;
4586	5109	}