~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -28,7 +34,73 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ boolean timeline;
	38	+ boolean wasFullScreen;
31	39
	40	+ GroupEditor callee;
	41	+ JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
	103	+
32	104	// SCRIPT
33	105
34	106	transient JFrame textpanel = null;
..	..	@@ -119,51 +191,62 @@
119	191	void keyPressed(int key, int modifiers)
120	192	{
121	193	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	194	+ Globals.theRenderer.keyPressed(key, modifiers);
123	195	}
124	196	*/
125	197
126	198	static GridBagConstraints aConstraints;
127	199	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	200	+
130	201	static int GRIDWIDTH = 100; // 4;
131	202
132	203	public void closeUI()
133	204	{
134	205	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
137	208	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
139	210
140		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
141	214	return;
142	215
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);
	216	+// objEditor.ctrlPanel.remove(liveCB);
	217	+// objEditor.ctrlPanel.remove(hideCB);
	218	+// objEditor.ctrlPanel.remove(markCB);
	219	+//
	220	+// objEditor.ctrlPanel.remove(randomCB);
	221	+// objEditor.ctrlPanel.remove(speedupCB);
	222	+// objEditor.ctrlPanel.remove(rewindCB);
	223	+//
	224	+// objEditor.ctrlPanel.remove(resetButton);
	225	+// objEditor.ctrlPanel.remove(stepButton);
	226	+//// objEditor.ctrlPanel.remove(stepAllButton);
	227	+//// objEditor.ctrlPanel.remove(resetAllButton);
	228	+// objEditor.ctrlPanel.remove(link2masterCB);
	229	+// //objEditor.ctrlPanel.remove(flipVCB);
	230	+// //objEditor.ctrlPanel.remove(texresMenu);
	231	+// objEditor.ctrlPanel.remove(slowerButton);
	232	+// objEditor.ctrlPanel.remove(fasterButton);
	233	+// objEditor.ctrlPanel.remove(remarkButton);
	234	+
	235	+ objEditor.ctrlPanel.remove(setupPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	238	+ objEditor.ctrlPanel.remove(pushPanel);
	239	+ //objEditor.ctrlPanel.remove(fillPanel);
	240	+
	241	+ //Remove(normalpushField);
161	242	}
162	243
163	244	public ObjEditor GetEditor()
164	245	{
165	246	return objEditor; //.GetEditor();
166	247	}
	248	+
	249	+ // Sometimes myself, sometimes my callee's.
167	250	ObjEditor objEditor;
168	251
169	252	/*
..	..	@@ -226,6 +309,7 @@
226	309	//localCopy.parent = null;
227	310
228	311	frame = new JFrame();
	312	+ frame.setUndecorated(true);
229	313	objEditor = this;
230	314	this.callee = callee;
231	315
..	..	@@ -238,7 +322,7 @@
238	322	//if (!isDisplayable())
239	323	//setUndecorated(true);
240	324
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	325	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	326	client = inClient;
243	327	copy = localCopy;
244	328	copy.editWindow = this;
..	..	@@ -256,27 +340,48 @@
256	340	return frame.action(event, obj);
257	341	}
258	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
259	348	void SetupMenu()
260	349	{
261	350	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..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	371	//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("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
272	376	if (client.parent != null)
273	377	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	379	} else
276	380	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	382	}
279	383
	384	+ newItem.addActionListener(this);
280	385	loadItem.addActionListener(this);
281	386	saveItem.addActionListener(this);
282	387	saveAsItem.addActionListener(this);
..	..	@@ -285,77 +390,64 @@
285	390	//povItem.addActionListener(this);
286	391	closeItem.addActionListener(this);
287	392
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	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
342	420	toolbarPanel = new JPanel();
343	421	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
345	423	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
	428	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
	437	+ materialPanel = new cGridBag().setVertical(true);
349	438	materialPanel.setName("Material");
	439	+
350	440	/JTextPane/
351	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
352	444	infoarea.setEditable(true);
353	445	SetText();
354	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	447	// infoarea.setOpaque(false);
356	448	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360	452	infoPanel.setPreferredSize(new Dimension(50, 200));
361	453	infoPanel.setName("Info");
..	..	@@ -366,16 +458,22 @@
366	458	mainPanel.setName("Main");
367	459	mainPanel.setContinuousLayout(true);
368	460	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	461	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
372		-
	462	+ mainPanel.setDividerLocation(0.5); //1.0);
	463	+ mainPanel.setResizeWeight(0.5);
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+// BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+// divider.setDividerSize(15);
	468	+// divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+
373	471	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	472	//mainPanel.setLayout(new GridBagLayout());
375	473	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	474	+// treePanel.setLayout(new GridBagLayout());
	475	+ //ctrlPanel.setLayout(new GridBagLayout());
	476	+ //materialPanel.setLayout(new GridBagLayout());
379	477
380	478	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	479	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +512,7 @@
414	512	static String newline = "\n";
415	513	protected static final String buttonString = "JButton";
416	514	StyledDocument doc;
417		- JTextArea infoarea;
	515	+ JTextPane infoarea;
418	516
419	517	void ClearInfo()
420	518	{
..	..	@@ -437,10 +535,10 @@
437	535	e.printStackTrace();
438	536	}
439	537
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();
	538	+// String selection = infoarea.getText();
	539	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	540	+// java.awt.datatransfer.Clipboard clipboard =
	541	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	542	//clipboard.setContents(data, data);
445	543	}
446	544
..	..	@@ -463,13 +561,13 @@
463	561	//SendInfo("Name:", "bold");
464	562	if (sel.GetTextures() != null \|\| debug)
465	563	{
466		- si.SendInfo(sel.toString(), "bold");
	564	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	565	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	566	if (sel.Size() > 0)
469	567	{
470	568	si.SendInfo("#children = " + sel.Size(), "regular");
471	569	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	570	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	571	if (debug)
474	572	{
475	573	try
..	..	@@ -481,7 +579,10 @@
481	579	}
482	580
483	581	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	582	+ {
	583	+ si.SendInfo(" BBox min: " + minima, "regular");
	584	+ si.SendInfo(" BBox max: " + maxima, "regular");
	585	+ }
485	586
486	587	if (sel.bRep != null)
487	588	{
..	..	@@ -508,7 +609,7 @@
508	609	}
509	610	if (sel.support != null)
510	611	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	612	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	613	}
513	614	if (sel.scriptnode != null)
514	615	{
..	..	@@ -579,6 +680,9 @@
579	680	{
580	681	CameraPane.pointflow = (PointFlow) sel;
581	682	}
	683	+
	684	+ si.SendInfo("_____________________", "regular");
	685	+ si.SendInfo("", "regular");
582	686	}
583	687	}
584	688
..	..	@@ -594,52 +698,140 @@
594	698	}
595	699	}
596	700
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		- };
	701	+static GraphicsDevice device = GraphicsEnvironment
	702	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	703
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	704	+ Rectangle keeprect;
	705	+ cRadio radio;
	706	+
	707	+cButton keepButton;
	708	+ cButton twoButton; // Full 3D
	709	+ cButton sixButton;
	710	+ cButton threeButton;
	711	+ cButton sevenButton;
	712	+ cButton fourButton; // full panel
	713	+ cButton oneButton; // full XYZ
	714	+ //cButton currentLayout;
	715	+
	716	+ boolean maximized;
	717	+
	718	+ cButton fullscreenLayout;
621	719
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	720	+ void Minimize()
628	721	{
629		- for (int j = 0; j < 2; j++)
	722	+ frame.setState(Frame.ICONIFIED);
	723	+ }
	724	+
	725	+ void Maximize()
	726	+ {
	727	+ if (maximized)
630	728	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	729	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
636	730	}
637		- } catch (BadLocationException ble)
	731	+ else
	732	+ {
	733	+ keeprect = frame.getBounds();
	734	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	735	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	736	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	737	+// frame.setState(Frame.MAXIMIZED_BOTH);
	738	+ }
	739	+
	740	+ maximized ^= true;
	741	+ }
	742	+
	743	+ void ToggleFullScreen()
638	744	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	745	+ cameraView.ToggleFullScreen();
	746	+
	747	+ if (!CameraPane.FULLSCREEN)
	748	+ {
	749	+ device.setFullScreenWindow(null);
	750	+ //frame.setVisible(false);
	751	+// frame.removeNotify();
	752	+// frame.setUndecorated(false);
	753	+// frame.addNotify();
	754	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	755	+
	756	+// X frame.getContentPane().remove(/"Center",/bigThree);
	757	+// X framePanel.add(bigThree);
	758	+// X frame.getContentPane().add(/"Center",/framePanel);
	759	+ framePanel.setDividerLocation(1);
	760	+
	761	+ //frame.setVisible(true);
	762	+ radio.layout = keepButton;
	763	+ //theFrame = null;
	764	+ keepButton = null;
	765	+ radio.layout.doClick();
	766	+
	767	+ } else
	768	+ {
	769	+ keepButton = radio.layout;
	770	+ //keeprect = frame.getBounds();
	771	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	772	+// frame.getToolkit().getScreenSize().height);
	773	+ //frame.setVisible(false);
	774	+ device.setFullScreenWindow(frame);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(true);
	777	+// frame.addNotify();
	778	+// X frame.getContentPane().remove(/"Center",/framePanel);
	779	+// X framePanel.remove(bigThree);
	780	+// X frame.getContentPane().add(/"Center",/bigThree);
	781	+ framePanel.setDividerLocation(0);
	782	+
	783	+ radio.layout = fullscreenLayout;
	784	+ radio.layout.doClick();
	785	+ //frame.setVisible(true);
	786	+ }
640	787	}
641	788
642		- return new JTextArea(); // textPane;
	789	+ private JTextPane createTextPane()
	790	+ {
	791	+// TEXTAREA String[] initString =
	792	+// {
	793	+// "This is an editable JTextPane, ", //regular
	794	+// "another ", //italic
	795	+// "styled ", //bold
	796	+// "text ", //small
	797	+// "component, ", //large
	798	+// "which supports embedded components..." + newline,//regular
	799	+// " " + newline, //button
	800	+// "...and embedded icons..." + newline, //regular
	801	+// " ", //icon
	802	+// newline + "JTextPane is a subclass of JEditorPane that "
	803	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	804	+// + "cover methods for interacting with those objects."
	805	+// };
	806	+//
	807	+// String[] initStyles =
	808	+// {
	809	+// "regular", "italic", "bold", "small", "large",
	810	+// "regular", "button", "regular", "icon",
	811	+// "regular"
	812	+// };
	813	+//
	814	+// JTextPane textPane = new JTextPane();
	815	+// textPane.setEditable(true);
	816	+// /StyledDocument/ doc = textPane.getStyledDocument();
	817	+// addStylesToDocument(doc);
	818	+//
	819	+// try
	820	+// {
	821	+// for (int j = 0; j < 2; j++)
	822	+// {
	823	+// for (int i = 0; i < initString.length; i++)
	824	+// {
	825	+// doc.insertString(doc.getLength(), initString[i],
	826	+// doc.getStyle(initStyles[i]));
	827	+// }
	828	+// }
	829	+// } catch (BadLocationException ble)
	830	+// {
	831	+// System.err.println("Couldn't insert initial text into text pane.");
	832	+// }
	833	+
	834	+ return new JTextPane(); // textPane;
643	835	}
644	836
645	837	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +884,7 @@
692	884	protected static ImageIcon createImageIcon(String path,
693	885	String description)
694	886	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	887	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	888	if (imgURL != null)
697	889	{
698	890	return new ImageIcon(imgURL, description);
..	..	@@ -724,6 +916,7 @@
724	916	// NumberSlider vDivsField;
725	917	// JCheckBox endcaps;
726	918	JCheckBox liveCB;
	919	+ JCheckBox selectCB;
727	920	JCheckBox hideCB;
728	921	JCheckBox link2masterCB;
729	922	JCheckBox markCB;
..	..	@@ -731,7 +924,12 @@
731	924	JCheckBox speedupCB;
732	925	JCheckBox rewindCB;
733	926	JCheckBox flipVCB;
	927	+
	928	+ cCheckBox toggleTextureCB;
	929	+ cCheckBox toggleSwitchCB;
	930	+
734	931	JComboBox texresMenu;
	932	+
735	933	JButton resetButton;
736	934	JButton stepButton;
737	935	JButton stepAllButton;
..	..	@@ -739,115 +937,87 @@
739	937	JButton slowerButton;
740	938	JButton fasterButton;
741	939	JButton remarkButton;
	940	+
	941	+ cGridBag editPanel;
	942	+ cGridBag editCommandsPanel;
	943	+
	944	+ cGridBag namePanel;
	945	+ cGridBag setupPanel;
	946	+ cGridBag setupPanel2;
	947	+ cGridBag objectCommandsPanel;
	948	+ cGridBag pushPanel;
	949	+ cGridBag fillPanel;
742	950
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	951	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	952	{
745	953	JCheckBox cb;
746	954
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);
	955	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	956	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	957
757	958	return cb;
758	959	}
759	960
760		- cButton AddButton(ObjEditor oe, String label)
	961	+ cButton AddButton(cGridBag panel, String label)
761	962	{
762	963	cButton cb;
763	964
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);
	965	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	966	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	967
774	968	return cb;
775	969	}
776	970
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	971	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	972	{
779	973	JComboBox combo;
780	974
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;
	975	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	976	combo.addActionListener(this);
785	977
786	978	return combo;
787	979	}
788	980
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	981	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	982	{
791		- NumberSlider combo;
	983	+ cGridBag control = new cGridBag();
	984	+
	985	+ cNumberSlider combo;
792	986
793	987	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	988	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		-
	989	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	990	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	991	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	992	+
	993	+ panel.add(control);
	994	+
	995	+ return control;
813	996	}
814	997
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	998	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	999	{
817		- NumberSlider combo;
	1000	+ cGridBag control = new cGridBag();
	1001	+
	1002	+ cNumberSlider combo;
818	1003
819	1004	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1005	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		-
	1006	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1007	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1008	combo.setInteger(current);
833	1009
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1010	+ panel.add(control);
	1011	+
	1012	+ return control;
839	1013	}
840	1014
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1015	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1016	{
843	1017	JTextArea text;
844	1018
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1019	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1020	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1021
852	1022	return text;
853	1023	}
..	..	@@ -877,9 +1047,16 @@
877	1047	objEditor.ctrlPanel.remove(j);
878	1048	}
879	1049
	1050	+ void Remove(cNumberSlider j)
	1051	+ {
	1052	+ j.removeChangeListener(this);
	1053	+ //objEditor.ctrlPanel.remove(j.label);
	1054	+ objEditor.ctrlPanel.remove(j);
	1055	+ }
	1056	+
880	1057	/*
881	1058	*/
882		- void Return() // ObjEditor oe)
	1059	+ void Return0() // ObjEditor oe)
883	1060	{
884	1061	aConstraints.gridy += 1;
885	1062	aConstraints.gridx = 0;
..	..	@@ -934,35 +1111,77 @@
934	1111
935	1112	void SetupUI2(ObjEditor oe)
936	1113	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1114	+ //SetupName(oe);
942	1115
943		- if (!GroupEditor.allparams)
	1116	+ namePanel = new cGridBag();
	1117	+
	1118	+ nameField = AddText(namePanel, copy.GetName());
	1119	+ namePanel.add(nameField);
	1120	+ oe.ctrlPanel.add(namePanel);
	1121	+
	1122	+ oe.ctrlPanel.Return();
	1123	+
	1124	+ if (!allparams)
944	1125	return;
945	1126
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1127	+ setupPanel = new cGridBag().setVertical(false);
	1128	+
	1129	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1130	+ liveCB.setToolTipText("Animate object");
	1131	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1132	+ selectCB.setToolTipText("Make object selectable");
949	1133	// 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");
	1134	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1135	+ hideCB.setToolTipText("Hide object");
	1136	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1137	+ markCB.setToolTipText("As animation target transform");
	1138	+
	1139	+ setupPanel2 = new cGridBag().setVertical(false);
	1140	+
	1141	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1142	+ rewindCB.setToolTipText("Rewind animation");
	1143	+
	1144	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1145	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1146	+
	1147	+ if (Globals.ADVANCED)
	1148	+ {
	1149	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1150	+ link2masterCB.setToolTipText("Attach to support");
	1151	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1152	+ speedupCB.setToolTipText("Option motion capture");
	1153	+ }
	1154	+
	1155	+ oe.ctrlPanel.add(setupPanel);
	1156	+ oe.ctrlPanel.Return();
	1157	+ oe.ctrlPanel.add(setupPanel2);
	1158	+ oe.ctrlPanel.Return();
	1159	+
	1160	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1161	+
	1162	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1163	+ resetButton.setToolTipText("Jump to frame zero");
	1164	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1165	+ stepButton.setToolTipText("Step one frame");
956	1166	// resetAllButton = AddButton(oe, "Reset All");
957	1167	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1168	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1169	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1170	+ slowerButton.setToolTipText("Decrease animation speed");
	1171	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1172	+ fasterButton.setToolTipText("Increase animation speed");
	1173	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1174	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1175
964		- Return();
	1176	+ oe.ctrlPanel.add(objectCommandsPanel);
	1177	+ oe.ctrlPanel.Return();
965	1178
	1179	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1180	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1181	+ //Return();
	1182	+
	1183	+ oe.ctrlPanel.Return();
	1184	+
966	1185	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1186	// ObjEditor.aConstraints.gridx += 1;
968	1187
..	..	@@ -1056,7 +1275,7 @@
1056	1275	oe.aConstraints.gridwidth = 1;
1057	1276	/**/
1058	1277	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1278	+ oe.ctrlPanel.Return();
1060	1279
1061	1280	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1281	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1377,28 @@
1158	1377	//JPanel worldPanel =
1159	1378	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1379	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1380	+ centralPanel = new cGridBag();
	1381	+ centralPanel.preferredWidth = 20;
	1382	+
	1383	+ if (Globals.ADVANCED)
	1384	+ {
	1385	+ timelinePanel = new JPanel(new BorderLayout());
	1386	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1387
	1388	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1389	+ cameraPanel.setContinuousLayout(true);
	1390	+ cameraPanel.setOneTouchExpandable(true);
	1391	+// cameraPanel.setDividerLocation(0.9);
	1392	+// cameraPanel.setDividerSize(9);
	1393	+ cameraPanel.setResizeWeight(1.0);
	1394	+
	1395	+ }
	1396	+
	1397	+ centralPanel.add(cameraView);
	1398	+ centralPanel.setFocusable(true);
	1399	+ //frame.setJMenuBar(timelineMenubar);
	1400	+ //centralPanel.add(timelinePanel);
	1401	+
1165	1402	//topView.camera = ;
1166	1403	//frontView.camera = new Camera(2);
1167	1404	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1414,13 @@
1177	1414	//frontView.object = copy;
1178	1415	//sideView.object = copy;
1179	1416
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1417	+ XYZPanel = new cGridBag().setVertical(true);
	1418	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1419
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1420	+ XYZPanel.preferredWidth = 5;
	1421	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1422	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1423	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1186	1424
1187	1425	/*
1188	1426	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1429,7 @@
1191	1429	gridPanel.add(cameraView);
1192	1430	gridPanel.add(XYZPanel);
1193	1431	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1432	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1433	gridPanel.setContinuousLayout(true);
1196	1434	gridPanel.setOneTouchExpandable(true);
1197	1435	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,11 +1458,13 @@
1220	1458	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1459	//tmp.setName("Edit");
1222	1460	objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- objectPanel.add(north);
	1461	+// JPanel north = new JPanel(new BorderLayout());
	1462	+// north.setName("Edit");
	1463	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1464	+// objectPanel.add(north);
	1465	+ objectPanel.add(editPanel);
1227	1466	objectPanel.add(infoPanel);
	1467	+ objectPanel.add(toolboxPanel);
1228	1468
1229	1469	/*
1230	1470	aConstraints.gridx = 0;
..	..	@@ -1233,7 +1473,7 @@
1233	1473	aConstraints.gridy += 1;
1234	1474	aConstraints.gridwidth = 1;
1235	1475	mainPanel.add(objectPanel, aConstraints);
1236		- */
	1476	+ */
1237	1477
1238	1478	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1239	1479	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1244,16 +1484,23 @@
1244	1484	scrollpane.setWheelScrollingEnabled(true);
1245	1485	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1486
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1487	+ /JTabbedPane/ scenePanel = new cGridBag();
	1488	+ scenePanel.preferredWidth = 6;
	1489	+
	1490	+ JTabbedPane tabbedPane = new JTabbedPane();
	1491	+ tabbedPane.add(scrollpane);
1249	1492
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1493	+ optionsPanel = new cGridBag().setVertical(false);
1253	1494
1254	1495	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1496	+
	1497	+ AddOptions(optionsPanel); //, aConstraints);
	1498	+
	1499	+ tabbedPane.add(optionsPanel);
	1500	+
	1501	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1502
	1503	+ scenePanel.add(tabbedPane);
1257	1504
1258	1505	/*
1259	1506	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1522,7 @@
1275	1522	jtp.add(tree);
1276	1523	*/
1277	1524
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1525	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1526	bigPanel.setContinuousLayout(true);
1280	1527	bigPanel.setOneTouchExpandable(true);
1281	1528	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1534,7 @@
1287	1534	//bigPanel.setSize(new Dimension(10,10));
1288	1535	//bigPanel.add(ctrlPanel);
1289	1536	//bigPanel.add(gridPanel);
	1537	+ /**
1290	1538	bigThree = new JPanel();
1291	1539	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1540	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1545,26 @@
1297	1545	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1546	aWindowConstraints.weightx = 0;
1299	1547	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1548	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1549	aWindowConstraints.weightx = 1;
1302	1550	aWindowConstraints.gridwidth = 3;
1303	1551	// aConstraints.gridheight = 3;
1304	1552	aWindowConstraints.gridx = 1;
1305	1553	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1554	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1555	aWindowConstraints.weightx = 0;
1308	1556	aWindowConstraints.gridx = 4;
1309	1557	aWindowConstraints.gridwidth = 1;
1310	1558	// aConstraints.gridheight = 3;
1311	1559	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1560	bigThree.add(XYZPanel, aWindowConstraints);
	1561	+ /**/
1313	1562
	1563	+ bigThree = new cGridBag();
	1564	+ bigThree.addComponent(scenePanel);
	1565	+ bigThree.addComponent(centralPanel);
	1566	+ bigThree.addComponent(XYZPanel);
	1567	+
1314	1568	// // SIDE EFFECT!!!
1315	1569	// aConstraints.gridx = 0;
1316	1570	// aConstraints.gridy = 0;
..	..	@@ -1331,14 +1585,19 @@
1331	1585	//worldPane.add(bigPanel);
1332	1586	//worldPane.add(worldPanel);
1333	1587	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1588	+ //frame.getContentPane().add(/"Center",/framePanel);
	1589	+ frame.add(/"Center",/framePanel);
1335	1590	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1591
1337	1592	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1593
1339		- frame.setSize(1024, 768);
1340		- frame.show();
	1594	+ frame.setSize(1280, 860);
	1595	+
	1596	+ frame.validate();
	1597	+ frame.setVisible(true);
1341	1598
	1599	+ cameraView.requestFocusInWindow();
	1600	+
1342	1601	gridPanel.setDividerLocation(1.0);
1343	1602
1344	1603	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1352,6 +1611,10 @@
1352	1611	});
1353	1612	}
1354	1613
	1614	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1615	+ {
	1616	+ }
	1617	+
1355	1618	JTree GetTree()
1356	1619	{
1357	1620	return objEditor.jTree;
..	..	@@ -1363,260 +1626,173 @@
1363	1626	ctrlPanel.removeAll();
1364	1627	}
1365	1628
1366		- void SetupMaterial(JPanel ctrlPanel)
	1629	+ void SetupMaterial(cGridBag panel)
1367	1630	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1631	+ /*
1371	1632	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1633	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1634	*/
1376	1635
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	1636	+ cGridBag editBar = new cGridBag().setVertical(false);
	1637	+
	1638	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1639	+ createMaterialButton.setToolTipText("Create material");
1382	1640
1383	1641	/*
1384	1642	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1643	*/
1389	1644
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	1645	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1646	+ clearMaterialButton.setToolTipText("Clear material");
	1647	+
	1648	+ if (Globals.ADVANCED)
	1649	+ {
	1650	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1651	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1652	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1653	+ }
1392	1654
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;
	1655	+ editBar.preferredHeight = 15;
	1656	+
	1657	+ panel.add(editBar);
	1658	+
1407	1659	/**/
1408	1660	//aConstraints.weighty = 0;
1409	1661	////aConstraints.weightx = 1;
1410	1662	//aConstraints.weighty = 1;
1411	1663	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1664	//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;
	1665	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1666
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;
	1667	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1668	+
	1669	+ cGridBag color = new cGridBag();
	1670	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1671	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1672	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1673	+ //colorField.preferredWidth = 200;
	1674	+ colorSection.add(color);
1429	1675
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;
	1676	+ cGridBag modulation = new cGridBag();
	1677	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1678	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1679	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1680	+ colorSection.add(modulation);
1439	1681
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;
	1682	+ cGridBag texture = new cGridBag();
	1683	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1684	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1685	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1686	+ colorSection.add(texture);
1449	1687
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;
	1688	+ cGridBag anisoU = new cGridBag();
	1689	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1690	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1691	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1692	+ colorSection.add(anisoU);
1459	1693
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;
	1694	+ cGridBag anisoV = new cGridBag();
	1695	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1696	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1697	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1698	+ colorSection.add(anisoV);
1469	1699
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;
	1700	+ cGridBag shadowbias = new cGridBag();
	1701	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1702	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1703	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1704	+ colorSection.add(shadowbias);
1479	1705
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;
	1706	+ panel.add(new JSeparator());
	1707	+
	1708	+ panel.add(colorSection);
	1709	+
	1710	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1711	+
	1712	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1713	+
	1714	+ cGridBag diffuse = new cGridBag();
	1715	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1716	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1717	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1718	+ diffuseSection.add(diffuse);
1488	1719
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;
	1720	+ cGridBag diffuseness = new cGridBag();
	1721	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1722	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1723	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1724	+ diffuseSection.add(diffuseness);
1498	1725
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;
	1726	+ cGridBag selfshadow = new cGridBag();
	1727	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1728	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1729	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1730	+ diffuseSection.add(selfshadow);
1508	1731
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;
	1732	+ cGridBag sheen = new cGridBag();
	1733	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1734	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1735	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1736	+ diffuseSection.add(sheen);
1518	1737
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;
	1738	+ cGridBag subsurface = new cGridBag();
	1739	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1740	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1741	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1742	+ diffuseSection.add(subsurface);
1528	1743
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;
	1744	+ cGridBag shadow = new cGridBag();
	1745	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1746	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1747	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1748	+ diffuseSection.add(shadow);
1538	1749
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;
	1750	+ cGridBag fakedepth = new cGridBag();
	1751	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1752	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1753	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1754	+ diffuseSection.add(fakedepth);
1548	1755
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;
	1756	+ panel.add(new JSeparator());
	1757	+
	1758	+ panel.add(diffuseSection);
	1759	+
	1760	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1761	+
	1762	+ cGridBag specularSection = new cGridBag().setVertical(true);
1558	1763
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;
	1764	+ cGridBag specular = new cGridBag();
	1765	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1766	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1767	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1768	+ specularSection.add(specular);
1567	1769
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;
	1770	+ cGridBag lightarea = new cGridBag();
	1771	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1772	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1773	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1774	+ specularSection.add(lightarea);
1577	1775
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;
	1776	+ cGridBag shininess = new cGridBag();
	1777	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1778	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1779	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1780	+ specularSection.add(shininess);
1587	1781
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;
	1782	+ cGridBag metalness = new cGridBag();
	1783	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1784	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1785	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1786	+ specularSection.add(metalness);
1597	1787
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;
	1788	+ cGridBag velvet = new cGridBag();
	1789	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1790	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1791	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1792	+ specularSection.add(velvet);
1607	1793
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();
	1794	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1795	+ //Return();
1620	1796	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1797	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1798	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1803,93 @@
1627	1803	// aConstraints.gridy += 1;
1628	1804	// aConstraints.gridwidth = 1;
1629	1805
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	1806
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;
	1807	+ panel.add(new JSeparator());
	1808	+
	1809	+ panel.add(specularSection);
	1810	+
	1811	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1812	+
	1813	+ cGridBag globalSection = new cGridBag().setVertical(true);
1648	1814
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;
	1815	+ cGridBag camera = new cGridBag();
	1816	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1817	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1818	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1819	+ globalSection.add(camera);
1658	1820
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;
	1821	+ cGridBag ambient = new cGridBag();
	1822	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1823	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1824	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1825	+ globalSection.add(ambient);
1668	1826
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;
	1827	+ cGridBag backlit = new cGridBag();
	1828	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1829	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1830	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1831	+ globalSection.add(backlit);
1679	1832
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;
	1833	+ cGridBag opacity = new cGridBag();
	1834	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1835	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1836	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1837	+ globalSection.add(opacity);
1689	1838
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;
	1839	+ panel.add(new JSeparator());
	1840	+
	1841	+ panel.add(globalSection);
	1842	+
	1843	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1844	+
	1845	+ cGridBag textureSection = new cGridBag().setVertical(true);
1699	1846
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;
	1847	+ cGridBag bump = new cGridBag();
	1848	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1849	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1850	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1851	+ textureSection.add(bump);
1709	1852
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;
	1853	+ cGridBag noise = new cGridBag();
	1854	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1855	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1856	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1857	+ textureSection.add(noise);
1719	1858
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;
	1859	+ cGridBag power = new cGridBag();
	1860	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1861	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1862	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1863	+ textureSection.add(power);
1729	1864
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;
	1865	+ cGridBag borderfade = new cGridBag();
	1866	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1867	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1868	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1869	+ textureSection.add(borderfade);
1739	1870
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	1871	+ cGridBag fog = new cGridBag();
	1872	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1873	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1874	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1875	+ textureSection.add(fog);
1745	1876
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	1877	+ cGridBag opacityPower = new cGridBag();
	1878	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1879	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1880	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1881	+ textureSection.add(opacityPower);
	1882	+
	1883	+ panel.add(new JSeparator());
	1884	+
	1885	+ panel.add(textureSection);
	1886	+
	1887	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	1888
1750	1889	SetMaterial(copy); // .GetMaterial());
1751	1890
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	1891	+ //colorField.addChangeListener(this);
	1892	+// modulationField.addChangeListener(this);
1754	1893	metalnessField.addChangeListener(this);
1755	1894	diffuseField.addChangeListener(this);
1756	1895	specularField.addChangeListener(this);
..	..	@@ -1780,12 +1919,15 @@
1780	1919	opacityPowerField.addChangeListener(this);
1781	1920	/**/
1782	1921
1783		- resetSlidersButton.addActionListener(this);
1784	1922	clearMaterialButton.addActionListener(this);
1785	1923	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	1924	+
	1925	+ if (Globals.ADVANCED)
	1926	+ {
	1927	+ resetSlidersButton.addActionListener(this);
	1928	+ propagateToggle.addItemListener(this);
	1929	+ multiplyToggle.addItemListener(this);
	1930	+ }
1789	1931	}
1790	1932
1791	1933	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1956,7 +2098,7 @@
1956	2098
1957	2099	//? flashIt = false;
1958	2100	CameraPane pane = (CameraPane) cameraView;
1959		- pane.clickStart(location.x, location.y, 0);
	2101	+ pane.clickStart(location.x, location.y, 0, 0);
1960	2102	pane.clickEnd(location.x, location.y, 0, true);
1961	2103
1962	2104	if (group.selection.size() == 1)
..	..	@@ -2005,6 +2147,7 @@
2005	2147	e2.printStackTrace();
2006	2148	}
2007	2149	}
	2150	+
2008	2151	LoadJMEThread loadThread;
2009	2152
2010	2153	class LoadJMEThread extends Thread
..	..	@@ -2062,6 +2205,7 @@
2062	2205	//LoadFile0(filename, converter);
2063	2206	}
2064	2207	}
	2208	+
2065	2209	LoadOBJThread loadObjThread;
2066	2210
2067	2211	class LoadOBJThread extends Thread
..	..	@@ -2140,19 +2284,19 @@
2140	2284
2141	2285	void LoadObjFile(String fullname)
2142	2286	{
2143		- /*
	2287	+ System.out.println("Loading " + fullname);
	2288	+ /**/
2144	2289	//lastFilename = fullname;
2145	2290	if(loadObjThread == null)
2146	2291	{
2147		- loadObjThread = new LoadOBJThread();
2148		- loadObjThread.start();
	2292	+ loadObjThread = new LoadOBJThread();
	2293	+ loadObjThread.start();
2149	2294	}
2150	2295
2151	2296	loadObjThread.add(fullname);
2152		- */
	2297	+ /**/
2153	2298
2154		- System.out.println("Loading " + fullname);
2155		- makeSomething(new FileObject(fullname, true), true);
	2299	+ //makeSomething(new FileObject(fullname, true), true);
2156	2300	}
2157	2301
2158	2302	void LoadGFDFile(String fullname)
..	..	@@ -2413,11 +2557,11 @@
2413	2557
2414	2558	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2415	2559	{
2416		- if (GrafreeD.standAlone)
	2560	+ if (Grafreed.standAlone)
2417	2561	{
2418	2562	/**/
2419	2563	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2420		- browser.show();
	2564	+ browser.setVisible(true);
2421	2565	String filename = browser.getFile();
2422	2566	if (filename != null && filename.length() > 0)
2423	2567	{
..	..	@@ -2562,6 +2706,7 @@
2562	2706	}
2563	2707	if (input == null)
2564	2708	{
	2709	+ new Exception().printStackTrace();
2565	2710	System.exit(0);
2566	2711	}
2567	2712
..	..	@@ -2768,6 +2913,8 @@
2768	2913
2769	2914	void SetMaterial(Object3D object)
2770	2915	{
	2916	+ latestObject = object;
	2917	+
2771	2918	cMaterial mat = object.material;
2772	2919
2773	2920	if (mat == null)
..	..	@@ -2776,7 +2923,8 @@
2776	2923	return;
2777	2924	}
2778	2925
2779		- multiplyToggle.setSelected(mat.multiply);
	2926	+ if (multiplyToggle != null)
	2927	+ multiplyToggle.setSelected(mat.multiply);
2780	2928
2781	2929	assert (object.projectedVertices != null);
2782	2930
..	..	@@ -2878,12 +3026,17 @@
2878	3026	// }
2879	3027
2880	3028	/**/
2881		- if (deselect)
	3029	+ if (deselect \|\| child == null)
2882	3030	{
2883	3031	//group.deselectAll();
2884	3032	//freeze = true;
2885	3033	GetTree().clearSelection();
2886	3034	//freeze = false;
	3035	+
	3036	+ if (child == null)
	3037	+ {
	3038	+ return;
	3039	+ }
2887	3040	}
2888	3041
2889	3042	//group.addSelectee(child);
..	..	@@ -2952,31 +3105,48 @@
2952	3105	cameraView.ToggleDL();
2953	3106	cameraView.repaint();
2954	3107	return;
2955		- } else if (event.getSource() == toggleTextureItem)
	3108	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2956	3109	{
2957	3110	cameraView.ToggleTexture();
2958	3111	// june 2013 copy.HardTouch();
2959	3112	cameraView.repaint();
2960	3113	return;
2961		- } else if (event.getSource() == toggleFullItem)
	3114	+ } else if (event.getSource() == toggleTimelineItem)
2962	3115	{
2963		- if (CameraPane.FULLSCREEN)
	3116	+ timeline ^= true;
	3117	+
	3118	+ if (timeline)
2964	3119	{
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);
	3120	+ centralPanel.remove(cameraView);
	3121	+ cameraPanel.add(cameraView);
	3122	+ centralPanel.add(cameraPanel);
	3123	+ frame.setJMenuBar(timelineMenubar);
	3124	+ wasFullScreen = CameraPane.FULLSCREEN;
	3125	+ if (!CameraPane.FULLSCREEN)
	3126	+ ToggleFullScreen();
	3127	+ toggleFullScreenItem.setEnabled(false);
2972	3128	}
	3129	+ else
	3130	+ {
	3131	+ centralPanel.remove(cameraPanel);
	3132	+ centralPanel.add(cameraView);
	3133	+ frame.setJMenuBar(null);
	3134	+ if (!wasFullScreen)
	3135	+ ToggleFullScreen();
	3136	+ toggleFullScreenItem.setEnabled(true);
	3137	+ }
	3138	+
2973	3139	frame.validate();
2974		- cameraView.ToggleFullScreen();
	3140	+ return;
	3141	+ } else if (event.getSource() == toggleFullScreenItem)
	3142	+ {
	3143	+ ToggleFullScreen();
	3144	+ frame.validate();
2975	3145
2976	3146	return;
2977		- } else if (event.getSource() == toggleRandomItem)
	3147	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2978	3148	{
2979		- cameraView.ToggleRandom();
	3149	+ cameraView.ToggleSwitch();
2980	3150	cameraView.repaint();
2981	3151	return;
2982	3152	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3005,6 +3175,10 @@
3005	3175	{
3006	3176	copy.live ^= true;
3007	3177	return;
	3178	+ } else if (event.getSource() == selectCB)
	3179	+ {
	3180	+ copy.dontselect ^= true;
	3181	+ return;
3008	3182	} else if (event.getSource() == hideCB)
3009	3183	{
3010	3184	copy.hide ^= true;
..	..	@@ -3019,6 +3193,7 @@
3019	3193	if (event.getSource() == randomCB)
3020	3194	{
3021	3195	copy.random ^= true;
	3196	+ objEditor.refreshContents();
3022	3197	return;
3023	3198	}
3024	3199	if (event.getSource() == speedupCB)
..	..	@@ -3042,8 +3217,9 @@
3042	3217
3043	3218	public void actionPerformed(ActionEvent event)
3044	3219	{
	3220	+ Object source = event.getSource();
3045	3221	// SCRIPT DIALOG
3046		- if (event.getSource() == okbutton)
	3222	+ if (source == okbutton)
3047	3223	{
3048	3224	textpanel.setVisible(false);
3049	3225	textpanel.remove(textarea);
..	..	@@ -3055,7 +3231,7 @@
3055	3231	textarea = null;
3056	3232	textpanel = null;
3057	3233	}
3058		- if (event.getSource() == cancelbutton)
	3234	+ if (source == cancelbutton)
3059	3235	{
3060	3236	textpanel.setVisible(false);
3061	3237	textpanel.remove(textarea);
..	..	@@ -3067,49 +3243,50 @@
3067	3243	//applySelf();
3068	3244	//client.refreshEditWindow();
3069	3245	//refreshContents();
3070		- if (event.getSource() == nameField)
	3246	+ if (source == nameField)
3071	3247	{
3072	3248	//System.out.println("ObjEditor " + event);
3073	3249	applySelf0(true);
3074	3250	//parent.applySelf();
3075	3251	objEditor.refreshContents();
3076		- } else if (event.getSource() == resetButton)
	3252	+ } else if (source == resetButton)
3077	3253	{
3078	3254	CameraPane.fullreset = true;
3079	3255	copy.Reset(); // ResetMeshes();
3080	3256	copy.Touch();
3081	3257	objEditor.refreshContents();
3082		- } else if (event.getSource() == stepItem)
	3258	+ } else if (source == stepItem)
3083	3259	{
3084		- cameraView.ONESTEP = true;
	3260	+ //cameraView.ONESTEP = true;
	3261	+ Globals.ONESTEP = true;
3085	3262	cameraView.repaint();
3086	3263	return;
3087		- } else if (event.getSource() == stepButton)
	3264	+ } else if (source == stepButton)
3088	3265	{
3089	3266	copy.Step();
3090	3267	copy.Touch();
3091	3268	objEditor.refreshContents();
3092		- } else if (event.getSource() == slowerButton)
	3269	+ } else if (source == slowerButton)
3093	3270	{
3094	3271	copy.Slower();
3095	3272	copy.Touch();
3096	3273	objEditor.refreshContents();
3097		- } else if (event.getSource() == fasterButton)
	3274	+ } else if (source == fasterButton)
3098	3275	{
3099	3276	copy.Faster();
3100	3277	copy.Touch();
3101	3278	objEditor.refreshContents();
3102		- } else if (event.getSource() == remarkButton)
	3279	+ } else if (source == remarkButton)
3103	3280	{
3104	3281	copy.Remark();
3105	3282	copy.Touch();
3106	3283	objEditor.refreshContents();
3107		- } else if (event.getSource() == stepAllButton)
	3284	+ } else if (source == stepAllButton)
3108	3285	{
3109	3286	copy.StepAll();
3110	3287	copy.Touch();
3111	3288	objEditor.refreshContents();
3112		- } else if (event.getSource() == resetAllButton)
	3289	+ } else if (source == resetAllButton)
3113	3290	{
3114	3291	//CameraPane.fullreset = true;
3115	3292	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3142,53 +3319,75 @@
3142	3319	// Close();
3143	3320	// }
3144	3321	// else
3145		- if (event.getSource() == resetSlidersButton)
	3322	+ if (source == resetSlidersButton)
3146	3323	{
3147	3324	ResetSliders();
3148		- } else if (event.getSource() == clearMaterialButton)
	3325	+ } else if (source == clearMaterialButton)
3149	3326	{
3150	3327	ClearMaterial();
3151		- } else if (event.getSource() == createMaterialButton)
	3328	+ } else if (source == createMaterialButton)
3152	3329	{
3153	3330	CreateMaterial();
3154		- } else if (event.getSource() == clearPanelButton)
	3331	+ } else if (source == clearPanelButton)
3155	3332	{
3156	3333	copy.ClearUI();
3157	3334	refreshContents(true);
3158		- } /*
3159		- }
3160		-
3161		- public boolean action(Event event, Object arg)
3162		- {
3163		- */ else if (event.getSource() == closeItem)
	3335	+ } else if (source == importGFDItem)
	3336	+ {
	3337	+ ImportGFD();
	3338	+ } else
	3339	+ if (source == importVRMLX3DItem)
	3340	+ {
	3341	+ ImportVRMLX3D();
	3342	+ } else
	3343	+ if (source == import3DSItem)
	3344	+ {
	3345	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3346	+ } else
	3347	+ if (source == importOBJItem)
	3348	+ {
	3349	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3350	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3351	+ browser.setVisible(true);
	3352	+ String filename = browser.getFile();
	3353	+ if (filename != null && filename.length() > 0)
	3354	+ {
	3355	+ String fullname = browser.getDirectory() + filename;
	3356	+ makeSomething(ReadOBJ(fullname), true);
	3357	+ }
	3358	+ } else
	3359	+ if (source == closeItem)
3164	3360	{
3165	3361	Close();
3166	3362	//return true;
3167		- } else if (event.getSource() == loadItem)
	3363	+ } else if (source == loadItem)
3168	3364	{
3169	3365	load();
3170	3366	//return true;
3171		- } else if (event.getSource() == saveItem)
	3367	+ } else if (source == newItem)
	3368	+ {
	3369	+ New();
	3370	+ } else if (source == saveItem)
3172	3371	{
3173	3372	save();
3174	3373	//return true;
3175		- } else if (event.getSource() == saveAsItem)
	3374	+ } else if (source == saveAsItem)
3176	3375	{
3177	3376	saveAs();
3178	3377	//return true;
3179		- } else if (event.getSource() == reexportItem)
	3378	+ } else if (source == reexportItem)
3180	3379	{
3181	3380	reexport();
3182	3381	//return true;
3183		- } else if (event.getSource() == exportAsItem)
	3382	+ } else if (source == exportAsItem)
3184	3383	{
3185	3384	export();
3186	3385	//return true;
3187		- } else if (event.getSource() == povItem)
	3386	+ } else if (source == povItem)
3188	3387	{
3189	3388	generatePOV();
3190	3389	//return true;
3191		- } else if (event.getSource() == zBufferItem)
	3390	+ } else if (source == zBufferItem)
3192	3391	{
3193	3392	try
3194	3393	{
..	..	@@ -3210,21 +3409,8 @@
3210	3409	cameraView.repaint();
3211	3410	//return true;
3212	3411	}
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)
	3412	+ */ else // combos...
	3413	+ if (source == texresMenu)
3228	3414	{
3229	3415	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3230	3416	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3236,27 +3422,302 @@
3236	3422	}
3237	3423	}
3238	3424
3239		- void ToggleAnimation()
	3425	+ void New()
3240	3426	{
3241		- if (!CameraPane.ANIMATION)
	3427	+ while (copy.Size() > 1)
3242	3428	{
3243		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3429	+ copy.remove(1);
	3430	+ }
	3431	+
	3432	+ ResetModel();
	3433	+ objEditor.refreshContents();
	3434	+ }
	3435	+
	3436	+ static public byte[] Compress(Object3D o)
	3437	+ {
	3438	+ try
	3439	+ {
	3440	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3441	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3442	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3443	+
	3444	+ Object3D parent = o.parent;
	3445	+ o.parent = null;
	3446	+
	3447	+ out.writeObject(o);
	3448	+
	3449	+ o.parent = parent;
	3450	+
	3451	+ out.flush();
	3452	+
	3453	+ zstream.close();
	3454	+ out.close();
	3455	+
	3456	+ return baos.toByteArray();
	3457	+ } catch (Exception e)
	3458	+ {
	3459	+ System.err.println(e);
	3460	+ return null;
	3461	+ }
	3462	+ }
	3463	+
	3464	+ static public Object Uncompress(byte[] bytes)
	3465	+ {
	3466	+ System.out.println("#bytes = " + bytes.length);
	3467	+ try
	3468	+ {
	3469	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3470	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3471	+ ObjectInputStream in = new ObjectInputStream(istream);
	3472	+ Object obj = in.readObject();
	3473	+ in.close();
	3474	+
	3475	+ return obj;
	3476	+ } catch (Exception e)
	3477	+ {
	3478	+ System.err.println(e);
	3479	+ return null;
	3480	+ }
	3481	+ }
	3482	+
	3483	+ static public Object clone(Object o)
	3484	+ {
	3485	+ try
	3486	+ {
	3487	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3488	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3489	+
	3490	+ out.writeObject(o);
	3491	+
	3492	+ out.flush();
	3493	+ out.close();
	3494	+
	3495	+ byte[] bytes = baos.toByteArray();
	3496	+
	3497	+ System.out.println("clone = " + bytes.length);
	3498	+
	3499	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3500	+ ObjectInputStream in = new ObjectInputStream(bais);
	3501	+ Object obj = in.readObject();
	3502	+ in.close();
	3503	+
	3504	+ return obj;
	3505	+ } catch (Exception e)
	3506	+ {
	3507	+ System.err.println(e);
	3508	+ return null;
	3509	+ }
	3510	+ }
	3511	+
	3512	+ cRadio GetCurrentTab()
	3513	+ {
	3514	+ cRadio ab;
	3515	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3516	+ {
	3517	+ ab = (cRadio)e.nextElement();
	3518	+ if(ab.GetObject() == copy)
	3519	+ {
	3520	+ return ab;
	3521	+ }
	3522	+ }
	3523	+
	3524	+ return null;
	3525	+ }
	3526	+
	3527	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3528	+
	3529	+ public void Save()
	3530	+ {
	3531	+ System.err.println("Save");
	3532	+
	3533	+ cRadio tab = GetCurrentTab();
	3534	+
	3535	+ boolean temp = CameraPane.SWITCH;
	3536	+ CameraPane.SWITCH = false;
	3537	+
	3538	+ copy.ExtractBigData(hashtable);
	3539	+
	3540	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3541	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3542	+
	3543	+ copy.RestoreBigData(hashtable);
	3544	+
	3545	+ CameraPane.SWITCH = temp;
	3546	+
	3547	+ //assert(hashtable.isEmpty());
	3548	+
	3549	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3550	+ {
	3551	+ tab.graphs[i] = null;
	3552	+ }
	3553	+
	3554	+ SetUndoStates();
	3555	+
	3556	+ // test save
	3557	+ if (false)
	3558	+ {
	3559	+ try
	3560	+ {
	3561	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3562	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3563	+
	3564	+ p.writeObject(copy);
	3565	+
	3566	+ p.flush();
	3567	+
	3568	+ ostream.close();
	3569	+ } catch (Exception e)
	3570	+ {
	3571	+ e.printStackTrace();
	3572	+ }
	3573	+ }
	3574	+ }
	3575	+
	3576	+ void CopyChanged(Object3D obj)
	3577	+ {
	3578	+ SetUndoStates();
	3579	+
	3580	+ boolean temp = CameraPane.SWITCH;
	3581	+ CameraPane.SWITCH = false;
	3582	+
	3583	+ copy.ExtractBigData(hashtable);
	3584	+
	3585	+ copy.clear();
	3586	+
	3587	+ for (int i=0; i<obj.Size(); i++)
	3588	+ {
	3589	+ copy.add(obj.get(i));
	3590	+ }
	3591	+
	3592	+ copy.RestoreBigData(hashtable);
	3593	+
	3594	+ CameraPane.SWITCH = temp;
	3595	+
	3596	+ //assert(hashtable.isEmpty());
	3597	+
	3598	+ copy.Touch();
	3599	+
	3600	+ ResetModel();
	3601	+ copy.HardTouch(); // recompile?
	3602	+
	3603	+ cRadio ab;
	3604	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3605	+ {
	3606	+ ab = (cRadio)e.nextElement();
	3607	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3608	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3609	+ if (test != null)
	3610	+ {
	3611	+ test.editWindow = ab.object.editWindow;
	3612	+ ab.object = test;
	3613	+ }
	3614	+ }
	3615	+
	3616	+ refreshContents();
	3617	+ }
	3618	+
	3619	+ cButton undoButton;
	3620	+ cButton redoButton;
	3621	+
	3622	+ void SetUndoStates()
	3623	+ {
	3624	+ cRadio tab = GetCurrentTab();
	3625	+
	3626	+ undoButton.setEnabled(tab.undoindex > 0);
	3627	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3628	+ }
	3629	+
	3630	+ public void Undo()
	3631	+ {
	3632	+ System.err.println("Undo");
	3633	+
	3634	+ cRadio tab = GetCurrentTab();
	3635	+
	3636	+ if (tab.undoindex == 0)
	3637	+ {
	3638	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3639	+ return;
	3640	+ }
	3641	+
	3642	+ if (tab.graphs[tab.undoindex] == null)
	3643	+ {
	3644	+ Save();
	3645	+ tab.undoindex -= 1;
	3646	+ }
	3647	+
	3648	+ tab.undoindex -= 1;
	3649	+
	3650	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3651	+ }
	3652	+
	3653	+ public void Redo()
	3654	+ {
	3655	+ cRadio tab = GetCurrentTab();
	3656	+
	3657	+ if (tab.graphs[tab.undoindex + 1] == null)
	3658	+ {
	3659	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3660	+ return;
	3661	+ }
	3662	+
	3663	+ tab.undoindex += 1;
	3664	+
	3665	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3666	+ }
	3667	+
	3668	+ void ImportGFD()
	3669	+ {
	3670	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3244	3671	browser.show();
3245	3672	String filename = browser.getFile();
3246	3673	if (filename != null && filename.length() > 0)
3247	3674	{
3248		- CameraPane.filename = browser.getDirectory() + filename;
	3675	+ String fullname = browser.getDirectory() + filename;
	3676	+
	3677	+ //Object3D readobj =
	3678	+ objEditor.ReadGFD(fullname, objEditor);
	3679	+ //makeSomething(readobj);
	3680	+ }
	3681	+ }
	3682	+
	3683	+ void ImportVRMLX3D()
	3684	+ {
	3685	+ if (Grafreed.standAlone)
	3686	+ {
	3687	+ /**/
	3688	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3689	+ browser.show();
	3690	+ String filename = browser.getFile();
	3691	+ if (filename != null && filename.length() > 0)
	3692	+ {
	3693	+ String fullname = browser.getDirectory() + filename;
	3694	+ LoadVRMLX3D(fullname);
	3695	+ }
	3696	+ /**/
	3697	+ }
	3698	+ }
	3699	+
	3700	+ void ToggleAnimation()
	3701	+ {
	3702	+ if (!Globals.ANIMATION)
	3703	+ {
	3704	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3705	+ browser.setVisible(true);
	3706	+ String filename = browser.getFile();
	3707	+ if (filename != null && filename.length() > 0)
	3708	+ {
	3709	+ Globals.filename = browser.getDirectory() + filename;
3249	3710	//CameraPane.framecount = 0;
3250		- CameraPane.imagecount = 0;
	3711	+ Globals.imagecount = 0;
3251	3712
3252		- CameraPane.ANIMATION ^= true;
	3713	+ Globals.ANIMATION ^= true;
3253	3714
3254		- GrafreeD.wav.cursor = 0;
3255		- GrafreeD.wav.loop = 0;
	3715	+ Grafreed.wav.cursor = 0;
	3716	+ Grafreed.wav.loop = 0;
3256	3717	}
3257	3718	} else
3258	3719	{
3259		- CameraPane.ANIMATION ^= true;
	3720	+ Globals.ANIMATION ^= true;
3260	3721	}
3261	3722	}
3262	3723
..	..	@@ -3302,7 +3763,7 @@
3302	3763	void CreateMaterial()
3303	3764	{
3304	3765	//copy.ClearMaterial(); // PATCH
3305		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3766	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3306	3767	if (copy.selection.size() > 0)
3307	3768	//SetMaterial(copy);
3308	3769	{
..	..	@@ -3353,7 +3814,7 @@
3353	3814	assert false;
3354	3815	}
3355	3816
3356		- void EditSelection()
	3817	+ void EditSelection(boolean newWindow)
3357	3818	{
3358	3819	}
3359	3820
..	..	@@ -3361,11 +3822,11 @@
3361	3822	{
3362	3823	copy.ResetBlockLoop(); // temporary problem
3363	3824
3364		- boolean random = CameraPane.RANDOM;
3365		- CameraPane.RANDOM = false; // parse everything
	3825	+ boolean random = CameraPane.SWITCH;
	3826	+ CameraPane.SWITCH = false; // parse everything
3366	3827	copy.ResetDisplayList();
3367	3828	copy.HardTouch();
3368		- CameraPane.RANDOM = random;
	3829	+ CameraPane.SWITCH = random;
3369	3830	}
3370	3831
3371	3832	// public void applySelf()
..	..	@@ -3435,10 +3896,40 @@
3435	3896	current.fakedepth = (float) fakedepthField.getFloat();
3436	3897	current.shadowbias = (float) shadowbiasField.getFloat();
3437	3898
3438		- if (!NumberSlider.frozen)
	3899	+ if (!cNumberSlider.frozen)
3439	3900	{
3440	3901	//System.out.println("Propagate = " + propagate);
3441	3902	copy.UpdateMaterial(anchor, current, propagate);
	3903	+
	3904	+ if (copy.material != null)
	3905	+ {
	3906	+ cMaterial mat = copy.material;
	3907	+
	3908	+ colorField.SetToolTipValue((mat.color));
	3909	+ modulationField.SetToolTipValue((mat.modulation));
	3910	+ metalnessField.SetToolTipValue((mat.metalness));
	3911	+ diffuseField.SetToolTipValue((mat.diffuse));
	3912	+ specularField.SetToolTipValue((mat.specular));
	3913	+ shininessField.SetToolTipValue((mat.shininess));
	3914	+ shiftField.SetToolTipValue((mat.shift));
	3915	+ ambientField.SetToolTipValue((mat.ambient));
	3916	+ lightareaField.SetToolTipValue((mat.lightarea));
	3917	+ diffusenessField.SetToolTipValue((mat.factor));
	3918	+ velvetField.SetToolTipValue((mat.velvet));
	3919	+ sheenField.SetToolTipValue((mat.sheen));
	3920	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3921	+ backlitField.SetToolTipValue((mat.bump));
	3922	+ anisoField.SetToolTipValue((mat.aniso));
	3923	+ anisoVField.SetToolTipValue((mat.anisoV));
	3924	+ cameraField.SetToolTipValue((mat.cameralight));
	3925	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3926	+ shadowField.SetToolTipValue((mat.shadow));
	3927	+ textureField.SetToolTipValue((mat.texture));
	3928	+ opacityField.SetToolTipValue((mat.opacity));
	3929	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3930	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3931	+ }
	3932	+
3442	3933	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3443	3934	{
3444	3935	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3483,6 +3974,7 @@
3483	3974	\|\| e.getSource() == apertureField
3484	3975	\|\| e.getSource() == shadowblurField)
3485	3976	{
	3977	+ new Exception().printStackTrace();
3486	3978	System.exit(0);
3487	3979	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3488	3980	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3509,7 +4001,13 @@
3509	4001	//System.out.println("PARENT = " + parent);
3510	4002	//if (parent != null)
3511	4003	// parent.applySelf();
3512		- refreshContents();
	4004	+ if (e.getSource() == normalpushField)
	4005	+ {
	4006	+ objEditor.refreshContents();
	4007	+ //Refresh();
	4008	+ }
	4009	+ else
	4010	+ refreshContents();
3513	4011	// ??? client.refreshEditWindow();
3514	4012	}
3515	4013	//else
..	..	@@ -3521,7 +4019,7 @@
3521	4019	//group.name = nameField.getText();
3522	4020	//objEditor.applySelf();
3523	4021
3524		- assert (objEditor == this);
	4022	+ // OCT2018: assert (objEditor == this);
3525	4023	if (copy.selection == null \|\| copy.selection.size() == 0)
3526	4024	//super.applySelf()
3527	4025	; else
..	..	@@ -3545,12 +4043,18 @@
3545	4043	objEditor.copy = keep;
3546	4044	}
3547	4045	}
	4046	+
	4047	+ if (normalpushField != null)
	4048	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3548	4049	}
3549	4050
3550	4051	void SnapObject()
3551	4052	{
3552		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3553		- SnapObject(obj);
	4053	+ if (copy.selection.size() > 0)
	4054	+ {
	4055	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4056	+ SnapObject(obj);
	4057	+ }
3554	4058	}
3555	4059
3556	4060	void SnapObject(Object3D obj)
..	..	@@ -3796,7 +4300,7 @@
3796	4300
3797	4301	radioPanel.revalidate();
3798	4302	radioPanel.repaint();
3799		- ctrlPanel.revalidate(); // ? new
	4303	+ ctrlPanel.validate(); // ? new
3800	4304	ctrlPanel.repaint();
3801	4305	}
3802	4306	}
..	..	@@ -3805,6 +4309,8 @@
3805	4309
3806	4310	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3807	4311	{
	4312	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4313	+ Save();
3808	4314	//Tween.set(thing, 0).target(1).start(tweenManager);
3809	4315	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3810	4316	// if (thing instanceof GenericJointDemo)
..	..	@@ -3891,6 +4397,12 @@
3891	4397	{
3892	4398	ResetModel();
3893	4399	Select(thing.GetTreePath(), true, false); // unselect... false);
	4400	+
	4401	+ if (thing.Size() == 0)
	4402	+ {
	4403	+ //EditSelection(false);
	4404	+ }
	4405	+
3894	4406	refreshContents();
3895	4407	}
3896	4408
..	..	@@ -4008,6 +4520,7 @@
4008	4520	}
4009	4521	}
4010	4522	}
	4523	+
4011	4524	LoadGFDThread loadGFDThread;
4012	4525
4013	4526	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4027,8 +4540,10 @@
4027	4540
4028	4541	try
4029	4542	{
	4543	+ // Try compressed version first.
4030	4544	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4031		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4545	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4546	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4032	4547
4033	4548	readobj = (Object3D) p.readObject();
4034	4549	istream.close();
..	..	@@ -4036,7 +4551,20 @@
4036	4551	readobj.ResetDisplayList();
4037	4552	} catch (Exception e)
4038	4553	{
4039		- e.printStackTrace();
	4554	+ //e.printStackTrace();
	4555	+ try
	4556	+ {
	4557	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4558	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4559	+
	4560	+ readobj = (Object3D) p.readObject();
	4561	+ istream.close();
	4562	+
	4563	+ readobj.ResetDisplayList();
	4564	+ } catch (Exception e2)
	4565	+ {
	4566	+ e2.printStackTrace();
	4567	+ }
4040	4568	}
4041	4569	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4042	4570	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4082,6 +4610,12 @@
4082	4610
4083	4611	void LoadIt(Object obj)
4084	4612	{
	4613	+ if (obj == null)
	4614	+ {
	4615	+ // Invalid file
	4616	+ return;
	4617	+ }
	4618	+
4085	4619	System.out.println("Loaded " + obj);
4086	4620	//new Exception().printStackTrace();
4087	4621	Object3D readobj = (Object3D) obj;
..	..	@@ -4091,6 +4625,8 @@
4091	4625
4092	4626	if (readobj != null)
4093	4627	{
	4628	+ if (Globals.SAVEONMAKE)
	4629	+ Save();
4094	4630	try
4095	4631	{
4096	4632	//readobj.deepCopySelf(copy);
..	..	@@ -4153,7 +4689,7 @@
4153	4689
4154	4690	void load() // throws ClassNotFoundException
4155	4691	{
4156		- if (GrafreeD.standAlone)
	4692	+ if (Grafreed.standAlone)
4157	4693	{
4158	4694	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4159	4695	browser.show();
..	..	@@ -4240,11 +4776,13 @@
4240	4776	try
4241	4777	{
4242	4778	FileOutputStream ostream = new FileOutputStream(lastname);
4243		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4779	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4780	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4244	4781
4245	4782	p.writeObject(copy);
4246	4783	p.flush();
4247	4784
	4785	+ zstream.close();
4248	4786	ostream.close();
4249	4787
4250	4788	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4254,17 +4792,20 @@
4254	4792	{
4255	4793	}
4256	4794	}
	4795	+
4257	4796	String lastname;
4258	4797
4259	4798	void saveAs()
4260	4799	{
4261		- if (GrafreeD.standAlone)
	4800	+ if (Grafreed.standAlone)
4262	4801	{
4263	4802	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4264	4803	browser.setVisible(true);
4265	4804	String filename = browser.getFile();
4266	4805	if (filename != null && filename.length() > 0)
4267	4806	{
	4807	+ if (!filename.endsWith(".gfd"))
	4808	+ filename += ".gfd";
4268	4809	lastname = browser.getDirectory() + filename;
4269	4810	save();
4270	4811	}
..	..	@@ -4363,13 +4904,13 @@
4363	4904	try
4364	4905	{
4365	4906	FileOutputStream ostream = new FileOutputStream(filename);
4366		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4367		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4907	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4908	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4368	4909
4369	4910	Object3D objectparent = obj.parent;
4370	4911	obj.parent = null;
4371	4912
4372		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4913	+ Object3D object = (Object3D) Grafreed.clone(obj);
4373	4914
4374	4915	obj.parent = objectparent;
4375	4916
..	..	@@ -4381,8 +4922,8 @@
4381	4922	p.writeObject(object);
4382	4923	p.flush();
4383	4924
	4925	+ zstream.close();
4384	4926	ostream.close();
4385		- // zstream.close();
4386	4927
4387	4928	// group.selection.get(0).parent = parent;
4388	4929	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4403,7 +4944,7 @@
4403	4944	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4404	4945	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4405	4946	copy.generatePOV(buffer);
4406		- if (GrafreeD.standAlone)
	4947	+ if (Grafreed.standAlone)
4407	4948	{
4408	4949	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4409	4950	browser.show();
..	..	@@ -4429,7 +4970,8 @@
4429	4970	Object3D client;
4430	4971	Object3D copy;
4431	4972	MenuBar menuBar;
4432		- Menu windowMenu;
	4973	+ Menu fileMenu;
	4974	+ MenuItem newItem;
4433	4975	MenuItem loadItem;
4434	4976	MenuItem saveItem;
4435	4977	MenuItem saveAsItem;
..	..	@@ -4437,45 +4979,60 @@
4437	4979	MenuItem reexportItem;
4438	4980	MenuItem povItem;
4439	4981	MenuItem closeItem;
4440		- Menu cameraMenu;
	4982	+
4441	4983	CheckboxMenuItem zBufferItem;
4442	4984	//MenuItem normalLensItem;
4443		- MenuItem editCameraItem;
4444		- MenuItem revertCameraItem;
4445		- CheckboxMenuItem toggleLiveItem;
4446	4985	MenuItem stepItem;
4447		- CheckboxMenuItem toggleFullItem;
	4986	+ CheckboxMenuItem toggleLiveItem;
	4987	+ CheckboxMenuItem toggleFullScreenItem;
	4988	+ CheckboxMenuItem toggleTimelineItem;
4448	4989	CheckboxMenuItem toggleRenderItem;
4449	4990	CheckboxMenuItem toggleDebugItem;
4450	4991	CheckboxMenuItem toggleFrustumItem;
4451	4992	CheckboxMenuItem toggleFootContactItem;
4452	4993	CheckboxMenuItem toggleDLItem;
4453	4994	CheckboxMenuItem toggleTextureItem;
4454		- CheckboxMenuItem toggleRandomItem;
	4995	+ CheckboxMenuItem toggleSwitchItem;
4455	4996	CheckboxMenuItem toggleRootItem;
4456	4997	CheckboxMenuItem animationItem;
4457	4998	CheckboxMenuItem toggleHandleItem;
4458	4999	CheckboxMenuItem togglePaintItem;
4459	5000	JSplitPane mainPanel;
4460	5001	JScrollPane scrollpane;
	5002	+
4461	5003	JPanel toolbarPanel;
4462		- JPanel treePanel;
	5004	+
	5005	+ cGridBag treePanel;
	5006	+
4463	5007	JPanel radioPanel;
4464	5008	ButtonGroup buttonGroup;
4465		- JPanel ctrlPanel;
4466		- JPanel materialPanel;
	5009	+
	5010	+ cGridBag toolboxPanel;
	5011	+ cGridBag materialPanel;
	5012	+ cGridBag ctrlPanel;
	5013	+
4467	5014	JScrollPane infoPanel;
4468		- JPanel optionsPanel;
	5015	+
	5016	+ cGridBag optionsPanel;
	5017	+
4469	5018	JTabbedPane objectPanel;
4470		- JPanel XYZPanel;
	5019	+ boolean materialFlushed;
	5020	+ Object3D latestObject;
	5021	+
	5022	+ cGridBag XYZPanel;
	5023	+
4471	5024	JSplitPane gridPanel;
4472	5025	JSplitPane bigPanel;
4473		- JPanel bigThree;
4474		- JTabbedPane jtp;
4475		- JPanel cameraPanel;
	5026	+
	5027	+ cGridBag bigThree;
	5028	+ cGridBag scenePanel;
	5029	+ cGridBag centralPanel;
	5030	+ JSplitPane cameraPanel;
	5031	+ JPanel timelinePanel;
	5032	+ JMenuBar timelineMenubar;
4476	5033	JSplitPane framePanel;
4477	5034	JTextArea/Field/ nameField;
4478		- cButton textureButton;
	5035	+ //cButton textureButton;
4479	5036	cButton okButton;
4480	5037	cButton applyButton;
4481	5038	cButton cancelButton;
..	..	@@ -4522,65 +5079,72 @@
4522	5079	// MATERIAL
4523	5080	JLabel materialLabel;
4524	5081	JLabel colorLabel;
4525		- NumberSlider colorField;
	5082	+ cNumberSlider colorField;
4526	5083	JLabel modulationLabel;
4527		- NumberSlider modulationField;
	5084	+ cNumberSlider modulationField;
4528	5085	JLabel metalnessLabel;
4529		- NumberSlider metalnessField;
	5086	+ cNumberSlider metalnessField;
4530	5087	JLabel diffuseLabel;
4531		- NumberSlider diffuseField;
	5088	+ cNumberSlider diffuseField;
4532	5089	JLabel specularLabel;
4533		- NumberSlider specularField;
	5090	+ cNumberSlider specularField;
4534	5091	JLabel shininessLabel;
4535		- NumberSlider shininessField;
	5092	+ cNumberSlider shininessField;
4536	5093	JLabel shiftLabel;
4537		- NumberSlider shiftField;
	5094	+ cNumberSlider shiftField;
4538	5095	JLabel ambientLabel;
4539		- NumberSlider ambientField;
	5096	+ cNumberSlider ambientField;
4540	5097	JLabel lightareaLabel;
4541		- NumberSlider lightareaField;
	5098	+ cNumberSlider lightareaField;
4542	5099	JLabel diffusenessLabel;
4543		- NumberSlider diffusenessField;
	5100	+ cNumberSlider diffusenessField;
4544	5101	JLabel velvetLabel;
4545		- NumberSlider velvetField;
	5102	+ cNumberSlider velvetField;
4546	5103	JLabel sheenLabel;
4547		- NumberSlider sheenField;
	5104	+ cNumberSlider sheenField;
4548	5105	JLabel subsurfaceLabel;
4549		- NumberSlider subsurfaceField;
	5106	+ cNumberSlider subsurfaceField;
4550	5107	//JLabel bumpLabel;
4551	5108	//NumberSlider bumpField;
4552	5109	JLabel backlitLabel;
4553		- NumberSlider backlitField;
	5110	+ cNumberSlider backlitField;
4554	5111	JLabel anisoLabel;
4555		- NumberSlider anisoField;
	5112	+ cNumberSlider anisoField;
4556	5113	JLabel anisoVLabel;
4557		- NumberSlider anisoVField;
	5114	+ cNumberSlider anisoVField;
4558	5115	JLabel cameraLabel;
4559		- NumberSlider cameraField;
	5116	+ cNumberSlider cameraField;
4560	5117	JLabel selfshadowLabel;
4561		- NumberSlider selfshadowField;
	5118	+ cNumberSlider selfshadowField;
4562	5119	JLabel shadowLabel;
4563		- NumberSlider shadowField;
	5120	+ cNumberSlider shadowField;
4564	5121	JLabel textureLabel;
4565		- NumberSlider textureField;
	5122	+ cNumberSlider textureField;
4566	5123	JLabel opacityLabel;
4567		- NumberSlider opacityField;
	5124	+ cNumberSlider opacityField;
4568	5125	JLabel fakedepthLabel;
4569		- NumberSlider fakedepthField;
	5126	+ cNumberSlider fakedepthField;
4570	5127	JLabel shadowbiasLabel;
4571		- NumberSlider shadowbiasField;
	5128	+ cNumberSlider shadowbiasField;
4572	5129	JLabel bumpLabel;
4573		- NumberSlider bumpField;
	5130	+ cNumberSlider bumpField;
4574	5131	JLabel noiseLabel;
4575		- NumberSlider noiseField;
	5132	+ cNumberSlider noiseField;
4576	5133	JLabel powerLabel;
4577		- NumberSlider powerField;
	5134	+ cNumberSlider powerField;
4578	5135	JLabel borderfadeLabel;
4579		- NumberSlider borderfadeField;
	5136	+ cNumberSlider borderfadeField;
4580	5137	JLabel fogLabel;
4581		- NumberSlider fogField;
	5138	+ cNumberSlider fogField;
4582	5139	JLabel opacityPowerLabel;
4583		- NumberSlider opacityPowerField;
4584		- JTree jTree;
	5140	+ cNumberSlider opacityPowerField;
	5141	+ cTree jTree;
4585	5142	//ObjectUI parent;
	5143	+
	5144	+ cNumberSlider normalpushField;
	5145	+
	5146	+ private MenuItem importGFDItem;
	5147	+ private MenuItem importVRMLX3DItem;
	5148	+ private MenuItem import3DSItem;
	5149	+ private MenuItem importOBJItem;
4586	5150	}