~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(false);
235	313	objEditor = this;
236	314	this.callee = callee;
237	315
..	..	@@ -262,28 +340,49 @@
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(openItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
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
286		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
287	386	saveItem.addActionListener(this);
288	387	saveAsItem.addActionListener(this);
289	388	exportAsItem.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(1, 1));
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,169 @@
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	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	749	+ }
	750	+
	751	+ maximized ^= true;
	752	+
	753	+ frame.validate();
	754	+ }
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
	759	+
605	760	void ToggleFullScreen()
606	761	{
607		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
608	767	{
609		- frame.getContentPane().remove(/"Center",/bigThree);
610		- framePanel.add(bigThree);
611		- frame.getContentPane().add(/"Center",/framePanel);
	768	+ device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
	774	+ //frame.setVisible(false);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(false);
	777	+// frame.addNotify();
	778	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	779	+
	780	+// X frame.getContentPane().remove(/"Center",/bigThree);
	781	+// X framePanel.add(bigThree);
	782	+// X frame.getContentPane().add(/"Center",/framePanel);
	783	+ framePanel.setDividerLocation(46);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
612	791	} else
613	792	{
614		- frame.getContentPane().remove(/"Center",/framePanel);
615		- framePanel.remove(bigThree);
616		- frame.getContentPane().add(/"Center",/bigThree);
	793	+ keepButton = radio.layout;
	794	+ //keeprect = frame.getBounds();
	795	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	796	+// frame.getToolkit().getScreenSize().height);
	797	+ //frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
	801	+ device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
	804	+// frame.removeNotify();
	805	+// frame.setUndecorated(true);
	806	+// frame.addNotify();
	807	+// X frame.getContentPane().remove(/"Center",/framePanel);
	808	+// X framePanel.remove(bigThree);
	809	+// X frame.getContentPane().add(/"Center",/bigThree);
	810	+ framePanel.setDividerLocation(0);
	811	+
	812	+ radio.layout = fullscreenLayout;
	813	+ radio.layout.doClick();
	814	+ //frame.setVisible(true);
617	815	}
618		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
619	817	}
620	818
621		- private JTextArea createTextPane()
	819	+ private JTextPane createTextPane()
622	820	{
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		- };
	821	+// TEXTAREA String[] initString =
	822	+// {
	823	+// "This is an editable JTextPane, ", //regular
	824	+// "another ", //italic
	825	+// "styled ", //bold
	826	+// "text ", //small
	827	+// "component, ", //large
	828	+// "which supports embedded components..." + newline,//regular
	829	+// " " + newline, //button
	830	+// "...and embedded icons..." + newline, //regular
	831	+// " ", //icon
	832	+// newline + "JTextPane is a subclass of JEditorPane that "
	833	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	834	+// + "cover methods for interacting with those objects."
	835	+// };
	836	+//
	837	+// String[] initStyles =
	838	+// {
	839	+// "regular", "italic", "bold", "small", "large",
	840	+// "regular", "button", "regular", "icon",
	841	+// "regular"
	842	+// };
	843	+//
	844	+// JTextPane textPane = new JTextPane();
	845	+// textPane.setEditable(true);
	846	+// /StyledDocument/ doc = textPane.getStyledDocument();
	847	+// addStylesToDocument(doc);
	848	+//
	849	+// try
	850	+// {
	851	+// for (int j = 0; j < 2; j++)
	852	+// {
	853	+// for (int i = 0; i < initString.length; i++)
	854	+// {
	855	+// doc.insertString(doc.getLength(), initString[i],
	856	+// doc.getStyle(initStyles[i]));
	857	+// }
	858	+// }
	859	+// } catch (BadLocationException ble)
	860	+// {
	861	+// System.err.println("Couldn't insert initial text into text pane.");
	862	+// }
638	863
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;
	864	+ return new JTextPane(); // textPane;
667	865	}
668	866
669	867	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -716,7 +914,7 @@
716	914	protected static ImageIcon createImageIcon(String path,
717	915	String description)
718	916	{
719		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	917	+ java.net.URL imgURL = Grafreed.class.getResource(path);
720	918	if (imgURL != null)
721	919	{
722	920	return new ImageIcon(imgURL, description);
..	..	@@ -748,6 +946,7 @@
748	946	// NumberSlider vDivsField;
749	947	// JCheckBox endcaps;
750	948	JCheckBox liveCB;
	949	+ JCheckBox selectCB;
751	950	JCheckBox hideCB;
752	951	JCheckBox link2masterCB;
753	952	JCheckBox markCB;
..	..	@@ -755,7 +954,12 @@
755	954	JCheckBox speedupCB;
756	955	JCheckBox rewindCB;
757	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
758	961	JComboBox texresMenu;
	962	+
759	963	JButton resetButton;
760	964	JButton stepButton;
761	965	JButton stepAllButton;
..	..	@@ -763,115 +967,87 @@
763	967	JButton slowerButton;
764	968	JButton fasterButton;
765	969	JButton remarkButton;
	970	+
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
	974	+ cGridBag namePanel;
	975	+ cGridBag setupPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
	978	+ cGridBag pushPanel;
	979	+ cGridBag fillPanel;
766	980
767		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	981	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
768	982	{
769	983	JCheckBox cb;
770	984
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);
	985	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
776	986	cb.addItemListener(this);
777		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
778		- oe.aConstraints.gridwidth = 1;
779		- oe.aConstraints.gridx += 1;
780	987
781	988	return cb;
782	989	}
783	990
784		- cButton AddButton(ObjEditor oe, String label)
	991	+ cButton AddButton(cGridBag panel, String label)
785	992	{
786	993	cButton cb;
787	994
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);
	995	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
793	996	cb.addActionListener(this);
794		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
795		- oe.aConstraints.gridwidth = 1;
796		- oe.aConstraints.gridx += 1;
797	997
798	998	return cb;
799	999	}
800	1000
801		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1001	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
802	1002	{
803	1003	JComboBox combo;
804	1004
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;
	1005	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	1006	combo.addActionListener(this);
809	1007
810	1008	return combo;
811	1009	}
812	1010
813		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1011	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
814	1012	{
815		- NumberSlider combo;
	1013	+ cGridBag control = new cGridBag();
	1014	+
	1015	+ cNumberSlider combo;
816	1016
817	1017	JLabel jlabel = new JLabel(label);
818		-
819		- aConstraints.fill = GridBagConstraints.VERTICAL;
820	1018	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		-
	1019	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1020	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830	1021	combo.setFloat(current);
831		-
832		- combo.label = jlabel;
833		-
834		- combo.addChangeListener(this);
835		-
836		- return combo;
	1022	+
	1023	+ panel.add(control);
	1024	+
	1025	+ return control;
837	1026	}
838	1027
839		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1028	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
840	1029	{
841		- NumberSlider combo;
	1030	+ cGridBag control = new cGridBag();
	1031	+
	1032	+ cNumberSlider combo;
842	1033
843	1034	JLabel jlabel = new JLabel(label);
844		-
845		- aConstraints.fill = GridBagConstraints.VERTICAL;
846	1035	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		-
	1036	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1037	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856	1038	combo.setInteger(current);
857	1039
858		- combo.label = jlabel;
859		-
860		- combo.addChangeListener(this);
861		-
862		- return combo;
	1040	+ panel.add(control);
	1041	+
	1042	+ return control;
863	1043	}
864	1044
865		- JTextArea AddText(JPanel ctrlPanel, String name)
	1045	+ JTextArea AddText(cGridBag ctrlPanel, String name)
866	1046	{
867	1047	JTextArea text;
868	1048
869		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
870		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1049	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872	1050	text.addCaretListener(this);
873		- aConstraints.gridx += 1;
874		- aConstraints.gridwidth = 1;
875	1051
876	1052	return text;
877	1053	}
..	..	@@ -901,9 +1077,16 @@
901	1077	objEditor.ctrlPanel.remove(j);
902	1078	}
903	1079
	1080	+ void Remove(cNumberSlider j)
	1081	+ {
	1082	+ j.removeChangeListener(this);
	1083	+ //objEditor.ctrlPanel.remove(j.label);
	1084	+ objEditor.ctrlPanel.remove(j);
	1085	+ }
	1086	+
904	1087	/*
905	1088	*/
906		- void Return() // ObjEditor oe)
	1089	+ void Return0() // ObjEditor oe)
907	1090	{
908	1091	aConstraints.gridy += 1;
909	1092	aConstraints.gridx = 0;
..	..	@@ -958,37 +1141,76 @@
958	1141
959	1142	void SetupUI2(ObjEditor oe)
960	1143	{
961		-// oe.aConstraints.weightx = 0;
962		-// oe.aConstraints.weighty = 0;
963		-// oe.aConstraints.gridx = 0;
964		-// oe.aConstraints.gridy = 0;
965		- SetupName(oe);
	1144	+ //SetupName(oe);
966	1145
967		- if (!GroupEditor.allparams)
	1146	+ namePanel = new cGridBag();
	1147	+
	1148	+ nameField = AddText(namePanel, copy.GetName());
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1150	+ oe.ctrlPanel.add(namePanel);
	1151	+
	1152	+ oe.ctrlPanel.Return();
	1153	+
	1154	+ if (!allparams)
968	1155	return;
969	1156
970		- liveCB = AddCheckBox(oe, "Live", copy.live);
971		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1157	+ setupPanel = new cGridBag().setVertical(false);
	1158	+
	1159	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1160	+ liveCB.setToolTipText("Animate object");
	1161	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1162	+ selectCB.setToolTipText("Make object selectable");
973	1163	// 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");
	1164	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1165	+ hideCB.setToolTipText("Hide object");
	1166	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1167	+ markCB.setToolTipText("As animation target transform");
	1168	+
	1169	+ setupPanel2 = new cGridBag().setVertical(false);
	1170	+
	1171	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1172	+ rewindCB.setToolTipText("Rewind animation");
	1173	+
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1176	+
	1177	+ if (Globals.ADVANCED)
	1178	+ {
	1179	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1180	+ link2masterCB.setToolTipText("Attach to support");
	1181	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1182	+ speedupCB.setToolTipText("Option motion capture");
	1183	+ }
	1184	+
	1185	+ oe.ctrlPanel.add(setupPanel);
	1186	+ oe.ctrlPanel.Return();
	1187	+ oe.ctrlPanel.add(setupPanel2);
	1188	+ oe.ctrlPanel.Return();
	1189	+
	1190	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1191	+
	1192	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1193	+ resetButton.setToolTipText("Jump to frame zero");
	1194	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1195	+ stepButton.setToolTipText("Step one frame");
980	1196	// resetAllButton = AddButton(oe, "Reset All");
981	1197	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
983	1198	// Return();
984		- slowerButton = AddButton(oe, "Slow");
985		- fasterButton = AddButton(oe, "Fast");
986		- remarkButton = AddButton(oe, "Rem");
	1199	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1200	+ slowerButton.setToolTipText("Decrease animation speed");
	1201	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1202	+ fasterButton.setToolTipText("Increase animation speed");
	1203	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1204	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1205
988		- Return();
	1206	+ oe.ctrlPanel.add(objectCommandsPanel);
	1207	+ oe.ctrlPanel.Return();
989	1208
990		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991		- Return();
	1209	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1210	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1211	+ //Return();
	1212	+
	1213	+ oe.ctrlPanel.Return();
992	1214
993	1215	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
994	1216	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1083,7 +1305,7 @@
1083	1305	oe.aConstraints.gridwidth = 1;
1084	1306	/**/
1085	1307	nameField = AddText(oe.ctrlPanel, copy.GetName());
1086		- Return();
	1308	+ oe.ctrlPanel.Return();
1087	1309
1088	1310	//ctrlPanel.add(textureButton = new Button("Texture..."));
1089	1311	//textureButton.setEnabled(false);
..	..	@@ -1185,11 +1407,25 @@
1185	1407	//JPanel worldPanel =
1186	1408	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187	1409	//worldPanel.setName("World");
1188		- centralPanel = new JPanel(new BorderLayout());
1189		- timelinePanel = new JPanel(new BorderLayout());
1190		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1410	+ centralPanel = new cGridBag();
	1411	+ centralPanel.preferredWidth = 20;
	1412	+
	1413	+ if (Globals.ADVANCED)
	1414	+ {
	1415	+ timelinePanel = new JPanel(new BorderLayout());
	1416	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191	1417
	1418	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1419	+ cameraPanel.setContinuousLayout(true);
	1420	+ cameraPanel.setOneTouchExpandable(true);
	1421	+// cameraPanel.setDividerLocation(0.9);
	1422	+// cameraPanel.setDividerSize(9);
	1423	+ cameraPanel.setResizeWeight(1.0);
	1424	+
	1425	+ }
	1426	+
1192	1427	centralPanel.add(cameraView);
	1428	+ centralPanel.setFocusable(true);
1193	1429	//frame.setJMenuBar(timelineMenubar);
1194	1430	//centralPanel.add(timelinePanel);
1195	1431
..	..	@@ -1208,12 +1444,13 @@
1208	1444	//frontView.object = copy;
1209	1445	//sideView.object = copy;
1210	1446
1211		- XYZPanel = new JPanel();
1212		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1447	+ XYZPanel = new cGridBag().setVertical(true);
	1448	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1213	1449
1214		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1215		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1216		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1450	+ XYZPanel.preferredWidth = 5;
	1451	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1452	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1453	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1217	1454
1218	1455	/*
1219	1456	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1251,11 +1488,16 @@
1251	1488	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1252	1489	//tmp.setName("Edit");
1253	1490	objectPanel.add(materialPanel);
1254		- JPanel north = new JPanel(new BorderLayout());
1255		- north.setName("Edit");
1256		- north.add(ctrlPanel, BorderLayout.NORTH);
1257		- objectPanel.add(north);
1258		- objectPanel.add(infoPanel);
	1491	+// JPanel north = new JPanel(new BorderLayout());
	1492	+// north.setName("Edit");
	1493	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1494	+// objectPanel.add(north);
	1495	+ objectPanel.add(editPanel);
	1496	+
	1497	+ //if (Globals.ADVANCED)
	1498	+ objectPanel.add(infoPanel);
	1499	+
	1500	+ objectPanel.add(toolboxPanel);
1259	1501
1260	1502	/*
1261	1503	aConstraints.gridx = 0;
..	..	@@ -1264,7 +1506,7 @@
1264	1506	aConstraints.gridy += 1;
1265	1507	aConstraints.gridwidth = 1;
1266	1508	mainPanel.add(objectPanel, aConstraints);
1267		- */
	1509	+ */
1268	1510
1269	1511	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1270	1512	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1275,16 +1517,23 @@
1275	1517	scrollpane.setWheelScrollingEnabled(true);
1276	1518	scrollpane.addMouseWheelListener(this); // Default not fast enough
1277	1519
1278		- /JTabbedPane/ scenePanel = new JTabbedPane();
1279		- scenePanel.add(scrollpane);
	1520	+ /JTabbedPane/ scenePanel = new cGridBag();
	1521	+ scenePanel.preferredWidth = 6;
	1522	+
	1523	+ JTabbedPane tabbedPane = new JTabbedPane();
	1524	+ tabbedPane.add(scrollpane);
1280	1525
1281		- scenePanel.add(FSPane = new cFileSystemPane(this));
1282		-
1283		- optionsPanel = new JPanel(new GridBagLayout());
	1526	+ optionsPanel = new cGridBag().setVertical(false);
1284	1527
1285	1528	optionsPanel.setName("Options");
1286		- scenePanel.add(optionsPanel);
	1529	+
	1530	+ AddOptions(optionsPanel); //, aConstraints);
	1531	+
	1532	+ tabbedPane.add(optionsPanel);
	1533	+
	1534	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1287	1535
	1536	+ scenePanel.add(tabbedPane);
1288	1537
1289	1538	/*
1290	1539	cTree jTree = new cTree(null);
..	..	@@ -1318,6 +1567,7 @@
1318	1567	//bigPanel.setSize(new Dimension(10,10));
1319	1568	//bigPanel.add(ctrlPanel);
1320	1569	//bigPanel.add(gridPanel);
	1570	+ /**
1321	1571	bigThree = new JPanel();
1322	1572	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1323	1573	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1341,7 +1591,13 @@
1341	1591	// aConstraints.gridheight = 3;
1342	1592	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1343	1593	bigThree.add(XYZPanel, aWindowConstraints);
	1594	+ /**/
1344	1595
	1596	+ bigThree = new cGridBag();
	1597	+ bigThree.addComponent(scenePanel);
	1598	+ bigThree.addComponent(centralPanel);
	1599	+ bigThree.addComponent(XYZPanel);
	1600	+
1345	1601	// // SIDE EFFECT!!!
1346	1602	// aConstraints.gridx = 0;
1347	1603	// aConstraints.gridy = 0;
..	..	@@ -1349,9 +1605,9 @@
1349	1605	// aConstraints.gridheight = 1;
1350	1606
1351	1607	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1352		- framePanel.setContinuousLayout(true);
1353		- framePanel.setOneTouchExpandable(true);
1354		- framePanel.setDividerLocation(0.8);
	1608	+ framePanel.setContinuousLayout(false);
	1609	+ framePanel.setOneTouchExpandable(false);
	1610	+ //.setDividerLocation(0.8);
1355	1611	//framePanel.setDividerSize(15);
1356	1612	//framePanel.setResizeWeight(0.15);
1357	1613	framePanel.setName("Frame");
..	..	@@ -1362,15 +1618,21 @@
1362	1618	//worldPane.add(bigPanel);
1363	1619	//worldPane.add(worldPanel);
1364	1620	/**/
1365		- frame.getContentPane().add(/"Center",/framePanel);
	1621	+ //frame.getContentPane().add(/"Center",/framePanel);
	1622	+ frame.add(/"Center",/framePanel);
1366	1623	//frame.getContentPane().add(/"Center",/ worldPane);
1367	1624
1368	1625	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1369	1626
1370		- frame.setSize(1024, 768);
1371		- frame.show();
1372		-
	1627	+ frame.setSize(1280, 860);
	1628	+
	1629	+ cameraView.requestFocusInWindow();
	1630	+
1373	1631	gridPanel.setDividerLocation(1.0);
	1632	+
	1633	+ frame.validate();
	1634	+
	1635	+ frame.setVisible(true);
1374	1636
1375	1637	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1376	1638	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1383,6 +1645,10 @@
1383	1645	});
1384	1646	}
1385	1647
	1648	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1649	+ {
	1650	+ }
	1651	+
1386	1652	JTree GetTree()
1387	1653	{
1388	1654	return objEditor.jTree;
..	..	@@ -1394,260 +1660,161 @@
1394	1660	ctrlPanel.removeAll();
1395	1661	}
1396	1662
1397		- void SetupMaterial(JPanel ctrlPanel)
	1663	+ void SetupMaterial(cGridBag panel)
1398	1664	{
1399		- aConstraints.weighty = 0;
1400		- //aConstraints.weightx = 1;
1401		- /*
	1665	+ /*
1402	1666	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1403	1667	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1404		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1405		- aConstraints.gridx += 1;
1406	1668	*/
1407	1669
1408		- aConstraints.gridwidth = 1;
1409		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1410		- aConstraints.gridx += 1;
1411		- aConstraints.weighty = 0;
1412		- aConstraints.gridwidth = 1;
	1670	+ cGridBag editBar = new cGridBag().setVertical(false);
	1671	+
	1672	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1673	+ createMaterialButton.setToolTipText("Create material");
1413	1674
1414	1675	/*
1415	1676	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1416		- aConstraints.gridx += 1;
1417		- aConstraints.weighty = 0;
1418		- aConstraints.gridwidth = 1;
1419	1677	*/
1420	1678
1421		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1422		- aConstraints.gridx += 1;
	1679	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1680	+ clearMaterialButton.setToolTipText("Clear material");
	1681	+
	1682	+ if (Globals.ADVANCED)
	1683	+ {
	1684	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1685	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1686	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1687	+ }
1423	1688
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;
	1689	+ editBar.preferredHeight = 15;
	1690	+
	1691	+ panel.add(editBar);
	1692	+
1438	1693	/**/
1439	1694	//aConstraints.weighty = 0;
1440	1695	////aConstraints.weightx = 1;
1441	1696	//aConstraints.weighty = 1;
1442	1697	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1443	1698	//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;
	1699	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1449	1700
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;
	1701	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1702	+
	1703	+ cGridBag color = new cGridBag();
	1704	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1705	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1706	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1707	+ //colorField.preferredWidth = 200;
	1708	+ colorSection.add(color);
1460	1709
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;
	1710	+ cGridBag modulation = new cGridBag();
	1711	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1712	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1713	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1714	+ colorSection.add(modulation);
1470	1715
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;
	1716	+ cGridBag texture = new cGridBag();
	1717	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1718	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1719	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1720	+ colorSection.add(texture);
1480	1721
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;
	1722	+ panel.add(new JSeparator());
	1723	+
	1724	+ panel.add(colorSection);
	1725	+
	1726	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1727	+
	1728	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1729	+
	1730	+ cGridBag diffuse = new cGridBag();
	1731	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1732	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1733	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1734	+ diffuseSection.add(diffuse);
1490	1735
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;
	1736	+ cGridBag diffuseness = new cGridBag();
	1737	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1738	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1739	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1740	+ diffuseSection.add(diffuseness);
1500	1741
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;
	1742	+ cGridBag selfshadow = new cGridBag();
	1743	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1744	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1745	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1746	+ diffuseSection.add(selfshadow);
1510	1747
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;
	1748	+ cGridBag sheen = new cGridBag();
	1749	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1750	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1751	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1752	+ diffuseSection.add(sheen);
1519	1753
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;
	1754	+ cGridBag subsurface = new cGridBag();
	1755	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1756	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1757	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1758	+ diffuseSection.add(subsurface);
1529	1759
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;
	1760	+ cGridBag shadow = new cGridBag();
	1761	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1762	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1763	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1764	+ diffuseSection.add(shadow);
1539	1765
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;
	1766	+ cGridBag fakedepth = new cGridBag();
	1767	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1768	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1769	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1770	+ diffuseSection.add(fakedepth);
1549	1771
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;
	1772	+ cGridBag shadowbias = new cGridBag();
	1773	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1774	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1775	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1776	+ diffuseSection.add(shadowbias);
1559	1777
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;
	1778	+ panel.add(new JSeparator());
	1779	+
	1780	+ panel.add(diffuseSection);
	1781	+
	1782	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1783	+
	1784	+ cGridBag specularSection = new cGridBag().setVertical(true);
1569	1785
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;
	1786	+ cGridBag specular = new cGridBag();
	1787	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1788	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1789	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1790	+ specularSection.add(specular);
1579	1791
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;
	1792	+ cGridBag lightarea = new cGridBag();
	1793	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1794	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1795	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1796	+ specularSection.add(lightarea);
1589	1797
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;
	1798	+ cGridBag shininess = new cGridBag();
	1799	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1800	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1801	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1802	+ specularSection.add(shininess);
1598	1803
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;
	1804	+ cGridBag metalness = new cGridBag();
	1805	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1806	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1807	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1808	+ specularSection.add(metalness);
1608	1809
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;
	1810	+ cGridBag velvet = new cGridBag();
	1811	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1812	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1813	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1814	+ specularSection.add(velvet);
1618	1815
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();
	1816	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1817	+ //Return();
1651	1818	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1652	1819	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653	1820	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1658,130 +1825,105 @@
1658	1825	// aConstraints.gridy += 1;
1659	1826	// aConstraints.gridwidth = 1;
1660	1827
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;
	1828	+ cGridBag anisoU = new cGridBag();
	1829	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1830	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1831	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1832	+ specularSection.add(anisoU);
1669	1833
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;
	1834	+ cGridBag anisoV = new cGridBag();
	1835	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1836	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1837	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1838	+ specularSection.add(anisoV);
1679	1839
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	1840
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;
	1841	+ panel.add(new JSeparator());
	1842	+
	1843	+ panel.add(specularSection);
	1844	+
	1845	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1846	+
	1847	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1699	1848
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;
	1849	+ cGridBag camera = new cGridBag();
	1850	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1851	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1852	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1853	+ colorSection.add(camera);
1710	1854
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;
	1855	+ cGridBag ambient = new cGridBag();
	1856	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1857	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1858	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1859	+ colorSection.add(ambient);
1720	1860
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;
	1861	+ cGridBag backlit = new cGridBag();
	1862	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1863	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1864	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1865	+ colorSection.add(backlit);
1730	1866
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;
	1867	+ cGridBag opacity = new cGridBag();
	1868	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1869	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1871	+ colorSection.add(opacity);
1740	1872
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;
	1873	+ //panel.add(new JSeparator());
	1874	+
	1875	+ //panel.add(globalSection);
	1876	+
	1877	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1878	+
	1879	+ cGridBag textureSection = new cGridBag().setVertical(true);
1750	1880
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;
	1881	+ cGridBag bump = new cGridBag();
	1882	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1883	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1884	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1885	+ textureSection.add(bump);
1760	1886
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;
	1887	+ cGridBag noise = new cGridBag();
	1888	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1889	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1890	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1891	+ textureSection.add(noise);
1770	1892
1771		- //aConstraints.weighty = 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1773		- //aConstraints.gridx += 1;
1774		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1775		- aConstraints.weighty = 0;
	1893	+ cGridBag power = new cGridBag();
	1894	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1895	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1896	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1897	+ textureSection.add(power);
1776	1898
1777		- aConstraints.gridx = 0;
1778		- aConstraints.gridy = 0;
1779		- aConstraints.gridwidth = 1;
	1899	+ cGridBag borderfade = new cGridBag();
	1900	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1901	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1902	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1903	+ textureSection.add(borderfade);
	1904	+
	1905	+ cGridBag fog = new cGridBag();
	1906	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1907	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1908	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1909	+ textureSection.add(fog);
	1910	+
	1911	+ cGridBag opacityPower = new cGridBag();
	1912	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1913	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1914	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1915	+ textureSection.add(opacityPower);
	1916	+
	1917	+ panel.add(new JSeparator());
	1918	+
	1919	+ panel.add(textureSection);
	1920	+
	1921	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1780	1922
1781	1923	SetMaterial(copy); // .GetMaterial());
1782	1924
1783		- colorField.addChangeListener(this);
1784		- modulationField.addChangeListener(this);
	1925	+ //colorField.addChangeListener(this);
	1926	+// modulationField.addChangeListener(this);
1785	1927	metalnessField.addChangeListener(this);
1786	1928	diffuseField.addChangeListener(this);
1787	1929	specularField.addChangeListener(this);
..	..	@@ -1811,12 +1953,15 @@
1811	1953	opacityPowerField.addChangeListener(this);
1812	1954	/**/
1813	1955
1814		- resetSlidersButton.addActionListener(this);
1815	1956	clearMaterialButton.addActionListener(this);
1816	1957	createMaterialButton.addActionListener(this);
1817		-
1818		- propagateToggle.addItemListener(this);
1819		- multiplyToggle.addItemListener(this);
	1958	+
	1959	+ if (Globals.ADVANCED)
	1960	+ {
	1961	+ resetSlidersButton.addActionListener(this);
	1962	+ propagateToggle.addItemListener(this);
	1963	+ multiplyToggle.addItemListener(this);
	1964	+ }
1820	1965	}
1821	1966
1822	1967	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1834,8 +1979,9 @@
1834	1979	// 3D models
1835	1980	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1836	1981	{
1837		- lastConverter = new com.jmex.model.converters.MaxToJme();
1838		- LoadFile(filename, lastConverter);
	1982	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1983	+ //LoadFile(filename, lastConverter);
	1984	+ LoadObjFile(filename); // New 3ds loader
1839	1985	continue;
1840	1986	}
1841	1987	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1987,7 +2133,7 @@
1987	2133
1988	2134	//? flashIt = false;
1989	2135	CameraPane pane = (CameraPane) cameraView;
1990		- pane.clickStart(location.x, location.y, 0);
	2136	+ pane.clickStart(location.x, location.y, 0, 0);
1991	2137	pane.clickEnd(location.x, location.y, 0, true);
1992	2138
1993	2139	if (group.selection.size() == 1)
..	..	@@ -2036,6 +2182,7 @@
2036	2182	e2.printStackTrace();
2037	2183	}
2038	2184	}
	2185	+
2039	2186	LoadJMEThread loadThread;
2040	2187
2041	2188	class LoadJMEThread extends Thread
..	..	@@ -2093,6 +2240,7 @@
2093	2240	//LoadFile0(filename, converter);
2094	2241	}
2095	2242	}
	2243	+
2096	2244	LoadOBJThread loadObjThread;
2097	2245
2098	2246	class LoadOBJThread extends Thread
..	..	@@ -2171,19 +2319,19 @@
2171	2319
2172	2320	void LoadObjFile(String fullname)
2173	2321	{
2174		- /*
	2322	+ System.out.println("Loading " + fullname);
	2323	+ /**/
2175	2324	//lastFilename = fullname;
2176	2325	if(loadObjThread == null)
2177	2326	{
2178		- loadObjThread = new LoadOBJThread();
2179		- loadObjThread.start();
	2327	+ loadObjThread = new LoadOBJThread();
	2328	+ loadObjThread.start();
2180	2329	}
2181	2330
2182	2331	loadObjThread.add(fullname);
2183		- */
	2332	+ /**/
2184	2333
2185		- System.out.println("Loading " + fullname);
2186		- makeSomething(new FileObject(fullname, true), true);
	2334	+ //makeSomething(new FileObject(fullname, true), true);
2187	2335	}
2188	2336
2189	2337	void LoadGFDFile(String fullname)
..	..	@@ -2444,11 +2592,11 @@
2444	2592
2445	2593	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2446	2594	{
2447		- if (GrafreeD.standAlone)
	2595	+ if (Grafreed.standAlone)
2448	2596	{
2449	2597	/**/
2450	2598	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2451		- browser.show();
	2599	+ browser.setVisible(true);
2452	2600	String filename = browser.getFile();
2453	2601	if (filename != null && filename.length() > 0)
2454	2602	{
..	..	@@ -2559,6 +2707,7 @@
2559	2707	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2560	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2561	2709	}
	2710	+
2562	2711	//cJME.count++;
2563	2712	//cJME.count %= 12;
2564	2713	if (gc)
..	..	@@ -2593,6 +2742,7 @@
2593	2742	}
2594	2743	if (input == null)
2595	2744	{
	2745	+ new Exception().printStackTrace();
2596	2746	System.exit(0);
2597	2747	}
2598	2748
..	..	@@ -2741,6 +2891,7 @@
2741	2891	}
2742	2892	}
2743	2893	}
	2894	+
2744	2895	cFileSystemPane FSPane;
2745	2896
2746	2897	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2794,11 +2945,14 @@
2794	2945	}
2795	2946	}
2796	2947	}
	2948	+
2797	2949	freezematerial = false;
2798	2950	}
2799	2951
2800	2952	void SetMaterial(Object3D object)
2801	2953	{
	2954	+ latestObject = object;
	2955	+
2802	2956	cMaterial mat = object.material;
2803	2957
2804	2958	if (mat == null)
..	..	@@ -2807,7 +2961,8 @@
2807	2961	return;
2808	2962	}
2809	2963
2810		- multiplyToggle.setSelected(mat.multiply);
	2964	+ if (multiplyToggle != null)
	2965	+ multiplyToggle.setSelected(mat.multiply);
2811	2966
2812	2967	assert (object.projectedVertices != null);
2813	2968
..	..	@@ -2909,12 +3064,17 @@
2909	3064	// }
2910	3065
2911	3066	/**/
2912		- if (deselect)
	3067	+ if (deselect \|\| child == null)
2913	3068	{
2914	3069	//group.deselectAll();
2915	3070	//freeze = true;
2916	3071	GetTree().clearSelection();
2917	3072	//freeze = false;
	3073	+
	3074	+ if (child == null)
	3075	+ {
	3076	+ return;
	3077	+ }
2918	3078	}
2919	3079
2920	3080	//group.addSelectee(child);
..	..	@@ -2983,7 +3143,7 @@
2983	3143	cameraView.ToggleDL();
2984	3144	cameraView.repaint();
2985	3145	return;
2986		- } else if (event.getSource() == toggleTextureItem)
	3146	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2987	3147	{
2988	3148	cameraView.ToggleTexture();
2989	3149	// june 2013 copy.HardTouch();
..	..	@@ -2996,7 +3156,8 @@
2996	3156	if (timeline)
2997	3157	{
2998	3158	centralPanel.remove(cameraView);
2999		- centralPanel.add(timelinePanel);
	3159	+ cameraPanel.add(cameraView);
	3160	+ centralPanel.add(cameraPanel);
3000	3161	frame.setJMenuBar(timelineMenubar);
3001	3162	wasFullScreen = CameraPane.FULLSCREEN;
3002	3163	if (!CameraPane.FULLSCREEN)
..	..	@@ -3005,7 +3166,7 @@
3005	3166	}
3006	3167	else
3007	3168	{
3008		- centralPanel.remove(timelinePanel);
	3169	+ centralPanel.remove(cameraPanel);
3009	3170	centralPanel.add(cameraView);
3010	3171	frame.setJMenuBar(null);
3011	3172	if (!wasFullScreen)
..	..	@@ -3021,9 +3182,9 @@
3021	3182	frame.validate();
3022	3183
3023	3184	return;
3024		- } else if (event.getSource() == toggleRandomItem)
	3185	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3025	3186	{
3026		- cameraView.ToggleRandom();
	3187	+ cameraView.ToggleSwitch();
3027	3188	cameraView.repaint();
3028	3189	return;
3029	3190	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3052,6 +3213,10 @@
3052	3213	{
3053	3214	copy.live ^= true;
3054	3215	return;
	3216	+ } else if (event.getSource() == selectCB)
	3217	+ {
	3218	+ copy.dontselect ^= true;
	3219	+ return;
3055	3220	} else if (event.getSource() == hideCB)
3056	3221	{
3057	3222	copy.hide ^= true;
..	..	@@ -3066,6 +3231,7 @@
3066	3231	if (event.getSource() == randomCB)
3067	3232	{
3068	3233	copy.random ^= true;
	3234	+ objEditor.refreshContents();
3069	3235	return;
3070	3236	}
3071	3237	if (event.getSource() == speedupCB)
..	..	@@ -3089,8 +3255,9 @@
3089	3255
3090	3256	public void actionPerformed(ActionEvent event)
3091	3257	{
	3258	+ Object source = event.getSource();
3092	3259	// SCRIPT DIALOG
3093		- if (event.getSource() == okbutton)
	3260	+ if (source == okbutton)
3094	3261	{
3095	3262	textpanel.setVisible(false);
3096	3263	textpanel.remove(textarea);
..	..	@@ -3102,7 +3269,7 @@
3102	3269	textarea = null;
3103	3270	textpanel = null;
3104	3271	}
3105		- if (event.getSource() == cancelbutton)
	3272	+ if (source == cancelbutton)
3106	3273	{
3107	3274	textpanel.setVisible(false);
3108	3275	textpanel.remove(textarea);
..	..	@@ -3114,49 +3281,50 @@
3114	3281	//applySelf();
3115	3282	//client.refreshEditWindow();
3116	3283	//refreshContents();
3117		- if (event.getSource() == nameField)
	3284	+ if (source == nameField)
3118	3285	{
3119	3286	//System.out.println("ObjEditor " + event);
3120	3287	applySelf0(true);
3121	3288	//parent.applySelf();
3122	3289	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetButton)
	3290	+ } else if (source == resetButton)
3124	3291	{
3125	3292	CameraPane.fullreset = true;
3126	3293	copy.Reset(); // ResetMeshes();
3127	3294	copy.Touch();
3128	3295	objEditor.refreshContents();
3129		- } else if (event.getSource() == stepItem)
	3296	+ } else if (source == stepItem)
3130	3297	{
3131		- cameraView.ONESTEP = true;
	3298	+ //cameraView.ONESTEP = true;
	3299	+ Globals.ONESTEP = true;
3132	3300	cameraView.repaint();
3133	3301	return;
3134		- } else if (event.getSource() == stepButton)
	3302	+ } else if (source == stepButton)
3135	3303	{
3136	3304	copy.Step();
3137	3305	copy.Touch();
3138	3306	objEditor.refreshContents();
3139		- } else if (event.getSource() == slowerButton)
	3307	+ } else if (source == slowerButton)
3140	3308	{
3141	3309	copy.Slower();
3142	3310	copy.Touch();
3143	3311	objEditor.refreshContents();
3144		- } else if (event.getSource() == fasterButton)
	3312	+ } else if (source == fasterButton)
3145	3313	{
3146	3314	copy.Faster();
3147	3315	copy.Touch();
3148	3316	objEditor.refreshContents();
3149		- } else if (event.getSource() == remarkButton)
	3317	+ } else if (source == remarkButton)
3150	3318	{
3151	3319	copy.Remark();
3152	3320	copy.Touch();
3153	3321	objEditor.refreshContents();
3154		- } else if (event.getSource() == stepAllButton)
	3322	+ } else if (source == stepAllButton)
3155	3323	{
3156	3324	copy.StepAll();
3157	3325	copy.Touch();
3158	3326	objEditor.refreshContents();
3159		- } else if (event.getSource() == resetAllButton)
	3327	+ } else if (source == resetAllButton)
3160	3328	{
3161	3329	//CameraPane.fullreset = true;
3162	3330	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3189,53 +3357,79 @@
3189	3357	// Close();
3190	3358	// }
3191	3359	// else
3192		- if (event.getSource() == resetSlidersButton)
	3360	+ if (source == resetSlidersButton)
3193	3361	{
3194	3362	ResetSliders();
3195		- } else if (event.getSource() == clearMaterialButton)
	3363	+ } else if (source == clearMaterialButton)
3196	3364	{
3197	3365	ClearMaterial();
3198		- } else if (event.getSource() == createMaterialButton)
	3366	+ } else if (source == createMaterialButton)
3199	3367	{
3200	3368	CreateMaterial();
3201		- } else if (event.getSource() == clearPanelButton)
	3369	+ } else if (source == clearPanelButton)
3202	3370	{
3203	3371	copy.ClearUI();
3204	3372	refreshContents(true);
3205		- } /*
3206		- }
3207		-
3208		- public boolean action(Event event, Object arg)
3209		- {
3210		- */ else if (event.getSource() == closeItem)
	3373	+ } else if (source == importGFDItem)
	3374	+ {
	3375	+ ImportGFD();
	3376	+ } else
	3377	+ if (source == importVRMLX3DItem)
	3378	+ {
	3379	+ ImportVRMLX3D();
	3380	+ } else
	3381	+ if (source == import3DSItem)
	3382	+ {
	3383	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3384	+ } else
	3385	+ if (source == importOBJItem)
	3386	+ {
	3387	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3388	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3389	+ browser.setVisible(true);
	3390	+ String filename = browser.getFile();
	3391	+ if (filename != null && filename.length() > 0)
	3392	+ {
	3393	+ String fullname = browser.getDirectory() + filename;
	3394	+ makeSomething(ReadOBJ(fullname), true);
	3395	+ }
	3396	+ } else
	3397	+ if (source == closeItem)
3211	3398	{
3212	3399	Close();
3213	3400	//return true;
3214		- } else if (event.getSource() == loadItem)
	3401	+ } else if (source == openItem)
3215	3402	{
3216		- load();
	3403	+ Open();
3217	3404	//return true;
3218		- } else if (event.getSource() == saveItem)
	3405	+ } else if (source == newItem)
	3406	+ {
	3407	+ New();
	3408	+ } else if (source == saveItem)
3219	3409	{
3220	3410	save();
3221	3411	//return true;
3222		- } else if (event.getSource() == saveAsItem)
	3412	+ } else if (source == saveAsItem)
3223	3413	{
3224	3414	saveAs();
3225	3415	//return true;
3226		- } else if (event.getSource() == reexportItem)
	3416	+ } else if (source == reexportItem)
3227	3417	{
3228	3418	reexport();
3229	3419	//return true;
3230		- } else if (event.getSource() == exportAsItem)
	3420	+ } else if (source == exportAsItem)
3231	3421	{
3232	3422	export();
3233	3423	//return true;
3234		- } else if (event.getSource() == povItem)
	3424	+ } else if (source == povItem)
3235	3425	{
3236	3426	generatePOV();
3237	3427	//return true;
3238		- } else if (event.getSource() == zBufferItem)
	3428	+ } else if (event.getSource() == archiveItem)
	3429	+ {
	3430	+ cTools.Archive(frame);
	3431	+ return;
	3432	+ } else if (source == zBufferItem)
3239	3433	{
3240	3434	try
3241	3435	{
..	..	@@ -3257,21 +3451,8 @@
3257	3451	cameraView.repaint();
3258	3452	//return true;
3259	3453	}
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)
	3454	+ */ else // combos...
	3455	+ if (source == texresMenu)
3275	3456	{
3276	3457	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3277	3458	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3283,27 +3464,353 @@
3283	3464	}
3284	3465	}
3285	3466
3286		- void ToggleAnimation()
	3467	+ void New()
3287	3468	{
3288		- if (!CameraPane.ANIMATION)
	3469	+ while (copy.Size() > 1)
3289	3470	{
3290		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3471	+ copy.remove(1);
	3472	+ }
	3473	+
	3474	+ ResetModel();
	3475	+ objEditor.refreshContents();
	3476	+ }
	3477	+
	3478	+ static public byte[] Compress(Object3D o)
	3479	+ {
	3480	+ try
	3481	+ {
	3482	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3483	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3484	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3485	+
	3486	+ Object3D parent = o.parent;
	3487	+ o.parent = null;
	3488	+
	3489	+ out.writeObject(o);
	3490	+
	3491	+ o.parent = parent;
	3492	+
	3493	+ out.flush();
	3494	+
	3495	+ zstream.close();
	3496	+ out.close();
	3497	+
	3498	+ return baos.toByteArray();
	3499	+ } catch (Exception e)
	3500	+ {
	3501	+ System.err.println(e);
	3502	+ return null;
	3503	+ }
	3504	+ }
	3505	+
	3506	+ static public Object Uncompress(byte[] bytes)
	3507	+ {
	3508	+ System.out.println("#bytes = " + bytes.length);
	3509	+ try
	3510	+ {
	3511	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3512	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3513	+ ObjectInputStream in = new ObjectInputStream(istream);
	3514	+ Object obj = in.readObject();
	3515	+ in.close();
	3516	+
	3517	+ return obj;
	3518	+ } catch (Exception e)
	3519	+ {
	3520	+ System.err.println(e);
	3521	+ return null;
	3522	+ }
	3523	+ }
	3524	+
	3525	+ static public Object clone(Object o)
	3526	+ {
	3527	+ try
	3528	+ {
	3529	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3530	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3531	+
	3532	+ out.writeObject(o);
	3533	+
	3534	+ out.flush();
	3535	+ out.close();
	3536	+
	3537	+ byte[] bytes = baos.toByteArray();
	3538	+
	3539	+ System.out.println("clone = " + bytes.length);
	3540	+
	3541	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3542	+ ObjectInputStream in = new ObjectInputStream(bais);
	3543	+ Object obj = in.readObject();
	3544	+ in.close();
	3545	+
	3546	+ return obj;
	3547	+ } catch (Exception e)
	3548	+ {
	3549	+ System.err.println(e);
	3550	+ return null;
	3551	+ }
	3552	+ }
	3553	+
	3554	+ cRadio GetCurrentTab()
	3555	+ {
	3556	+ cRadio ab;
	3557	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3558	+ {
	3559	+ ab = (cRadio)e.nextElement();
	3560	+ if(ab.GetObject() == copy)
	3561	+ {
	3562	+ return ab;
	3563	+ }
	3564	+ }
	3565	+
	3566	+ return null;
	3567	+ }
	3568	+
	3569	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3570	+
	3571	+ public void Save()
	3572	+ {
	3573	+ // Default reduces the probability of heuristics errors.
	3574	+ Save(true);
	3575	+ }
	3576	+
	3577	+ private boolean Equal(byte[] compress, byte[] name)
	3578	+ {
	3579	+ if (compress.length != name.length)
	3580	+ {
	3581	+ return false;
	3582	+ }
	3583	+
	3584	+ for (int i=compress.length; --i>=0;)
	3585	+ {
	3586	+ if (compress[i] != name[i])
	3587	+ return false;
	3588	+ }
	3589	+
	3590	+ return true;
	3591	+ }
	3592	+
	3593	+ public boolean Save(boolean user)
	3594	+ {
	3595	+ System.err.println("Save");
	3596	+
	3597	+ cRadio tab = GetCurrentTab();
	3598	+
	3599	+ boolean temp = CameraPane.SWITCH;
	3600	+ CameraPane.SWITCH = false;
	3601	+
	3602	+ copy.ExtractBigData(hashtable);
	3603	+
	3604	+ byte[] compress = Compress(copy);
	3605	+
	3606	+ CameraPane.SWITCH = temp;
	3607	+
	3608	+ boolean thesame = false;
	3609	+
	3610	+ // Quick heuristic using length. Works only when stream is compressed.
	3611	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3612	+ {
	3613	+ thesame = true;
	3614	+ }
	3615	+
	3616	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3617	+ if (!thesame)
	3618	+ {
	3619	+ tab.user[tab.undoindex] = user;
	3620	+ tab.graphs[tab.undoindex++] = compress;
	3621	+ }
	3622	+
	3623	+ copy.RestoreBigData(hashtable);
	3624	+
	3625	+ //assert(hashtable.isEmpty());
	3626	+
	3627	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3628	+ {
	3629	+ tab.user[i] = false;
	3630	+ tab.graphs[i] = null;
	3631	+ }
	3632	+
	3633	+ SetUndoStates();
	3634	+
	3635	+ // test save
	3636	+ if (false)
	3637	+ {
	3638	+ try
	3639	+ {
	3640	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3641	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3642	+
	3643	+ p.writeObject(copy);
	3644	+
	3645	+ p.flush();
	3646	+
	3647	+ ostream.close();
	3648	+ } catch (Exception e)
	3649	+ {
	3650	+ e.printStackTrace();
	3651	+ }
	3652	+ }
	3653	+
	3654	+ return !thesame;
	3655	+ }
	3656	+
	3657	+ void CopyChanged(Object3D obj)
	3658	+ {
	3659	+ SetUndoStates();
	3660	+
	3661	+ boolean temp = CameraPane.SWITCH;
	3662	+ CameraPane.SWITCH = false;
	3663	+
	3664	+ copy.ExtractBigData(hashtable);
	3665	+
	3666	+ copy.clear();
	3667	+
	3668	+ for (int i=0; i<obj.Size(); i++)
	3669	+ {
	3670	+ copy.add(obj.get(i));
	3671	+ }
	3672	+
	3673	+ copy.RestoreBigData(hashtable);
	3674	+
	3675	+ CameraPane.SWITCH = temp;
	3676	+
	3677	+ //assert(hashtable.isEmpty());
	3678	+
	3679	+ copy.Touch();
	3680	+
	3681	+ ResetModel();
	3682	+ copy.HardTouch(); // recompile?
	3683	+
	3684	+ cRadio ab;
	3685	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3686	+ {
	3687	+ ab = (cRadio)e.nextElement();
	3688	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3689	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3690	+ if (test != null)
	3691	+ {
	3692	+ test.editWindow = ab.object.editWindow;
	3693	+ ab.object = test;
	3694	+ }
	3695	+ }
	3696	+
	3697	+ refreshContents();
	3698	+ }
	3699	+
	3700	+ cButton undoButton;
	3701	+ cButton redoButton;
	3702	+
	3703	+ void SetUndoStates()
	3704	+ {
	3705	+ cRadio tab = GetCurrentTab();
	3706	+
	3707	+ undoButton.setEnabled(tab.undoindex > 0);
	3708	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3709	+ }
	3710	+
	3711	+ public boolean Undo()
	3712	+ {
	3713	+ System.err.println("Undo");
	3714	+
	3715	+ cRadio tab = GetCurrentTab();
	3716	+
	3717	+ if (tab.undoindex == 0)
	3718	+ {
	3719	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3720	+ return false;
	3721	+ }
	3722	+
	3723	+ if (tab.graphs[tab.undoindex] == null \|\| !tab.user[tab.undoindex])
	3724	+ {
	3725	+ if (Save(false))
	3726	+ tab.undoindex -= 1;
	3727	+ else
	3728	+ {
	3729	+ if (tab.undoindex <= 0)
	3730	+ return false;
	3731	+ else
	3732	+ tab.undoindex -= 1;
	3733	+ }
	3734	+ }
	3735	+
	3736	+ tab.undoindex -= 1;
	3737	+
	3738	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3739	+
	3740	+ return true;
	3741	+ }
	3742	+
	3743	+ public void Redo()
	3744	+ {
	3745	+ cRadio tab = GetCurrentTab();
	3746	+
	3747	+ if (tab.graphs[tab.undoindex + 1] == null)
	3748	+ {
	3749	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3750	+ return;
	3751	+ }
	3752	+
	3753	+ tab.undoindex += 1;
	3754	+
	3755	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3756	+
	3757	+ if (!tab.user[tab.undoindex])
	3758	+ tab.graphs[tab.undoindex] = null;
	3759	+ }
	3760	+
	3761	+ void ImportGFD()
	3762	+ {
	3763	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3291	3764	browser.show();
3292	3765	String filename = browser.getFile();
3293	3766	if (filename != null && filename.length() > 0)
3294	3767	{
3295		- CameraPane.filename = browser.getDirectory() + filename;
	3768	+ String fullname = browser.getDirectory() + filename;
	3769	+
	3770	+ //Object3D readobj =
	3771	+ objEditor.ReadGFD(fullname, objEditor);
	3772	+ //makeSomething(readobj);
	3773	+ }
	3774	+ }
	3775	+
	3776	+ void ImportVRMLX3D()
	3777	+ {
	3778	+ if (Grafreed.standAlone)
	3779	+ {
	3780	+ /**/
	3781	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3782	+ browser.show();
	3783	+ String filename = browser.getFile();
	3784	+ if (filename != null && filename.length() > 0)
	3785	+ {
	3786	+ String fullname = browser.getDirectory() + filename;
	3787	+ LoadVRMLX3D(fullname);
	3788	+ }
	3789	+ /**/
	3790	+ }
	3791	+ }
	3792	+
	3793	+ void ToggleAnimation()
	3794	+ {
	3795	+ if (!Globals.ANIMATION)
	3796	+ {
	3797	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3798	+ browser.setVisible(true);
	3799	+ String filename = browser.getFile();
	3800	+ if (filename != null && filename.length() > 0)
	3801	+ {
	3802	+ Globals.filename = browser.getDirectory() + filename;
3296	3803	//CameraPane.framecount = 0;
3297		- CameraPane.imagecount = 0;
	3804	+ Globals.imagecount = 0;
3298	3805
3299		- CameraPane.ANIMATION ^= true;
	3806	+ Globals.ANIMATION ^= true;
3300	3807
3301		- GrafreeD.wav.cursor = 0;
3302		- GrafreeD.wav.loop = 0;
	3808	+ Grafreed.wav.cursor = 0;
	3809	+ Grafreed.wav.loop = 0;
3303	3810	}
3304	3811	} else
3305	3812	{
3306		- CameraPane.ANIMATION ^= true;
	3813	+ Globals.ANIMATION ^= true;
3307	3814	}
3308	3815	}
3309	3816
..	..	@@ -3349,7 +3856,7 @@
3349	3856	void CreateMaterial()
3350	3857	{
3351	3858	//copy.ClearMaterial(); // PATCH
3352		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3859	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3353	3860	if (copy.selection.size() > 0)
3354	3861	//SetMaterial(copy);
3355	3862	{
..	..	@@ -3400,7 +3907,7 @@
3400	3907	assert false;
3401	3908	}
3402	3909
3403		- void EditSelection()
	3910	+ void EditSelection(boolean newWindow)
3404	3911	{
3405	3912	}
3406	3913
..	..	@@ -3408,11 +3915,11 @@
3408	3915	{
3409	3916	copy.ResetBlockLoop(); // temporary problem
3410	3917
3411		- boolean random = CameraPane.RANDOM;
3412		- CameraPane.RANDOM = false; // parse everything
	3918	+ boolean random = CameraPane.SWITCH;
	3919	+ CameraPane.SWITCH = false; // parse everything
3413	3920	copy.ResetDisplayList();
3414	3921	copy.HardTouch();
3415		- CameraPane.RANDOM = random;
	3922	+ CameraPane.SWITCH = random;
3416	3923	}
3417	3924
3418	3925	// public void applySelf()
..	..	@@ -3482,10 +3989,40 @@
3482	3989	current.fakedepth = (float) fakedepthField.getFloat();
3483	3990	current.shadowbias = (float) shadowbiasField.getFloat();
3484	3991
3485		- if (!NumberSlider.frozen)
	3992	+ if (!cNumberSlider.frozen)
3486	3993	{
3487	3994	//System.out.println("Propagate = " + propagate);
3488	3995	copy.UpdateMaterial(anchor, current, propagate);
	3996	+
	3997	+ if (copy.material != null)
	3998	+ {
	3999	+ cMaterial mat = copy.material;
	4000	+
	4001	+ colorField.SetToolTipValue((mat.color));
	4002	+ modulationField.SetToolTipValue((mat.modulation));
	4003	+ metalnessField.SetToolTipValue((mat.metalness));
	4004	+ diffuseField.SetToolTipValue((mat.diffuse));
	4005	+ specularField.SetToolTipValue((mat.specular));
	4006	+ shininessField.SetToolTipValue((mat.shininess));
	4007	+ shiftField.SetToolTipValue((mat.shift));
	4008	+ ambientField.SetToolTipValue((mat.ambient));
	4009	+ lightareaField.SetToolTipValue((mat.lightarea));
	4010	+ diffusenessField.SetToolTipValue((mat.factor));
	4011	+ velvetField.SetToolTipValue((mat.velvet));
	4012	+ sheenField.SetToolTipValue((mat.sheen));
	4013	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4014	+ backlitField.SetToolTipValue((mat.bump));
	4015	+ anisoField.SetToolTipValue((mat.aniso));
	4016	+ anisoVField.SetToolTipValue((mat.anisoV));
	4017	+ cameraField.SetToolTipValue((mat.cameralight));
	4018	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4019	+ shadowField.SetToolTipValue((mat.shadow));
	4020	+ textureField.SetToolTipValue((mat.texture));
	4021	+ opacityField.SetToolTipValue((mat.opacity));
	4022	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4023	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4024	+ }
	4025	+
3489	4026	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3490	4027	{
3491	4028	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3530,6 +4067,7 @@
3530	4067	\|\| e.getSource() == apertureField
3531	4068	\|\| e.getSource() == shadowblurField)
3532	4069	{
	4070	+ new Exception().printStackTrace();
3533	4071	System.exit(0);
3534	4072	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3535	4073	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3600,7 +4138,7 @@
3600	4138	}
3601	4139
3602	4140	if (normalpushField != null)
3603		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4141	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3604	4142	}
3605	4143
3606	4144	void SnapObject()
..	..	@@ -3855,7 +4393,7 @@
3855	4393
3856	4394	radioPanel.revalidate();
3857	4395	radioPanel.repaint();
3858		- ctrlPanel.revalidate(); // ? new
	4396	+ ctrlPanel.validate(); // ? new
3859	4397	ctrlPanel.repaint();
3860	4398	}
3861	4399	}
..	..	@@ -3864,6 +4402,8 @@
3864	4402
3865	4403	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3866	4404	{
	4405	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4406	+ Save();
3867	4407	//Tween.set(thing, 0).target(1).start(tweenManager);
3868	4408	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3869	4409	// if (thing instanceof GenericJointDemo)
..	..	@@ -3950,6 +4490,12 @@
3950	4490	{
3951	4491	ResetModel();
3952	4492	Select(thing.GetTreePath(), true, false); // unselect... false);
	4493	+
	4494	+ if (thing.Size() == 0)
	4495	+ {
	4496	+ //EditSelection(false);
	4497	+ }
	4498	+
3953	4499	refreshContents();
3954	4500	}
3955	4501
..	..	@@ -4067,6 +4613,7 @@
4067	4613	}
4068	4614	}
4069	4615	}
	4616	+
4070	4617	LoadGFDThread loadGFDThread;
4071	4618
4072	4619	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4086,8 +4633,10 @@
4086	4633
4087	4634	try
4088	4635	{
	4636	+ // Try compressed version first.
4089	4637	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4090		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4638	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4639	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4091	4640
4092	4641	readobj = (Object3D) p.readObject();
4093	4642	istream.close();
..	..	@@ -4095,7 +4644,20 @@
4095	4644	readobj.ResetDisplayList();
4096	4645	} catch (Exception e)
4097	4646	{
4098		- e.printStackTrace();
	4647	+ //e.printStackTrace();
	4648	+ try
	4649	+ {
	4650	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4651	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4652	+
	4653	+ readobj = (Object3D) p.readObject();
	4654	+ istream.close();
	4655	+
	4656	+ readobj.ResetDisplayList();
	4657	+ } catch (Exception e2)
	4658	+ {
	4659	+ e2.printStackTrace();
	4660	+ }
4099	4661	}
4100	4662	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4101	4663	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4141,6 +4703,12 @@
4141	4703
4142	4704	void LoadIt(Object obj)
4143	4705	{
	4706	+ if (obj == null)
	4707	+ {
	4708	+ // Invalid file
	4709	+ return;
	4710	+ }
	4711	+
4144	4712	System.out.println("Loaded " + obj);
4145	4713	//new Exception().printStackTrace();
4146	4714	Object3D readobj = (Object3D) obj;
..	..	@@ -4150,6 +4718,8 @@
4150	4718
4151	4719	if (readobj != null)
4152	4720	{
	4721	+ if (Globals.SAVEONMAKE)
	4722	+ Save();
4153	4723	try
4154	4724	{
4155	4725	//readobj.deepCopySelf(copy);
..	..	@@ -4210,9 +4780,9 @@
4210	4780	}
4211	4781	}
4212	4782
4213		- void load() // throws ClassNotFoundException
	4783	+ void Open() // throws ClassNotFoundException
4214	4784	{
4215		- if (GrafreeD.standAlone)
	4785	+ if (Grafreed.standAlone)
4216	4786	{
4217	4787	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4218	4788	browser.show();
..	..	@@ -4299,11 +4869,13 @@
4299	4869	try
4300	4870	{
4301	4871	FileOutputStream ostream = new FileOutputStream(lastname);
4302		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4872	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4873	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4303	4874
4304	4875	p.writeObject(copy);
4305	4876	p.flush();
4306	4877
	4878	+ zstream.close();
4307	4879	ostream.close();
4308	4880
4309	4881	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4313,17 +4885,20 @@
4313	4885	{
4314	4886	}
4315	4887	}
	4888	+
4316	4889	String lastname;
4317	4890
4318	4891	void saveAs()
4319	4892	{
4320		- if (GrafreeD.standAlone)
	4893	+ if (Grafreed.standAlone)
4321	4894	{
4322	4895	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4323	4896	browser.setVisible(true);
4324	4897	String filename = browser.getFile();
4325	4898	if (filename != null && filename.length() > 0)
4326	4899	{
	4900	+ if (!filename.endsWith(".gfd"))
	4901	+ filename += ".gfd";
4327	4902	lastname = browser.getDirectory() + filename;
4328	4903	save();
4329	4904	}
..	..	@@ -4422,13 +4997,13 @@
4422	4997	try
4423	4998	{
4424	4999	FileOutputStream ostream = new FileOutputStream(filename);
4425		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4426		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5000	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5001	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4427	5002
4428	5003	Object3D objectparent = obj.parent;
4429	5004	obj.parent = null;
4430	5005
4431		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5006	+ Object3D object = (Object3D) Grafreed.clone(obj);
4432	5007
4433	5008	obj.parent = objectparent;
4434	5009
..	..	@@ -4440,8 +5015,8 @@
4440	5015	p.writeObject(object);
4441	5016	p.flush();
4442	5017
	5018	+ zstream.close();
4443	5019	ostream.close();
4444		- // zstream.close();
4445	5020
4446	5021	// group.selection.get(0).parent = parent;
4447	5022	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4462,7 +5037,7 @@
4462	5037	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4463	5038	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4464	5039	copy.generatePOV(buffer);
4465		- if (GrafreeD.standAlone)
	5040	+ if (Grafreed.standAlone)
4466	5041	{
4467	5042	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4468	5043	browser.show();
..	..	@@ -4488,21 +5063,20 @@
4488	5063	Object3D client;
4489	5064	Object3D copy;
4490	5065	MenuBar menuBar;
4491		- Menu windowMenu;
4492		- MenuItem loadItem;
	5066	+ Menu fileMenu;
	5067	+ MenuItem newItem;
	5068	+ MenuItem openItem;
4493	5069	MenuItem saveItem;
4494	5070	MenuItem saveAsItem;
4495	5071	MenuItem exportAsItem;
4496	5072	MenuItem reexportItem;
4497	5073	MenuItem povItem;
4498	5074	MenuItem closeItem;
4499		- Menu cameraMenu;
	5075	+
4500	5076	CheckboxMenuItem zBufferItem;
4501	5077	//MenuItem normalLensItem;
4502		- MenuItem editCameraItem;
4503		- MenuItem revertCameraItem;
4504		- CheckboxMenuItem toggleLiveItem;
4505	5078	MenuItem stepItem;
	5079	+ CheckboxMenuItem toggleLiveItem;
4506	5080	CheckboxMenuItem toggleFullScreenItem;
4507	5081	CheckboxMenuItem toggleTimelineItem;
4508	5082	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4511,28 +5085,43 @@
4511	5085	CheckboxMenuItem toggleFootContactItem;
4512	5086	CheckboxMenuItem toggleDLItem;
4513	5087	CheckboxMenuItem toggleTextureItem;
4514		- CheckboxMenuItem toggleRandomItem;
	5088	+ CheckboxMenuItem toggleSwitchItem;
4515	5089	CheckboxMenuItem toggleRootItem;
4516	5090	CheckboxMenuItem animationItem;
	5091	+ MenuItem archiveItem;
4517	5092	CheckboxMenuItem toggleHandleItem;
4518	5093	CheckboxMenuItem togglePaintItem;
4519	5094	JSplitPane mainPanel;
4520	5095	JScrollPane scrollpane;
	5096	+
4521	5097	JPanel toolbarPanel;
4522		- JPanel treePanel;
	5098	+
	5099	+ cGridBag treePanel;
	5100	+
4523	5101	JPanel radioPanel;
4524	5102	ButtonGroup buttonGroup;
4525		- JPanel ctrlPanel;
4526		- JPanel materialPanel;
	5103	+
	5104	+ cGridBag toolboxPanel;
	5105	+ cGridBag materialPanel;
	5106	+ cGridBag ctrlPanel;
	5107	+
4527	5108	JScrollPane infoPanel;
4528		- JPanel optionsPanel;
	5109	+
	5110	+ cGridBag optionsPanel;
	5111	+
4529	5112	JTabbedPane objectPanel;
4530		- JPanel XYZPanel;
	5113	+ boolean materialFlushed;
	5114	+ Object3D latestObject;
	5115	+
	5116	+ cGridBag XYZPanel;
	5117	+
4531	5118	JSplitPane gridPanel;
4532	5119	JSplitPane bigPanel;
4533		- JPanel bigThree;
4534		- JTabbedPane scenePanel;
4535		- JPanel centralPanel;
	5120	+
	5121	+ cGridBag bigThree;
	5122	+ cGridBag scenePanel;
	5123	+ cGridBag centralPanel;
	5124	+ JSplitPane cameraPanel;
4536	5125	JPanel timelinePanel;
4537	5126	JMenuBar timelineMenubar;
4538	5127	JSplitPane framePanel;
..	..	@@ -4584,67 +5173,72 @@
4584	5173	// MATERIAL
4585	5174	JLabel materialLabel;
4586	5175	JLabel colorLabel;
4587		- NumberSlider colorField;
	5176	+ cNumberSlider colorField;
4588	5177	JLabel modulationLabel;
4589		- NumberSlider modulationField;
	5178	+ cNumberSlider modulationField;
4590	5179	JLabel metalnessLabel;
4591		- NumberSlider metalnessField;
	5180	+ cNumberSlider metalnessField;
4592	5181	JLabel diffuseLabel;
4593		- NumberSlider diffuseField;
	5182	+ cNumberSlider diffuseField;
4594	5183	JLabel specularLabel;
4595		- NumberSlider specularField;
	5184	+ cNumberSlider specularField;
4596	5185	JLabel shininessLabel;
4597		- NumberSlider shininessField;
	5186	+ cNumberSlider shininessField;
4598	5187	JLabel shiftLabel;
4599		- NumberSlider shiftField;
	5188	+ cNumberSlider shiftField;
4600	5189	JLabel ambientLabel;
4601		- NumberSlider ambientField;
	5190	+ cNumberSlider ambientField;
4602	5191	JLabel lightareaLabel;
4603		- NumberSlider lightareaField;
	5192	+ cNumberSlider lightareaField;
4604	5193	JLabel diffusenessLabel;
4605		- NumberSlider diffusenessField;
	5194	+ cNumberSlider diffusenessField;
4606	5195	JLabel velvetLabel;
4607		- NumberSlider velvetField;
	5196	+ cNumberSlider velvetField;
4608	5197	JLabel sheenLabel;
4609		- NumberSlider sheenField;
	5198	+ cNumberSlider sheenField;
4610	5199	JLabel subsurfaceLabel;
4611		- NumberSlider subsurfaceField;
	5200	+ cNumberSlider subsurfaceField;
4612	5201	//JLabel bumpLabel;
4613	5202	//NumberSlider bumpField;
4614	5203	JLabel backlitLabel;
4615		- NumberSlider backlitField;
	5204	+ cNumberSlider backlitField;
4616	5205	JLabel anisoLabel;
4617		- NumberSlider anisoField;
	5206	+ cNumberSlider anisoField;
4618	5207	JLabel anisoVLabel;
4619		- NumberSlider anisoVField;
	5208	+ cNumberSlider anisoVField;
4620	5209	JLabel cameraLabel;
4621		- NumberSlider cameraField;
	5210	+ cNumberSlider cameraField;
4622	5211	JLabel selfshadowLabel;
4623		- NumberSlider selfshadowField;
	5212	+ cNumberSlider selfshadowField;
4624	5213	JLabel shadowLabel;
4625		- NumberSlider shadowField;
	5214	+ cNumberSlider shadowField;
4626	5215	JLabel textureLabel;
4627		- NumberSlider textureField;
	5216	+ cNumberSlider textureField;
4628	5217	JLabel opacityLabel;
4629		- NumberSlider opacityField;
	5218	+ cNumberSlider opacityField;
4630	5219	JLabel fakedepthLabel;
4631		- NumberSlider fakedepthField;
	5220	+ cNumberSlider fakedepthField;
4632	5221	JLabel shadowbiasLabel;
4633		- NumberSlider shadowbiasField;
	5222	+ cNumberSlider shadowbiasField;
4634	5223	JLabel bumpLabel;
4635		- NumberSlider bumpField;
	5224	+ cNumberSlider bumpField;
4636	5225	JLabel noiseLabel;
4637		- NumberSlider noiseField;
	5226	+ cNumberSlider noiseField;
4638	5227	JLabel powerLabel;
4639		- NumberSlider powerField;
	5228	+ cNumberSlider powerField;
4640	5229	JLabel borderfadeLabel;
4641		- NumberSlider borderfadeField;
	5230	+ cNumberSlider borderfadeField;
4642	5231	JLabel fogLabel;
4643		- NumberSlider fogField;
	5232	+ cNumberSlider fogField;
4644	5233	JLabel opacityPowerLabel;
4645		- NumberSlider opacityPowerField;
4646		- JTree jTree;
	5234	+ cNumberSlider opacityPowerField;
	5235	+ cTree jTree;
4647	5236	//ObjectUI parent;
4648	5237
4649		- NumberSlider normalpushField;
	5238	+ cNumberSlider normalpushField;
	5239	+
	5240	+ private MenuItem importGFDItem;
	5241	+ private MenuItem importVRMLX3DItem;
	5242	+ private MenuItem import3DSItem;
	5243	+ private MenuItem importOBJItem;
4650	5244	}