~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -31,6 +37,70 @@
31	37	boolean timeline;
32	38	boolean wasFullScreen;
33	39
	40	+ GroupEditor callee;
	41	+ JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
	103	+
34	104	// SCRIPT
35	105
36	106	transient JFrame textpanel = null;
..	..	@@ -121,47 +191,54 @@
121	191	void keyPressed(int key, int modifiers)
122	192	{
123	193	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	194	+ Globals.theRenderer.keyPressed(key, modifiers);
125	195	}
126	196	*/
127	197
128	198	static GridBagConstraints aConstraints;
129	199	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	200	+
132	201	static int GRIDWIDTH = 100; // 4;
133	202
134	203	public void closeUI()
135	204	{
136	205	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
139	208	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
141	210
142		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
143	214	return;
144	215
145		- objEditor.ctrlPanel.remove(liveCB);
146		- objEditor.ctrlPanel.remove(hideCB);
147		- objEditor.ctrlPanel.remove(markCB);
148		-
149		- objEditor.ctrlPanel.remove(randomCB);
150		- objEditor.ctrlPanel.remove(speedupCB);
151		- objEditor.ctrlPanel.remove(rewindCB);
152		-
153		- objEditor.ctrlPanel.remove(resetButton);
154		- objEditor.ctrlPanel.remove(stepButton);
155		-// objEditor.ctrlPanel.remove(stepAllButton);
156		-// objEditor.ctrlPanel.remove(resetAllButton);
157		- objEditor.ctrlPanel.remove(link2masterCB);
158		- //objEditor.ctrlPanel.remove(flipVCB);
159		- //objEditor.ctrlPanel.remove(texresMenu);
160		- objEditor.ctrlPanel.remove(slowerButton);
161		- objEditor.ctrlPanel.remove(fasterButton);
162		- objEditor.ctrlPanel.remove(remarkButton);
	216	+// objEditor.ctrlPanel.remove(liveCB);
	217	+// objEditor.ctrlPanel.remove(hideCB);
	218	+// objEditor.ctrlPanel.remove(markCB);
	219	+//
	220	+// objEditor.ctrlPanel.remove(randomCB);
	221	+// objEditor.ctrlPanel.remove(speedupCB);
	222	+// objEditor.ctrlPanel.remove(rewindCB);
	223	+//
	224	+// objEditor.ctrlPanel.remove(resetButton);
	225	+// objEditor.ctrlPanel.remove(stepButton);
	226	+//// objEditor.ctrlPanel.remove(stepAllButton);
	227	+//// objEditor.ctrlPanel.remove(resetAllButton);
	228	+// objEditor.ctrlPanel.remove(link2masterCB);
	229	+// //objEditor.ctrlPanel.remove(flipVCB);
	230	+// //objEditor.ctrlPanel.remove(texresMenu);
	231	+// objEditor.ctrlPanel.remove(slowerButton);
	232	+// objEditor.ctrlPanel.remove(fasterButton);
	233	+// objEditor.ctrlPanel.remove(remarkButton);
163	234
164		- 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);
165	242	}
166	243
167	244	public ObjEditor GetEditor()
..	..	@@ -232,6 +309,7 @@
232	309	//localCopy.parent = null;
233	310
234	311	frame = new JFrame();
	312	+ frame.setUndecorated(true);
235	313	objEditor = this;
236	314	this.callee = callee;
237	315
..	..	@@ -262,27 +340,48 @@
262	340	return frame.action(event, obj);
263	341	}
264	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	+
265	348	void SetupMenu()
266	349	{
267	350	frame.setMenuBar(menuBar = new MenuBar());
268		- menuBar.add(windowMenu = new Menu("File"));
269		- windowMenu.add(loadItem = new MenuItem("Load..."));
270		- windowMenu.add("-");
271		- windowMenu.add(saveItem = new MenuItem("Save"));
272		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
273	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
274		- windowMenu.add("-");
275		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
276		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
277		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
278	376	if (client.parent != null)
279	377	{
280		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
281	379	} else
282	380	{
283		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
284	382	}
285	383
	384	+ newItem.addActionListener(this);
286	385	loadItem.addActionListener(this);
287	386	saveItem.addActionListener(this);
288	387	saveAsItem.addActionListener(this);
..	..	@@ -291,81 +390,66 @@
291	390	//povItem.addActionListener(this);
292	391	closeItem.addActionListener(this);
293	392
294		- menuBar.add(cameraMenu = new Menu("View"));
295		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
296		- //zBufferItem.addActionListener(this);
297		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
298		- //normalLensItem.addActionListener(this);
299		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
300		- revertCameraItem.addActionListener(this);
301		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
302		- toggleTimelineItem.addItemListener(this);
303		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
304		- toggleFullScreenItem.addItemListener(this);
305		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
306		- cameraMenu.add("-");
307		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
308		- toggleTextureItem.addItemListener(this);
309		- toggleTextureItem.setState(CameraPane.textureon);
310		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311		- toggleLiveItem.addItemListener(this);
312		- toggleLiveItem.setState(CameraPane.isLIVE());
313		- cameraMenu.add(stepItem = new MenuItem("Step"));
314		- stepItem.addActionListener(this);
315		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
316		-// toggleDLItem.addItemListener(this);
317		-// toggleDLItem.setState(false);
318		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
319		- toggleRenderItem.addItemListener(this);
320		- toggleRenderItem.setState(!CameraPane.frozen);
321		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
322		- toggleDebugItem.addItemListener(this);
323		- toggleDebugItem.setState(CameraPane.DEBUG);
324		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
325		- toggleFrustumItem.addItemListener(this);
326		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
327		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
328		- toggleFootContactItem.addItemListener(this);
329		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
330		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
331		- toggleRandomItem.addItemListener(this);
332		- toggleRandomItem.setState(CameraPane.RANDOM);
333		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
334		- toggleHandleItem.addItemListener(this);
335		- toggleHandleItem.setState(CameraPane.HANDLES);
336		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
337		- togglePaintItem.addItemListener(this);
338		- togglePaintItem.setState(CameraPane.PAINTMODE);
339		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
340		-// toggleRootItem.addItemListener(this);
341		-// toggleRootItem.setState(false);
342		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
343		-// animationItem.addItemListener(this);
344		-// animationItem.setState(CameraPane.ANIMATION);
345		- cameraMenu.add("-");
346		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
347		- editCameraItem.addActionListener(this);
348		-
349	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	+
350	420	toolbarPanel = new JPanel();
351	421	toolbarPanel.setName("Toolbar");
352		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
353	423	treePanel.setName("Tree");
354		- ctrlPanel = new JPanel(); // new GridBagLayout());
355		- ctrlPanel.setName("Edit");
356		- 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);
357	438	materialPanel.setName("Material");
	439	+
358	440	/JTextPane/
359	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
360	444	infoarea.setEditable(true);
361	445	SetText();
362	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
363	447	// infoarea.setOpaque(false);
364	448	// //infoarea.setForeground(textcolor);
365		- infoarea.setLineWrap(true);
366		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
367	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
368		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ //infoPanel.setPreferredSize(new Dimension(50, 200));
369	453	infoPanel.setName("Info");
370	454	//infoPanel.setLayout(new BorderLayout());
371	455	//infoPanel.add(createTextPane());
..	..	@@ -374,16 +458,23 @@
374	458	mainPanel.setName("Main");
375	459	mainPanel.setContinuousLayout(true);
376	460	mainPanel.setOneTouchExpandable(true);
377		- mainPanel.setDividerLocation(1.0);
378	461	mainPanel.setDividerSize(9);
379		- mainPanel.setResizeWeight(0);
380		-
	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	+
381	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
382	473	//mainPanel.setLayout(new GridBagLayout());
383	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384		- treePanel.setLayout(new GridBagLayout());
385		- ctrlPanel.setLayout(new GridBagLayout());
386		- materialPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
	477	+ //materialPanel.setLayout(new GridBagLayout());
387	478
388	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389	480	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -422,7 +513,7 @@
422	513	static String newline = "\n";
423	514	protected static final String buttonString = "JButton";
424	515	StyledDocument doc;
425		- JTextArea infoarea;
	516	+ JTextPane infoarea;
426	517
427	518	void ClearInfo()
428	519	{
..	..	@@ -445,10 +536,10 @@
445	536	e.printStackTrace();
446	537	}
447	538
448		- String selection = infoarea.getText();
449		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
450		- java.awt.datatransfer.Clipboard clipboard =
451		- 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();
452	543	//clipboard.setContents(data, data);
453	544	}
454	545
..	..	@@ -471,13 +562,13 @@
471	562	//SendInfo("Name:", "bold");
472	563	if (sel.GetTextures() != null \|\| debug)
473	564	{
474		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
475	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
476	567	if (sel.Size() > 0)
477	568	{
478	569	si.SendInfo("#children = " + sel.Size(), "regular");
479	570	}
480		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
481	572	if (debug)
482	573	{
483	574	try
..	..	@@ -489,7 +580,10 @@
489	580	}
490	581
491	582	if (full)
492		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
493	587
494	588	if (sel.bRep != null)
495	589	{
..	..	@@ -516,7 +610,7 @@
516	610	}
517	611	if (sel.support != null)
518	612	{
519		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
520	614	}
521	615	if (sel.scriptnode != null)
522	616	{
..	..	@@ -587,6 +681,9 @@
587	681	{
588	682	CameraPane.pointflow = (PointFlow) sel;
589	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
590	687	}
591	688	}
592	689
..	..	@@ -602,68 +699,159 @@
602	699	}
603	700	}
604	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	+ }
	749	+
	750	+ maximized ^= true;
	751	+
	752	+ frame.validate();
	753	+ }
	754	+
	755	+ cButton minButton;
	756	+ cButton maxButton;
	757	+ cButton fullButton;
	758	+
605	759	void ToggleFullScreen()
606	760	{
607		- if (CameraPane.FULLSCREEN)
	761	+ cameraView.ToggleFullScreen();
	762	+
	763	+ if (!CameraPane.FULLSCREEN)
608	764	{
609		- frame.getContentPane().remove(/"Center",/bigThree);
610		- framePanel.add(bigThree);
611		- frame.getContentPane().add(/"Center",/framePanel);
	765	+ device.setFullScreenWindow(null);
	766	+ frame.validate();
	767	+
	768	+ //frame.setVisible(false);
	769	+// frame.removeNotify();
	770	+// frame.setUndecorated(false);
	771	+// frame.addNotify();
	772	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	773	+
	774	+// X frame.getContentPane().remove(/"Center",/bigThree);
	775	+// X framePanel.add(bigThree);
	776	+// X frame.getContentPane().add(/"Center",/framePanel);
	777	+ framePanel.setDividerLocation(1);
	778	+
	779	+ //frame.setVisible(true);
	780	+ radio.layout = keepButton;
	781	+ //theFrame = null;
	782	+ keepButton = null;
	783	+ radio.layout.doClick();
	784	+
612	785	} else
613	786	{
614		- frame.getContentPane().remove(/"Center",/framePanel);
615		- framePanel.remove(bigThree);
616		- frame.getContentPane().add(/"Center",/bigThree);
	787	+ keepButton = radio.layout;
	788	+ //keeprect = frame.getBounds();
	789	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	790	+// frame.getToolkit().getScreenSize().height);
	791	+ //frame.setVisible(false);
	792	+ device.setFullScreenWindow(frame);
	793	+ frame.validate();
	794	+// frame.removeNotify();
	795	+// frame.setUndecorated(true);
	796	+// frame.addNotify();
	797	+// X frame.getContentPane().remove(/"Center",/framePanel);
	798	+// X framePanel.remove(bigThree);
	799	+// X frame.getContentPane().add(/"Center",/bigThree);
	800	+ framePanel.setDividerLocation(0);
	801	+
	802	+ radio.layout = fullscreenLayout;
	803	+ radio.layout.doClick();
	804	+ //frame.setVisible(true);
617	805	}
618		- cameraView.ToggleFullScreen();
	806	+ frame.validate();
619	807	}
620	808
621		- private JTextArea createTextPane()
	809	+ private JTextPane createTextPane()
622	810	{
623		- String[] initString =
624		- {
625		- "This is an editable JTextPane, ", //regular
626		- "another ", //italic
627		- "styled ", //bold
628		- "text ", //small
629		- "component, ", //large
630		- "which supports embedded components..." + newline,//regular
631		- " " + newline, //button
632		- "...and embedded icons..." + newline, //regular
633		- " ", //icon
634		- newline + "JTextPane is a subclass of JEditorPane that "
635		- + "uses a StyledEditorKit and StyledDocument, and provides "
636		- + "cover methods for interacting with those objects."
637		- };
	811	+// TEXTAREA String[] initString =
	812	+// {
	813	+// "This is an editable JTextPane, ", //regular
	814	+// "another ", //italic
	815	+// "styled ", //bold
	816	+// "text ", //small
	817	+// "component, ", //large
	818	+// "which supports embedded components..." + newline,//regular
	819	+// " " + newline, //button
	820	+// "...and embedded icons..." + newline, //regular
	821	+// " ", //icon
	822	+// newline + "JTextPane is a subclass of JEditorPane that "
	823	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	824	+// + "cover methods for interacting with those objects."
	825	+// };
	826	+//
	827	+// String[] initStyles =
	828	+// {
	829	+// "regular", "italic", "bold", "small", "large",
	830	+// "regular", "button", "regular", "icon",
	831	+// "regular"
	832	+// };
	833	+//
	834	+// JTextPane textPane = new JTextPane();
	835	+// textPane.setEditable(true);
	836	+// /StyledDocument/ doc = textPane.getStyledDocument();
	837	+// addStylesToDocument(doc);
	838	+//
	839	+// try
	840	+// {
	841	+// for (int j = 0; j < 2; j++)
	842	+// {
	843	+// for (int i = 0; i < initString.length; i++)
	844	+// {
	845	+// doc.insertString(doc.getLength(), initString[i],
	846	+// doc.getStyle(initStyles[i]));
	847	+// }
	848	+// }
	849	+// } catch (BadLocationException ble)
	850	+// {
	851	+// System.err.println("Couldn't insert initial text into text pane.");
	852	+// }
638	853
639		- String[] initStyles =
640		- {
641		- "regular", "italic", "bold", "small", "large",
642		- "regular", "button", "regular", "icon",
643		- "regular"
644		- };
645		-
646		- JTextPane textPane = new JTextPane();
647		- textPane.setEditable(true);
648		- /StyledDocument/ doc = textPane.getStyledDocument();
649		- addStylesToDocument(doc);
650		-
651		- try
652		- {
653		- for (int j = 0; j < 2; j++)
654		- {
655		- for (int i = 0; i < initString.length; i++)
656		- {
657		- doc.insertString(doc.getLength(), initString[i],
658		- doc.getStyle(initStyles[i]));
659		- }
660		- }
661		- } catch (BadLocationException ble)
662		- {
663		- System.err.println("Couldn't insert initial text into text pane.");
664		- }
665		-
666		- return new JTextArea(); // textPane;
	854	+ return new JTextPane(); // textPane;
667	855	}
668	856
669	857	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -716,7 +904,7 @@
716	904	protected static ImageIcon createImageIcon(String path,
717	905	String description)
718	906	{
719		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	907	+ java.net.URL imgURL = Grafreed.class.getResource(path);
720	908	if (imgURL != null)
721	909	{
722	910	return new ImageIcon(imgURL, description);
..	..	@@ -748,6 +936,7 @@
748	936	// NumberSlider vDivsField;
749	937	// JCheckBox endcaps;
750	938	JCheckBox liveCB;
	939	+ JCheckBox selectCB;
751	940	JCheckBox hideCB;
752	941	JCheckBox link2masterCB;
753	942	JCheckBox markCB;
..	..	@@ -755,7 +944,12 @@
755	944	JCheckBox speedupCB;
756	945	JCheckBox rewindCB;
757	946	JCheckBox flipVCB;
	947	+
	948	+ cCheckBox toggleTextureCB;
	949	+ cCheckBox toggleSwitchCB;
	950	+
758	951	JComboBox texresMenu;
	952	+
759	953	JButton resetButton;
760	954	JButton stepButton;
761	955	JButton stepAllButton;
..	..	@@ -763,115 +957,87 @@
763	957	JButton slowerButton;
764	958	JButton fasterButton;
765	959	JButton remarkButton;
	960	+
	961	+ cGridBag editPanel;
	962	+ cGridBag editCommandsPanel;
	963	+
	964	+ cGridBag namePanel;
	965	+ cGridBag setupPanel;
	966	+ cGridBag setupPanel2;
	967	+ cGridBag objectCommandsPanel;
	968	+ cGridBag pushPanel;
	969	+ cGridBag fillPanel;
766	970
767		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	971	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
768	972	{
769	973	JCheckBox cb;
770	974
771		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
772		- oe.aConstraints.gridwidth = 1; // 3;
773		-// oe.aConstraints.weightx = 1;
774		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
775		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	975	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
776	976	cb.addItemListener(this);
777		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
778		- oe.aConstraints.gridwidth = 1;
779		- oe.aConstraints.gridx += 1;
780	977
781	978	return cb;
782	979	}
783	980
784		- cButton AddButton(ObjEditor oe, String label)
	981	+ cButton AddButton(cGridBag panel, String label)
785	982	{
786	983	cButton cb;
787	984
788		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
789		- oe.aConstraints.gridwidth = 1;
790		-// oe.aConstraints.weightx = 1;
791		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
792		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	985	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
793	986	cb.addActionListener(this);
794		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
795		- oe.aConstraints.gridwidth = 1;
796		- oe.aConstraints.gridx += 1;
797	987
798	988	return cb;
799	989	}
800	990
801		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	991	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
802	992	{
803	993	JComboBox combo;
804	994
805		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
806		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
807		- oe.aConstraints.gridx += 1;
	995	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	996	combo.addActionListener(this);
809	997
810	998	return combo;
811	999	}
812	1000
813		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1001	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
814	1002	{
815		- NumberSlider combo;
	1003	+ cGridBag control = new cGridBag();
	1004	+
	1005	+ cNumberSlider combo;
816	1006
817	1007	JLabel jlabel = new JLabel(label);
818		-
819		- aConstraints.fill = GridBagConstraints.VERTICAL;
820	1008	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
821		- aConstraints.gridwidth = 1;
822		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
825		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
826		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.gridwidth = 1;
829		-
	1009	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1010	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830	1011	combo.setFloat(current);
831		-
832		- combo.label = jlabel;
833		-
834		- combo.addChangeListener(this);
835		-
836		- return combo;
	1012	+
	1013	+ panel.add(control);
	1014	+
	1015	+ return control;
837	1016	}
838	1017
839		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1018	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
840	1019	{
841		- NumberSlider combo;
	1020	+ cGridBag control = new cGridBag();
	1021	+
	1022	+ cNumberSlider combo;
842	1023
843	1024	JLabel jlabel = new JLabel(label);
844		-
845		- aConstraints.fill = GridBagConstraints.VERTICAL;
846	1025	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
847		- aConstraints.gridwidth = 2;
848		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
851		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
852		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.gridwidth = 1;
855		-
	1026	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1027	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856	1028	combo.setInteger(current);
857	1029
858		- combo.label = jlabel;
859		-
860		- combo.addChangeListener(this);
861		-
862		- return combo;
	1030	+ panel.add(control);
	1031	+
	1032	+ return control;
863	1033	}
864	1034
865		- JTextArea AddText(JPanel ctrlPanel, String name)
	1035	+ JTextArea AddText(cGridBag ctrlPanel, String name)
866	1036	{
867	1037	JTextArea text;
868	1038
869		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
870		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1039	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872	1040	text.addCaretListener(this);
873		- aConstraints.gridx += 1;
874		- aConstraints.gridwidth = 1;
875	1041
876	1042	return text;
877	1043	}
..	..	@@ -901,9 +1067,16 @@
901	1067	objEditor.ctrlPanel.remove(j);
902	1068	}
903	1069
	1070	+ void Remove(cNumberSlider j)
	1071	+ {
	1072	+ j.removeChangeListener(this);
	1073	+ //objEditor.ctrlPanel.remove(j.label);
	1074	+ objEditor.ctrlPanel.remove(j);
	1075	+ }
	1076	+
904	1077	/*
905	1078	*/
906		- void Return() // ObjEditor oe)
	1079	+ void Return0() // ObjEditor oe)
907	1080	{
908	1081	aConstraints.gridy += 1;
909	1082	aConstraints.gridx = 0;
..	..	@@ -958,37 +1131,76 @@
958	1131
959	1132	void SetupUI2(ObjEditor oe)
960	1133	{
961		-// oe.aConstraints.weightx = 0;
962		-// oe.aConstraints.weighty = 0;
963		-// oe.aConstraints.gridx = 0;
964		-// oe.aConstraints.gridy = 0;
965		- SetupName(oe);
	1134	+ //SetupName(oe);
966	1135
967		- if (!GroupEditor.allparams)
	1136	+ namePanel = new cGridBag();
	1137	+
	1138	+ nameField = AddText(namePanel, copy.GetName());
	1139	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1140	+ oe.ctrlPanel.add(namePanel);
	1141	+
	1142	+ oe.ctrlPanel.Return();
	1143	+
	1144	+ if (!allparams)
968	1145	return;
969	1146
970		- liveCB = AddCheckBox(oe, "Live", copy.live);
971		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1147	+ setupPanel = new cGridBag().setVertical(false);
	1148	+
	1149	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1150	+ liveCB.setToolTipText("Animate object");
	1151	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1152	+ selectCB.setToolTipText("Make object selectable");
973	1153	// Return();
974		- markCB = AddCheckBox(oe, "Mark", copy.marked);
975		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
976		- randomCB = AddCheckBox(oe, "Rand", copy.random);
977		- Return();
978		- resetButton = AddButton(oe, "Reset");
979		- stepButton = AddButton(oe, "Step");
	1154	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1155	+ hideCB.setToolTipText("Hide object");
	1156	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1157	+ markCB.setToolTipText("As animation target transform");
	1158	+
	1159	+ setupPanel2 = new cGridBag().setVertical(false);
	1160	+
	1161	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1162	+ rewindCB.setToolTipText("Rewind animation");
	1163	+
	1164	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1165	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1166	+
	1167	+ if (Globals.ADVANCED)
	1168	+ {
	1169	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1170	+ link2masterCB.setToolTipText("Attach to support");
	1171	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1172	+ speedupCB.setToolTipText("Option motion capture");
	1173	+ }
	1174	+
	1175	+ oe.ctrlPanel.add(setupPanel);
	1176	+ oe.ctrlPanel.Return();
	1177	+ oe.ctrlPanel.add(setupPanel2);
	1178	+ oe.ctrlPanel.Return();
	1179	+
	1180	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1181	+
	1182	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1183	+ resetButton.setToolTipText("Jump to frame zero");
	1184	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1185	+ stepButton.setToolTipText("Step one frame");
980	1186	// resetAllButton = AddButton(oe, "Reset All");
981	1187	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
983	1188	// Return();
984		- slowerButton = AddButton(oe, "Slow");
985		- fasterButton = AddButton(oe, "Fast");
986		- remarkButton = AddButton(oe, "Rem");
	1189	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1190	+ slowerButton.setToolTipText("Decrease animation speed");
	1191	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1192	+ fasterButton.setToolTipText("Increase animation speed");
	1193	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1194	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1195
988		- Return();
	1196	+ oe.ctrlPanel.add(objectCommandsPanel);
	1197	+ oe.ctrlPanel.Return();
989	1198
990		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991		- Return();
	1199	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1200	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1201	+ //Return();
	1202	+
	1203	+ oe.ctrlPanel.Return();
992	1204
993	1205	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
994	1206	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1083,7 +1295,7 @@
1083	1295	oe.aConstraints.gridwidth = 1;
1084	1296	/**/
1085	1297	nameField = AddText(oe.ctrlPanel, copy.GetName());
1086		- Return();
	1298	+ oe.ctrlPanel.Return();
1087	1299
1088	1300	//ctrlPanel.add(textureButton = new Button("Texture..."));
1089	1301	//textureButton.setEnabled(false);
..	..	@@ -1185,11 +1397,25 @@
1185	1397	//JPanel worldPanel =
1186	1398	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187	1399	//worldPanel.setName("World");
1188		- centralPanel = new JPanel(new BorderLayout());
1189		- timelinePanel = new JPanel(new BorderLayout());
1190		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1400	+ centralPanel = new cGridBag();
	1401	+ centralPanel.preferredWidth = 20;
	1402	+
	1403	+ if (Globals.ADVANCED)
	1404	+ {
	1405	+ timelinePanel = new JPanel(new BorderLayout());
	1406	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191	1407
	1408	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1409	+ cameraPanel.setContinuousLayout(true);
	1410	+ cameraPanel.setOneTouchExpandable(true);
	1411	+// cameraPanel.setDividerLocation(0.9);
	1412	+// cameraPanel.setDividerSize(9);
	1413	+ cameraPanel.setResizeWeight(1.0);
	1414	+
	1415	+ }
	1416	+
1192	1417	centralPanel.add(cameraView);
	1418	+ centralPanel.setFocusable(true);
1193	1419	//frame.setJMenuBar(timelineMenubar);
1194	1420	//centralPanel.add(timelinePanel);
1195	1421
..	..	@@ -1208,12 +1434,13 @@
1208	1434	//frontView.object = copy;
1209	1435	//sideView.object = copy;
1210	1436
1211		- XYZPanel = new JPanel();
1212		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1437	+ XYZPanel = new cGridBag().setVertical(true);
	1438	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1213	1439
1214		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1215		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1216		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1440	+ XYZPanel.preferredWidth = 5;
	1441	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1442	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1443	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1217	1444
1218	1445	/*
1219	1446	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1251,11 +1478,13 @@
1251	1478	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1252	1479	//tmp.setName("Edit");
1253	1480	objectPanel.add(materialPanel);
1254		- JPanel north = new JPanel(new BorderLayout());
1255		- north.setName("Edit");
1256		- north.add(ctrlPanel, BorderLayout.NORTH);
1257		- objectPanel.add(north);
	1481	+// JPanel north = new JPanel(new BorderLayout());
	1482	+// north.setName("Edit");
	1483	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1484	+// objectPanel.add(north);
	1485	+ objectPanel.add(editPanel);
1258	1486	objectPanel.add(infoPanel);
	1487	+ objectPanel.add(toolboxPanel);
1259	1488
1260	1489	/*
1261	1490	aConstraints.gridx = 0;
..	..	@@ -1264,7 +1493,7 @@
1264	1493	aConstraints.gridy += 1;
1265	1494	aConstraints.gridwidth = 1;
1266	1495	mainPanel.add(objectPanel, aConstraints);
1267		- */
	1496	+ */
1268	1497
1269	1498	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1270	1499	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1275,16 +1504,23 @@
1275	1504	scrollpane.setWheelScrollingEnabled(true);
1276	1505	scrollpane.addMouseWheelListener(this); // Default not fast enough
1277	1506
1278		- /JTabbedPane/ scenePanel = new JTabbedPane();
1279		- scenePanel.add(scrollpane);
	1507	+ /JTabbedPane/ scenePanel = new cGridBag();
	1508	+ scenePanel.preferredWidth = 6;
	1509	+
	1510	+ JTabbedPane tabbedPane = new JTabbedPane();
	1511	+ tabbedPane.add(scrollpane);
1280	1512
1281		- scenePanel.add(FSPane = new cFileSystemPane(this));
1282		-
1283		- optionsPanel = new JPanel(new GridBagLayout());
	1513	+ optionsPanel = new cGridBag().setVertical(false);
1284	1514
1285	1515	optionsPanel.setName("Options");
1286		- scenePanel.add(optionsPanel);
	1516	+
	1517	+ AddOptions(optionsPanel); //, aConstraints);
	1518	+
	1519	+ tabbedPane.add(optionsPanel);
	1520	+
	1521	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1287	1522
	1523	+ scenePanel.add(tabbedPane);
1288	1524
1289	1525	/*
1290	1526	cTree jTree = new cTree(null);
..	..	@@ -1318,6 +1554,7 @@
1318	1554	//bigPanel.setSize(new Dimension(10,10));
1319	1555	//bigPanel.add(ctrlPanel);
1320	1556	//bigPanel.add(gridPanel);
	1557	+ /**
1321	1558	bigThree = new JPanel();
1322	1559	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1323	1560	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1341,7 +1578,13 @@
1341	1578	// aConstraints.gridheight = 3;
1342	1579	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1343	1580	bigThree.add(XYZPanel, aWindowConstraints);
	1581	+ /**/
1344	1582
	1583	+ bigThree = new cGridBag();
	1584	+ bigThree.addComponent(scenePanel);
	1585	+ bigThree.addComponent(centralPanel);
	1586	+ bigThree.addComponent(XYZPanel);
	1587	+
1345	1588	// // SIDE EFFECT!!!
1346	1589	// aConstraints.gridx = 0;
1347	1590	// aConstraints.gridy = 0;
..	..	@@ -1362,14 +1605,19 @@
1362	1605	//worldPane.add(bigPanel);
1363	1606	//worldPane.add(worldPanel);
1364	1607	/**/
1365		- frame.getContentPane().add(/"Center",/framePanel);
	1608	+ //frame.getContentPane().add(/"Center",/framePanel);
	1609	+ frame.add(/"Center",/framePanel);
1366	1610	//frame.getContentPane().add(/"Center",/ worldPane);
1367	1611
1368	1612	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1369	1613
1370		- frame.setSize(1024, 768);
1371		- frame.show();
	1614	+ frame.setSize(1280, 860);
	1615	+
	1616	+ frame.validate();
	1617	+ frame.setVisible(true);
1372	1618
	1619	+ cameraView.requestFocusInWindow();
	1620	+
1373	1621	gridPanel.setDividerLocation(1.0);
1374	1622
1375	1623	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1383,6 +1631,10 @@
1383	1631	});
1384	1632	}
1385	1633
	1634	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1635	+ {
	1636	+ }
	1637	+
1386	1638	JTree GetTree()
1387	1639	{
1388	1640	return objEditor.jTree;
..	..	@@ -1394,260 +1646,161 @@
1394	1646	ctrlPanel.removeAll();
1395	1647	}
1396	1648
1397		- void SetupMaterial(JPanel ctrlPanel)
	1649	+ void SetupMaterial(cGridBag panel)
1398	1650	{
1399		- aConstraints.weighty = 0;
1400		- //aConstraints.weightx = 1;
1401		- /*
	1651	+ /*
1402	1652	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1403	1653	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1404		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1405		- aConstraints.gridx += 1;
1406	1654	*/
1407	1655
1408		- aConstraints.gridwidth = 1;
1409		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1410		- aConstraints.gridx += 1;
1411		- aConstraints.weighty = 0;
1412		- aConstraints.gridwidth = 1;
	1656	+ cGridBag editBar = new cGridBag().setVertical(false);
	1657	+
	1658	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1659	+ createMaterialButton.setToolTipText("Create material");
1413	1660
1414	1661	/*
1415	1662	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1416		- aConstraints.gridx += 1;
1417		- aConstraints.weighty = 0;
1418		- aConstraints.gridwidth = 1;
1419	1663	*/
1420	1664
1421		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1422		- aConstraints.gridx += 1;
	1665	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1666	+ clearMaterialButton.setToolTipText("Clear material");
	1667	+
	1668	+ if (Globals.ADVANCED)
	1669	+ {
	1670	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1671	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1672	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1673	+ }
1423	1674
1424		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1425		-
1426		- aConstraints.gridx += 1;
1427		-
1428		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1429		-
1430		- aConstraints.gridx += 1;
1431		-
1432		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1433		-
1434		- aConstraints.gridx = 0;
1435		- aConstraints.gridy += 1;
1436		- aConstraints.weighty = 0;
1437		- aConstraints.gridwidth = 1;
	1675	+ editBar.preferredHeight = 15;
	1676	+
	1677	+ panel.add(editBar);
	1678	+
1438	1679	/**/
1439	1680	//aConstraints.weighty = 0;
1440	1681	////aConstraints.weightx = 1;
1441	1682	//aConstraints.weighty = 1;
1442	1683	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1443	1684	//aConstraints.gridx += 1;
1444		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1445		- aConstraints.weighty = 0;
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	1685	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1449	1686
1450		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1451		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- //aConstraints.weightx = 0;
1456		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1457		- aConstraints.gridx = 0;
1458		- aConstraints.gridy += 1;
1459		- aConstraints.gridwidth = 1;
	1687	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1688	+
	1689	+ cGridBag color = new cGridBag();
	1690	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1691	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1692	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1693	+ //colorField.preferredWidth = 200;
	1694	+ colorSection.add(color);
1460	1695
1461		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1462		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1463		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1464		- aConstraints.gridx += 1;
1465		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- aConstraints.gridwidth = 1;
	1696	+ cGridBag modulation = new cGridBag();
	1697	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1698	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1699	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1700	+ colorSection.add(modulation);
1470	1701
1471		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1472		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- aConstraints.gridwidth = 1;
	1702	+ cGridBag texture = new cGridBag();
	1703	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1704	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1705	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1706	+ colorSection.add(texture);
1480	1707
1481		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1482		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484		- aConstraints.gridx += 1;
1485		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487		- aConstraints.gridx = 0;
1488		- aConstraints.gridy += 1;
1489		- aConstraints.gridwidth = 1;
	1708	+ panel.add(new JSeparator());
	1709	+
	1710	+ panel.add(colorSection);
	1711	+
	1712	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1713	+
	1714	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1715	+
	1716	+ cGridBag diffuse = new cGridBag();
	1717	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1718	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1719	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1720	+ diffuseSection.add(diffuse);
1490	1721
1491		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1492		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494		- aConstraints.gridx += 1;
1495		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497		- aConstraints.gridx = 0;
1498		- aConstraints.gridy += 1;
1499		- aConstraints.gridwidth = 1;
	1722	+ cGridBag diffuseness = new cGridBag();
	1723	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1724	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1725	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1726	+ diffuseSection.add(diffuseness);
1500	1727
1501		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1502		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504		- aConstraints.gridx += 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1507		- aConstraints.gridx = 0;
1508		- aConstraints.gridy += 1;
1509		- aConstraints.gridwidth = 1;
	1728	+ cGridBag selfshadow = new cGridBag();
	1729	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1730	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1731	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1732	+ diffuseSection.add(selfshadow);
1510	1733
1511		- //aConstraints.weighty = 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1513		- //aConstraints.gridx += 1;
1514		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1515		- aConstraints.weighty = 0;
1516		- aConstraints.gridx = 0;
1517		- aConstraints.gridy += 1;
1518		- aConstraints.gridwidth = 1;
	1734	+ cGridBag sheen = new cGridBag();
	1735	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1736	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1737	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1738	+ diffuseSection.add(sheen);
1519	1739
1520		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1521		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1523		- aConstraints.gridx += 1;
1524		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1525		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- aConstraints.gridwidth = 1;
	1740	+ cGridBag subsurface = new cGridBag();
	1741	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1742	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1743	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1744	+ diffuseSection.add(subsurface);
1529	1745
1530		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1531		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- aConstraints.gridwidth = 1;
	1746	+ cGridBag shadow = new cGridBag();
	1747	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1748	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1749	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1750	+ diffuseSection.add(shadow);
1539	1751
1540		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1541		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- aConstraints.gridwidth = 1;
	1752	+ cGridBag fakedepth = new cGridBag();
	1753	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1754	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1755	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1756	+ diffuseSection.add(fakedepth);
1549	1757
1550		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1551		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- aConstraints.gridwidth = 1;
	1758	+ cGridBag shadowbias = new cGridBag();
	1759	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1760	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1761	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1762	+ diffuseSection.add(shadowbias);
1559	1763
1560		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1561		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563		- aConstraints.gridx += 1;
1564		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1566		- aConstraints.gridx = 0;
1567		- aConstraints.gridy += 1;
1568		- aConstraints.gridwidth = 1;
	1764	+ panel.add(new JSeparator());
	1765	+
	1766	+ panel.add(diffuseSection);
	1767	+
	1768	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1769	+
	1770	+ cGridBag specularSection = new cGridBag().setVertical(true);
1569	1771
1570		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1571		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573		- aConstraints.gridx += 1;
1574		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1576		- aConstraints.gridx = 0;
1577		- aConstraints.gridy += 1;
1578		- aConstraints.gridwidth = 1;
	1772	+ cGridBag specular = new cGridBag();
	1773	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1774	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1775	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1776	+ specularSection.add(specular);
1579	1777
1580		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1581		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583		- aConstraints.gridx += 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1586		- aConstraints.gridx = 0;
1587		- aConstraints.gridy += 1;
1588		- aConstraints.gridwidth = 1;
	1778	+ cGridBag lightarea = new cGridBag();
	1779	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1780	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1781	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1782	+ specularSection.add(lightarea);
1589	1783
1590		- //aConstraints.weighty = 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1592		- //aConstraints.gridx += 1;
1593		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1594		- aConstraints.weighty = 0;
1595		- aConstraints.gridx = 0;
1596		- aConstraints.gridy += 1;
1597		- aConstraints.gridwidth = 1;
	1784	+ cGridBag shininess = new cGridBag();
	1785	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1786	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1787	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1788	+ specularSection.add(shininess);
1598	1789
1599		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1600		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1601		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1602		- aConstraints.gridx += 1;
1603		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- aConstraints.gridwidth = 1;
	1790	+ cGridBag metalness = new cGridBag();
	1791	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1792	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1793	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1794	+ specularSection.add(metalness);
1608	1795
1609		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1610		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- aConstraints.gridwidth = 1;
	1796	+ cGridBag velvet = new cGridBag();
	1797	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1798	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1799	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1800	+ specularSection.add(velvet);
1618	1801
1619		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1620		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622		- aConstraints.gridx += 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1625		- aConstraints.gridx = 0;
1626		- aConstraints.gridy += 1;
1627		- aConstraints.gridwidth = 1;
1628		-
1629		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1630		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632		- aConstraints.gridx += 1;
1633		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
1638		-
1639		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1640		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
1648		-
1649		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1650		- Return();
	1802	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1803	+ //Return();
1651	1804	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1652	1805	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653	1806	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1658,130 +1811,105 @@
1658	1811	// aConstraints.gridy += 1;
1659	1812	// aConstraints.gridwidth = 1;
1660	1813
1661		- //aConstraints.weighty = 1;
1662		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1663		- //aConstraints.gridx += 1;
1664		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1665		- aConstraints.weighty = 0;
1666		- aConstraints.gridx = 0;
1667		- aConstraints.gridy += 1;
1668		- aConstraints.gridwidth = 1;
	1814	+ cGridBag anisoU = new cGridBag();
	1815	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1816	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1817	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1818	+ specularSection.add(anisoU);
1669	1819
1670		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1671		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1673		- aConstraints.gridx += 1;
1674		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- aConstraints.gridwidth = 1;
	1820	+ cGridBag anisoV = new cGridBag();
	1821	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1822	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1823	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1824	+ specularSection.add(anisoV);
1679	1825
1680		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1681		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
1689	1826
1690		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1691		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
	1827	+ panel.add(new JSeparator());
	1828	+
	1829	+ panel.add(specularSection);
	1830	+
	1831	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1832	+
	1833	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1699	1834
1700		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1701		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
1709		- aConstraints.weighty = 0;
	1835	+ cGridBag camera = new cGridBag();
	1836	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1837	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1838	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1839	+ colorSection.add(camera);
1710	1840
1711		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1712		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1714		- aConstraints.gridx += 1;
1715		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1716		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1717		- aConstraints.gridx = 0;
1718		- aConstraints.gridy += 1;
1719		- aConstraints.gridwidth = 1;
	1841	+ cGridBag ambient = new cGridBag();
	1842	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1843	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1844	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1845	+ colorSection.add(ambient);
1720	1846
1721		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1722		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- aConstraints.gridwidth = 1;
	1847	+ cGridBag backlit = new cGridBag();
	1848	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1849	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1850	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1851	+ colorSection.add(backlit);
1730	1852
1731		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1732		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- aConstraints.gridwidth = 1;
	1853	+ cGridBag opacity = new cGridBag();
	1854	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1855	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1856	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1857	+ colorSection.add(opacity);
1740	1858
1741		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1742		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744		- aConstraints.gridx += 1;
1745		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy += 1;
1749		- aConstraints.gridwidth = 1;
	1859	+ //panel.add(new JSeparator());
	1860	+
	1861	+ //panel.add(globalSection);
	1862	+
	1863	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1864	+
	1865	+ cGridBag textureSection = new cGridBag().setVertical(true);
1750	1866
1751		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1752		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754		- aConstraints.gridx += 1;
1755		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1757		- aConstraints.gridx = 0;
1758		- aConstraints.gridy += 1;
1759		- aConstraints.gridwidth = 1;
	1867	+ cGridBag bump = new cGridBag();
	1868	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1869	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1871	+ textureSection.add(bump);
1760	1872
1761		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1762		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764		- aConstraints.gridx += 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1767		- aConstraints.gridx = 0;
1768		- aConstraints.gridy += 1;
1769		- aConstraints.gridwidth = 1;
	1873	+ cGridBag noise = new cGridBag();
	1874	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1875	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1876	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1877	+ textureSection.add(noise);
1770	1878
1771		- //aConstraints.weighty = 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1773		- //aConstraints.gridx += 1;
1774		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1775		- aConstraints.weighty = 0;
	1879	+ cGridBag power = new cGridBag();
	1880	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1881	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1882	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1883	+ textureSection.add(power);
1776	1884
1777		- aConstraints.gridx = 0;
1778		- aConstraints.gridy = 0;
1779		- aConstraints.gridwidth = 1;
	1885	+ cGridBag borderfade = new cGridBag();
	1886	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1887	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1888	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1889	+ textureSection.add(borderfade);
	1890	+
	1891	+ cGridBag fog = new cGridBag();
	1892	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1893	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1894	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1895	+ textureSection.add(fog);
	1896	+
	1897	+ cGridBag opacityPower = new cGridBag();
	1898	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1899	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1900	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1901	+ textureSection.add(opacityPower);
	1902	+
	1903	+ panel.add(new JSeparator());
	1904	+
	1905	+ panel.add(textureSection);
	1906	+
	1907	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1780	1908
1781	1909	SetMaterial(copy); // .GetMaterial());
1782	1910
1783		- colorField.addChangeListener(this);
1784		- modulationField.addChangeListener(this);
	1911	+ //colorField.addChangeListener(this);
	1912	+// modulationField.addChangeListener(this);
1785	1913	metalnessField.addChangeListener(this);
1786	1914	diffuseField.addChangeListener(this);
1787	1915	specularField.addChangeListener(this);
..	..	@@ -1811,12 +1939,15 @@
1811	1939	opacityPowerField.addChangeListener(this);
1812	1940	/**/
1813	1941
1814		- resetSlidersButton.addActionListener(this);
1815	1942	clearMaterialButton.addActionListener(this);
1816	1943	createMaterialButton.addActionListener(this);
1817		-
1818		- propagateToggle.addItemListener(this);
1819		- multiplyToggle.addItemListener(this);
	1944	+
	1945	+ if (Globals.ADVANCED)
	1946	+ {
	1947	+ resetSlidersButton.addActionListener(this);
	1948	+ propagateToggle.addItemListener(this);
	1949	+ multiplyToggle.addItemListener(this);
	1950	+ }
1820	1951	}
1821	1952
1822	1953	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1987,7 +2118,7 @@
1987	2118
1988	2119	//? flashIt = false;
1989	2120	CameraPane pane = (CameraPane) cameraView;
1990		- pane.clickStart(location.x, location.y, 0);
	2121	+ pane.clickStart(location.x, location.y, 0, 0);
1991	2122	pane.clickEnd(location.x, location.y, 0, true);
1992	2123
1993	2124	if (group.selection.size() == 1)
..	..	@@ -2036,6 +2167,7 @@
2036	2167	e2.printStackTrace();
2037	2168	}
2038	2169	}
	2170	+
2039	2171	LoadJMEThread loadThread;
2040	2172
2041	2173	class LoadJMEThread extends Thread
..	..	@@ -2093,6 +2225,7 @@
2093	2225	//LoadFile0(filename, converter);
2094	2226	}
2095	2227	}
	2228	+
2096	2229	LoadOBJThread loadObjThread;
2097	2230
2098	2231	class LoadOBJThread extends Thread
..	..	@@ -2171,19 +2304,19 @@
2171	2304
2172	2305	void LoadObjFile(String fullname)
2173	2306	{
2174		- /*
	2307	+ System.out.println("Loading " + fullname);
	2308	+ /**/
2175	2309	//lastFilename = fullname;
2176	2310	if(loadObjThread == null)
2177	2311	{
2178		- loadObjThread = new LoadOBJThread();
2179		- loadObjThread.start();
	2312	+ loadObjThread = new LoadOBJThread();
	2313	+ loadObjThread.start();
2180	2314	}
2181	2315
2182	2316	loadObjThread.add(fullname);
2183		- */
	2317	+ /**/
2184	2318
2185		- System.out.println("Loading " + fullname);
2186		- makeSomething(new FileObject(fullname, true), true);
	2319	+ //makeSomething(new FileObject(fullname, true), true);
2187	2320	}
2188	2321
2189	2322	void LoadGFDFile(String fullname)
..	..	@@ -2444,11 +2577,11 @@
2444	2577
2445	2578	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2446	2579	{
2447		- if (GrafreeD.standAlone)
	2580	+ if (Grafreed.standAlone)
2448	2581	{
2449	2582	/**/
2450	2583	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2451		- browser.show();
	2584	+ browser.setVisible(true);
2452	2585	String filename = browser.getFile();
2453	2586	if (filename != null && filename.length() > 0)
2454	2587	{
..	..	@@ -2593,6 +2726,7 @@
2593	2726	}
2594	2727	if (input == null)
2595	2728	{
	2729	+ new Exception().printStackTrace();
2596	2730	System.exit(0);
2597	2731	}
2598	2732
..	..	@@ -2799,6 +2933,8 @@
2799	2933
2800	2934	void SetMaterial(Object3D object)
2801	2935	{
	2936	+ latestObject = object;
	2937	+
2802	2938	cMaterial mat = object.material;
2803	2939
2804	2940	if (mat == null)
..	..	@@ -2807,7 +2943,8 @@
2807	2943	return;
2808	2944	}
2809	2945
2810		- multiplyToggle.setSelected(mat.multiply);
	2946	+ if (multiplyToggle != null)
	2947	+ multiplyToggle.setSelected(mat.multiply);
2811	2948
2812	2949	assert (object.projectedVertices != null);
2813	2950
..	..	@@ -2909,12 +3046,17 @@
2909	3046	// }
2910	3047
2911	3048	/**/
2912		- if (deselect)
	3049	+ if (deselect \|\| child == null)
2913	3050	{
2914	3051	//group.deselectAll();
2915	3052	//freeze = true;
2916	3053	GetTree().clearSelection();
2917	3054	//freeze = false;
	3055	+
	3056	+ if (child == null)
	3057	+ {
	3058	+ return;
	3059	+ }
2918	3060	}
2919	3061
2920	3062	//group.addSelectee(child);
..	..	@@ -2983,7 +3125,7 @@
2983	3125	cameraView.ToggleDL();
2984	3126	cameraView.repaint();
2985	3127	return;
2986		- } else if (event.getSource() == toggleTextureItem)
	3128	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2987	3129	{
2988	3130	cameraView.ToggleTexture();
2989	3131	// june 2013 copy.HardTouch();
..	..	@@ -2996,7 +3138,8 @@
2996	3138	if (timeline)
2997	3139	{
2998	3140	centralPanel.remove(cameraView);
2999		- centralPanel.add(timelinePanel);
	3141	+ cameraPanel.add(cameraView);
	3142	+ centralPanel.add(cameraPanel);
3000	3143	frame.setJMenuBar(timelineMenubar);
3001	3144	wasFullScreen = CameraPane.FULLSCREEN;
3002	3145	if (!CameraPane.FULLSCREEN)
..	..	@@ -3005,7 +3148,7 @@
3005	3148	}
3006	3149	else
3007	3150	{
3008		- centralPanel.remove(timelinePanel);
	3151	+ centralPanel.remove(cameraPanel);
3009	3152	centralPanel.add(cameraView);
3010	3153	frame.setJMenuBar(null);
3011	3154	if (!wasFullScreen)
..	..	@@ -3021,9 +3164,9 @@
3021	3164	frame.validate();
3022	3165
3023	3166	return;
3024		- } else if (event.getSource() == toggleRandomItem)
	3167	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3025	3168	{
3026		- cameraView.ToggleRandom();
	3169	+ cameraView.ToggleSwitch();
3027	3170	cameraView.repaint();
3028	3171	return;
3029	3172	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3052,6 +3195,10 @@
3052	3195	{
3053	3196	copy.live ^= true;
3054	3197	return;
	3198	+ } else if (event.getSource() == selectCB)
	3199	+ {
	3200	+ copy.dontselect ^= true;
	3201	+ return;
3055	3202	} else if (event.getSource() == hideCB)
3056	3203	{
3057	3204	copy.hide ^= true;
..	..	@@ -3066,6 +3213,7 @@
3066	3213	if (event.getSource() == randomCB)
3067	3214	{
3068	3215	copy.random ^= true;
	3216	+ objEditor.refreshContents();
3069	3217	return;
3070	3218	}
3071	3219	if (event.getSource() == speedupCB)
..	..	@@ -3089,8 +3237,9 @@
3089	3237
3090	3238	public void actionPerformed(ActionEvent event)
3091	3239	{
	3240	+ Object source = event.getSource();
3092	3241	// SCRIPT DIALOG
3093		- if (event.getSource() == okbutton)
	3242	+ if (source == okbutton)
3094	3243	{
3095	3244	textpanel.setVisible(false);
3096	3245	textpanel.remove(textarea);
..	..	@@ -3102,7 +3251,7 @@
3102	3251	textarea = null;
3103	3252	textpanel = null;
3104	3253	}
3105		- if (event.getSource() == cancelbutton)
	3254	+ if (source == cancelbutton)
3106	3255	{
3107	3256	textpanel.setVisible(false);
3108	3257	textpanel.remove(textarea);
..	..	@@ -3114,49 +3263,50 @@
3114	3263	//applySelf();
3115	3264	//client.refreshEditWindow();
3116	3265	//refreshContents();
3117		- if (event.getSource() == nameField)
	3266	+ if (source == nameField)
3118	3267	{
3119	3268	//System.out.println("ObjEditor " + event);
3120	3269	applySelf0(true);
3121	3270	//parent.applySelf();
3122	3271	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetButton)
	3272	+ } else if (source == resetButton)
3124	3273	{
3125	3274	CameraPane.fullreset = true;
3126	3275	copy.Reset(); // ResetMeshes();
3127	3276	copy.Touch();
3128	3277	objEditor.refreshContents();
3129		- } else if (event.getSource() == stepItem)
	3278	+ } else if (source == stepItem)
3130	3279	{
3131		- cameraView.ONESTEP = true;
	3280	+ //cameraView.ONESTEP = true;
	3281	+ Globals.ONESTEP = true;
3132	3282	cameraView.repaint();
3133	3283	return;
3134		- } else if (event.getSource() == stepButton)
	3284	+ } else if (source == stepButton)
3135	3285	{
3136	3286	copy.Step();
3137	3287	copy.Touch();
3138	3288	objEditor.refreshContents();
3139		- } else if (event.getSource() == slowerButton)
	3289	+ } else if (source == slowerButton)
3140	3290	{
3141	3291	copy.Slower();
3142	3292	copy.Touch();
3143	3293	objEditor.refreshContents();
3144		- } else if (event.getSource() == fasterButton)
	3294	+ } else if (source == fasterButton)
3145	3295	{
3146	3296	copy.Faster();
3147	3297	copy.Touch();
3148	3298	objEditor.refreshContents();
3149		- } else if (event.getSource() == remarkButton)
	3299	+ } else if (source == remarkButton)
3150	3300	{
3151	3301	copy.Remark();
3152	3302	copy.Touch();
3153	3303	objEditor.refreshContents();
3154		- } else if (event.getSource() == stepAllButton)
	3304	+ } else if (source == stepAllButton)
3155	3305	{
3156	3306	copy.StepAll();
3157	3307	copy.Touch();
3158	3308	objEditor.refreshContents();
3159		- } else if (event.getSource() == resetAllButton)
	3309	+ } else if (source == resetAllButton)
3160	3310	{
3161	3311	//CameraPane.fullreset = true;
3162	3312	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3189,53 +3339,75 @@
3189	3339	// Close();
3190	3340	// }
3191	3341	// else
3192		- if (event.getSource() == resetSlidersButton)
	3342	+ if (source == resetSlidersButton)
3193	3343	{
3194	3344	ResetSliders();
3195		- } else if (event.getSource() == clearMaterialButton)
	3345	+ } else if (source == clearMaterialButton)
3196	3346	{
3197	3347	ClearMaterial();
3198		- } else if (event.getSource() == createMaterialButton)
	3348	+ } else if (source == createMaterialButton)
3199	3349	{
3200	3350	CreateMaterial();
3201		- } else if (event.getSource() == clearPanelButton)
	3351	+ } else if (source == clearPanelButton)
3202	3352	{
3203	3353	copy.ClearUI();
3204	3354	refreshContents(true);
3205		- } /*
3206		- }
3207		-
3208		- public boolean action(Event event, Object arg)
3209		- {
3210		- */ else if (event.getSource() == closeItem)
	3355	+ } else if (source == importGFDItem)
	3356	+ {
	3357	+ ImportGFD();
	3358	+ } else
	3359	+ if (source == importVRMLX3DItem)
	3360	+ {
	3361	+ ImportVRMLX3D();
	3362	+ } else
	3363	+ if (source == import3DSItem)
	3364	+ {
	3365	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3366	+ } else
	3367	+ if (source == importOBJItem)
	3368	+ {
	3369	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3370	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3371	+ browser.setVisible(true);
	3372	+ String filename = browser.getFile();
	3373	+ if (filename != null && filename.length() > 0)
	3374	+ {
	3375	+ String fullname = browser.getDirectory() + filename;
	3376	+ makeSomething(ReadOBJ(fullname), true);
	3377	+ }
	3378	+ } else
	3379	+ if (source == closeItem)
3211	3380	{
3212	3381	Close();
3213	3382	//return true;
3214		- } else if (event.getSource() == loadItem)
	3383	+ } else if (source == loadItem)
3215	3384	{
3216	3385	load();
3217	3386	//return true;
3218		- } else if (event.getSource() == saveItem)
	3387	+ } else if (source == newItem)
	3388	+ {
	3389	+ New();
	3390	+ } else if (source == saveItem)
3219	3391	{
3220	3392	save();
3221	3393	//return true;
3222		- } else if (event.getSource() == saveAsItem)
	3394	+ } else if (source == saveAsItem)
3223	3395	{
3224	3396	saveAs();
3225	3397	//return true;
3226		- } else if (event.getSource() == reexportItem)
	3398	+ } else if (source == reexportItem)
3227	3399	{
3228	3400	reexport();
3229	3401	//return true;
3230		- } else if (event.getSource() == exportAsItem)
	3402	+ } else if (source == exportAsItem)
3231	3403	{
3232	3404	export();
3233	3405	//return true;
3234		- } else if (event.getSource() == povItem)
	3406	+ } else if (source == povItem)
3235	3407	{
3236	3408	generatePOV();
3237	3409	//return true;
3238		- } else if (event.getSource() == zBufferItem)
	3410	+ } else if (source == zBufferItem)
3239	3411	{
3240	3412	try
3241	3413	{
..	..	@@ -3257,21 +3429,8 @@
3257	3429	cameraView.repaint();
3258	3430	//return true;
3259	3431	}
3260		- */ else if (event.getSource() == editCameraItem)
3261		- {
3262		- cameraView.ProtectCamera();
3263		- cameraView.repaint();
3264		- return;
3265		- } else if (event.getSource() == revertCameraItem)
3266		- {
3267		- cameraView.RevertCamera();
3268		- cameraView.repaint();
3269		- return;
3270		-// } else if (event.getSource() == textureButton)
3271		-// {
3272		-// return; // true;
3273		- } else // combos...
3274		- if (event.getSource() == texresMenu)
	3432	+ */ else // combos...
	3433	+ if (source == texresMenu)
3275	3434	{
3276	3435	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3277	3436	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3283,27 +3442,304 @@
3283	3442	}
3284	3443	}
3285	3444
3286		- void ToggleAnimation()
	3445	+ void New()
3287	3446	{
3288		- if (!CameraPane.ANIMATION)
	3447	+ while (copy.Size() > 1)
3289	3448	{
3290		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3449	+ copy.remove(1);
	3450	+ }
	3451	+
	3452	+ ResetModel();
	3453	+ objEditor.refreshContents();
	3454	+ }
	3455	+
	3456	+ static public byte[] Compress(Object3D o)
	3457	+ {
	3458	+ try
	3459	+ {
	3460	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3461	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3462	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3463	+
	3464	+ Object3D parent = o.parent;
	3465	+ o.parent = null;
	3466	+
	3467	+ out.writeObject(o);
	3468	+
	3469	+ o.parent = parent;
	3470	+
	3471	+ out.flush();
	3472	+
	3473	+ zstream.close();
	3474	+ out.close();
	3475	+
	3476	+ return baos.toByteArray();
	3477	+ } catch (Exception e)
	3478	+ {
	3479	+ System.err.println(e);
	3480	+ return null;
	3481	+ }
	3482	+ }
	3483	+
	3484	+ static public Object Uncompress(byte[] bytes)
	3485	+ {
	3486	+ System.out.println("#bytes = " + bytes.length);
	3487	+ try
	3488	+ {
	3489	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3490	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3491	+ ObjectInputStream in = new ObjectInputStream(istream);
	3492	+ Object obj = in.readObject();
	3493	+ in.close();
	3494	+
	3495	+ return obj;
	3496	+ } catch (Exception e)
	3497	+ {
	3498	+ System.err.println(e);
	3499	+ return null;
	3500	+ }
	3501	+ }
	3502	+
	3503	+ static public Object clone(Object o)
	3504	+ {
	3505	+ try
	3506	+ {
	3507	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3508	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3509	+
	3510	+ out.writeObject(o);
	3511	+
	3512	+ out.flush();
	3513	+ out.close();
	3514	+
	3515	+ byte[] bytes = baos.toByteArray();
	3516	+
	3517	+ System.out.println("clone = " + bytes.length);
	3518	+
	3519	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3520	+ ObjectInputStream in = new ObjectInputStream(bais);
	3521	+ Object obj = in.readObject();
	3522	+ in.close();
	3523	+
	3524	+ return obj;
	3525	+ } catch (Exception e)
	3526	+ {
	3527	+ System.err.println(e);
	3528	+ return null;
	3529	+ }
	3530	+ }
	3531	+
	3532	+ cRadio GetCurrentTab()
	3533	+ {
	3534	+ cRadio ab;
	3535	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3536	+ {
	3537	+ ab = (cRadio)e.nextElement();
	3538	+ if(ab.GetObject() == copy)
	3539	+ {
	3540	+ return ab;
	3541	+ }
	3542	+ }
	3543	+
	3544	+ return null;
	3545	+ }
	3546	+
	3547	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3548	+
	3549	+ public void Save()
	3550	+ {
	3551	+ System.err.println("Save");
	3552	+
	3553	+ cRadio tab = GetCurrentTab();
	3554	+
	3555	+ boolean temp = CameraPane.SWITCH;
	3556	+ CameraPane.SWITCH = false;
	3557	+
	3558	+ copy.ExtractBigData(hashtable);
	3559	+
	3560	+ byte[] compress = Compress(copy);
	3561	+
	3562	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3563	+ tab.graphs[tab.undoindex++] = compress;
	3564	+
	3565	+ copy.RestoreBigData(hashtable);
	3566	+
	3567	+ CameraPane.SWITCH = temp;
	3568	+
	3569	+ //assert(hashtable.isEmpty());
	3570	+
	3571	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3572	+ {
	3573	+ tab.graphs[i] = null;
	3574	+ }
	3575	+
	3576	+ SetUndoStates();
	3577	+
	3578	+ // test save
	3579	+ if (false)
	3580	+ {
	3581	+ try
	3582	+ {
	3583	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3584	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3585	+
	3586	+ p.writeObject(copy);
	3587	+
	3588	+ p.flush();
	3589	+
	3590	+ ostream.close();
	3591	+ } catch (Exception e)
	3592	+ {
	3593	+ e.printStackTrace();
	3594	+ }
	3595	+ }
	3596	+ }
	3597	+
	3598	+ void CopyChanged(Object3D obj)
	3599	+ {
	3600	+ SetUndoStates();
	3601	+
	3602	+ boolean temp = CameraPane.SWITCH;
	3603	+ CameraPane.SWITCH = false;
	3604	+
	3605	+ copy.ExtractBigData(hashtable);
	3606	+
	3607	+ copy.clear();
	3608	+
	3609	+ for (int i=0; i<obj.Size(); i++)
	3610	+ {
	3611	+ copy.add(obj.get(i));
	3612	+ }
	3613	+
	3614	+ copy.RestoreBigData(hashtable);
	3615	+
	3616	+ CameraPane.SWITCH = temp;
	3617	+
	3618	+ //assert(hashtable.isEmpty());
	3619	+
	3620	+ copy.Touch();
	3621	+
	3622	+ ResetModel();
	3623	+ copy.HardTouch(); // recompile?
	3624	+
	3625	+ cRadio ab;
	3626	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3627	+ {
	3628	+ ab = (cRadio)e.nextElement();
	3629	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3630	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3631	+ if (test != null)
	3632	+ {
	3633	+ test.editWindow = ab.object.editWindow;
	3634	+ ab.object = test;
	3635	+ }
	3636	+ }
	3637	+
	3638	+ refreshContents();
	3639	+ }
	3640	+
	3641	+ cButton undoButton;
	3642	+ cButton redoButton;
	3643	+
	3644	+ void SetUndoStates()
	3645	+ {
	3646	+ cRadio tab = GetCurrentTab();
	3647	+
	3648	+ undoButton.setEnabled(tab.undoindex > 0);
	3649	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3650	+ }
	3651	+
	3652	+ public void Undo()
	3653	+ {
	3654	+ System.err.println("Undo");
	3655	+
	3656	+ cRadio tab = GetCurrentTab();
	3657	+
	3658	+ if (tab.undoindex == 0)
	3659	+ {
	3660	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3661	+ return;
	3662	+ }
	3663	+
	3664	+ if (tab.graphs[tab.undoindex] == null)
	3665	+ {
	3666	+ Save();
	3667	+ tab.undoindex -= 1;
	3668	+ }
	3669	+
	3670	+ tab.undoindex -= 1;
	3671	+
	3672	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3673	+ }
	3674	+
	3675	+ public void Redo()
	3676	+ {
	3677	+ cRadio tab = GetCurrentTab();
	3678	+
	3679	+ if (tab.graphs[tab.undoindex + 1] == null)
	3680	+ {
	3681	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3682	+ return;
	3683	+ }
	3684	+
	3685	+ tab.undoindex += 1;
	3686	+
	3687	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3688	+ }
	3689	+
	3690	+ void ImportGFD()
	3691	+ {
	3692	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3291	3693	browser.show();
3292	3694	String filename = browser.getFile();
3293	3695	if (filename != null && filename.length() > 0)
3294	3696	{
3295		- CameraPane.filename = browser.getDirectory() + filename;
	3697	+ String fullname = browser.getDirectory() + filename;
	3698	+
	3699	+ //Object3D readobj =
	3700	+ objEditor.ReadGFD(fullname, objEditor);
	3701	+ //makeSomething(readobj);
	3702	+ }
	3703	+ }
	3704	+
	3705	+ void ImportVRMLX3D()
	3706	+ {
	3707	+ if (Grafreed.standAlone)
	3708	+ {
	3709	+ /**/
	3710	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3711	+ browser.show();
	3712	+ String filename = browser.getFile();
	3713	+ if (filename != null && filename.length() > 0)
	3714	+ {
	3715	+ String fullname = browser.getDirectory() + filename;
	3716	+ LoadVRMLX3D(fullname);
	3717	+ }
	3718	+ /**/
	3719	+ }
	3720	+ }
	3721	+
	3722	+ void ToggleAnimation()
	3723	+ {
	3724	+ if (!Globals.ANIMATION)
	3725	+ {
	3726	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3727	+ browser.setVisible(true);
	3728	+ String filename = browser.getFile();
	3729	+ if (filename != null && filename.length() > 0)
	3730	+ {
	3731	+ Globals.filename = browser.getDirectory() + filename;
3296	3732	//CameraPane.framecount = 0;
3297		- CameraPane.imagecount = 0;
	3733	+ Globals.imagecount = 0;
3298	3734
3299		- CameraPane.ANIMATION ^= true;
	3735	+ Globals.ANIMATION ^= true;
3300	3736
3301		- GrafreeD.wav.cursor = 0;
3302		- GrafreeD.wav.loop = 0;
	3737	+ Grafreed.wav.cursor = 0;
	3738	+ Grafreed.wav.loop = 0;
3303	3739	}
3304	3740	} else
3305	3741	{
3306		- CameraPane.ANIMATION ^= true;
	3742	+ Globals.ANIMATION ^= true;
3307	3743	}
3308	3744	}
3309	3745
..	..	@@ -3349,7 +3785,7 @@
3349	3785	void CreateMaterial()
3350	3786	{
3351	3787	//copy.ClearMaterial(); // PATCH
3352		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3788	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3353	3789	if (copy.selection.size() > 0)
3354	3790	//SetMaterial(copy);
3355	3791	{
..	..	@@ -3400,7 +3836,7 @@
3400	3836	assert false;
3401	3837	}
3402	3838
3403		- void EditSelection()
	3839	+ void EditSelection(boolean newWindow)
3404	3840	{
3405	3841	}
3406	3842
..	..	@@ -3408,11 +3844,11 @@
3408	3844	{
3409	3845	copy.ResetBlockLoop(); // temporary problem
3410	3846
3411		- boolean random = CameraPane.RANDOM;
3412		- CameraPane.RANDOM = false; // parse everything
	3847	+ boolean random = CameraPane.SWITCH;
	3848	+ CameraPane.SWITCH = false; // parse everything
3413	3849	copy.ResetDisplayList();
3414	3850	copy.HardTouch();
3415		- CameraPane.RANDOM = random;
	3851	+ CameraPane.SWITCH = random;
3416	3852	}
3417	3853
3418	3854	// public void applySelf()
..	..	@@ -3482,10 +3918,40 @@
3482	3918	current.fakedepth = (float) fakedepthField.getFloat();
3483	3919	current.shadowbias = (float) shadowbiasField.getFloat();
3484	3920
3485		- if (!NumberSlider.frozen)
	3921	+ if (!cNumberSlider.frozen)
3486	3922	{
3487	3923	//System.out.println("Propagate = " + propagate);
3488	3924	copy.UpdateMaterial(anchor, current, propagate);
	3925	+
	3926	+ if (copy.material != null)
	3927	+ {
	3928	+ cMaterial mat = copy.material;
	3929	+
	3930	+ colorField.SetToolTipValue((mat.color));
	3931	+ modulationField.SetToolTipValue((mat.modulation));
	3932	+ metalnessField.SetToolTipValue((mat.metalness));
	3933	+ diffuseField.SetToolTipValue((mat.diffuse));
	3934	+ specularField.SetToolTipValue((mat.specular));
	3935	+ shininessField.SetToolTipValue((mat.shininess));
	3936	+ shiftField.SetToolTipValue((mat.shift));
	3937	+ ambientField.SetToolTipValue((mat.ambient));
	3938	+ lightareaField.SetToolTipValue((mat.lightarea));
	3939	+ diffusenessField.SetToolTipValue((mat.factor));
	3940	+ velvetField.SetToolTipValue((mat.velvet));
	3941	+ sheenField.SetToolTipValue((mat.sheen));
	3942	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3943	+ backlitField.SetToolTipValue((mat.bump));
	3944	+ anisoField.SetToolTipValue((mat.aniso));
	3945	+ anisoVField.SetToolTipValue((mat.anisoV));
	3946	+ cameraField.SetToolTipValue((mat.cameralight));
	3947	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3948	+ shadowField.SetToolTipValue((mat.shadow));
	3949	+ textureField.SetToolTipValue((mat.texture));
	3950	+ opacityField.SetToolTipValue((mat.opacity));
	3951	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3952	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3953	+ }
	3954	+
3489	3955	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3490	3956	{
3491	3957	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3530,6 +3996,7 @@
3530	3996	\|\| e.getSource() == apertureField
3531	3997	\|\| e.getSource() == shadowblurField)
3532	3998	{
	3999	+ new Exception().printStackTrace();
3533	4000	System.exit(0);
3534	4001	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3535	4002	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3600,7 +4067,7 @@
3600	4067	}
3601	4068
3602	4069	if (normalpushField != null)
3603		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4070	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3604	4071	}
3605	4072
3606	4073	void SnapObject()
..	..	@@ -3855,7 +4322,7 @@
3855	4322
3856	4323	radioPanel.revalidate();
3857	4324	radioPanel.repaint();
3858		- ctrlPanel.revalidate(); // ? new
	4325	+ ctrlPanel.validate(); // ? new
3859	4326	ctrlPanel.repaint();
3860	4327	}
3861	4328	}
..	..	@@ -3864,6 +4331,8 @@
3864	4331
3865	4332	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3866	4333	{
	4334	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4335	+ Save();
3867	4336	//Tween.set(thing, 0).target(1).start(tweenManager);
3868	4337	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3869	4338	// if (thing instanceof GenericJointDemo)
..	..	@@ -3950,6 +4419,12 @@
3950	4419	{
3951	4420	ResetModel();
3952	4421	Select(thing.GetTreePath(), true, false); // unselect... false);
	4422	+
	4423	+ if (thing.Size() == 0)
	4424	+ {
	4425	+ //EditSelection(false);
	4426	+ }
	4427	+
3953	4428	refreshContents();
3954	4429	}
3955	4430
..	..	@@ -4067,6 +4542,7 @@
4067	4542	}
4068	4543	}
4069	4544	}
	4545	+
4070	4546	LoadGFDThread loadGFDThread;
4071	4547
4072	4548	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4086,8 +4562,10 @@
4086	4562
4087	4563	try
4088	4564	{
	4565	+ // Try compressed version first.
4089	4566	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4090		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4567	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4568	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4091	4569
4092	4570	readobj = (Object3D) p.readObject();
4093	4571	istream.close();
..	..	@@ -4095,7 +4573,20 @@
4095	4573	readobj.ResetDisplayList();
4096	4574	} catch (Exception e)
4097	4575	{
4098		- e.printStackTrace();
	4576	+ //e.printStackTrace();
	4577	+ try
	4578	+ {
	4579	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4580	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4581	+
	4582	+ readobj = (Object3D) p.readObject();
	4583	+ istream.close();
	4584	+
	4585	+ readobj.ResetDisplayList();
	4586	+ } catch (Exception e2)
	4587	+ {
	4588	+ e2.printStackTrace();
	4589	+ }
4099	4590	}
4100	4591	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4101	4592	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4141,6 +4632,12 @@
4141	4632
4142	4633	void LoadIt(Object obj)
4143	4634	{
	4635	+ if (obj == null)
	4636	+ {
	4637	+ // Invalid file
	4638	+ return;
	4639	+ }
	4640	+
4144	4641	System.out.println("Loaded " + obj);
4145	4642	//new Exception().printStackTrace();
4146	4643	Object3D readobj = (Object3D) obj;
..	..	@@ -4150,6 +4647,8 @@
4150	4647
4151	4648	if (readobj != null)
4152	4649	{
	4650	+ if (Globals.SAVEONMAKE)
	4651	+ Save();
4153	4652	try
4154	4653	{
4155	4654	//readobj.deepCopySelf(copy);
..	..	@@ -4212,7 +4711,7 @@
4212	4711
4213	4712	void load() // throws ClassNotFoundException
4214	4713	{
4215		- if (GrafreeD.standAlone)
	4714	+ if (Grafreed.standAlone)
4216	4715	{
4217	4716	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4218	4717	browser.show();
..	..	@@ -4299,11 +4798,13 @@
4299	4798	try
4300	4799	{
4301	4800	FileOutputStream ostream = new FileOutputStream(lastname);
4302		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4801	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4802	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4303	4803
4304	4804	p.writeObject(copy);
4305	4805	p.flush();
4306	4806
	4807	+ zstream.close();
4307	4808	ostream.close();
4308	4809
4309	4810	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4313,17 +4814,20 @@
4313	4814	{
4314	4815	}
4315	4816	}
	4817	+
4316	4818	String lastname;
4317	4819
4318	4820	void saveAs()
4319	4821	{
4320		- if (GrafreeD.standAlone)
	4822	+ if (Grafreed.standAlone)
4321	4823	{
4322	4824	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4323	4825	browser.setVisible(true);
4324	4826	String filename = browser.getFile();
4325	4827	if (filename != null && filename.length() > 0)
4326	4828	{
	4829	+ if (!filename.endsWith(".gfd"))
	4830	+ filename += ".gfd";
4327	4831	lastname = browser.getDirectory() + filename;
4328	4832	save();
4329	4833	}
..	..	@@ -4422,13 +4926,13 @@
4422	4926	try
4423	4927	{
4424	4928	FileOutputStream ostream = new FileOutputStream(filename);
4425		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4426		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4929	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4930	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4427	4931
4428	4932	Object3D objectparent = obj.parent;
4429	4933	obj.parent = null;
4430	4934
4431		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4935	+ Object3D object = (Object3D) Grafreed.clone(obj);
4432	4936
4433	4937	obj.parent = objectparent;
4434	4938
..	..	@@ -4440,8 +4944,8 @@
4440	4944	p.writeObject(object);
4441	4945	p.flush();
4442	4946
	4947	+ zstream.close();
4443	4948	ostream.close();
4444		- // zstream.close();
4445	4949
4446	4950	// group.selection.get(0).parent = parent;
4447	4951	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4462,7 +4966,7 @@
4462	4966	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4463	4967	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4464	4968	copy.generatePOV(buffer);
4465		- if (GrafreeD.standAlone)
	4969	+ if (Grafreed.standAlone)
4466	4970	{
4467	4971	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4468	4972	browser.show();
..	..	@@ -4488,7 +4992,8 @@
4488	4992	Object3D client;
4489	4993	Object3D copy;
4490	4994	MenuBar menuBar;
4491		- Menu windowMenu;
	4995	+ Menu fileMenu;
	4996	+ MenuItem newItem;
4492	4997	MenuItem loadItem;
4493	4998	MenuItem saveItem;
4494	4999	MenuItem saveAsItem;
..	..	@@ -4496,13 +5001,11 @@
4496	5001	MenuItem reexportItem;
4497	5002	MenuItem povItem;
4498	5003	MenuItem closeItem;
4499		- Menu cameraMenu;
	5004	+
4500	5005	CheckboxMenuItem zBufferItem;
4501	5006	//MenuItem normalLensItem;
4502		- MenuItem editCameraItem;
4503		- MenuItem revertCameraItem;
4504		- CheckboxMenuItem toggleLiveItem;
4505	5007	MenuItem stepItem;
	5008	+ CheckboxMenuItem toggleLiveItem;
4506	5009	CheckboxMenuItem toggleFullScreenItem;
4507	5010	CheckboxMenuItem toggleTimelineItem;
4508	5011	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4511,28 +5014,42 @@
4511	5014	CheckboxMenuItem toggleFootContactItem;
4512	5015	CheckboxMenuItem toggleDLItem;
4513	5016	CheckboxMenuItem toggleTextureItem;
4514		- CheckboxMenuItem toggleRandomItem;
	5017	+ CheckboxMenuItem toggleSwitchItem;
4515	5018	CheckboxMenuItem toggleRootItem;
4516	5019	CheckboxMenuItem animationItem;
4517	5020	CheckboxMenuItem toggleHandleItem;
4518	5021	CheckboxMenuItem togglePaintItem;
4519	5022	JSplitPane mainPanel;
4520	5023	JScrollPane scrollpane;
	5024	+
4521	5025	JPanel toolbarPanel;
4522		- JPanel treePanel;
	5026	+
	5027	+ cGridBag treePanel;
	5028	+
4523	5029	JPanel radioPanel;
4524	5030	ButtonGroup buttonGroup;
4525		- JPanel ctrlPanel;
4526		- JPanel materialPanel;
	5031	+
	5032	+ cGridBag toolboxPanel;
	5033	+ cGridBag materialPanel;
	5034	+ cGridBag ctrlPanel;
	5035	+
4527	5036	JScrollPane infoPanel;
4528		- JPanel optionsPanel;
	5037	+
	5038	+ cGridBag optionsPanel;
	5039	+
4529	5040	JTabbedPane objectPanel;
4530		- JPanel XYZPanel;
	5041	+ boolean materialFlushed;
	5042	+ Object3D latestObject;
	5043	+
	5044	+ cGridBag XYZPanel;
	5045	+
4531	5046	JSplitPane gridPanel;
4532	5047	JSplitPane bigPanel;
4533		- JPanel bigThree;
4534		- JTabbedPane scenePanel;
4535		- JPanel centralPanel;
	5048	+
	5049	+ cGridBag bigThree;
	5050	+ cGridBag scenePanel;
	5051	+ cGridBag centralPanel;
	5052	+ JSplitPane cameraPanel;
4536	5053	JPanel timelinePanel;
4537	5054	JMenuBar timelineMenubar;
4538	5055	JSplitPane framePanel;
..	..	@@ -4584,67 +5101,72 @@
4584	5101	// MATERIAL
4585	5102	JLabel materialLabel;
4586	5103	JLabel colorLabel;
4587		- NumberSlider colorField;
	5104	+ cNumberSlider colorField;
4588	5105	JLabel modulationLabel;
4589		- NumberSlider modulationField;
	5106	+ cNumberSlider modulationField;
4590	5107	JLabel metalnessLabel;
4591		- NumberSlider metalnessField;
	5108	+ cNumberSlider metalnessField;
4592	5109	JLabel diffuseLabel;
4593		- NumberSlider diffuseField;
	5110	+ cNumberSlider diffuseField;
4594	5111	JLabel specularLabel;
4595		- NumberSlider specularField;
	5112	+ cNumberSlider specularField;
4596	5113	JLabel shininessLabel;
4597		- NumberSlider shininessField;
	5114	+ cNumberSlider shininessField;
4598	5115	JLabel shiftLabel;
4599		- NumberSlider shiftField;
	5116	+ cNumberSlider shiftField;
4600	5117	JLabel ambientLabel;
4601		- NumberSlider ambientField;
	5118	+ cNumberSlider ambientField;
4602	5119	JLabel lightareaLabel;
4603		- NumberSlider lightareaField;
	5120	+ cNumberSlider lightareaField;
4604	5121	JLabel diffusenessLabel;
4605		- NumberSlider diffusenessField;
	5122	+ cNumberSlider diffusenessField;
4606	5123	JLabel velvetLabel;
4607		- NumberSlider velvetField;
	5124	+ cNumberSlider velvetField;
4608	5125	JLabel sheenLabel;
4609		- NumberSlider sheenField;
	5126	+ cNumberSlider sheenField;
4610	5127	JLabel subsurfaceLabel;
4611		- NumberSlider subsurfaceField;
	5128	+ cNumberSlider subsurfaceField;
4612	5129	//JLabel bumpLabel;
4613	5130	//NumberSlider bumpField;
4614	5131	JLabel backlitLabel;
4615		- NumberSlider backlitField;
	5132	+ cNumberSlider backlitField;
4616	5133	JLabel anisoLabel;
4617		- NumberSlider anisoField;
	5134	+ cNumberSlider anisoField;
4618	5135	JLabel anisoVLabel;
4619		- NumberSlider anisoVField;
	5136	+ cNumberSlider anisoVField;
4620	5137	JLabel cameraLabel;
4621		- NumberSlider cameraField;
	5138	+ cNumberSlider cameraField;
4622	5139	JLabel selfshadowLabel;
4623		- NumberSlider selfshadowField;
	5140	+ cNumberSlider selfshadowField;
4624	5141	JLabel shadowLabel;
4625		- NumberSlider shadowField;
	5142	+ cNumberSlider shadowField;
4626	5143	JLabel textureLabel;
4627		- NumberSlider textureField;
	5144	+ cNumberSlider textureField;
4628	5145	JLabel opacityLabel;
4629		- NumberSlider opacityField;
	5146	+ cNumberSlider opacityField;
4630	5147	JLabel fakedepthLabel;
4631		- NumberSlider fakedepthField;
	5148	+ cNumberSlider fakedepthField;
4632	5149	JLabel shadowbiasLabel;
4633		- NumberSlider shadowbiasField;
	5150	+ cNumberSlider shadowbiasField;
4634	5151	JLabel bumpLabel;
4635		- NumberSlider bumpField;
	5152	+ cNumberSlider bumpField;
4636	5153	JLabel noiseLabel;
4637		- NumberSlider noiseField;
	5154	+ cNumberSlider noiseField;
4638	5155	JLabel powerLabel;
4639		- NumberSlider powerField;
	5156	+ cNumberSlider powerField;
4640	5157	JLabel borderfadeLabel;
4641		- NumberSlider borderfadeField;
	5158	+ cNumberSlider borderfadeField;
4642	5159	JLabel fogLabel;
4643		- NumberSlider fogField;
	5160	+ cNumberSlider fogField;
4644	5161	JLabel opacityPowerLabel;
4645		- NumberSlider opacityPowerField;
4646		- JTree jTree;
	5162	+ cNumberSlider opacityPowerField;
	5163	+ cTree jTree;
4647	5164	//ObjectUI parent;
4648	5165
4649		- NumberSlider normalpushField;
	5166	+ cNumberSlider normalpushField;
	5167	+
	5168	+ private MenuItem importGFDItem;
	5169	+ private MenuItem importVRMLX3DItem;
	5170	+ private MenuItem import3DSItem;
	5171	+ private MenuItem importOBJItem;
4650	5172	}