~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(commandsPanel);
	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,77 +322,26 @@
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(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
298		- cameraMenu.add("-");
299		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300		- toggleTextureItem.addItemListener(this);
301		- toggleTextureItem.setState(CameraPane.textureon);
302		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303		- toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
305		- cameraMenu.add(stepItem = new MenuItem("Step"));
306		- stepItem.addActionListener(this);
307		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
308		-// toggleDLItem.addItemListener(this);
309		-// toggleDLItem.setState(false);
310		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
311		- toggleRenderItem.addItemListener(this);
312		- toggleRenderItem.setState(!CameraPane.frozen);
313		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
314		- toggleDebugItem.addItemListener(this);
315		- toggleDebugItem.setState(CameraPane.DEBUG);
316		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
317		- toggleFrustumItem.addItemListener(this);
318		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
319		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
320		- toggleFootContactItem.addItemListener(this);
321		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
322		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
323		- toggleRandomItem.addItemListener(this);
324		- toggleRandomItem.setState(CameraPane.RANDOM);
325		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
326		- toggleHandleItem.addItemListener(this);
327		- toggleHandleItem.setState(CameraPane.HANDLES);
328		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
329		- togglePaintItem.addItemListener(this);
330		- togglePaintItem.setState(CameraPane.PAINTMODE);
331		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
332		-// toggleRootItem.addItemListener(this);
333		-// toggleRootItem.setState(false);
334		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
335		-// animationItem.addItemListener(this);
336		-// animationItem.setState(CameraPane.ANIMATION);
337		- cameraMenu.add("-");
338		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
339		- editCameraItem.addActionListener(this);
340		-
341	325	objectPanel = new JTabbedPane();
342	326	toolbarPanel = new JPanel();
343	327	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	328	+ treePanel = new cGridBag();
345	329	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
	330	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
347	331	ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	332	+ materialPanel = new cGridBag().setVertical(true);
349	333	materialPanel.setName("Material");
350	334	/JTextPane/
351	335	infoarea = createTextPane();
	336	+ doc = infoarea.getStyledDocument();
	337	+
352	338	infoarea.setEditable(true);
353	339	SetText();
354	340	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	341	// infoarea.setOpaque(false);
356	342	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	343	+// TEXTAREA infoarea.setLineWrap(true);
	344	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	345	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360	346	infoPanel.setPreferredSize(new Dimension(50, 200));
361	347	infoPanel.setName("Info");
..	..	@@ -366,16 +352,16 @@
366	352	mainPanel.setName("Main");
367	353	mainPanel.setContinuousLayout(true);
368	354	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	355	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
	356	+ mainPanel.setDividerLocation(0.5); //1.0);
	357	+ mainPanel.setResizeWeight(0.5);
372	358
373	359	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	360	//mainPanel.setLayout(new GridBagLayout());
375	361	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	362	+// treePanel.setLayout(new GridBagLayout());
	363	+ //ctrlPanel.setLayout(new GridBagLayout());
	364	+ //materialPanel.setLayout(new GridBagLayout());
379	365
380	366	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	367	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +400,7 @@
414	400	static String newline = "\n";
415	401	protected static final String buttonString = "JButton";
416	402	StyledDocument doc;
417		- JTextArea infoarea;
	403	+ JTextPane infoarea;
418	404
419	405	void ClearInfo()
420	406	{
..	..	@@ -437,10 +423,10 @@
437	423	e.printStackTrace();
438	424	}
439	425
440		- String selection = infoarea.getText();
441		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
442		- java.awt.datatransfer.Clipboard clipboard =
443		- Toolkit.getDefaultToolkit().getSystemClipboard();
	426	+// String selection = infoarea.getText();
	427	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	428	+// java.awt.datatransfer.Clipboard clipboard =
	429	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	430	//clipboard.setContents(data, data);
445	431	}
446	432
..	..	@@ -463,13 +449,13 @@
463	449	//SendInfo("Name:", "bold");
464	450	if (sel.GetTextures() != null \|\| debug)
465	451	{
466		- si.SendInfo(sel.toString(), "bold");
	452	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	453	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	454	if (sel.Size() > 0)
469	455	{
470	456	si.SendInfo("#children = " + sel.Size(), "regular");
471	457	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	458	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	459	if (debug)
474	460	{
475	461	try
..	..	@@ -481,7 +467,10 @@
481	467	}
482	468
483	469	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	470	+ {
	471	+ si.SendInfo(" BBox min: " + minima, "regular");
	472	+ si.SendInfo(" BBox max: " + maxima, "regular");
	473	+ }
485	474
486	475	if (sel.bRep != null)
487	476	{
..	..	@@ -508,7 +497,7 @@
508	497	}
509	498	if (sel.support != null)
510	499	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	500	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	501	}
513	502	if (sel.scriptnode != null)
514	503	{
..	..	@@ -522,18 +511,18 @@
522	511	maxima.y = sel.toParent[3][1];
523	512	maxima.z = sel.toParent[3][2];
524	513	si.SendInfo(" Orig: " + maxima, "regular");
525		- maxima.x = sel.globalTransform[3][0];
526		- maxima.y = sel.globalTransform[3][1];
527		- maxima.z = sel.globalTransform[3][2];
528		- if (full)
529		- si.SendInfo(" Global Orig: " + maxima, "regular");
530	514	maxima.x = sel.toParent[0][0];
531	515	maxima.y = sel.toParent[1][1];
532	516	maxima.z = sel.toParent[2][2];
533	517	si.SendInfo(" Scale: " + maxima, "regular");
534		- maxima.x = sel.globalTransform[0][0];
535		- maxima.y = sel.globalTransform[1][1];
536		- maxima.z = sel.globalTransform[2][2];
	518	+ maxima.x = sel.globalTransform[3][0];
	519	+ maxima.y = sel.globalTransform[3][1];
	520	+ maxima.z = sel.globalTransform[3][2];
	521	+ if (full)
	522	+ si.SendInfo(" Global Orig: " + maxima, "regular");
	523	+ maxima.x = sel.globalTransform[0][0];
	524	+ maxima.y = sel.globalTransform[1][1];
	525	+ maxima.z = sel.globalTransform[2][2];
537	526	if (full)
538	527	si.SendInfo(" Global Scale: " + maxima, "regular");
539	528	}
..	..	@@ -579,6 +568,9 @@
579	568	{
580	569	CameraPane.pointflow = (PointFlow) sel;
581	570	}
	571	+
	572	+ si.SendInfo("_____________________", "regular");
	573	+ si.SendInfo("", "regular");
582	574	}
583	575	}
584	576
..	..	@@ -594,52 +586,138 @@
594	586	}
595	587	}
596	588
597		- private JTextArea createTextPane()
598		- {
599		- String[] initString =
600		- {
601		- "This is an editable JTextPane, ", //regular
602		- "another ", //italic
603		- "styled ", //bold
604		- "text ", //small
605		- "component, ", //large
606		- "which supports embedded components..." + newline,//regular
607		- " " + newline, //button
608		- "...and embedded icons..." + newline, //regular
609		- " ", //icon
610		- newline + "JTextPane is a subclass of JEditorPane that "
611		- + "uses a StyledEditorKit and StyledDocument, and provides "
612		- + "cover methods for interacting with those objects."
613		- };
	589	+static GraphicsDevice device = GraphicsEnvironment
	590	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	591
615		- String[] initStyles =
	592	+ Rectangle keeprect;
	593	+ cRadio radio;
	594	+
	595	+cButton keepButton;
	596	+ cButton twoButton; // Full 3D
	597	+ cButton sixButton;
	598	+ cButton threeButton;
	599	+ cButton sevenButton;
	600	+ cButton fourButton; // full panel
	601	+ cButton oneButton; // full XYZ
	602	+ //cButton currentLayout;
	603	+
	604	+ boolean maximized;
	605	+
	606	+ void Minimize()
616	607	{
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
621		-
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	608	+ frame.setState(Frame.ICONIFIED);
	609	+ }
	610	+
	611	+ void Maximize()
628	612	{
629		- for (int j = 0; j < 2; j++)
	613	+ if (maximized)
630	614	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	615	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
636	616	}
637		- } catch (BadLocationException ble)
	617	+ else
	618	+ {
	619	+ keeprect = frame.getBounds();
	620	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	621	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	622	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	623	+// frame.setState(Frame.MAXIMIZED_BOTH);
	624	+ }
	625	+
	626	+ maximized ^= true;
	627	+ }
	628	+
	629	+ void ToggleFullScreen()
638	630	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	631	+ if (CameraPane.FULLSCREEN)
	632	+ {
	633	+ device.setFullScreenWindow(null);
	634	+ //frame.setVisible(false);
	635	+// frame.removeNotify();
	636	+// frame.setUndecorated(false);
	637	+// frame.addNotify();
	638	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	639	+
	640	+// X frame.getContentPane().remove(/"Center",/bigThree);
	641	+// X framePanel.add(bigThree);
	642	+// X frame.getContentPane().add(/"Center",/framePanel);
	643	+ framePanel.setDividerLocation(1);
	644	+
	645	+ //frame.setVisible(true);
	646	+ radio.layout = keepButton;
	647	+ //theFrame = null;
	648	+ keepButton = null;
	649	+ radio.layout.doClick();
	650	+
	651	+ } else
	652	+ {
	653	+ keepButton = radio.layout;
	654	+ //keeprect = frame.getBounds();
	655	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	656	+// frame.getToolkit().getScreenSize().height);
	657	+ //frame.setVisible(false);
	658	+ device.setFullScreenWindow(frame);
	659	+// frame.removeNotify();
	660	+// frame.setUndecorated(true);
	661	+// frame.addNotify();
	662	+// X frame.getContentPane().remove(/"Center",/framePanel);
	663	+// X framePanel.remove(bigThree);
	664	+// X frame.getContentPane().add(/"Center",/bigThree);
	665	+ framePanel.setDividerLocation(0);
	666	+
	667	+ radio.layout = twoButton;
	668	+ radio.layout.doClick();
	669	+ //frame.setVisible(true);
	670	+ }
	671	+
	672	+ cameraView.ToggleFullScreen();
640	673	}
641	674
642		- return new JTextArea(); // textPane;
	675	+ private JTextPane createTextPane()
	676	+ {
	677	+// TEXTAREA String[] initString =
	678	+// {
	679	+// "This is an editable JTextPane, ", //regular
	680	+// "another ", //italic
	681	+// "styled ", //bold
	682	+// "text ", //small
	683	+// "component, ", //large
	684	+// "which supports embedded components..." + newline,//regular
	685	+// " " + newline, //button
	686	+// "...and embedded icons..." + newline, //regular
	687	+// " ", //icon
	688	+// newline + "JTextPane is a subclass of JEditorPane that "
	689	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	690	+// + "cover methods for interacting with those objects."
	691	+// };
	692	+//
	693	+// String[] initStyles =
	694	+// {
	695	+// "regular", "italic", "bold", "small", "large",
	696	+// "regular", "button", "regular", "icon",
	697	+// "regular"
	698	+// };
	699	+//
	700	+// JTextPane textPane = new JTextPane();
	701	+// textPane.setEditable(true);
	702	+// /StyledDocument/ doc = textPane.getStyledDocument();
	703	+// addStylesToDocument(doc);
	704	+//
	705	+// try
	706	+// {
	707	+// for (int j = 0; j < 2; j++)
	708	+// {
	709	+// for (int i = 0; i < initString.length; i++)
	710	+// {
	711	+// doc.insertString(doc.getLength(), initString[i],
	712	+// doc.getStyle(initStyles[i]));
	713	+// }
	714	+// }
	715	+// } catch (BadLocationException ble)
	716	+// {
	717	+// System.err.println("Couldn't insert initial text into text pane.");
	718	+// }
	719	+
	720	+ return new JTextPane(); // textPane;
643	721	}
644	722
645	723	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +770,7 @@
692	770	protected static ImageIcon createImageIcon(String path,
693	771	String description)
694	772	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	773	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	774	if (imgURL != null)
697	775	{
698	776	return new ImageIcon(imgURL, description);
..	..	@@ -724,6 +802,7 @@
724	802	// NumberSlider vDivsField;
725	803	// JCheckBox endcaps;
726	804	JCheckBox liveCB;
	805	+ JCheckBox selectCB;
727	806	JCheckBox hideCB;
728	807	JCheckBox link2masterCB;
729	808	JCheckBox markCB;
..	..	@@ -739,115 +818,84 @@
739	818	JButton slowerButton;
740	819	JButton fasterButton;
741	820	JButton remarkButton;
	821	+
	822	+ cGridBag namePanel;
	823	+ cGridBag setupPanel;
	824	+ cGridBag setupPanel2;
	825	+ cGridBag commandsPanel;
	826	+ cGridBag pushPanel;
	827	+ cGridBag fillPanel;
742	828
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	829	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	830	{
745	831	JCheckBox cb;
746	832
747		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
748		- oe.aConstraints.gridwidth = 1; // 3;
749		-// oe.aConstraints.weightx = 1;
750		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
751		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	833	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	834	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	835
757	836	return cb;
758	837	}
759	838
760		- cButton AddButton(ObjEditor oe, String label)
	839	+ cButton AddButton(cGridBag panel, String label)
761	840	{
762	841	cButton cb;
763	842
764		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
765		- oe.aConstraints.gridwidth = 1;
766		-// oe.aConstraints.weightx = 1;
767		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
768		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	843	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	844	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	845
774	846	return cb;
775	847	}
776	848
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	849	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	850	{
779	851	JComboBox combo;
780	852
781		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
782		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
783		- oe.aConstraints.gridx += 1;
	853	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	854	combo.addActionListener(this);
785	855
786	856	return combo;
787	857	}
788	858
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	859	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	860	{
791		- NumberSlider combo;
	861	+ cGridBag control = new cGridBag();
	862	+
	863	+ cNumberSlider combo;
792	864
793	865	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	866	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797		- aConstraints.gridwidth = 2;
798		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799		- aConstraints.gridx += 1;
800		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
801		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- aConstraints.gridx += 1;
804		- aConstraints.gridwidth = 1;
805		-
	867	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	868	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	869	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	870	+
	871	+ panel.add(control);
	872	+
	873	+ return control;
813	874	}
814	875
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	876	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	877	{
817		- NumberSlider combo;
	878	+ cGridBag control = new cGridBag();
	879	+
	880	+ cNumberSlider combo;
818	881
819	882	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	883	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 2;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	884	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	885	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	886	combo.setInteger(current);
833	887
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	888	+ panel.add(control);
	889	+
	890	+ return control;
839	891	}
840	892
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	893	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	894	{
843	895	JTextArea text;
844	896
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	897	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	898	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	899
852	900	return text;
853	901	}
..	..	@@ -877,9 +925,16 @@
877	925	objEditor.ctrlPanel.remove(j);
878	926	}
879	927
	928	+ void Remove(cNumberSlider j)
	929	+ {
	930	+ j.removeChangeListener(this);
	931	+ //objEditor.ctrlPanel.remove(j.label);
	932	+ objEditor.ctrlPanel.remove(j);
	933	+ }
	934	+
880	935	/*
881	936	*/
882		- void Return() // ObjEditor oe)
	937	+ void Return0() // ObjEditor oe)
883	938	{
884	939	aConstraints.gridy += 1;
885	940	aConstraints.gridx = 0;
..	..	@@ -934,35 +989,77 @@
934	989
935	990	void SetupUI2(ObjEditor oe)
936	991	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	992	+ //SetupName(oe);
	993	+
	994	+ namePanel = new cGridBag();
	995	+
	996	+ nameField = AddText(namePanel, copy.GetName());
	997	+ namePanel.add(nameField);
	998	+ oe.ctrlPanel.add(namePanel);
	999	+
	1000	+ oe.ctrlPanel.Return();
942	1001
943	1002	if (!GroupEditor.allparams)
944	1003	return;
945	1004
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1005	+ setupPanel = new cGridBag().setVertical(false);
	1006	+
	1007	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1008	+ liveCB.setToolTipText("Animate object");
	1009	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1010	+ selectCB.setToolTipText("Make object selectable");
949	1011	// Return();
950		- markCB = AddCheckBox(oe, "Mark", copy.marked);
951		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
952		- randomCB = AddCheckBox(oe, "Rand", copy.random);
953		- Return();
954		- resetButton = AddButton(oe, "Reset");
955		- stepButton = AddButton(oe, "Step");
	1012	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1013	+ hideCB.setToolTipText("Hide object");
	1014	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1015	+ markCB.setToolTipText("Set the animation target transform");
	1016	+
	1017	+ setupPanel2 = new cGridBag().setVertical(false);
	1018	+
	1019	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1020	+ rewindCB.setToolTipText("Rewind animation");
	1021	+
	1022	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1023	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1024	+
	1025	+ if (Globals.ADVANCED)
	1026	+ {
	1027	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1028	+ link2masterCB.setToolTipText("Attach to support");
	1029	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1030	+ speedupCB.setToolTipText("Option motion capture");
	1031	+ }
	1032	+
	1033	+ oe.ctrlPanel.add(setupPanel);
	1034	+ oe.ctrlPanel.Return();
	1035	+ oe.ctrlPanel.add(setupPanel2);
	1036	+ oe.ctrlPanel.Return();
	1037	+
	1038	+ commandsPanel = new cGridBag().setVertical(false);
	1039	+
	1040	+ resetButton = AddButton(commandsPanel, "Reset");
	1041	+ resetButton.setToolTipText("Jump to frame zero");
	1042	+ stepButton = AddButton(commandsPanel, "Step");
	1043	+ stepButton.setToolTipText("Step one frame");
956	1044	// resetAllButton = AddButton(oe, "Reset All");
957	1045	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1046	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1047	+ slowerButton = AddButton(commandsPanel, "Slow");
	1048	+ slowerButton.setToolTipText("Decrease animation speed");
	1049	+ fasterButton = AddButton(commandsPanel, "Fast");
	1050	+ fasterButton.setToolTipText("Increase animation speed");
	1051	+ remarkButton = AddButton(commandsPanel, "Remark");
	1052	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1053
964		- Return();
	1054	+ oe.ctrlPanel.add(commandsPanel);
	1055	+ oe.ctrlPanel.Return();
965	1056
	1057	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1058	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1059	+ //Return();
	1060	+
	1061	+ oe.ctrlPanel.Return();
	1062	+
966	1063	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1064	// ObjEditor.aConstraints.gridx += 1;
968	1065
..	..	@@ -1056,7 +1153,7 @@
1056	1153	oe.aConstraints.gridwidth = 1;
1057	1154	/**/
1058	1155	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1156	+ oe.ctrlPanel.Return();
1060	1157
1061	1158	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1159	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1255,28 @@
1158	1255	//JPanel worldPanel =
1159	1256	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1257	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1258	+ centralPanel = new cGridBag();
	1259	+ centralPanel.preferredWidth = 20;
	1260	+
	1261	+ if (Globals.ADVANCED)
	1262	+ {
	1263	+ timelinePanel = new JPanel(new BorderLayout());
	1264	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1265
	1266	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1267	+ cameraPanel.setContinuousLayout(true);
	1268	+ cameraPanel.setOneTouchExpandable(true);
	1269	+// cameraPanel.setDividerLocation(0.9);
	1270	+// cameraPanel.setDividerSize(9);
	1271	+ cameraPanel.setResizeWeight(1.0);
	1272	+
	1273	+ }
	1274	+
	1275	+ centralPanel.add(cameraView);
	1276	+ centralPanel.setFocusable(true);
	1277	+ //frame.setJMenuBar(timelineMenubar);
	1278	+ //centralPanel.add(timelinePanel);
	1279	+
1165	1280	//topView.camera = ;
1166	1281	//frontView.camera = new Camera(2);
1167	1282	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1292,13 @@
1177	1292	//frontView.object = copy;
1178	1293	//sideView.object = copy;
1179	1294
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1295	+ XYZPanel = new cGridBag().setVertical(true);
	1296	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1297
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1298	+ XYZPanel.preferredWidth = 5;
	1299	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1300	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1301	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1186	1302
1187	1303	/*
1188	1304	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1307,7 @@
1191	1307	gridPanel.add(cameraView);
1192	1308	gridPanel.add(XYZPanel);
1193	1309	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1310	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1311	gridPanel.setContinuousLayout(true);
1196	1312	gridPanel.setOneTouchExpandable(true);
1197	1313	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,10 +1336,11 @@
1220	1336	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1337	//tmp.setName("Edit");
1222	1338	objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- objectPanel.add(north);
	1339	+// JPanel north = new JPanel(new BorderLayout());
	1340	+// north.setName("Edit");
	1341	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1342	+// objectPanel.add(north);
	1343	+ objectPanel.add(ctrlPanel);
1227	1344	objectPanel.add(infoPanel);
1228	1345
1229	1346	/*
..	..	@@ -1244,16 +1361,23 @@
1244	1361	scrollpane.setWheelScrollingEnabled(true);
1245	1362	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1363
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1364	+ /JTabbedPane/ scenePanel = new cGridBag();
	1365	+ scenePanel.preferredWidth = 6;
	1366	+
	1367	+ JTabbedPane tabbedPane = new JTabbedPane();
	1368	+ tabbedPane.add(scrollpane);
1249	1369
1250		- jtp.add(FSPane = new cFileSystemPane(this));
	1370	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1251	1371
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1372	+ optionsPanel = new cGridBag().setVertical(true);
1253	1373
1254	1374	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
1256		-
	1375	+
	1376	+ AddOptions(optionsPanel); //, aConstraints);
	1377	+
	1378	+ tabbedPane.add(optionsPanel);
	1379	+
	1380	+ scenePanel.add(tabbedPane);
1257	1381
1258	1382	/*
1259	1383	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1399,7 @@
1275	1399	jtp.add(tree);
1276	1400	*/
1277	1401
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1402	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1403	bigPanel.setContinuousLayout(true);
1280	1404	bigPanel.setOneTouchExpandable(true);
1281	1405	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1411,7 @@
1287	1411	//bigPanel.setSize(new Dimension(10,10));
1288	1412	//bigPanel.add(ctrlPanel);
1289	1413	//bigPanel.add(gridPanel);
	1414	+ /**
1290	1415	bigThree = new JPanel();
1291	1416	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1417	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1422,26 @@
1297	1422	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1423	aWindowConstraints.weightx = 0;
1299	1424	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1425	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1426	aWindowConstraints.weightx = 1;
1302	1427	aWindowConstraints.gridwidth = 3;
1303	1428	// aConstraints.gridheight = 3;
1304	1429	aWindowConstraints.gridx = 1;
1305	1430	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1431	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1432	aWindowConstraints.weightx = 0;
1308	1433	aWindowConstraints.gridx = 4;
1309	1434	aWindowConstraints.gridwidth = 1;
1310	1435	// aConstraints.gridheight = 3;
1311	1436	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1437	bigThree.add(XYZPanel, aWindowConstraints);
	1438	+ /**/
1313	1439
	1440	+ bigThree = new cGridBag();
	1441	+ bigThree.addComponent(scenePanel);
	1442	+ bigThree.addComponent(centralPanel);
	1443	+ bigThree.addComponent(XYZPanel);
	1444	+
1314	1445	// // SIDE EFFECT!!!
1315	1446	// aConstraints.gridx = 0;
1316	1447	// aConstraints.gridy = 0;
..	..	@@ -1331,14 +1462,17 @@
1331	1462	//worldPane.add(bigPanel);
1332	1463	//worldPane.add(worldPanel);
1333	1464	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1465	+ //frame.getContentPane().add(/"Center",/framePanel);
	1466	+ frame.add(/"Center",/framePanel);
1335	1467	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1468
1337	1469	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1470
1339		- frame.setSize(1024, 768);
1340		- frame.show();
	1471	+ frame.setSize(1280, 860);
	1472	+ frame.setVisible(true);
1341	1473
	1474	+ cameraView.requestFocusInWindow();
	1475	+
1342	1476	gridPanel.setDividerLocation(1.0);
1343	1477
1344	1478	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1352,6 +1486,10 @@
1352	1486	});
1353	1487	}
1354	1488
	1489	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1490	+ {
	1491	+ }
	1492	+
1355	1493	JTree GetTree()
1356	1494	{
1357	1495	return objEditor.jTree;
..	..	@@ -1363,260 +1501,173 @@
1363	1501	ctrlPanel.removeAll();
1364	1502	}
1365	1503
1366		- void SetupMaterial(JPanel ctrlPanel)
	1504	+ void SetupMaterial(cGridBag panel)
1367	1505	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1506	+ /*
1371	1507	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1508	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1509	*/
1376	1510
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	1511	+ cGridBag editBar = new cGridBag().setVertical(false);
	1512	+
	1513	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1514	+ createMaterialButton.setToolTipText("Create material");
1382	1515
1383	1516	/*
1384	1517	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1518	*/
1389	1519
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	1520	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1521	+ clearMaterialButton.setToolTipText("Clear material");
	1522	+
	1523	+ if (Globals.ADVANCED)
	1524	+ {
	1525	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1526	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1527	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1528	+ }
1392	1529
1393		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394		-
1395		- aConstraints.gridx += 1;
1396		-
1397		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398		-
1399		- aConstraints.gridx += 1;
1400		-
1401		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402		-
1403		- aConstraints.gridx = 0;
1404		- aConstraints.gridy += 1;
1405		- aConstraints.weighty = 0;
1406		- aConstraints.gridwidth = 1;
	1530	+ editBar.preferredHeight = 15;
	1531	+
	1532	+ panel.add(editBar);
	1533	+
1407	1534	/**/
1408	1535	//aConstraints.weighty = 0;
1409	1536	////aConstraints.weightx = 1;
1410	1537	//aConstraints.weighty = 1;
1411	1538	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1539	//aConstraints.gridx += 1;
1413		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414		- aConstraints.weighty = 0;
1415		- aConstraints.gridx = 0;
1416		- aConstraints.gridy += 1;
1417		- aConstraints.gridwidth = 1;
	1540	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1541
1419		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424		- //aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426		- aConstraints.gridx = 0;
1427		- aConstraints.gridy += 1;
1428		- aConstraints.gridwidth = 1;
	1542	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1543	+
	1544	+ cGridBag color = new cGridBag();
	1545	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1546	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1547	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1548	+ //colorField.preferredWidth = 200;
	1549	+ colorSection.add(color);
1429	1550
1430		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433		- aConstraints.gridx += 1;
1434		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436		- aConstraints.gridx = 0;
1437		- aConstraints.gridy += 1;
1438		- aConstraints.gridwidth = 1;
	1551	+ cGridBag modulation = new cGridBag();
	1552	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1553	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1554	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1555	+ colorSection.add(modulation);
1439	1556
1440		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443		- aConstraints.gridx += 1;
1444		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	1557	+ cGridBag texture = new cGridBag();
	1558	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1559	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1560	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1561	+ colorSection.add(texture);
1449	1562
1450		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- aConstraints.gridwidth = 1;
	1563	+ cGridBag anisoU = new cGridBag();
	1564	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1565	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1566	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1567	+ colorSection.add(anisoU);
1459	1568
1460		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.gridwidth = 1;
	1569	+ cGridBag anisoV = new cGridBag();
	1570	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1571	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1572	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1573	+ colorSection.add(anisoV);
1469	1574
1470		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473		- aConstraints.gridx += 1;
1474		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476		- aConstraints.gridx = 0;
1477		- aConstraints.gridy += 1;
1478		- aConstraints.gridwidth = 1;
	1575	+ cGridBag shadowbias = new cGridBag();
	1576	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1577	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1578	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1579	+ colorSection.add(shadowbias);
1479	1580
1480		- //aConstraints.weighty = 1;
1481		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482		- //aConstraints.gridx += 1;
1483		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484		- aConstraints.weighty = 0;
1485		- aConstraints.gridx = 0;
1486		- aConstraints.gridy += 1;
1487		- aConstraints.gridwidth = 1;
	1581	+ panel.add(new JSeparator());
	1582	+
	1583	+ panel.add(colorSection);
	1584	+
	1585	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1586	+
	1587	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1588	+
	1589	+ cGridBag diffuse = new cGridBag();
	1590	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1591	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1592	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1593	+ diffuseSection.add(diffuse);
1488	1594
1489		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492		- aConstraints.gridx += 1;
1493		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495		- aConstraints.gridx = 0;
1496		- aConstraints.gridy += 1;
1497		- aConstraints.gridwidth = 1;
	1595	+ cGridBag diffuseness = new cGridBag();
	1596	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1597	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1598	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1599	+ diffuseSection.add(diffuseness);
1498	1600
1499		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502		- aConstraints.gridx += 1;
1503		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505		- aConstraints.gridx = 0;
1506		- aConstraints.gridy += 1;
1507		- aConstraints.gridwidth = 1;
	1601	+ cGridBag selfshadow = new cGridBag();
	1602	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1603	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1604	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1605	+ diffuseSection.add(selfshadow);
1508	1606
1509		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512		- aConstraints.gridx += 1;
1513		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515		- aConstraints.gridx = 0;
1516		- aConstraints.gridy += 1;
1517		- aConstraints.gridwidth = 1;
	1607	+ cGridBag sheen = new cGridBag();
	1608	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1609	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1610	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1611	+ diffuseSection.add(sheen);
1518	1612
1519		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522		- aConstraints.gridx += 1;
1523		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525		- aConstraints.gridx = 0;
1526		- aConstraints.gridy += 1;
1527		- aConstraints.gridwidth = 1;
	1613	+ cGridBag subsurface = new cGridBag();
	1614	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1615	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1616	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1617	+ diffuseSection.add(subsurface);
1528	1618
1529		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532		- aConstraints.gridx += 1;
1533		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535		- aConstraints.gridx = 0;
1536		- aConstraints.gridy += 1;
1537		- aConstraints.gridwidth = 1;
	1619	+ cGridBag shadow = new cGridBag();
	1620	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1621	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1622	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1623	+ diffuseSection.add(shadow);
1538	1624
1539		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542		- aConstraints.gridx += 1;
1543		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545		- aConstraints.gridx = 0;
1546		- aConstraints.gridy += 1;
1547		- aConstraints.gridwidth = 1;
	1625	+ cGridBag fakedepth = new cGridBag();
	1626	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1627	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1628	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1629	+ diffuseSection.add(fakedepth);
1548	1630
1549		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552		- aConstraints.gridx += 1;
1553		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555		- aConstraints.gridx = 0;
1556		- aConstraints.gridy += 1;
1557		- aConstraints.gridwidth = 1;
	1631	+ panel.add(new JSeparator());
	1632	+
	1633	+ panel.add(diffuseSection);
	1634	+
	1635	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1636	+
	1637	+ cGridBag specularSection = new cGridBag().setVertical(true);
1558	1638
1559		- //aConstraints.weighty = 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561		- //aConstraints.gridx += 1;
1562		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563		- aConstraints.weighty = 0;
1564		- aConstraints.gridx = 0;
1565		- aConstraints.gridy += 1;
1566		- aConstraints.gridwidth = 1;
	1639	+ cGridBag specular = new cGridBag();
	1640	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1641	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1642	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1643	+ specularSection.add(specular);
1567	1644
1568		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571		- aConstraints.gridx += 1;
1572		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574		- aConstraints.gridx = 0;
1575		- aConstraints.gridy += 1;
1576		- aConstraints.gridwidth = 1;
	1645	+ cGridBag lightarea = new cGridBag();
	1646	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1647	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1648	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1649	+ specularSection.add(lightarea);
1577	1650
1578		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581		- aConstraints.gridx += 1;
1582		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584		- aConstraints.gridx = 0;
1585		- aConstraints.gridy += 1;
1586		- aConstraints.gridwidth = 1;
	1651	+ cGridBag shininess = new cGridBag();
	1652	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1653	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1654	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1655	+ specularSection.add(shininess);
1587	1656
1588		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591		- aConstraints.gridx += 1;
1592		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594		- aConstraints.gridx = 0;
1595		- aConstraints.gridy += 1;
1596		- aConstraints.gridwidth = 1;
	1657	+ cGridBag metalness = new cGridBag();
	1658	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1659	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1660	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1661	+ specularSection.add(metalness);
1597	1662
1598		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601		- aConstraints.gridx += 1;
1602		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604		- aConstraints.gridx = 0;
1605		- aConstraints.gridy += 1;
1606		- aConstraints.gridwidth = 1;
	1663	+ cGridBag velvet = new cGridBag();
	1664	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1665	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1666	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1667	+ specularSection.add(velvet);
1607	1668
1608		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611		- aConstraints.gridx += 1;
1612		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614		- aConstraints.gridx = 0;
1615		- aConstraints.gridy += 1;
1616		- aConstraints.gridwidth = 1;
1617		-
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	1669	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1670	+ //Return();
1620	1671	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1672	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1673	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1678,93 @@
1627	1678	// aConstraints.gridy += 1;
1628	1679	// aConstraints.gridwidth = 1;
1629	1680
1630		- //aConstraints.weighty = 1;
1631		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632		- //aConstraints.gridx += 1;
1633		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634		- aConstraints.weighty = 0;
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
1638	1681
1639		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
	1682	+ panel.add(new JSeparator());
	1683	+
	1684	+ panel.add(specularSection);
	1685	+
	1686	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1687	+
	1688	+ cGridBag globalSection = new cGridBag().setVertical(true);
1648	1689
1649		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- aConstraints.gridwidth = 1;
	1690	+ cGridBag camera = new cGridBag();
	1691	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1692	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1693	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1694	+ globalSection.add(camera);
1658	1695
1659		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662		- aConstraints.gridx += 1;
1663		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665		- aConstraints.gridx = 0;
1666		- aConstraints.gridy += 1;
1667		- aConstraints.gridwidth = 1;
	1696	+ cGridBag ambient = new cGridBag();
	1697	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1698	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1699	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1700	+ globalSection.add(ambient);
1668	1701
1669		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672		- aConstraints.gridx += 1;
1673		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675		- aConstraints.gridx = 0;
1676		- aConstraints.gridy += 1;
1677		- aConstraints.gridwidth = 1;
1678		- aConstraints.weighty = 0;
	1702	+ cGridBag backlit = new cGridBag();
	1703	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1704	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1705	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1706	+ globalSection.add(backlit);
1679	1707
1680		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	1708	+ cGridBag opacity = new cGridBag();
	1709	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1710	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1711	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1712	+ globalSection.add(opacity);
1689	1713
1690		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
	1714	+ panel.add(new JSeparator());
	1715	+
	1716	+ panel.add(globalSection);
	1717	+
	1718	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1719	+
	1720	+ cGridBag textureSection = new cGridBag().setVertical(true);
1699	1721
1700		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
	1722	+ cGridBag bump = new cGridBag();
	1723	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1724	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1725	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1726	+ textureSection.add(bump);
1709	1727
1710		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- aConstraints.gridwidth = 1;
	1728	+ cGridBag noise = new cGridBag();
	1729	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1730	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1731	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1732	+ textureSection.add(noise);
1719	1733
1720		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723		- aConstraints.gridx += 1;
1724		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726		- aConstraints.gridx = 0;
1727		- aConstraints.gridy += 1;
1728		- aConstraints.gridwidth = 1;
	1734	+ cGridBag power = new cGridBag();
	1735	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1736	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1737	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1738	+ textureSection.add(power);
1729	1739
1730		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733		- aConstraints.gridx += 1;
1734		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1736		- aConstraints.gridx = 0;
1737		- aConstraints.gridy += 1;
1738		- aConstraints.gridwidth = 1;
	1740	+ cGridBag borderfade = new cGridBag();
	1741	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1742	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1743	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1744	+ textureSection.add(borderfade);
1739	1745
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	1746	+ cGridBag fog = new cGridBag();
	1747	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1748	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1749	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1750	+ textureSection.add(fog);
1745	1751
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	1752	+ cGridBag opacityPower = new cGridBag();
	1753	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1754	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1755	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1756	+ textureSection.add(opacityPower);
	1757	+
	1758	+ panel.add(new JSeparator());
	1759	+
	1760	+ panel.add(textureSection);
	1761	+
	1762	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	1763
1750	1764	SetMaterial(copy); // .GetMaterial());
1751	1765
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	1766	+ //colorField.addChangeListener(this);
	1767	+// modulationField.addChangeListener(this);
1754	1768	metalnessField.addChangeListener(this);
1755	1769	diffuseField.addChangeListener(this);
1756	1770	specularField.addChangeListener(this);
..	..	@@ -1780,12 +1794,15 @@
1780	1794	opacityPowerField.addChangeListener(this);
1781	1795	/**/
1782	1796
1783		- resetSlidersButton.addActionListener(this);
1784	1797	clearMaterialButton.addActionListener(this);
1785	1798	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	1799	+
	1800	+ if (Globals.ADVANCED)
	1801	+ {
	1802	+ resetSlidersButton.addActionListener(this);
	1803	+ propagateToggle.addItemListener(this);
	1804	+ multiplyToggle.addItemListener(this);
	1805	+ }
1789	1806	}
1790	1807
1791	1808	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1859,19 +1876,21 @@
1859	1876	}
1860	1877
1861	1878	// Images/textures
1862		- if (textures
1863		- && (filename.toLowerCase().endsWith(".jpg")
1864		- \|\| filename.toLowerCase().endsWith(".jpeg")
1865		- \|\| filename.toLowerCase().endsWith(".gif")
1866		- \|\| filename.toLowerCase().endsWith(".png")
1867		- \|\| filename.toLowerCase().endsWith(".tre")
1868		- \|\| filename.toLowerCase().endsWith(".bmp")
1869		- \|\| filename.toLowerCase().endsWith(".tga")
1870		- \|\| filename.toLowerCase().endsWith(".sgi")
1871		- \|\| filename.toLowerCase().endsWith(".tif")
1872		- \|\| filename.toLowerCase().endsWith(".tiff")))
	1879	+ if (filename.toLowerCase().endsWith(".jpg")
	1880	+ \|\| filename.toLowerCase().endsWith(".jpeg")
	1881	+ \|\| filename.toLowerCase().endsWith(".gif")
	1882	+ \|\| filename.toLowerCase().endsWith(".png")
	1883	+ \|\| filename.toLowerCase().endsWith(".tre")
	1884	+ \|\| filename.toLowerCase().endsWith(".bmp")
	1885	+ \|\| filename.toLowerCase().endsWith(".tga")
	1886	+ \|\| filename.toLowerCase().endsWith(".sgi")
	1887	+ \|\| filename.toLowerCase().endsWith(".tif")
	1888	+ \|\| filename.toLowerCase().endsWith(".tiff"))
1873	1889	{
1874		- DropTexture(filename);
	1890	+ if (textures)
	1891	+ DropTexture(filename);
	1892	+ else
	1893	+ CreateBillboard(filename);
1875	1894	continue;
1876	1895	}
1877	1896
..	..	@@ -1880,6 +1899,60 @@
1880	1899	}
1881	1900
1882	1901	ResetModel();
	1902	+ }
	1903	+
	1904	+ void CreateBillboard(String filename)
	1905	+ {
	1906	+ Object3D source = null;
	1907	+ Object3D group = copy;
	1908	+
	1909	+ if (group.selection.size() > 0)
	1910	+ {
	1911	+ source = group.selection.get(0);
	1912	+ }
	1913	+
	1914	+ Grid grid = new Grid(1,1);
	1915	+ grid.material = null;
	1916	+
	1917	+ grid.toParent = LA.newMatrix();
	1918	+ grid.fromParent = LA.newMatrix();
	1919	+ LA.matYRotate(grid.toParent, Math.PI/2);
	1920	+ LA.matXRotate(grid.toParent, -Math.PI/2);
	1921	+ LA.matXRotate(grid.fromParent, Math.PI/2);
	1922	+ LA.matYRotate(grid.fromParent, -Math.PI/2);
	1923	+
	1924	+ BillboardNode bb = new BillboardNode();
	1925	+ bb.addChild(grid);
	1926	+
	1927	+ Object3D newgroup = new Object3D();
	1928	+ newgroup.CreateMaterial();
	1929	+
	1930	+ File file = new File(filename);
	1931	+ newgroup.name = file.getName();
	1932	+ newgroup.addChild(bb);
	1933	+
	1934	+ Object3D main = newgroup;
	1935	+
	1936	+ main.SetPigmentTexture(filename);
	1937	+
	1938	+ if (source != null)
	1939	+ {
	1940	+ main.material = new cMaterial(source.material);
	1941	+ if (main.projectedVertices.length < source.projectedVertices.length)
	1942	+ {
	1943	+ main.projectedVertices = new Object3D.cVector2[source.projectedVertices.length];
	1944	+ }
	1945	+
	1946	+ for (int i=0; i<source.projectedVertices.length; i++)
	1947	+ {
	1948	+ main.projectedVertices[i].x = source.projectedVertices[i].x;
	1949	+ main.projectedVertices[i].y = source.projectedVertices[i].y;
	1950	+ }
	1951	+
	1952	+ main.texres = source.texres;
	1953	+ }
	1954	+
	1955	+ makeSomething(newgroup, false);
1883	1956	}
1884	1957
1885	1958	Point location;
..	..	@@ -1900,7 +1973,7 @@
1900	1973
1901	1974	//? flashIt = false;
1902	1975	CameraPane pane = (CameraPane) cameraView;
1903		- pane.clickStart(location.x, location.y, 0);
	1976	+ pane.clickStart(location.x, location.y, 0, 0);
1904	1977	pane.clickEnd(location.x, location.y, 0, true);
1905	1978
1906	1979	if (group.selection.size() == 1)
..	..	@@ -1949,6 +2022,7 @@
1949	2022	e2.printStackTrace();
1950	2023	}
1951	2024	}
	2025	+
1952	2026	LoadJMEThread loadThread;
1953	2027
1954	2028	class LoadJMEThread extends Thread
..	..	@@ -2006,6 +2080,7 @@
2006	2080	//LoadFile0(filename, converter);
2007	2081	}
2008	2082	}
	2083	+
2009	2084	LoadOBJThread loadObjThread;
2010	2085
2011	2086	class LoadOBJThread extends Thread
..	..	@@ -2084,19 +2159,19 @@
2084	2159
2085	2160	void LoadObjFile(String fullname)
2086	2161	{
2087		- /*
	2162	+ System.out.println("Loading " + fullname);
	2163	+ /**/
2088	2164	//lastFilename = fullname;
2089	2165	if(loadObjThread == null)
2090	2166	{
2091		- loadObjThread = new LoadOBJThread();
2092		- loadObjThread.start();
	2167	+ loadObjThread = new LoadOBJThread();
	2168	+ loadObjThread.start();
2093	2169	}
2094	2170
2095	2171	loadObjThread.add(fullname);
2096		- */
	2172	+ /**/
2097	2173
2098		- System.out.println("Loading " + fullname);
2099		- makeSomething(new FileObject(fullname, true), true);
	2174	+ //makeSomething(new FileObject(fullname, true), true);
2100	2175	}
2101	2176
2102	2177	void LoadGFDFile(String fullname)
..	..	@@ -2138,6 +2213,8 @@
2138	2213	{
2139	2214	Mocap sel = (Mocap) copy.selection.get(0);
2140	2215
	2216	+ sel.SetCurrentBones(sel.frame);
	2217	+
2141	2218	sel.fullname = fullname;
2142	2219
2143	2220	if (changename)
..	..	@@ -2151,14 +2228,18 @@
2151	2228	sel.smoothed = false;
2152	2229
2153	2230	// if (!changename)
2154		- sel.SetPositionDelta(false, true, true, true/?/); // false
	2231	+ //sel.SetPositionDelta(false, true, true, true/?/); // false
	2232	+ sel.SetGlobalTransform();
	2233	+ sel.LoadData();
	2234	+ sel.Rewind();
	2235	+ sel.Fade();
2155	2236	// sel.setPose(0);
2156	2237	refreshContents();
2157	2238	} else
2158	2239	{
2159	2240	mocap.Reset();
2160	2241	// new skeleton
2161		- makeSomething(mocap, false); // true);
	2242	+ makeSomething(mocap, true); // true);
2162	2243	}
2163	2244	} catch (Exception e)
2164	2245	{
..	..	@@ -2185,6 +2266,8 @@
2185	2266	{
2186	2267	Mocap sel = (Mocap) select;
2187	2268
	2269	+ sel.SetCurrentBones(sel.frame);
	2270	+
2188	2271	File file = new File(fullname);
2189	2272
2190	2273	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2251,7 +2334,11 @@
2251	2334
2252	2335	if (!changename)
2253	2336	{
2254		- sel.SetPositionDelta(false, true, true, true/?/);
	2337	+ //sel.SetPositionDelta(false, true, true, true/?/);
	2338	+ sel.SetGlobalTransform();
	2339	+ sel.LoadData();
	2340	+ sel.Rewind();
	2341	+ sel.Fade();
2255	2342	}
2256	2343
2257	2344	// sel.setPose(0);
..	..	@@ -2345,11 +2432,11 @@
2345	2432
2346	2433	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2434	{
2348		- if (GrafreeD.standAlone)
	2435	+ if (Grafreed.standAlone)
2349	2436	{
2350	2437	/**/
2351	2438	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2439	+ browser.setVisible(true);
2353	2440	String filename = browser.getFile();
2354	2441	if (filename != null && filename.length() > 0)
2355	2442	{
..	..	@@ -2494,6 +2581,7 @@
2494	2581	}
2495	2582	if (input == null)
2496	2583	{
	2584	+ new Exception().printStackTrace();
2497	2585	System.exit(0);
2498	2586	}
2499	2587
..	..	@@ -2708,7 +2796,8 @@
2708	2796	return;
2709	2797	}
2710	2798
2711		- multiplyToggle.setSelected(mat.multiply);
	2799	+ if (multiplyToggle != null)
	2800	+ multiplyToggle.setSelected(mat.multiply);
2712	2801
2713	2802	assert (object.projectedVertices != null);
2714	2803
..	..	@@ -2890,25 +2979,42 @@
2890	2979	// june 2013 copy.HardTouch();
2891	2980	cameraView.repaint();
2892	2981	return;
2893		- } else if (event.getSource() == toggleFullItem)
	2982	+ } else if (event.getSource() == toggleTimelineItem)
2894	2983	{
2895		- if (CameraPane.FULLSCREEN)
	2984	+ timeline ^= true;
	2985	+
	2986	+ if (timeline)
2896	2987	{
2897		- frame.getContentPane().remove(/"Center",/bigThree);
2898		- framePanel.add(bigThree);
2899		- frame.getContentPane().add(/"Center",/framePanel);
2900		- } else
2901		- {
2902		- frame.getContentPane().remove(/"Center",/framePanel);
2903		- frame.getContentPane().add(/"Center",/bigThree);
	2988	+ centralPanel.remove(cameraView);
	2989	+ cameraPanel.add(cameraView);
	2990	+ centralPanel.add(cameraPanel);
	2991	+ frame.setJMenuBar(timelineMenubar);
	2992	+ wasFullScreen = CameraPane.FULLSCREEN;
	2993	+ if (!CameraPane.FULLSCREEN)
	2994	+ ToggleFullScreen();
	2995	+ toggleFullScreenItem.setEnabled(false);
2904	2996	}
	2997	+ else
	2998	+ {
	2999	+ centralPanel.remove(cameraPanel);
	3000	+ centralPanel.add(cameraView);
	3001	+ frame.setJMenuBar(null);
	3002	+ if (!wasFullScreen)
	3003	+ ToggleFullScreen();
	3004	+ toggleFullScreenItem.setEnabled(true);
	3005	+ }
	3006	+
2905	3007	frame.validate();
2906		- cameraView.ToggleFullScreen();
	3008	+ return;
	3009	+ } else if (event.getSource() == toggleFullScreenItem)
	3010	+ {
	3011	+ ToggleFullScreen();
	3012	+ frame.validate();
2907	3013
2908	3014	return;
2909		- } else if (event.getSource() == toggleRandomItem)
	3015	+ } else if (event.getSource() == toggleSwitchItem)
2910	3016	{
2911		- cameraView.ToggleRandom();
	3017	+ cameraView.ToggleSwitch();
2912	3018	cameraView.repaint();
2913	3019	return;
2914	3020	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2937,6 +3043,10 @@
2937	3043	{
2938	3044	copy.live ^= true;
2939	3045	return;
	3046	+ } else if (event.getSource() == selectCB)
	3047	+ {
	3048	+ copy.dontselect ^= true;
	3049	+ return;
2940	3050	} else if (event.getSource() == hideCB)
2941	3051	{
2942	3052	copy.hide ^= true;
..	..	@@ -2951,6 +3061,7 @@
2951	3061	if (event.getSource() == randomCB)
2952	3062	{
2953	3063	copy.random ^= true;
	3064	+ objEditor.refreshContents();
2954	3065	return;
2955	3066	}
2956	3067	if (event.getSource() == speedupCB)
..	..	@@ -2974,8 +3085,9 @@
2974	3085
2975	3086	public void actionPerformed(ActionEvent event)
2976	3087	{
	3088	+ Object source = event.getSource();
2977	3089	// SCRIPT DIALOG
2978		- if (event.getSource() == okbutton)
	3090	+ if (source == okbutton)
2979	3091	{
2980	3092	textpanel.setVisible(false);
2981	3093	textpanel.remove(textarea);
..	..	@@ -2987,7 +3099,7 @@
2987	3099	textarea = null;
2988	3100	textpanel = null;
2989	3101	}
2990		- if (event.getSource() == cancelbutton)
	3102	+ if (source == cancelbutton)
2991	3103	{
2992	3104	textpanel.setVisible(false);
2993	3105	textpanel.remove(textarea);
..	..	@@ -2999,49 +3111,50 @@
2999	3111	//applySelf();
3000	3112	//client.refreshEditWindow();
3001	3113	//refreshContents();
3002		- if (event.getSource() == nameField)
	3114	+ if (source == nameField)
3003	3115	{
3004	3116	//System.out.println("ObjEditor " + event);
3005	3117	applySelf0(true);
3006	3118	//parent.applySelf();
3007	3119	objEditor.refreshContents();
3008		- } else if (event.getSource() == resetButton)
	3120	+ } else if (source == resetButton)
3009	3121	{
3010	3122	CameraPane.fullreset = true;
3011	3123	copy.Reset(); // ResetMeshes();
3012	3124	copy.Touch();
3013	3125	objEditor.refreshContents();
3014		- } else if (event.getSource() == stepItem)
	3126	+ } else if (source == stepItem)
3015	3127	{
3016		- cameraView.ONESTEP = true;
	3128	+ //cameraView.ONESTEP = true;
	3129	+ Globals.ONESTEP = true;
3017	3130	cameraView.repaint();
3018	3131	return;
3019		- } else if (event.getSource() == stepButton)
	3132	+ } else if (source == stepButton)
3020	3133	{
3021	3134	copy.Step();
3022	3135	copy.Touch();
3023	3136	objEditor.refreshContents();
3024		- } else if (event.getSource() == slowerButton)
	3137	+ } else if (source == slowerButton)
3025	3138	{
3026	3139	copy.Slower();
3027	3140	copy.Touch();
3028	3141	objEditor.refreshContents();
3029		- } else if (event.getSource() == fasterButton)
	3142	+ } else if (source == fasterButton)
3030	3143	{
3031	3144	copy.Faster();
3032	3145	copy.Touch();
3033	3146	objEditor.refreshContents();
3034		- } else if (event.getSource() == remarkButton)
	3147	+ } else if (source == remarkButton)
3035	3148	{
3036	3149	copy.Remark();
3037	3150	copy.Touch();
3038	3151	objEditor.refreshContents();
3039		- } else if (event.getSource() == stepAllButton)
	3152	+ } else if (source == stepAllButton)
3040	3153	{
3041	3154	copy.StepAll();
3042	3155	copy.Touch();
3043	3156	objEditor.refreshContents();
3044		- } else if (event.getSource() == resetAllButton)
	3157	+ } else if (source == resetAllButton)
3045	3158	{
3046	3159	//CameraPane.fullreset = true;
3047	3160	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3074,53 +3187,75 @@
3074	3187	// Close();
3075	3188	// }
3076	3189	// else
3077		- if (event.getSource() == resetSlidersButton)
	3190	+ if (source == resetSlidersButton)
3078	3191	{
3079	3192	ResetSliders();
3080		- } else if (event.getSource() == clearMaterialButton)
	3193	+ } else if (source == clearMaterialButton)
3081	3194	{
3082	3195	ClearMaterial();
3083		- } else if (event.getSource() == createMaterialButton)
	3196	+ } else if (source == createMaterialButton)
3084	3197	{
3085	3198	CreateMaterial();
3086		- } else if (event.getSource() == clearPanelButton)
	3199	+ } else if (source == clearPanelButton)
3087	3200	{
3088	3201	copy.ClearUI();
3089	3202	refreshContents(true);
3090		- } /*
3091		- }
3092		-
3093		- public boolean action(Event event, Object arg)
3094		- {
3095		- */ else if (event.getSource() == closeItem)
	3203	+ } else if (source == importGFDItem)
	3204	+ {
	3205	+ ImportGFD();
	3206	+ } else
	3207	+ if (source == importVRMLX3DItem)
	3208	+ {
	3209	+ ImportVRMLX3D();
	3210	+ } else
	3211	+ if (source == import3DSItem)
	3212	+ {
	3213	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3214	+ } else
	3215	+ if (source == importOBJItem)
	3216	+ {
	3217	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3218	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3219	+ browser.setVisible(true);
	3220	+ String filename = browser.getFile();
	3221	+ if (filename != null && filename.length() > 0)
	3222	+ {
	3223	+ String fullname = browser.getDirectory() + filename;
	3224	+ makeSomething(ReadOBJ(fullname), true);
	3225	+ }
	3226	+ } else
	3227	+ if (source == closeItem)
3096	3228	{
3097	3229	Close();
3098	3230	//return true;
3099		- } else if (event.getSource() == loadItem)
	3231	+ } else if (source == loadItem)
3100	3232	{
3101	3233	load();
3102	3234	//return true;
3103		- } else if (event.getSource() == saveItem)
	3235	+ } else if (source == newItem)
	3236	+ {
	3237	+ New();
	3238	+ } else if (source == saveItem)
3104	3239	{
3105	3240	save();
3106	3241	//return true;
3107		- } else if (event.getSource() == saveAsItem)
	3242	+ } else if (source == saveAsItem)
3108	3243	{
3109	3244	saveAs();
3110	3245	//return true;
3111		- } else if (event.getSource() == reexportItem)
	3246	+ } else if (source == reexportItem)
3112	3247	{
3113	3248	reexport();
3114	3249	//return true;
3115		- } else if (event.getSource() == exportAsItem)
	3250	+ } else if (source == exportAsItem)
3116	3251	{
3117	3252	export();
3118	3253	//return true;
3119		- } else if (event.getSource() == povItem)
	3254	+ } else if (source == povItem)
3120	3255	{
3121	3256	generatePOV();
3122	3257	//return true;
3123		- } else if (event.getSource() == zBufferItem)
	3258	+ } else if (source == zBufferItem)
3124	3259	{
3125	3260	try
3126	3261	{
..	..	@@ -3142,21 +3277,8 @@
3142	3277	cameraView.repaint();
3143	3278	//return true;
3144	3279	}
3145		- */ else if (event.getSource() == editCameraItem)
3146		- {
3147		- cameraView.ProtectCamera();
3148		- cameraView.repaint();
3149		- return;
3150		- } else if (event.getSource() == revertCameraItem)
3151		- {
3152		- cameraView.RevertCamera();
3153		- cameraView.repaint();
3154		- return;
3155		- } else if (event.getSource() == textureButton)
3156		- {
3157		- return; // true;
3158		- } else // combos...
3159		- if (event.getSource() == texresMenu)
	3280	+ */ else // combos...
	3281	+ if (source == texresMenu)
3160	3282	{
3161	3283	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3162	3284	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3168,27 +3290,283 @@
3168	3290	}
3169	3291	}
3170	3292
3171		- void ToggleAnimation()
	3293	+ void New()
3172	3294	{
3173		- if (!CameraPane.ANIMATION)
	3295	+ while (copy.Size() > 1)
3174	3296	{
3175		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3297	+ copy.remove(1);
	3298	+ }
	3299	+
	3300	+ ResetModel();
	3301	+ objEditor.refreshContents();
	3302	+ }
	3303	+
	3304	+ static public byte[] Compress(Object3D o)
	3305	+ {
	3306	+ try
	3307	+ {
	3308	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3309	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3310	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3311	+
	3312	+ Object3D parent = o.parent;
	3313	+ o.parent = null;
	3314	+
	3315	+ out.writeObject(o);
	3316	+
	3317	+ o.parent = parent;
	3318	+
	3319	+ out.flush();
	3320	+
	3321	+ zstream.close();
	3322	+ out.close();
	3323	+
	3324	+ return baos.toByteArray();
	3325	+ } catch (Exception e)
	3326	+ {
	3327	+ System.err.println(e);
	3328	+ return null;
	3329	+ }
	3330	+ }
	3331	+
	3332	+ static public Object Uncompress(byte[] bytes)
	3333	+ {
	3334	+ System.out.println("#bytes = " + bytes.length);
	3335	+ try
	3336	+ {
	3337	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3338	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3339	+ ObjectInputStream in = new ObjectInputStream(istream);
	3340	+ Object obj = in.readObject();
	3341	+ in.close();
	3342	+
	3343	+ return obj;
	3344	+ } catch (Exception e)
	3345	+ {
	3346	+ System.err.println(e);
	3347	+ return null;
	3348	+ }
	3349	+ }
	3350	+
	3351	+ static public Object clone(Object o)
	3352	+ {
	3353	+ try
	3354	+ {
	3355	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3356	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3357	+
	3358	+ out.writeObject(o);
	3359	+
	3360	+ out.flush();
	3361	+ out.close();
	3362	+
	3363	+ byte[] bytes = baos.toByteArray();
	3364	+
	3365	+ System.out.println("clone = " + bytes.length);
	3366	+
	3367	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3368	+ ObjectInputStream in = new ObjectInputStream(bais);
	3369	+ Object obj = in.readObject();
	3370	+ in.close();
	3371	+
	3372	+ return obj;
	3373	+ } catch (Exception e)
	3374	+ {
	3375	+ System.err.println(e);
	3376	+ return null;
	3377	+ }
	3378	+ }
	3379	+
	3380	+ cRadio GetCurrentTab()
	3381	+ {
	3382	+ cRadio ab;
	3383	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3384	+ {
	3385	+ ab = (cRadio)e.nextElement();
	3386	+ if(ab.GetObject() == copy)
	3387	+ {
	3388	+ return ab;
	3389	+ }
	3390	+ }
	3391	+
	3392	+ return null;
	3393	+ }
	3394	+
	3395	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3396	+
	3397	+ public void Save()
	3398	+ {
	3399	+ cRadio tab = GetCurrentTab();
	3400	+
	3401	+ boolean temp = CameraPane.SWITCH;
	3402	+ CameraPane.SWITCH = false;
	3403	+
	3404	+ copy.ExtractBigData(hashtable);
	3405	+
	3406	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3407	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3408	+
	3409	+ copy.RestoreBigData(hashtable);
	3410	+
	3411	+ CameraPane.SWITCH = temp;
	3412	+
	3413	+ //assert(hashtable.isEmpty());
	3414	+
	3415	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3416	+ {
	3417	+ tab.graphs[i] = null;
	3418	+ }
	3419	+
	3420	+ // test save
	3421	+ if (false)
	3422	+ {
	3423	+ try
	3424	+ {
	3425	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3426	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3427	+
	3428	+ p.writeObject(copy);
	3429	+
	3430	+ p.flush();
	3431	+
	3432	+ ostream.close();
	3433	+ } catch (Exception e)
	3434	+ {
	3435	+ e.printStackTrace();
	3436	+ }
	3437	+ }
	3438	+ }
	3439	+
	3440	+ void CopyChanged(Object3D obj)
	3441	+ {
	3442	+ boolean temp = CameraPane.SWITCH;
	3443	+ CameraPane.SWITCH = false;
	3444	+
	3445	+ copy.ExtractBigData(hashtable);
	3446	+
	3447	+ copy.clear();
	3448	+
	3449	+ for (int i=0; i<obj.Size(); i++)
	3450	+ {
	3451	+ copy.add(obj.get(i));
	3452	+ }
	3453	+
	3454	+ copy.RestoreBigData(hashtable);
	3455	+
	3456	+ CameraPane.SWITCH = temp;
	3457	+
	3458	+ //assert(hashtable.isEmpty());
	3459	+
	3460	+ copy.Touch();
	3461	+
	3462	+ ResetModel();
	3463	+ copy.HardTouch(); // recompile?
	3464	+
	3465	+ cRadio ab;
	3466	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3467	+ {
	3468	+ ab = (cRadio)e.nextElement();
	3469	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3470	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3471	+ if (test != null)
	3472	+ {
	3473	+ test.editWindow = ab.object.editWindow;
	3474	+ ab.object = test;
	3475	+ }
	3476	+ }
	3477	+
	3478	+ refreshContents();
	3479	+ }
	3480	+
	3481	+ public void Undo()
	3482	+ {
	3483	+ cRadio tab = GetCurrentTab();
	3484	+
	3485	+ if (tab.undoindex == 0)
	3486	+ {
	3487	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3488	+ return;
	3489	+ }
	3490	+
	3491	+ if (tab.graphs[tab.undoindex] == null)
	3492	+ {
	3493	+ Save();
	3494	+ tab.undoindex -= 1;
	3495	+ }
	3496	+
	3497	+ tab.undoindex -= 1;
	3498	+
	3499	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3500	+ }
	3501	+
	3502	+ public void Redo()
	3503	+ {
	3504	+ cRadio tab = GetCurrentTab();
	3505	+
	3506	+ if (tab.graphs[tab.undoindex + 1] == null)
	3507	+ {
	3508	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3509	+ return;
	3510	+ }
	3511	+
	3512	+ tab.undoindex += 1;
	3513	+
	3514	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3515	+ }
	3516	+
	3517	+ void ImportGFD()
	3518	+ {
	3519	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3176	3520	browser.show();
3177	3521	String filename = browser.getFile();
3178	3522	if (filename != null && filename.length() > 0)
3179	3523	{
3180		- CameraPane.filename = browser.getDirectory() + filename;
	3524	+ String fullname = browser.getDirectory() + filename;
	3525	+
	3526	+ //Object3D readobj =
	3527	+ objEditor.ReadGFD(fullname, objEditor);
	3528	+ //makeSomething(readobj);
	3529	+ }
	3530	+ }
	3531	+
	3532	+ void ImportVRMLX3D()
	3533	+ {
	3534	+ if (Grafreed.standAlone)
	3535	+ {
	3536	+ /**/
	3537	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3538	+ browser.show();
	3539	+ String filename = browser.getFile();
	3540	+ if (filename != null && filename.length() > 0)
	3541	+ {
	3542	+ String fullname = browser.getDirectory() + filename;
	3543	+ LoadVRMLX3D(fullname);
	3544	+ }
	3545	+ /**/
	3546	+ }
	3547	+ }
	3548	+
	3549	+ void ToggleAnimation()
	3550	+ {
	3551	+ if (!Globals.ANIMATION)
	3552	+ {
	3553	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3554	+ browser.setVisible(true);
	3555	+ String filename = browser.getFile();
	3556	+ if (filename != null && filename.length() > 0)
	3557	+ {
	3558	+ Globals.filename = browser.getDirectory() + filename;
3181	3559	//CameraPane.framecount = 0;
3182		- CameraPane.imagecount = 0;
	3560	+ Globals.imagecount = 0;
3183	3561
3184		- CameraPane.ANIMATION ^= true;
	3562	+ Globals.ANIMATION ^= true;
3185	3563
3186		- GrafreeD.wav.cursor = 0;
3187		- GrafreeD.wav.loop = 0;
	3564	+ Grafreed.wav.cursor = 0;
	3565	+ Grafreed.wav.loop = 0;
3188	3566	}
3189	3567	} else
3190	3568	{
3191		- CameraPane.ANIMATION ^= true;
	3569	+ Globals.ANIMATION ^= true;
3192	3570	}
3193	3571	}
3194	3572
..	..	@@ -3234,7 +3612,7 @@
3234	3612	void CreateMaterial()
3235	3613	{
3236	3614	//copy.ClearMaterial(); // PATCH
3237		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3615	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3238	3616	if (copy.selection.size() > 0)
3239	3617	//SetMaterial(copy);
3240	3618	{
..	..	@@ -3293,11 +3671,11 @@
3293	3671	{
3294	3672	copy.ResetBlockLoop(); // temporary problem
3295	3673
3296		- boolean random = CameraPane.RANDOM;
3297		- CameraPane.RANDOM = false; // parse everything
	3674	+ boolean random = CameraPane.SWITCH;
	3675	+ CameraPane.SWITCH = false; // parse everything
3298	3676	copy.ResetDisplayList();
3299	3677	copy.HardTouch();
3300		- CameraPane.RANDOM = random;
	3678	+ CameraPane.SWITCH = random;
3301	3679	}
3302	3680
3303	3681	// public void applySelf()
..	..	@@ -3367,10 +3745,40 @@
3367	3745	current.fakedepth = (float) fakedepthField.getFloat();
3368	3746	current.shadowbias = (float) shadowbiasField.getFloat();
3369	3747
3370		- if (!NumberSlider.frozen)
	3748	+ if (!cNumberSlider.frozen)
3371	3749	{
3372	3750	//System.out.println("Propagate = " + propagate);
3373	3751	copy.UpdateMaterial(anchor, current, propagate);
	3752	+
	3753	+ if (copy.material != null)
	3754	+ {
	3755	+ cMaterial mat = copy.material;
	3756	+
	3757	+ colorField.SetToolTipValue((mat.color));
	3758	+ modulationField.SetToolTipValue((mat.modulation));
	3759	+ metalnessField.SetToolTipValue((mat.metalness));
	3760	+ diffuseField.SetToolTipValue((mat.diffuse));
	3761	+ specularField.SetToolTipValue((mat.specular));
	3762	+ shininessField.SetToolTipValue((mat.shininess));
	3763	+ shiftField.SetToolTipValue((mat.shift));
	3764	+ ambientField.SetToolTipValue((mat.ambient));
	3765	+ lightareaField.SetToolTipValue((mat.lightarea));
	3766	+ diffusenessField.SetToolTipValue((mat.factor));
	3767	+ velvetField.SetToolTipValue((mat.velvet));
	3768	+ sheenField.SetToolTipValue((mat.sheen));
	3769	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3770	+ backlitField.SetToolTipValue((mat.bump));
	3771	+ anisoField.SetToolTipValue((mat.aniso));
	3772	+ anisoVField.SetToolTipValue((mat.anisoV));
	3773	+ cameraField.SetToolTipValue((mat.cameralight));
	3774	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3775	+ shadowField.SetToolTipValue((mat.shadow));
	3776	+ textureField.SetToolTipValue((mat.texture));
	3777	+ opacityField.SetToolTipValue((mat.opacity));
	3778	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3779	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3780	+ }
	3781	+
3374	3782	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3375	3783	{
3376	3784	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3415,6 +3823,7 @@
3415	3823	\|\| e.getSource() == apertureField
3416	3824	\|\| e.getSource() == shadowblurField)
3417	3825	{
	3826	+ new Exception().printStackTrace();
3418	3827	System.exit(0);
3419	3828	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3420	3829	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3441,7 +3850,13 @@
3441	3850	//System.out.println("PARENT = " + parent);
3442	3851	//if (parent != null)
3443	3852	// parent.applySelf();
3444		- refreshContents();
	3853	+ if (e.getSource() == normalpushField)
	3854	+ {
	3855	+ objEditor.refreshContents();
	3856	+ //Refresh();
	3857	+ }
	3858	+ else
	3859	+ refreshContents();
3445	3860	// ??? client.refreshEditWindow();
3446	3861	}
3447	3862	//else
..	..	@@ -3453,7 +3868,7 @@
3453	3868	//group.name = nameField.getText();
3454	3869	//objEditor.applySelf();
3455	3870
3456		- assert (objEditor == this);
	3871	+ // OCT2018: assert (objEditor == this);
3457	3872	if (copy.selection == null \|\| copy.selection.size() == 0)
3458	3873	//super.applySelf()
3459	3874	; else
..	..	@@ -3477,12 +3892,18 @@
3477	3892	objEditor.copy = keep;
3478	3893	}
3479	3894	}
	3895	+
	3896	+ if (normalpushField != null)
	3897	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3480	3898	}
3481	3899
3482	3900	void SnapObject()
3483	3901	{
3484		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3485		- SnapObject(obj);
	3902	+ if (copy.selection.size() > 0)
	3903	+ {
	3904	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3905	+ SnapObject(obj);
	3906	+ }
3486	3907	}
3487	3908
3488	3909	void SnapObject(Object3D obj)
..	..	@@ -3596,7 +4017,7 @@
3596	4017
3597	4018	if (obj.parent != null)
3598	4019	{
3599		- obj.parent.TransformToWorld(interest);
	4020	+// obj.parent.TransformToWorld(interest);
3600	4021	}
3601	4022
3602	4023	if (!CameraPane.TRACK)
..	..	@@ -3728,7 +4149,7 @@
3728	4149
3729	4150	radioPanel.revalidate();
3730	4151	radioPanel.repaint();
3731		- ctrlPanel.revalidate(); // ? new
	4152	+ ctrlPanel.validate(); // ? new
3732	4153	ctrlPanel.repaint();
3733	4154	}
3734	4155	}
..	..	@@ -3737,6 +4158,7 @@
3737	4158
3738	4159	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3739	4160	{
	4161	+ Save();
3740	4162	//Tween.set(thing, 0).target(1).start(tweenManager);
3741	4163	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3742	4164	// if (thing instanceof GenericJointDemo)
..	..	@@ -3940,6 +4362,7 @@
3940	4362	}
3941	4363	}
3942	4364	}
	4365	+
3943	4366	LoadGFDThread loadGFDThread;
3944	4367
3945	4368	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3959,8 +4382,10 @@
3959	4382
3960	4383	try
3961	4384	{
	4385	+ // Try compressed version first.
3962	4386	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3963		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4387	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4388	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3964	4389
3965	4390	readobj = (Object3D) p.readObject();
3966	4391	istream.close();
..	..	@@ -3968,7 +4393,20 @@
3968	4393	readobj.ResetDisplayList();
3969	4394	} catch (Exception e)
3970	4395	{
3971		- e.printStackTrace();
	4396	+ //e.printStackTrace();
	4397	+ try
	4398	+ {
	4399	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4400	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4401	+
	4402	+ readobj = (Object3D) p.readObject();
	4403	+ istream.close();
	4404	+
	4405	+ readobj.ResetDisplayList();
	4406	+ } catch (Exception e2)
	4407	+ {
	4408	+ e2.printStackTrace();
	4409	+ }
3972	4410	}
3973	4411	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3974	4412	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4014,6 +4452,12 @@
4014	4452
4015	4453	void LoadIt(Object obj)
4016	4454	{
	4455	+ if (obj == null)
	4456	+ {
	4457	+ // Invalid file
	4458	+ return;
	4459	+ }
	4460	+
4017	4461	System.out.println("Loaded " + obj);
4018	4462	//new Exception().printStackTrace();
4019	4463	Object3D readobj = (Object3D) obj;
..	..	@@ -4023,6 +4467,7 @@
4023	4467
4024	4468	if (readobj != null)
4025	4469	{
	4470	+ Save();
4026	4471	try
4027	4472	{
4028	4473	//readobj.deepCopySelf(copy);
..	..	@@ -4085,7 +4530,7 @@
4085	4530
4086	4531	void load() // throws ClassNotFoundException
4087	4532	{
4088		- if (GrafreeD.standAlone)
	4533	+ if (Grafreed.standAlone)
4089	4534	{
4090	4535	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4091	4536	browser.show();
..	..	@@ -4172,11 +4617,13 @@
4172	4617	try
4173	4618	{
4174	4619	FileOutputStream ostream = new FileOutputStream(lastname);
4175		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4620	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4621	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4176	4622
4177	4623	p.writeObject(copy);
4178	4624	p.flush();
4179	4625
	4626	+ zstream.close();
4180	4627	ostream.close();
4181	4628
4182	4629	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4186,11 +4633,12 @@
4186	4633	{
4187	4634	}
4188	4635	}
	4636	+
4189	4637	String lastname;
4190	4638
4191	4639	void saveAs()
4192	4640	{
4193		- if (GrafreeD.standAlone)
	4641	+ if (Grafreed.standAlone)
4194	4642	{
4195	4643	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4196	4644	browser.setVisible(true);
..	..	@@ -4295,13 +4743,13 @@
4295	4743	try
4296	4744	{
4297	4745	FileOutputStream ostream = new FileOutputStream(filename);
4298		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4299		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4746	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4747	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4300	4748
4301	4749	Object3D objectparent = obj.parent;
4302	4750	obj.parent = null;
4303	4751
4304		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4752	+ Object3D object = (Object3D) Grafreed.clone(obj);
4305	4753
4306	4754	obj.parent = objectparent;
4307	4755
..	..	@@ -4313,8 +4761,8 @@
4313	4761	p.writeObject(object);
4314	4762	p.flush();
4315	4763
	4764	+ zstream.close();
4316	4765	ostream.close();
4317		- // zstream.close();
4318	4766
4319	4767	// group.selection.get(0).parent = parent;
4320	4768	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4335,7 +4783,7 @@
4335	4783	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4336	4784	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4337	4785	copy.generatePOV(buffer);
4338		- if (GrafreeD.standAlone)
	4786	+ if (Grafreed.standAlone)
4339	4787	{
4340	4788	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4341	4789	browser.show();
..	..	@@ -4361,7 +4809,8 @@
4361	4809	Object3D client;
4362	4810	Object3D copy;
4363	4811	MenuBar menuBar;
4364		- Menu windowMenu;
	4812	+ Menu fileMenu;
	4813	+ MenuItem newItem;
4365	4814	MenuItem loadItem;
4366	4815	MenuItem saveItem;
4367	4816	MenuItem saveAsItem;
..	..	@@ -4369,21 +4818,20 @@
4369	4818	MenuItem reexportItem;
4370	4819	MenuItem povItem;
4371	4820	MenuItem closeItem;
4372		- Menu cameraMenu;
	4821	+
4373	4822	CheckboxMenuItem zBufferItem;
4374	4823	//MenuItem normalLensItem;
4375		- MenuItem editCameraItem;
4376		- MenuItem revertCameraItem;
4377		- CheckboxMenuItem toggleLiveItem;
4378	4824	MenuItem stepItem;
4379		- CheckboxMenuItem toggleFullItem;
	4825	+ CheckboxMenuItem toggleLiveItem;
	4826	+ CheckboxMenuItem toggleFullScreenItem;
	4827	+ CheckboxMenuItem toggleTimelineItem;
4380	4828	CheckboxMenuItem toggleRenderItem;
4381	4829	CheckboxMenuItem toggleDebugItem;
4382	4830	CheckboxMenuItem toggleFrustumItem;
4383	4831	CheckboxMenuItem toggleFootContactItem;
4384	4832	CheckboxMenuItem toggleDLItem;
4385	4833	CheckboxMenuItem toggleTextureItem;
4386		- CheckboxMenuItem toggleRandomItem;
	4834	+ CheckboxMenuItem toggleSwitchItem;
4387	4835	CheckboxMenuItem toggleRootItem;
4388	4836	CheckboxMenuItem animationItem;
4389	4837	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4391,23 +4839,26 @@
4391	4839	JSplitPane mainPanel;
4392	4840	JScrollPane scrollpane;
4393	4841	JPanel toolbarPanel;
4394		- JPanel treePanel;
	4842	+ cGridBag treePanel;
4395	4843	JPanel radioPanel;
4396	4844	ButtonGroup buttonGroup;
4397		- JPanel ctrlPanel;
4398		- JPanel materialPanel;
	4845	+ cGridBag ctrlPanel;
	4846	+ cGridBag materialPanel;
4399	4847	JScrollPane infoPanel;
4400		- JPanel optionsPanel;
	4848	+ cGridBag optionsPanel;
4401	4849	JTabbedPane objectPanel;
4402		- JPanel XYZPanel;
	4850	+ cGridBag XYZPanel;
4403	4851	JSplitPane gridPanel;
4404	4852	JSplitPane bigPanel;
4405		- JPanel bigThree;
4406		- JTabbedPane jtp;
4407		- JPanel cameraPanel;
	4853	+ cGridBag bigThree;
	4854	+ cGridBag scenePanel;
	4855	+ cGridBag centralPanel;
	4856	+ JSplitPane cameraPanel;
	4857	+ JPanel timelinePanel;
	4858	+ JMenuBar timelineMenubar;
4408	4859	JSplitPane framePanel;
4409	4860	JTextArea/Field/ nameField;
4410		- cButton textureButton;
	4861	+ //cButton textureButton;
4411	4862	cButton okButton;
4412	4863	cButton applyButton;
4413	4864	cButton cancelButton;
..	..	@@ -4454,65 +4905,72 @@
4454	4905	// MATERIAL
4455	4906	JLabel materialLabel;
4456	4907	JLabel colorLabel;
4457		- NumberSlider colorField;
	4908	+ cNumberSlider colorField;
4458	4909	JLabel modulationLabel;
4459		- NumberSlider modulationField;
	4910	+ cNumberSlider modulationField;
4460	4911	JLabel metalnessLabel;
4461		- NumberSlider metalnessField;
	4912	+ cNumberSlider metalnessField;
4462	4913	JLabel diffuseLabel;
4463		- NumberSlider diffuseField;
	4914	+ cNumberSlider diffuseField;
4464	4915	JLabel specularLabel;
4465		- NumberSlider specularField;
	4916	+ cNumberSlider specularField;
4466	4917	JLabel shininessLabel;
4467		- NumberSlider shininessField;
	4918	+ cNumberSlider shininessField;
4468	4919	JLabel shiftLabel;
4469		- NumberSlider shiftField;
	4920	+ cNumberSlider shiftField;
4470	4921	JLabel ambientLabel;
4471		- NumberSlider ambientField;
	4922	+ cNumberSlider ambientField;
4472	4923	JLabel lightareaLabel;
4473		- NumberSlider lightareaField;
	4924	+ cNumberSlider lightareaField;
4474	4925	JLabel diffusenessLabel;
4475		- NumberSlider diffusenessField;
	4926	+ cNumberSlider diffusenessField;
4476	4927	JLabel velvetLabel;
4477		- NumberSlider velvetField;
	4928	+ cNumberSlider velvetField;
4478	4929	JLabel sheenLabel;
4479		- NumberSlider sheenField;
	4930	+ cNumberSlider sheenField;
4480	4931	JLabel subsurfaceLabel;
4481		- NumberSlider subsurfaceField;
	4932	+ cNumberSlider subsurfaceField;
4482	4933	//JLabel bumpLabel;
4483	4934	//NumberSlider bumpField;
4484	4935	JLabel backlitLabel;
4485		- NumberSlider backlitField;
	4936	+ cNumberSlider backlitField;
4486	4937	JLabel anisoLabel;
4487		- NumberSlider anisoField;
	4938	+ cNumberSlider anisoField;
4488	4939	JLabel anisoVLabel;
4489		- NumberSlider anisoVField;
	4940	+ cNumberSlider anisoVField;
4490	4941	JLabel cameraLabel;
4491		- NumberSlider cameraField;
	4942	+ cNumberSlider cameraField;
4492	4943	JLabel selfshadowLabel;
4493		- NumberSlider selfshadowField;
	4944	+ cNumberSlider selfshadowField;
4494	4945	JLabel shadowLabel;
4495		- NumberSlider shadowField;
	4946	+ cNumberSlider shadowField;
4496	4947	JLabel textureLabel;
4497		- NumberSlider textureField;
	4948	+ cNumberSlider textureField;
4498	4949	JLabel opacityLabel;
4499		- NumberSlider opacityField;
	4950	+ cNumberSlider opacityField;
4500	4951	JLabel fakedepthLabel;
4501		- NumberSlider fakedepthField;
	4952	+ cNumberSlider fakedepthField;
4502	4953	JLabel shadowbiasLabel;
4503		- NumberSlider shadowbiasField;
	4954	+ cNumberSlider shadowbiasField;
4504	4955	JLabel bumpLabel;
4505		- NumberSlider bumpField;
	4956	+ cNumberSlider bumpField;
4506	4957	JLabel noiseLabel;
4507		- NumberSlider noiseField;
	4958	+ cNumberSlider noiseField;
4508	4959	JLabel powerLabel;
4509		- NumberSlider powerField;
	4960	+ cNumberSlider powerField;
4510	4961	JLabel borderfadeLabel;
4511		- NumberSlider borderfadeField;
	4962	+ cNumberSlider borderfadeField;
4512	4963	JLabel fogLabel;
4513		- NumberSlider fogField;
	4964	+ cNumberSlider fogField;
4514	4965	JLabel opacityPowerLabel;
4515		- NumberSlider opacityPowerField;
	4966	+ cNumberSlider opacityPowerField;
4516	4967	JTree jTree;
4517	4968	//ObjectUI parent;
	4969	+
	4970	+ cNumberSlider normalpushField;
	4971	+
	4972	+ private MenuItem importGFDItem;
	4973	+ private MenuItem importVRMLX3DItem;
	4974	+ private MenuItem import3DSItem;
	4975	+ private MenuItem importOBJItem;
4518	4976	}