~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,
..	..	@@ -28,7 +30,14 @@
28	30	iSendInfo
29	31	//KeyListener
30	32	{
	33	+ boolean timeline;
	34	+ boolean wasFullScreen;
31	35
	36	+ GroupEditor callee;
	37	+ JFrame frame;
	38	+
	39	+ static ObjEditor theFrame;
	40	+
32	41	// SCRIPT
33	42
34	43	transient JFrame textpanel = null;
..	..	@@ -119,51 +128,62 @@
119	128	void keyPressed(int key, int modifiers)
120	129	{
121	130	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	131	+ Globals.theRenderer.keyPressed(key, modifiers);
123	132	}
124	133	*/
125	134
126	135	static GridBagConstraints aConstraints;
127	136	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	137	+
130	138	static int GRIDWIDTH = 100; // 4;
131	139
132	140	public void closeUI()
133	141	{
134	142	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	143	+// System.out.println("this = " + this);
	144	+// System.out.println("objEditor = " + objEditor);
137	145	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	146	+// objEditor.ctrlPanel.remove(nameField);
	147	+
	148	+ objEditor.ctrlPanel.remove(namePanel);
139	149
140	150	if (!GroupEditor.allparams)
141	151	return;
142	152
143		- objEditor.ctrlPanel.remove(liveCB);
144		- objEditor.ctrlPanel.remove(hideCB);
145		- objEditor.ctrlPanel.remove(markCB);
146		-
147		- objEditor.ctrlPanel.remove(randomCB);
148		- objEditor.ctrlPanel.remove(speedupCB);
149		- objEditor.ctrlPanel.remove(rewindCB);
150		-
151		- objEditor.ctrlPanel.remove(resetButton);
152		- objEditor.ctrlPanel.remove(stepButton);
153		-// objEditor.ctrlPanel.remove(stepAllButton);
154		-// objEditor.ctrlPanel.remove(resetAllButton);
155		- objEditor.ctrlPanel.remove(link2masterCB);
156		- //objEditor.ctrlPanel.remove(flipVCB);
157		- //objEditor.ctrlPanel.remove(texresMenu);
158		- objEditor.ctrlPanel.remove(slowerButton);
159		- objEditor.ctrlPanel.remove(fasterButton);
160		- objEditor.ctrlPanel.remove(remarkButton);
	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);
	171	+
	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);
161	179	}
162	180
163	181	public ObjEditor GetEditor()
164	182	{
165	183	return objEditor; //.GetEditor();
166	184	}
	185	+
	186	+ // Sometimes myself, sometimes my callee's.
167	187	ObjEditor objEditor;
168	188
169	189	/*
..	..	@@ -226,6 +246,7 @@
226	246	//localCopy.parent = null;
227	247
228	248	frame = new JFrame();
	249	+ frame.setUndecorated(true);
229	250	objEditor = this;
230	251	this.callee = callee;
231	252
..	..	@@ -238,7 +259,7 @@
238	259	//if (!isDisplayable())
239	260	//setUndecorated(true);
240	261
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	262	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	263	client = inClient;
243	264	copy = localCopy;
244	265	copy.editWindow = this;
..	..	@@ -259,24 +280,40 @@
259	280	void SetupMenu()
260	281	{
261	282	frame.setMenuBar(menuBar = new MenuBar());
262		- menuBar.add(windowMenu = new Menu("File"));
263		- windowMenu.add(loadItem = new MenuItem("Load..."));
264		- windowMenu.add("-");
265		- windowMenu.add(saveItem = new MenuItem("Save"));
266		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	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..."));
267	303	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
268		- windowMenu.add("-");
269		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
270		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
271		- windowMenu.add("-");
	304	+ fileMenu.add("-");
	305	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	306	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	307	+ fileMenu.add("-");
272	308	if (client.parent != null)
273	309	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	310	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	311	} else
276	312	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	313	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	314	}
279	315
	316	+ newItem.addActionListener(this);
280	317	loadItem.addActionListener(this);
281	318	saveItem.addActionListener(this);
282	319	saveAsItem.addActionListener(this);
..	..	@@ -285,79 +322,35 @@
285	322	//povItem.addActionListener(this);
286	323	closeItem.addActionListener(this);
287	324
288		- menuBar.add(cameraMenu = new Menu("View"));
289		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
290		- //zBufferItem.addActionListener(this);
291		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
292		- //normalLensItem.addActionListener(this);
293		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294		- revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullScreenItem.addItemListener(this);
297		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
299		- toggleTimelineItem.addItemListener(this);
300		- cameraMenu.add("-");
301		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
302		- toggleTextureItem.addItemListener(this);
303		- toggleTextureItem.setState(CameraPane.textureon);
304		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
305		- toggleLiveItem.addItemListener(this);
306		- toggleLiveItem.setState(CameraPane.isLIVE());
307		- cameraMenu.add(stepItem = new MenuItem("Step"));
308		- stepItem.addActionListener(this);
309		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
310		-// toggleDLItem.addItemListener(this);
311		-// toggleDLItem.setState(false);
312		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
313		- toggleRenderItem.addItemListener(this);
314		- toggleRenderItem.setState(!CameraPane.frozen);
315		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
316		- toggleDebugItem.addItemListener(this);
317		- toggleDebugItem.setState(CameraPane.DEBUG);
318		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
319		- toggleFrustumItem.addItemListener(this);
320		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
321		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
322		- toggleFootContactItem.addItemListener(this);
323		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
324		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
325		- toggleRandomItem.addItemListener(this);
326		- toggleRandomItem.setState(CameraPane.RANDOM);
327		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
328		- toggleHandleItem.addItemListener(this);
329		- toggleHandleItem.setState(CameraPane.HANDLES);
330		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331		- togglePaintItem.addItemListener(this);
332		- togglePaintItem.setState(CameraPane.PAINTMODE);
333		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
334		-// toggleRootItem.addItemListener(this);
335		-// toggleRootItem.setState(false);
336		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
337		-// animationItem.addItemListener(this);
338		-// animationItem.setState(CameraPane.ANIMATION);
339		- cameraMenu.add("-");
340		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
341		- editCameraItem.addActionListener(this);
342		-
343	325	objectPanel = new JTabbedPane();
344	326	toolbarPanel = new JPanel();
345	327	toolbarPanel.setName("Toolbar");
346		- treePanel = new JPanel();
	328	+ treePanel = new cGridBag();
347	329	treePanel.setName("Tree");
348		- ctrlPanel = new JPanel(); // new GridBagLayout());
349		- ctrlPanel.setName("Edit");
350		- 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	+
351	342	materialPanel.setName("Material");
352	343	/JTextPane/
353	344	infoarea = createTextPane();
	345	+ doc = infoarea.getStyledDocument();
	346	+
354	347	infoarea.setEditable(true);
355	348	SetText();
356	349	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
357	350	// infoarea.setOpaque(false);
358	351	// //infoarea.setForeground(textcolor);
359		- infoarea.setLineWrap(true);
360		- infoarea.setWrapStyleWord(true);
	352	+// TEXTAREA infoarea.setLineWrap(true);
	353	+// TEXTAREA infoarea.setWrapStyleWord(true);
361	354	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
362	355	infoPanel.setPreferredSize(new Dimension(50, 200));
363	356	infoPanel.setName("Info");
..	..	@@ -368,16 +361,16 @@
368	361	mainPanel.setName("Main");
369	362	mainPanel.setContinuousLayout(true);
370	363	mainPanel.setOneTouchExpandable(true);
371		- mainPanel.setDividerLocation(1.0);
372	364	mainPanel.setDividerSize(9);
373		- mainPanel.setResizeWeight(0);
	365	+ mainPanel.setDividerLocation(0.5); //1.0);
	366	+ mainPanel.setResizeWeight(0.5);
374	367
375	368	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
376	369	//mainPanel.setLayout(new GridBagLayout());
377	370	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
378		- treePanel.setLayout(new GridBagLayout());
379		- ctrlPanel.setLayout(new GridBagLayout());
380		- materialPanel.setLayout(new GridBagLayout());
	371	+// treePanel.setLayout(new GridBagLayout());
	372	+ //ctrlPanel.setLayout(new GridBagLayout());
	373	+ //materialPanel.setLayout(new GridBagLayout());
381	374
382	375	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
383	376	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -416,7 +409,7 @@
416	409	static String newline = "\n";
417	410	protected static final String buttonString = "JButton";
418	411	StyledDocument doc;
419		- JTextArea infoarea;
	412	+ JTextPane infoarea;
420	413
421	414	void ClearInfo()
422	415	{
..	..	@@ -439,10 +432,10 @@
439	432	e.printStackTrace();
440	433	}
441	434
442		- String selection = infoarea.getText();
443		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
444		- java.awt.datatransfer.Clipboard clipboard =
445		- 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();
446	439	//clipboard.setContents(data, data);
447	440	}
448	441
..	..	@@ -465,13 +458,13 @@
465	458	//SendInfo("Name:", "bold");
466	459	if (sel.GetTextures() != null \|\| debug)
467	460	{
468		- si.SendInfo(sel.toString(), "bold");
	461	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
469	462	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
470	463	if (sel.Size() > 0)
471	464	{
472	465	si.SendInfo("#children = " + sel.Size(), "regular");
473	466	}
474		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	467	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
475	468	if (debug)
476	469	{
477	470	try
..	..	@@ -483,7 +476,10 @@
483	476	}
484	477
485	478	if (full)
486		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	479	+ {
	480	+ si.SendInfo(" BBox min: " + minima, "regular");
	481	+ si.SendInfo(" BBox max: " + maxima, "regular");
	482	+ }
487	483
488	484	if (sel.bRep != null)
489	485	{
..	..	@@ -510,7 +506,7 @@
510	506	}
511	507	if (sel.support != null)
512	508	{
513		- si.SendInfo(" support: " + sel.support, "regular");
	509	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
514	510	}
515	511	if (sel.scriptnode != null)
516	512	{
..	..	@@ -581,6 +577,9 @@
581	577	{
582	578	CameraPane.pointflow = (PointFlow) sel;
583	579	}
	580	+
	581	+ si.SendInfo("_____________________", "regular");
	582	+ si.SendInfo("", "regular");
584	583	}
585	584	}
586	585
..	..	@@ -596,52 +595,138 @@
596	595	}
597	596	}
598	597
599		- private JTextArea createTextPane()
600		- {
601		- String[] initString =
602		- {
603		- "This is an editable JTextPane, ", //regular
604		- "another ", //italic
605		- "styled ", //bold
606		- "text ", //small
607		- "component, ", //large
608		- "which supports embedded components..." + newline,//regular
609		- " " + newline, //button
610		- "...and embedded icons..." + newline, //regular
611		- " ", //icon
612		- newline + "JTextPane is a subclass of JEditorPane that "
613		- + "uses a StyledEditorKit and StyledDocument, and provides "
614		- + "cover methods for interacting with those objects."
615		- };
	598	+static GraphicsDevice device = GraphicsEnvironment
	599	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
616	600
617		- String[] initStyles =
	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()
618	616	{
619		- "regular", "italic", "bold", "small", "large",
620		- "regular", "button", "regular", "icon",
621		- "regular"
622		- };
623		-
624		- JTextPane textPane = new JTextPane();
625		- textPane.setEditable(true);
626		- /StyledDocument/ doc = textPane.getStyledDocument();
627		- addStylesToDocument(doc);
628		-
629		- try
	617	+ frame.setState(Frame.ICONIFIED);
	618	+ }
	619	+
	620	+ void Maximize()
630	621	{
631		- for (int j = 0; j < 2; j++)
	622	+ if (maximized)
632	623	{
633		- for (int i = 0; i < initString.length; i++)
634		- {
635		- doc.insertString(doc.getLength(), initString[i],
636		- doc.getStyle(initStyles[i]));
637		- }
	624	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
638	625	}
639		- } catch (BadLocationException ble)
	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	+
	638	+ void ToggleFullScreen()
640	639	{
641		- System.err.println("Couldn't insert initial text into text pane.");
	640	+ if (CameraPane.FULLSCREEN)
	641	+ {
	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	+
	660	+ } else
	661	+ {
	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);
	679	+ }
	680	+
	681	+ cameraView.ToggleFullScreen();
642	682	}
643	683
644		- return new JTextArea(); // textPane;
	684	+ private JTextPane createTextPane()
	685	+ {
	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	+// }
	728	+
	729	+ return new JTextPane(); // textPane;
645	730	}
646	731
647	732	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -694,7 +779,7 @@
694	779	protected static ImageIcon createImageIcon(String path,
695	780	String description)
696	781	{
697		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	782	+ java.net.URL imgURL = Grafreed.class.getResource(path);
698	783	if (imgURL != null)
699	784	{
700	785	return new ImageIcon(imgURL, description);
..	..	@@ -726,6 +811,7 @@
726	811	// NumberSlider vDivsField;
727	812	// JCheckBox endcaps;
728	813	JCheckBox liveCB;
	814	+ JCheckBox selectCB;
729	815	JCheckBox hideCB;
730	816	JCheckBox link2masterCB;
731	817	JCheckBox markCB;
..	..	@@ -741,115 +827,87 @@
741	827	JButton slowerButton;
742	828	JButton fasterButton;
743	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;
744	840
745		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	841	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
746	842	{
747	843	JCheckBox cb;
748	844
749		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
750		- oe.aConstraints.gridwidth = 1; // 3;
751		-// oe.aConstraints.weightx = 1;
752		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
753		- 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);
754	846	cb.addItemListener(this);
755		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
756		- oe.aConstraints.gridwidth = 1;
757		- oe.aConstraints.gridx += 1;
758	847
759	848	return cb;
760	849	}
761	850
762		- cButton AddButton(ObjEditor oe, String label)
	851	+ cButton AddButton(cGridBag panel, String label)
763	852	{
764	853	cButton cb;
765	854
766		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
767		- oe.aConstraints.gridwidth = 1;
768		-// oe.aConstraints.weightx = 1;
769		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
770		- 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);
771	856	cb.addActionListener(this);
772		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
773		- oe.aConstraints.gridwidth = 1;
774		- oe.aConstraints.gridx += 1;
775	857
776	858	return cb;
777	859	}
778	860
779		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	861	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
780	862	{
781	863	JComboBox combo;
782	864
783		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
784		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
785		- oe.aConstraints.gridx += 1;
	865	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
786	866	combo.addActionListener(this);
787	867
788	868	return combo;
789	869	}
790	870
791		- 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)
792	872	{
793		- NumberSlider combo;
	873	+ cGridBag control = new cGridBag();
	874	+
	875	+ cNumberSlider combo;
794	876
795	877	JLabel jlabel = new JLabel(label);
796		-
797		- aConstraints.fill = GridBagConstraints.VERTICAL;
798	878	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
799		- aConstraints.gridwidth = 2;
800		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
801		- aConstraints.gridx += 1;
802		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
803		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
804		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
805		- aConstraints.gridx += 1;
806		- aConstraints.gridwidth = 1;
807		-
	879	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	880	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	881	combo.setFloat(current);
809		-
810		- combo.label = jlabel;
811		-
812		- combo.addChangeListener(this);
813		-
814		- return combo;
	882	+
	883	+ panel.add(control);
	884	+
	885	+ return control;
815	886	}
816	887
817		- 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)
818	889	{
819		- NumberSlider combo;
	890	+ cGridBag control = new cGridBag();
	891	+
	892	+ cNumberSlider combo;
820	893
821	894	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	895	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 2;
826		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
829		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	896	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	897	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	898	combo.setInteger(current);
835	899
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	900	+ panel.add(control);
	901	+
	902	+ return control;
841	903	}
842	904
843		- JTextArea AddText(JPanel ctrlPanel, String name)
	905	+ JTextArea AddText(cGridBag ctrlPanel, String name)
844	906	{
845	907	JTextArea text;
846	908
847		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
848		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
849		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	909	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
850	910	text.addCaretListener(this);
851		- aConstraints.gridx += 1;
852		- aConstraints.gridwidth = 1;
853	911
854	912	return text;
855	913	}
..	..	@@ -879,9 +937,16 @@
879	937	objEditor.ctrlPanel.remove(j);
880	938	}
881	939
	940	+ void Remove(cNumberSlider j)
	941	+ {
	942	+ j.removeChangeListener(this);
	943	+ //objEditor.ctrlPanel.remove(j.label);
	944	+ objEditor.ctrlPanel.remove(j);
	945	+ }
	946	+
882	947	/*
883	948	*/
884		- void Return() // ObjEditor oe)
	949	+ void Return0() // ObjEditor oe)
885	950	{
886	951	aConstraints.gridy += 1;
887	952	aConstraints.gridx = 0;
..	..	@@ -936,35 +1001,77 @@
936	1001
937	1002	void SetupUI2(ObjEditor oe)
938	1003	{
939		-// oe.aConstraints.weightx = 0;
940		-// oe.aConstraints.weighty = 0;
941		-// oe.aConstraints.gridx = 0;
942		-// oe.aConstraints.gridy = 0;
943		- 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();
944	1013
945	1014	if (!GroupEditor.allparams)
946	1015	return;
947	1016
948		- liveCB = AddCheckBox(oe, "Live", copy.live);
949		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
950		- 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");
951	1023	// Return();
952		- markCB = AddCheckBox(oe, "Mark", copy.marked);
953		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
954		- randomCB = AddCheckBox(oe, "Rand", copy.random);
955		- Return();
956		- resetButton = AddButton(oe, "Reset");
957		- 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");
958	1056	// resetAllButton = AddButton(oe, "Reset All");
959	1057	// stepAllButton = AddButton(oe, "Step All");
960		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
961	1058	// Return();
962		- slowerButton = AddButton(oe, "Slow");
963		- fasterButton = AddButton(oe, "Fast");
964		- 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");
965	1065
966		- Return();
	1066	+ oe.ctrlPanel.add(objectCommandsPanel);
	1067	+ oe.ctrlPanel.Return();
967	1068
	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();
	1074	+
968	1075	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
969	1076	// ObjEditor.aConstraints.gridx += 1;
970	1077
..	..	@@ -1058,7 +1165,7 @@
1058	1165	oe.aConstraints.gridwidth = 1;
1059	1166	/**/
1060	1167	nameField = AddText(oe.ctrlPanel, copy.GetName());
1061		- Return();
	1168	+ oe.ctrlPanel.Return();
1062	1169
1063	1170	//ctrlPanel.add(textureButton = new Button("Texture..."));
1064	1171	//textureButton.setEnabled(false);
..	..	@@ -1160,11 +1267,25 @@
1160	1267	//JPanel worldPanel =
1161	1268	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1162	1269	//worldPanel.setName("World");
1163		- centralPanel = new JPanel(new BorderLayout());
1164		- timelinePanel = new JPanel(new BorderLayout());
1165		- 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);
1166	1277
	1278	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1279	+ cameraPanel.setContinuousLayout(true);
	1280	+ cameraPanel.setOneTouchExpandable(true);
	1281	+// cameraPanel.setDividerLocation(0.9);
	1282	+// cameraPanel.setDividerSize(9);
	1283	+ cameraPanel.setResizeWeight(1.0);
	1284	+
	1285	+ }
	1286	+
1167	1287	centralPanel.add(cameraView);
	1288	+ centralPanel.setFocusable(true);
1168	1289	//frame.setJMenuBar(timelineMenubar);
1169	1290	//centralPanel.add(timelinePanel);
1170	1291
..	..	@@ -1183,12 +1304,13 @@
1183	1304	//frontView.object = copy;
1184	1305	//sideView.object = copy;
1185	1306
1186		- XYZPanel = new JPanel();
1187		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1307	+ XYZPanel = new cGridBag().setVertical(true);
	1308	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1188	1309
1189		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1190		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1191		- 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);
1192	1314
1193	1315	/*
1194	1316	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1226,10 +1348,11 @@
1226	1348	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1227	1349	//tmp.setName("Edit");
1228	1350	objectPanel.add(materialPanel);
1229		- JPanel north = new JPanel(new BorderLayout());
1230		- north.setName("Edit");
1231		- north.add(ctrlPanel, BorderLayout.NORTH);
1232		- 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);
1233	1356	objectPanel.add(infoPanel);
1234	1357
1235	1358	/*
..	..	@@ -1250,16 +1373,23 @@
1250	1373	scrollpane.setWheelScrollingEnabled(true);
1251	1374	scrollpane.addMouseWheelListener(this); // Default not fast enough
1252	1375
1253		- /JTabbedPane/ scenePanel = new JTabbedPane();
1254		- scenePanel.add(scrollpane);
	1376	+ /JTabbedPane/ scenePanel = new cGridBag();
	1377	+ scenePanel.preferredWidth = 6;
	1378	+
	1379	+ JTabbedPane tabbedPane = new JTabbedPane();
	1380	+ tabbedPane.add(scrollpane);
1255	1381
1256		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1382	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1257	1383
1258		- optionsPanel = new JPanel(new GridBagLayout());
	1384	+ optionsPanel = new cGridBag().setVertical(true);
1259	1385
1260	1386	optionsPanel.setName("Options");
1261		- scenePanel.add(optionsPanel);
1262		-
	1387	+
	1388	+ AddOptions(optionsPanel); //, aConstraints);
	1389	+
	1390	+ tabbedPane.add(optionsPanel);
	1391	+
	1392	+ scenePanel.add(tabbedPane);
1263	1393
1264	1394	/*
1265	1395	cTree jTree = new cTree(null);
..	..	@@ -1293,6 +1423,7 @@
1293	1423	//bigPanel.setSize(new Dimension(10,10));
1294	1424	//bigPanel.add(ctrlPanel);
1295	1425	//bigPanel.add(gridPanel);
	1426	+ /**
1296	1427	bigThree = new JPanel();
1297	1428	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1298	1429	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1316,7 +1447,13 @@
1316	1447	// aConstraints.gridheight = 3;
1317	1448	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1318	1449	bigThree.add(XYZPanel, aWindowConstraints);
	1450	+ /**/
1319	1451
	1452	+ bigThree = new cGridBag();
	1453	+ bigThree.addComponent(scenePanel);
	1454	+ bigThree.addComponent(centralPanel);
	1455	+ bigThree.addComponent(XYZPanel);
	1456	+
1320	1457	// // SIDE EFFECT!!!
1321	1458	// aConstraints.gridx = 0;
1322	1459	// aConstraints.gridy = 0;
..	..	@@ -1337,14 +1474,17 @@
1337	1474	//worldPane.add(bigPanel);
1338	1475	//worldPane.add(worldPanel);
1339	1476	/**/
1340		- frame.getContentPane().add(/"Center",/framePanel);
	1477	+ //frame.getContentPane().add(/"Center",/framePanel);
	1478	+ frame.add(/"Center",/framePanel);
1341	1479	//frame.getContentPane().add(/"Center",/ worldPane);
1342	1480
1343	1481	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1344	1482
1345		- frame.setSize(1024, 768);
1346		- frame.show();
	1483	+ frame.setSize(1280, 860);
	1484	+ frame.setVisible(true);
1347	1485
	1486	+ cameraView.requestFocusInWindow();
	1487	+
1348	1488	gridPanel.setDividerLocation(1.0);
1349	1489
1350	1490	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1358,6 +1498,10 @@
1358	1498	});
1359	1499	}
1360	1500
	1501	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1502	+ {
	1503	+ }
	1504	+
1361	1505	JTree GetTree()
1362	1506	{
1363	1507	return objEditor.jTree;
..	..	@@ -1369,260 +1513,173 @@
1369	1513	ctrlPanel.removeAll();
1370	1514	}
1371	1515
1372		- void SetupMaterial(JPanel ctrlPanel)
	1516	+ void SetupMaterial(cGridBag panel)
1373	1517	{
1374		- aConstraints.weighty = 0;
1375		- //aConstraints.weightx = 1;
1376		- /*
	1518	+ /*
1377	1519	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1378	1520	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1379		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1380		- aConstraints.gridx += 1;
1381	1521	*/
1382	1522
1383		- aConstraints.gridwidth = 1;
1384		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- 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");
1388	1527
1389	1528	/*
1390	1529	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1391		- aConstraints.gridx += 1;
1392		- aConstraints.weighty = 0;
1393		- aConstraints.gridwidth = 1;
1394	1530	*/
1395	1531
1396		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1397		- 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	+ }
1398	1541
1399		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1400		-
1401		- aConstraints.gridx += 1;
1402		-
1403		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1404		-
1405		- aConstraints.gridx += 1;
1406		-
1407		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1408		-
1409		- aConstraints.gridx = 0;
1410		- aConstraints.gridy += 1;
1411		- aConstraints.weighty = 0;
1412		- aConstraints.gridwidth = 1;
	1542	+ editBar.preferredHeight = 15;
	1543	+
	1544	+ panel.add(editBar);
	1545	+
1413	1546	/**/
1414	1547	//aConstraints.weighty = 0;
1415	1548	////aConstraints.weightx = 1;
1416	1549	//aConstraints.weighty = 1;
1417	1550	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1418	1551	//aConstraints.gridx += 1;
1419		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1420		- aConstraints.weighty = 0;
1421		- aConstraints.gridx = 0;
1422		- aConstraints.gridy += 1;
1423		- aConstraints.gridwidth = 1;
	1552	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1424	1553
1425		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1426		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1427		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1428		- aConstraints.gridx += 1;
1429		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1430		- //aConstraints.weightx = 0;
1431		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1432		- aConstraints.gridx = 0;
1433		- aConstraints.gridy += 1;
1434		- 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);
1435	1562
1436		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1437		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1438		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1439		- aConstraints.gridx += 1;
1440		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1441		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1442		- aConstraints.gridx = 0;
1443		- aConstraints.gridy += 1;
1444		- 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);
1445	1568
1446		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1447		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1448		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1449		- aConstraints.gridx += 1;
1450		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1451		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1452		- aConstraints.gridx = 0;
1453		- aConstraints.gridy += 1;
1454		- 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);
1455	1574
1456		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1457		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1459		- aConstraints.gridx += 1;
1460		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1461		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1462		- aConstraints.gridx = 0;
1463		- aConstraints.gridy += 1;
1464		- 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);
1465	1580
1466		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1467		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1468		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1469		- aConstraints.gridx += 1;
1470		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1471		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1472		- aConstraints.gridx = 0;
1473		- aConstraints.gridy += 1;
1474		- 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);
1475	1586
1476		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1477		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1479		- aConstraints.gridx += 1;
1480		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1481		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1482		- aConstraints.gridx = 0;
1483		- aConstraints.gridy += 1;
1484		- 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);
1485	1592
1486		- //aConstraints.weighty = 1;
1487		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1488		- //aConstraints.gridx += 1;
1489		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1490		- aConstraints.weighty = 0;
1491		- aConstraints.gridx = 0;
1492		- aConstraints.gridy += 1;
1493		- 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);
1494	1606
1495		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1496		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1498		- aConstraints.gridx += 1;
1499		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1500		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1501		- aConstraints.gridx = 0;
1502		- aConstraints.gridy += 1;
1503		- 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);
1504	1612
1505		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1506		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1507		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1508		- aConstraints.gridx += 1;
1509		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1510		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1511		- aConstraints.gridx = 0;
1512		- aConstraints.gridy += 1;
1513		- 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);
1514	1618
1515		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1516		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1517		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1518		- aConstraints.gridx += 1;
1519		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1520		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1521		- aConstraints.gridx = 0;
1522		- aConstraints.gridy += 1;
1523		- 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);
1524	1624
1525		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1526		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1527		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1528		- aConstraints.gridx += 1;
1529		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1530		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1531		- aConstraints.gridx = 0;
1532		- aConstraints.gridy += 1;
1533		- 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);
1534	1630
1535		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1536		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1537		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1538		- aConstraints.gridx += 1;
1539		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1540		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1541		- aConstraints.gridx = 0;
1542		- aConstraints.gridy += 1;
1543		- 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);
1544	1636
1545		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1546		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1548		- aConstraints.gridx += 1;
1549		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1550		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1551		- aConstraints.gridx = 0;
1552		- aConstraints.gridy += 1;
1553		- 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);
1554	1642
1555		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1556		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1557		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1558		- aConstraints.gridx += 1;
1559		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1560		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1561		- aConstraints.gridx = 0;
1562		- aConstraints.gridy += 1;
1563		- 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);
1564	1650
1565		- //aConstraints.weighty = 1;
1566		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1567		- //aConstraints.gridx += 1;
1568		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1569		- aConstraints.weighty = 0;
1570		- aConstraints.gridx = 0;
1571		- aConstraints.gridy += 1;
1572		- 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);
1573	1656
1574		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1575		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1576		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1577		- aConstraints.gridx += 1;
1578		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1579		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1580		- aConstraints.gridx = 0;
1581		- aConstraints.gridy += 1;
1582		- 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);
1583	1662
1584		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1585		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1586		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1587		- aConstraints.gridx += 1;
1588		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1589		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1590		- aConstraints.gridx = 0;
1591		- aConstraints.gridy += 1;
1592		- 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);
1593	1668
1594		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1595		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1596		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1597		- aConstraints.gridx += 1;
1598		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1599		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1600		- aConstraints.gridx = 0;
1601		- aConstraints.gridy += 1;
1602		- 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);
1603	1674
1604		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1605		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1607		- aConstraints.gridx += 1;
1608		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1609		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1610		- aConstraints.gridx = 0;
1611		- aConstraints.gridy += 1;
1612		- 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);
1613	1680
1614		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1615		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1616		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1617		- aConstraints.gridx += 1;
1618		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1619		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1620		- aConstraints.gridx = 0;
1621		- aConstraints.gridy += 1;
1622		- aConstraints.gridwidth = 1;
1623		-
1624		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1625		- Return();
	1681	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1682	+ //Return();
1626	1683	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1627	1684	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628	1685	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1633,130 +1690,93 @@
1633	1690	// aConstraints.gridy += 1;
1634	1691	// aConstraints.gridwidth = 1;
1635	1692
1636		- //aConstraints.weighty = 1;
1637		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1638		- //aConstraints.gridx += 1;
1639		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1640		- aConstraints.weighty = 0;
1641		- aConstraints.gridx = 0;
1642		- aConstraints.gridy += 1;
1643		- aConstraints.gridwidth = 1;
1644	1693
1645		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1646		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1648		- aConstraints.gridx += 1;
1649		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1650		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1651		- aConstraints.gridx = 0;
1652		- aConstraints.gridy += 1;
1653		- 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);
1654	1701
1655		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1656		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1658		- aConstraints.gridx += 1;
1659		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1660		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1661		- aConstraints.gridx = 0;
1662		- aConstraints.gridy += 1;
1663		- 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);
1664	1707
1665		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1666		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1667		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1668		- aConstraints.gridx += 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1670		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1671		- aConstraints.gridx = 0;
1672		- aConstraints.gridy += 1;
1673		- 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);
1674	1713
1675		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1676		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1678		- aConstraints.gridx += 1;
1679		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1680		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1681		- aConstraints.gridx = 0;
1682		- aConstraints.gridy += 1;
1683		- aConstraints.gridwidth = 1;
1684		- 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);
1685	1719
1686		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1687		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1689		- aConstraints.gridx += 1;
1690		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1691		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1692		- aConstraints.gridx = 0;
1693		- aConstraints.gridy += 1;
1694		- 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);
1695	1725
1696		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1697		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1699		- aConstraints.gridx += 1;
1700		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1701		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1702		- aConstraints.gridx = 0;
1703		- aConstraints.gridy += 1;
1704		- 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);
1705	1733
1706		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1707		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1709		- aConstraints.gridx += 1;
1710		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1711		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1712		- aConstraints.gridx = 0;
1713		- aConstraints.gridy += 1;
1714		- 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);
1715	1739
1716		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1717		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1718		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1719		- aConstraints.gridx += 1;
1720		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1721		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1722		- aConstraints.gridx = 0;
1723		- aConstraints.gridy += 1;
1724		- 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);
1725	1745
1726		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1727		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1728		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1729		- aConstraints.gridx += 1;
1730		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1731		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1732		- aConstraints.gridx = 0;
1733		- aConstraints.gridy += 1;
1734		- 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);
1735	1751
1736		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1737		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1738		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1739		- aConstraints.gridx += 1;
1740		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1741		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1742		- aConstraints.gridx = 0;
1743		- aConstraints.gridy += 1;
1744		- 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);
1745	1757
1746		- //aConstraints.weighty = 1;
1747		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1748		- //aConstraints.gridx += 1;
1749		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1750		- 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);
1751	1763
1752		- aConstraints.gridx = 0;
1753		- aConstraints.gridy = 0;
1754		- 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);
1755	1775
1756	1776	SetMaterial(copy); // .GetMaterial());
1757	1777
1758		- colorField.addChangeListener(this);
1759		- modulationField.addChangeListener(this);
	1778	+ //colorField.addChangeListener(this);
	1779	+// modulationField.addChangeListener(this);
1760	1780	metalnessField.addChangeListener(this);
1761	1781	diffuseField.addChangeListener(this);
1762	1782	specularField.addChangeListener(this);
..	..	@@ -1786,12 +1806,15 @@
1786	1806	opacityPowerField.addChangeListener(this);
1787	1807	/**/
1788	1808
1789		- resetSlidersButton.addActionListener(this);
1790	1809	clearMaterialButton.addActionListener(this);
1791	1810	createMaterialButton.addActionListener(this);
1792		-
1793		- propagateToggle.addItemListener(this);
1794		- multiplyToggle.addItemListener(this);
	1811	+
	1812	+ if (Globals.ADVANCED)
	1813	+ {
	1814	+ resetSlidersButton.addActionListener(this);
	1815	+ propagateToggle.addItemListener(this);
	1816	+ multiplyToggle.addItemListener(this);
	1817	+ }
1795	1818	}
1796	1819
1797	1820	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1962,7 +1985,7 @@
1962	1985
1963	1986	//? flashIt = false;
1964	1987	CameraPane pane = (CameraPane) cameraView;
1965		- pane.clickStart(location.x, location.y, 0);
	1988	+ pane.clickStart(location.x, location.y, 0, 0);
1966	1989	pane.clickEnd(location.x, location.y, 0, true);
1967	1990
1968	1991	if (group.selection.size() == 1)
..	..	@@ -2011,6 +2034,7 @@
2011	2034	e2.printStackTrace();
2012	2035	}
2013	2036	}
	2037	+
2014	2038	LoadJMEThread loadThread;
2015	2039
2016	2040	class LoadJMEThread extends Thread
..	..	@@ -2068,6 +2092,7 @@
2068	2092	//LoadFile0(filename, converter);
2069	2093	}
2070	2094	}
	2095	+
2071	2096	LoadOBJThread loadObjThread;
2072	2097
2073	2098	class LoadOBJThread extends Thread
..	..	@@ -2146,19 +2171,19 @@
2146	2171
2147	2172	void LoadObjFile(String fullname)
2148	2173	{
2149		- /*
	2174	+ System.out.println("Loading " + fullname);
	2175	+ /**/
2150	2176	//lastFilename = fullname;
2151	2177	if(loadObjThread == null)
2152	2178	{
2153		- loadObjThread = new LoadOBJThread();
2154		- loadObjThread.start();
	2179	+ loadObjThread = new LoadOBJThread();
	2180	+ loadObjThread.start();
2155	2181	}
2156	2182
2157	2183	loadObjThread.add(fullname);
2158		- */
	2184	+ /**/
2159	2185
2160		- System.out.println("Loading " + fullname);
2161		- makeSomething(new FileObject(fullname, true), true);
	2186	+ //makeSomething(new FileObject(fullname, true), true);
2162	2187	}
2163	2188
2164	2189	void LoadGFDFile(String fullname)
..	..	@@ -2419,11 +2444,11 @@
2419	2444
2420	2445	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2421	2446	{
2422		- if (GrafreeD.standAlone)
	2447	+ if (Grafreed.standAlone)
2423	2448	{
2424	2449	/**/
2425	2450	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2426		- browser.show();
	2451	+ browser.setVisible(true);
2427	2452	String filename = browser.getFile();
2428	2453	if (filename != null && filename.length() > 0)
2429	2454	{
..	..	@@ -2568,6 +2593,7 @@
2568	2593	}
2569	2594	if (input == null)
2570	2595	{
	2596	+ new Exception().printStackTrace();
2571	2597	System.exit(0);
2572	2598	}
2573	2599
..	..	@@ -2782,7 +2808,8 @@
2782	2808	return;
2783	2809	}
2784	2810
2785		- multiplyToggle.setSelected(mat.multiply);
	2811	+ if (multiplyToggle != null)
	2812	+ multiplyToggle.setSelected(mat.multiply);
2786	2813
2787	2814	assert (object.projectedVertices != null);
2788	2815
..	..	@@ -2966,42 +2993,40 @@
2966	2993	return;
2967	2994	} else if (event.getSource() == toggleTimelineItem)
2968	2995	{
2969		- copy.timeline ^= true;
	2996	+ timeline ^= true;
2970	2997
2971		- if (copy.timeline)
	2998	+ if (timeline)
2972	2999	{
2973	3000	centralPanel.remove(cameraView);
2974		- centralPanel.add(timelinePanel);
	3001	+ cameraPanel.add(cameraView);
	3002	+ centralPanel.add(cameraPanel);
2975	3003	frame.setJMenuBar(timelineMenubar);
	3004	+ wasFullScreen = CameraPane.FULLSCREEN;
	3005	+ if (!CameraPane.FULLSCREEN)
	3006	+ ToggleFullScreen();
	3007	+ toggleFullScreenItem.setEnabled(false);
2976	3008	}
2977	3009	else
2978	3010	{
2979		- centralPanel.remove(timelinePanel);
	3011	+ centralPanel.remove(cameraPanel);
2980	3012	centralPanel.add(cameraView);
2981	3013	frame.setJMenuBar(null);
	3014	+ if (!wasFullScreen)
	3015	+ ToggleFullScreen();
	3016	+ toggleFullScreenItem.setEnabled(true);
2982	3017	}
2983	3018
2984	3019	frame.validate();
2985	3020	return;
2986	3021	} else if (event.getSource() == toggleFullScreenItem)
2987	3022	{
2988		- if (CameraPane.FULLSCREEN)
2989		- {
2990		- frame.getContentPane().remove(/"Center",/bigThree);
2991		- framePanel.add(bigThree);
2992		- frame.getContentPane().add(/"Center",/framePanel);
2993		- } else
2994		- {
2995		- frame.getContentPane().remove(/"Center",/framePanel);
2996		- frame.getContentPane().add(/"Center",/bigThree);
2997		- }
	3023	+ ToggleFullScreen();
2998	3024	frame.validate();
2999		- cameraView.ToggleFullScreen();
3000	3025
3001	3026	return;
3002		- } else if (event.getSource() == toggleRandomItem)
	3027	+ } else if (event.getSource() == toggleSwitchItem)
3003	3028	{
3004		- cameraView.ToggleRandom();
	3029	+ cameraView.ToggleSwitch();
3005	3030	cameraView.repaint();
3006	3031	return;
3007	3032	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3030,6 +3055,10 @@
3030	3055	{
3031	3056	copy.live ^= true;
3032	3057	return;
	3058	+ } else if (event.getSource() == selectCB)
	3059	+ {
	3060	+ copy.dontselect ^= true;
	3061	+ return;
3033	3062	} else if (event.getSource() == hideCB)
3034	3063	{
3035	3064	copy.hide ^= true;
..	..	@@ -3044,6 +3073,7 @@
3044	3073	if (event.getSource() == randomCB)
3045	3074	{
3046	3075	copy.random ^= true;
	3076	+ objEditor.refreshContents();
3047	3077	return;
3048	3078	}
3049	3079	if (event.getSource() == speedupCB)
..	..	@@ -3067,8 +3097,9 @@
3067	3097
3068	3098	public void actionPerformed(ActionEvent event)
3069	3099	{
	3100	+ Object source = event.getSource();
3070	3101	// SCRIPT DIALOG
3071		- if (event.getSource() == okbutton)
	3102	+ if (source == okbutton)
3072	3103	{
3073	3104	textpanel.setVisible(false);
3074	3105	textpanel.remove(textarea);
..	..	@@ -3080,7 +3111,7 @@
3080	3111	textarea = null;
3081	3112	textpanel = null;
3082	3113	}
3083		- if (event.getSource() == cancelbutton)
	3114	+ if (source == cancelbutton)
3084	3115	{
3085	3116	textpanel.setVisible(false);
3086	3117	textpanel.remove(textarea);
..	..	@@ -3092,49 +3123,50 @@
3092	3123	//applySelf();
3093	3124	//client.refreshEditWindow();
3094	3125	//refreshContents();
3095		- if (event.getSource() == nameField)
	3126	+ if (source == nameField)
3096	3127	{
3097	3128	//System.out.println("ObjEditor " + event);
3098	3129	applySelf0(true);
3099	3130	//parent.applySelf();
3100	3131	objEditor.refreshContents();
3101		- } else if (event.getSource() == resetButton)
	3132	+ } else if (source == resetButton)
3102	3133	{
3103	3134	CameraPane.fullreset = true;
3104	3135	copy.Reset(); // ResetMeshes();
3105	3136	copy.Touch();
3106	3137	objEditor.refreshContents();
3107		- } else if (event.getSource() == stepItem)
	3138	+ } else if (source == stepItem)
3108	3139	{
3109		- cameraView.ONESTEP = true;
	3140	+ //cameraView.ONESTEP = true;
	3141	+ Globals.ONESTEP = true;
3110	3142	cameraView.repaint();
3111	3143	return;
3112		- } else if (event.getSource() == stepButton)
	3144	+ } else if (source == stepButton)
3113	3145	{
3114	3146	copy.Step();
3115	3147	copy.Touch();
3116	3148	objEditor.refreshContents();
3117		- } else if (event.getSource() == slowerButton)
	3149	+ } else if (source == slowerButton)
3118	3150	{
3119	3151	copy.Slower();
3120	3152	copy.Touch();
3121	3153	objEditor.refreshContents();
3122		- } else if (event.getSource() == fasterButton)
	3154	+ } else if (source == fasterButton)
3123	3155	{
3124	3156	copy.Faster();
3125	3157	copy.Touch();
3126	3158	objEditor.refreshContents();
3127		- } else if (event.getSource() == remarkButton)
	3159	+ } else if (source == remarkButton)
3128	3160	{
3129	3161	copy.Remark();
3130	3162	copy.Touch();
3131	3163	objEditor.refreshContents();
3132		- } else if (event.getSource() == stepAllButton)
	3164	+ } else if (source == stepAllButton)
3133	3165	{
3134	3166	copy.StepAll();
3135	3167	copy.Touch();
3136	3168	objEditor.refreshContents();
3137		- } else if (event.getSource() == resetAllButton)
	3169	+ } else if (source == resetAllButton)
3138	3170	{
3139	3171	//CameraPane.fullreset = true;
3140	3172	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3167,53 +3199,75 @@
3167	3199	// Close();
3168	3200	// }
3169	3201	// else
3170		- if (event.getSource() == resetSlidersButton)
	3202	+ if (source == resetSlidersButton)
3171	3203	{
3172	3204	ResetSliders();
3173		- } else if (event.getSource() == clearMaterialButton)
	3205	+ } else if (source == clearMaterialButton)
3174	3206	{
3175	3207	ClearMaterial();
3176		- } else if (event.getSource() == createMaterialButton)
	3208	+ } else if (source == createMaterialButton)
3177	3209	{
3178	3210	CreateMaterial();
3179		- } else if (event.getSource() == clearPanelButton)
	3211	+ } else if (source == clearPanelButton)
3180	3212	{
3181	3213	copy.ClearUI();
3182	3214	refreshContents(true);
3183		- } /*
3184		- }
3185		-
3186		- public boolean action(Event event, Object arg)
3187		- {
3188		- */ 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)
3189	3240	{
3190	3241	Close();
3191	3242	//return true;
3192		- } else if (event.getSource() == loadItem)
	3243	+ } else if (source == loadItem)
3193	3244	{
3194	3245	load();
3195	3246	//return true;
3196		- } else if (event.getSource() == saveItem)
	3247	+ } else if (source == newItem)
	3248	+ {
	3249	+ New();
	3250	+ } else if (source == saveItem)
3197	3251	{
3198	3252	save();
3199	3253	//return true;
3200		- } else if (event.getSource() == saveAsItem)
	3254	+ } else if (source == saveAsItem)
3201	3255	{
3202	3256	saveAs();
3203	3257	//return true;
3204		- } else if (event.getSource() == reexportItem)
	3258	+ } else if (source == reexportItem)
3205	3259	{
3206	3260	reexport();
3207	3261	//return true;
3208		- } else if (event.getSource() == exportAsItem)
	3262	+ } else if (source == exportAsItem)
3209	3263	{
3210	3264	export();
3211	3265	//return true;
3212		- } else if (event.getSource() == povItem)
	3266	+ } else if (source == povItem)
3213	3267	{
3214	3268	generatePOV();
3215	3269	//return true;
3216		- } else if (event.getSource() == zBufferItem)
	3270	+ } else if (source == zBufferItem)
3217	3271	{
3218	3272	try
3219	3273	{
..	..	@@ -3235,21 +3289,8 @@
3235	3289	cameraView.repaint();
3236	3290	//return true;
3237	3291	}
3238		- */ else if (event.getSource() == editCameraItem)
3239		- {
3240		- cameraView.ProtectCamera();
3241		- cameraView.repaint();
3242		- return;
3243		- } else if (event.getSource() == revertCameraItem)
3244		- {
3245		- cameraView.RevertCamera();
3246		- cameraView.repaint();
3247		- return;
3248		-// } else if (event.getSource() == textureButton)
3249		-// {
3250		-// return; // true;
3251		- } else // combos...
3252		- if (event.getSource() == texresMenu)
	3292	+ */ else // combos...
	3293	+ if (source == texresMenu)
3253	3294	{
3254	3295	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3255	3296	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3261,27 +3302,283 @@
3261	3302	}
3262	3303	}
3263	3304
3264		- void ToggleAnimation()
	3305	+ void New()
3265	3306	{
3266		- if (!CameraPane.ANIMATION)
	3307	+ while (copy.Size() > 1)
3267	3308	{
3268		- 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);
3269	3532	browser.show();
3270	3533	String filename = browser.getFile();
3271	3534	if (filename != null && filename.length() > 0)
3272	3535	{
3273		- 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;
3274	3571	//CameraPane.framecount = 0;
3275		- CameraPane.imagecount = 0;
	3572	+ Globals.imagecount = 0;
3276	3573
3277		- CameraPane.ANIMATION ^= true;
	3574	+ Globals.ANIMATION ^= true;
3278	3575
3279		- GrafreeD.wav.cursor = 0;
3280		- GrafreeD.wav.loop = 0;
	3576	+ Grafreed.wav.cursor = 0;
	3577	+ Grafreed.wav.loop = 0;
3281	3578	}
3282	3579	} else
3283	3580	{
3284		- CameraPane.ANIMATION ^= true;
	3581	+ Globals.ANIMATION ^= true;
3285	3582	}
3286	3583	}
3287	3584
..	..	@@ -3327,7 +3624,7 @@
3327	3624	void CreateMaterial()
3328	3625	{
3329	3626	//copy.ClearMaterial(); // PATCH
3330		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3627	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3331	3628	if (copy.selection.size() > 0)
3332	3629	//SetMaterial(copy);
3333	3630	{
..	..	@@ -3386,11 +3683,11 @@
3386	3683	{
3387	3684	copy.ResetBlockLoop(); // temporary problem
3388	3685
3389		- boolean random = CameraPane.RANDOM;
3390		- CameraPane.RANDOM = false; // parse everything
	3686	+ boolean random = CameraPane.SWITCH;
	3687	+ CameraPane.SWITCH = false; // parse everything
3391	3688	copy.ResetDisplayList();
3392	3689	copy.HardTouch();
3393		- CameraPane.RANDOM = random;
	3690	+ CameraPane.SWITCH = random;
3394	3691	}
3395	3692
3396	3693	// public void applySelf()
..	..	@@ -3460,10 +3757,40 @@
3460	3757	current.fakedepth = (float) fakedepthField.getFloat();
3461	3758	current.shadowbias = (float) shadowbiasField.getFloat();
3462	3759
3463		- if (!NumberSlider.frozen)
	3760	+ if (!cNumberSlider.frozen)
3464	3761	{
3465	3762	//System.out.println("Propagate = " + propagate);
3466	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	+
3467	3794	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3468	3795	{
3469	3796	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3508,6 +3835,7 @@
3508	3835	\|\| e.getSource() == apertureField
3509	3836	\|\| e.getSource() == shadowblurField)
3510	3837	{
	3838	+ new Exception().printStackTrace();
3511	3839	System.exit(0);
3512	3840	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3513	3841	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3534,7 +3862,13 @@
3534	3862	//System.out.println("PARENT = " + parent);
3535	3863	//if (parent != null)
3536	3864	// parent.applySelf();
3537		- refreshContents();
	3865	+ if (e.getSource() == normalpushField)
	3866	+ {
	3867	+ objEditor.refreshContents();
	3868	+ //Refresh();
	3869	+ }
	3870	+ else
	3871	+ refreshContents();
3538	3872	// ??? client.refreshEditWindow();
3539	3873	}
3540	3874	//else
..	..	@@ -3546,7 +3880,7 @@
3546	3880	//group.name = nameField.getText();
3547	3881	//objEditor.applySelf();
3548	3882
3549		- assert (objEditor == this);
	3883	+ // OCT2018: assert (objEditor == this);
3550	3884	if (copy.selection == null \|\| copy.selection.size() == 0)
3551	3885	//super.applySelf()
3552	3886	; else
..	..	@@ -3570,12 +3904,18 @@
3570	3904	objEditor.copy = keep;
3571	3905	}
3572	3906	}
	3907	+
	3908	+ if (normalpushField != null)
	3909	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3573	3910	}
3574	3911
3575	3912	void SnapObject()
3576	3913	{
3577		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3578		- SnapObject(obj);
	3914	+ if (copy.selection.size() > 0)
	3915	+ {
	3916	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3917	+ SnapObject(obj);
	3918	+ }
3579	3919	}
3580	3920
3581	3921	void SnapObject(Object3D obj)
..	..	@@ -3821,7 +4161,7 @@
3821	4161
3822	4162	radioPanel.revalidate();
3823	4163	radioPanel.repaint();
3824		- ctrlPanel.revalidate(); // ? new
	4164	+ ctrlPanel.validate(); // ? new
3825	4165	ctrlPanel.repaint();
3826	4166	}
3827	4167	}
..	..	@@ -3830,6 +4170,7 @@
3830	4170
3831	4171	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3832	4172	{
	4173	+ Save();
3833	4174	//Tween.set(thing, 0).target(1).start(tweenManager);
3834	4175	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3835	4176	// if (thing instanceof GenericJointDemo)
..	..	@@ -4033,6 +4374,7 @@
4033	4374	}
4034	4375	}
4035	4376	}
	4377	+
4036	4378	LoadGFDThread loadGFDThread;
4037	4379
4038	4380	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4052,8 +4394,10 @@
4052	4394
4053	4395	try
4054	4396	{
	4397	+ // Try compressed version first.
4055	4398	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4056		- 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);
4057	4401
4058	4402	readobj = (Object3D) p.readObject();
4059	4403	istream.close();
..	..	@@ -4061,7 +4405,20 @@
4061	4405	readobj.ResetDisplayList();
4062	4406	} catch (Exception e)
4063	4407	{
4064		- 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	+ }
4065	4422	}
4066	4423	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4067	4424	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4107,6 +4464,12 @@
4107	4464
4108	4465	void LoadIt(Object obj)
4109	4466	{
	4467	+ if (obj == null)
	4468	+ {
	4469	+ // Invalid file
	4470	+ return;
	4471	+ }
	4472	+
4110	4473	System.out.println("Loaded " + obj);
4111	4474	//new Exception().printStackTrace();
4112	4475	Object3D readobj = (Object3D) obj;
..	..	@@ -4116,6 +4479,7 @@
4116	4479
4117	4480	if (readobj != null)
4118	4481	{
	4482	+ Save();
4119	4483	try
4120	4484	{
4121	4485	//readobj.deepCopySelf(copy);
..	..	@@ -4178,7 +4542,7 @@
4178	4542
4179	4543	void load() // throws ClassNotFoundException
4180	4544	{
4181		- if (GrafreeD.standAlone)
	4545	+ if (Grafreed.standAlone)
4182	4546	{
4183	4547	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4184	4548	browser.show();
..	..	@@ -4265,11 +4629,13 @@
4265	4629	try
4266	4630	{
4267	4631	FileOutputStream ostream = new FileOutputStream(lastname);
4268		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4632	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4633	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4269	4634
4270	4635	p.writeObject(copy);
4271	4636	p.flush();
4272	4637
	4638	+ zstream.close();
4273	4639	ostream.close();
4274	4640
4275	4641	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4279,11 +4645,12 @@
4279	4645	{
4280	4646	}
4281	4647	}
	4648	+
4282	4649	String lastname;
4283	4650
4284	4651	void saveAs()
4285	4652	{
4286		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4287	4654	{
4288	4655	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4289	4656	browser.setVisible(true);
..	..	@@ -4388,13 +4755,13 @@
4388	4755	try
4389	4756	{
4390	4757	FileOutputStream ostream = new FileOutputStream(filename);
4391		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4392		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4758	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4759	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4393	4760
4394	4761	Object3D objectparent = obj.parent;
4395	4762	obj.parent = null;
4396	4763
4397		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4764	+ Object3D object = (Object3D) Grafreed.clone(obj);
4398	4765
4399	4766	obj.parent = objectparent;
4400	4767
..	..	@@ -4406,8 +4773,8 @@
4406	4773	p.writeObject(object);
4407	4774	p.flush();
4408	4775
	4776	+ zstream.close();
4409	4777	ostream.close();
4410		- // zstream.close();
4411	4778
4412	4779	// group.selection.get(0).parent = parent;
4413	4780	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4428,7 +4795,7 @@
4428	4795	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4429	4796	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4430	4797	copy.generatePOV(buffer);
4431		- if (GrafreeD.standAlone)
	4798	+ if (Grafreed.standAlone)
4432	4799	{
4433	4800	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4434	4801	browser.show();
..	..	@@ -4454,7 +4821,8 @@
4454	4821	Object3D client;
4455	4822	Object3D copy;
4456	4823	MenuBar menuBar;
4457		- Menu windowMenu;
	4824	+ Menu fileMenu;
	4825	+ MenuItem newItem;
4458	4826	MenuItem loadItem;
4459	4827	MenuItem saveItem;
4460	4828	MenuItem saveAsItem;
..	..	@@ -4462,13 +4830,11 @@
4462	4830	MenuItem reexportItem;
4463	4831	MenuItem povItem;
4464	4832	MenuItem closeItem;
4465		- Menu cameraMenu;
	4833	+
4466	4834	CheckboxMenuItem zBufferItem;
4467	4835	//MenuItem normalLensItem;
4468		- MenuItem editCameraItem;
4469		- MenuItem revertCameraItem;
4470		- CheckboxMenuItem toggleLiveItem;
4471	4836	MenuItem stepItem;
	4837	+ CheckboxMenuItem toggleLiveItem;
4472	4838	CheckboxMenuItem toggleFullScreenItem;
4473	4839	CheckboxMenuItem toggleTimelineItem;
4474	4840	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4477,7 +4843,7 @@
4477	4843	CheckboxMenuItem toggleFootContactItem;
4478	4844	CheckboxMenuItem toggleDLItem;
4479	4845	CheckboxMenuItem toggleTextureItem;
4480		- CheckboxMenuItem toggleRandomItem;
	4846	+ CheckboxMenuItem toggleSwitchItem;
4481	4847	CheckboxMenuItem toggleRootItem;
4482	4848	CheckboxMenuItem animationItem;
4483	4849	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4485,20 +4851,21 @@
4485	4851	JSplitPane mainPanel;
4486	4852	JScrollPane scrollpane;
4487	4853	JPanel toolbarPanel;
4488		- JPanel treePanel;
	4854	+ cGridBag treePanel;
4489	4855	JPanel radioPanel;
4490	4856	ButtonGroup buttonGroup;
4491		- JPanel ctrlPanel;
4492		- JPanel materialPanel;
	4857	+ cGridBag ctrlPanel;
	4858	+ cGridBag materialPanel;
4493	4859	JScrollPane infoPanel;
4494		- JPanel optionsPanel;
	4860	+ cGridBag optionsPanel;
4495	4861	JTabbedPane objectPanel;
4496		- JPanel XYZPanel;
	4862	+ cGridBag XYZPanel;
4497	4863	JSplitPane gridPanel;
4498	4864	JSplitPane bigPanel;
4499		- JPanel bigThree;
4500		- JTabbedPane scenePanel;
4501		- JPanel centralPanel;
	4865	+ cGridBag bigThree;
	4866	+ cGridBag scenePanel;
	4867	+ cGridBag centralPanel;
	4868	+ JSplitPane cameraPanel;
4502	4869	JPanel timelinePanel;
4503	4870	JMenuBar timelineMenubar;
4504	4871	JSplitPane framePanel;
..	..	@@ -4550,65 +4917,72 @@
4550	4917	// MATERIAL
4551	4918	JLabel materialLabel;
4552	4919	JLabel colorLabel;
4553		- NumberSlider colorField;
	4920	+ cNumberSlider colorField;
4554	4921	JLabel modulationLabel;
4555		- NumberSlider modulationField;
	4922	+ cNumberSlider modulationField;
4556	4923	JLabel metalnessLabel;
4557		- NumberSlider metalnessField;
	4924	+ cNumberSlider metalnessField;
4558	4925	JLabel diffuseLabel;
4559		- NumberSlider diffuseField;
	4926	+ cNumberSlider diffuseField;
4560	4927	JLabel specularLabel;
4561		- NumberSlider specularField;
	4928	+ cNumberSlider specularField;
4562	4929	JLabel shininessLabel;
4563		- NumberSlider shininessField;
	4930	+ cNumberSlider shininessField;
4564	4931	JLabel shiftLabel;
4565		- NumberSlider shiftField;
	4932	+ cNumberSlider shiftField;
4566	4933	JLabel ambientLabel;
4567		- NumberSlider ambientField;
	4934	+ cNumberSlider ambientField;
4568	4935	JLabel lightareaLabel;
4569		- NumberSlider lightareaField;
	4936	+ cNumberSlider lightareaField;
4570	4937	JLabel diffusenessLabel;
4571		- NumberSlider diffusenessField;
	4938	+ cNumberSlider diffusenessField;
4572	4939	JLabel velvetLabel;
4573		- NumberSlider velvetField;
	4940	+ cNumberSlider velvetField;
4574	4941	JLabel sheenLabel;
4575		- NumberSlider sheenField;
	4942	+ cNumberSlider sheenField;
4576	4943	JLabel subsurfaceLabel;
4577		- NumberSlider subsurfaceField;
	4944	+ cNumberSlider subsurfaceField;
4578	4945	//JLabel bumpLabel;
4579	4946	//NumberSlider bumpField;
4580	4947	JLabel backlitLabel;
4581		- NumberSlider backlitField;
	4948	+ cNumberSlider backlitField;
4582	4949	JLabel anisoLabel;
4583		- NumberSlider anisoField;
	4950	+ cNumberSlider anisoField;
4584	4951	JLabel anisoVLabel;
4585		- NumberSlider anisoVField;
	4952	+ cNumberSlider anisoVField;
4586	4953	JLabel cameraLabel;
4587		- NumberSlider cameraField;
	4954	+ cNumberSlider cameraField;
4588	4955	JLabel selfshadowLabel;
4589		- NumberSlider selfshadowField;
	4956	+ cNumberSlider selfshadowField;
4590	4957	JLabel shadowLabel;
4591		- NumberSlider shadowField;
	4958	+ cNumberSlider shadowField;
4592	4959	JLabel textureLabel;
4593		- NumberSlider textureField;
	4960	+ cNumberSlider textureField;
4594	4961	JLabel opacityLabel;
4595		- NumberSlider opacityField;
	4962	+ cNumberSlider opacityField;
4596	4963	JLabel fakedepthLabel;
4597		- NumberSlider fakedepthField;
	4964	+ cNumberSlider fakedepthField;
4598	4965	JLabel shadowbiasLabel;
4599		- NumberSlider shadowbiasField;
	4966	+ cNumberSlider shadowbiasField;
4600	4967	JLabel bumpLabel;
4601		- NumberSlider bumpField;
	4968	+ cNumberSlider bumpField;
4602	4969	JLabel noiseLabel;
4603		- NumberSlider noiseField;
	4970	+ cNumberSlider noiseField;
4604	4971	JLabel powerLabel;
4605		- NumberSlider powerField;
	4972	+ cNumberSlider powerField;
4606	4973	JLabel borderfadeLabel;
4607		- NumberSlider borderfadeField;
	4974	+ cNumberSlider borderfadeField;
4608	4975	JLabel fogLabel;
4609		- NumberSlider fogField;
	4976	+ cNumberSlider fogField;
4610	4977	JLabel opacityPowerLabel;
4611		- NumberSlider opacityPowerField;
	4978	+ cNumberSlider opacityPowerField;
4612	4979	JTree jTree;
4613	4980	//ObjectUI parent;
	4981	+
	4982	+ cNumberSlider normalpushField;
	4983	+
	4984	+ private MenuItem importGFDItem;
	4985	+ private MenuItem importVRMLX3DItem;
	4986	+ private MenuItem import3DSItem;
	4987	+ private MenuItem importOBJItem;
4614	4988	}