~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -19,6 +20,8 @@
19	20	import //weka.core.
20	21	matrix.Matrix;
21	22
	23	+import grafeme.ui.*;
	24	+
22	25	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	26	ActionListener, ChangeListener,
24	27	InputMethodListener,
..	..	@@ -33,6 +36,54 @@
33	36
34	37	GroupEditor callee;
35	38	JFrame frame;
	39	+
	40	+ static ObjEditor theFrame;
	41	+
	42	+ cButton GetButton(String name, boolean border)
	43	+ {
	44	+ try
	45	+ {
	46	+ ImageIcon icon = GetIcon(name);
	47	+ return new cButton(icon, border);
	48	+ }
	49	+ catch (Exception e)
	50	+ {
	51	+ return new cButton(name, border);
	52	+ }
	53	+ }
	54	+
	55	+ cCheckBox GetCheckBox(String name, boolean border)
	56	+ {
	57	+ try
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+ catch (Exception e)
	63	+ {
	64	+ return new cCheckBox(name, border);
	65	+ }
	66	+ }
	67	+
	68	+ private ImageIcon GetIcon(String name) throws IOException
	69	+ {
	70	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	71	+
	72	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	73	+ {
	74	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	75	+ Graphics2D g = resized.createGraphics();
	76	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	77	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	78	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	79	+ g.dispose();
	80	+
	81	+ image = resized;
	82	+ }
	83	+
	84	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	85	+ return icon;
	86	+ }
36	87
37	88	// SCRIPT
38	89
..	..	@@ -124,7 +175,7 @@
124	175	void keyPressed(int key, int modifiers)
125	176	{
126	177	System.out.println("KEY PRESSED");
127		- CameraPane.theRenderer.keyPressed(key, modifiers);
	178	+ Globals.theRenderer.keyPressed(key, modifiers);
128	179	}
129	180	*/
130	181
..	..	@@ -136,34 +187,42 @@
136	187	public void closeUI()
137	188	{
138	189	//new Exception().printStackTrace();
139		- System.out.println("this = " + this);
140		- System.out.println("objEditor = " + objEditor);
	190	+// System.out.println("this = " + this);
	191	+// System.out.println("objEditor = " + objEditor);
141	192	//nameField.removeActionListener(this);
142		- objEditor.ctrlPanel.remove(nameField);
	193	+// objEditor.ctrlPanel.remove(nameField);
	194	+
	195	+ objEditor.ctrlPanel.remove(namePanel);
143	196
144	197	if (!GroupEditor.allparams)
145	198	return;
146	199
147		- objEditor.ctrlPanel.remove(liveCB);
148		- objEditor.ctrlPanel.remove(hideCB);
149		- objEditor.ctrlPanel.remove(markCB);
150		-
151		- objEditor.ctrlPanel.remove(randomCB);
152		- objEditor.ctrlPanel.remove(speedupCB);
153		- objEditor.ctrlPanel.remove(rewindCB);
154		-
155		- objEditor.ctrlPanel.remove(resetButton);
156		- objEditor.ctrlPanel.remove(stepButton);
157		-// objEditor.ctrlPanel.remove(stepAllButton);
158		-// objEditor.ctrlPanel.remove(resetAllButton);
159		- objEditor.ctrlPanel.remove(link2masterCB);
160		- //objEditor.ctrlPanel.remove(flipVCB);
161		- //objEditor.ctrlPanel.remove(texresMenu);
162		- objEditor.ctrlPanel.remove(slowerButton);
163		- objEditor.ctrlPanel.remove(fasterButton);
164		- objEditor.ctrlPanel.remove(remarkButton);
	200	+// objEditor.ctrlPanel.remove(liveCB);
	201	+// objEditor.ctrlPanel.remove(hideCB);
	202	+// objEditor.ctrlPanel.remove(markCB);
	203	+//
	204	+// objEditor.ctrlPanel.remove(randomCB);
	205	+// objEditor.ctrlPanel.remove(speedupCB);
	206	+// objEditor.ctrlPanel.remove(rewindCB);
	207	+//
	208	+// objEditor.ctrlPanel.remove(resetButton);
	209	+// objEditor.ctrlPanel.remove(stepButton);
	210	+//// objEditor.ctrlPanel.remove(stepAllButton);
	211	+//// objEditor.ctrlPanel.remove(resetAllButton);
	212	+// objEditor.ctrlPanel.remove(link2masterCB);
	213	+// //objEditor.ctrlPanel.remove(flipVCB);
	214	+// //objEditor.ctrlPanel.remove(texresMenu);
	215	+// objEditor.ctrlPanel.remove(slowerButton);
	216	+// objEditor.ctrlPanel.remove(fasterButton);
	217	+// objEditor.ctrlPanel.remove(remarkButton);
165	218
166		- Remove(normalpushField);
	219	+ objEditor.ctrlPanel.remove(setupPanel);
	220	+ objEditor.ctrlPanel.remove(setupPanel2);
	221	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	222	+ objEditor.ctrlPanel.remove(pushPanel);
	223	+ //objEditor.ctrlPanel.remove(fillPanel);
	224	+
	225	+ //Remove(normalpushField);
167	226	}
168	227
169	228	public ObjEditor GetEditor()
..	..	@@ -234,6 +293,7 @@
234	293	//localCopy.parent = null;
235	294
236	295	frame = new JFrame();
	296	+ frame.setUndecorated(true);
237	297	objEditor = this;
238	298	this.callee = callee;
239	299
..	..	@@ -267,24 +327,40 @@
267	327	void SetupMenu()
268	328	{
269	329	frame.setMenuBar(menuBar = new MenuBar());
270		- menuBar.add(windowMenu = new Menu("File"));
271		- windowMenu.add(loadItem = new MenuItem("Load..."));
272		- windowMenu.add("-");
273		- windowMenu.add(saveItem = new MenuItem("Save"));
274		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	330	+ menuBar.add(fileMenu = new Menu("File"));
	331	+ fileMenu.add(newItem = new MenuItem("New"));
	332	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	333	+
	334	+ //oe.menuBar.add(menu = new Menu("Include"));
	335	+ Menu menu = new Menu("Import");
	336	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	337	+ importOBJItem.addActionListener(this);
	338	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	339	+ import3DSItem.addActionListener(this);
	340	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	341	+ importVRMLX3DItem.addActionListener(this);
	342	+ menu.add("-");
	343	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	344	+ importGFDItem.addActionListener(this);
	345	+ fileMenu.add(menu);
	346	+ fileMenu.add("-");
	347	+
	348	+ fileMenu.add(saveItem = new MenuItem("Save"));
	349	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
275	350	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
276		- windowMenu.add("-");
277		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
278		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
279		- windowMenu.add("-");
	351	+ fileMenu.add("-");
	352	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	353	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	354	+ fileMenu.add("-");
280	355	if (client.parent != null)
281	356	{
282		- windowMenu.add(closeItem = new MenuItem("Close"));
	357	+ fileMenu.add(closeItem = new MenuItem("Close"));
283	358	} else
284	359	{
285		- windowMenu.add(closeItem = new MenuItem("Exit"));
	360	+ fileMenu.add(closeItem = new MenuItem("Exit"));
286	361	}
287	362
	363	+ newItem.addActionListener(this);
288	364	loadItem.addActionListener(this);
289	365	saveItem.addActionListener(this);
290	366	saveAsItem.addActionListener(this);
..	..	@@ -293,79 +369,35 @@
293	369	//povItem.addActionListener(this);
294	370	closeItem.addActionListener(this);
295	371
296		- menuBar.add(cameraMenu = new Menu("View"));
297		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
298		- //zBufferItem.addActionListener(this);
299		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
300		- //normalLensItem.addActionListener(this);
301		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
302		- revertCameraItem.addActionListener(this);
303		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
304		- toggleTimelineItem.addItemListener(this);
305		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
306		- toggleFullScreenItem.addItemListener(this);
307		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
308		- cameraMenu.add("-");
309		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
310		- toggleTextureItem.addItemListener(this);
311		- toggleTextureItem.setState(CameraPane.textureon);
312		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
313		- toggleLiveItem.addItemListener(this);
314		- toggleLiveItem.setState(CameraPane.isLIVE());
315		- cameraMenu.add(stepItem = new MenuItem("Step"));
316		- stepItem.addActionListener(this);
317		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
318		-// toggleDLItem.addItemListener(this);
319		-// toggleDLItem.setState(false);
320		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
321		- toggleRenderItem.addItemListener(this);
322		- toggleRenderItem.setState(!CameraPane.frozen);
323		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
324		- toggleDebugItem.addItemListener(this);
325		- toggleDebugItem.setState(CameraPane.DEBUG);
326		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
327		- toggleFrustumItem.addItemListener(this);
328		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
329		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
330		- toggleFootContactItem.addItemListener(this);
331		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
332		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
333		- toggleRandomItem.addItemListener(this);
334		- toggleRandomItem.setState(CameraPane.RANDOM);
335		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
336		- toggleHandleItem.addItemListener(this);
337		- toggleHandleItem.setState(CameraPane.HANDLES);
338		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
339		- togglePaintItem.addItemListener(this);
340		- togglePaintItem.setState(CameraPane.PAINTMODE);
341		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
342		-// toggleRootItem.addItemListener(this);
343		-// toggleRootItem.setState(false);
344		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
345		-// animationItem.addItemListener(this);
346		-// animationItem.setState(CameraPane.ANIMATION);
347		- cameraMenu.add("-");
348		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
349		- editCameraItem.addActionListener(this);
350		-
351	372	objectPanel = new JTabbedPane();
352	373	toolbarPanel = new JPanel();
353	374	toolbarPanel.setName("Toolbar");
354		- treePanel = new JPanel();
	375	+ treePanel = new cGridBag();
355	376	treePanel.setName("Tree");
356		- ctrlPanel = new JPanel(); // new GridBagLayout());
357		- ctrlPanel.setName("Edit");
358		- materialPanel = new JPanel();
	377	+
	378	+ editPanel = new cGridBag().setVertical(true);
	379	+ editPanel.setName("Edit");
	380	+
	381	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	382	+
	383	+ editCommandsPanel = new cGridBag();
	384	+ editPanel.add(editCommandsPanel);
	385	+ editPanel.add(ctrlPanel);
	386	+
	387	+ materialPanel = new cGridBag().setVertical(true);
	388	+
359	389	materialPanel.setName("Material");
360	390	/JTextPane/
361	391	infoarea = createTextPane();
	392	+ doc = infoarea.getStyledDocument();
	393	+
362	394	infoarea.setEditable(true);
363	395	SetText();
364	396	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365	397	// infoarea.setOpaque(false);
366	398	// //infoarea.setForeground(textcolor);
367		- infoarea.setLineWrap(true);
368		- infoarea.setWrapStyleWord(true);
	399	+// TEXTAREA infoarea.setLineWrap(true);
	400	+// TEXTAREA infoarea.setWrapStyleWord(true);
369	401	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370	402	infoPanel.setPreferredSize(new Dimension(50, 200));
371	403	infoPanel.setName("Info");
..	..	@@ -376,16 +408,16 @@
376	408	mainPanel.setName("Main");
377	409	mainPanel.setContinuousLayout(true);
378	410	mainPanel.setOneTouchExpandable(true);
379		- mainPanel.setDividerLocation(1.0);
380	411	mainPanel.setDividerSize(9);
381		- mainPanel.setResizeWeight(0);
	412	+ mainPanel.setDividerLocation(0.5); //1.0);
	413	+ mainPanel.setResizeWeight(0.5);
382	414
383	415	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384	416	//mainPanel.setLayout(new GridBagLayout());
385	417	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386		- treePanel.setLayout(new GridBagLayout());
387		- ctrlPanel.setLayout(new GridBagLayout());
388		- materialPanel.setLayout(new GridBagLayout());
	418	+// treePanel.setLayout(new GridBagLayout());
	419	+ //ctrlPanel.setLayout(new GridBagLayout());
	420	+ //materialPanel.setLayout(new GridBagLayout());
389	421
390	422	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391	423	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -424,7 +456,7 @@
424	456	static String newline = "\n";
425	457	protected static final String buttonString = "JButton";
426	458	StyledDocument doc;
427		- JTextArea infoarea;
	459	+ JTextPane infoarea;
428	460
429	461	void ClearInfo()
430	462	{
..	..	@@ -447,10 +479,10 @@
447	479	e.printStackTrace();
448	480	}
449	481
450		- String selection = infoarea.getText();
451		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
452		- java.awt.datatransfer.Clipboard clipboard =
453		- Toolkit.getDefaultToolkit().getSystemClipboard();
	482	+// String selection = infoarea.getText();
	483	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	484	+// java.awt.datatransfer.Clipboard clipboard =
	485	+// Toolkit.getDefaultToolkit().getSystemClipboard();
454	486	//clipboard.setContents(data, data);
455	487	}
456	488
..	..	@@ -473,13 +505,13 @@
473	505	//SendInfo("Name:", "bold");
474	506	if (sel.GetTextures() != null \|\| debug)
475	507	{
476		- si.SendInfo(sel.toString(), "bold");
	508	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
477	509	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
478	510	if (sel.Size() > 0)
479	511	{
480	512	si.SendInfo("#children = " + sel.Size(), "regular");
481	513	}
482		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	514	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
483	515	if (debug)
484	516	{
485	517	try
..	..	@@ -491,7 +523,10 @@
491	523	}
492	524
493	525	if (full)
494		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	526	+ {
	527	+ si.SendInfo(" BBox min: " + minima, "regular");
	528	+ si.SendInfo(" BBox max: " + maxima, "regular");
	529	+ }
495	530
496	531	if (sel.bRep != null)
497	532	{
..	..	@@ -518,7 +553,7 @@
518	553	}
519	554	if (sel.support != null)
520	555	{
521		- si.SendInfo(" support: " + sel.support, "regular");
	556	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
522	557	}
523	558	if (sel.scriptnode != null)
524	559	{
..	..	@@ -589,6 +624,9 @@
589	624	{
590	625	CameraPane.pointflow = (PointFlow) sel;
591	626	}
	627	+
	628	+ si.SendInfo("_____________________", "regular");
	629	+ si.SendInfo("", "regular");
592	630	}
593	631	}
594	632
..	..	@@ -604,68 +642,138 @@
604	642	}
605	643	}
606	644
	645	+static GraphicsDevice device = GraphicsEnvironment
	646	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	647	+
	648	+ Rectangle keeprect;
	649	+ cRadio radio;
	650	+
	651	+cButton keepButton;
	652	+ cButton twoButton; // Full 3D
	653	+ cButton sixButton;
	654	+ cButton threeButton;
	655	+ cButton sevenButton;
	656	+ cButton fourButton; // full panel
	657	+ cButton oneButton; // full XYZ
	658	+ //cButton currentLayout;
	659	+
	660	+ boolean maximized;
	661	+
	662	+ void Minimize()
	663	+ {
	664	+ frame.setState(Frame.ICONIFIED);
	665	+ }
	666	+
	667	+ void Maximize()
	668	+ {
	669	+ if (maximized)
	670	+ {
	671	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	672	+ }
	673	+ else
	674	+ {
	675	+ keeprect = frame.getBounds();
	676	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	677	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	678	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	679	+// frame.setState(Frame.MAXIMIZED_BOTH);
	680	+ }
	681	+
	682	+ maximized ^= true;
	683	+ }
	684	+
607	685	void ToggleFullScreen()
608	686	{
609	687	if (CameraPane.FULLSCREEN)
610	688	{
611		- frame.getContentPane().remove(/"Center",/bigThree);
612		- framePanel.add(bigThree);
613		- frame.getContentPane().add(/"Center",/framePanel);
	689	+ device.setFullScreenWindow(null);
	690	+ //frame.setVisible(false);
	691	+// frame.removeNotify();
	692	+// frame.setUndecorated(false);
	693	+// frame.addNotify();
	694	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	695	+
	696	+// X frame.getContentPane().remove(/"Center",/bigThree);
	697	+// X framePanel.add(bigThree);
	698	+// X frame.getContentPane().add(/"Center",/framePanel);
	699	+ framePanel.setDividerLocation(1);
	700	+
	701	+ //frame.setVisible(true);
	702	+ radio.layout = keepButton;
	703	+ //theFrame = null;
	704	+ keepButton = null;
	705	+ radio.layout.doClick();
	706	+
614	707	} else
615	708	{
616		- frame.getContentPane().remove(/"Center",/framePanel);
617		- framePanel.remove(bigThree);
618		- frame.getContentPane().add(/"Center",/bigThree);
	709	+ keepButton = radio.layout;
	710	+ //keeprect = frame.getBounds();
	711	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	712	+// frame.getToolkit().getScreenSize().height);
	713	+ //frame.setVisible(false);
	714	+ device.setFullScreenWindow(frame);
	715	+// frame.removeNotify();
	716	+// frame.setUndecorated(true);
	717	+// frame.addNotify();
	718	+// X frame.getContentPane().remove(/"Center",/framePanel);
	719	+// X framePanel.remove(bigThree);
	720	+// X frame.getContentPane().add(/"Center",/bigThree);
	721	+ framePanel.setDividerLocation(0);
	722	+
	723	+ radio.layout = twoButton;
	724	+ radio.layout.doClick();
	725	+ //frame.setVisible(true);
619	726	}
	727	+
620	728	cameraView.ToggleFullScreen();
621	729	}
622	730
623		- private JTextArea createTextPane()
	731	+ private JTextPane createTextPane()
624	732	{
625		- String[] initString =
626		- {
627		- "This is an editable JTextPane, ", //regular
628		- "another ", //italic
629		- "styled ", //bold
630		- "text ", //small
631		- "component, ", //large
632		- "which supports embedded components..." + newline,//regular
633		- " " + newline, //button
634		- "...and embedded icons..." + newline, //regular
635		- " ", //icon
636		- newline + "JTextPane is a subclass of JEditorPane that "
637		- + "uses a StyledEditorKit and StyledDocument, and provides "
638		- + "cover methods for interacting with those objects."
639		- };
	733	+// TEXTAREA String[] initString =
	734	+// {
	735	+// "This is an editable JTextPane, ", //regular
	736	+// "another ", //italic
	737	+// "styled ", //bold
	738	+// "text ", //small
	739	+// "component, ", //large
	740	+// "which supports embedded components..." + newline,//regular
	741	+// " " + newline, //button
	742	+// "...and embedded icons..." + newline, //regular
	743	+// " ", //icon
	744	+// newline + "JTextPane is a subclass of JEditorPane that "
	745	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	746	+// + "cover methods for interacting with those objects."
	747	+// };
	748	+//
	749	+// String[] initStyles =
	750	+// {
	751	+// "regular", "italic", "bold", "small", "large",
	752	+// "regular", "button", "regular", "icon",
	753	+// "regular"
	754	+// };
	755	+//
	756	+// JTextPane textPane = new JTextPane();
	757	+// textPane.setEditable(true);
	758	+// /StyledDocument/ doc = textPane.getStyledDocument();
	759	+// addStylesToDocument(doc);
	760	+//
	761	+// try
	762	+// {
	763	+// for (int j = 0; j < 2; j++)
	764	+// {
	765	+// for (int i = 0; i < initString.length; i++)
	766	+// {
	767	+// doc.insertString(doc.getLength(), initString[i],
	768	+// doc.getStyle(initStyles[i]));
	769	+// }
	770	+// }
	771	+// } catch (BadLocationException ble)
	772	+// {
	773	+// System.err.println("Couldn't insert initial text into text pane.");
	774	+// }
640	775
641		- String[] initStyles =
642		- {
643		- "regular", "italic", "bold", "small", "large",
644		- "regular", "button", "regular", "icon",
645		- "regular"
646		- };
647		-
648		- JTextPane textPane = new JTextPane();
649		- textPane.setEditable(true);
650		- /StyledDocument/ doc = textPane.getStyledDocument();
651		- addStylesToDocument(doc);
652		-
653		- try
654		- {
655		- for (int j = 0; j < 2; j++)
656		- {
657		- for (int i = 0; i < initString.length; i++)
658		- {
659		- doc.insertString(doc.getLength(), initString[i],
660		- doc.getStyle(initStyles[i]));
661		- }
662		- }
663		- } catch (BadLocationException ble)
664		- {
665		- System.err.println("Couldn't insert initial text into text pane.");
666		- }
667		-
668		- return new JTextArea(); // textPane;
	776	+ return new JTextPane(); // textPane;
669	777	}
670	778
671	779	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -718,7 +826,7 @@
718	826	protected static ImageIcon createImageIcon(String path,
719	827	String description)
720	828	{
721		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	829	+ java.net.URL imgURL = Grafreed.class.getResource(path);
722	830	if (imgURL != null)
723	831	{
724	832	return new ImageIcon(imgURL, description);
..	..	@@ -750,6 +858,7 @@
750	858	// NumberSlider vDivsField;
751	859	// JCheckBox endcaps;
752	860	JCheckBox liveCB;
	861	+ JCheckBox selectCB;
753	862	JCheckBox hideCB;
754	863	JCheckBox link2masterCB;
755	864	JCheckBox markCB;
..	..	@@ -765,115 +874,87 @@
765	874	JButton slowerButton;
766	875	JButton fasterButton;
767	876	JButton remarkButton;
	877	+
	878	+ cGridBag editPanel;
	879	+ cGridBag editCommandsPanel;
	880	+
	881	+ cGridBag namePanel;
	882	+ cGridBag setupPanel;
	883	+ cGridBag setupPanel2;
	884	+ cGridBag objectCommandsPanel;
	885	+ cGridBag pushPanel;
	886	+ cGridBag fillPanel;
768	887
769		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	888	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
770	889	{
771	890	JCheckBox cb;
772	891
773		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
774		- oe.aConstraints.gridwidth = 1; // 3;
775		-// oe.aConstraints.weightx = 1;
776		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
777		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	892	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
778	893	cb.addItemListener(this);
779		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
780		- oe.aConstraints.gridwidth = 1;
781		- oe.aConstraints.gridx += 1;
782	894
783	895	return cb;
784	896	}
785	897
786		- cButton AddButton(ObjEditor oe, String label)
	898	+ cButton AddButton(cGridBag panel, String label)
787	899	{
788	900	cButton cb;
789	901
790		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
791		- oe.aConstraints.gridwidth = 1;
792		-// oe.aConstraints.weightx = 1;
793		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
794		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	902	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
795	903	cb.addActionListener(this);
796		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
797		- oe.aConstraints.gridwidth = 1;
798		- oe.aConstraints.gridx += 1;
799	904
800	905	return cb;
801	906	}
802	907
803		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	908	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
804	909	{
805	910	JComboBox combo;
806	911
807		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
808		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
809		- oe.aConstraints.gridx += 1;
	912	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
810	913	combo.addActionListener(this);
811	914
812	915	return combo;
813	916	}
814	917
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	918	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
816	919	{
817		- NumberSlider combo;
	920	+ cGridBag control = new cGridBag();
	921	+
	922	+ cNumberSlider combo;
818	923
819	924	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	925	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 1;
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, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	926	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	927	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	928	combo.setFloat(current);
833		-
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	929	+
	930	+ panel.add(control);
	931	+
	932	+ return control;
839	933	}
840	934
841		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	935	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
842	936	{
843		- NumberSlider combo;
	937	+ cGridBag control = new cGridBag();
	938	+
	939	+ cNumberSlider combo;
844	940
845	941	JLabel jlabel = new JLabel(label);
846		-
847		- aConstraints.fill = GridBagConstraints.VERTICAL;
848	942	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
849		- aConstraints.gridwidth = 2;
850		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
851		- aConstraints.gridx += 1;
852		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
853		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
854		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
855		- aConstraints.gridx += 1;
856		- aConstraints.gridwidth = 1;
857		-
	943	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	944	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	945	combo.setInteger(current);
859	946
860		- combo.label = jlabel;
861		-
862		- combo.addChangeListener(this);
863		-
864		- return combo;
	947	+ panel.add(control);
	948	+
	949	+ return control;
865	950	}
866	951
867		- JTextArea AddText(JPanel ctrlPanel, String name)
	952	+ JTextArea AddText(cGridBag ctrlPanel, String name)
868	953	{
869	954	JTextArea text;
870	955
871		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
872		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	956	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874	957	text.addCaretListener(this);
875		- aConstraints.gridx += 1;
876		- aConstraints.gridwidth = 1;
877	958
878	959	return text;
879	960	}
..	..	@@ -903,9 +984,16 @@
903	984	objEditor.ctrlPanel.remove(j);
904	985	}
905	986
	987	+ void Remove(cNumberSlider j)
	988	+ {
	989	+ j.removeChangeListener(this);
	990	+ //objEditor.ctrlPanel.remove(j.label);
	991	+ objEditor.ctrlPanel.remove(j);
	992	+ }
	993	+
906	994	/*
907	995	*/
908		- void Return() // ObjEditor oe)
	996	+ void Return0() // ObjEditor oe)
909	997	{
910	998	aConstraints.gridy += 1;
911	999	aConstraints.gridx = 0;
..	..	@@ -960,37 +1048,76 @@
960	1048
961	1049	void SetupUI2(ObjEditor oe)
962	1050	{
963		-// oe.aConstraints.weightx = 0;
964		-// oe.aConstraints.weighty = 0;
965		-// oe.aConstraints.gridx = 0;
966		-// oe.aConstraints.gridy = 0;
967		- SetupName(oe);
	1051	+ //SetupName(oe);
	1052	+
	1053	+ namePanel = new cGridBag();
	1054	+
	1055	+ nameField = AddText(namePanel, copy.GetName());
	1056	+ namePanel.add(nameField);
	1057	+ oe.ctrlPanel.add(namePanel);
	1058	+
	1059	+ oe.ctrlPanel.Return();
968	1060
969	1061	if (!GroupEditor.allparams)
970	1062	return;
971	1063
972		- liveCB = AddCheckBox(oe, "Live", copy.live);
973		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1064	+ setupPanel = new cGridBag().setVertical(false);
	1065	+
	1066	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1067	+ liveCB.setToolTipText("Animate object");
	1068	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1069	+ selectCB.setToolTipText("Make object selectable");
975	1070	// Return();
976		- markCB = AddCheckBox(oe, "Mark", copy.marked);
977		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
978		- randomCB = AddCheckBox(oe, "Rand", copy.random);
979		- Return();
980		- resetButton = AddButton(oe, "Reset");
981		- stepButton = AddButton(oe, "Step");
	1071	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1072	+ hideCB.setToolTipText("Hide object");
	1073	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1074	+ markCB.setToolTipText("Set the animation target transform");
	1075	+
	1076	+ setupPanel2 = new cGridBag().setVertical(false);
	1077	+
	1078	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1079	+ rewindCB.setToolTipText("Rewind animation");
	1080	+
	1081	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1082	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1083	+
	1084	+ if (Globals.ADVANCED)
	1085	+ {
	1086	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1087	+ link2masterCB.setToolTipText("Attach to support");
	1088	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1089	+ speedupCB.setToolTipText("Option motion capture");
	1090	+ }
	1091	+
	1092	+ oe.ctrlPanel.add(setupPanel);
	1093	+ oe.ctrlPanel.Return();
	1094	+ oe.ctrlPanel.add(setupPanel2);
	1095	+ oe.ctrlPanel.Return();
	1096	+
	1097	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1098	+
	1099	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1100	+ resetButton.setToolTipText("Jump to frame zero");
	1101	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1102	+ stepButton.setToolTipText("Step one frame");
982	1103	// resetAllButton = AddButton(oe, "Reset All");
983	1104	// stepAllButton = AddButton(oe, "Step All");
984		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
985	1105	// Return();
986		- slowerButton = AddButton(oe, "Slow");
987		- fasterButton = AddButton(oe, "Fast");
988		- remarkButton = AddButton(oe, "Rem");
	1106	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1107	+ slowerButton.setToolTipText("Decrease animation speed");
	1108	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1109	+ fasterButton.setToolTipText("Increase animation speed");
	1110	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1111	+ remarkButton.setToolTipText("Set the current transform as the target");
989	1112
990		- Return();
	1113	+ oe.ctrlPanel.add(objectCommandsPanel);
	1114	+ oe.ctrlPanel.Return();
991	1115
992		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993		- Return();
	1116	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1117	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1118	+ //Return();
	1119	+
	1120	+ oe.ctrlPanel.Return();
994	1121
995	1122	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
996	1123	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1085,7 +1212,7 @@
1085	1212	oe.aConstraints.gridwidth = 1;
1086	1213	/**/
1087	1214	nameField = AddText(oe.ctrlPanel, copy.GetName());
1088		- Return();
	1215	+ oe.ctrlPanel.Return();
1089	1216
1090	1217	//ctrlPanel.add(textureButton = new Button("Texture..."));
1091	1218	//textureButton.setEnabled(false);
..	..	@@ -1187,9 +1314,13 @@
1187	1314	//JPanel worldPanel =
1188	1315	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1189	1316	//worldPanel.setName("World");
1190		- centralPanel = new JPanel(new BorderLayout());
1191		- timelinePanel = new JPanel(new BorderLayout());
1192		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1317	+ centralPanel = new cGridBag();
	1318	+ centralPanel.preferredWidth = 20;
	1319	+
	1320	+ if (Globals.ADVANCED)
	1321	+ {
	1322	+ timelinePanel = new JPanel(new BorderLayout());
	1323	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1193	1324
1194	1325	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195	1326	cameraPanel.setContinuousLayout(true);
..	..	@@ -1198,7 +1329,10 @@
1198	1329	// cameraPanel.setDividerSize(9);
1199	1330	cameraPanel.setResizeWeight(1.0);
1200	1331
	1332	+ }
	1333	+
1201	1334	centralPanel.add(cameraView);
	1335	+ centralPanel.setFocusable(true);
1202	1336	//frame.setJMenuBar(timelineMenubar);
1203	1337	//centralPanel.add(timelinePanel);
1204	1338
..	..	@@ -1217,12 +1351,13 @@
1217	1351	//frontView.object = copy;
1218	1352	//sideView.object = copy;
1219	1353
1220		- XYZPanel = new JPanel();
1221		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1354	+ XYZPanel = new cGridBag().setVertical(true);
	1355	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1222	1356
1223		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1224		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1225		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1357	+ XYZPanel.preferredWidth = 5;
	1358	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1359	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1360	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1226	1361
1227	1362	/*
1228	1363	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1260,10 +1395,11 @@
1260	1395	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1261	1396	//tmp.setName("Edit");
1262	1397	objectPanel.add(materialPanel);
1263		- JPanel north = new JPanel(new BorderLayout());
1264		- north.setName("Edit");
1265		- north.add(ctrlPanel, BorderLayout.NORTH);
1266		- objectPanel.add(north);
	1398	+// JPanel north = new JPanel(new BorderLayout());
	1399	+// north.setName("Edit");
	1400	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1401	+// objectPanel.add(north);
	1402	+ objectPanel.add(editPanel);
1267	1403	objectPanel.add(infoPanel);
1268	1404
1269	1405	/*
..	..	@@ -1284,16 +1420,23 @@
1284	1420	scrollpane.setWheelScrollingEnabled(true);
1285	1421	scrollpane.addMouseWheelListener(this); // Default not fast enough
1286	1422
1287		- /JTabbedPane/ scenePanel = new JTabbedPane();
1288		- scenePanel.add(scrollpane);
	1423	+ /JTabbedPane/ scenePanel = new cGridBag();
	1424	+ scenePanel.preferredWidth = 6;
	1425	+
	1426	+ JTabbedPane tabbedPane = new JTabbedPane();
	1427	+ tabbedPane.add(scrollpane);
1289	1428
1290		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1429	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1291	1430
1292		- optionsPanel = new JPanel(new GridBagLayout());
	1431	+ optionsPanel = new cGridBag().setVertical(true);
1293	1432
1294	1433	optionsPanel.setName("Options");
1295		- scenePanel.add(optionsPanel);
1296		-
	1434	+
	1435	+ AddOptions(optionsPanel); //, aConstraints);
	1436	+
	1437	+ tabbedPane.add(optionsPanel);
	1438	+
	1439	+ scenePanel.add(tabbedPane);
1297	1440
1298	1441	/*
1299	1442	cTree jTree = new cTree(null);
..	..	@@ -1327,6 +1470,7 @@
1327	1470	//bigPanel.setSize(new Dimension(10,10));
1328	1471	//bigPanel.add(ctrlPanel);
1329	1472	//bigPanel.add(gridPanel);
	1473	+ /**
1330	1474	bigThree = new JPanel();
1331	1475	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1332	1476	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1350,7 +1494,13 @@
1350	1494	// aConstraints.gridheight = 3;
1351	1495	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1352	1496	bigThree.add(XYZPanel, aWindowConstraints);
	1497	+ /**/
1353	1498
	1499	+ bigThree = new cGridBag();
	1500	+ bigThree.addComponent(scenePanel);
	1501	+ bigThree.addComponent(centralPanel);
	1502	+ bigThree.addComponent(XYZPanel);
	1503	+
1354	1504	// // SIDE EFFECT!!!
1355	1505	// aConstraints.gridx = 0;
1356	1506	// aConstraints.gridy = 0;
..	..	@@ -1377,9 +1527,11 @@
1377	1527
1378	1528	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1379	1529
1380		- frame.setSize(1024, 768);
1381		- frame.show();
	1530	+ frame.setSize(1280, 860);
	1531	+ frame.setVisible(true);
1382	1532
	1533	+ cameraView.requestFocusInWindow();
	1534	+
1383	1535	gridPanel.setDividerLocation(1.0);
1384	1536
1385	1537	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1393,6 +1545,10 @@
1393	1545	});
1394	1546	}
1395	1547
	1548	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1549	+ {
	1550	+ }
	1551	+
1396	1552	JTree GetTree()
1397	1553	{
1398	1554	return objEditor.jTree;
..	..	@@ -1404,260 +1560,173 @@
1404	1560	ctrlPanel.removeAll();
1405	1561	}
1406	1562
1407		- void SetupMaterial(JPanel ctrlPanel)
	1563	+ void SetupMaterial(cGridBag panel)
1408	1564	{
1409		- aConstraints.weighty = 0;
1410		- //aConstraints.weightx = 1;
1411		- /*
	1565	+ /*
1412	1566	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1413	1567	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1414		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1415		- aConstraints.gridx += 1;
1416	1568	*/
1417	1569
1418		- aConstraints.gridwidth = 1;
1419		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1420		- aConstraints.gridx += 1;
1421		- aConstraints.weighty = 0;
1422		- aConstraints.gridwidth = 1;
	1570	+ cGridBag editBar = new cGridBag().setVertical(false);
	1571	+
	1572	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1573	+ createMaterialButton.setToolTipText("Create material");
1423	1574
1424	1575	/*
1425	1576	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1426		- aConstraints.gridx += 1;
1427		- aConstraints.weighty = 0;
1428		- aConstraints.gridwidth = 1;
1429	1577	*/
1430	1578
1431		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1432		- aConstraints.gridx += 1;
	1579	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1580	+ clearMaterialButton.setToolTipText("Clear material");
	1581	+
	1582	+ if (Globals.ADVANCED)
	1583	+ {
	1584	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1585	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1586	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1587	+ }
1433	1588
1434		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1435		-
1436		- aConstraints.gridx += 1;
1437		-
1438		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1439		-
1440		- aConstraints.gridx += 1;
1441		-
1442		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1443		-
1444		- aConstraints.gridx = 0;
1445		- aConstraints.gridy += 1;
1446		- aConstraints.weighty = 0;
1447		- aConstraints.gridwidth = 1;
	1589	+ editBar.preferredHeight = 15;
	1590	+
	1591	+ panel.add(editBar);
	1592	+
1448	1593	/**/
1449	1594	//aConstraints.weighty = 0;
1450	1595	////aConstraints.weightx = 1;
1451	1596	//aConstraints.weighty = 1;
1452	1597	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1453	1598	//aConstraints.gridx += 1;
1454		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1455		- aConstraints.weighty = 0;
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- aConstraints.gridwidth = 1;
	1599	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1459	1600
1460		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1461		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- //aConstraints.weightx = 0;
1466		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- aConstraints.gridwidth = 1;
	1601	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1602	+
	1603	+ cGridBag color = new cGridBag();
	1604	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1605	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1606	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1607	+ //colorField.preferredWidth = 200;
	1608	+ colorSection.add(color);
1470	1609
1471		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1472		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- aConstraints.gridwidth = 1;
	1610	+ cGridBag modulation = new cGridBag();
	1611	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1612	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1613	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1614	+ colorSection.add(modulation);
1480	1615
1481		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1482		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484		- aConstraints.gridx += 1;
1485		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487		- aConstraints.gridx = 0;
1488		- aConstraints.gridy += 1;
1489		- aConstraints.gridwidth = 1;
	1616	+ cGridBag texture = new cGridBag();
	1617	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1618	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1619	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1620	+ colorSection.add(texture);
1490	1621
1491		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1492		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494		- aConstraints.gridx += 1;
1495		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497		- aConstraints.gridx = 0;
1498		- aConstraints.gridy += 1;
1499		- aConstraints.gridwidth = 1;
	1622	+ cGridBag anisoU = new cGridBag();
	1623	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1624	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1625	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1626	+ colorSection.add(anisoU);
1500	1627
1501		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1502		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504		- aConstraints.gridx += 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1507		- aConstraints.gridx = 0;
1508		- aConstraints.gridy += 1;
1509		- aConstraints.gridwidth = 1;
	1628	+ cGridBag anisoV = new cGridBag();
	1629	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1630	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1631	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1632	+ colorSection.add(anisoV);
1510	1633
1511		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1512		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1513		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1514		- aConstraints.gridx += 1;
1515		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1516		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1517		- aConstraints.gridx = 0;
1518		- aConstraints.gridy += 1;
1519		- aConstraints.gridwidth = 1;
	1634	+ cGridBag shadowbias = new cGridBag();
	1635	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1636	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1637	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1638	+ colorSection.add(shadowbias);
1520	1639
1521		- //aConstraints.weighty = 1;
1522		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1523		- //aConstraints.gridx += 1;
1524		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1525		- aConstraints.weighty = 0;
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- aConstraints.gridwidth = 1;
	1640	+ panel.add(new JSeparator());
	1641	+
	1642	+ panel.add(colorSection);
	1643	+
	1644	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1645	+
	1646	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1647	+
	1648	+ cGridBag diffuse = new cGridBag();
	1649	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1650	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1651	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1652	+ diffuseSection.add(diffuse);
1529	1653
1530		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1531		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- aConstraints.gridwidth = 1;
	1654	+ cGridBag diffuseness = new cGridBag();
	1655	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1656	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1657	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1658	+ diffuseSection.add(diffuseness);
1539	1659
1540		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1541		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- aConstraints.gridwidth = 1;
	1660	+ cGridBag selfshadow = new cGridBag();
	1661	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1662	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1663	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1664	+ diffuseSection.add(selfshadow);
1549	1665
1550		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1551		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- aConstraints.gridwidth = 1;
	1666	+ cGridBag sheen = new cGridBag();
	1667	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1668	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1669	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1670	+ diffuseSection.add(sheen);
1559	1671
1560		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1561		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563		- aConstraints.gridx += 1;
1564		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1566		- aConstraints.gridx = 0;
1567		- aConstraints.gridy += 1;
1568		- aConstraints.gridwidth = 1;
	1672	+ cGridBag subsurface = new cGridBag();
	1673	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1674	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1675	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1676	+ diffuseSection.add(subsurface);
1569	1677
1570		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1571		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573		- aConstraints.gridx += 1;
1574		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1576		- aConstraints.gridx = 0;
1577		- aConstraints.gridy += 1;
1578		- aConstraints.gridwidth = 1;
	1678	+ cGridBag shadow = new cGridBag();
	1679	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1680	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1681	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1682	+ diffuseSection.add(shadow);
1579	1683
1580		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1581		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583		- aConstraints.gridx += 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1586		- aConstraints.gridx = 0;
1587		- aConstraints.gridy += 1;
1588		- aConstraints.gridwidth = 1;
	1684	+ cGridBag fakedepth = new cGridBag();
	1685	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1686	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1687	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1688	+ diffuseSection.add(fakedepth);
1589	1689
1590		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1591		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1592		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1593		- aConstraints.gridx += 1;
1594		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1595		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1596		- aConstraints.gridx = 0;
1597		- aConstraints.gridy += 1;
1598		- aConstraints.gridwidth = 1;
	1690	+ panel.add(new JSeparator());
	1691	+
	1692	+ panel.add(diffuseSection);
	1693	+
	1694	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1695	+
	1696	+ cGridBag specularSection = new cGridBag().setVertical(true);
1599	1697
1600		- //aConstraints.weighty = 1;
1601		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1602		- //aConstraints.gridx += 1;
1603		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1604		- aConstraints.weighty = 0;
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- aConstraints.gridwidth = 1;
	1698	+ cGridBag specular = new cGridBag();
	1699	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1700	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1701	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1702	+ specularSection.add(specular);
1608	1703
1609		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1610		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- aConstraints.gridwidth = 1;
	1704	+ cGridBag lightarea = new cGridBag();
	1705	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1706	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1707	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1708	+ specularSection.add(lightarea);
1618	1709
1619		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1620		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622		- aConstraints.gridx += 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1625		- aConstraints.gridx = 0;
1626		- aConstraints.gridy += 1;
1627		- aConstraints.gridwidth = 1;
	1710	+ cGridBag shininess = new cGridBag();
	1711	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1712	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1713	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1714	+ specularSection.add(shininess);
1628	1715
1629		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1630		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632		- aConstraints.gridx += 1;
1633		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
	1716	+ cGridBag metalness = new cGridBag();
	1717	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1718	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1719	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1720	+ specularSection.add(metalness);
1638	1721
1639		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1640		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
	1722	+ cGridBag velvet = new cGridBag();
	1723	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1724	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1725	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1726	+ specularSection.add(velvet);
1648	1727
1649		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1650		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- aConstraints.gridwidth = 1;
1658		-
1659		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1660		- Return();
	1728	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1729	+ //Return();
1661	1730	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1662	1731	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663	1732	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1668,130 +1737,93 @@
1668	1737	// aConstraints.gridy += 1;
1669	1738	// aConstraints.gridwidth = 1;
1670	1739
1671		- //aConstraints.weighty = 1;
1672		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1673		- //aConstraints.gridx += 1;
1674		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1675		- aConstraints.weighty = 0;
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- aConstraints.gridwidth = 1;
1679	1740
1680		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1681		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	1741	+ panel.add(new JSeparator());
	1742	+
	1743	+ panel.add(specularSection);
	1744	+
	1745	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1746	+
	1747	+ cGridBag globalSection = new cGridBag().setVertical(true);
1689	1748
1690		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1691		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
	1749	+ cGridBag camera = new cGridBag();
	1750	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1751	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1752	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1753	+ globalSection.add(camera);
1699	1754
1700		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1701		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
	1755	+ cGridBag ambient = new cGridBag();
	1756	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1757	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1758	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1759	+ globalSection.add(ambient);
1709	1760
1710		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1711		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- aConstraints.gridwidth = 1;
1719		- aConstraints.weighty = 0;
	1761	+ cGridBag backlit = new cGridBag();
	1762	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1763	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1764	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1765	+ globalSection.add(backlit);
1720	1766
1721		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1722		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- aConstraints.gridwidth = 1;
	1767	+ cGridBag opacity = new cGridBag();
	1768	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1769	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1770	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1771	+ globalSection.add(opacity);
1730	1772
1731		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1732		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- aConstraints.gridwidth = 1;
	1773	+ panel.add(new JSeparator());
	1774	+
	1775	+ panel.add(globalSection);
	1776	+
	1777	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1778	+
	1779	+ cGridBag textureSection = new cGridBag().setVertical(true);
1740	1780
1741		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1742		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744		- aConstraints.gridx += 1;
1745		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy += 1;
1749		- aConstraints.gridwidth = 1;
	1781	+ cGridBag bump = new cGridBag();
	1782	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1783	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1784	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1785	+ textureSection.add(bump);
1750	1786
1751		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1752		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754		- aConstraints.gridx += 1;
1755		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1757		- aConstraints.gridx = 0;
1758		- aConstraints.gridy += 1;
1759		- aConstraints.gridwidth = 1;
	1787	+ cGridBag noise = new cGridBag();
	1788	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1789	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1790	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1791	+ textureSection.add(noise);
1760	1792
1761		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1762		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764		- aConstraints.gridx += 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1767		- aConstraints.gridx = 0;
1768		- aConstraints.gridy += 1;
1769		- aConstraints.gridwidth = 1;
	1793	+ cGridBag power = new cGridBag();
	1794	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1795	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1796	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1797	+ textureSection.add(power);
1770	1798
1771		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1772		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1773		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1774		- aConstraints.gridx += 1;
1775		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1776		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1777		- aConstraints.gridx = 0;
1778		- aConstraints.gridy += 1;
1779		- aConstraints.gridwidth = 1;
	1799	+ cGridBag borderfade = new cGridBag();
	1800	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1801	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1802	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1803	+ textureSection.add(borderfade);
1780	1804
1781		- //aConstraints.weighty = 1;
1782		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1783		- //aConstraints.gridx += 1;
1784		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1785		- aConstraints.weighty = 0;
	1805	+ cGridBag fog = new cGridBag();
	1806	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1807	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1808	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1809	+ textureSection.add(fog);
1786	1810
1787		- aConstraints.gridx = 0;
1788		- aConstraints.gridy = 0;
1789		- aConstraints.gridwidth = 1;
	1811	+ cGridBag opacityPower = new cGridBag();
	1812	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1813	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1814	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1815	+ textureSection.add(opacityPower);
	1816	+
	1817	+ panel.add(new JSeparator());
	1818	+
	1819	+ panel.add(textureSection);
	1820	+
	1821	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1790	1822
1791	1823	SetMaterial(copy); // .GetMaterial());
1792	1824
1793		- colorField.addChangeListener(this);
1794		- modulationField.addChangeListener(this);
	1825	+ //colorField.addChangeListener(this);
	1826	+// modulationField.addChangeListener(this);
1795	1827	metalnessField.addChangeListener(this);
1796	1828	diffuseField.addChangeListener(this);
1797	1829	specularField.addChangeListener(this);
..	..	@@ -1821,12 +1853,15 @@
1821	1853	opacityPowerField.addChangeListener(this);
1822	1854	/**/
1823	1855
1824		- resetSlidersButton.addActionListener(this);
1825	1856	clearMaterialButton.addActionListener(this);
1826	1857	createMaterialButton.addActionListener(this);
1827		-
1828		- propagateToggle.addItemListener(this);
1829		- multiplyToggle.addItemListener(this);
	1858	+
	1859	+ if (Globals.ADVANCED)
	1860	+ {
	1861	+ resetSlidersButton.addActionListener(this);
	1862	+ propagateToggle.addItemListener(this);
	1863	+ multiplyToggle.addItemListener(this);
	1864	+ }
1830	1865	}
1831	1866
1832	1867	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1997,7 +2032,7 @@
1997	2032
1998	2033	//? flashIt = false;
1999	2034	CameraPane pane = (CameraPane) cameraView;
2000		- pane.clickStart(location.x, location.y, 0);
	2035	+ pane.clickStart(location.x, location.y, 0, 0);
2001	2036	pane.clickEnd(location.x, location.y, 0, true);
2002	2037
2003	2038	if (group.selection.size() == 1)
..	..	@@ -2046,6 +2081,7 @@
2046	2081	e2.printStackTrace();
2047	2082	}
2048	2083	}
	2084	+
2049	2085	LoadJMEThread loadThread;
2050	2086
2051	2087	class LoadJMEThread extends Thread
..	..	@@ -2103,6 +2139,7 @@
2103	2139	//LoadFile0(filename, converter);
2104	2140	}
2105	2141	}
	2142	+
2106	2143	LoadOBJThread loadObjThread;
2107	2144
2108	2145	class LoadOBJThread extends Thread
..	..	@@ -2181,19 +2218,19 @@
2181	2218
2182	2219	void LoadObjFile(String fullname)
2183	2220	{
2184		- /*
	2221	+ System.out.println("Loading " + fullname);
	2222	+ /**/
2185	2223	//lastFilename = fullname;
2186	2224	if(loadObjThread == null)
2187	2225	{
2188		- loadObjThread = new LoadOBJThread();
2189		- loadObjThread.start();
	2226	+ loadObjThread = new LoadOBJThread();
	2227	+ loadObjThread.start();
2190	2228	}
2191	2229
2192	2230	loadObjThread.add(fullname);
2193		- */
	2231	+ /**/
2194	2232
2195		- System.out.println("Loading " + fullname);
2196		- makeSomething(new FileObject(fullname, true), true);
	2233	+ //makeSomething(new FileObject(fullname, true), true);
2197	2234	}
2198	2235
2199	2236	void LoadGFDFile(String fullname)
..	..	@@ -2454,11 +2491,11 @@
2454	2491
2455	2492	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2456	2493	{
2457		- if (GrafreeD.standAlone)
	2494	+ if (Grafreed.standAlone)
2458	2495	{
2459	2496	/**/
2460	2497	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2461		- browser.show();
	2498	+ browser.setVisible(true);
2462	2499	String filename = browser.getFile();
2463	2500	if (filename != null && filename.length() > 0)
2464	2501	{
..	..	@@ -2603,6 +2640,7 @@
2603	2640	}
2604	2641	if (input == null)
2605	2642	{
	2643	+ new Exception().printStackTrace();
2606	2644	System.exit(0);
2607	2645	}
2608	2646
..	..	@@ -2817,7 +2855,8 @@
2817	2855	return;
2818	2856	}
2819	2857
2820		- multiplyToggle.setSelected(mat.multiply);
	2858	+ if (multiplyToggle != null)
	2859	+ multiplyToggle.setSelected(mat.multiply);
2821	2860
2822	2861	assert (object.projectedVertices != null);
2823	2862
..	..	@@ -3032,9 +3071,9 @@
3032	3071	frame.validate();
3033	3072
3034	3073	return;
3035		- } else if (event.getSource() == toggleRandomItem)
	3074	+ } else if (event.getSource() == toggleSwitchItem)
3036	3075	{
3037		- cameraView.ToggleRandom();
	3076	+ cameraView.ToggleSwitch();
3038	3077	cameraView.repaint();
3039	3078	return;
3040	3079	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3063,6 +3102,10 @@
3063	3102	{
3064	3103	copy.live ^= true;
3065	3104	return;
	3105	+ } else if (event.getSource() == selectCB)
	3106	+ {
	3107	+ copy.dontselect ^= true;
	3108	+ return;
3066	3109	} else if (event.getSource() == hideCB)
3067	3110	{
3068	3111	copy.hide ^= true;
..	..	@@ -3077,6 +3120,7 @@
3077	3120	if (event.getSource() == randomCB)
3078	3121	{
3079	3122	copy.random ^= true;
	3123	+ objEditor.refreshContents();
3080	3124	return;
3081	3125	}
3082	3126	if (event.getSource() == speedupCB)
..	..	@@ -3100,8 +3144,9 @@
3100	3144
3101	3145	public void actionPerformed(ActionEvent event)
3102	3146	{
	3147	+ Object source = event.getSource();
3103	3148	// SCRIPT DIALOG
3104		- if (event.getSource() == okbutton)
	3149	+ if (source == okbutton)
3105	3150	{
3106	3151	textpanel.setVisible(false);
3107	3152	textpanel.remove(textarea);
..	..	@@ -3113,7 +3158,7 @@
3113	3158	textarea = null;
3114	3159	textpanel = null;
3115	3160	}
3116		- if (event.getSource() == cancelbutton)
	3161	+ if (source == cancelbutton)
3117	3162	{
3118	3163	textpanel.setVisible(false);
3119	3164	textpanel.remove(textarea);
..	..	@@ -3125,49 +3170,50 @@
3125	3170	//applySelf();
3126	3171	//client.refreshEditWindow();
3127	3172	//refreshContents();
3128		- if (event.getSource() == nameField)
	3173	+ if (source == nameField)
3129	3174	{
3130	3175	//System.out.println("ObjEditor " + event);
3131	3176	applySelf0(true);
3132	3177	//parent.applySelf();
3133	3178	objEditor.refreshContents();
3134		- } else if (event.getSource() == resetButton)
	3179	+ } else if (source == resetButton)
3135	3180	{
3136	3181	CameraPane.fullreset = true;
3137	3182	copy.Reset(); // ResetMeshes();
3138	3183	copy.Touch();
3139	3184	objEditor.refreshContents();
3140		- } else if (event.getSource() == stepItem)
	3185	+ } else if (source == stepItem)
3141	3186	{
3142		- cameraView.ONESTEP = true;
	3187	+ //cameraView.ONESTEP = true;
	3188	+ Globals.ONESTEP = true;
3143	3189	cameraView.repaint();
3144	3190	return;
3145		- } else if (event.getSource() == stepButton)
	3191	+ } else if (source == stepButton)
3146	3192	{
3147	3193	copy.Step();
3148	3194	copy.Touch();
3149	3195	objEditor.refreshContents();
3150		- } else if (event.getSource() == slowerButton)
	3196	+ } else if (source == slowerButton)
3151	3197	{
3152	3198	copy.Slower();
3153	3199	copy.Touch();
3154	3200	objEditor.refreshContents();
3155		- } else if (event.getSource() == fasterButton)
	3201	+ } else if (source == fasterButton)
3156	3202	{
3157	3203	copy.Faster();
3158	3204	copy.Touch();
3159	3205	objEditor.refreshContents();
3160		- } else if (event.getSource() == remarkButton)
	3206	+ } else if (source == remarkButton)
3161	3207	{
3162	3208	copy.Remark();
3163	3209	copy.Touch();
3164	3210	objEditor.refreshContents();
3165		- } else if (event.getSource() == stepAllButton)
	3211	+ } else if (source == stepAllButton)
3166	3212	{
3167	3213	copy.StepAll();
3168	3214	copy.Touch();
3169	3215	objEditor.refreshContents();
3170		- } else if (event.getSource() == resetAllButton)
	3216	+ } else if (source == resetAllButton)
3171	3217	{
3172	3218	//CameraPane.fullreset = true;
3173	3219	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3200,53 +3246,75 @@
3200	3246	// Close();
3201	3247	// }
3202	3248	// else
3203		- if (event.getSource() == resetSlidersButton)
	3249	+ if (source == resetSlidersButton)
3204	3250	{
3205	3251	ResetSliders();
3206		- } else if (event.getSource() == clearMaterialButton)
	3252	+ } else if (source == clearMaterialButton)
3207	3253	{
3208	3254	ClearMaterial();
3209		- } else if (event.getSource() == createMaterialButton)
	3255	+ } else if (source == createMaterialButton)
3210	3256	{
3211	3257	CreateMaterial();
3212		- } else if (event.getSource() == clearPanelButton)
	3258	+ } else if (source == clearPanelButton)
3213	3259	{
3214	3260	copy.ClearUI();
3215	3261	refreshContents(true);
3216		- } /*
3217		- }
3218		-
3219		- public boolean action(Event event, Object arg)
3220		- {
3221		- */ else if (event.getSource() == closeItem)
	3262	+ } else if (source == importGFDItem)
	3263	+ {
	3264	+ ImportGFD();
	3265	+ } else
	3266	+ if (source == importVRMLX3DItem)
	3267	+ {
	3268	+ ImportVRMLX3D();
	3269	+ } else
	3270	+ if (source == import3DSItem)
	3271	+ {
	3272	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3273	+ } else
	3274	+ if (source == importOBJItem)
	3275	+ {
	3276	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3277	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3278	+ browser.setVisible(true);
	3279	+ String filename = browser.getFile();
	3280	+ if (filename != null && filename.length() > 0)
	3281	+ {
	3282	+ String fullname = browser.getDirectory() + filename;
	3283	+ makeSomething(ReadOBJ(fullname), true);
	3284	+ }
	3285	+ } else
	3286	+ if (source == closeItem)
3222	3287	{
3223	3288	Close();
3224	3289	//return true;
3225		- } else if (event.getSource() == loadItem)
	3290	+ } else if (source == loadItem)
3226	3291	{
3227	3292	load();
3228	3293	//return true;
3229		- } else if (event.getSource() == saveItem)
	3294	+ } else if (source == newItem)
	3295	+ {
	3296	+ New();
	3297	+ } else if (source == saveItem)
3230	3298	{
3231	3299	save();
3232	3300	//return true;
3233		- } else if (event.getSource() == saveAsItem)
	3301	+ } else if (source == saveAsItem)
3234	3302	{
3235	3303	saveAs();
3236	3304	//return true;
3237		- } else if (event.getSource() == reexportItem)
	3305	+ } else if (source == reexportItem)
3238	3306	{
3239	3307	reexport();
3240	3308	//return true;
3241		- } else if (event.getSource() == exportAsItem)
	3309	+ } else if (source == exportAsItem)
3242	3310	{
3243	3311	export();
3244	3312	//return true;
3245		- } else if (event.getSource() == povItem)
	3313	+ } else if (source == povItem)
3246	3314	{
3247	3315	generatePOV();
3248	3316	//return true;
3249		- } else if (event.getSource() == zBufferItem)
	3317	+ } else if (source == zBufferItem)
3250	3318	{
3251	3319	try
3252	3320	{
..	..	@@ -3268,21 +3336,8 @@
3268	3336	cameraView.repaint();
3269	3337	//return true;
3270	3338	}
3271		- */ else if (event.getSource() == editCameraItem)
3272		- {
3273		- cameraView.ProtectCamera();
3274		- cameraView.repaint();
3275		- return;
3276		- } else if (event.getSource() == revertCameraItem)
3277		- {
3278		- cameraView.RevertCamera();
3279		- cameraView.repaint();
3280		- return;
3281		-// } else if (event.getSource() == textureButton)
3282		-// {
3283		-// return; // true;
3284		- } else // combos...
3285		- if (event.getSource() == texresMenu)
	3339	+ */ else // combos...
	3340	+ if (source == texresMenu)
3286	3341	{
3287	3342	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3288	3343	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3294,27 +3349,287 @@
3294	3349	}
3295	3350	}
3296	3351
3297		- void ToggleAnimation()
	3352	+ void New()
3298	3353	{
3299		- if (!CameraPane.ANIMATION)
	3354	+ while (copy.Size() > 1)
3300	3355	{
3301		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3356	+ copy.remove(1);
	3357	+ }
	3358	+
	3359	+ ResetModel();
	3360	+ objEditor.refreshContents();
	3361	+ }
	3362	+
	3363	+ static public byte[] Compress(Object3D o)
	3364	+ {
	3365	+ try
	3366	+ {
	3367	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3368	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3369	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3370	+
	3371	+ Object3D parent = o.parent;
	3372	+ o.parent = null;
	3373	+
	3374	+ out.writeObject(o);
	3375	+
	3376	+ o.parent = parent;
	3377	+
	3378	+ out.flush();
	3379	+
	3380	+ zstream.close();
	3381	+ out.close();
	3382	+
	3383	+ return baos.toByteArray();
	3384	+ } catch (Exception e)
	3385	+ {
	3386	+ System.err.println(e);
	3387	+ return null;
	3388	+ }
	3389	+ }
	3390	+
	3391	+ static public Object Uncompress(byte[] bytes)
	3392	+ {
	3393	+ System.out.println("#bytes = " + bytes.length);
	3394	+ try
	3395	+ {
	3396	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3397	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3398	+ ObjectInputStream in = new ObjectInputStream(istream);
	3399	+ Object obj = in.readObject();
	3400	+ in.close();
	3401	+
	3402	+ return obj;
	3403	+ } catch (Exception e)
	3404	+ {
	3405	+ System.err.println(e);
	3406	+ return null;
	3407	+ }
	3408	+ }
	3409	+
	3410	+ static public Object clone(Object o)
	3411	+ {
	3412	+ try
	3413	+ {
	3414	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3415	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3416	+
	3417	+ out.writeObject(o);
	3418	+
	3419	+ out.flush();
	3420	+ out.close();
	3421	+
	3422	+ byte[] bytes = baos.toByteArray();
	3423	+
	3424	+ System.out.println("clone = " + bytes.length);
	3425	+
	3426	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3427	+ ObjectInputStream in = new ObjectInputStream(bais);
	3428	+ Object obj = in.readObject();
	3429	+ in.close();
	3430	+
	3431	+ return obj;
	3432	+ } catch (Exception e)
	3433	+ {
	3434	+ System.err.println(e);
	3435	+ return null;
	3436	+ }
	3437	+ }
	3438	+
	3439	+ cRadio GetCurrentTab()
	3440	+ {
	3441	+ cRadio ab;
	3442	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3443	+ {
	3444	+ ab = (cRadio)e.nextElement();
	3445	+ if(ab.GetObject() == copy)
	3446	+ {
	3447	+ return ab;
	3448	+ }
	3449	+ }
	3450	+
	3451	+ return null;
	3452	+ }
	3453	+
	3454	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3455	+
	3456	+ public void Save()
	3457	+ {
	3458	+ System.err.println("Save");
	3459	+
	3460	+ cRadio tab = GetCurrentTab();
	3461	+
	3462	+ boolean temp = CameraPane.SWITCH;
	3463	+ CameraPane.SWITCH = false;
	3464	+
	3465	+ copy.ExtractBigData(hashtable);
	3466	+
	3467	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3468	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3469	+
	3470	+ copy.RestoreBigData(hashtable);
	3471	+
	3472	+ CameraPane.SWITCH = temp;
	3473	+
	3474	+ //assert(hashtable.isEmpty());
	3475	+
	3476	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3477	+ {
	3478	+ tab.graphs[i] = null;
	3479	+ }
	3480	+
	3481	+ // test save
	3482	+ if (false)
	3483	+ {
	3484	+ try
	3485	+ {
	3486	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3487	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3488	+
	3489	+ p.writeObject(copy);
	3490	+
	3491	+ p.flush();
	3492	+
	3493	+ ostream.close();
	3494	+ } catch (Exception e)
	3495	+ {
	3496	+ e.printStackTrace();
	3497	+ }
	3498	+ }
	3499	+ }
	3500	+
	3501	+ void CopyChanged(Object3D obj)
	3502	+ {
	3503	+ boolean temp = CameraPane.SWITCH;
	3504	+ CameraPane.SWITCH = false;
	3505	+
	3506	+ copy.ExtractBigData(hashtable);
	3507	+
	3508	+ copy.clear();
	3509	+
	3510	+ for (int i=0; i<obj.Size(); i++)
	3511	+ {
	3512	+ copy.add(obj.get(i));
	3513	+ }
	3514	+
	3515	+ copy.RestoreBigData(hashtable);
	3516	+
	3517	+ CameraPane.SWITCH = temp;
	3518	+
	3519	+ //assert(hashtable.isEmpty());
	3520	+
	3521	+ copy.Touch();
	3522	+
	3523	+ ResetModel();
	3524	+ copy.HardTouch(); // recompile?
	3525	+
	3526	+ cRadio ab;
	3527	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3528	+ {
	3529	+ ab = (cRadio)e.nextElement();
	3530	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3531	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3532	+ if (test != null)
	3533	+ {
	3534	+ test.editWindow = ab.object.editWindow;
	3535	+ ab.object = test;
	3536	+ }
	3537	+ }
	3538	+
	3539	+ refreshContents();
	3540	+ }
	3541	+
	3542	+ public void Undo()
	3543	+ {
	3544	+ System.err.println("Undo");
	3545	+
	3546	+ cRadio tab = GetCurrentTab();
	3547	+
	3548	+ if (tab.undoindex == 0)
	3549	+ {
	3550	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3551	+ return;
	3552	+ }
	3553	+
	3554	+ if (tab.graphs[tab.undoindex] == null)
	3555	+ {
	3556	+ Save();
	3557	+ tab.undoindex -= 1;
	3558	+ }
	3559	+
	3560	+ tab.undoindex -= 1;
	3561	+
	3562	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3563	+ }
	3564	+
	3565	+ public void Redo()
	3566	+ {
	3567	+ cRadio tab = GetCurrentTab();
	3568	+
	3569	+ if (tab.graphs[tab.undoindex + 1] == null)
	3570	+ {
	3571	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3572	+ return;
	3573	+ }
	3574	+
	3575	+ tab.undoindex += 1;
	3576	+
	3577	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3578	+ }
	3579	+
	3580	+ void ImportGFD()
	3581	+ {
	3582	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3302	3583	browser.show();
3303	3584	String filename = browser.getFile();
3304	3585	if (filename != null && filename.length() > 0)
3305	3586	{
3306		- CameraPane.filename = browser.getDirectory() + filename;
	3587	+ String fullname = browser.getDirectory() + filename;
	3588	+
	3589	+ //Object3D readobj =
	3590	+ objEditor.ReadGFD(fullname, objEditor);
	3591	+ //makeSomething(readobj);
	3592	+ }
	3593	+ }
	3594	+
	3595	+ void ImportVRMLX3D()
	3596	+ {
	3597	+ if (Grafreed.standAlone)
	3598	+ {
	3599	+ /**/
	3600	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3601	+ browser.show();
	3602	+ String filename = browser.getFile();
	3603	+ if (filename != null && filename.length() > 0)
	3604	+ {
	3605	+ String fullname = browser.getDirectory() + filename;
	3606	+ LoadVRMLX3D(fullname);
	3607	+ }
	3608	+ /**/
	3609	+ }
	3610	+ }
	3611	+
	3612	+ void ToggleAnimation()
	3613	+ {
	3614	+ if (!Globals.ANIMATION)
	3615	+ {
	3616	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3617	+ browser.setVisible(true);
	3618	+ String filename = browser.getFile();
	3619	+ if (filename != null && filename.length() > 0)
	3620	+ {
	3621	+ Globals.filename = browser.getDirectory() + filename;
3307	3622	//CameraPane.framecount = 0;
3308		- CameraPane.imagecount = 0;
	3623	+ Globals.imagecount = 0;
3309	3624
3310		- CameraPane.ANIMATION ^= true;
	3625	+ Globals.ANIMATION ^= true;
3311	3626
3312		- GrafreeD.wav.cursor = 0;
3313		- GrafreeD.wav.loop = 0;
	3627	+ Grafreed.wav.cursor = 0;
	3628	+ Grafreed.wav.loop = 0;
3314	3629	}
3315	3630	} else
3316	3631	{
3317		- CameraPane.ANIMATION ^= true;
	3632	+ Globals.ANIMATION ^= true;
3318	3633	}
3319	3634	}
3320	3635
..	..	@@ -3360,7 +3675,7 @@
3360	3675	void CreateMaterial()
3361	3676	{
3362	3677	//copy.ClearMaterial(); // PATCH
3363		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3678	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3364	3679	if (copy.selection.size() > 0)
3365	3680	//SetMaterial(copy);
3366	3681	{
..	..	@@ -3419,11 +3734,11 @@
3419	3734	{
3420	3735	copy.ResetBlockLoop(); // temporary problem
3421	3736
3422		- boolean random = CameraPane.RANDOM;
3423		- CameraPane.RANDOM = false; // parse everything
	3737	+ boolean random = CameraPane.SWITCH;
	3738	+ CameraPane.SWITCH = false; // parse everything
3424	3739	copy.ResetDisplayList();
3425	3740	copy.HardTouch();
3426		- CameraPane.RANDOM = random;
	3741	+ CameraPane.SWITCH = random;
3427	3742	}
3428	3743
3429	3744	// public void applySelf()
..	..	@@ -3493,10 +3808,40 @@
3493	3808	current.fakedepth = (float) fakedepthField.getFloat();
3494	3809	current.shadowbias = (float) shadowbiasField.getFloat();
3495	3810
3496		- if (!NumberSlider.frozen)
	3811	+ if (!cNumberSlider.frozen)
3497	3812	{
3498	3813	//System.out.println("Propagate = " + propagate);
3499	3814	copy.UpdateMaterial(anchor, current, propagate);
	3815	+
	3816	+ if (copy.material != null)
	3817	+ {
	3818	+ cMaterial mat = copy.material;
	3819	+
	3820	+ colorField.SetToolTipValue((mat.color));
	3821	+ modulationField.SetToolTipValue((mat.modulation));
	3822	+ metalnessField.SetToolTipValue((mat.metalness));
	3823	+ diffuseField.SetToolTipValue((mat.diffuse));
	3824	+ specularField.SetToolTipValue((mat.specular));
	3825	+ shininessField.SetToolTipValue((mat.shininess));
	3826	+ shiftField.SetToolTipValue((mat.shift));
	3827	+ ambientField.SetToolTipValue((mat.ambient));
	3828	+ lightareaField.SetToolTipValue((mat.lightarea));
	3829	+ diffusenessField.SetToolTipValue((mat.factor));
	3830	+ velvetField.SetToolTipValue((mat.velvet));
	3831	+ sheenField.SetToolTipValue((mat.sheen));
	3832	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3833	+ backlitField.SetToolTipValue((mat.bump));
	3834	+ anisoField.SetToolTipValue((mat.aniso));
	3835	+ anisoVField.SetToolTipValue((mat.anisoV));
	3836	+ cameraField.SetToolTipValue((mat.cameralight));
	3837	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3838	+ shadowField.SetToolTipValue((mat.shadow));
	3839	+ textureField.SetToolTipValue((mat.texture));
	3840	+ opacityField.SetToolTipValue((mat.opacity));
	3841	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3842	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3843	+ }
	3844	+
3500	3845	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3501	3846	{
3502	3847	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3541,6 +3886,7 @@
3541	3886	\|\| e.getSource() == apertureField
3542	3887	\|\| e.getSource() == shadowblurField)
3543	3888	{
	3889	+ new Exception().printStackTrace();
3544	3890	System.exit(0);
3545	3891	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3546	3892	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3611,7 +3957,7 @@
3611	3957	}
3612	3958
3613	3959	if (normalpushField != null)
3614		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3960	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3615	3961	}
3616	3962
3617	3963	void SnapObject()
..	..	@@ -3866,7 +4212,7 @@
3866	4212
3867	4213	radioPanel.revalidate();
3868	4214	radioPanel.repaint();
3869		- ctrlPanel.revalidate(); // ? new
	4215	+ ctrlPanel.validate(); // ? new
3870	4216	ctrlPanel.repaint();
3871	4217	}
3872	4218	}
..	..	@@ -3875,6 +4221,8 @@
3875	4221
3876	4222	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3877	4223	{
	4224	+ if (Globals.SAVEONMAKE)
	4225	+ Save();
3878	4226	//Tween.set(thing, 0).target(1).start(tweenManager);
3879	4227	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3880	4228	// if (thing instanceof GenericJointDemo)
..	..	@@ -4078,6 +4426,7 @@
4078	4426	}
4079	4427	}
4080	4428	}
	4429	+
4081	4430	LoadGFDThread loadGFDThread;
4082	4431
4083	4432	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4097,8 +4446,10 @@
4097	4446
4098	4447	try
4099	4448	{
	4449	+ // Try compressed version first.
4100	4450	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4101		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4451	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4452	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4102	4453
4103	4454	readobj = (Object3D) p.readObject();
4104	4455	istream.close();
..	..	@@ -4106,7 +4457,20 @@
4106	4457	readobj.ResetDisplayList();
4107	4458	} catch (Exception e)
4108	4459	{
4109		- e.printStackTrace();
	4460	+ //e.printStackTrace();
	4461	+ try
	4462	+ {
	4463	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4464	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4465	+
	4466	+ readobj = (Object3D) p.readObject();
	4467	+ istream.close();
	4468	+
	4469	+ readobj.ResetDisplayList();
	4470	+ } catch (Exception e2)
	4471	+ {
	4472	+ e2.printStackTrace();
	4473	+ }
4110	4474	}
4111	4475	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4112	4476	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4152,6 +4516,12 @@
4152	4516
4153	4517	void LoadIt(Object obj)
4154	4518	{
	4519	+ if (obj == null)
	4520	+ {
	4521	+ // Invalid file
	4522	+ return;
	4523	+ }
	4524	+
4155	4525	System.out.println("Loaded " + obj);
4156	4526	//new Exception().printStackTrace();
4157	4527	Object3D readobj = (Object3D) obj;
..	..	@@ -4161,6 +4531,8 @@
4161	4531
4162	4532	if (readobj != null)
4163	4533	{
	4534	+ if (Globals.SAVEONMAKE)
	4535	+ Save();
4164	4536	try
4165	4537	{
4166	4538	//readobj.deepCopySelf(copy);
..	..	@@ -4223,7 +4595,7 @@
4223	4595
4224	4596	void load() // throws ClassNotFoundException
4225	4597	{
4226		- if (GrafreeD.standAlone)
	4598	+ if (Grafreed.standAlone)
4227	4599	{
4228	4600	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4229	4601	browser.show();
..	..	@@ -4310,11 +4682,13 @@
4310	4682	try
4311	4683	{
4312	4684	FileOutputStream ostream = new FileOutputStream(lastname);
4313		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4685	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4686	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4314	4687
4315	4688	p.writeObject(copy);
4316	4689	p.flush();
4317	4690
	4691	+ zstream.close();
4318	4692	ostream.close();
4319	4693
4320	4694	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4324,11 +4698,12 @@
4324	4698	{
4325	4699	}
4326	4700	}
	4701	+
4327	4702	String lastname;
4328	4703
4329	4704	void saveAs()
4330	4705	{
4331		- if (GrafreeD.standAlone)
	4706	+ if (Grafreed.standAlone)
4332	4707	{
4333	4708	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4334	4709	browser.setVisible(true);
..	..	@@ -4433,13 +4808,13 @@
4433	4808	try
4434	4809	{
4435	4810	FileOutputStream ostream = new FileOutputStream(filename);
4436		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4437		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4811	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4812	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4438	4813
4439	4814	Object3D objectparent = obj.parent;
4440	4815	obj.parent = null;
4441	4816
4442		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4817	+ Object3D object = (Object3D) Grafreed.clone(obj);
4443	4818
4444	4819	obj.parent = objectparent;
4445	4820
..	..	@@ -4451,8 +4826,8 @@
4451	4826	p.writeObject(object);
4452	4827	p.flush();
4453	4828
	4829	+ zstream.close();
4454	4830	ostream.close();
4455		- // zstream.close();
4456	4831
4457	4832	// group.selection.get(0).parent = parent;
4458	4833	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4473,7 +4848,7 @@
4473	4848	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4474	4849	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4475	4850	copy.generatePOV(buffer);
4476		- if (GrafreeD.standAlone)
	4851	+ if (Grafreed.standAlone)
4477	4852	{
4478	4853	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4479	4854	browser.show();
..	..	@@ -4499,7 +4874,8 @@
4499	4874	Object3D client;
4500	4875	Object3D copy;
4501	4876	MenuBar menuBar;
4502		- Menu windowMenu;
	4877	+ Menu fileMenu;
	4878	+ MenuItem newItem;
4503	4879	MenuItem loadItem;
4504	4880	MenuItem saveItem;
4505	4881	MenuItem saveAsItem;
..	..	@@ -4507,13 +4883,11 @@
4507	4883	MenuItem reexportItem;
4508	4884	MenuItem povItem;
4509	4885	MenuItem closeItem;
4510		- Menu cameraMenu;
	4886	+
4511	4887	CheckboxMenuItem zBufferItem;
4512	4888	//MenuItem normalLensItem;
4513		- MenuItem editCameraItem;
4514		- MenuItem revertCameraItem;
4515		- CheckboxMenuItem toggleLiveItem;
4516	4889	MenuItem stepItem;
	4890	+ CheckboxMenuItem toggleLiveItem;
4517	4891	CheckboxMenuItem toggleFullScreenItem;
4518	4892	CheckboxMenuItem toggleTimelineItem;
4519	4893	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4522,7 +4896,7 @@
4522	4896	CheckboxMenuItem toggleFootContactItem;
4523	4897	CheckboxMenuItem toggleDLItem;
4524	4898	CheckboxMenuItem toggleTextureItem;
4525		- CheckboxMenuItem toggleRandomItem;
	4899	+ CheckboxMenuItem toggleSwitchItem;
4526	4900	CheckboxMenuItem toggleRootItem;
4527	4901	CheckboxMenuItem animationItem;
4528	4902	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4530,20 +4904,20 @@
4530	4904	JSplitPane mainPanel;
4531	4905	JScrollPane scrollpane;
4532	4906	JPanel toolbarPanel;
4533		- JPanel treePanel;
	4907	+ cGridBag treePanel;
4534	4908	JPanel radioPanel;
4535	4909	ButtonGroup buttonGroup;
4536		- JPanel ctrlPanel;
4537		- JPanel materialPanel;
	4910	+ cGridBag ctrlPanel;
	4911	+ cGridBag materialPanel;
4538	4912	JScrollPane infoPanel;
4539		- JPanel optionsPanel;
	4913	+ cGridBag optionsPanel;
4540	4914	JTabbedPane objectPanel;
4541		- JPanel XYZPanel;
	4915	+ cGridBag XYZPanel;
4542	4916	JSplitPane gridPanel;
4543	4917	JSplitPane bigPanel;
4544		- JPanel bigThree;
4545		- JTabbedPane scenePanel;
4546		- JPanel centralPanel;
	4918	+ cGridBag bigThree;
	4919	+ cGridBag scenePanel;
	4920	+ cGridBag centralPanel;
4547	4921	JSplitPane cameraPanel;
4548	4922	JPanel timelinePanel;
4549	4923	JMenuBar timelineMenubar;
..	..	@@ -4596,67 +4970,72 @@
4596	4970	// MATERIAL
4597	4971	JLabel materialLabel;
4598	4972	JLabel colorLabel;
4599		- NumberSlider colorField;
	4973	+ cNumberSlider colorField;
4600	4974	JLabel modulationLabel;
4601		- NumberSlider modulationField;
	4975	+ cNumberSlider modulationField;
4602	4976	JLabel metalnessLabel;
4603		- NumberSlider metalnessField;
	4977	+ cNumberSlider metalnessField;
4604	4978	JLabel diffuseLabel;
4605		- NumberSlider diffuseField;
	4979	+ cNumberSlider diffuseField;
4606	4980	JLabel specularLabel;
4607		- NumberSlider specularField;
	4981	+ cNumberSlider specularField;
4608	4982	JLabel shininessLabel;
4609		- NumberSlider shininessField;
	4983	+ cNumberSlider shininessField;
4610	4984	JLabel shiftLabel;
4611		- NumberSlider shiftField;
	4985	+ cNumberSlider shiftField;
4612	4986	JLabel ambientLabel;
4613		- NumberSlider ambientField;
	4987	+ cNumberSlider ambientField;
4614	4988	JLabel lightareaLabel;
4615		- NumberSlider lightareaField;
	4989	+ cNumberSlider lightareaField;
4616	4990	JLabel diffusenessLabel;
4617		- NumberSlider diffusenessField;
	4991	+ cNumberSlider diffusenessField;
4618	4992	JLabel velvetLabel;
4619		- NumberSlider velvetField;
	4993	+ cNumberSlider velvetField;
4620	4994	JLabel sheenLabel;
4621		- NumberSlider sheenField;
	4995	+ cNumberSlider sheenField;
4622	4996	JLabel subsurfaceLabel;
4623		- NumberSlider subsurfaceField;
	4997	+ cNumberSlider subsurfaceField;
4624	4998	//JLabel bumpLabel;
4625	4999	//NumberSlider bumpField;
4626	5000	JLabel backlitLabel;
4627		- NumberSlider backlitField;
	5001	+ cNumberSlider backlitField;
4628	5002	JLabel anisoLabel;
4629		- NumberSlider anisoField;
	5003	+ cNumberSlider anisoField;
4630	5004	JLabel anisoVLabel;
4631		- NumberSlider anisoVField;
	5005	+ cNumberSlider anisoVField;
4632	5006	JLabel cameraLabel;
4633		- NumberSlider cameraField;
	5007	+ cNumberSlider cameraField;
4634	5008	JLabel selfshadowLabel;
4635		- NumberSlider selfshadowField;
	5009	+ cNumberSlider selfshadowField;
4636	5010	JLabel shadowLabel;
4637		- NumberSlider shadowField;
	5011	+ cNumberSlider shadowField;
4638	5012	JLabel textureLabel;
4639		- NumberSlider textureField;
	5013	+ cNumberSlider textureField;
4640	5014	JLabel opacityLabel;
4641		- NumberSlider opacityField;
	5015	+ cNumberSlider opacityField;
4642	5016	JLabel fakedepthLabel;
4643		- NumberSlider fakedepthField;
	5017	+ cNumberSlider fakedepthField;
4644	5018	JLabel shadowbiasLabel;
4645		- NumberSlider shadowbiasField;
	5019	+ cNumberSlider shadowbiasField;
4646	5020	JLabel bumpLabel;
4647		- NumberSlider bumpField;
	5021	+ cNumberSlider bumpField;
4648	5022	JLabel noiseLabel;
4649		- NumberSlider noiseField;
	5023	+ cNumberSlider noiseField;
4650	5024	JLabel powerLabel;
4651		- NumberSlider powerField;
	5025	+ cNumberSlider powerField;
4652	5026	JLabel borderfadeLabel;
4653		- NumberSlider borderfadeField;
	5027	+ cNumberSlider borderfadeField;
4654	5028	JLabel fogLabel;
4655		- NumberSlider fogField;
	5029	+ cNumberSlider fogField;
4656	5030	JLabel opacityPowerLabel;
4657		- NumberSlider opacityPowerField;
	5031	+ cNumberSlider opacityPowerField;
4658	5032	JTree jTree;
4659	5033	//ObjectUI parent;
4660	5034
4661		- NumberSlider normalpushField;
	5035	+ cNumberSlider normalpushField;
	5036	+
	5037	+ private MenuItem importGFDItem;
	5038	+ private MenuItem importVRMLX3DItem;
	5039	+ private MenuItem import3DSItem;
	5040	+ private MenuItem importOBJItem;
4662	5041	}