~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -31,6 +37,70 @@
31	37	boolean timeline;
32	38	boolean wasFullScreen;
33	39
	40	+ GroupEditor callee;
	41	+ JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
	103	+
34	104	// SCRIPT
35	105
36	106	transient JFrame textpanel = null;
..	..	@@ -121,51 +191,62 @@
121	191	void keyPressed(int key, int modifiers)
122	192	{
123	193	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	194	+ Globals.theRenderer.keyPressed(key, modifiers);
125	195	}
126	196	*/
127	197
128	198	static GridBagConstraints aConstraints;
129	199	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	200	+
132	201	static int GRIDWIDTH = 100; // 4;
133	202
134	203	public void closeUI()
135	204	{
136	205	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
139	208	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
141	210
142		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
143	214	return;
144	215
145		- objEditor.ctrlPanel.remove(liveCB);
146		- objEditor.ctrlPanel.remove(hideCB);
147		- objEditor.ctrlPanel.remove(markCB);
148		-
149		- objEditor.ctrlPanel.remove(randomCB);
150		- objEditor.ctrlPanel.remove(speedupCB);
151		- objEditor.ctrlPanel.remove(rewindCB);
152		-
153		- objEditor.ctrlPanel.remove(resetButton);
154		- objEditor.ctrlPanel.remove(stepButton);
155		-// objEditor.ctrlPanel.remove(stepAllButton);
156		-// objEditor.ctrlPanel.remove(resetAllButton);
157		- objEditor.ctrlPanel.remove(link2masterCB);
158		- //objEditor.ctrlPanel.remove(flipVCB);
159		- //objEditor.ctrlPanel.remove(texresMenu);
160		- objEditor.ctrlPanel.remove(slowerButton);
161		- objEditor.ctrlPanel.remove(fasterButton);
162		- objEditor.ctrlPanel.remove(remarkButton);
	216	+// objEditor.ctrlPanel.remove(liveCB);
	217	+// objEditor.ctrlPanel.remove(hideCB);
	218	+// objEditor.ctrlPanel.remove(markCB);
	219	+//
	220	+// objEditor.ctrlPanel.remove(randomCB);
	221	+// objEditor.ctrlPanel.remove(speedupCB);
	222	+// objEditor.ctrlPanel.remove(rewindCB);
	223	+//
	224	+// objEditor.ctrlPanel.remove(resetButton);
	225	+// objEditor.ctrlPanel.remove(stepButton);
	226	+//// objEditor.ctrlPanel.remove(stepAllButton);
	227	+//// objEditor.ctrlPanel.remove(resetAllButton);
	228	+// objEditor.ctrlPanel.remove(link2masterCB);
	229	+// //objEditor.ctrlPanel.remove(flipVCB);
	230	+// //objEditor.ctrlPanel.remove(texresMenu);
	231	+// objEditor.ctrlPanel.remove(slowerButton);
	232	+// objEditor.ctrlPanel.remove(fasterButton);
	233	+// objEditor.ctrlPanel.remove(remarkButton);
	234	+
	235	+ objEditor.ctrlPanel.remove(setupPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	238	+ objEditor.ctrlPanel.remove(pushPanel);
	239	+ //objEditor.ctrlPanel.remove(fillPanel);
	240	+
	241	+ //Remove(normalpushField);
163	242	}
164	243
165	244	public ObjEditor GetEditor()
166	245	{
167	246	return objEditor; //.GetEditor();
168	247	}
	248	+
	249	+ // Sometimes myself, sometimes my callee's.
169	250	ObjEditor objEditor;
170	251
171	252	/*
..	..	@@ -228,6 +309,7 @@
228	309	//localCopy.parent = null;
229	310
230	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
231	313	objEditor = this;
232	314	this.callee = callee;
233	315
..	..	@@ -258,27 +340,48 @@
258	340	return frame.action(event, obj);
259	341	}
260	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
261	348	void SetupMenu()
262	349	{
263	350	frame.setMenuBar(menuBar = new MenuBar());
264		- menuBar.add(windowMenu = new Menu("File"));
265		- windowMenu.add(loadItem = new MenuItem("Load..."));
266		- windowMenu.add("-");
267		- windowMenu.add(saveItem = new MenuItem("Save"));
268		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
269	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
270		- windowMenu.add("-");
271		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
272		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
273		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
274	376	if (client.parent != null)
275	377	{
276		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
277	379	} else
278	380	{
279		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
280	382	}
281	383
	384	+ newItem.addActionListener(this);
282	385	loadItem.addActionListener(this);
283	386	saveItem.addActionListener(this);
284	387	saveAsItem.addActionListener(this);
..	..	@@ -287,81 +390,66 @@
287	390	//povItem.addActionListener(this);
288	391	closeItem.addActionListener(this);
289	392
290		- menuBar.add(cameraMenu = new Menu("View"));
291		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
292		- //zBufferItem.addActionListener(this);
293		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
294		- //normalLensItem.addActionListener(this);
295		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
296		- revertCameraItem.addActionListener(this);
297		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
298		- toggleTimelineItem.addItemListener(this);
299		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
300		- toggleFullScreenItem.addItemListener(this);
301		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
302		- cameraMenu.add("-");
303		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
304		- toggleTextureItem.addItemListener(this);
305		- toggleTextureItem.setState(CameraPane.textureon);
306		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
307		- toggleLiveItem.addItemListener(this);
308		- toggleLiveItem.setState(CameraPane.isLIVE());
309		- cameraMenu.add(stepItem = new MenuItem("Step"));
310		- stepItem.addActionListener(this);
311		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
312		-// toggleDLItem.addItemListener(this);
313		-// toggleDLItem.setState(false);
314		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
315		- toggleRenderItem.addItemListener(this);
316		- toggleRenderItem.setState(!CameraPane.frozen);
317		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
318		- toggleDebugItem.addItemListener(this);
319		- toggleDebugItem.setState(CameraPane.DEBUG);
320		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
321		- toggleFrustumItem.addItemListener(this);
322		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
323		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
324		- toggleFootContactItem.addItemListener(this);
325		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
326		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
327		- toggleRandomItem.addItemListener(this);
328		- toggleRandomItem.setState(CameraPane.RANDOM);
329		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
330		- toggleHandleItem.addItemListener(this);
331		- toggleHandleItem.setState(CameraPane.HANDLES);
332		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
333		- togglePaintItem.addItemListener(this);
334		- togglePaintItem.setState(CameraPane.PAINTMODE);
335		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
336		-// toggleRootItem.addItemListener(this);
337		-// toggleRootItem.setState(false);
338		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
339		-// animationItem.addItemListener(this);
340		-// animationItem.setState(CameraPane.ANIMATION);
341		- cameraMenu.add("-");
342		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
343		- editCameraItem.addActionListener(this);
344		-
345	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
346	420	toolbarPanel = new JPanel();
347	421	toolbarPanel.setName("Toolbar");
348		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
349	423	treePanel.setName("Tree");
350		- ctrlPanel = new JPanel(); // new GridBagLayout());
351		- ctrlPanel.setName("Edit");
352		- materialPanel = new JPanel();
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
	428	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
	437	+ materialPanel = new cGridBag().setVertical(true);
353	438	materialPanel.setName("Material");
	439	+
354	440	/JTextPane/
355	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
356	444	infoarea.setEditable(true);
357	445	SetText();
358	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
359	447	// infoarea.setOpaque(false);
360	448	// //infoarea.setForeground(textcolor);
361		- infoarea.setLineWrap(true);
362		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
363	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
364		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ //infoPanel.setPreferredSize(new Dimension(50, 200));
365	453	infoPanel.setName("Info");
366	454	//infoPanel.setLayout(new BorderLayout());
367	455	//infoPanel.add(createTextPane());
..	..	@@ -370,16 +458,23 @@
370	458	mainPanel.setName("Main");
371	459	mainPanel.setContinuousLayout(true);
372	460	mainPanel.setOneTouchExpandable(true);
373		- mainPanel.setDividerLocation(1.0);
374	461	mainPanel.setDividerSize(9);
375		- mainPanel.setResizeWeight(0);
376		-
	462	+ mainPanel.setDividerLocation(0.5); //1.0);
	463	+ mainPanel.setResizeWeight(0.5);
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
377	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
378	473	//mainPanel.setLayout(new GridBagLayout());
379	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
380		- treePanel.setLayout(new GridBagLayout());
381		- ctrlPanel.setLayout(new GridBagLayout());
382		- materialPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
	477	+ //materialPanel.setLayout(new GridBagLayout());
383	478
384	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
385	480	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -418,7 +513,7 @@
418	513	static String newline = "\n";
419	514	protected static final String buttonString = "JButton";
420	515	StyledDocument doc;
421		- JTextArea infoarea;
	516	+ JTextPane infoarea;
422	517
423	518	void ClearInfo()
424	519	{
..	..	@@ -441,10 +536,10 @@
441	536	e.printStackTrace();
442	537	}
443	538
444		- String selection = infoarea.getText();
445		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
446		- java.awt.datatransfer.Clipboard clipboard =
447		- Toolkit.getDefaultToolkit().getSystemClipboard();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
448	543	//clipboard.setContents(data, data);
449	544	}
450	545
..	..	@@ -467,13 +562,13 @@
467	562	//SendInfo("Name:", "bold");
468	563	if (sel.GetTextures() != null \|\| debug)
469	564	{
470		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
471	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
472	567	if (sel.Size() > 0)
473	568	{
474	569	si.SendInfo("#children = " + sel.Size(), "regular");
475	570	}
476		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
477	572	if (debug)
478	573	{
479	574	try
..	..	@@ -485,7 +580,10 @@
485	580	}
486	581
487	582	if (full)
488		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
489	587
490	588	if (sel.bRep != null)
491	589	{
..	..	@@ -512,7 +610,7 @@
512	610	}
513	611	if (sel.support != null)
514	612	{
515		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
516	614	}
517	615	if (sel.scriptnode != null)
518	616	{
..	..	@@ -583,6 +681,9 @@
583	681	{
584	682	CameraPane.pointflow = (PointFlow) sel;
585	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
586	687	}
587	688	}
588	689
..	..	@@ -598,68 +699,169 @@
598	699	}
599	700	}
600	701
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
	720	+
	721	+ void Minimize()
	722	+ {
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
	725	+ }
	726	+
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	730	+ void Maximize()
	731	+ {
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
	737	+ if (maximized)
	738	+ {
	739	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	740	+ }
	741	+ else
	742	+ {
	743	+ keeprect = frame.getBounds();
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	747	+// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	749	+ }
	750	+
	751	+ maximized ^= true;
	752	+
	753	+ frame.validate();
	754	+ }
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
	759	+
601	760	void ToggleFullScreen()
602	761	{
603		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
604	767	{
605		- frame.getContentPane().remove(/"Center",/bigThree);
606		- framePanel.add(bigThree);
607		- frame.getContentPane().add(/"Center",/framePanel);
	768	+ device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
	774	+ //frame.setVisible(false);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(false);
	777	+// frame.addNotify();
	778	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	779	+
	780	+// X frame.getContentPane().remove(/"Center",/bigThree);
	781	+// X framePanel.add(bigThree);
	782	+// X frame.getContentPane().add(/"Center",/framePanel);
	783	+ framePanel.setDividerLocation(1);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
608	791	} else
609	792	{
610		- frame.getContentPane().remove(/"Center",/framePanel);
611		- framePanel.remove(bigThree);
612		- frame.getContentPane().add(/"Center",/bigThree);
	793	+ keepButton = radio.layout;
	794	+ //keeprect = frame.getBounds();
	795	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	796	+// frame.getToolkit().getScreenSize().height);
	797	+ //frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
	801	+ device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
	804	+// frame.removeNotify();
	805	+// frame.setUndecorated(true);
	806	+// frame.addNotify();
	807	+// X frame.getContentPane().remove(/"Center",/framePanel);
	808	+// X framePanel.remove(bigThree);
	809	+// X frame.getContentPane().add(/"Center",/bigThree);
	810	+ framePanel.setDividerLocation(0);
	811	+
	812	+ radio.layout = fullscreenLayout;
	813	+ radio.layout.doClick();
	814	+ //frame.setVisible(true);
613	815	}
614		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
615	817	}
616	818
617		- private JTextArea createTextPane()
	819	+ private JTextPane createTextPane()
618	820	{
619		- String[] initString =
620		- {
621		- "This is an editable JTextPane, ", //regular
622		- "another ", //italic
623		- "styled ", //bold
624		- "text ", //small
625		- "component, ", //large
626		- "which supports embedded components..." + newline,//regular
627		- " " + newline, //button
628		- "...and embedded icons..." + newline, //regular
629		- " ", //icon
630		- newline + "JTextPane is a subclass of JEditorPane that "
631		- + "uses a StyledEditorKit and StyledDocument, and provides "
632		- + "cover methods for interacting with those objects."
633		- };
	821	+// TEXTAREA String[] initString =
	822	+// {
	823	+// "This is an editable JTextPane, ", //regular
	824	+// "another ", //italic
	825	+// "styled ", //bold
	826	+// "text ", //small
	827	+// "component, ", //large
	828	+// "which supports embedded components..." + newline,//regular
	829	+// " " + newline, //button
	830	+// "...and embedded icons..." + newline, //regular
	831	+// " ", //icon
	832	+// newline + "JTextPane is a subclass of JEditorPane that "
	833	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	834	+// + "cover methods for interacting with those objects."
	835	+// };
	836	+//
	837	+// String[] initStyles =
	838	+// {
	839	+// "regular", "italic", "bold", "small", "large",
	840	+// "regular", "button", "regular", "icon",
	841	+// "regular"
	842	+// };
	843	+//
	844	+// JTextPane textPane = new JTextPane();
	845	+// textPane.setEditable(true);
	846	+// /StyledDocument/ doc = textPane.getStyledDocument();
	847	+// addStylesToDocument(doc);
	848	+//
	849	+// try
	850	+// {
	851	+// for (int j = 0; j < 2; j++)
	852	+// {
	853	+// for (int i = 0; i < initString.length; i++)
	854	+// {
	855	+// doc.insertString(doc.getLength(), initString[i],
	856	+// doc.getStyle(initStyles[i]));
	857	+// }
	858	+// }
	859	+// } catch (BadLocationException ble)
	860	+// {
	861	+// System.err.println("Couldn't insert initial text into text pane.");
	862	+// }
634	863
635		- String[] initStyles =
636		- {
637		- "regular", "italic", "bold", "small", "large",
638		- "regular", "button", "regular", "icon",
639		- "regular"
640		- };
641		-
642		- JTextPane textPane = new JTextPane();
643		- textPane.setEditable(true);
644		- /StyledDocument/ doc = textPane.getStyledDocument();
645		- addStylesToDocument(doc);
646		-
647		- try
648		- {
649		- for (int j = 0; j < 2; j++)
650		- {
651		- for (int i = 0; i < initString.length; i++)
652		- {
653		- doc.insertString(doc.getLength(), initString[i],
654		- doc.getStyle(initStyles[i]));
655		- }
656		- }
657		- } catch (BadLocationException ble)
658		- {
659		- System.err.println("Couldn't insert initial text into text pane.");
660		- }
661		-
662		- return new JTextArea(); // textPane;
	864	+ return new JTextPane(); // textPane;
663	865	}
664	866
665	867	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -712,7 +914,7 @@
712	914	protected static ImageIcon createImageIcon(String path,
713	915	String description)
714	916	{
715		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	917	+ java.net.URL imgURL = Grafreed.class.getResource(path);
716	918	if (imgURL != null)
717	919	{
718	920	return new ImageIcon(imgURL, description);
..	..	@@ -744,6 +946,7 @@
744	946	// NumberSlider vDivsField;
745	947	// JCheckBox endcaps;
746	948	JCheckBox liveCB;
	949	+ JCheckBox selectCB;
747	950	JCheckBox hideCB;
748	951	JCheckBox link2masterCB;
749	952	JCheckBox markCB;
..	..	@@ -751,7 +954,12 @@
751	954	JCheckBox speedupCB;
752	955	JCheckBox rewindCB;
753	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
754	961	JComboBox texresMenu;
	962	+
755	963	JButton resetButton;
756	964	JButton stepButton;
757	965	JButton stepAllButton;
..	..	@@ -759,115 +967,87 @@
759	967	JButton slowerButton;
760	968	JButton fasterButton;
761	969	JButton remarkButton;
	970	+
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
	974	+ cGridBag namePanel;
	975	+ cGridBag setupPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
	978	+ cGridBag pushPanel;
	979	+ cGridBag fillPanel;
762	980
763		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	981	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
764	982	{
765	983	JCheckBox cb;
766	984
767		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
768		- oe.aConstraints.gridwidth = 1; // 3;
769		-// oe.aConstraints.weightx = 1;
770		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
771		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	985	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
772	986	cb.addItemListener(this);
773		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
774		- oe.aConstraints.gridwidth = 1;
775		- oe.aConstraints.gridx += 1;
776	987
777	988	return cb;
778	989	}
779	990
780		- cButton AddButton(ObjEditor oe, String label)
	991	+ cButton AddButton(cGridBag panel, String label)
781	992	{
782	993	cButton cb;
783	994
784		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
785		- oe.aConstraints.gridwidth = 1;
786		-// oe.aConstraints.weightx = 1;
787		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
788		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	995	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
789	996	cb.addActionListener(this);
790		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
791		- oe.aConstraints.gridwidth = 1;
792		- oe.aConstraints.gridx += 1;
793	997
794	998	return cb;
795	999	}
796	1000
797		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1001	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
798	1002	{
799	1003	JComboBox combo;
800	1004
801		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
802		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- oe.aConstraints.gridx += 1;
	1005	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
804	1006	combo.addActionListener(this);
805	1007
806	1008	return combo;
807	1009	}
808	1010
809		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1011	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
810	1012	{
811		- NumberSlider combo;
	1013	+ cGridBag control = new cGridBag();
	1014	+
	1015	+ cNumberSlider combo;
812	1016
813	1017	JLabel jlabel = new JLabel(label);
814		-
815		- aConstraints.fill = GridBagConstraints.VERTICAL;
816	1018	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
817		- aConstraints.gridwidth = 2;
818		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
819		- aConstraints.gridx += 1;
820		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
822		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.gridwidth = 1;
825		-
	1019	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1020	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826	1021	combo.setFloat(current);
827		-
828		- combo.label = jlabel;
829		-
830		- combo.addChangeListener(this);
831		-
832		- return combo;
	1022	+
	1023	+ panel.add(control);
	1024	+
	1025	+ return control;
833	1026	}
834	1027
835		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1028	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
836	1029	{
837		- NumberSlider combo;
	1030	+ cGridBag control = new cGridBag();
	1031	+
	1032	+ cNumberSlider combo;
838	1033
839	1034	JLabel jlabel = new JLabel(label);
840		-
841		- aConstraints.fill = GridBagConstraints.VERTICAL;
842	1035	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
843		- aConstraints.gridwidth = 2;
844		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
845		- aConstraints.gridx += 1;
846		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
847		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
848		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851		-
	1036	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1037	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
852	1038	combo.setInteger(current);
853	1039
854		- combo.label = jlabel;
855		-
856		- combo.addChangeListener(this);
857		-
858		- return combo;
	1040	+ panel.add(control);
	1041	+
	1042	+ return control;
859	1043	}
860	1044
861		- JTextArea AddText(JPanel ctrlPanel, String name)
	1045	+ JTextArea AddText(cGridBag ctrlPanel, String name)
862	1046	{
863	1047	JTextArea text;
864	1048
865		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
866		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
867		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1049	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
868	1050	text.addCaretListener(this);
869		- aConstraints.gridx += 1;
870		- aConstraints.gridwidth = 1;
871	1051
872	1052	return text;
873	1053	}
..	..	@@ -897,9 +1077,16 @@
897	1077	objEditor.ctrlPanel.remove(j);
898	1078	}
899	1079
	1080	+ void Remove(cNumberSlider j)
	1081	+ {
	1082	+ j.removeChangeListener(this);
	1083	+ //objEditor.ctrlPanel.remove(j.label);
	1084	+ objEditor.ctrlPanel.remove(j);
	1085	+ }
	1086	+
900	1087	/*
901	1088	*/
902		- void Return() // ObjEditor oe)
	1089	+ void Return0() // ObjEditor oe)
903	1090	{
904	1091	aConstraints.gridy += 1;
905	1092	aConstraints.gridx = 0;
..	..	@@ -954,35 +1141,77 @@
954	1141
955	1142	void SetupUI2(ObjEditor oe)
956	1143	{
957		-// oe.aConstraints.weightx = 0;
958		-// oe.aConstraints.weighty = 0;
959		-// oe.aConstraints.gridx = 0;
960		-// oe.aConstraints.gridy = 0;
961		- SetupName(oe);
	1144	+ //SetupName(oe);
962	1145
963		- if (!GroupEditor.allparams)
	1146	+ namePanel = new cGridBag();
	1147	+
	1148	+ nameField = AddText(namePanel, copy.GetName());
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1150	+ oe.ctrlPanel.add(namePanel);
	1151	+
	1152	+ oe.ctrlPanel.Return();
	1153	+
	1154	+ if (!allparams)
964	1155	return;
965	1156
966		- liveCB = AddCheckBox(oe, "Live", copy.live);
967		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
968		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1157	+ setupPanel = new cGridBag().setVertical(false);
	1158	+
	1159	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1160	+ liveCB.setToolTipText("Animate object");
	1161	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1162	+ selectCB.setToolTipText("Make object selectable");
969	1163	// Return();
970		- markCB = AddCheckBox(oe, "Mark", copy.marked);
971		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
972		- randomCB = AddCheckBox(oe, "Rand", copy.random);
973		- Return();
974		- resetButton = AddButton(oe, "Reset");
975		- stepButton = AddButton(oe, "Step");
	1164	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1165	+ hideCB.setToolTipText("Hide object");
	1166	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1167	+ markCB.setToolTipText("As animation target transform");
	1168	+
	1169	+ setupPanel2 = new cGridBag().setVertical(false);
	1170	+
	1171	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1172	+ rewindCB.setToolTipText("Rewind animation");
	1173	+
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1176	+
	1177	+ if (Globals.ADVANCED)
	1178	+ {
	1179	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1180	+ link2masterCB.setToolTipText("Attach to support");
	1181	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1182	+ speedupCB.setToolTipText("Option motion capture");
	1183	+ }
	1184	+
	1185	+ oe.ctrlPanel.add(setupPanel);
	1186	+ oe.ctrlPanel.Return();
	1187	+ oe.ctrlPanel.add(setupPanel2);
	1188	+ oe.ctrlPanel.Return();
	1189	+
	1190	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1191	+
	1192	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1193	+ resetButton.setToolTipText("Jump to frame zero");
	1194	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1195	+ stepButton.setToolTipText("Step one frame");
976	1196	// resetAllButton = AddButton(oe, "Reset All");
977	1197	// stepAllButton = AddButton(oe, "Step All");
978		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
979	1198	// Return();
980		- slowerButton = AddButton(oe, "Slow");
981		- fasterButton = AddButton(oe, "Fast");
982		- remarkButton = AddButton(oe, "Rem");
	1199	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1200	+ slowerButton.setToolTipText("Decrease animation speed");
	1201	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1202	+ fasterButton.setToolTipText("Increase animation speed");
	1203	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1204	+ remarkButton.setToolTipText("Set the current transform as the target");
983	1205
984		- Return();
	1206	+ oe.ctrlPanel.add(objectCommandsPanel);
	1207	+ oe.ctrlPanel.Return();
985	1208
	1209	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1210	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1211	+ //Return();
	1212	+
	1213	+ oe.ctrlPanel.Return();
	1214	+
986	1215	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1216	// ObjEditor.aConstraints.gridx += 1;
988	1217
..	..	@@ -1076,7 +1305,7 @@
1076	1305	oe.aConstraints.gridwidth = 1;
1077	1306	/**/
1078	1307	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1308	+ oe.ctrlPanel.Return();
1080	1309
1081	1310	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1311	//textureButton.setEnabled(false);
..	..	@@ -1178,11 +1407,25 @@
1178	1407	//JPanel worldPanel =
1179	1408	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1180	1409	//worldPanel.setName("World");
1181		- centralPanel = new JPanel(new BorderLayout());
1182		- timelinePanel = new JPanel(new BorderLayout());
1183		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1410	+ centralPanel = new cGridBag();
	1411	+ centralPanel.preferredWidth = 20;
	1412	+
	1413	+ if (Globals.ADVANCED)
	1414	+ {
	1415	+ timelinePanel = new JPanel(new BorderLayout());
	1416	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1184	1417
	1418	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1419	+ cameraPanel.setContinuousLayout(true);
	1420	+ cameraPanel.setOneTouchExpandable(true);
	1421	+// cameraPanel.setDividerLocation(0.9);
	1422	+// cameraPanel.setDividerSize(9);
	1423	+ cameraPanel.setResizeWeight(1.0);
	1424	+
	1425	+ }
	1426	+
1185	1427	centralPanel.add(cameraView);
	1428	+ centralPanel.setFocusable(true);
1186	1429	//frame.setJMenuBar(timelineMenubar);
1187	1430	//centralPanel.add(timelinePanel);
1188	1431
..	..	@@ -1201,12 +1444,13 @@
1201	1444	//frontView.object = copy;
1202	1445	//sideView.object = copy;
1203	1446
1204		- XYZPanel = new JPanel();
1205		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1447	+ XYZPanel = new cGridBag().setVertical(true);
	1448	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1206	1449
1207		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1208		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1209		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1450	+ XYZPanel.preferredWidth = 5;
	1451	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1452	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1453	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1210	1454
1211	1455	/*
1212	1456	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1244,11 +1488,13 @@
1244	1488	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1245	1489	//tmp.setName("Edit");
1246	1490	objectPanel.add(materialPanel);
1247		- JPanel north = new JPanel(new BorderLayout());
1248		- north.setName("Edit");
1249		- north.add(ctrlPanel, BorderLayout.NORTH);
1250		- objectPanel.add(north);
	1491	+// JPanel north = new JPanel(new BorderLayout());
	1492	+// north.setName("Edit");
	1493	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1494	+// objectPanel.add(north);
	1495	+ objectPanel.add(editPanel);
1251	1496	objectPanel.add(infoPanel);
	1497	+ objectPanel.add(toolboxPanel);
1252	1498
1253	1499	/*
1254	1500	aConstraints.gridx = 0;
..	..	@@ -1257,7 +1503,7 @@
1257	1503	aConstraints.gridy += 1;
1258	1504	aConstraints.gridwidth = 1;
1259	1505	mainPanel.add(objectPanel, aConstraints);
1260		- */
	1506	+ */
1261	1507
1262	1508	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1263	1509	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1268,16 +1514,23 @@
1268	1514	scrollpane.setWheelScrollingEnabled(true);
1269	1515	scrollpane.addMouseWheelListener(this); // Default not fast enough
1270	1516
1271		- /JTabbedPane/ scenePanel = new JTabbedPane();
1272		- scenePanel.add(scrollpane);
	1517	+ /JTabbedPane/ scenePanel = new cGridBag();
	1518	+ scenePanel.preferredWidth = 6;
	1519	+
	1520	+ JTabbedPane tabbedPane = new JTabbedPane();
	1521	+ tabbedPane.add(scrollpane);
1273	1522
1274		- scenePanel.add(FSPane = new cFileSystemPane(this));
1275		-
1276		- optionsPanel = new JPanel(new GridBagLayout());
	1523	+ optionsPanel = new cGridBag().setVertical(false);
1277	1524
1278	1525	optionsPanel.setName("Options");
1279		- scenePanel.add(optionsPanel);
	1526	+
	1527	+ AddOptions(optionsPanel); //, aConstraints);
	1528	+
	1529	+ tabbedPane.add(optionsPanel);
	1530	+
	1531	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1280	1532
	1533	+ scenePanel.add(tabbedPane);
1281	1534
1282	1535	/*
1283	1536	cTree jTree = new cTree(null);
..	..	@@ -1311,6 +1564,7 @@
1311	1564	//bigPanel.setSize(new Dimension(10,10));
1312	1565	//bigPanel.add(ctrlPanel);
1313	1566	//bigPanel.add(gridPanel);
	1567	+ /**
1314	1568	bigThree = new JPanel();
1315	1569	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1316	1570	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1334,7 +1588,13 @@
1334	1588	// aConstraints.gridheight = 3;
1335	1589	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1336	1590	bigThree.add(XYZPanel, aWindowConstraints);
	1591	+ /**/
1337	1592
	1593	+ bigThree = new cGridBag();
	1594	+ bigThree.addComponent(scenePanel);
	1595	+ bigThree.addComponent(centralPanel);
	1596	+ bigThree.addComponent(XYZPanel);
	1597	+
1338	1598	// // SIDE EFFECT!!!
1339	1599	// aConstraints.gridx = 0;
1340	1600	// aConstraints.gridy = 0;
..	..	@@ -1355,15 +1615,21 @@
1355	1615	//worldPane.add(bigPanel);
1356	1616	//worldPane.add(worldPanel);
1357	1617	/**/
1358		- frame.getContentPane().add(/"Center",/framePanel);
	1618	+ //frame.getContentPane().add(/"Center",/framePanel);
	1619	+ frame.add(/"Center",/framePanel);
1359	1620	//frame.getContentPane().add(/"Center",/ worldPane);
1360	1621
1361	1622	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1362	1623
1363		- frame.setSize(1024, 768);
1364		- frame.show();
1365		-
	1624	+ frame.setSize(1280, 860);
	1625	+
	1626	+ cameraView.requestFocusInWindow();
	1627	+
1366	1628	gridPanel.setDividerLocation(1.0);
	1629	+
	1630	+ frame.validate();
	1631	+
	1632	+ frame.setVisible(true);
1367	1633
1368	1634	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1369	1635	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1376,6 +1642,10 @@
1376	1642	});
1377	1643	}
1378	1644
	1645	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1646	+ {
	1647	+ }
	1648	+
1379	1649	JTree GetTree()
1380	1650	{
1381	1651	return objEditor.jTree;
..	..	@@ -1387,260 +1657,161 @@
1387	1657	ctrlPanel.removeAll();
1388	1658	}
1389	1659
1390		- void SetupMaterial(JPanel ctrlPanel)
	1660	+ void SetupMaterial(cGridBag panel)
1391	1661	{
1392		- aConstraints.weighty = 0;
1393		- //aConstraints.weightx = 1;
1394		- /*
	1662	+ /*
1395	1663	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1396	1664	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1397		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1398		- aConstraints.gridx += 1;
1399	1665	*/
1400	1666
1401		- aConstraints.gridwidth = 1;
1402		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1403		- aConstraints.gridx += 1;
1404		- aConstraints.weighty = 0;
1405		- aConstraints.gridwidth = 1;
	1667	+ cGridBag editBar = new cGridBag().setVertical(false);
	1668	+
	1669	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1670	+ createMaterialButton.setToolTipText("Create material");
1406	1671
1407	1672	/*
1408	1673	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1409		- aConstraints.gridx += 1;
1410		- aConstraints.weighty = 0;
1411		- aConstraints.gridwidth = 1;
1412	1674	*/
1413	1675
1414		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1415		- aConstraints.gridx += 1;
	1676	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1677	+ clearMaterialButton.setToolTipText("Clear material");
	1678	+
	1679	+ if (Globals.ADVANCED)
	1680	+ {
	1681	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1682	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1683	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1684	+ }
1416	1685
1417		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1418		-
1419		- aConstraints.gridx += 1;
1420		-
1421		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1422		-
1423		- aConstraints.gridx += 1;
1424		-
1425		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1426		-
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.weighty = 0;
1430		- aConstraints.gridwidth = 1;
	1686	+ editBar.preferredHeight = 15;
	1687	+
	1688	+ panel.add(editBar);
	1689	+
1431	1690	/**/
1432	1691	//aConstraints.weighty = 0;
1433	1692	////aConstraints.weightx = 1;
1434	1693	//aConstraints.weighty = 1;
1435	1694	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1436	1695	//aConstraints.gridx += 1;
1437		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1438		- aConstraints.weighty = 0;
1439		- aConstraints.gridx = 0;
1440		- aConstraints.gridy += 1;
1441		- aConstraints.gridwidth = 1;
	1696	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1442	1697
1443		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1444		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1445		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1446		- aConstraints.gridx += 1;
1447		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1448		- //aConstraints.weightx = 0;
1449		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1450		- aConstraints.gridx = 0;
1451		- aConstraints.gridy += 1;
1452		- aConstraints.gridwidth = 1;
	1698	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1699	+
	1700	+ cGridBag color = new cGridBag();
	1701	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1702	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1703	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1704	+ //colorField.preferredWidth = 200;
	1705	+ colorSection.add(color);
1453	1706
1454		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1455		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1456		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1457		- aConstraints.gridx += 1;
1458		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.gridwidth = 1;
	1707	+ cGridBag modulation = new cGridBag();
	1708	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1709	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1710	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1711	+ colorSection.add(modulation);
1463	1712
1464		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1465		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1467		- aConstraints.gridx += 1;
1468		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1470		- aConstraints.gridx = 0;
1471		- aConstraints.gridy += 1;
1472		- aConstraints.gridwidth = 1;
	1713	+ cGridBag texture = new cGridBag();
	1714	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1715	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1716	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1717	+ colorSection.add(texture);
1473	1718
1474		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1477		- aConstraints.gridx += 1;
1478		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1480		- aConstraints.gridx = 0;
1481		- aConstraints.gridy += 1;
1482		- aConstraints.gridwidth = 1;
	1719	+ panel.add(new JSeparator());
	1720	+
	1721	+ panel.add(colorSection);
	1722	+
	1723	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1724	+
	1725	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1726	+
	1727	+ cGridBag diffuse = new cGridBag();
	1728	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1729	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1730	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1731	+ diffuseSection.add(diffuse);
1483	1732
1484		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1485		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1486		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1487		- aConstraints.gridx += 1;
1488		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1490		- aConstraints.gridx = 0;
1491		- aConstraints.gridy += 1;
1492		- aConstraints.gridwidth = 1;
	1733	+ cGridBag diffuseness = new cGridBag();
	1734	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1735	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1736	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1737	+ diffuseSection.add(diffuseness);
1493	1738
1494		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1497		- aConstraints.gridx += 1;
1498		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1499		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1500		- aConstraints.gridx = 0;
1501		- aConstraints.gridy += 1;
1502		- aConstraints.gridwidth = 1;
	1739	+ cGridBag selfshadow = new cGridBag();
	1740	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1741	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1742	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1743	+ diffuseSection.add(selfshadow);
1503	1744
1504		- //aConstraints.weighty = 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1506		- //aConstraints.gridx += 1;
1507		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1508		- aConstraints.weighty = 0;
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	1745	+ cGridBag sheen = new cGridBag();
	1746	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1747	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1748	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1749	+ diffuseSection.add(sheen);
1512	1750
1513		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1514		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	1751	+ cGridBag subsurface = new cGridBag();
	1752	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1753	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1754	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1755	+ diffuseSection.add(subsurface);
1522	1756
1523		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1524		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	1757	+ cGridBag shadow = new cGridBag();
	1758	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1759	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1760	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1761	+ diffuseSection.add(shadow);
1532	1762
1533		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1534		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	1763	+ cGridBag fakedepth = new cGridBag();
	1764	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1765	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1766	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1767	+ diffuseSection.add(fakedepth);
1542	1768
1543		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1544		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1545		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1546		- aConstraints.gridx += 1;
1547		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1548		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1549		- aConstraints.gridx = 0;
1550		- aConstraints.gridy += 1;
1551		- aConstraints.gridwidth = 1;
	1769	+ cGridBag shadowbias = new cGridBag();
	1770	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1771	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1772	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1773	+ diffuseSection.add(shadowbias);
1552	1774
1553		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1554		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1555		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1556		- aConstraints.gridx += 1;
1557		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1559		- aConstraints.gridx = 0;
1560		- aConstraints.gridy += 1;
1561		- aConstraints.gridwidth = 1;
	1775	+ panel.add(new JSeparator());
	1776	+
	1777	+ panel.add(diffuseSection);
	1778	+
	1779	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1780	+
	1781	+ cGridBag specularSection = new cGridBag().setVertical(true);
1562	1782
1563		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1564		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1565		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1566		- aConstraints.gridx += 1;
1567		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1568		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1569		- aConstraints.gridx = 0;
1570		- aConstraints.gridy += 1;
1571		- aConstraints.gridwidth = 1;
	1783	+ cGridBag specular = new cGridBag();
	1784	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1785	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1786	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1787	+ specularSection.add(specular);
1572	1788
1573		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1574		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1575		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1576		- aConstraints.gridx += 1;
1577		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1578		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1579		- aConstraints.gridx = 0;
1580		- aConstraints.gridy += 1;
1581		- aConstraints.gridwidth = 1;
	1789	+ cGridBag lightarea = new cGridBag();
	1790	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1791	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1792	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1793	+ specularSection.add(lightarea);
1582	1794
1583		- //aConstraints.weighty = 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1585		- //aConstraints.gridx += 1;
1586		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1587		- aConstraints.weighty = 0;
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	1795	+ cGridBag shininess = new cGridBag();
	1796	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1797	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1798	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1799	+ specularSection.add(shininess);
1591	1800
1592		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1593		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	1801	+ cGridBag metalness = new cGridBag();
	1802	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1803	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1804	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1805	+ specularSection.add(metalness);
1601	1806
1602		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1603		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	1807	+ cGridBag velvet = new cGridBag();
	1808	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1809	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1810	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1811	+ specularSection.add(velvet);
1611	1812
1612		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1613		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
1621		-
1622		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1623		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1625		- aConstraints.gridx += 1;
1626		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1628		- aConstraints.gridx = 0;
1629		- aConstraints.gridy += 1;
1630		- aConstraints.gridwidth = 1;
1631		-
1632		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1633		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1634		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1635		- aConstraints.gridx += 1;
1636		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1637		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1638		- aConstraints.gridx = 0;
1639		- aConstraints.gridy += 1;
1640		- aConstraints.gridwidth = 1;
1641		-
1642		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1643		- Return();
	1813	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1814	+ //Return();
1644	1815	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1645	1816	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1646	1817	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1651,130 +1822,105 @@
1651	1822	// aConstraints.gridy += 1;
1652	1823	// aConstraints.gridwidth = 1;
1653	1824
1654		- //aConstraints.weighty = 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1656		- //aConstraints.gridx += 1;
1657		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1658		- aConstraints.weighty = 0;
1659		- aConstraints.gridx = 0;
1660		- aConstraints.gridy += 1;
1661		- aConstraints.gridwidth = 1;
	1825	+ cGridBag anisoU = new cGridBag();
	1826	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1827	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1828	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1829	+ specularSection.add(anisoU);
1662	1830
1663		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1664		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1666		- aConstraints.gridx += 1;
1667		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1668		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1669		- aConstraints.gridx = 0;
1670		- aConstraints.gridy += 1;
1671		- aConstraints.gridwidth = 1;
	1831	+ cGridBag anisoV = new cGridBag();
	1832	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1833	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1834	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1835	+ specularSection.add(anisoV);
1672	1836
1673		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1674		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1675		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1676		- aConstraints.gridx += 1;
1677		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1678		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1679		- aConstraints.gridx = 0;
1680		- aConstraints.gridy += 1;
1681		- aConstraints.gridwidth = 1;
1682	1837
1683		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1684		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1686		- aConstraints.gridx += 1;
1687		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1688		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1689		- aConstraints.gridx = 0;
1690		- aConstraints.gridy += 1;
1691		- aConstraints.gridwidth = 1;
	1838	+ panel.add(new JSeparator());
	1839	+
	1840	+ panel.add(specularSection);
	1841	+
	1842	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1843	+
	1844	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1692	1845
1693		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1694		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1695		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1696		- aConstraints.gridx += 1;
1697		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1699		- aConstraints.gridx = 0;
1700		- aConstraints.gridy += 1;
1701		- aConstraints.gridwidth = 1;
1702		- aConstraints.weighty = 0;
	1846	+ cGridBag camera = new cGridBag();
	1847	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1848	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1849	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1850	+ colorSection.add(camera);
1703	1851
1704		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1705		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1707		- aConstraints.gridx += 1;
1708		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1709		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1710		- aConstraints.gridx = 0;
1711		- aConstraints.gridy += 1;
1712		- aConstraints.gridwidth = 1;
	1852	+ cGridBag ambient = new cGridBag();
	1853	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1854	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1855	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1856	+ colorSection.add(ambient);
1713	1857
1714		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1715		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1717		- aConstraints.gridx += 1;
1718		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1719		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1720		- aConstraints.gridx = 0;
1721		- aConstraints.gridy += 1;
1722		- aConstraints.gridwidth = 1;
	1858	+ cGridBag backlit = new cGridBag();
	1859	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1860	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1861	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1862	+ colorSection.add(backlit);
1723	1863
1724		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1725		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1726		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1727		- aConstraints.gridx += 1;
1728		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1729		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1730		- aConstraints.gridx = 0;
1731		- aConstraints.gridy += 1;
1732		- aConstraints.gridwidth = 1;
	1864	+ cGridBag opacity = new cGridBag();
	1865	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1866	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1867	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1868	+ colorSection.add(opacity);
1733	1869
1734		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1735		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1737		- aConstraints.gridx += 1;
1738		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1739		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1740		- aConstraints.gridx = 0;
1741		- aConstraints.gridy += 1;
1742		- aConstraints.gridwidth = 1;
	1870	+ //panel.add(new JSeparator());
	1871	+
	1872	+ //panel.add(globalSection);
	1873	+
	1874	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1875	+
	1876	+ cGridBag textureSection = new cGridBag().setVertical(true);
1743	1877
1744		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1745		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1747		- aConstraints.gridx += 1;
1748		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1749		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1750		- aConstraints.gridx = 0;
1751		- aConstraints.gridy += 1;
1752		- aConstraints.gridwidth = 1;
	1878	+ cGridBag bump = new cGridBag();
	1879	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1880	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1881	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1882	+ textureSection.add(bump);
1753	1883
1754		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1755		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1756		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1757		- aConstraints.gridx += 1;
1758		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1759		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1760		- aConstraints.gridx = 0;
1761		- aConstraints.gridy += 1;
1762		- aConstraints.gridwidth = 1;
	1884	+ cGridBag noise = new cGridBag();
	1885	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1886	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1887	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1888	+ textureSection.add(noise);
1763	1889
1764		- //aConstraints.weighty = 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1766		- //aConstraints.gridx += 1;
1767		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1768		- aConstraints.weighty = 0;
	1890	+ cGridBag power = new cGridBag();
	1891	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1892	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1893	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1894	+ textureSection.add(power);
1769	1895
1770		- aConstraints.gridx = 0;
1771		- aConstraints.gridy = 0;
1772		- aConstraints.gridwidth = 1;
	1896	+ cGridBag borderfade = new cGridBag();
	1897	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1898	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1899	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1900	+ textureSection.add(borderfade);
	1901	+
	1902	+ cGridBag fog = new cGridBag();
	1903	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1904	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1905	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1906	+ textureSection.add(fog);
	1907	+
	1908	+ cGridBag opacityPower = new cGridBag();
	1909	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1910	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1911	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1912	+ textureSection.add(opacityPower);
	1913	+
	1914	+ panel.add(new JSeparator());
	1915	+
	1916	+ panel.add(textureSection);
	1917	+
	1918	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1773	1919
1774	1920	SetMaterial(copy); // .GetMaterial());
1775	1921
1776		- colorField.addChangeListener(this);
1777		- modulationField.addChangeListener(this);
	1922	+ //colorField.addChangeListener(this);
	1923	+// modulationField.addChangeListener(this);
1778	1924	metalnessField.addChangeListener(this);
1779	1925	diffuseField.addChangeListener(this);
1780	1926	specularField.addChangeListener(this);
..	..	@@ -1804,12 +1950,15 @@
1804	1950	opacityPowerField.addChangeListener(this);
1805	1951	/**/
1806	1952
1807		- resetSlidersButton.addActionListener(this);
1808	1953	clearMaterialButton.addActionListener(this);
1809	1954	createMaterialButton.addActionListener(this);
1810		-
1811		- propagateToggle.addItemListener(this);
1812		- multiplyToggle.addItemListener(this);
	1955	+
	1956	+ if (Globals.ADVANCED)
	1957	+ {
	1958	+ resetSlidersButton.addActionListener(this);
	1959	+ propagateToggle.addItemListener(this);
	1960	+ multiplyToggle.addItemListener(this);
	1961	+ }
1813	1962	}
1814	1963
1815	1964	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1980,7 +2129,7 @@
1980	2129
1981	2130	//? flashIt = false;
1982	2131	CameraPane pane = (CameraPane) cameraView;
1983		- pane.clickStart(location.x, location.y, 0);
	2132	+ pane.clickStart(location.x, location.y, 0, 0);
1984	2133	pane.clickEnd(location.x, location.y, 0, true);
1985	2134
1986	2135	if (group.selection.size() == 1)
..	..	@@ -2029,6 +2178,7 @@
2029	2178	e2.printStackTrace();
2030	2179	}
2031	2180	}
	2181	+
2032	2182	LoadJMEThread loadThread;
2033	2183
2034	2184	class LoadJMEThread extends Thread
..	..	@@ -2086,6 +2236,7 @@
2086	2236	//LoadFile0(filename, converter);
2087	2237	}
2088	2238	}
	2239	+
2089	2240	LoadOBJThread loadObjThread;
2090	2241
2091	2242	class LoadOBJThread extends Thread
..	..	@@ -2164,19 +2315,19 @@
2164	2315
2165	2316	void LoadObjFile(String fullname)
2166	2317	{
2167		- /*
	2318	+ System.out.println("Loading " + fullname);
	2319	+ /**/
2168	2320	//lastFilename = fullname;
2169	2321	if(loadObjThread == null)
2170	2322	{
2171		- loadObjThread = new LoadOBJThread();
2172		- loadObjThread.start();
	2323	+ loadObjThread = new LoadOBJThread();
	2324	+ loadObjThread.start();
2173	2325	}
2174	2326
2175	2327	loadObjThread.add(fullname);
2176		- */
	2328	+ /**/
2177	2329
2178		- System.out.println("Loading " + fullname);
2179		- makeSomething(new FileObject(fullname, true), true);
	2330	+ //makeSomething(new FileObject(fullname, true), true);
2180	2331	}
2181	2332
2182	2333	void LoadGFDFile(String fullname)
..	..	@@ -2437,11 +2588,11 @@
2437	2588
2438	2589	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2439	2590	{
2440		- if (GrafreeD.standAlone)
	2591	+ if (Grafreed.standAlone)
2441	2592	{
2442	2593	/**/
2443	2594	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2444		- browser.show();
	2595	+ browser.setVisible(true);
2445	2596	String filename = browser.getFile();
2446	2597	if (filename != null && filename.length() > 0)
2447	2598	{
..	..	@@ -2586,6 +2737,7 @@
2586	2737	}
2587	2738	if (input == null)
2588	2739	{
	2740	+ new Exception().printStackTrace();
2589	2741	System.exit(0);
2590	2742	}
2591	2743
..	..	@@ -2792,6 +2944,8 @@
2792	2944
2793	2945	void SetMaterial(Object3D object)
2794	2946	{
	2947	+ latestObject = object;
	2948	+
2795	2949	cMaterial mat = object.material;
2796	2950
2797	2951	if (mat == null)
..	..	@@ -2800,7 +2954,8 @@
2800	2954	return;
2801	2955	}
2802	2956
2803		- multiplyToggle.setSelected(mat.multiply);
	2957	+ if (multiplyToggle != null)
	2958	+ multiplyToggle.setSelected(mat.multiply);
2804	2959
2805	2960	assert (object.projectedVertices != null);
2806	2961
..	..	@@ -2902,12 +3057,17 @@
2902	3057	// }
2903	3058
2904	3059	/**/
2905		- if (deselect)
	3060	+ if (deselect \|\| child == null)
2906	3061	{
2907	3062	//group.deselectAll();
2908	3063	//freeze = true;
2909	3064	GetTree().clearSelection();
2910	3065	//freeze = false;
	3066	+
	3067	+ if (child == null)
	3068	+ {
	3069	+ return;
	3070	+ }
2911	3071	}
2912	3072
2913	3073	//group.addSelectee(child);
..	..	@@ -2976,7 +3136,7 @@
2976	3136	cameraView.ToggleDL();
2977	3137	cameraView.repaint();
2978	3138	return;
2979		- } else if (event.getSource() == toggleTextureItem)
	3139	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2980	3140	{
2981	3141	cameraView.ToggleTexture();
2982	3142	// june 2013 copy.HardTouch();
..	..	@@ -2989,7 +3149,8 @@
2989	3149	if (timeline)
2990	3150	{
2991	3151	centralPanel.remove(cameraView);
2992		- centralPanel.add(timelinePanel);
	3152	+ cameraPanel.add(cameraView);
	3153	+ centralPanel.add(cameraPanel);
2993	3154	frame.setJMenuBar(timelineMenubar);
2994	3155	wasFullScreen = CameraPane.FULLSCREEN;
2995	3156	if (!CameraPane.FULLSCREEN)
..	..	@@ -2998,7 +3159,7 @@
2998	3159	}
2999	3160	else
3000	3161	{
3001		- centralPanel.remove(timelinePanel);
	3162	+ centralPanel.remove(cameraPanel);
3002	3163	centralPanel.add(cameraView);
3003	3164	frame.setJMenuBar(null);
3004	3165	if (!wasFullScreen)
..	..	@@ -3014,9 +3175,9 @@
3014	3175	frame.validate();
3015	3176
3016	3177	return;
3017		- } else if (event.getSource() == toggleRandomItem)
	3178	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3018	3179	{
3019		- cameraView.ToggleRandom();
	3180	+ cameraView.ToggleSwitch();
3020	3181	cameraView.repaint();
3021	3182	return;
3022	3183	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3045,6 +3206,10 @@
3045	3206	{
3046	3207	copy.live ^= true;
3047	3208	return;
	3209	+ } else if (event.getSource() == selectCB)
	3210	+ {
	3211	+ copy.dontselect ^= true;
	3212	+ return;
3048	3213	} else if (event.getSource() == hideCB)
3049	3214	{
3050	3215	copy.hide ^= true;
..	..	@@ -3059,6 +3224,7 @@
3059	3224	if (event.getSource() == randomCB)
3060	3225	{
3061	3226	copy.random ^= true;
	3227	+ objEditor.refreshContents();
3062	3228	return;
3063	3229	}
3064	3230	if (event.getSource() == speedupCB)
..	..	@@ -3082,8 +3248,9 @@
3082	3248
3083	3249	public void actionPerformed(ActionEvent event)
3084	3250	{
	3251	+ Object source = event.getSource();
3085	3252	// SCRIPT DIALOG
3086		- if (event.getSource() == okbutton)
	3253	+ if (source == okbutton)
3087	3254	{
3088	3255	textpanel.setVisible(false);
3089	3256	textpanel.remove(textarea);
..	..	@@ -3095,7 +3262,7 @@
3095	3262	textarea = null;
3096	3263	textpanel = null;
3097	3264	}
3098		- if (event.getSource() == cancelbutton)
	3265	+ if (source == cancelbutton)
3099	3266	{
3100	3267	textpanel.setVisible(false);
3101	3268	textpanel.remove(textarea);
..	..	@@ -3107,49 +3274,50 @@
3107	3274	//applySelf();
3108	3275	//client.refreshEditWindow();
3109	3276	//refreshContents();
3110		- if (event.getSource() == nameField)
	3277	+ if (source == nameField)
3111	3278	{
3112	3279	//System.out.println("ObjEditor " + event);
3113	3280	applySelf0(true);
3114	3281	//parent.applySelf();
3115	3282	objEditor.refreshContents();
3116		- } else if (event.getSource() == resetButton)
	3283	+ } else if (source == resetButton)
3117	3284	{
3118	3285	CameraPane.fullreset = true;
3119	3286	copy.Reset(); // ResetMeshes();
3120	3287	copy.Touch();
3121	3288	objEditor.refreshContents();
3122		- } else if (event.getSource() == stepItem)
	3289	+ } else if (source == stepItem)
3123	3290	{
3124		- cameraView.ONESTEP = true;
	3291	+ //cameraView.ONESTEP = true;
	3292	+ Globals.ONESTEP = true;
3125	3293	cameraView.repaint();
3126	3294	return;
3127		- } else if (event.getSource() == stepButton)
	3295	+ } else if (source == stepButton)
3128	3296	{
3129	3297	copy.Step();
3130	3298	copy.Touch();
3131	3299	objEditor.refreshContents();
3132		- } else if (event.getSource() == slowerButton)
	3300	+ } else if (source == slowerButton)
3133	3301	{
3134	3302	copy.Slower();
3135	3303	copy.Touch();
3136	3304	objEditor.refreshContents();
3137		- } else if (event.getSource() == fasterButton)
	3305	+ } else if (source == fasterButton)
3138	3306	{
3139	3307	copy.Faster();
3140	3308	copy.Touch();
3141	3309	objEditor.refreshContents();
3142		- } else if (event.getSource() == remarkButton)
	3310	+ } else if (source == remarkButton)
3143	3311	{
3144	3312	copy.Remark();
3145	3313	copy.Touch();
3146	3314	objEditor.refreshContents();
3147		- } else if (event.getSource() == stepAllButton)
	3315	+ } else if (source == stepAllButton)
3148	3316	{
3149	3317	copy.StepAll();
3150	3318	copy.Touch();
3151	3319	objEditor.refreshContents();
3152		- } else if (event.getSource() == resetAllButton)
	3320	+ } else if (source == resetAllButton)
3153	3321	{
3154	3322	//CameraPane.fullreset = true;
3155	3323	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3182,53 +3350,75 @@
3182	3350	// Close();
3183	3351	// }
3184	3352	// else
3185		- if (event.getSource() == resetSlidersButton)
	3353	+ if (source == resetSlidersButton)
3186	3354	{
3187	3355	ResetSliders();
3188		- } else if (event.getSource() == clearMaterialButton)
	3356	+ } else if (source == clearMaterialButton)
3189	3357	{
3190	3358	ClearMaterial();
3191		- } else if (event.getSource() == createMaterialButton)
	3359	+ } else if (source == createMaterialButton)
3192	3360	{
3193	3361	CreateMaterial();
3194		- } else if (event.getSource() == clearPanelButton)
	3362	+ } else if (source == clearPanelButton)
3195	3363	{
3196	3364	copy.ClearUI();
3197	3365	refreshContents(true);
3198		- } /*
3199		- }
3200		-
3201		- public boolean action(Event event, Object arg)
3202		- {
3203		- */ else if (event.getSource() == closeItem)
	3366	+ } else if (source == importGFDItem)
	3367	+ {
	3368	+ ImportGFD();
	3369	+ } else
	3370	+ if (source == importVRMLX3DItem)
	3371	+ {
	3372	+ ImportVRMLX3D();
	3373	+ } else
	3374	+ if (source == import3DSItem)
	3375	+ {
	3376	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3377	+ } else
	3378	+ if (source == importOBJItem)
	3379	+ {
	3380	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3381	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3382	+ browser.setVisible(true);
	3383	+ String filename = browser.getFile();
	3384	+ if (filename != null && filename.length() > 0)
	3385	+ {
	3386	+ String fullname = browser.getDirectory() + filename;
	3387	+ makeSomething(ReadOBJ(fullname), true);
	3388	+ }
	3389	+ } else
	3390	+ if (source == closeItem)
3204	3391	{
3205	3392	Close();
3206	3393	//return true;
3207		- } else if (event.getSource() == loadItem)
	3394	+ } else if (source == loadItem)
3208	3395	{
3209	3396	load();
3210	3397	//return true;
3211		- } else if (event.getSource() == saveItem)
	3398	+ } else if (source == newItem)
	3399	+ {
	3400	+ New();
	3401	+ } else if (source == saveItem)
3212	3402	{
3213	3403	save();
3214	3404	//return true;
3215		- } else if (event.getSource() == saveAsItem)
	3405	+ } else if (source == saveAsItem)
3216	3406	{
3217	3407	saveAs();
3218	3408	//return true;
3219		- } else if (event.getSource() == reexportItem)
	3409	+ } else if (source == reexportItem)
3220	3410	{
3221	3411	reexport();
3222	3412	//return true;
3223		- } else if (event.getSource() == exportAsItem)
	3413	+ } else if (source == exportAsItem)
3224	3414	{
3225	3415	export();
3226	3416	//return true;
3227		- } else if (event.getSource() == povItem)
	3417	+ } else if (source == povItem)
3228	3418	{
3229	3419	generatePOV();
3230	3420	//return true;
3231		- } else if (event.getSource() == zBufferItem)
	3421	+ } else if (source == zBufferItem)
3232	3422	{
3233	3423	try
3234	3424	{
..	..	@@ -3250,21 +3440,8 @@
3250	3440	cameraView.repaint();
3251	3441	//return true;
3252	3442	}
3253		- */ else if (event.getSource() == editCameraItem)
3254		- {
3255		- cameraView.ProtectCamera();
3256		- cameraView.repaint();
3257		- return;
3258		- } else if (event.getSource() == revertCameraItem)
3259		- {
3260		- cameraView.RevertCamera();
3261		- cameraView.repaint();
3262		- return;
3263		-// } else if (event.getSource() == textureButton)
3264		-// {
3265		-// return; // true;
3266		- } else // combos...
3267		- if (event.getSource() == texresMenu)
	3443	+ */ else // combos...
	3444	+ if (source == texresMenu)
3268	3445	{
3269	3446	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3270	3447	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3276,27 +3453,304 @@
3276	3453	}
3277	3454	}
3278	3455
3279		- void ToggleAnimation()
	3456	+ void New()
3280	3457	{
3281		- if (!CameraPane.ANIMATION)
	3458	+ while (copy.Size() > 1)
3282	3459	{
3283		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3460	+ copy.remove(1);
	3461	+ }
	3462	+
	3463	+ ResetModel();
	3464	+ objEditor.refreshContents();
	3465	+ }
	3466	+
	3467	+ static public byte[] Compress(Object3D o)
	3468	+ {
	3469	+ try
	3470	+ {
	3471	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3472	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3473	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3474	+
	3475	+ Object3D parent = o.parent;
	3476	+ o.parent = null;
	3477	+
	3478	+ out.writeObject(o);
	3479	+
	3480	+ o.parent = parent;
	3481	+
	3482	+ out.flush();
	3483	+
	3484	+ zstream.close();
	3485	+ out.close();
	3486	+
	3487	+ return baos.toByteArray();
	3488	+ } catch (Exception e)
	3489	+ {
	3490	+ System.err.println(e);
	3491	+ return null;
	3492	+ }
	3493	+ }
	3494	+
	3495	+ static public Object Uncompress(byte[] bytes)
	3496	+ {
	3497	+ System.out.println("#bytes = " + bytes.length);
	3498	+ try
	3499	+ {
	3500	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3501	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3502	+ ObjectInputStream in = new ObjectInputStream(istream);
	3503	+ Object obj = in.readObject();
	3504	+ in.close();
	3505	+
	3506	+ return obj;
	3507	+ } catch (Exception e)
	3508	+ {
	3509	+ System.err.println(e);
	3510	+ return null;
	3511	+ }
	3512	+ }
	3513	+
	3514	+ static public Object clone(Object o)
	3515	+ {
	3516	+ try
	3517	+ {
	3518	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3519	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3520	+
	3521	+ out.writeObject(o);
	3522	+
	3523	+ out.flush();
	3524	+ out.close();
	3525	+
	3526	+ byte[] bytes = baos.toByteArray();
	3527	+
	3528	+ System.out.println("clone = " + bytes.length);
	3529	+
	3530	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3531	+ ObjectInputStream in = new ObjectInputStream(bais);
	3532	+ Object obj = in.readObject();
	3533	+ in.close();
	3534	+
	3535	+ return obj;
	3536	+ } catch (Exception e)
	3537	+ {
	3538	+ System.err.println(e);
	3539	+ return null;
	3540	+ }
	3541	+ }
	3542	+
	3543	+ cRadio GetCurrentTab()
	3544	+ {
	3545	+ cRadio ab;
	3546	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3547	+ {
	3548	+ ab = (cRadio)e.nextElement();
	3549	+ if(ab.GetObject() == copy)
	3550	+ {
	3551	+ return ab;
	3552	+ }
	3553	+ }
	3554	+
	3555	+ return null;
	3556	+ }
	3557	+
	3558	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3559	+
	3560	+ public void Save()
	3561	+ {
	3562	+ System.err.println("Save");
	3563	+
	3564	+ cRadio tab = GetCurrentTab();
	3565	+
	3566	+ boolean temp = CameraPane.SWITCH;
	3567	+ CameraPane.SWITCH = false;
	3568	+
	3569	+ copy.ExtractBigData(hashtable);
	3570	+
	3571	+ byte[] compress = Compress(copy);
	3572	+
	3573	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3574	+ tab.graphs[tab.undoindex++] = compress;
	3575	+
	3576	+ copy.RestoreBigData(hashtable);
	3577	+
	3578	+ CameraPane.SWITCH = temp;
	3579	+
	3580	+ //assert(hashtable.isEmpty());
	3581	+
	3582	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3583	+ {
	3584	+ tab.graphs[i] = null;
	3585	+ }
	3586	+
	3587	+ SetUndoStates();
	3588	+
	3589	+ // test save
	3590	+ if (false)
	3591	+ {
	3592	+ try
	3593	+ {
	3594	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3595	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3596	+
	3597	+ p.writeObject(copy);
	3598	+
	3599	+ p.flush();
	3600	+
	3601	+ ostream.close();
	3602	+ } catch (Exception e)
	3603	+ {
	3604	+ e.printStackTrace();
	3605	+ }
	3606	+ }
	3607	+ }
	3608	+
	3609	+ void CopyChanged(Object3D obj)
	3610	+ {
	3611	+ SetUndoStates();
	3612	+
	3613	+ boolean temp = CameraPane.SWITCH;
	3614	+ CameraPane.SWITCH = false;
	3615	+
	3616	+ copy.ExtractBigData(hashtable);
	3617	+
	3618	+ copy.clear();
	3619	+
	3620	+ for (int i=0; i<obj.Size(); i++)
	3621	+ {
	3622	+ copy.add(obj.get(i));
	3623	+ }
	3624	+
	3625	+ copy.RestoreBigData(hashtable);
	3626	+
	3627	+ CameraPane.SWITCH = temp;
	3628	+
	3629	+ //assert(hashtable.isEmpty());
	3630	+
	3631	+ copy.Touch();
	3632	+
	3633	+ ResetModel();
	3634	+ copy.HardTouch(); // recompile?
	3635	+
	3636	+ cRadio ab;
	3637	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3638	+ {
	3639	+ ab = (cRadio)e.nextElement();
	3640	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3641	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3642	+ if (test != null)
	3643	+ {
	3644	+ test.editWindow = ab.object.editWindow;
	3645	+ ab.object = test;
	3646	+ }
	3647	+ }
	3648	+
	3649	+ refreshContents();
	3650	+ }
	3651	+
	3652	+ cButton undoButton;
	3653	+ cButton redoButton;
	3654	+
	3655	+ void SetUndoStates()
	3656	+ {
	3657	+ cRadio tab = GetCurrentTab();
	3658	+
	3659	+ undoButton.setEnabled(tab.undoindex > 0);
	3660	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3661	+ }
	3662	+
	3663	+ public void Undo()
	3664	+ {
	3665	+ System.err.println("Undo");
	3666	+
	3667	+ cRadio tab = GetCurrentTab();
	3668	+
	3669	+ if (tab.undoindex == 0)
	3670	+ {
	3671	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3672	+ return;
	3673	+ }
	3674	+
	3675	+ if (tab.graphs[tab.undoindex] == null)
	3676	+ {
	3677	+ Save();
	3678	+ tab.undoindex -= 1;
	3679	+ }
	3680	+
	3681	+ tab.undoindex -= 1;
	3682	+
	3683	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3684	+ }
	3685	+
	3686	+ public void Redo()
	3687	+ {
	3688	+ cRadio tab = GetCurrentTab();
	3689	+
	3690	+ if (tab.graphs[tab.undoindex + 1] == null)
	3691	+ {
	3692	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3693	+ return;
	3694	+ }
	3695	+
	3696	+ tab.undoindex += 1;
	3697	+
	3698	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3699	+ }
	3700	+
	3701	+ void ImportGFD()
	3702	+ {
	3703	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3284	3704	browser.show();
3285	3705	String filename = browser.getFile();
3286	3706	if (filename != null && filename.length() > 0)
3287	3707	{
3288		- CameraPane.filename = browser.getDirectory() + filename;
	3708	+ String fullname = browser.getDirectory() + filename;
	3709	+
	3710	+ //Object3D readobj =
	3711	+ objEditor.ReadGFD(fullname, objEditor);
	3712	+ //makeSomething(readobj);
	3713	+ }
	3714	+ }
	3715	+
	3716	+ void ImportVRMLX3D()
	3717	+ {
	3718	+ if (Grafreed.standAlone)
	3719	+ {
	3720	+ /**/
	3721	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3722	+ browser.show();
	3723	+ String filename = browser.getFile();
	3724	+ if (filename != null && filename.length() > 0)
	3725	+ {
	3726	+ String fullname = browser.getDirectory() + filename;
	3727	+ LoadVRMLX3D(fullname);
	3728	+ }
	3729	+ /**/
	3730	+ }
	3731	+ }
	3732	+
	3733	+ void ToggleAnimation()
	3734	+ {
	3735	+ if (!Globals.ANIMATION)
	3736	+ {
	3737	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3738	+ browser.setVisible(true);
	3739	+ String filename = browser.getFile();
	3740	+ if (filename != null && filename.length() > 0)
	3741	+ {
	3742	+ Globals.filename = browser.getDirectory() + filename;
3289	3743	//CameraPane.framecount = 0;
3290		- CameraPane.imagecount = 0;
	3744	+ Globals.imagecount = 0;
3291	3745
3292		- CameraPane.ANIMATION ^= true;
	3746	+ Globals.ANIMATION ^= true;
3293	3747
3294		- GrafreeD.wav.cursor = 0;
3295		- GrafreeD.wav.loop = 0;
	3748	+ Grafreed.wav.cursor = 0;
	3749	+ Grafreed.wav.loop = 0;
3296	3750	}
3297	3751	} else
3298	3752	{
3299		- CameraPane.ANIMATION ^= true;
	3753	+ Globals.ANIMATION ^= true;
3300	3754	}
3301	3755	}
3302	3756
..	..	@@ -3342,7 +3796,7 @@
3342	3796	void CreateMaterial()
3343	3797	{
3344	3798	//copy.ClearMaterial(); // PATCH
3345		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3799	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3346	3800	if (copy.selection.size() > 0)
3347	3801	//SetMaterial(copy);
3348	3802	{
..	..	@@ -3393,7 +3847,7 @@
3393	3847	assert false;
3394	3848	}
3395	3849
3396		- void EditSelection()
	3850	+ void EditSelection(boolean newWindow)
3397	3851	{
3398	3852	}
3399	3853
..	..	@@ -3401,11 +3855,11 @@
3401	3855	{
3402	3856	copy.ResetBlockLoop(); // temporary problem
3403	3857
3404		- boolean random = CameraPane.RANDOM;
3405		- CameraPane.RANDOM = false; // parse everything
	3858	+ boolean random = CameraPane.SWITCH;
	3859	+ CameraPane.SWITCH = false; // parse everything
3406	3860	copy.ResetDisplayList();
3407	3861	copy.HardTouch();
3408		- CameraPane.RANDOM = random;
	3862	+ CameraPane.SWITCH = random;
3409	3863	}
3410	3864
3411	3865	// public void applySelf()
..	..	@@ -3475,10 +3929,40 @@
3475	3929	current.fakedepth = (float) fakedepthField.getFloat();
3476	3930	current.shadowbias = (float) shadowbiasField.getFloat();
3477	3931
3478		- if (!NumberSlider.frozen)
	3932	+ if (!cNumberSlider.frozen)
3479	3933	{
3480	3934	//System.out.println("Propagate = " + propagate);
3481	3935	copy.UpdateMaterial(anchor, current, propagate);
	3936	+
	3937	+ if (copy.material != null)
	3938	+ {
	3939	+ cMaterial mat = copy.material;
	3940	+
	3941	+ colorField.SetToolTipValue((mat.color));
	3942	+ modulationField.SetToolTipValue((mat.modulation));
	3943	+ metalnessField.SetToolTipValue((mat.metalness));
	3944	+ diffuseField.SetToolTipValue((mat.diffuse));
	3945	+ specularField.SetToolTipValue((mat.specular));
	3946	+ shininessField.SetToolTipValue((mat.shininess));
	3947	+ shiftField.SetToolTipValue((mat.shift));
	3948	+ ambientField.SetToolTipValue((mat.ambient));
	3949	+ lightareaField.SetToolTipValue((mat.lightarea));
	3950	+ diffusenessField.SetToolTipValue((mat.factor));
	3951	+ velvetField.SetToolTipValue((mat.velvet));
	3952	+ sheenField.SetToolTipValue((mat.sheen));
	3953	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3954	+ backlitField.SetToolTipValue((mat.bump));
	3955	+ anisoField.SetToolTipValue((mat.aniso));
	3956	+ anisoVField.SetToolTipValue((mat.anisoV));
	3957	+ cameraField.SetToolTipValue((mat.cameralight));
	3958	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3959	+ shadowField.SetToolTipValue((mat.shadow));
	3960	+ textureField.SetToolTipValue((mat.texture));
	3961	+ opacityField.SetToolTipValue((mat.opacity));
	3962	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3963	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3964	+ }
	3965	+
3482	3966	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3483	3967	{
3484	3968	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3523,6 +4007,7 @@
3523	4007	\|\| e.getSource() == apertureField
3524	4008	\|\| e.getSource() == shadowblurField)
3525	4009	{
	4010	+ new Exception().printStackTrace();
3526	4011	System.exit(0);
3527	4012	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3528	4013	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3549,7 +4034,13 @@
3549	4034	//System.out.println("PARENT = " + parent);
3550	4035	//if (parent != null)
3551	4036	// parent.applySelf();
3552		- refreshContents();
	4037	+ if (e.getSource() == normalpushField)
	4038	+ {
	4039	+ objEditor.refreshContents();
	4040	+ //Refresh();
	4041	+ }
	4042	+ else
	4043	+ refreshContents();
3553	4044	// ??? client.refreshEditWindow();
3554	4045	}
3555	4046	//else
..	..	@@ -3561,7 +4052,7 @@
3561	4052	//group.name = nameField.getText();
3562	4053	//objEditor.applySelf();
3563	4054
3564		- assert (objEditor == this);
	4055	+ // OCT2018: assert (objEditor == this);
3565	4056	if (copy.selection == null \|\| copy.selection.size() == 0)
3566	4057	//super.applySelf()
3567	4058	; else
..	..	@@ -3585,6 +4076,9 @@
3585	4076	objEditor.copy = keep;
3586	4077	}
3587	4078	}
	4079	+
	4080	+ if (normalpushField != null)
	4081	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3588	4082	}
3589	4083
3590	4084	void SnapObject()
..	..	@@ -3839,7 +4333,7 @@
3839	4333
3840	4334	radioPanel.revalidate();
3841	4335	radioPanel.repaint();
3842		- ctrlPanel.revalidate(); // ? new
	4336	+ ctrlPanel.validate(); // ? new
3843	4337	ctrlPanel.repaint();
3844	4338	}
3845	4339	}
..	..	@@ -3848,6 +4342,8 @@
3848	4342
3849	4343	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3850	4344	{
	4345	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4346	+ Save();
3851	4347	//Tween.set(thing, 0).target(1).start(tweenManager);
3852	4348	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3853	4349	// if (thing instanceof GenericJointDemo)
..	..	@@ -3934,6 +4430,12 @@
3934	4430	{
3935	4431	ResetModel();
3936	4432	Select(thing.GetTreePath(), true, false); // unselect... false);
	4433	+
	4434	+ if (thing.Size() == 0)
	4435	+ {
	4436	+ //EditSelection(false);
	4437	+ }
	4438	+
3937	4439	refreshContents();
3938	4440	}
3939	4441
..	..	@@ -4051,6 +4553,7 @@
4051	4553	}
4052	4554	}
4053	4555	}
	4556	+
4054	4557	LoadGFDThread loadGFDThread;
4055	4558
4056	4559	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4070,8 +4573,10 @@
4070	4573
4071	4574	try
4072	4575	{
	4576	+ // Try compressed version first.
4073	4577	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4074		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4578	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4579	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4075	4580
4076	4581	readobj = (Object3D) p.readObject();
4077	4582	istream.close();
..	..	@@ -4079,7 +4584,20 @@
4079	4584	readobj.ResetDisplayList();
4080	4585	} catch (Exception e)
4081	4586	{
4082		- e.printStackTrace();
	4587	+ //e.printStackTrace();
	4588	+ try
	4589	+ {
	4590	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4591	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4592	+
	4593	+ readobj = (Object3D) p.readObject();
	4594	+ istream.close();
	4595	+
	4596	+ readobj.ResetDisplayList();
	4597	+ } catch (Exception e2)
	4598	+ {
	4599	+ e2.printStackTrace();
	4600	+ }
4083	4601	}
4084	4602	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4085	4603	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4125,6 +4643,12 @@
4125	4643
4126	4644	void LoadIt(Object obj)
4127	4645	{
	4646	+ if (obj == null)
	4647	+ {
	4648	+ // Invalid file
	4649	+ return;
	4650	+ }
	4651	+
4128	4652	System.out.println("Loaded " + obj);
4129	4653	//new Exception().printStackTrace();
4130	4654	Object3D readobj = (Object3D) obj;
..	..	@@ -4134,6 +4658,8 @@
4134	4658
4135	4659	if (readobj != null)
4136	4660	{
	4661	+ if (Globals.SAVEONMAKE)
	4662	+ Save();
4137	4663	try
4138	4664	{
4139	4665	//readobj.deepCopySelf(copy);
..	..	@@ -4196,7 +4722,7 @@
4196	4722
4197	4723	void load() // throws ClassNotFoundException
4198	4724	{
4199		- if (GrafreeD.standAlone)
	4725	+ if (Grafreed.standAlone)
4200	4726	{
4201	4727	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4202	4728	browser.show();
..	..	@@ -4283,11 +4809,13 @@
4283	4809	try
4284	4810	{
4285	4811	FileOutputStream ostream = new FileOutputStream(lastname);
4286		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4812	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4813	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4287	4814
4288	4815	p.writeObject(copy);
4289	4816	p.flush();
4290	4817
	4818	+ zstream.close();
4291	4819	ostream.close();
4292	4820
4293	4821	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4297,17 +4825,20 @@
4297	4825	{
4298	4826	}
4299	4827	}
	4828	+
4300	4829	String lastname;
4301	4830
4302	4831	void saveAs()
4303	4832	{
4304		- if (GrafreeD.standAlone)
	4833	+ if (Grafreed.standAlone)
4305	4834	{
4306	4835	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4307	4836	browser.setVisible(true);
4308	4837	String filename = browser.getFile();
4309	4838	if (filename != null && filename.length() > 0)
4310	4839	{
	4840	+ if (!filename.endsWith(".gfd"))
	4841	+ filename += ".gfd";
4311	4842	lastname = browser.getDirectory() + filename;
4312	4843	save();
4313	4844	}
..	..	@@ -4406,13 +4937,13 @@
4406	4937	try
4407	4938	{
4408	4939	FileOutputStream ostream = new FileOutputStream(filename);
4409		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4410		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4940	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4941	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4411	4942
4412	4943	Object3D objectparent = obj.parent;
4413	4944	obj.parent = null;
4414	4945
4415		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4946	+ Object3D object = (Object3D) Grafreed.clone(obj);
4416	4947
4417	4948	obj.parent = objectparent;
4418	4949
..	..	@@ -4424,8 +4955,8 @@
4424	4955	p.writeObject(object);
4425	4956	p.flush();
4426	4957
	4958	+ zstream.close();
4427	4959	ostream.close();
4428		- // zstream.close();
4429	4960
4430	4961	// group.selection.get(0).parent = parent;
4431	4962	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4446,7 +4977,7 @@
4446	4977	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4447	4978	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4448	4979	copy.generatePOV(buffer);
4449		- if (GrafreeD.standAlone)
	4980	+ if (Grafreed.standAlone)
4450	4981	{
4451	4982	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4452	4983	browser.show();
..	..	@@ -4472,7 +5003,8 @@
4472	5003	Object3D client;
4473	5004	Object3D copy;
4474	5005	MenuBar menuBar;
4475		- Menu windowMenu;
	5006	+ Menu fileMenu;
	5007	+ MenuItem newItem;
4476	5008	MenuItem loadItem;
4477	5009	MenuItem saveItem;
4478	5010	MenuItem saveAsItem;
..	..	@@ -4480,13 +5012,11 @@
4480	5012	MenuItem reexportItem;
4481	5013	MenuItem povItem;
4482	5014	MenuItem closeItem;
4483		- Menu cameraMenu;
	5015	+
4484	5016	CheckboxMenuItem zBufferItem;
4485	5017	//MenuItem normalLensItem;
4486		- MenuItem editCameraItem;
4487		- MenuItem revertCameraItem;
4488		- CheckboxMenuItem toggleLiveItem;
4489	5018	MenuItem stepItem;
	5019	+ CheckboxMenuItem toggleLiveItem;
4490	5020	CheckboxMenuItem toggleFullScreenItem;
4491	5021	CheckboxMenuItem toggleTimelineItem;
4492	5022	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4495,28 +5025,42 @@
4495	5025	CheckboxMenuItem toggleFootContactItem;
4496	5026	CheckboxMenuItem toggleDLItem;
4497	5027	CheckboxMenuItem toggleTextureItem;
4498		- CheckboxMenuItem toggleRandomItem;
	5028	+ CheckboxMenuItem toggleSwitchItem;
4499	5029	CheckboxMenuItem toggleRootItem;
4500	5030	CheckboxMenuItem animationItem;
4501	5031	CheckboxMenuItem toggleHandleItem;
4502	5032	CheckboxMenuItem togglePaintItem;
4503	5033	JSplitPane mainPanel;
4504	5034	JScrollPane scrollpane;
	5035	+
4505	5036	JPanel toolbarPanel;
4506		- JPanel treePanel;
	5037	+
	5038	+ cGridBag treePanel;
	5039	+
4507	5040	JPanel radioPanel;
4508	5041	ButtonGroup buttonGroup;
4509		- JPanel ctrlPanel;
4510		- JPanel materialPanel;
	5042	+
	5043	+ cGridBag toolboxPanel;
	5044	+ cGridBag materialPanel;
	5045	+ cGridBag ctrlPanel;
	5046	+
4511	5047	JScrollPane infoPanel;
4512		- JPanel optionsPanel;
	5048	+
	5049	+ cGridBag optionsPanel;
	5050	+
4513	5051	JTabbedPane objectPanel;
4514		- JPanel XYZPanel;
	5052	+ boolean materialFlushed;
	5053	+ Object3D latestObject;
	5054	+
	5055	+ cGridBag XYZPanel;
	5056	+
4515	5057	JSplitPane gridPanel;
4516	5058	JSplitPane bigPanel;
4517		- JPanel bigThree;
4518		- JTabbedPane scenePanel;
4519		- JPanel centralPanel;
	5059	+
	5060	+ cGridBag bigThree;
	5061	+ cGridBag scenePanel;
	5062	+ cGridBag centralPanel;
	5063	+ JSplitPane cameraPanel;
4520	5064	JPanel timelinePanel;
4521	5065	JMenuBar timelineMenubar;
4522	5066	JSplitPane framePanel;
..	..	@@ -4568,65 +5112,72 @@
4568	5112	// MATERIAL
4569	5113	JLabel materialLabel;
4570	5114	JLabel colorLabel;
4571		- NumberSlider colorField;
	5115	+ cNumberSlider colorField;
4572	5116	JLabel modulationLabel;
4573		- NumberSlider modulationField;
	5117	+ cNumberSlider modulationField;
4574	5118	JLabel metalnessLabel;
4575		- NumberSlider metalnessField;
	5119	+ cNumberSlider metalnessField;
4576	5120	JLabel diffuseLabel;
4577		- NumberSlider diffuseField;
	5121	+ cNumberSlider diffuseField;
4578	5122	JLabel specularLabel;
4579		- NumberSlider specularField;
	5123	+ cNumberSlider specularField;
4580	5124	JLabel shininessLabel;
4581		- NumberSlider shininessField;
	5125	+ cNumberSlider shininessField;
4582	5126	JLabel shiftLabel;
4583		- NumberSlider shiftField;
	5127	+ cNumberSlider shiftField;
4584	5128	JLabel ambientLabel;
4585		- NumberSlider ambientField;
	5129	+ cNumberSlider ambientField;
4586	5130	JLabel lightareaLabel;
4587		- NumberSlider lightareaField;
	5131	+ cNumberSlider lightareaField;
4588	5132	JLabel diffusenessLabel;
4589		- NumberSlider diffusenessField;
	5133	+ cNumberSlider diffusenessField;
4590	5134	JLabel velvetLabel;
4591		- NumberSlider velvetField;
	5135	+ cNumberSlider velvetField;
4592	5136	JLabel sheenLabel;
4593		- NumberSlider sheenField;
	5137	+ cNumberSlider sheenField;
4594	5138	JLabel subsurfaceLabel;
4595		- NumberSlider subsurfaceField;
	5139	+ cNumberSlider subsurfaceField;
4596	5140	//JLabel bumpLabel;
4597	5141	//NumberSlider bumpField;
4598	5142	JLabel backlitLabel;
4599		- NumberSlider backlitField;
	5143	+ cNumberSlider backlitField;
4600	5144	JLabel anisoLabel;
4601		- NumberSlider anisoField;
	5145	+ cNumberSlider anisoField;
4602	5146	JLabel anisoVLabel;
4603		- NumberSlider anisoVField;
	5147	+ cNumberSlider anisoVField;
4604	5148	JLabel cameraLabel;
4605		- NumberSlider cameraField;
	5149	+ cNumberSlider cameraField;
4606	5150	JLabel selfshadowLabel;
4607		- NumberSlider selfshadowField;
	5151	+ cNumberSlider selfshadowField;
4608	5152	JLabel shadowLabel;
4609		- NumberSlider shadowField;
	5153	+ cNumberSlider shadowField;
4610	5154	JLabel textureLabel;
4611		- NumberSlider textureField;
	5155	+ cNumberSlider textureField;
4612	5156	JLabel opacityLabel;
4613		- NumberSlider opacityField;
	5157	+ cNumberSlider opacityField;
4614	5158	JLabel fakedepthLabel;
4615		- NumberSlider fakedepthField;
	5159	+ cNumberSlider fakedepthField;
4616	5160	JLabel shadowbiasLabel;
4617		- NumberSlider shadowbiasField;
	5161	+ cNumberSlider shadowbiasField;
4618	5162	JLabel bumpLabel;
4619		- NumberSlider bumpField;
	5163	+ cNumberSlider bumpField;
4620	5164	JLabel noiseLabel;
4621		- NumberSlider noiseField;
	5165	+ cNumberSlider noiseField;
4622	5166	JLabel powerLabel;
4623		- NumberSlider powerField;
	5167	+ cNumberSlider powerField;
4624	5168	JLabel borderfadeLabel;
4625		- NumberSlider borderfadeField;
	5169	+ cNumberSlider borderfadeField;
4626	5170	JLabel fogLabel;
4627		- NumberSlider fogField;
	5171	+ cNumberSlider fogField;
4628	5172	JLabel opacityPowerLabel;
4629		- NumberSlider opacityPowerField;
4630		- JTree jTree;
	5173	+ cNumberSlider opacityPowerField;
	5174	+ cTree jTree;
4631	5175	//ObjectUI parent;
	5176	+
	5177	+ cNumberSlider normalpushField;
	5178	+
	5179	+ private MenuItem importGFDItem;
	5180	+ private MenuItem importVRMLX3DItem;
	5181	+ private MenuItem import3DSItem;
	5182	+ private MenuItem importOBJItem;
4632	5183	}