~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.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,67 @@
35	39
36	40	GroupEditor callee;
37	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	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -138,34 +203,42 @@
138	203	public void closeUI()
139	204	{
140	205	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
143	208	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
145	210
146		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
147	214	return;
148	215
149		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- 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);
167	234
168		- Remove(normalpushField);
	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);
169	242	}
170	243
171	244	public ObjEditor GetEditor()
..	..	@@ -236,6 +309,7 @@
236	309	//localCopy.parent = null;
237	310
238	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
239	313	objEditor = this;
240	314	this.callee = callee;
241	315
..	..	@@ -266,28 +340,49 @@
266	340	return frame.action(event, obj);
267	341	}
268	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	+
269	348	void SetupMenu()
270	349	{
271	350	frame.setMenuBar(menuBar = new MenuBar());
272		- menuBar.add(windowMenu = new Menu("File"));
273		- windowMenu.add(loadItem = new MenuItem("Load..."));
274		- windowMenu.add("-");
275		- windowMenu.add(saveItem = new MenuItem("Save"));
276		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(openItem = 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..."));
277	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278		- windowMenu.add("-");
279		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
282	376	if (client.parent != null)
283	377	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	379	} else
286	380	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	382	}
289	383
290		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
291	386	saveItem.addActionListener(this);
292	387	saveAsItem.addActionListener(this);
293	388	exportAsItem.addActionListener(this);
..	..	@@ -295,81 +390,66 @@
295	390	//povItem.addActionListener(this);
296	391	closeItem.addActionListener(this);
297	392
298		- menuBar.add(cameraMenu = new Menu("View"));
299		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300		- //zBufferItem.addActionListener(this);
301		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302		- //normalLensItem.addActionListener(this);
303		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304		- revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
307		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308		- toggleFullScreenItem.addItemListener(this);
309		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310		- cameraMenu.add("-");
311		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312		- toggleTextureItem.addItemListener(this);
313		- toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
337		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338		- toggleHandleItem.addItemListener(this);
339		- toggleHandleItem.setState(CameraPane.HANDLES);
340		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341		- togglePaintItem.addItemListener(this);
342		- togglePaintItem.setState(CameraPane.PAINTMODE);
343		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344		-// toggleRootItem.addItemListener(this);
345		-// toggleRootItem.setState(false);
346		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347		-// animationItem.addItemListener(this);
348		-// animationItem.setState(CameraPane.ANIMATION);
349		- cameraMenu.add("-");
350		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351		- editCameraItem.addActionListener(this);
352		-
353	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	+
354	420	toolbarPanel = new JPanel();
355	421	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
357	423	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- 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);
361	438	materialPanel.setName("Material");
	439	+
362	440	/JTextPane/
363	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
364	444	infoarea.setEditable(true);
365	445	SetText();
366	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	447	// infoarea.setOpaque(false);
368	448	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
373	453	infoPanel.setName("Info");
374	454	//infoPanel.setLayout(new BorderLayout());
375	455	//infoPanel.add(createTextPane());
..	..	@@ -378,16 +458,23 @@
378	458	mainPanel.setName("Main");
379	459	mainPanel.setContinuousLayout(true);
380	460	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	461	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	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	+
385	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	473	//mainPanel.setLayout(new GridBagLayout());
387	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
	477	+ //materialPanel.setLayout(new GridBagLayout());
391	478
392	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	480	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +513,7 @@
426	513	static String newline = "\n";
427	514	protected static final String buttonString = "JButton";
428	515	StyledDocument doc;
429		- JTextArea infoarea;
	516	+ JTextPane infoarea;
430	517
431	518	void ClearInfo()
432	519	{
..	..	@@ -449,10 +536,10 @@
449	536	e.printStackTrace();
450	537	}
451	538
452		- String selection = infoarea.getText();
453		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454		- java.awt.datatransfer.Clipboard clipboard =
455		- 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();
456	543	//clipboard.setContents(data, data);
457	544	}
458	545
..	..	@@ -475,13 +562,13 @@
475	562	//SendInfo("Name:", "bold");
476	563	if (sel.GetTextures() != null \|\| debug)
477	564	{
478		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	567	if (sel.Size() > 0)
481	568	{
482	569	si.SendInfo("#children = " + sel.Size(), "regular");
483	570	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	572	if (debug)
486	573	{
487	574	try
..	..	@@ -493,7 +580,10 @@
493	580	}
494	581
495	582	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
497	587
498	588	if (sel.bRep != null)
499	589	{
..	..	@@ -520,7 +610,7 @@
520	610	}
521	611	if (sel.support != null)
522	612	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	614	}
525	615	if (sel.scriptnode != null)
526	616	{
..	..	@@ -591,6 +681,9 @@
591	681	{
592	682	CameraPane.pointflow = (PointFlow) sel;
593	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
594	687	}
595	688	}
596	689
..	..	@@ -606,68 +699,169 @@
606	699	}
607	700	}
608	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	+
609	760	void ToggleFullScreen()
610	761	{
611		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
612	767	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- 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(46);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
616	791	} else
617	792	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- 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);
621	815	}
622		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
623	817	}
624	818
625		- private JTextArea createTextPane()
	819	+ private JTextPane createTextPane()
626	820	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	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	+// }
642	863
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
649		-
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	864	+ return new JTextPane(); // textPane;
671	865	}
672	866
673	867	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +914,7 @@
720	914	protected static ImageIcon createImageIcon(String path,
721	915	String description)
722	916	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	917	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	918	if (imgURL != null)
725	919	{
726	920	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +946,7 @@
752	946	// NumberSlider vDivsField;
753	947	// JCheckBox endcaps;
754	948	JCheckBox liveCB;
	949	+ JCheckBox selectCB;
755	950	JCheckBox hideCB;
756	951	JCheckBox link2masterCB;
757	952	JCheckBox markCB;
..	..	@@ -759,7 +954,12 @@
759	954	JCheckBox speedupCB;
760	955	JCheckBox rewindCB;
761	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
762	961	JComboBox texresMenu;
	962	+
763	963	JButton resetButton;
764	964	JButton stepButton;
765	965	JButton stepAllButton;
..	..	@@ -767,115 +967,87 @@
767	967	JButton slowerButton;
768	968	JButton fasterButton;
769	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;
770	980
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	981	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	982	{
773	983	JCheckBox cb;
774	984
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- 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);
780	986	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	987
785	988	return cb;
786	989	}
787	990
788		- cButton AddButton(ObjEditor oe, String label)
	991	+ cButton AddButton(cGridBag panel, String label)
789	992	{
790	993	cButton cb;
791	994
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- 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);
797	996	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	997
802	998	return cb;
803	999	}
804	1000
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1001	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1002	{
807	1003	JComboBox combo;
808	1004
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	1005	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1006	combo.addActionListener(this);
813	1007
814	1008	return combo;
815	1009	}
816	1010
817		- 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)
818	1012	{
819		- NumberSlider combo;
	1013	+ cGridBag control = new cGridBag();
	1014	+
	1015	+ cNumberSlider combo;
820	1016
821	1017	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	1018	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 1;
826		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
829		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	1019	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1020	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	1021	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	1022	+
	1023	+ panel.add(control);
	1024	+
	1025	+ return control;
841	1026	}
842	1027
843		- 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)
844	1029	{
845		- NumberSlider combo;
	1030	+ cGridBag control = new cGridBag();
	1031	+
	1032	+ cNumberSlider combo;
846	1033
847	1034	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	1035	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
851		- aConstraints.gridwidth = 2;
852		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
855		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
856		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857		- aConstraints.gridx += 1;
858		- aConstraints.gridwidth = 1;
859		-
	1036	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1037	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	1038	combo.setInteger(current);
861	1039
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	1040	+ panel.add(control);
	1041	+
	1042	+ return control;
867	1043	}
868	1044
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	1045	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	1046	{
871	1047	JTextArea text;
872	1048
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1049	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	1050	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	1051
880	1052	return text;
881	1053	}
..	..	@@ -905,9 +1077,16 @@
905	1077	objEditor.ctrlPanel.remove(j);
906	1078	}
907	1079
	1080	+ void Remove(cNumberSlider j)
	1081	+ {
	1082	+ j.removeChangeListener(this);
	1083	+ //objEditor.ctrlPanel.remove(j.label);
	1084	+ objEditor.ctrlPanel.remove(j);
	1085	+ }
	1086	+
908	1087	/*
909	1088	*/
910		- void Return() // ObjEditor oe)
	1089	+ void Return0() // ObjEditor oe)
911	1090	{
912	1091	aConstraints.gridy += 1;
913	1092	aConstraints.gridx = 0;
..	..	@@ -962,37 +1141,77 @@
962	1141
963	1142	void SetupUI2(ObjEditor oe)
964	1143	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	1144	+ //SetupName(oe);
970	1145
971		- 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)
972	1155	return;
973	1156
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- 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");
977	1163	// Return();
978		- markCB = AddCheckBox(oe, "Mark", copy.marked);
979		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
980		- randomCB = AddCheckBox(oe, "Rand", copy.random);
981		- Return();
982		- resetButton = AddButton(oe, "Reset");
983		- 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	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1178	+ link2masterCB.setToolTipText("Attach to support");
	1179	+
	1180	+ if (Globals.ADVANCED)
	1181	+ {
	1182	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1183	+ speedupCB.setToolTipText("Option motion capture");
	1184	+ }
	1185	+
	1186	+ oe.ctrlPanel.add(setupPanel);
	1187	+ oe.ctrlPanel.Return();
	1188	+ oe.ctrlPanel.add(setupPanel2);
	1189	+ oe.ctrlPanel.Return();
	1190	+
	1191	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1192	+
	1193	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1194	+ resetButton.setToolTipText("Jump to frame zero");
	1195	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1196	+ stepButton.setToolTipText("Step one frame");
984	1197	// resetAllButton = AddButton(oe, "Reset All");
985	1198	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1199	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	1200	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1201	+ slowerButton.setToolTipText("Decrease animation speed");
	1202	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1203	+ fasterButton.setToolTipText("Increase animation speed");
	1204	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1205	+ remarkButton.setToolTipText("Set the current transform as the target");
991	1206
992		- Return();
	1207	+ oe.ctrlPanel.add(objectCommandsPanel);
	1208	+ oe.ctrlPanel.Return();
993	1209
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	1210	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1211	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1212	+ //Return();
	1213	+
	1214	+ oe.ctrlPanel.Return();
996	1215
997	1216	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	1217	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1306,7 @@
1087	1306	oe.aConstraints.gridwidth = 1;
1088	1307	/**/
1089	1308	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1309	+ oe.ctrlPanel.Return();
1091	1310
1092	1311	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1312	//textureButton.setEnabled(false);
..	..	@@ -1189,9 +1408,13 @@
1189	1408	//JPanel worldPanel =
1190	1409	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1191	1410	//worldPanel.setName("World");
1192		- centralPanel = new JPanel(new BorderLayout());
1193		- timelinePanel = new JPanel(new BorderLayout());
1194		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1411	+ centralPanel = new cGridBag();
	1412	+ centralPanel.preferredWidth = 20;
	1413	+
	1414	+ if (Globals.ADVANCED)
	1415	+ {
	1416	+ timelinePanel = new JPanel(new BorderLayout());
	1417	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1195	1418
1196	1419	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1197	1420	cameraPanel.setContinuousLayout(true);
..	..	@@ -1200,7 +1423,10 @@
1200	1423	// cameraPanel.setDividerSize(9);
1201	1424	cameraPanel.setResizeWeight(1.0);
1202	1425
	1426	+ }
	1427	+
1203	1428	centralPanel.add(cameraView);
	1429	+ centralPanel.setFocusable(true);
1204	1430	//frame.setJMenuBar(timelineMenubar);
1205	1431	//centralPanel.add(timelinePanel);
1206	1432
..	..	@@ -1222,6 +1448,7 @@
1222	1448	XYZPanel = new cGridBag().setVertical(true);
1223	1449	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1224	1450
	1451	+ XYZPanel.preferredWidth = 5;
1225	1452	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1226	1453	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1227	1454	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
..	..	@@ -1262,11 +1489,16 @@
1262	1489	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1263	1490	//tmp.setName("Edit");
1264	1491	objectPanel.add(materialPanel);
1265		- JPanel north = new JPanel(new BorderLayout());
1266		- north.setName("Edit");
1267		- north.add(ctrlPanel, BorderLayout.NORTH);
1268		- objectPanel.add(north);
1269		- objectPanel.add(infoPanel);
	1492	+// JPanel north = new JPanel(new BorderLayout());
	1493	+// north.setName("Edit");
	1494	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1495	+// objectPanel.add(north);
	1496	+ objectPanel.add(editPanel);
	1497	+
	1498	+ //if (Globals.ADVANCED)
	1499	+ objectPanel.add(infoPanel);
	1500	+
	1501	+ objectPanel.add(toolboxPanel);
1270	1502
1271	1503	/*
1272	1504	aConstraints.gridx = 0;
..	..	@@ -1275,7 +1507,7 @@
1275	1507	aConstraints.gridy += 1;
1276	1508	aConstraints.gridwidth = 1;
1277	1509	mainPanel.add(objectPanel, aConstraints);
1278		- */
	1510	+ */
1279	1511
1280	1512	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1281	1513	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1286,19 +1518,23 @@
1286	1518	scrollpane.setWheelScrollingEnabled(true);
1287	1519	scrollpane.addMouseWheelListener(this); // Default not fast enough
1288	1520
1289		- /JTabbedPane/ scenePanel = new JTabbedPane();
1290		- scenePanel.add(scrollpane);
	1521	+ /JTabbedPane/ scenePanel = new cGridBag();
	1522	+ scenePanel.preferredWidth = 6;
	1523	+
	1524	+ JTabbedPane tabbedPane = new JTabbedPane();
	1525	+ tabbedPane.add(scrollpane);
1291	1526
1292		- scenePanel.add(FSPane = new cFileSystemPane(this));
1293		-
1294		- optionsPanel = new JPanel(new GridBagLayout());
	1527	+ optionsPanel = new cGridBag().setVertical(false);
1295	1528
1296	1529	optionsPanel.setName("Options");
1297	1530
1298		- AddOptions(optionsPanel, aConstraints);
	1531	+ AddOptions(optionsPanel); //, aConstraints);
1299	1532
1300		- scenePanel.add(optionsPanel);
	1533	+ tabbedPane.add(optionsPanel);
	1534	+
	1535	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1301	1536
	1537	+ scenePanel.add(tabbedPane);
1302	1538
1303	1539	/*
1304	1540	cTree jTree = new cTree(null);
..	..	@@ -1370,9 +1606,9 @@
1370	1606	// aConstraints.gridheight = 1;
1371	1607
1372	1608	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1373		- framePanel.setContinuousLayout(true);
1374		- framePanel.setOneTouchExpandable(true);
1375		- framePanel.setDividerLocation(0.8);
	1609	+ framePanel.setContinuousLayout(false);
	1610	+ framePanel.setOneTouchExpandable(false);
	1611	+ //.setDividerLocation(0.8);
1376	1612	//framePanel.setDividerSize(15);
1377	1613	//framePanel.setResizeWeight(0.15);
1378	1614	framePanel.setName("Frame");
..	..	@@ -1389,10 +1625,15 @@
1389	1625
1390	1626	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1627
1392		- frame.setSize(1024, 768);
1393		- frame.show();
1394		-
	1628	+ frame.setSize(1280, 860);
	1629	+
	1630	+ cameraView.requestFocusInWindow();
	1631	+
1395	1632	gridPanel.setDividerLocation(1.0);
	1633	+
	1634	+ frame.validate();
	1635	+
	1636	+ frame.setVisible(true);
1396	1637
1397	1638	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1398	1639	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1405,7 +1646,7 @@
1405	1646	});
1406	1647	}
1407	1648
1408		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1649	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1409	1650	{
1410	1651	}
1411	1652
..	..	@@ -1420,260 +1661,161 @@
1420	1661	ctrlPanel.removeAll();
1421	1662	}
1422	1663
1423		- void SetupMaterial(JPanel ctrlPanel)
	1664	+ void SetupMaterial(cGridBag panel)
1424	1665	{
1425		- aConstraints.weighty = 0;
1426		- //aConstraints.weightx = 1;
1427		- /*
	1666	+ /*
1428	1667	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1429	1668	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1430		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1431		- aConstraints.gridx += 1;
1432	1669	*/
1433	1670
1434		- aConstraints.gridwidth = 1;
1435		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1436		- aConstraints.gridx += 1;
1437		- aConstraints.weighty = 0;
1438		- aConstraints.gridwidth = 1;
	1671	+ cGridBag editBar = new cGridBag().setVertical(false);
	1672	+
	1673	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1674	+ createMaterialButton.setToolTipText("Create material");
1439	1675
1440	1676	/*
1441	1677	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
1445	1678	*/
1446	1679
1447		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1448		- aConstraints.gridx += 1;
	1680	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1681	+ clearMaterialButton.setToolTipText("Clear material");
	1682	+
	1683	+ if (Globals.ADVANCED)
	1684	+ {
	1685	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1686	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1687	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1688	+ }
1449	1689
1450		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1451		-
1452		- aConstraints.gridx += 1;
1453		-
1454		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1455		-
1456		- aConstraints.gridx += 1;
1457		-
1458		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1459		-
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.weighty = 0;
1463		- aConstraints.gridwidth = 1;
	1690	+ editBar.preferredHeight = 15;
	1691	+
	1692	+ panel.add(editBar);
	1693	+
1464	1694	/**/
1465	1695	//aConstraints.weighty = 0;
1466	1696	////aConstraints.weightx = 1;
1467	1697	//aConstraints.weighty = 1;
1468	1698	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1469	1699	//aConstraints.gridx += 1;
1470		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1471		- aConstraints.weighty = 0;
1472		- aConstraints.gridx = 0;
1473		- aConstraints.gridy += 1;
1474		- aConstraints.gridwidth = 1;
	1700	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1475	1701
1476		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1477		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1479		- aConstraints.gridx += 1;
1480		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1481		- //aConstraints.weightx = 0;
1482		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1483		- aConstraints.gridx = 0;
1484		- aConstraints.gridy += 1;
1485		- aConstraints.gridwidth = 1;
	1702	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1703	+
	1704	+ cGridBag color = new cGridBag();
	1705	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1706	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1707	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1708	+ //colorField.preferredWidth = 200;
	1709	+ colorSection.add(color);
1486	1710
1487		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1488		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1489		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1490		- aConstraints.gridx += 1;
1491		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1492		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1493		- aConstraints.gridx = 0;
1494		- aConstraints.gridy += 1;
1495		- aConstraints.gridwidth = 1;
	1711	+ cGridBag modulation = new cGridBag();
	1712	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1713	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1714	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1715	+ colorSection.add(modulation);
1496	1716
1497		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1498		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1499		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1500		- aConstraints.gridx += 1;
1501		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1502		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1503		- aConstraints.gridx = 0;
1504		- aConstraints.gridy += 1;
1505		- aConstraints.gridwidth = 1;
	1717	+ cGridBag texture = new cGridBag();
	1718	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1719	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1720	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1721	+ colorSection.add(texture);
1506	1722
1507		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1508		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1510		- aConstraints.gridx += 1;
1511		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1512		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1513		- aConstraints.gridx = 0;
1514		- aConstraints.gridy += 1;
1515		- aConstraints.gridwidth = 1;
	1723	+ panel.add(new JSeparator());
	1724	+
	1725	+ panel.add(colorSection);
	1726	+
	1727	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1728	+
	1729	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1730	+
	1731	+ cGridBag diffuse = new cGridBag();
	1732	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1733	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1734	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1735	+ diffuseSection.add(diffuse);
1516	1736
1517		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1518		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1519		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1520		- aConstraints.gridx += 1;
1521		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1522		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1523		- aConstraints.gridx = 0;
1524		- aConstraints.gridy += 1;
1525		- aConstraints.gridwidth = 1;
	1737	+ cGridBag diffuseness = new cGridBag();
	1738	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1739	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1740	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1741	+ diffuseSection.add(diffuseness);
1526	1742
1527		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1528		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1530		- aConstraints.gridx += 1;
1531		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1532		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	1743	+ cGridBag selfshadow = new cGridBag();
	1744	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1745	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1746	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1747	+ diffuseSection.add(selfshadow);
1536	1748
1537		- //aConstraints.weighty = 1;
1538		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1539		- //aConstraints.gridx += 1;
1540		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1541		- aConstraints.weighty = 0;
1542		- aConstraints.gridx = 0;
1543		- aConstraints.gridy += 1;
1544		- aConstraints.gridwidth = 1;
	1749	+ cGridBag sheen = new cGridBag();
	1750	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1751	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1752	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1753	+ diffuseSection.add(sheen);
1545	1754
1546		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1547		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1548		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1549		- aConstraints.gridx += 1;
1550		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1551		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1552		- aConstraints.gridx = 0;
1553		- aConstraints.gridy += 1;
1554		- aConstraints.gridwidth = 1;
	1755	+ cGridBag subsurface = new cGridBag();
	1756	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1757	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1758	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1759	+ diffuseSection.add(subsurface);
1555	1760
1556		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1557		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1558		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1559		- aConstraints.gridx += 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1561		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1562		- aConstraints.gridx = 0;
1563		- aConstraints.gridy += 1;
1564		- aConstraints.gridwidth = 1;
	1761	+ cGridBag shadow = new cGridBag();
	1762	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1763	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1764	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1765	+ diffuseSection.add(shadow);
1565	1766
1566		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1567		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1568		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1569		- aConstraints.gridx += 1;
1570		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1571		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1572		- aConstraints.gridx = 0;
1573		- aConstraints.gridy += 1;
1574		- aConstraints.gridwidth = 1;
	1767	+ cGridBag fakedepth = new cGridBag();
	1768	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1769	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1770	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1771	+ diffuseSection.add(fakedepth);
1575	1772
1576		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1577		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1579		- aConstraints.gridx += 1;
1580		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1581		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1582		- aConstraints.gridx = 0;
1583		- aConstraints.gridy += 1;
1584		- aConstraints.gridwidth = 1;
	1773	+ cGridBag shadowbias = new cGridBag();
	1774	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1775	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1776	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1777	+ diffuseSection.add(shadowbias);
1585	1778
1586		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1587		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1588		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1589		- aConstraints.gridx += 1;
1590		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1591		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1592		- aConstraints.gridx = 0;
1593		- aConstraints.gridy += 1;
1594		- aConstraints.gridwidth = 1;
	1779	+ panel.add(new JSeparator());
	1780	+
	1781	+ panel.add(diffuseSection);
	1782	+
	1783	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1784	+
	1785	+ cGridBag specularSection = new cGridBag().setVertical(true);
1595	1786
1596		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1597		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1598		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1599		- aConstraints.gridx += 1;
1600		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1601		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1602		- aConstraints.gridx = 0;
1603		- aConstraints.gridy += 1;
1604		- aConstraints.gridwidth = 1;
	1787	+ cGridBag specular = new cGridBag();
	1788	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1789	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1790	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1791	+ specularSection.add(specular);
1605	1792
1606		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1607		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1608		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1609		- aConstraints.gridx += 1;
1610		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1611		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	1793	+ cGridBag lightarea = new cGridBag();
	1794	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1795	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1796	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1797	+ specularSection.add(lightarea);
1615	1798
1616		- //aConstraints.weighty = 1;
1617		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1618		- //aConstraints.gridx += 1;
1619		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1620		- aConstraints.weighty = 0;
1621		- aConstraints.gridx = 0;
1622		- aConstraints.gridy += 1;
1623		- aConstraints.gridwidth = 1;
	1799	+ cGridBag shininess = new cGridBag();
	1800	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1801	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1802	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1803	+ specularSection.add(shininess);
1624	1804
1625		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1626		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1627		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1628		- aConstraints.gridx += 1;
1629		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1630		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1631		- aConstraints.gridx = 0;
1632		- aConstraints.gridy += 1;
1633		- aConstraints.gridwidth = 1;
	1805	+ cGridBag metalness = new cGridBag();
	1806	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1807	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1808	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1809	+ specularSection.add(metalness);
1634	1810
1635		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1636		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1638		- aConstraints.gridx += 1;
1639		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1640		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1641		- aConstraints.gridx = 0;
1642		- aConstraints.gridy += 1;
1643		- aConstraints.gridwidth = 1;
	1811	+ cGridBag velvet = new cGridBag();
	1812	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1813	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1814	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1815	+ specularSection.add(velvet);
1644	1816
1645		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1646		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1648		- aConstraints.gridx += 1;
1649		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1650		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1651		- aConstraints.gridx = 0;
1652		- aConstraints.gridy += 1;
1653		- aConstraints.gridwidth = 1;
1654		-
1655		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1656		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1658		- aConstraints.gridx += 1;
1659		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1660		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1661		- aConstraints.gridx = 0;
1662		- aConstraints.gridy += 1;
1663		- aConstraints.gridwidth = 1;
1664		-
1665		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1666		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1667		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1668		- aConstraints.gridx += 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1670		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1671		- aConstraints.gridx = 0;
1672		- aConstraints.gridy += 1;
1673		- aConstraints.gridwidth = 1;
1674		-
1675		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1676		- Return();
	1817	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1818	+ //Return();
1677	1819	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1678	1820	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679	1821	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1684,130 +1826,105 @@
1684	1826	// aConstraints.gridy += 1;
1685	1827	// aConstraints.gridwidth = 1;
1686	1828
1687		- //aConstraints.weighty = 1;
1688		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1689		- //aConstraints.gridx += 1;
1690		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1691		- aConstraints.weighty = 0;
1692		- aConstraints.gridx = 0;
1693		- aConstraints.gridy += 1;
1694		- aConstraints.gridwidth = 1;
	1829	+ cGridBag anisoU = new cGridBag();
	1830	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1831	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1832	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1833	+ specularSection.add(anisoU);
1695	1834
1696		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1697		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1699		- aConstraints.gridx += 1;
1700		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1701		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1702		- aConstraints.gridx = 0;
1703		- aConstraints.gridy += 1;
1704		- aConstraints.gridwidth = 1;
	1835	+ cGridBag anisoV = new cGridBag();
	1836	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1837	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1838	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1839	+ specularSection.add(anisoV);
1705	1840
1706		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1707		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1709		- aConstraints.gridx += 1;
1710		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1711		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1712		- aConstraints.gridx = 0;
1713		- aConstraints.gridy += 1;
1714		- aConstraints.gridwidth = 1;
1715	1841
1716		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1717		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1718		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1719		- aConstraints.gridx += 1;
1720		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1721		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1722		- aConstraints.gridx = 0;
1723		- aConstraints.gridy += 1;
1724		- aConstraints.gridwidth = 1;
	1842	+ panel.add(new JSeparator());
	1843	+
	1844	+ panel.add(specularSection);
	1845	+
	1846	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1847	+
	1848	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1725	1849
1726		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1727		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1728		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1729		- aConstraints.gridx += 1;
1730		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1731		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1732		- aConstraints.gridx = 0;
1733		- aConstraints.gridy += 1;
1734		- aConstraints.gridwidth = 1;
1735		- aConstraints.weighty = 0;
	1850	+ cGridBag camera = new cGridBag();
	1851	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1852	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1853	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1854	+ colorSection.add(camera);
1736	1855
1737		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1738		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1739		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1740		- aConstraints.gridx += 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1742		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1743		- aConstraints.gridx = 0;
1744		- aConstraints.gridy += 1;
1745		- aConstraints.gridwidth = 1;
	1856	+ cGridBag ambient = new cGridBag();
	1857	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1858	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1859	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1860	+ colorSection.add(ambient);
1746	1861
1747		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1748		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1749		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1750		- aConstraints.gridx += 1;
1751		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1752		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1753		- aConstraints.gridx = 0;
1754		- aConstraints.gridy += 1;
1755		- aConstraints.gridwidth = 1;
	1862	+ cGridBag backlit = new cGridBag();
	1863	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1864	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1865	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1866	+ colorSection.add(backlit);
1756	1867
1757		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1758		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1759		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1760		- aConstraints.gridx += 1;
1761		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1762		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1763		- aConstraints.gridx = 0;
1764		- aConstraints.gridy += 1;
1765		- aConstraints.gridwidth = 1;
	1868	+ cGridBag opacity = new cGridBag();
	1869	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1870	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1871	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1872	+ colorSection.add(opacity);
1766	1873
1767		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1768		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1769		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1770		- aConstraints.gridx += 1;
1771		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1772		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1773		- aConstraints.gridx = 0;
1774		- aConstraints.gridy += 1;
1775		- aConstraints.gridwidth = 1;
	1874	+ //panel.add(new JSeparator());
	1875	+
	1876	+ //panel.add(globalSection);
	1877	+
	1878	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1879	+
	1880	+ cGridBag textureSection = new cGridBag().setVertical(true);
1776	1881
1777		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1778		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1779		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1780		- aConstraints.gridx += 1;
1781		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1782		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1783		- aConstraints.gridx = 0;
1784		- aConstraints.gridy += 1;
1785		- aConstraints.gridwidth = 1;
	1882	+ cGridBag bump = new cGridBag();
	1883	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1884	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1885	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1886	+ textureSection.add(bump);
1786	1887
1787		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1788		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1790		- aConstraints.gridx += 1;
1791		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1792		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1793		- aConstraints.gridx = 0;
1794		- aConstraints.gridy += 1;
1795		- aConstraints.gridwidth = 1;
	1888	+ cGridBag noise = new cGridBag();
	1889	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1890	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1891	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1892	+ textureSection.add(noise);
1796	1893
1797		- //aConstraints.weighty = 1;
1798		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1799		- //aConstraints.gridx += 1;
1800		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1801		- aConstraints.weighty = 0;
	1894	+ cGridBag power = new cGridBag();
	1895	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1896	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1897	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1898	+ textureSection.add(power);
1802	1899
1803		- aConstraints.gridx = 0;
1804		- aConstraints.gridy = 0;
1805		- aConstraints.gridwidth = 1;
	1900	+ cGridBag borderfade = new cGridBag();
	1901	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1902	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1903	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1904	+ textureSection.add(borderfade);
	1905	+
	1906	+ cGridBag fog = new cGridBag();
	1907	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1908	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1909	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1910	+ textureSection.add(fog);
	1911	+
	1912	+ cGridBag opacityPower = new cGridBag();
	1913	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1914	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1915	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1916	+ textureSection.add(opacityPower);
	1917	+
	1918	+ panel.add(new JSeparator());
	1919	+
	1920	+ panel.add(textureSection);
	1921	+
	1922	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1806	1923
1807	1924	SetMaterial(copy); // .GetMaterial());
1808	1925
1809		- colorField.addChangeListener(this);
1810		- modulationField.addChangeListener(this);
	1926	+ //colorField.addChangeListener(this);
	1927	+// modulationField.addChangeListener(this);
1811	1928	metalnessField.addChangeListener(this);
1812	1929	diffuseField.addChangeListener(this);
1813	1930	specularField.addChangeListener(this);
..	..	@@ -1837,12 +1954,15 @@
1837	1954	opacityPowerField.addChangeListener(this);
1838	1955	/**/
1839	1956
1840		- resetSlidersButton.addActionListener(this);
1841	1957	clearMaterialButton.addActionListener(this);
1842	1958	createMaterialButton.addActionListener(this);
1843		-
1844		- propagateToggle.addItemListener(this);
1845		- multiplyToggle.addItemListener(this);
	1959	+
	1960	+ if (Globals.ADVANCED)
	1961	+ {
	1962	+ resetSlidersButton.addActionListener(this);
	1963	+ propagateToggle.addItemListener(this);
	1964	+ multiplyToggle.addItemListener(this);
	1965	+ }
1846	1966	}
1847	1967
1848	1968	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1860,8 +1980,9 @@
1860	1980	// 3D models
1861	1981	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1862	1982	{
1863		- lastConverter = new com.jmex.model.converters.MaxToJme();
1864		- LoadFile(filename, lastConverter);
	1983	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1984	+ //LoadFile(filename, lastConverter);
	1985	+ LoadObjFile(filename); // New 3ds loader
1865	1986	continue;
1866	1987	}
1867	1988	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2013,7 +2134,7 @@
2013	2134
2014	2135	//? flashIt = false;
2015	2136	CameraPane pane = (CameraPane) cameraView;
2016		- pane.clickStart(location.x, location.y, 0);
	2137	+ pane.clickStart(location.x, location.y, 0, 0);
2017	2138	pane.clickEnd(location.x, location.y, 0, true);
2018	2139
2019	2140	if (group.selection.size() == 1)
..	..	@@ -2062,6 +2183,7 @@
2062	2183	e2.printStackTrace();
2063	2184	}
2064	2185	}
	2186	+
2065	2187	LoadJMEThread loadThread;
2066	2188
2067	2189	class LoadJMEThread extends Thread
..	..	@@ -2119,6 +2241,7 @@
2119	2241	//LoadFile0(filename, converter);
2120	2242	}
2121	2243	}
	2244	+
2122	2245	LoadOBJThread loadObjThread;
2123	2246
2124	2247	class LoadOBJThread extends Thread
..	..	@@ -2197,19 +2320,19 @@
2197	2320
2198	2321	void LoadObjFile(String fullname)
2199	2322	{
2200		- /*
	2323	+ System.out.println("Loading " + fullname);
	2324	+ /**/
2201	2325	//lastFilename = fullname;
2202	2326	if(loadObjThread == null)
2203	2327	{
2204		- loadObjThread = new LoadOBJThread();
2205		- loadObjThread.start();
	2328	+ loadObjThread = new LoadOBJThread();
	2329	+ loadObjThread.start();
2206	2330	}
2207	2331
2208	2332	loadObjThread.add(fullname);
2209		- */
	2333	+ /**/
2210	2334
2211		- System.out.println("Loading " + fullname);
2212		- makeSomething(new FileObject(fullname, true), true);
	2335	+ //makeSomething(new FileObject(fullname, true), true);
2213	2336	}
2214	2337
2215	2338	void LoadGFDFile(String fullname)
..	..	@@ -2470,11 +2593,11 @@
2470	2593
2471	2594	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2472	2595	{
2473		- if (GrafreeD.standAlone)
	2596	+ if (Grafreed.standAlone)
2474	2597	{
2475	2598	/**/
2476	2599	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2477		- browser.show();
	2600	+ browser.setVisible(true);
2478	2601	String filename = browser.getFile();
2479	2602	if (filename != null && filename.length() > 0)
2480	2603	{
..	..	@@ -2585,6 +2708,7 @@
2585	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2586	2709	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2587	2710	}
	2711	+
2588	2712	//cJME.count++;
2589	2713	//cJME.count %= 12;
2590	2714	if (gc)
..	..	@@ -2619,6 +2743,7 @@
2619	2743	}
2620	2744	if (input == null)
2621	2745	{
	2746	+ new Exception().printStackTrace();
2622	2747	System.exit(0);
2623	2748	}
2624	2749
..	..	@@ -2767,6 +2892,7 @@
2767	2892	}
2768	2893	}
2769	2894	}
	2895	+
2770	2896	cFileSystemPane FSPane;
2771	2897
2772	2898	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2820,11 +2946,14 @@
2820	2946	}
2821	2947	}
2822	2948	}
	2949	+
2823	2950	freezematerial = false;
2824	2951	}
2825	2952
2826	2953	void SetMaterial(Object3D object)
2827	2954	{
	2955	+ latestObject = object;
	2956	+
2828	2957	cMaterial mat = object.material;
2829	2958
2830	2959	if (mat == null)
..	..	@@ -2833,7 +2962,8 @@
2833	2962	return;
2834	2963	}
2835	2964
2836		- multiplyToggle.setSelected(mat.multiply);
	2965	+ if (multiplyToggle != null)
	2966	+ multiplyToggle.setSelected(mat.multiply);
2837	2967
2838	2968	assert (object.projectedVertices != null);
2839	2969
..	..	@@ -2935,12 +3065,17 @@
2935	3065	// }
2936	3066
2937	3067	/**/
2938		- if (deselect)
	3068	+ if (deselect \|\| child == null)
2939	3069	{
2940	3070	//group.deselectAll();
2941	3071	//freeze = true;
2942	3072	GetTree().clearSelection();
2943	3073	//freeze = false;
	3074	+
	3075	+ if (child == null)
	3076	+ {
	3077	+ return;
	3078	+ }
2944	3079	}
2945	3080
2946	3081	//group.addSelectee(child);
..	..	@@ -3009,7 +3144,7 @@
3009	3144	cameraView.ToggleDL();
3010	3145	cameraView.repaint();
3011	3146	return;
3012		- } else if (event.getSource() == toggleTextureItem)
	3147	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3013	3148	{
3014	3149	cameraView.ToggleTexture();
3015	3150	// june 2013 copy.HardTouch();
..	..	@@ -3048,9 +3183,9 @@
3048	3183	frame.validate();
3049	3184
3050	3185	return;
3051		- } else if (event.getSource() == toggleRandomItem)
	3186	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3052	3187	{
3053		- cameraView.ToggleRandom();
	3188	+ cameraView.ToggleSwitch();
3054	3189	cameraView.repaint();
3055	3190	return;
3056	3191	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3079,6 +3214,10 @@
3079	3214	{
3080	3215	copy.live ^= true;
3081	3216	return;
	3217	+ } else if (event.getSource() == selectCB)
	3218	+ {
	3219	+ copy.dontselect ^= true;
	3220	+ return;
3082	3221	} else if (event.getSource() == hideCB)
3083	3222	{
3084	3223	copy.hide ^= true;
..	..	@@ -3093,6 +3232,7 @@
3093	3232	if (event.getSource() == randomCB)
3094	3233	{
3095	3234	copy.random ^= true;
	3235	+ objEditor.refreshContents();
3096	3236	return;
3097	3237	}
3098	3238	if (event.getSource() == speedupCB)
..	..	@@ -3116,8 +3256,9 @@
3116	3256
3117	3257	public void actionPerformed(ActionEvent event)
3118	3258	{
	3259	+ Object source = event.getSource();
3119	3260	// SCRIPT DIALOG
3120		- if (event.getSource() == okbutton)
	3261	+ if (source == okbutton)
3121	3262	{
3122	3263	textpanel.setVisible(false);
3123	3264	textpanel.remove(textarea);
..	..	@@ -3129,7 +3270,7 @@
3129	3270	textarea = null;
3130	3271	textpanel = null;
3131	3272	}
3132		- if (event.getSource() == cancelbutton)
	3273	+ if (source == cancelbutton)
3133	3274	{
3134	3275	textpanel.setVisible(false);
3135	3276	textpanel.remove(textarea);
..	..	@@ -3141,50 +3282,50 @@
3141	3282	//applySelf();
3142	3283	//client.refreshEditWindow();
3143	3284	//refreshContents();
3144		- if (event.getSource() == nameField)
	3285	+ if (source == nameField)
3145	3286	{
3146	3287	//System.out.println("ObjEditor " + event);
3147	3288	applySelf0(true);
3148	3289	//parent.applySelf();
3149	3290	objEditor.refreshContents();
3150		- } else if (event.getSource() == resetButton)
	3291	+ } else if (source == resetButton)
3151	3292	{
3152	3293	CameraPane.fullreset = true;
3153	3294	copy.Reset(); // ResetMeshes();
3154	3295	copy.Touch();
3155	3296	objEditor.refreshContents();
3156		- } else if (event.getSource() == stepItem)
	3297	+ } else if (source == stepItem)
3157	3298	{
3158	3299	//cameraView.ONESTEP = true;
3159	3300	Globals.ONESTEP = true;
3160	3301	cameraView.repaint();
3161	3302	return;
3162		- } else if (event.getSource() == stepButton)
	3303	+ } else if (source == stepButton)
3163	3304	{
3164	3305	copy.Step();
3165	3306	copy.Touch();
3166	3307	objEditor.refreshContents();
3167		- } else if (event.getSource() == slowerButton)
	3308	+ } else if (source == slowerButton)
3168	3309	{
3169	3310	copy.Slower();
3170	3311	copy.Touch();
3171	3312	objEditor.refreshContents();
3172		- } else if (event.getSource() == fasterButton)
	3313	+ } else if (source == fasterButton)
3173	3314	{
3174	3315	copy.Faster();
3175	3316	copy.Touch();
3176	3317	objEditor.refreshContents();
3177		- } else if (event.getSource() == remarkButton)
	3318	+ } else if (source == remarkButton)
3178	3319	{
3179	3320	copy.Remark();
3180	3321	copy.Touch();
3181	3322	objEditor.refreshContents();
3182		- } else if (event.getSource() == stepAllButton)
	3323	+ } else if (source == stepAllButton)
3183	3324	{
3184	3325	copy.StepAll();
3185	3326	copy.Touch();
3186	3327	objEditor.refreshContents();
3187		- } else if (event.getSource() == resetAllButton)
	3328	+ } else if (source == resetAllButton)
3188	3329	{
3189	3330	//CameraPane.fullreset = true;
3190	3331	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3217,53 +3358,79 @@
3217	3358	// Close();
3218	3359	// }
3219	3360	// else
3220		- if (event.getSource() == resetSlidersButton)
	3361	+ if (source == resetSlidersButton)
3221	3362	{
3222	3363	ResetSliders();
3223		- } else if (event.getSource() == clearMaterialButton)
	3364	+ } else if (source == clearMaterialButton)
3224	3365	{
3225	3366	ClearMaterial();
3226		- } else if (event.getSource() == createMaterialButton)
	3367	+ } else if (source == createMaterialButton)
3227	3368	{
3228	3369	CreateMaterial();
3229		- } else if (event.getSource() == clearPanelButton)
	3370	+ } else if (source == clearPanelButton)
3230	3371	{
3231	3372	copy.ClearUI();
3232	3373	refreshContents(true);
3233		- } /*
3234		- }
3235		-
3236		- public boolean action(Event event, Object arg)
3237		- {
3238		- */ else if (event.getSource() == closeItem)
	3374	+ } else if (source == importGFDItem)
	3375	+ {
	3376	+ ImportGFD();
	3377	+ } else
	3378	+ if (source == importVRMLX3DItem)
	3379	+ {
	3380	+ ImportVRMLX3D();
	3381	+ } else
	3382	+ if (source == import3DSItem)
	3383	+ {
	3384	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3385	+ } else
	3386	+ if (source == importOBJItem)
	3387	+ {
	3388	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3389	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3390	+ browser.setVisible(true);
	3391	+ String filename = browser.getFile();
	3392	+ if (filename != null && filename.length() > 0)
	3393	+ {
	3394	+ String fullname = browser.getDirectory() + filename;
	3395	+ makeSomething(ReadOBJ(fullname), true);
	3396	+ }
	3397	+ } else
	3398	+ if (source == closeItem)
3239	3399	{
3240	3400	Close();
3241	3401	//return true;
3242		- } else if (event.getSource() == loadItem)
	3402	+ } else if (source == openItem)
3243	3403	{
3244		- load();
	3404	+ Open();
3245	3405	//return true;
3246		- } else if (event.getSource() == saveItem)
	3406	+ } else if (source == newItem)
	3407	+ {
	3408	+ New();
	3409	+ } else if (source == saveItem)
3247	3410	{
3248	3411	save();
3249	3412	//return true;
3250		- } else if (event.getSource() == saveAsItem)
	3413	+ } else if (source == saveAsItem)
3251	3414	{
3252	3415	saveAs();
3253	3416	//return true;
3254		- } else if (event.getSource() == reexportItem)
	3417	+ } else if (source == reexportItem)
3255	3418	{
3256	3419	reexport();
3257	3420	//return true;
3258		- } else if (event.getSource() == exportAsItem)
	3421	+ } else if (source == exportAsItem)
3259	3422	{
3260	3423	export();
3261	3424	//return true;
3262		- } else if (event.getSource() == povItem)
	3425	+ } else if (source == povItem)
3263	3426	{
3264	3427	generatePOV();
3265	3428	//return true;
3266		- } else if (event.getSource() == zBufferItem)
	3429	+ } else if (event.getSource() == archiveItem)
	3430	+ {
	3431	+ cTools.Archive(frame);
	3432	+ return;
	3433	+ } else if (source == zBufferItem)
3267	3434	{
3268	3435	try
3269	3436	{
..	..	@@ -3285,21 +3452,8 @@
3285	3452	cameraView.repaint();
3286	3453	//return true;
3287	3454	}
3288		- */ else if (event.getSource() == editCameraItem)
3289		- {
3290		- cameraView.ProtectCamera();
3291		- cameraView.repaint();
3292		- return;
3293		- } else if (event.getSource() == revertCameraItem)
3294		- {
3295		- cameraView.RevertCamera();
3296		- cameraView.repaint();
3297		- return;
3298		-// } else if (event.getSource() == textureButton)
3299		-// {
3300		-// return; // true;
3301		- } else // combos...
3302		- if (event.getSource() == texresMenu)
	3455	+ */ else // combos...
	3456	+ if (source == texresMenu)
3303	3457	{
3304	3458	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3305	3459	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3311,12 +3465,349 @@
3311	3465	}
3312	3466	}
3313	3467
	3468	+ void New()
	3469	+ {
	3470	+ while (copy.Size() > 1)
	3471	+ {
	3472	+ copy.remove(1);
	3473	+ }
	3474	+
	3475	+ ResetModel();
	3476	+ objEditor.refreshContents();
	3477	+ }
	3478	+
	3479	+ static public byte[] Compress(Object3D o)
	3480	+ {
	3481	+ try
	3482	+ {
	3483	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3484	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3485	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3486	+
	3487	+ Object3D parent = o.parent;
	3488	+ o.parent = null;
	3489	+
	3490	+ out.writeObject(o);
	3491	+
	3492	+ o.parent = parent;
	3493	+
	3494	+ out.flush();
	3495	+
	3496	+ baos //zstream
	3497	+ .close();
	3498	+ out.close();
	3499	+
	3500	+ byte[] bytes = baos.toByteArray();
	3501	+
	3502	+ System.out.println("save #bytes = " + bytes.length);
	3503	+ return bytes;
	3504	+ } catch (Exception e)
	3505	+ {
	3506	+ System.err.println(e);
	3507	+ return null;
	3508	+ }
	3509	+ }
	3510	+
	3511	+ static public Object Uncompress(byte[] bytes)
	3512	+ {
	3513	+ System.out.println("restore #bytes = " + bytes.length);
	3514	+ try
	3515	+ {
	3516	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3517	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3518	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3519	+ Object obj = in.readObject();
	3520	+
	3521	+ bais //istream
	3522	+ .close();
	3523	+ in.close();
	3524	+
	3525	+ return obj;
	3526	+ } catch (Exception e)
	3527	+ {
	3528	+ System.err.println(e);
	3529	+ return null;
	3530	+ }
	3531	+ }
	3532	+
	3533	+ static public Object clone(Object o)
	3534	+ {
	3535	+ try
	3536	+ {
	3537	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3538	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3539	+
	3540	+ out.writeObject(o);
	3541	+
	3542	+ out.flush();
	3543	+ out.close();
	3544	+
	3545	+ byte[] bytes = baos.toByteArray();
	3546	+
	3547	+ System.out.println("clone = " + bytes.length);
	3548	+
	3549	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3550	+ ObjectInputStream in = new ObjectInputStream(bais);
	3551	+ Object obj = in.readObject();
	3552	+ in.close();
	3553	+
	3554	+ return obj;
	3555	+ } catch (Exception e)
	3556	+ {
	3557	+ System.err.println(e);
	3558	+ return null;
	3559	+ }
	3560	+ }
	3561	+
	3562	+ cRadio GetCurrentTab()
	3563	+ {
	3564	+ cRadio ab;
	3565	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3566	+ {
	3567	+ ab = (cRadio)e.nextElement();
	3568	+ if(ab.GetObject() == copy)
	3569	+ {
	3570	+ return ab;
	3571	+ }
	3572	+ }
	3573	+
	3574	+ return null;
	3575	+ }
	3576	+
	3577	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3578	+
	3579	+ public void Save()
	3580	+ {
	3581	+ Save(true);
	3582	+ }
	3583	+
	3584	+ private boolean Equal(byte[] compress, byte[] name)
	3585	+ {
	3586	+ if (compress.length != name.length)
	3587	+ {
	3588	+ return false;
	3589	+ }
	3590	+
	3591	+ for (int i=compress.length; --i>=0;)
	3592	+ {
	3593	+ if (compress[i] != name[i])
	3594	+ return false;
	3595	+ }
	3596	+
	3597	+ return true;
	3598	+ }
	3599	+
	3600	+ public boolean Save(boolean user)
	3601	+ {
	3602	+ System.err.println("Save");
	3603	+
	3604	+ cRadio tab = GetCurrentTab();
	3605	+
	3606	+ boolean temp = CameraPane.SWITCH;
	3607	+ CameraPane.SWITCH = false;
	3608	+
	3609	+ copy.ExtractBigData(hashtable);
	3610	+
	3611	+ byte[] compress = Compress(copy);
	3612	+
	3613	+ CameraPane.SWITCH = temp;
	3614	+
	3615	+ boolean thesame = false;
	3616	+
	3617	+ // Quick heuristic using length. Works only when stream is compressed.
	3618	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3619	+ {
	3620	+ thesame = true;
	3621	+ }
	3622	+
	3623	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3624	+ if (!thesame)
	3625	+ {
	3626	+ //tab.user[tab.undoindex] = user;
	3627	+ boolean increment = tab.graphs[tab.undoindex] == null;
	3628	+
	3629	+ tab.graphs[tab.undoindex] = compress;
	3630	+
	3631	+ if (increment)
	3632	+ tab.undoindex++;
	3633	+ }
	3634	+
	3635	+ copy.RestoreBigData(hashtable);
	3636	+
	3637	+ //assert(hashtable.isEmpty());
	3638	+
	3639	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3640	+ {
	3641	+ //tab.user[i] = false;
	3642	+ // tab.graphs[i] = null;
	3643	+ }
	3644	+
	3645	+ SetUndoStates();
	3646	+
	3647	+ // test save
	3648	+ if (false)
	3649	+ {
	3650	+ try
	3651	+ {
	3652	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3653	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3654	+
	3655	+ p.writeObject(copy);
	3656	+
	3657	+ p.flush();
	3658	+
	3659	+ ostream.close();
	3660	+ } catch (Exception e)
	3661	+ {
	3662	+ e.printStackTrace();
	3663	+ }
	3664	+ }
	3665	+
	3666	+ return !thesame;
	3667	+ }
	3668	+
	3669	+ void CopyChanged(Object3D obj)
	3670	+ {
	3671	+ SetUndoStates();
	3672	+
	3673	+ boolean temp = CameraPane.SWITCH;
	3674	+ CameraPane.SWITCH = false;
	3675	+
	3676	+ copy.ExtractBigData(hashtable);
	3677	+
	3678	+ copy.clear();
	3679	+
	3680	+ for (int i=0; i<obj.Size(); i++)
	3681	+ {
	3682	+ copy.add(obj.get(i));
	3683	+ }
	3684	+
	3685	+ copy.RestoreBigData(hashtable);
	3686	+
	3687	+ CameraPane.SWITCH = temp;
	3688	+
	3689	+ //assert(hashtable.isEmpty());
	3690	+
	3691	+ copy.Touch();
	3692	+
	3693	+ ResetModel();
	3694	+ copy.HardTouch(); // recompile?
	3695	+
	3696	+ cRadio ab;
	3697	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3698	+ {
	3699	+ ab = (cRadio)e.nextElement();
	3700	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3701	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3702	+ if (test != null)
	3703	+ {
	3704	+ test.editWindow = ab.object.editWindow;
	3705	+ ab.object = test;
	3706	+ }
	3707	+ }
	3708	+
	3709	+ refreshContents();
	3710	+ }
	3711	+
	3712	+ cButton undoButton;
	3713	+ cButton redoButton;
	3714	+
	3715	+ void SetUndoStates()
	3716	+ {
	3717	+ cRadio tab = GetCurrentTab();
	3718	+
	3719	+ undoButton.setEnabled(tab.undoindex > 0);
	3720	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3721	+ }
	3722	+
	3723	+ public boolean Undo()
	3724	+ {
	3725	+ System.err.println("Undo");
	3726	+
	3727	+ cRadio tab = GetCurrentTab();
	3728	+
	3729	+ if (tab.undoindex == 0)
	3730	+ {
	3731	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
	3736	+ {
	3737	+ if (Save(false))
	3738	+ tab.undoindex -= 1;
	3739	+ else
	3740	+ {
	3741	+ if (tab.undoindex <= 0)
	3742	+ return false;
	3743	+ else
	3744	+ tab.undoindex -= 1;
	3745	+ }
	3746	+ }
	3747	+
	3748	+ tab.undoindex -= 1;
	3749	+
	3750	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3751	+
	3752	+ return true;
	3753	+ }
	3754	+
	3755	+ public void Redo()
	3756	+ {
	3757	+ cRadio tab = GetCurrentTab();
	3758	+
	3759	+ if (tab.graphs[tab.undoindex + 1] == null)
	3760	+ {
	3761	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3762	+ return;
	3763	+ }
	3764	+
	3765	+ tab.undoindex += 1;
	3766	+
	3767	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3768	+
	3769	+ //if (!tab.user[tab.undoindex])
	3770	+ // tab.graphs[tab.undoindex] = null;
	3771	+ }
	3772	+
	3773	+ void ImportGFD()
	3774	+ {
	3775	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3776	+ browser.show();
	3777	+ String filename = browser.getFile();
	3778	+ if (filename != null && filename.length() > 0)
	3779	+ {
	3780	+ String fullname = browser.getDirectory() + filename;
	3781	+
	3782	+ //Object3D readobj =
	3783	+ objEditor.ReadGFD(fullname, objEditor);
	3784	+ //makeSomething(readobj);
	3785	+ }
	3786	+ }
	3787	+
	3788	+ void ImportVRMLX3D()
	3789	+ {
	3790	+ if (Grafreed.standAlone)
	3791	+ {
	3792	+ /**/
	3793	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3794	+ browser.show();
	3795	+ String filename = browser.getFile();
	3796	+ if (filename != null && filename.length() > 0)
	3797	+ {
	3798	+ String fullname = browser.getDirectory() + filename;
	3799	+ LoadVRMLX3D(fullname);
	3800	+ }
	3801	+ /**/
	3802	+ }
	3803	+ }
	3804	+
3314	3805	void ToggleAnimation()
3315	3806	{
3316	3807	if (!Globals.ANIMATION)
3317	3808	{
3318	3809	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3319		- browser.show();
	3810	+ browser.setVisible(true);
3320	3811	String filename = browser.getFile();
3321	3812	if (filename != null && filename.length() > 0)
3322	3813	{
..	..	@@ -3326,8 +3817,8 @@
3326	3817
3327	3818	Globals.ANIMATION ^= true;
3328	3819
3329		- GrafreeD.wav.cursor = 0;
3330		- GrafreeD.wav.loop = 0;
	3820	+ Grafreed.wav.cursor = 0;
	3821	+ Grafreed.wav.loop = 0;
3331	3822	}
3332	3823	} else
3333	3824	{
..	..	@@ -3377,7 +3868,7 @@
3377	3868	void CreateMaterial()
3378	3869	{
3379	3870	//copy.ClearMaterial(); // PATCH
3380		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3871	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3381	3872	if (copy.selection.size() > 0)
3382	3873	//SetMaterial(copy);
3383	3874	{
..	..	@@ -3428,7 +3919,7 @@
3428	3919	assert false;
3429	3920	}
3430	3921
3431		- void EditSelection()
	3922	+ void EditSelection(boolean newWindow)
3432	3923	{
3433	3924	}
3434	3925
..	..	@@ -3436,11 +3927,11 @@
3436	3927	{
3437	3928	copy.ResetBlockLoop(); // temporary problem
3438	3929
3439		- boolean random = CameraPane.RANDOM;
3440		- CameraPane.RANDOM = false; // parse everything
	3930	+ boolean random = CameraPane.SWITCH;
	3931	+ CameraPane.SWITCH = false; // parse everything
3441	3932	copy.ResetDisplayList();
3442	3933	copy.HardTouch();
3443		- CameraPane.RANDOM = random;
	3934	+ CameraPane.SWITCH = random;
3444	3935	}
3445	3936
3446	3937	// public void applySelf()
..	..	@@ -3510,10 +4001,40 @@
3510	4001	current.fakedepth = (float) fakedepthField.getFloat();
3511	4002	current.shadowbias = (float) shadowbiasField.getFloat();
3512	4003
3513		- if (!NumberSlider.frozen)
	4004	+ if (!cNumberSlider.frozen)
3514	4005	{
3515	4006	//System.out.println("Propagate = " + propagate);
3516	4007	copy.UpdateMaterial(anchor, current, propagate);
	4008	+
	4009	+ if (copy.material != null)
	4010	+ {
	4011	+ cMaterial mat = copy.material;
	4012	+
	4013	+ colorField.SetToolTipValue((mat.color));
	4014	+ modulationField.SetToolTipValue((mat.modulation));
	4015	+ metalnessField.SetToolTipValue((mat.metalness));
	4016	+ diffuseField.SetToolTipValue((mat.diffuse));
	4017	+ specularField.SetToolTipValue((mat.specular));
	4018	+ shininessField.SetToolTipValue((mat.shininess));
	4019	+ shiftField.SetToolTipValue((mat.shift));
	4020	+ ambientField.SetToolTipValue((mat.ambient));
	4021	+ lightareaField.SetToolTipValue((mat.lightarea));
	4022	+ diffusenessField.SetToolTipValue((mat.factor));
	4023	+ velvetField.SetToolTipValue((mat.velvet));
	4024	+ sheenField.SetToolTipValue((mat.sheen));
	4025	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4026	+ backlitField.SetToolTipValue((mat.bump));
	4027	+ anisoField.SetToolTipValue((mat.aniso));
	4028	+ anisoVField.SetToolTipValue((mat.anisoV));
	4029	+ cameraField.SetToolTipValue((mat.cameralight));
	4030	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4031	+ shadowField.SetToolTipValue((mat.shadow));
	4032	+ textureField.SetToolTipValue((mat.texture));
	4033	+ opacityField.SetToolTipValue((mat.opacity));
	4034	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4035	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4036	+ }
	4037	+
3517	4038	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3518	4039	{
3519	4040	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3558,6 +4079,7 @@
3558	4079	\|\| e.getSource() == apertureField
3559	4080	\|\| e.getSource() == shadowblurField)
3560	4081	{
	4082	+ new Exception().printStackTrace();
3561	4083	System.exit(0);
3562	4084	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3563	4085	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3628,7 +4150,7 @@
3628	4150	}
3629	4151
3630	4152	if (normalpushField != null)
3631		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4153	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3632	4154	}
3633	4155
3634	4156	void SnapObject()
..	..	@@ -3883,7 +4405,7 @@
3883	4405
3884	4406	radioPanel.revalidate();
3885	4407	radioPanel.repaint();
3886		- ctrlPanel.revalidate(); // ? new
	4408	+ ctrlPanel.validate(); // ? new
3887	4409	ctrlPanel.repaint();
3888	4410	}
3889	4411	}
..	..	@@ -3892,6 +4414,8 @@
3892	4414
3893	4415	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3894	4416	{
	4417	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4418	+ Save();
3895	4419	//Tween.set(thing, 0).target(1).start(tweenManager);
3896	4420	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3897	4421	// if (thing instanceof GenericJointDemo)
..	..	@@ -3978,6 +4502,12 @@
3978	4502	{
3979	4503	ResetModel();
3980	4504	Select(thing.GetTreePath(), true, false); // unselect... false);
	4505	+
	4506	+ if (thing.Size() == 0)
	4507	+ {
	4508	+ //EditSelection(false);
	4509	+ }
	4510	+
3981	4511	refreshContents();
3982	4512	}
3983	4513
..	..	@@ -4095,6 +4625,7 @@
4095	4625	}
4096	4626	}
4097	4627	}
	4628	+
4098	4629	LoadGFDThread loadGFDThread;
4099	4630
4100	4631	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4114,8 +4645,10 @@
4114	4645
4115	4646	try
4116	4647	{
	4648	+ // Try compressed version first.
4117	4649	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4118		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4650	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4651	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4119	4652
4120	4653	readobj = (Object3D) p.readObject();
4121	4654	istream.close();
..	..	@@ -4123,7 +4656,20 @@
4123	4656	readobj.ResetDisplayList();
4124	4657	} catch (Exception e)
4125	4658	{
4126		- e.printStackTrace();
	4659	+ //e.printStackTrace();
	4660	+ try
	4661	+ {
	4662	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4663	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4664	+
	4665	+ readobj = (Object3D) p.readObject();
	4666	+ istream.close();
	4667	+
	4668	+ readobj.ResetDisplayList();
	4669	+ } catch (Exception e2)
	4670	+ {
	4671	+ e2.printStackTrace();
	4672	+ }
4127	4673	}
4128	4674	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4129	4675	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4169,6 +4715,12 @@
4169	4715
4170	4716	void LoadIt(Object obj)
4171	4717	{
	4718	+ if (obj == null)
	4719	+ {
	4720	+ // Invalid file
	4721	+ return;
	4722	+ }
	4723	+
4172	4724	System.out.println("Loaded " + obj);
4173	4725	//new Exception().printStackTrace();
4174	4726	Object3D readobj = (Object3D) obj;
..	..	@@ -4178,6 +4730,8 @@
4178	4730
4179	4731	if (readobj != null)
4180	4732	{
	4733	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4734	+ // Save();
4181	4735	try
4182	4736	{
4183	4737	//readobj.deepCopySelf(copy);
..	..	@@ -4238,9 +4792,9 @@
4238	4792	}
4239	4793	}
4240	4794
4241		- void load() // throws ClassNotFoundException
	4795	+ void Open() // throws ClassNotFoundException
4242	4796	{
4243		- if (GrafreeD.standAlone)
	4797	+ if (Grafreed.standAlone)
4244	4798	{
4245	4799	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4246	4800	browser.show();
..	..	@@ -4327,11 +4881,13 @@
4327	4881	try
4328	4882	{
4329	4883	FileOutputStream ostream = new FileOutputStream(lastname);
4330		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4884	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4885	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4331	4886
4332	4887	p.writeObject(copy);
4333	4888	p.flush();
4334	4889
	4890	+ zstream.close();
4335	4891	ostream.close();
4336	4892
4337	4893	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4341,17 +4897,20 @@
4341	4897	{
4342	4898	}
4343	4899	}
	4900	+
4344	4901	String lastname;
4345	4902
4346	4903	void saveAs()
4347	4904	{
4348		- if (GrafreeD.standAlone)
	4905	+ if (Grafreed.standAlone)
4349	4906	{
4350	4907	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4351	4908	browser.setVisible(true);
4352	4909	String filename = browser.getFile();
4353	4910	if (filename != null && filename.length() > 0)
4354	4911	{
	4912	+ if (!filename.endsWith(".gfd"))
	4913	+ filename += ".gfd";
4355	4914	lastname = browser.getDirectory() + filename;
4356	4915	save();
4357	4916	}
..	..	@@ -4450,13 +5009,13 @@
4450	5009	try
4451	5010	{
4452	5011	FileOutputStream ostream = new FileOutputStream(filename);
4453		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4454		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5012	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5013	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4455	5014
4456	5015	Object3D objectparent = obj.parent;
4457	5016	obj.parent = null;
4458	5017
4459		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5018	+ Object3D object = (Object3D) Grafreed.clone(obj);
4460	5019
4461	5020	obj.parent = objectparent;
4462	5021
..	..	@@ -4468,8 +5027,8 @@
4468	5027	p.writeObject(object);
4469	5028	p.flush();
4470	5029
	5030	+ zstream.close();
4471	5031	ostream.close();
4472		- // zstream.close();
4473	5032
4474	5033	// group.selection.get(0).parent = parent;
4475	5034	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4490,7 +5049,7 @@
4490	5049	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4491	5050	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4492	5051	copy.generatePOV(buffer);
4493		- if (GrafreeD.standAlone)
	5052	+ if (Grafreed.standAlone)
4494	5053	{
4495	5054	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4496	5055	browser.show();
..	..	@@ -4516,21 +5075,20 @@
4516	5075	Object3D client;
4517	5076	Object3D copy;
4518	5077	MenuBar menuBar;
4519		- Menu windowMenu;
4520		- MenuItem loadItem;
	5078	+ Menu fileMenu;
	5079	+ MenuItem newItem;
	5080	+ MenuItem openItem;
4521	5081	MenuItem saveItem;
4522	5082	MenuItem saveAsItem;
4523	5083	MenuItem exportAsItem;
4524	5084	MenuItem reexportItem;
4525	5085	MenuItem povItem;
4526	5086	MenuItem closeItem;
4527		- Menu cameraMenu;
	5087	+
4528	5088	CheckboxMenuItem zBufferItem;
4529	5089	//MenuItem normalLensItem;
4530		- MenuItem editCameraItem;
4531		- MenuItem revertCameraItem;
4532		- CheckboxMenuItem toggleLiveItem;
4533	5090	MenuItem stepItem;
	5091	+ CheckboxMenuItem toggleLiveItem;
4534	5092	CheckboxMenuItem toggleFullScreenItem;
4535	5093	CheckboxMenuItem toggleTimelineItem;
4536	5094	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4539,28 +5097,42 @@
4539	5097	CheckboxMenuItem toggleFootContactItem;
4540	5098	CheckboxMenuItem toggleDLItem;
4541	5099	CheckboxMenuItem toggleTextureItem;
4542		- CheckboxMenuItem toggleRandomItem;
	5100	+ CheckboxMenuItem toggleSwitchItem;
4543	5101	CheckboxMenuItem toggleRootItem;
4544	5102	CheckboxMenuItem animationItem;
	5103	+ MenuItem archiveItem;
4545	5104	CheckboxMenuItem toggleHandleItem;
4546	5105	CheckboxMenuItem togglePaintItem;
4547	5106	JSplitPane mainPanel;
4548	5107	JScrollPane scrollpane;
	5108	+
4549	5109	JPanel toolbarPanel;
4550		- JPanel treePanel;
	5110	+
	5111	+ cGridBag treePanel;
	5112	+
4551	5113	JPanel radioPanel;
4552	5114	ButtonGroup buttonGroup;
4553		- JPanel ctrlPanel;
4554		- JPanel materialPanel;
	5115	+
	5116	+ cGridBag toolboxPanel;
	5117	+ cGridBag materialPanel;
	5118	+ cGridBag ctrlPanel;
	5119	+
4555	5120	JScrollPane infoPanel;
4556		- JPanel optionsPanel;
	5121	+
	5122	+ cGridBag optionsPanel;
	5123	+
4557	5124	JTabbedPane objectPanel;
	5125	+ boolean materialFlushed;
	5126	+ Object3D latestObject;
	5127	+
4558	5128	cGridBag XYZPanel;
	5129	+
4559	5130	JSplitPane gridPanel;
4560	5131	JSplitPane bigPanel;
	5132	+
4561	5133	cGridBag bigThree;
4562		- JTabbedPane scenePanel;
4563		- JPanel centralPanel;
	5134	+ cGridBag scenePanel;
	5135	+ cGridBag centralPanel;
4564	5136	JSplitPane cameraPanel;
4565	5137	JPanel timelinePanel;
4566	5138	JMenuBar timelineMenubar;
..	..	@@ -4613,67 +5185,72 @@
4613	5185	// MATERIAL
4614	5186	JLabel materialLabel;
4615	5187	JLabel colorLabel;
4616		- NumberSlider colorField;
	5188	+ cNumberSlider colorField;
4617	5189	JLabel modulationLabel;
4618		- NumberSlider modulationField;
	5190	+ cNumberSlider modulationField;
4619	5191	JLabel metalnessLabel;
4620		- NumberSlider metalnessField;
	5192	+ cNumberSlider metalnessField;
4621	5193	JLabel diffuseLabel;
4622		- NumberSlider diffuseField;
	5194	+ cNumberSlider diffuseField;
4623	5195	JLabel specularLabel;
4624		- NumberSlider specularField;
	5196	+ cNumberSlider specularField;
4625	5197	JLabel shininessLabel;
4626		- NumberSlider shininessField;
	5198	+ cNumberSlider shininessField;
4627	5199	JLabel shiftLabel;
4628		- NumberSlider shiftField;
	5200	+ cNumberSlider shiftField;
4629	5201	JLabel ambientLabel;
4630		- NumberSlider ambientField;
	5202	+ cNumberSlider ambientField;
4631	5203	JLabel lightareaLabel;
4632		- NumberSlider lightareaField;
	5204	+ cNumberSlider lightareaField;
4633	5205	JLabel diffusenessLabel;
4634		- NumberSlider diffusenessField;
	5206	+ cNumberSlider diffusenessField;
4635	5207	JLabel velvetLabel;
4636		- NumberSlider velvetField;
	5208	+ cNumberSlider velvetField;
4637	5209	JLabel sheenLabel;
4638		- NumberSlider sheenField;
	5210	+ cNumberSlider sheenField;
4639	5211	JLabel subsurfaceLabel;
4640		- NumberSlider subsurfaceField;
	5212	+ cNumberSlider subsurfaceField;
4641	5213	//JLabel bumpLabel;
4642	5214	//NumberSlider bumpField;
4643	5215	JLabel backlitLabel;
4644		- NumberSlider backlitField;
	5216	+ cNumberSlider backlitField;
4645	5217	JLabel anisoLabel;
4646		- NumberSlider anisoField;
	5218	+ cNumberSlider anisoField;
4647	5219	JLabel anisoVLabel;
4648		- NumberSlider anisoVField;
	5220	+ cNumberSlider anisoVField;
4649	5221	JLabel cameraLabel;
4650		- NumberSlider cameraField;
	5222	+ cNumberSlider cameraField;
4651	5223	JLabel selfshadowLabel;
4652		- NumberSlider selfshadowField;
	5224	+ cNumberSlider selfshadowField;
4653	5225	JLabel shadowLabel;
4654		- NumberSlider shadowField;
	5226	+ cNumberSlider shadowField;
4655	5227	JLabel textureLabel;
4656		- NumberSlider textureField;
	5228	+ cNumberSlider textureField;
4657	5229	JLabel opacityLabel;
4658		- NumberSlider opacityField;
	5230	+ cNumberSlider opacityField;
4659	5231	JLabel fakedepthLabel;
4660		- NumberSlider fakedepthField;
	5232	+ cNumberSlider fakedepthField;
4661	5233	JLabel shadowbiasLabel;
4662		- NumberSlider shadowbiasField;
	5234	+ cNumberSlider shadowbiasField;
4663	5235	JLabel bumpLabel;
4664		- NumberSlider bumpField;
	5236	+ cNumberSlider bumpField;
4665	5237	JLabel noiseLabel;
4666		- NumberSlider noiseField;
	5238	+ cNumberSlider noiseField;
4667	5239	JLabel powerLabel;
4668		- NumberSlider powerField;
	5240	+ cNumberSlider powerField;
4669	5241	JLabel borderfadeLabel;
4670		- NumberSlider borderfadeField;
	5242	+ cNumberSlider borderfadeField;
4671	5243	JLabel fogLabel;
4672		- NumberSlider fogField;
	5244	+ cNumberSlider fogField;
4673	5245	JLabel opacityPowerLabel;
4674		- NumberSlider opacityPowerField;
4675		- JTree jTree;
	5246	+ cNumberSlider opacityPowerField;
	5247	+ cTree jTree;
4676	5248	//ObjectUI parent;
4677	5249
4678		- NumberSlider normalpushField;
	5250	+ cNumberSlider normalpushField;
	5251	+
	5252	+ private MenuItem importGFDItem;
	5253	+ private MenuItem importVRMLX3DItem;
	5254	+ private MenuItem import3DSItem;
	5255	+ private MenuItem importOBJItem;
4679	5256	}