~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -19,6 +19,8 @@
19	19	import //weka.core.
20	20	matrix.Matrix;
21	21
	22	+import grafeme.ui.*;
	23	+
22	24	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	25	ActionListener, ChangeListener,
24	26	InputMethodListener,
..	..	@@ -33,6 +35,8 @@
33	35
34	36	GroupEditor callee;
35	37	JFrame frame;
	38	+
	39	+ static ObjEditor theFrame;
36	40
37	41	// SCRIPT
38	42
..	..	@@ -124,7 +128,7 @@
124	128	void keyPressed(int key, int modifiers)
125	129	{
126	130	System.out.println("KEY PRESSED");
127		- CameraPane.theRenderer.keyPressed(key, modifiers);
	131	+ Globals.theRenderer.keyPressed(key, modifiers);
128	132	}
129	133	*/
130	134
..	..	@@ -136,34 +140,42 @@
136	140	public void closeUI()
137	141	{
138	142	//new Exception().printStackTrace();
139		- System.out.println("this = " + this);
140		- System.out.println("objEditor = " + objEditor);
	143	+// System.out.println("this = " + this);
	144	+// System.out.println("objEditor = " + objEditor);
141	145	//nameField.removeActionListener(this);
142		- objEditor.ctrlPanel.remove(nameField);
	146	+// objEditor.ctrlPanel.remove(nameField);
	147	+
	148	+ objEditor.ctrlPanel.remove(namePanel);
143	149
144	150	if (!GroupEditor.allparams)
145	151	return;
146	152
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);
	153	+// objEditor.ctrlPanel.remove(liveCB);
	154	+// objEditor.ctrlPanel.remove(hideCB);
	155	+// objEditor.ctrlPanel.remove(markCB);
	156	+//
	157	+// objEditor.ctrlPanel.remove(randomCB);
	158	+// objEditor.ctrlPanel.remove(speedupCB);
	159	+// objEditor.ctrlPanel.remove(rewindCB);
	160	+//
	161	+// objEditor.ctrlPanel.remove(resetButton);
	162	+// objEditor.ctrlPanel.remove(stepButton);
	163	+//// objEditor.ctrlPanel.remove(stepAllButton);
	164	+//// objEditor.ctrlPanel.remove(resetAllButton);
	165	+// objEditor.ctrlPanel.remove(link2masterCB);
	166	+// //objEditor.ctrlPanel.remove(flipVCB);
	167	+// //objEditor.ctrlPanel.remove(texresMenu);
	168	+// objEditor.ctrlPanel.remove(slowerButton);
	169	+// objEditor.ctrlPanel.remove(fasterButton);
	170	+// objEditor.ctrlPanel.remove(remarkButton);
165	171
166		- Remove(normalpushField);
	172	+ objEditor.ctrlPanel.remove(setupPanel);
	173	+ objEditor.ctrlPanel.remove(setupPanel2);
	174	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	175	+ objEditor.ctrlPanel.remove(pushPanel);
	176	+ //objEditor.ctrlPanel.remove(fillPanel);
	177	+
	178	+ //Remove(normalpushField);
167	179	}
168	180
169	181	public ObjEditor GetEditor()
..	..	@@ -234,6 +246,7 @@
234	246	//localCopy.parent = null;
235	247
236	248	frame = new JFrame();
	249	+ frame.setUndecorated(true);
237	250	objEditor = this;
238	251	this.callee = callee;
239	252
..	..	@@ -267,24 +280,40 @@
267	280	void SetupMenu()
268	281	{
269	282	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..."));
	283	+ menuBar.add(fileMenu = new Menu("File"));
	284	+ fileMenu.add(newItem = new MenuItem("New"));
	285	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	286	+
	287	+ //oe.menuBar.add(menu = new Menu("Include"));
	288	+ Menu menu = new Menu("Import");
	289	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	290	+ importOBJItem.addActionListener(this);
	291	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	292	+ import3DSItem.addActionListener(this);
	293	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	294	+ importVRMLX3DItem.addActionListener(this);
	295	+ menu.add("-");
	296	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	297	+ importGFDItem.addActionListener(this);
	298	+ fileMenu.add(menu);
	299	+ fileMenu.add("-");
	300	+
	301	+ fileMenu.add(saveItem = new MenuItem("Save"));
	302	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
275	303	//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("-");
	304	+ fileMenu.add("-");
	305	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	306	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	307	+ fileMenu.add("-");
280	308	if (client.parent != null)
281	309	{
282		- windowMenu.add(closeItem = new MenuItem("Close"));
	310	+ fileMenu.add(closeItem = new MenuItem("Close"));
283	311	} else
284	312	{
285		- windowMenu.add(closeItem = new MenuItem("Exit"));
	313	+ fileMenu.add(closeItem = new MenuItem("Exit"));
286	314	}
287	315
	316	+ newItem.addActionListener(this);
288	317	loadItem.addActionListener(this);
289	318	saveItem.addActionListener(this);
290	319	saveAsItem.addActionListener(this);
..	..	@@ -293,79 +322,35 @@
293	322	//povItem.addActionListener(this);
294	323	closeItem.addActionListener(this);
295	324
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(Globals.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	325	objectPanel = new JTabbedPane();
352	326	toolbarPanel = new JPanel();
353	327	toolbarPanel.setName("Toolbar");
354		- treePanel = new JPanel();
	328	+ treePanel = new cGridBag();
355	329	treePanel.setName("Tree");
356		- ctrlPanel = new JPanel(); // new GridBagLayout());
357		- ctrlPanel.setName("Edit");
358		- materialPanel = new JPanel();
	330	+
	331	+ editPanel = new cGridBag().setVertical(true);
	332	+ editPanel.setName("Edit");
	333	+
	334	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	335	+
	336	+ editCommandsPanel = new cGridBag();
	337	+ editPanel.add(editCommandsPanel);
	338	+ editPanel.add(ctrlPanel);
	339	+
	340	+ materialPanel = new cGridBag().setVertical(true);
	341	+
359	342	materialPanel.setName("Material");
360	343	/JTextPane/
361	344	infoarea = createTextPane();
	345	+ doc = infoarea.getStyledDocument();
	346	+
362	347	infoarea.setEditable(true);
363	348	SetText();
364	349	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365	350	// infoarea.setOpaque(false);
366	351	// //infoarea.setForeground(textcolor);
367		- infoarea.setLineWrap(true);
368		- infoarea.setWrapStyleWord(true);
	352	+// TEXTAREA infoarea.setLineWrap(true);
	353	+// TEXTAREA infoarea.setWrapStyleWord(true);
369	354	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370	355	infoPanel.setPreferredSize(new Dimension(50, 200));
371	356	infoPanel.setName("Info");
..	..	@@ -376,16 +361,16 @@
376	361	mainPanel.setName("Main");
377	362	mainPanel.setContinuousLayout(true);
378	363	mainPanel.setOneTouchExpandable(true);
379		- mainPanel.setDividerLocation(1.0);
380	364	mainPanel.setDividerSize(9);
381		- mainPanel.setResizeWeight(0);
	365	+ mainPanel.setDividerLocation(0.5); //1.0);
	366	+ mainPanel.setResizeWeight(0.5);
382	367
383	368	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384	369	//mainPanel.setLayout(new GridBagLayout());
385	370	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386		- treePanel.setLayout(new GridBagLayout());
387		- ctrlPanel.setLayout(new GridBagLayout());
388		- materialPanel.setLayout(new GridBagLayout());
	371	+// treePanel.setLayout(new GridBagLayout());
	372	+ //ctrlPanel.setLayout(new GridBagLayout());
	373	+ //materialPanel.setLayout(new GridBagLayout());
389	374
390	375	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391	376	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -424,7 +409,7 @@
424	409	static String newline = "\n";
425	410	protected static final String buttonString = "JButton";
426	411	StyledDocument doc;
427		- JTextArea infoarea;
	412	+ JTextPane infoarea;
428	413
429	414	void ClearInfo()
430	415	{
..	..	@@ -447,10 +432,10 @@
447	432	e.printStackTrace();
448	433	}
449	434
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();
	435	+// String selection = infoarea.getText();
	436	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	437	+// java.awt.datatransfer.Clipboard clipboard =
	438	+// Toolkit.getDefaultToolkit().getSystemClipboard();
454	439	//clipboard.setContents(data, data);
455	440	}
456	441
..	..	@@ -473,13 +458,13 @@
473	458	//SendInfo("Name:", "bold");
474	459	if (sel.GetTextures() != null \|\| debug)
475	460	{
476		- si.SendInfo(sel.toString(), "bold");
	461	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
477	462	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
478	463	if (sel.Size() > 0)
479	464	{
480	465	si.SendInfo("#children = " + sel.Size(), "regular");
481	466	}
482		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	467	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
483	468	if (debug)
484	469	{
485	470	try
..	..	@@ -491,7 +476,10 @@
491	476	}
492	477
493	478	if (full)
494		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	479	+ {
	480	+ si.SendInfo(" BBox min: " + minima, "regular");
	481	+ si.SendInfo(" BBox max: " + maxima, "regular");
	482	+ }
495	483
496	484	if (sel.bRep != null)
497	485	{
..	..	@@ -518,7 +506,7 @@
518	506	}
519	507	if (sel.support != null)
520	508	{
521		- si.SendInfo(" support: " + sel.support, "regular");
	509	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
522	510	}
523	511	if (sel.scriptnode != null)
524	512	{
..	..	@@ -589,6 +577,9 @@
589	577	{
590	578	CameraPane.pointflow = (PointFlow) sel;
591	579	}
	580	+
	581	+ si.SendInfo("_____________________", "regular");
	582	+ si.SendInfo("", "regular");
592	583	}
593	584	}
594	585
..	..	@@ -604,68 +595,138 @@
604	595	}
605	596	}
606	597
	598	+static GraphicsDevice device = GraphicsEnvironment
	599	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	600	+
	601	+ Rectangle keeprect;
	602	+ cRadio radio;
	603	+
	604	+cButton keepButton;
	605	+ cButton twoButton; // Full 3D
	606	+ cButton sixButton;
	607	+ cButton threeButton;
	608	+ cButton sevenButton;
	609	+ cButton fourButton; // full panel
	610	+ cButton oneButton; // full XYZ
	611	+ //cButton currentLayout;
	612	+
	613	+ boolean maximized;
	614	+
	615	+ void Minimize()
	616	+ {
	617	+ frame.setState(Frame.ICONIFIED);
	618	+ }
	619	+
	620	+ void Maximize()
	621	+ {
	622	+ if (maximized)
	623	+ {
	624	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	625	+ }
	626	+ else
	627	+ {
	628	+ keeprect = frame.getBounds();
	629	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	630	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	631	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	632	+// frame.setState(Frame.MAXIMIZED_BOTH);
	633	+ }
	634	+
	635	+ maximized ^= true;
	636	+ }
	637	+
607	638	void ToggleFullScreen()
608	639	{
609	640	if (CameraPane.FULLSCREEN)
610	641	{
611		- frame.getContentPane().remove(/"Center",/bigThree);
612		- framePanel.add(bigThree);
613		- frame.getContentPane().add(/"Center",/framePanel);
	642	+ device.setFullScreenWindow(null);
	643	+ //frame.setVisible(false);
	644	+// frame.removeNotify();
	645	+// frame.setUndecorated(false);
	646	+// frame.addNotify();
	647	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	648	+
	649	+// X frame.getContentPane().remove(/"Center",/bigThree);
	650	+// X framePanel.add(bigThree);
	651	+// X frame.getContentPane().add(/"Center",/framePanel);
	652	+ framePanel.setDividerLocation(1);
	653	+
	654	+ //frame.setVisible(true);
	655	+ radio.layout = keepButton;
	656	+ //theFrame = null;
	657	+ keepButton = null;
	658	+ radio.layout.doClick();
	659	+
614	660	} else
615	661	{
616		- frame.getContentPane().remove(/"Center",/framePanel);
617		- framePanel.remove(bigThree);
618		- frame.getContentPane().add(/"Center",/bigThree);
	662	+ keepButton = radio.layout;
	663	+ //keeprect = frame.getBounds();
	664	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	665	+// frame.getToolkit().getScreenSize().height);
	666	+ //frame.setVisible(false);
	667	+ device.setFullScreenWindow(frame);
	668	+// frame.removeNotify();
	669	+// frame.setUndecorated(true);
	670	+// frame.addNotify();
	671	+// X frame.getContentPane().remove(/"Center",/framePanel);
	672	+// X framePanel.remove(bigThree);
	673	+// X frame.getContentPane().add(/"Center",/bigThree);
	674	+ framePanel.setDividerLocation(0);
	675	+
	676	+ radio.layout = twoButton;
	677	+ radio.layout.doClick();
	678	+ //frame.setVisible(true);
619	679	}
	680	+
620	681	cameraView.ToggleFullScreen();
621	682	}
622	683
623		- private JTextArea createTextPane()
	684	+ private JTextPane createTextPane()
624	685	{
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		- };
	686	+// TEXTAREA String[] initString =
	687	+// {
	688	+// "This is an editable JTextPane, ", //regular
	689	+// "another ", //italic
	690	+// "styled ", //bold
	691	+// "text ", //small
	692	+// "component, ", //large
	693	+// "which supports embedded components..." + newline,//regular
	694	+// " " + newline, //button
	695	+// "...and embedded icons..." + newline, //regular
	696	+// " ", //icon
	697	+// newline + "JTextPane is a subclass of JEditorPane that "
	698	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	699	+// + "cover methods for interacting with those objects."
	700	+// };
	701	+//
	702	+// String[] initStyles =
	703	+// {
	704	+// "regular", "italic", "bold", "small", "large",
	705	+// "regular", "button", "regular", "icon",
	706	+// "regular"
	707	+// };
	708	+//
	709	+// JTextPane textPane = new JTextPane();
	710	+// textPane.setEditable(true);
	711	+// /StyledDocument/ doc = textPane.getStyledDocument();
	712	+// addStylesToDocument(doc);
	713	+//
	714	+// try
	715	+// {
	716	+// for (int j = 0; j < 2; j++)
	717	+// {
	718	+// for (int i = 0; i < initString.length; i++)
	719	+// {
	720	+// doc.insertString(doc.getLength(), initString[i],
	721	+// doc.getStyle(initStyles[i]));
	722	+// }
	723	+// }
	724	+// } catch (BadLocationException ble)
	725	+// {
	726	+// System.err.println("Couldn't insert initial text into text pane.");
	727	+// }
640	728
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;
	729	+ return new JTextPane(); // textPane;
669	730	}
670	731
671	732	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -718,7 +779,7 @@
718	779	protected static ImageIcon createImageIcon(String path,
719	780	String description)
720	781	{
721		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	782	+ java.net.URL imgURL = Grafreed.class.getResource(path);
722	783	if (imgURL != null)
723	784	{
724	785	return new ImageIcon(imgURL, description);
..	..	@@ -750,6 +811,7 @@
750	811	// NumberSlider vDivsField;
751	812	// JCheckBox endcaps;
752	813	JCheckBox liveCB;
	814	+ JCheckBox selectCB;
753	815	JCheckBox hideCB;
754	816	JCheckBox link2masterCB;
755	817	JCheckBox markCB;
..	..	@@ -765,115 +827,87 @@
765	827	JButton slowerButton;
766	828	JButton fasterButton;
767	829	JButton remarkButton;
	830	+
	831	+ cGridBag editPanel;
	832	+ cGridBag editCommandsPanel;
	833	+
	834	+ cGridBag namePanel;
	835	+ cGridBag setupPanel;
	836	+ cGridBag setupPanel2;
	837	+ cGridBag objectCommandsPanel;
	838	+ cGridBag pushPanel;
	839	+ cGridBag fillPanel;
768	840
769		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	841	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
770	842	{
771	843	JCheckBox cb;
772	844
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);
	845	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
778	846	cb.addItemListener(this);
779		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
780		- oe.aConstraints.gridwidth = 1;
781		- oe.aConstraints.gridx += 1;
782	847
783	848	return cb;
784	849	}
785	850
786		- cButton AddButton(ObjEditor oe, String label)
	851	+ cButton AddButton(cGridBag panel, String label)
787	852	{
788	853	cButton cb;
789	854
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);
	855	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
795	856	cb.addActionListener(this);
796		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
797		- oe.aConstraints.gridwidth = 1;
798		- oe.aConstraints.gridx += 1;
799	857
800	858	return cb;
801	859	}
802	860
803		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	861	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
804	862	{
805	863	JComboBox combo;
806	864
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;
	865	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
810	866	combo.addActionListener(this);
811	867
812	868	return combo;
813	869	}
814	870
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	871	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
816	872	{
817		- NumberSlider combo;
	873	+ cGridBag control = new cGridBag();
	874	+
	875	+ cNumberSlider combo;
818	876
819	877	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	878	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		-
	879	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	880	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	881	combo.setFloat(current);
833		-
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	882	+
	883	+ panel.add(control);
	884	+
	885	+ return control;
839	886	}
840	887
841		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	888	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
842	889	{
843		- NumberSlider combo;
	890	+ cGridBag control = new cGridBag();
	891	+
	892	+ cNumberSlider combo;
844	893
845	894	JLabel jlabel = new JLabel(label);
846		-
847		- aConstraints.fill = GridBagConstraints.VERTICAL;
848	895	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		-
	896	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	897	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	898	combo.setInteger(current);
859	899
860		- combo.label = jlabel;
861		-
862		- combo.addChangeListener(this);
863		-
864		- return combo;
	900	+ panel.add(control);
	901	+
	902	+ return control;
865	903	}
866	904
867		- JTextArea AddText(JPanel ctrlPanel, String name)
	905	+ JTextArea AddText(cGridBag ctrlPanel, String name)
868	906	{
869	907	JTextArea text;
870	908
871		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
872		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	909	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874	910	text.addCaretListener(this);
875		- aConstraints.gridx += 1;
876		- aConstraints.gridwidth = 1;
877	911
878	912	return text;
879	913	}
..	..	@@ -903,9 +937,16 @@
903	937	objEditor.ctrlPanel.remove(j);
904	938	}
905	939
	940	+ void Remove(cNumberSlider j)
	941	+ {
	942	+ j.removeChangeListener(this);
	943	+ //objEditor.ctrlPanel.remove(j.label);
	944	+ objEditor.ctrlPanel.remove(j);
	945	+ }
	946	+
906	947	/*
907	948	*/
908		- void Return() // ObjEditor oe)
	949	+ void Return0() // ObjEditor oe)
909	950	{
910	951	aConstraints.gridy += 1;
911	952	aConstraints.gridx = 0;
..	..	@@ -960,37 +1001,76 @@
960	1001
961	1002	void SetupUI2(ObjEditor oe)
962	1003	{
963		-// oe.aConstraints.weightx = 0;
964		-// oe.aConstraints.weighty = 0;
965		-// oe.aConstraints.gridx = 0;
966		-// oe.aConstraints.gridy = 0;
967		- SetupName(oe);
	1004	+ //SetupName(oe);
	1005	+
	1006	+ namePanel = new cGridBag();
	1007	+
	1008	+ nameField = AddText(namePanel, copy.GetName());
	1009	+ namePanel.add(nameField);
	1010	+ oe.ctrlPanel.add(namePanel);
	1011	+
	1012	+ oe.ctrlPanel.Return();
968	1013
969	1014	if (!GroupEditor.allparams)
970	1015	return;
971	1016
972		- liveCB = AddCheckBox(oe, "Live", copy.live);
973		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1017	+ setupPanel = new cGridBag().setVertical(false);
	1018	+
	1019	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1020	+ liveCB.setToolTipText("Animate object");
	1021	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1022	+ selectCB.setToolTipText("Make object selectable");
975	1023	// 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");
	1024	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1025	+ hideCB.setToolTipText("Hide object");
	1026	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1027	+ markCB.setToolTipText("Set the animation target transform");
	1028	+
	1029	+ setupPanel2 = new cGridBag().setVertical(false);
	1030	+
	1031	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1032	+ rewindCB.setToolTipText("Rewind animation");
	1033	+
	1034	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1035	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1036	+
	1037	+ if (Globals.ADVANCED)
	1038	+ {
	1039	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1040	+ link2masterCB.setToolTipText("Attach to support");
	1041	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1042	+ speedupCB.setToolTipText("Option motion capture");
	1043	+ }
	1044	+
	1045	+ oe.ctrlPanel.add(setupPanel);
	1046	+ oe.ctrlPanel.Return();
	1047	+ oe.ctrlPanel.add(setupPanel2);
	1048	+ oe.ctrlPanel.Return();
	1049	+
	1050	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1051	+
	1052	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1053	+ resetButton.setToolTipText("Jump to frame zero");
	1054	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1055	+ stepButton.setToolTipText("Step one frame");
982	1056	// resetAllButton = AddButton(oe, "Reset All");
983	1057	// stepAllButton = AddButton(oe, "Step All");
984		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
985	1058	// Return();
986		- slowerButton = AddButton(oe, "Slow");
987		- fasterButton = AddButton(oe, "Fast");
988		- remarkButton = AddButton(oe, "Rem");
	1059	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1060	+ slowerButton.setToolTipText("Decrease animation speed");
	1061	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1062	+ fasterButton.setToolTipText("Increase animation speed");
	1063	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1064	+ remarkButton.setToolTipText("Set the current transform as the target");
989	1065
990		- Return();
	1066	+ oe.ctrlPanel.add(objectCommandsPanel);
	1067	+ oe.ctrlPanel.Return();
991	1068
992		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993		- Return();
	1069	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1070	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1071	+ //Return();
	1072	+
	1073	+ oe.ctrlPanel.Return();
994	1074
995	1075	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
996	1076	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1085,7 +1165,7 @@
1085	1165	oe.aConstraints.gridwidth = 1;
1086	1166	/**/
1087	1167	nameField = AddText(oe.ctrlPanel, copy.GetName());
1088		- Return();
	1168	+ oe.ctrlPanel.Return();
1089	1169
1090	1170	//ctrlPanel.add(textureButton = new Button("Texture..."));
1091	1171	//textureButton.setEnabled(false);
..	..	@@ -1187,9 +1267,13 @@
1187	1267	//JPanel worldPanel =
1188	1268	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1189	1269	//worldPanel.setName("World");
1190		- centralPanel = new JPanel(new BorderLayout());
1191		- timelinePanel = new JPanel(new BorderLayout());
1192		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1270	+ centralPanel = new cGridBag();
	1271	+ centralPanel.preferredWidth = 20;
	1272	+
	1273	+ if (Globals.ADVANCED)
	1274	+ {
	1275	+ timelinePanel = new JPanel(new BorderLayout());
	1276	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1193	1277
1194	1278	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195	1279	cameraPanel.setContinuousLayout(true);
..	..	@@ -1198,7 +1282,10 @@
1198	1282	// cameraPanel.setDividerSize(9);
1199	1283	cameraPanel.setResizeWeight(1.0);
1200	1284
	1285	+ }
	1286	+
1201	1287	centralPanel.add(cameraView);
	1288	+ centralPanel.setFocusable(true);
1202	1289	//frame.setJMenuBar(timelineMenubar);
1203	1290	//centralPanel.add(timelinePanel);
1204	1291
..	..	@@ -1217,12 +1304,13 @@
1217	1304	//frontView.object = copy;
1218	1305	//sideView.object = copy;
1219	1306
1220		- XYZPanel = new JPanel();
1221		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1307	+ XYZPanel = new cGridBag().setVertical(true);
	1308	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1222	1309
1223		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1224		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1225		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1310	+ XYZPanel.preferredWidth = 5;
	1311	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1312	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1313	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1226	1314
1227	1315	/*
1228	1316	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1260,10 +1348,11 @@
1260	1348	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1261	1349	//tmp.setName("Edit");
1262	1350	objectPanel.add(materialPanel);
1263		- JPanel north = new JPanel(new BorderLayout());
1264		- north.setName("Edit");
1265		- north.add(ctrlPanel, BorderLayout.NORTH);
1266		- objectPanel.add(north);
	1351	+// JPanel north = new JPanel(new BorderLayout());
	1352	+// north.setName("Edit");
	1353	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1354	+// objectPanel.add(north);
	1355	+ objectPanel.add(editPanel);
1267	1356	objectPanel.add(infoPanel);
1268	1357
1269	1358	/*
..	..	@@ -1284,16 +1373,23 @@
1284	1373	scrollpane.setWheelScrollingEnabled(true);
1285	1374	scrollpane.addMouseWheelListener(this); // Default not fast enough
1286	1375
1287		- /JTabbedPane/ scenePanel = new JTabbedPane();
1288		- scenePanel.add(scrollpane);
	1376	+ /JTabbedPane/ scenePanel = new cGridBag();
	1377	+ scenePanel.preferredWidth = 6;
	1378	+
	1379	+ JTabbedPane tabbedPane = new JTabbedPane();
	1380	+ tabbedPane.add(scrollpane);
1289	1381
1290		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1382	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1291	1383
1292		- optionsPanel = new JPanel(new GridBagLayout());
	1384	+ optionsPanel = new cGridBag().setVertical(true);
1293	1385
1294	1386	optionsPanel.setName("Options");
1295		- scenePanel.add(optionsPanel);
1296		-
	1387	+
	1388	+ AddOptions(optionsPanel); //, aConstraints);
	1389	+
	1390	+ tabbedPane.add(optionsPanel);
	1391	+
	1392	+ scenePanel.add(tabbedPane);
1297	1393
1298	1394	/*
1299	1395	cTree jTree = new cTree(null);
..	..	@@ -1327,6 +1423,7 @@
1327	1423	//bigPanel.setSize(new Dimension(10,10));
1328	1424	//bigPanel.add(ctrlPanel);
1329	1425	//bigPanel.add(gridPanel);
	1426	+ /**
1330	1427	bigThree = new JPanel();
1331	1428	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1332	1429	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1350,7 +1447,13 @@
1350	1447	// aConstraints.gridheight = 3;
1351	1448	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1352	1449	bigThree.add(XYZPanel, aWindowConstraints);
	1450	+ /**/
1353	1451
	1452	+ bigThree = new cGridBag();
	1453	+ bigThree.addComponent(scenePanel);
	1454	+ bigThree.addComponent(centralPanel);
	1455	+ bigThree.addComponent(XYZPanel);
	1456	+
1354	1457	// // SIDE EFFECT!!!
1355	1458	// aConstraints.gridx = 0;
1356	1459	// aConstraints.gridy = 0;
..	..	@@ -1377,9 +1480,11 @@
1377	1480
1378	1481	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1379	1482
1380		- frame.setSize(1024, 768);
1381		- frame.show();
	1483	+ frame.setSize(1280, 860);
	1484	+ frame.setVisible(true);
1382	1485
	1486	+ cameraView.requestFocusInWindow();
	1487	+
1383	1488	gridPanel.setDividerLocation(1.0);
1384	1489
1385	1490	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1393,6 +1498,10 @@
1393	1498	});
1394	1499	}
1395	1500
	1501	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1502	+ {
	1503	+ }
	1504	+
1396	1505	JTree GetTree()
1397	1506	{
1398	1507	return objEditor.jTree;
..	..	@@ -1404,260 +1513,173 @@
1404	1513	ctrlPanel.removeAll();
1405	1514	}
1406	1515
1407		- void SetupMaterial(JPanel ctrlPanel)
	1516	+ void SetupMaterial(cGridBag panel)
1408	1517	{
1409		- aConstraints.weighty = 0;
1410		- //aConstraints.weightx = 1;
1411		- /*
	1518	+ /*
1412	1519	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1413	1520	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1414		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1415		- aConstraints.gridx += 1;
1416	1521	*/
1417	1522
1418		- aConstraints.gridwidth = 1;
1419		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1420		- aConstraints.gridx += 1;
1421		- aConstraints.weighty = 0;
1422		- aConstraints.gridwidth = 1;
	1523	+ cGridBag editBar = new cGridBag().setVertical(false);
	1524	+
	1525	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1526	+ createMaterialButton.setToolTipText("Create material");
1423	1527
1424	1528	/*
1425	1529	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1426		- aConstraints.gridx += 1;
1427		- aConstraints.weighty = 0;
1428		- aConstraints.gridwidth = 1;
1429	1530	*/
1430	1531
1431		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1432		- aConstraints.gridx += 1;
	1532	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1533	+ clearMaterialButton.setToolTipText("Clear material");
	1534	+
	1535	+ if (Globals.ADVANCED)
	1536	+ {
	1537	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1538	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1539	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1540	+ }
1433	1541
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;
	1542	+ editBar.preferredHeight = 15;
	1543	+
	1544	+ panel.add(editBar);
	1545	+
1448	1546	/**/
1449	1547	//aConstraints.weighty = 0;
1450	1548	////aConstraints.weightx = 1;
1451	1549	//aConstraints.weighty = 1;
1452	1550	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1453	1551	//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;
	1552	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1459	1553
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;
	1554	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1555	+
	1556	+ cGridBag color = new cGridBag();
	1557	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1558	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1559	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1560	+ //colorField.preferredWidth = 200;
	1561	+ colorSection.add(color);
1470	1562
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;
	1563	+ cGridBag modulation = new cGridBag();
	1564	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1565	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1566	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1567	+ colorSection.add(modulation);
1480	1568
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;
	1569	+ cGridBag texture = new cGridBag();
	1570	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1571	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1572	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1573	+ colorSection.add(texture);
1490	1574
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;
	1575	+ cGridBag anisoU = new cGridBag();
	1576	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1577	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1578	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1579	+ colorSection.add(anisoU);
1500	1580
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;
	1581	+ cGridBag anisoV = new cGridBag();
	1582	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1583	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1584	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1585	+ colorSection.add(anisoV);
1510	1586
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;
	1587	+ cGridBag shadowbias = new cGridBag();
	1588	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1589	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1590	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1591	+ colorSection.add(shadowbias);
1520	1592
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;
	1593	+ panel.add(new JSeparator());
	1594	+
	1595	+ panel.add(colorSection);
	1596	+
	1597	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1598	+
	1599	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1600	+
	1601	+ cGridBag diffuse = new cGridBag();
	1602	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1603	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1604	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1605	+ diffuseSection.add(diffuse);
1529	1606
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;
	1607	+ cGridBag diffuseness = new cGridBag();
	1608	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1609	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1610	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1611	+ diffuseSection.add(diffuseness);
1539	1612
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;
	1613	+ cGridBag selfshadow = new cGridBag();
	1614	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1615	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1616	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1617	+ diffuseSection.add(selfshadow);
1549	1618
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;
	1619	+ cGridBag sheen = new cGridBag();
	1620	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1621	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1622	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1623	+ diffuseSection.add(sheen);
1559	1624
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;
	1625	+ cGridBag subsurface = new cGridBag();
	1626	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1627	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1628	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1629	+ diffuseSection.add(subsurface);
1569	1630
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;
	1631	+ cGridBag shadow = new cGridBag();
	1632	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1633	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1634	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1635	+ diffuseSection.add(shadow);
1579	1636
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;
	1637	+ cGridBag fakedepth = new cGridBag();
	1638	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1639	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1640	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1641	+ diffuseSection.add(fakedepth);
1589	1642
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;
	1643	+ panel.add(new JSeparator());
	1644	+
	1645	+ panel.add(diffuseSection);
	1646	+
	1647	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1648	+
	1649	+ cGridBag specularSection = new cGridBag().setVertical(true);
1599	1650
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;
	1651	+ cGridBag specular = new cGridBag();
	1652	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1653	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1654	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1655	+ specularSection.add(specular);
1608	1656
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;
	1657	+ cGridBag lightarea = new cGridBag();
	1658	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1659	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1660	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1661	+ specularSection.add(lightarea);
1618	1662
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;
	1663	+ cGridBag shininess = new cGridBag();
	1664	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1665	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1666	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1667	+ specularSection.add(shininess);
1628	1668
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;
	1669	+ cGridBag metalness = new cGridBag();
	1670	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1671	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1672	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1673	+ specularSection.add(metalness);
1638	1674
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;
	1675	+ cGridBag velvet = new cGridBag();
	1676	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1677	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1678	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1679	+ specularSection.add(velvet);
1648	1680
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();
	1681	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1682	+ //Return();
1661	1683	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1662	1684	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663	1685	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1668,130 +1690,93 @@
1668	1690	// aConstraints.gridy += 1;
1669	1691	// aConstraints.gridwidth = 1;
1670	1692
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	1693
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;
	1694	+ panel.add(new JSeparator());
	1695	+
	1696	+ panel.add(specularSection);
	1697	+
	1698	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1699	+
	1700	+ cGridBag globalSection = new cGridBag().setVertical(true);
1689	1701
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;
	1702	+ cGridBag camera = new cGridBag();
	1703	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1704	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1705	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1706	+ globalSection.add(camera);
1699	1707
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;
	1708	+ cGridBag ambient = new cGridBag();
	1709	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1710	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1711	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1712	+ globalSection.add(ambient);
1709	1713
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;
	1714	+ cGridBag backlit = new cGridBag();
	1715	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1716	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1717	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1718	+ globalSection.add(backlit);
1720	1719
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;
	1720	+ cGridBag opacity = new cGridBag();
	1721	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1722	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1723	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1724	+ globalSection.add(opacity);
1730	1725
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;
	1726	+ panel.add(new JSeparator());
	1727	+
	1728	+ panel.add(globalSection);
	1729	+
	1730	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1731	+
	1732	+ cGridBag textureSection = new cGridBag().setVertical(true);
1740	1733
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;
	1734	+ cGridBag bump = new cGridBag();
	1735	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1736	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1737	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1738	+ textureSection.add(bump);
1750	1739
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;
	1740	+ cGridBag noise = new cGridBag();
	1741	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1742	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1743	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1744	+ textureSection.add(noise);
1760	1745
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;
	1746	+ cGridBag power = new cGridBag();
	1747	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1748	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1749	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1750	+ textureSection.add(power);
1770	1751
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;
	1752	+ cGridBag borderfade = new cGridBag();
	1753	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1754	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1755	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1756	+ textureSection.add(borderfade);
1780	1757
1781		- //aConstraints.weighty = 1;
1782		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1783		- //aConstraints.gridx += 1;
1784		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1785		- aConstraints.weighty = 0;
	1758	+ cGridBag fog = new cGridBag();
	1759	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1760	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1761	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1762	+ textureSection.add(fog);
1786	1763
1787		- aConstraints.gridx = 0;
1788		- aConstraints.gridy = 0;
1789		- aConstraints.gridwidth = 1;
	1764	+ cGridBag opacityPower = new cGridBag();
	1765	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1766	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1767	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1768	+ textureSection.add(opacityPower);
	1769	+
	1770	+ panel.add(new JSeparator());
	1771	+
	1772	+ panel.add(textureSection);
	1773	+
	1774	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1790	1775
1791	1776	SetMaterial(copy); // .GetMaterial());
1792	1777
1793		- colorField.addChangeListener(this);
1794		- modulationField.addChangeListener(this);
	1778	+ //colorField.addChangeListener(this);
	1779	+// modulationField.addChangeListener(this);
1795	1780	metalnessField.addChangeListener(this);
1796	1781	diffuseField.addChangeListener(this);
1797	1782	specularField.addChangeListener(this);
..	..	@@ -1821,12 +1806,15 @@
1821	1806	opacityPowerField.addChangeListener(this);
1822	1807	/**/
1823	1808
1824		- resetSlidersButton.addActionListener(this);
1825	1809	clearMaterialButton.addActionListener(this);
1826	1810	createMaterialButton.addActionListener(this);
1827		-
1828		- propagateToggle.addItemListener(this);
1829		- multiplyToggle.addItemListener(this);
	1811	+
	1812	+ if (Globals.ADVANCED)
	1813	+ {
	1814	+ resetSlidersButton.addActionListener(this);
	1815	+ propagateToggle.addItemListener(this);
	1816	+ multiplyToggle.addItemListener(this);
	1817	+ }
1830	1818	}
1831	1819
1832	1820	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1997,7 +1985,7 @@
1997	1985
1998	1986	//? flashIt = false;
1999	1987	CameraPane pane = (CameraPane) cameraView;
2000		- pane.clickStart(location.x, location.y, 0);
	1988	+ pane.clickStart(location.x, location.y, 0, 0);
2001	1989	pane.clickEnd(location.x, location.y, 0, true);
2002	1990
2003	1991	if (group.selection.size() == 1)
..	..	@@ -2046,6 +2034,7 @@
2046	2034	e2.printStackTrace();
2047	2035	}
2048	2036	}
	2037	+
2049	2038	LoadJMEThread loadThread;
2050	2039
2051	2040	class LoadJMEThread extends Thread
..	..	@@ -2103,6 +2092,7 @@
2103	2092	//LoadFile0(filename, converter);
2104	2093	}
2105	2094	}
	2095	+
2106	2096	LoadOBJThread loadObjThread;
2107	2097
2108	2098	class LoadOBJThread extends Thread
..	..	@@ -2181,19 +2171,19 @@
2181	2171
2182	2172	void LoadObjFile(String fullname)
2183	2173	{
2184		- /*
	2174	+ System.out.println("Loading " + fullname);
	2175	+ /**/
2185	2176	//lastFilename = fullname;
2186	2177	if(loadObjThread == null)
2187	2178	{
2188		- loadObjThread = new LoadOBJThread();
2189		- loadObjThread.start();
	2179	+ loadObjThread = new LoadOBJThread();
	2180	+ loadObjThread.start();
2190	2181	}
2191	2182
2192	2183	loadObjThread.add(fullname);
2193		- */
	2184	+ /**/
2194	2185
2195		- System.out.println("Loading " + fullname);
2196		- makeSomething(new FileObject(fullname, true), true);
	2186	+ //makeSomething(new FileObject(fullname, true), true);
2197	2187	}
2198	2188
2199	2189	void LoadGFDFile(String fullname)
..	..	@@ -2454,11 +2444,11 @@
2454	2444
2455	2445	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2456	2446	{
2457		- if (GrafreeD.standAlone)
	2447	+ if (Grafreed.standAlone)
2458	2448	{
2459	2449	/**/
2460	2450	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2461		- browser.show();
	2451	+ browser.setVisible(true);
2462	2452	String filename = browser.getFile();
2463	2453	if (filename != null && filename.length() > 0)
2464	2454	{
..	..	@@ -2603,6 +2593,7 @@
2603	2593	}
2604	2594	if (input == null)
2605	2595	{
	2596	+ new Exception().printStackTrace();
2606	2597	System.exit(0);
2607	2598	}
2608	2599
..	..	@@ -2817,7 +2808,8 @@
2817	2808	return;
2818	2809	}
2819	2810
2820		- multiplyToggle.setSelected(mat.multiply);
	2811	+ if (multiplyToggle != null)
	2812	+ multiplyToggle.setSelected(mat.multiply);
2821	2813
2822	2814	assert (object.projectedVertices != null);
2823	2815
..	..	@@ -3032,9 +3024,9 @@
3032	3024	frame.validate();
3033	3025
3034	3026	return;
3035		- } else if (event.getSource() == toggleRandomItem)
	3027	+ } else if (event.getSource() == toggleSwitchItem)
3036	3028	{
3037		- cameraView.ToggleRandom();
	3029	+ cameraView.ToggleSwitch();
3038	3030	cameraView.repaint();
3039	3031	return;
3040	3032	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3063,6 +3055,10 @@
3063	3055	{
3064	3056	copy.live ^= true;
3065	3057	return;
	3058	+ } else if (event.getSource() == selectCB)
	3059	+ {
	3060	+ copy.dontselect ^= true;
	3061	+ return;
3066	3062	} else if (event.getSource() == hideCB)
3067	3063	{
3068	3064	copy.hide ^= true;
..	..	@@ -3077,6 +3073,7 @@
3077	3073	if (event.getSource() == randomCB)
3078	3074	{
3079	3075	copy.random ^= true;
	3076	+ objEditor.refreshContents();
3080	3077	return;
3081	3078	}
3082	3079	if (event.getSource() == speedupCB)
..	..	@@ -3100,8 +3097,9 @@
3100	3097
3101	3098	public void actionPerformed(ActionEvent event)
3102	3099	{
	3100	+ Object source = event.getSource();
3103	3101	// SCRIPT DIALOG
3104		- if (event.getSource() == okbutton)
	3102	+ if (source == okbutton)
3105	3103	{
3106	3104	textpanel.setVisible(false);
3107	3105	textpanel.remove(textarea);
..	..	@@ -3113,7 +3111,7 @@
3113	3111	textarea = null;
3114	3112	textpanel = null;
3115	3113	}
3116		- if (event.getSource() == cancelbutton)
	3114	+ if (source == cancelbutton)
3117	3115	{
3118	3116	textpanel.setVisible(false);
3119	3117	textpanel.remove(textarea);
..	..	@@ -3125,50 +3123,50 @@
3125	3123	//applySelf();
3126	3124	//client.refreshEditWindow();
3127	3125	//refreshContents();
3128		- if (event.getSource() == nameField)
	3126	+ if (source == nameField)
3129	3127	{
3130	3128	//System.out.println("ObjEditor " + event);
3131	3129	applySelf0(true);
3132	3130	//parent.applySelf();
3133	3131	objEditor.refreshContents();
3134		- } else if (event.getSource() == resetButton)
	3132	+ } else if (source == resetButton)
3135	3133	{
3136	3134	CameraPane.fullreset = true;
3137	3135	copy.Reset(); // ResetMeshes();
3138	3136	copy.Touch();
3139	3137	objEditor.refreshContents();
3140		- } else if (event.getSource() == stepItem)
	3138	+ } else if (source == stepItem)
3141	3139	{
3142	3140	//cameraView.ONESTEP = true;
3143	3141	Globals.ONESTEP = true;
3144	3142	cameraView.repaint();
3145	3143	return;
3146		- } else if (event.getSource() == stepButton)
	3144	+ } else if (source == stepButton)
3147	3145	{
3148	3146	copy.Step();
3149	3147	copy.Touch();
3150	3148	objEditor.refreshContents();
3151		- } else if (event.getSource() == slowerButton)
	3149	+ } else if (source == slowerButton)
3152	3150	{
3153	3151	copy.Slower();
3154	3152	copy.Touch();
3155	3153	objEditor.refreshContents();
3156		- } else if (event.getSource() == fasterButton)
	3154	+ } else if (source == fasterButton)
3157	3155	{
3158	3156	copy.Faster();
3159	3157	copy.Touch();
3160	3158	objEditor.refreshContents();
3161		- } else if (event.getSource() == remarkButton)
	3159	+ } else if (source == remarkButton)
3162	3160	{
3163	3161	copy.Remark();
3164	3162	copy.Touch();
3165	3163	objEditor.refreshContents();
3166		- } else if (event.getSource() == stepAllButton)
	3164	+ } else if (source == stepAllButton)
3167	3165	{
3168	3166	copy.StepAll();
3169	3167	copy.Touch();
3170	3168	objEditor.refreshContents();
3171		- } else if (event.getSource() == resetAllButton)
	3169	+ } else if (source == resetAllButton)
3172	3170	{
3173	3171	//CameraPane.fullreset = true;
3174	3172	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3201,53 +3199,75 @@
3201	3199	// Close();
3202	3200	// }
3203	3201	// else
3204		- if (event.getSource() == resetSlidersButton)
	3202	+ if (source == resetSlidersButton)
3205	3203	{
3206	3204	ResetSliders();
3207		- } else if (event.getSource() == clearMaterialButton)
	3205	+ } else if (source == clearMaterialButton)
3208	3206	{
3209	3207	ClearMaterial();
3210		- } else if (event.getSource() == createMaterialButton)
	3208	+ } else if (source == createMaterialButton)
3211	3209	{
3212	3210	CreateMaterial();
3213		- } else if (event.getSource() == clearPanelButton)
	3211	+ } else if (source == clearPanelButton)
3214	3212	{
3215	3213	copy.ClearUI();
3216	3214	refreshContents(true);
3217		- } /*
3218		- }
3219		-
3220		- public boolean action(Event event, Object arg)
3221		- {
3222		- */ else if (event.getSource() == closeItem)
	3215	+ } else if (source == importGFDItem)
	3216	+ {
	3217	+ ImportGFD();
	3218	+ } else
	3219	+ if (source == importVRMLX3DItem)
	3220	+ {
	3221	+ ImportVRMLX3D();
	3222	+ } else
	3223	+ if (source == import3DSItem)
	3224	+ {
	3225	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3226	+ } else
	3227	+ if (source == importOBJItem)
	3228	+ {
	3229	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3230	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3231	+ browser.setVisible(true);
	3232	+ String filename = browser.getFile();
	3233	+ if (filename != null && filename.length() > 0)
	3234	+ {
	3235	+ String fullname = browser.getDirectory() + filename;
	3236	+ makeSomething(ReadOBJ(fullname), true);
	3237	+ }
	3238	+ } else
	3239	+ if (source == closeItem)
3223	3240	{
3224	3241	Close();
3225	3242	//return true;
3226		- } else if (event.getSource() == loadItem)
	3243	+ } else if (source == loadItem)
3227	3244	{
3228	3245	load();
3229	3246	//return true;
3230		- } else if (event.getSource() == saveItem)
	3247	+ } else if (source == newItem)
	3248	+ {
	3249	+ New();
	3250	+ } else if (source == saveItem)
3231	3251	{
3232	3252	save();
3233	3253	//return true;
3234		- } else if (event.getSource() == saveAsItem)
	3254	+ } else if (source == saveAsItem)
3235	3255	{
3236	3256	saveAs();
3237	3257	//return true;
3238		- } else if (event.getSource() == reexportItem)
	3258	+ } else if (source == reexportItem)
3239	3259	{
3240	3260	reexport();
3241	3261	//return true;
3242		- } else if (event.getSource() == exportAsItem)
	3262	+ } else if (source == exportAsItem)
3243	3263	{
3244	3264	export();
3245	3265	//return true;
3246		- } else if (event.getSource() == povItem)
	3266	+ } else if (source == povItem)
3247	3267	{
3248	3268	generatePOV();
3249	3269	//return true;
3250		- } else if (event.getSource() == zBufferItem)
	3270	+ } else if (source == zBufferItem)
3251	3271	{
3252	3272	try
3253	3273	{
..	..	@@ -3269,21 +3289,8 @@
3269	3289	cameraView.repaint();
3270	3290	//return true;
3271	3291	}
3272		- */ else if (event.getSource() == editCameraItem)
3273		- {
3274		- cameraView.ProtectCamera();
3275		- cameraView.repaint();
3276		- return;
3277		- } else if (event.getSource() == revertCameraItem)
3278		- {
3279		- cameraView.RevertCamera();
3280		- cameraView.repaint();
3281		- return;
3282		-// } else if (event.getSource() == textureButton)
3283		-// {
3284		-// return; // true;
3285		- } else // combos...
3286		- if (event.getSource() == texresMenu)
	3292	+ */ else // combos...
	3293	+ if (source == texresMenu)
3287	3294	{
3288	3295	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3289	3296	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3295,27 +3302,283 @@
3295	3302	}
3296	3303	}
3297	3304
3298		- void ToggleAnimation()
	3305	+ void New()
3299	3306	{
3300		- if (!CameraPane.ANIMATION)
	3307	+ while (copy.Size() > 1)
3301	3308	{
3302		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3309	+ copy.remove(1);
	3310	+ }
	3311	+
	3312	+ ResetModel();
	3313	+ objEditor.refreshContents();
	3314	+ }
	3315	+
	3316	+ static public byte[] Compress(Object3D o)
	3317	+ {
	3318	+ try
	3319	+ {
	3320	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3321	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3322	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3323	+
	3324	+ Object3D parent = o.parent;
	3325	+ o.parent = null;
	3326	+
	3327	+ out.writeObject(o);
	3328	+
	3329	+ o.parent = parent;
	3330	+
	3331	+ out.flush();
	3332	+
	3333	+ zstream.close();
	3334	+ out.close();
	3335	+
	3336	+ return baos.toByteArray();
	3337	+ } catch (Exception e)
	3338	+ {
	3339	+ System.err.println(e);
	3340	+ return null;
	3341	+ }
	3342	+ }
	3343	+
	3344	+ static public Object Uncompress(byte[] bytes)
	3345	+ {
	3346	+ System.out.println("#bytes = " + bytes.length);
	3347	+ try
	3348	+ {
	3349	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3350	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3351	+ ObjectInputStream in = new ObjectInputStream(istream);
	3352	+ Object obj = in.readObject();
	3353	+ in.close();
	3354	+
	3355	+ return obj;
	3356	+ } catch (Exception e)
	3357	+ {
	3358	+ System.err.println(e);
	3359	+ return null;
	3360	+ }
	3361	+ }
	3362	+
	3363	+ static public Object clone(Object o)
	3364	+ {
	3365	+ try
	3366	+ {
	3367	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3368	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3369	+
	3370	+ out.writeObject(o);
	3371	+
	3372	+ out.flush();
	3373	+ out.close();
	3374	+
	3375	+ byte[] bytes = baos.toByteArray();
	3376	+
	3377	+ System.out.println("clone = " + bytes.length);
	3378	+
	3379	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3380	+ ObjectInputStream in = new ObjectInputStream(bais);
	3381	+ Object obj = in.readObject();
	3382	+ in.close();
	3383	+
	3384	+ return obj;
	3385	+ } catch (Exception e)
	3386	+ {
	3387	+ System.err.println(e);
	3388	+ return null;
	3389	+ }
	3390	+ }
	3391	+
	3392	+ cRadio GetCurrentTab()
	3393	+ {
	3394	+ cRadio ab;
	3395	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3396	+ {
	3397	+ ab = (cRadio)e.nextElement();
	3398	+ if(ab.GetObject() == copy)
	3399	+ {
	3400	+ return ab;
	3401	+ }
	3402	+ }
	3403	+
	3404	+ return null;
	3405	+ }
	3406	+
	3407	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3408	+
	3409	+ public void Save()
	3410	+ {
	3411	+ cRadio tab = GetCurrentTab();
	3412	+
	3413	+ boolean temp = CameraPane.SWITCH;
	3414	+ CameraPane.SWITCH = false;
	3415	+
	3416	+ copy.ExtractBigData(hashtable);
	3417	+
	3418	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3419	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3420	+
	3421	+ copy.RestoreBigData(hashtable);
	3422	+
	3423	+ CameraPane.SWITCH = temp;
	3424	+
	3425	+ //assert(hashtable.isEmpty());
	3426	+
	3427	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3428	+ {
	3429	+ tab.graphs[i] = null;
	3430	+ }
	3431	+
	3432	+ // test save
	3433	+ if (false)
	3434	+ {
	3435	+ try
	3436	+ {
	3437	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3438	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3439	+
	3440	+ p.writeObject(copy);
	3441	+
	3442	+ p.flush();
	3443	+
	3444	+ ostream.close();
	3445	+ } catch (Exception e)
	3446	+ {
	3447	+ e.printStackTrace();
	3448	+ }
	3449	+ }
	3450	+ }
	3451	+
	3452	+ void CopyChanged(Object3D obj)
	3453	+ {
	3454	+ boolean temp = CameraPane.SWITCH;
	3455	+ CameraPane.SWITCH = false;
	3456	+
	3457	+ copy.ExtractBigData(hashtable);
	3458	+
	3459	+ copy.clear();
	3460	+
	3461	+ for (int i=0; i<obj.Size(); i++)
	3462	+ {
	3463	+ copy.add(obj.get(i));
	3464	+ }
	3465	+
	3466	+ copy.RestoreBigData(hashtable);
	3467	+
	3468	+ CameraPane.SWITCH = temp;
	3469	+
	3470	+ //assert(hashtable.isEmpty());
	3471	+
	3472	+ copy.Touch();
	3473	+
	3474	+ ResetModel();
	3475	+ copy.HardTouch(); // recompile?
	3476	+
	3477	+ cRadio ab;
	3478	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3479	+ {
	3480	+ ab = (cRadio)e.nextElement();
	3481	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3482	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3483	+ if (test != null)
	3484	+ {
	3485	+ test.editWindow = ab.object.editWindow;
	3486	+ ab.object = test;
	3487	+ }
	3488	+ }
	3489	+
	3490	+ refreshContents();
	3491	+ }
	3492	+
	3493	+ public void Undo()
	3494	+ {
	3495	+ cRadio tab = GetCurrentTab();
	3496	+
	3497	+ if (tab.undoindex == 0)
	3498	+ {
	3499	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3500	+ return;
	3501	+ }
	3502	+
	3503	+ if (tab.graphs[tab.undoindex] == null)
	3504	+ {
	3505	+ Save();
	3506	+ tab.undoindex -= 1;
	3507	+ }
	3508	+
	3509	+ tab.undoindex -= 1;
	3510	+
	3511	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3512	+ }
	3513	+
	3514	+ public void Redo()
	3515	+ {
	3516	+ cRadio tab = GetCurrentTab();
	3517	+
	3518	+ if (tab.graphs[tab.undoindex + 1] == null)
	3519	+ {
	3520	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3521	+ return;
	3522	+ }
	3523	+
	3524	+ tab.undoindex += 1;
	3525	+
	3526	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3527	+ }
	3528	+
	3529	+ void ImportGFD()
	3530	+ {
	3531	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3303	3532	browser.show();
3304	3533	String filename = browser.getFile();
3305	3534	if (filename != null && filename.length() > 0)
3306	3535	{
3307		- CameraPane.filename = browser.getDirectory() + filename;
	3536	+ String fullname = browser.getDirectory() + filename;
	3537	+
	3538	+ //Object3D readobj =
	3539	+ objEditor.ReadGFD(fullname, objEditor);
	3540	+ //makeSomething(readobj);
	3541	+ }
	3542	+ }
	3543	+
	3544	+ void ImportVRMLX3D()
	3545	+ {
	3546	+ if (Grafreed.standAlone)
	3547	+ {
	3548	+ /**/
	3549	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3550	+ browser.show();
	3551	+ String filename = browser.getFile();
	3552	+ if (filename != null && filename.length() > 0)
	3553	+ {
	3554	+ String fullname = browser.getDirectory() + filename;
	3555	+ LoadVRMLX3D(fullname);
	3556	+ }
	3557	+ /**/
	3558	+ }
	3559	+ }
	3560	+
	3561	+ void ToggleAnimation()
	3562	+ {
	3563	+ if (!Globals.ANIMATION)
	3564	+ {
	3565	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3566	+ browser.setVisible(true);
	3567	+ String filename = browser.getFile();
	3568	+ if (filename != null && filename.length() > 0)
	3569	+ {
	3570	+ Globals.filename = browser.getDirectory() + filename;
3308	3571	//CameraPane.framecount = 0;
3309		- CameraPane.imagecount = 0;
	3572	+ Globals.imagecount = 0;
3310	3573
3311		- CameraPane.ANIMATION ^= true;
	3574	+ Globals.ANIMATION ^= true;
3312	3575
3313		- GrafreeD.wav.cursor = 0;
3314		- GrafreeD.wav.loop = 0;
	3576	+ Grafreed.wav.cursor = 0;
	3577	+ Grafreed.wav.loop = 0;
3315	3578	}
3316	3579	} else
3317	3580	{
3318		- CameraPane.ANIMATION ^= true;
	3581	+ Globals.ANIMATION ^= true;
3319	3582	}
3320	3583	}
3321	3584
..	..	@@ -3361,7 +3624,7 @@
3361	3624	void CreateMaterial()
3362	3625	{
3363	3626	//copy.ClearMaterial(); // PATCH
3364		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3627	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3365	3628	if (copy.selection.size() > 0)
3366	3629	//SetMaterial(copy);
3367	3630	{
..	..	@@ -3420,11 +3683,11 @@
3420	3683	{
3421	3684	copy.ResetBlockLoop(); // temporary problem
3422	3685
3423		- boolean random = CameraPane.RANDOM;
3424		- CameraPane.RANDOM = false; // parse everything
	3686	+ boolean random = CameraPane.SWITCH;
	3687	+ CameraPane.SWITCH = false; // parse everything
3425	3688	copy.ResetDisplayList();
3426	3689	copy.HardTouch();
3427		- CameraPane.RANDOM = random;
	3690	+ CameraPane.SWITCH = random;
3428	3691	}
3429	3692
3430	3693	// public void applySelf()
..	..	@@ -3494,10 +3757,40 @@
3494	3757	current.fakedepth = (float) fakedepthField.getFloat();
3495	3758	current.shadowbias = (float) shadowbiasField.getFloat();
3496	3759
3497		- if (!NumberSlider.frozen)
	3760	+ if (!cNumberSlider.frozen)
3498	3761	{
3499	3762	//System.out.println("Propagate = " + propagate);
3500	3763	copy.UpdateMaterial(anchor, current, propagate);
	3764	+
	3765	+ if (copy.material != null)
	3766	+ {
	3767	+ cMaterial mat = copy.material;
	3768	+
	3769	+ colorField.SetToolTipValue((mat.color));
	3770	+ modulationField.SetToolTipValue((mat.modulation));
	3771	+ metalnessField.SetToolTipValue((mat.metalness));
	3772	+ diffuseField.SetToolTipValue((mat.diffuse));
	3773	+ specularField.SetToolTipValue((mat.specular));
	3774	+ shininessField.SetToolTipValue((mat.shininess));
	3775	+ shiftField.SetToolTipValue((mat.shift));
	3776	+ ambientField.SetToolTipValue((mat.ambient));
	3777	+ lightareaField.SetToolTipValue((mat.lightarea));
	3778	+ diffusenessField.SetToolTipValue((mat.factor));
	3779	+ velvetField.SetToolTipValue((mat.velvet));
	3780	+ sheenField.SetToolTipValue((mat.sheen));
	3781	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3782	+ backlitField.SetToolTipValue((mat.bump));
	3783	+ anisoField.SetToolTipValue((mat.aniso));
	3784	+ anisoVField.SetToolTipValue((mat.anisoV));
	3785	+ cameraField.SetToolTipValue((mat.cameralight));
	3786	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3787	+ shadowField.SetToolTipValue((mat.shadow));
	3788	+ textureField.SetToolTipValue((mat.texture));
	3789	+ opacityField.SetToolTipValue((mat.opacity));
	3790	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3791	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3792	+ }
	3793	+
3501	3794	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3502	3795	{
3503	3796	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3542,6 +3835,7 @@
3542	3835	\|\| e.getSource() == apertureField
3543	3836	\|\| e.getSource() == shadowblurField)
3544	3837	{
	3838	+ new Exception().printStackTrace();
3545	3839	System.exit(0);
3546	3840	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3547	3841	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3612,7 +3906,7 @@
3612	3906	}
3613	3907
3614	3908	if (normalpushField != null)
3615		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3909	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3616	3910	}
3617	3911
3618	3912	void SnapObject()
..	..	@@ -3867,7 +4161,7 @@
3867	4161
3868	4162	radioPanel.revalidate();
3869	4163	radioPanel.repaint();
3870		- ctrlPanel.revalidate(); // ? new
	4164	+ ctrlPanel.validate(); // ? new
3871	4165	ctrlPanel.repaint();
3872	4166	}
3873	4167	}
..	..	@@ -3876,6 +4170,7 @@
3876	4170
3877	4171	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3878	4172	{
	4173	+ Save();
3879	4174	//Tween.set(thing, 0).target(1).start(tweenManager);
3880	4175	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3881	4176	// if (thing instanceof GenericJointDemo)
..	..	@@ -4079,6 +4374,7 @@
4079	4374	}
4080	4375	}
4081	4376	}
	4377	+
4082	4378	LoadGFDThread loadGFDThread;
4083	4379
4084	4380	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4098,8 +4394,10 @@
4098	4394
4099	4395	try
4100	4396	{
	4397	+ // Try compressed version first.
4101	4398	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4102		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4399	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4400	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4103	4401
4104	4402	readobj = (Object3D) p.readObject();
4105	4403	istream.close();
..	..	@@ -4107,7 +4405,20 @@
4107	4405	readobj.ResetDisplayList();
4108	4406	} catch (Exception e)
4109	4407	{
4110		- e.printStackTrace();
	4408	+ //e.printStackTrace();
	4409	+ try
	4410	+ {
	4411	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4412	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4413	+
	4414	+ readobj = (Object3D) p.readObject();
	4415	+ istream.close();
	4416	+
	4417	+ readobj.ResetDisplayList();
	4418	+ } catch (Exception e2)
	4419	+ {
	4420	+ e2.printStackTrace();
	4421	+ }
4111	4422	}
4112	4423	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4113	4424	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4153,6 +4464,12 @@
4153	4464
4154	4465	void LoadIt(Object obj)
4155	4466	{
	4467	+ if (obj == null)
	4468	+ {
	4469	+ // Invalid file
	4470	+ return;
	4471	+ }
	4472	+
4156	4473	System.out.println("Loaded " + obj);
4157	4474	//new Exception().printStackTrace();
4158	4475	Object3D readobj = (Object3D) obj;
..	..	@@ -4162,6 +4479,7 @@
4162	4479
4163	4480	if (readobj != null)
4164	4481	{
	4482	+ Save();
4165	4483	try
4166	4484	{
4167	4485	//readobj.deepCopySelf(copy);
..	..	@@ -4224,7 +4542,7 @@
4224	4542
4225	4543	void load() // throws ClassNotFoundException
4226	4544	{
4227		- if (GrafreeD.standAlone)
	4545	+ if (Grafreed.standAlone)
4228	4546	{
4229	4547	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4230	4548	browser.show();
..	..	@@ -4311,11 +4629,13 @@
4311	4629	try
4312	4630	{
4313	4631	FileOutputStream ostream = new FileOutputStream(lastname);
4314		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4632	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4633	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4315	4634
4316	4635	p.writeObject(copy);
4317	4636	p.flush();
4318	4637
	4638	+ zstream.close();
4319	4639	ostream.close();
4320	4640
4321	4641	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4325,11 +4645,12 @@
4325	4645	{
4326	4646	}
4327	4647	}
	4648	+
4328	4649	String lastname;
4329	4650
4330	4651	void saveAs()
4331	4652	{
4332		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4333	4654	{
4334	4655	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4335	4656	browser.setVisible(true);
..	..	@@ -4434,13 +4755,13 @@
4434	4755	try
4435	4756	{
4436	4757	FileOutputStream ostream = new FileOutputStream(filename);
4437		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4438		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4758	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4759	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4439	4760
4440	4761	Object3D objectparent = obj.parent;
4441	4762	obj.parent = null;
4442	4763
4443		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4764	+ Object3D object = (Object3D) Grafreed.clone(obj);
4444	4765
4445	4766	obj.parent = objectparent;
4446	4767
..	..	@@ -4452,8 +4773,8 @@
4452	4773	p.writeObject(object);
4453	4774	p.flush();
4454	4775
	4776	+ zstream.close();
4455	4777	ostream.close();
4456		- // zstream.close();
4457	4778
4458	4779	// group.selection.get(0).parent = parent;
4459	4780	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4474,7 +4795,7 @@
4474	4795	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4475	4796	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4476	4797	copy.generatePOV(buffer);
4477		- if (GrafreeD.standAlone)
	4798	+ if (Grafreed.standAlone)
4478	4799	{
4479	4800	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4480	4801	browser.show();
..	..	@@ -4500,7 +4821,8 @@
4500	4821	Object3D client;
4501	4822	Object3D copy;
4502	4823	MenuBar menuBar;
4503		- Menu windowMenu;
	4824	+ Menu fileMenu;
	4825	+ MenuItem newItem;
4504	4826	MenuItem loadItem;
4505	4827	MenuItem saveItem;
4506	4828	MenuItem saveAsItem;
..	..	@@ -4508,13 +4830,11 @@
4508	4830	MenuItem reexportItem;
4509	4831	MenuItem povItem;
4510	4832	MenuItem closeItem;
4511		- Menu cameraMenu;
	4833	+
4512	4834	CheckboxMenuItem zBufferItem;
4513	4835	//MenuItem normalLensItem;
4514		- MenuItem editCameraItem;
4515		- MenuItem revertCameraItem;
4516		- CheckboxMenuItem toggleLiveItem;
4517	4836	MenuItem stepItem;
	4837	+ CheckboxMenuItem toggleLiveItem;
4518	4838	CheckboxMenuItem toggleFullScreenItem;
4519	4839	CheckboxMenuItem toggleTimelineItem;
4520	4840	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4523,7 +4843,7 @@
4523	4843	CheckboxMenuItem toggleFootContactItem;
4524	4844	CheckboxMenuItem toggleDLItem;
4525	4845	CheckboxMenuItem toggleTextureItem;
4526		- CheckboxMenuItem toggleRandomItem;
	4846	+ CheckboxMenuItem toggleSwitchItem;
4527	4847	CheckboxMenuItem toggleRootItem;
4528	4848	CheckboxMenuItem animationItem;
4529	4849	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4531,20 +4851,20 @@
4531	4851	JSplitPane mainPanel;
4532	4852	JScrollPane scrollpane;
4533	4853	JPanel toolbarPanel;
4534		- JPanel treePanel;
	4854	+ cGridBag treePanel;
4535	4855	JPanel radioPanel;
4536	4856	ButtonGroup buttonGroup;
4537		- JPanel ctrlPanel;
4538		- JPanel materialPanel;
	4857	+ cGridBag ctrlPanel;
	4858	+ cGridBag materialPanel;
4539	4859	JScrollPane infoPanel;
4540		- JPanel optionsPanel;
	4860	+ cGridBag optionsPanel;
4541	4861	JTabbedPane objectPanel;
4542		- JPanel XYZPanel;
	4862	+ cGridBag XYZPanel;
4543	4863	JSplitPane gridPanel;
4544	4864	JSplitPane bigPanel;
4545		- JPanel bigThree;
4546		- JTabbedPane scenePanel;
4547		- JPanel centralPanel;
	4865	+ cGridBag bigThree;
	4866	+ cGridBag scenePanel;
	4867	+ cGridBag centralPanel;
4548	4868	JSplitPane cameraPanel;
4549	4869	JPanel timelinePanel;
4550	4870	JMenuBar timelineMenubar;
..	..	@@ -4597,67 +4917,72 @@
4597	4917	// MATERIAL
4598	4918	JLabel materialLabel;
4599	4919	JLabel colorLabel;
4600		- NumberSlider colorField;
	4920	+ cNumberSlider colorField;
4601	4921	JLabel modulationLabel;
4602		- NumberSlider modulationField;
	4922	+ cNumberSlider modulationField;
4603	4923	JLabel metalnessLabel;
4604		- NumberSlider metalnessField;
	4924	+ cNumberSlider metalnessField;
4605	4925	JLabel diffuseLabel;
4606		- NumberSlider diffuseField;
	4926	+ cNumberSlider diffuseField;
4607	4927	JLabel specularLabel;
4608		- NumberSlider specularField;
	4928	+ cNumberSlider specularField;
4609	4929	JLabel shininessLabel;
4610		- NumberSlider shininessField;
	4930	+ cNumberSlider shininessField;
4611	4931	JLabel shiftLabel;
4612		- NumberSlider shiftField;
	4932	+ cNumberSlider shiftField;
4613	4933	JLabel ambientLabel;
4614		- NumberSlider ambientField;
	4934	+ cNumberSlider ambientField;
4615	4935	JLabel lightareaLabel;
4616		- NumberSlider lightareaField;
	4936	+ cNumberSlider lightareaField;
4617	4937	JLabel diffusenessLabel;
4618		- NumberSlider diffusenessField;
	4938	+ cNumberSlider diffusenessField;
4619	4939	JLabel velvetLabel;
4620		- NumberSlider velvetField;
	4940	+ cNumberSlider velvetField;
4621	4941	JLabel sheenLabel;
4622		- NumberSlider sheenField;
	4942	+ cNumberSlider sheenField;
4623	4943	JLabel subsurfaceLabel;
4624		- NumberSlider subsurfaceField;
	4944	+ cNumberSlider subsurfaceField;
4625	4945	//JLabel bumpLabel;
4626	4946	//NumberSlider bumpField;
4627	4947	JLabel backlitLabel;
4628		- NumberSlider backlitField;
	4948	+ cNumberSlider backlitField;
4629	4949	JLabel anisoLabel;
4630		- NumberSlider anisoField;
	4950	+ cNumberSlider anisoField;
4631	4951	JLabel anisoVLabel;
4632		- NumberSlider anisoVField;
	4952	+ cNumberSlider anisoVField;
4633	4953	JLabel cameraLabel;
4634		- NumberSlider cameraField;
	4954	+ cNumberSlider cameraField;
4635	4955	JLabel selfshadowLabel;
4636		- NumberSlider selfshadowField;
	4956	+ cNumberSlider selfshadowField;
4637	4957	JLabel shadowLabel;
4638		- NumberSlider shadowField;
	4958	+ cNumberSlider shadowField;
4639	4959	JLabel textureLabel;
4640		- NumberSlider textureField;
	4960	+ cNumberSlider textureField;
4641	4961	JLabel opacityLabel;
4642		- NumberSlider opacityField;
	4962	+ cNumberSlider opacityField;
4643	4963	JLabel fakedepthLabel;
4644		- NumberSlider fakedepthField;
	4964	+ cNumberSlider fakedepthField;
4645	4965	JLabel shadowbiasLabel;
4646		- NumberSlider shadowbiasField;
	4966	+ cNumberSlider shadowbiasField;
4647	4967	JLabel bumpLabel;
4648		- NumberSlider bumpField;
	4968	+ cNumberSlider bumpField;
4649	4969	JLabel noiseLabel;
4650		- NumberSlider noiseField;
	4970	+ cNumberSlider noiseField;
4651	4971	JLabel powerLabel;
4652		- NumberSlider powerField;
	4972	+ cNumberSlider powerField;
4653	4973	JLabel borderfadeLabel;
4654		- NumberSlider borderfadeField;
	4974	+ cNumberSlider borderfadeField;
4655	4975	JLabel fogLabel;
4656		- NumberSlider fogField;
	4976	+ cNumberSlider fogField;
4657	4977	JLabel opacityPowerLabel;
4658		- NumberSlider opacityPowerField;
	4978	+ cNumberSlider opacityPowerField;
4659	4979	JTree jTree;
4660	4980	//ObjectUI parent;
4661	4981
4662		- NumberSlider normalpushField;
	4982	+ cNumberSlider normalpushField;
	4983	+
	4984	+ private MenuItem importGFDItem;
	4985	+ private MenuItem importVRMLX3DItem;
	4986	+ private MenuItem import3DSItem;
	4987	+ private MenuItem importOBJItem;
4663	4988	}