~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,
..	..	@@ -33,6 +39,67 @@
33	39
34	40	GroupEditor callee;
35	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	+ }
36	103
37	104	// SCRIPT
38	105
..	..	@@ -124,7 +191,7 @@
124	191	void keyPressed(int key, int modifiers)
125	192	{
126	193	System.out.println("KEY PRESSED");
127		- CameraPane.theRenderer.keyPressed(key, modifiers);
	194	+ Globals.theRenderer.keyPressed(key, modifiers);
128	195	}
129	196	*/
130	197
..	..	@@ -136,34 +203,42 @@
136	203	public void closeUI()
137	204	{
138	205	//new Exception().printStackTrace();
139		- System.out.println("this = " + this);
140		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
141	208	//nameField.removeActionListener(this);
142		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
143	210
144		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
145	214	return;
146	215
147		- objEditor.ctrlPanel.remove(liveCB);
148		- objEditor.ctrlPanel.remove(hideCB);
149		- objEditor.ctrlPanel.remove(markCB);
150		-
151		- objEditor.ctrlPanel.remove(randomCB);
152		- objEditor.ctrlPanel.remove(speedupCB);
153		- objEditor.ctrlPanel.remove(rewindCB);
154		-
155		- objEditor.ctrlPanel.remove(resetButton);
156		- objEditor.ctrlPanel.remove(stepButton);
157		-// objEditor.ctrlPanel.remove(stepAllButton);
158		-// objEditor.ctrlPanel.remove(resetAllButton);
159		- objEditor.ctrlPanel.remove(link2masterCB);
160		- //objEditor.ctrlPanel.remove(flipVCB);
161		- //objEditor.ctrlPanel.remove(texresMenu);
162		- objEditor.ctrlPanel.remove(slowerButton);
163		- objEditor.ctrlPanel.remove(fasterButton);
164		- 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);
165	234
166		- 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);
167	242	}
168	243
169	244	public ObjEditor GetEditor()
..	..	@@ -234,6 +309,7 @@
234	309	//localCopy.parent = null;
235	310
236	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
237	313	objEditor = this;
238	314	this.callee = callee;
239	315
..	..	@@ -264,28 +340,49 @@
264	340	return frame.action(event, obj);
265	341	}
266	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	+
267	348	void SetupMenu()
268	349	{
269	350	frame.setMenuBar(menuBar = new MenuBar());
270		- menuBar.add(windowMenu = new Menu("File"));
271		- windowMenu.add(loadItem = new MenuItem("Load..."));
272		- windowMenu.add("-");
273		- windowMenu.add(saveItem = new MenuItem("Save"));
274		- 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..."));
275	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
276		- windowMenu.add("-");
277		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
278		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
279		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
280	376	if (client.parent != null)
281	377	{
282		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
283	379	} else
284	380	{
285		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
286	382	}
287	383
288		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
289	386	saveItem.addActionListener(this);
290	387	saveAsItem.addActionListener(this);
291	388	exportAsItem.addActionListener(this);
..	..	@@ -293,81 +390,66 @@
293	390	//povItem.addActionListener(this);
294	391	closeItem.addActionListener(this);
295	392
296		- menuBar.add(cameraMenu = new Menu("View"));
297		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
298		- //zBufferItem.addActionListener(this);
299		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
300		- //normalLensItem.addActionListener(this);
301		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
302		- revertCameraItem.addActionListener(this);
303		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
304		- toggleTimelineItem.addItemListener(this);
305		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
306		- toggleFullScreenItem.addItemListener(this);
307		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
308		- cameraMenu.add("-");
309		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
310		- toggleTextureItem.addItemListener(this);
311		- toggleTextureItem.setState(CameraPane.textureon);
312		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
313		- toggleLiveItem.addItemListener(this);
314		- toggleLiveItem.setState(Globals.isLIVE());
315		- cameraMenu.add(stepItem = new MenuItem("Step"));
316		- stepItem.addActionListener(this);
317		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
318		-// toggleDLItem.addItemListener(this);
319		-// toggleDLItem.setState(false);
320		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
321		- toggleRenderItem.addItemListener(this);
322		- toggleRenderItem.setState(!CameraPane.frozen);
323		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
324		- toggleDebugItem.addItemListener(this);
325		- toggleDebugItem.setState(CameraPane.DEBUG);
326		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
327		- toggleFrustumItem.addItemListener(this);
328		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
329		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
330		- toggleFootContactItem.addItemListener(this);
331		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
332		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
333		- toggleRandomItem.addItemListener(this);
334		- toggleRandomItem.setState(CameraPane.RANDOM);
335		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
336		- toggleHandleItem.addItemListener(this);
337		- toggleHandleItem.setState(CameraPane.HANDLES);
338		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
339		- togglePaintItem.addItemListener(this);
340		- togglePaintItem.setState(CameraPane.PAINTMODE);
341		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
342		-// toggleRootItem.addItemListener(this);
343		-// toggleRootItem.setState(false);
344		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
345		-// animationItem.addItemListener(this);
346		-// animationItem.setState(CameraPane.ANIMATION);
347		- cameraMenu.add("-");
348		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
349		- editCameraItem.addActionListener(this);
350		-
351	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	+
352	420	toolbarPanel = new JPanel();
353	421	toolbarPanel.setName("Toolbar");
354		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
355	423	treePanel.setName("Tree");
356		- ctrlPanel = new JPanel(); // new GridBagLayout());
357		- ctrlPanel.setName("Edit");
358		- 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);
359	438	materialPanel.setName("Material");
	439	+
360	440	/JTextPane/
361	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
362	444	infoarea.setEditable(true);
363	445	SetText();
364	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365	447	// infoarea.setOpaque(false);
366	448	// //infoarea.setForeground(textcolor);
367		- infoarea.setLineWrap(true);
368		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
369	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
371	453	infoPanel.setName("Info");
372	454	//infoPanel.setLayout(new BorderLayout());
373	455	//infoPanel.add(createTextPane());
..	..	@@ -376,16 +458,23 @@
376	458	mainPanel.setName("Main");
377	459	mainPanel.setContinuousLayout(true);
378	460	mainPanel.setOneTouchExpandable(true);
379		- mainPanel.setDividerLocation(1.0);
380	461	mainPanel.setDividerSize(9);
381		- mainPanel.setResizeWeight(0);
382		-
	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	+
383	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384	473	//mainPanel.setLayout(new GridBagLayout());
385	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386		- treePanel.setLayout(new GridBagLayout());
387		- ctrlPanel.setLayout(new GridBagLayout());
388		- materialPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
	477	+ //materialPanel.setLayout(new GridBagLayout());
389	478
390	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391	480	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -424,7 +513,7 @@
424	513	static String newline = "\n";
425	514	protected static final String buttonString = "JButton";
426	515	StyledDocument doc;
427		- JTextArea infoarea;
	516	+ JTextPane infoarea;
428	517
429	518	void ClearInfo()
430	519	{
..	..	@@ -447,10 +536,10 @@
447	536	e.printStackTrace();
448	537	}
449	538
450		- String selection = infoarea.getText();
451		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
452		- java.awt.datatransfer.Clipboard clipboard =
453		- 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();
454	543	//clipboard.setContents(data, data);
455	544	}
456	545
..	..	@@ -473,13 +562,13 @@
473	562	//SendInfo("Name:", "bold");
474	563	if (sel.GetTextures() != null \|\| debug)
475	564	{
476		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
477	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
478	567	if (sel.Size() > 0)
479	568	{
480	569	si.SendInfo("#children = " + sel.Size(), "regular");
481	570	}
482		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
483	572	if (debug)
484	573	{
485	574	try
..	..	@@ -491,7 +580,10 @@
491	580	}
492	581
493	582	if (full)
494		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
495	587
496	588	if (sel.bRep != null)
497	589	{
..	..	@@ -518,7 +610,7 @@
518	610	}
519	611	if (sel.support != null)
520	612	{
521		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
522	614	}
523	615	if (sel.scriptnode != null)
524	616	{
..	..	@@ -589,6 +681,9 @@
589	681	{
590	682	CameraPane.pointflow = (PointFlow) sel;
591	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
592	687	}
593	688	}
594	689
..	..	@@ -604,68 +699,169 @@
604	699	}
605	700	}
606	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	+
607	760	void ToggleFullScreen()
608	761	{
609		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
610	767	{
611		- frame.getContentPane().remove(/"Center",/bigThree);
612		- framePanel.add(bigThree);
613		- 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	+
614	791	} else
615	792	{
616		- frame.getContentPane().remove(/"Center",/framePanel);
617		- framePanel.remove(bigThree);
618		- 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);
619	815	}
620		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
621	817	}
622	818
623		- private JTextArea createTextPane()
	819	+ private JTextPane createTextPane()
624	820	{
625		- String[] initString =
626		- {
627		- "This is an editable JTextPane, ", //regular
628		- "another ", //italic
629		- "styled ", //bold
630		- "text ", //small
631		- "component, ", //large
632		- "which supports embedded components..." + newline,//regular
633		- " " + newline, //button
634		- "...and embedded icons..." + newline, //regular
635		- " ", //icon
636		- newline + "JTextPane is a subclass of JEditorPane that "
637		- + "uses a StyledEditorKit and StyledDocument, and provides "
638		- + "cover methods for interacting with those objects."
639		- };
	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	+// }
640	863
641		- String[] initStyles =
642		- {
643		- "regular", "italic", "bold", "small", "large",
644		- "regular", "button", "regular", "icon",
645		- "regular"
646		- };
647		-
648		- JTextPane textPane = new JTextPane();
649		- textPane.setEditable(true);
650		- /StyledDocument/ doc = textPane.getStyledDocument();
651		- addStylesToDocument(doc);
652		-
653		- try
654		- {
655		- for (int j = 0; j < 2; j++)
656		- {
657		- for (int i = 0; i < initString.length; i++)
658		- {
659		- doc.insertString(doc.getLength(), initString[i],
660		- doc.getStyle(initStyles[i]));
661		- }
662		- }
663		- } catch (BadLocationException ble)
664		- {
665		- System.err.println("Couldn't insert initial text into text pane.");
666		- }
667		-
668		- return new JTextArea(); // textPane;
	864	+ return new JTextPane(); // textPane;
669	865	}
670	866
671	867	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -718,7 +914,7 @@
718	914	protected static ImageIcon createImageIcon(String path,
719	915	String description)
720	916	{
721		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	917	+ java.net.URL imgURL = Grafreed.class.getResource(path);
722	918	if (imgURL != null)
723	919	{
724	920	return new ImageIcon(imgURL, description);
..	..	@@ -750,6 +946,7 @@
750	946	// NumberSlider vDivsField;
751	947	// JCheckBox endcaps;
752	948	JCheckBox liveCB;
	949	+ JCheckBox selectCB;
753	950	JCheckBox hideCB;
754	951	JCheckBox link2masterCB;
755	952	JCheckBox markCB;
..	..	@@ -757,7 +954,12 @@
757	954	JCheckBox speedupCB;
758	955	JCheckBox rewindCB;
759	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
760	961	JComboBox texresMenu;
	962	+
761	963	JButton resetButton;
762	964	JButton stepButton;
763	965	JButton stepAllButton;
..	..	@@ -765,115 +967,87 @@
765	967	JButton slowerButton;
766	968	JButton fasterButton;
767	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;
768	980
769		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	981	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
770	982	{
771	983	JCheckBox cb;
772	984
773		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
774		- oe.aConstraints.gridwidth = 1; // 3;
775		-// oe.aConstraints.weightx = 1;
776		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
777		- 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);
778	986	cb.addItemListener(this);
779		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
780		- oe.aConstraints.gridwidth = 1;
781		- oe.aConstraints.gridx += 1;
782	987
783	988	return cb;
784	989	}
785	990
786		- cButton AddButton(ObjEditor oe, String label)
	991	+ cButton AddButton(cGridBag panel, String label)
787	992	{
788	993	cButton cb;
789	994
790		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
791		- oe.aConstraints.gridwidth = 1;
792		-// oe.aConstraints.weightx = 1;
793		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
794		- 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);
795	996	cb.addActionListener(this);
796		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
797		- oe.aConstraints.gridwidth = 1;
798		- oe.aConstraints.gridx += 1;
799	997
800	998	return cb;
801	999	}
802	1000
803		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1001	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
804	1002	{
805	1003	JComboBox combo;
806	1004
807		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
808		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
809		- oe.aConstraints.gridx += 1;
	1005	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
810	1006	combo.addActionListener(this);
811	1007
812	1008	return combo;
813	1009	}
814	1010
815		- 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)
816	1012	{
817		- NumberSlider combo;
	1013	+ cGridBag control = new cGridBag();
	1014	+
	1015	+ cNumberSlider combo;
818	1016
819	1017	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1018	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 1;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	1019	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1020	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1021	combo.setFloat(current);
833		-
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1022	+
	1023	+ panel.add(control);
	1024	+
	1025	+ return control;
839	1026	}
840	1027
841		- 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)
842	1029	{
843		- NumberSlider combo;
	1030	+ cGridBag control = new cGridBag();
	1031	+
	1032	+ cNumberSlider combo;
844	1033
845	1034	JLabel jlabel = new JLabel(label);
846		-
847		- aConstraints.fill = GridBagConstraints.VERTICAL;
848	1035	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
849		- aConstraints.gridwidth = 2;
850		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
851		- aConstraints.gridx += 1;
852		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
853		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
854		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
855		- aConstraints.gridx += 1;
856		- aConstraints.gridwidth = 1;
857		-
	1036	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1037	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1038	combo.setInteger(current);
859	1039
860		- combo.label = jlabel;
861		-
862		- combo.addChangeListener(this);
863		-
864		- return combo;
	1040	+ panel.add(control);
	1041	+
	1042	+ return control;
865	1043	}
866	1044
867		- JTextArea AddText(JPanel ctrlPanel, String name)
	1045	+ JTextArea AddText(cGridBag ctrlPanel, String name)
868	1046	{
869	1047	JTextArea text;
870	1048
871		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
872		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1049	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874	1050	text.addCaretListener(this);
875		- aConstraints.gridx += 1;
876		- aConstraints.gridwidth = 1;
877	1051
878	1052	return text;
879	1053	}
..	..	@@ -903,9 +1077,16 @@
903	1077	objEditor.ctrlPanel.remove(j);
904	1078	}
905	1079
	1080	+ void Remove(cNumberSlider j)
	1081	+ {
	1082	+ j.removeChangeListener(this);
	1083	+ //objEditor.ctrlPanel.remove(j.label);
	1084	+ objEditor.ctrlPanel.remove(j);
	1085	+ }
	1086	+
906	1087	/*
907	1088	*/
908		- void Return() // ObjEditor oe)
	1089	+ void Return0() // ObjEditor oe)
909	1090	{
910	1091	aConstraints.gridy += 1;
911	1092	aConstraints.gridx = 0;
..	..	@@ -960,37 +1141,76 @@
960	1141
961	1142	void SetupUI2(ObjEditor oe)
962	1143	{
963		-// oe.aConstraints.weightx = 0;
964		-// oe.aConstraints.weighty = 0;
965		-// oe.aConstraints.gridx = 0;
966		-// oe.aConstraints.gridy = 0;
967		- SetupName(oe);
	1144	+ //SetupName(oe);
968	1145
969		- 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)
970	1155	return;
971	1156
972		- liveCB = AddCheckBox(oe, "Live", copy.live);
973		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974		- 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");
975	1163	// Return();
976		- markCB = AddCheckBox(oe, "Mark", copy.marked);
977		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
978		- randomCB = AddCheckBox(oe, "Rand", copy.random);
979		- Return();
980		- resetButton = AddButton(oe, "Reset");
981		- 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");
982	1196	// resetAllButton = AddButton(oe, "Reset All");
983	1197	// stepAllButton = AddButton(oe, "Step All");
984		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
985	1198	// Return();
986		- slowerButton = AddButton(oe, "Slow");
987		- fasterButton = AddButton(oe, "Fast");
988		- 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");
989	1205
990		- Return();
	1206	+ oe.ctrlPanel.add(objectCommandsPanel);
	1207	+ oe.ctrlPanel.Return();
991	1208
992		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993		- 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();
994	1214
995	1215	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
996	1216	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1085,7 +1305,7 @@
1085	1305	oe.aConstraints.gridwidth = 1;
1086	1306	/**/
1087	1307	nameField = AddText(oe.ctrlPanel, copy.GetName());
1088		- Return();
	1308	+ oe.ctrlPanel.Return();
1089	1309
1090	1310	//ctrlPanel.add(textureButton = new Button("Texture..."));
1091	1311	//textureButton.setEnabled(false);
..	..	@@ -1187,9 +1407,13 @@
1187	1407	//JPanel worldPanel =
1188	1408	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1189	1409	//worldPanel.setName("World");
1190		- centralPanel = new JPanel(new BorderLayout());
1191		- timelinePanel = new JPanel(new BorderLayout());
1192		- 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);
1193	1417
1194	1418	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195	1419	cameraPanel.setContinuousLayout(true);
..	..	@@ -1198,7 +1422,10 @@
1198	1422	// cameraPanel.setDividerSize(9);
1199	1423	cameraPanel.setResizeWeight(1.0);
1200	1424
	1425	+ }
	1426	+
1201	1427	centralPanel.add(cameraView);
	1428	+ centralPanel.setFocusable(true);
1202	1429	//frame.setJMenuBar(timelineMenubar);
1203	1430	//centralPanel.add(timelinePanel);
1204	1431
..	..	@@ -1217,12 +1444,13 @@
1217	1444	//frontView.object = copy;
1218	1445	//sideView.object = copy;
1219	1446
1220		- XYZPanel = new JPanel();
1221		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1447	+ XYZPanel = new cGridBag().setVertical(true);
	1448	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1222	1449
1223		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1224		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1225		- 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);
1226	1454
1227	1455	/*
1228	1456	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1260,11 +1488,16 @@
1260	1488	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1261	1489	//tmp.setName("Edit");
1262	1490	objectPanel.add(materialPanel);
1263		- JPanel north = new JPanel(new BorderLayout());
1264		- north.setName("Edit");
1265		- north.add(ctrlPanel, BorderLayout.NORTH);
1266		- objectPanel.add(north);
1267		- 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);
1268	1501
1269	1502	/*
1270	1503	aConstraints.gridx = 0;
..	..	@@ -1273,7 +1506,7 @@
1273	1506	aConstraints.gridy += 1;
1274	1507	aConstraints.gridwidth = 1;
1275	1508	mainPanel.add(objectPanel, aConstraints);
1276		- */
	1509	+ */
1277	1510
1278	1511	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1279	1512	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1284,16 +1517,23 @@
1284	1517	scrollpane.setWheelScrollingEnabled(true);
1285	1518	scrollpane.addMouseWheelListener(this); // Default not fast enough
1286	1519
1287		- /JTabbedPane/ scenePanel = new JTabbedPane();
1288		- scenePanel.add(scrollpane);
	1520	+ /JTabbedPane/ scenePanel = new cGridBag();
	1521	+ scenePanel.preferredWidth = 6;
	1522	+
	1523	+ JTabbedPane tabbedPane = new JTabbedPane();
	1524	+ tabbedPane.add(scrollpane);
1289	1525
1290		- scenePanel.add(FSPane = new cFileSystemPane(this));
1291		-
1292		- optionsPanel = new JPanel(new GridBagLayout());
	1526	+ optionsPanel = new cGridBag().setVertical(false);
1293	1527
1294	1528	optionsPanel.setName("Options");
1295		- scenePanel.add(optionsPanel);
	1529	+
	1530	+ AddOptions(optionsPanel); //, aConstraints);
	1531	+
	1532	+ tabbedPane.add(optionsPanel);
	1533	+
	1534	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1296	1535
	1536	+ scenePanel.add(tabbedPane);
1297	1537
1298	1538	/*
1299	1539	cTree jTree = new cTree(null);
..	..	@@ -1327,6 +1567,7 @@
1327	1567	//bigPanel.setSize(new Dimension(10,10));
1328	1568	//bigPanel.add(ctrlPanel);
1329	1569	//bigPanel.add(gridPanel);
	1570	+ /**
1330	1571	bigThree = new JPanel();
1331	1572	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1332	1573	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1350,7 +1591,13 @@
1350	1591	// aConstraints.gridheight = 3;
1351	1592	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1352	1593	bigThree.add(XYZPanel, aWindowConstraints);
	1594	+ /**/
1353	1595
	1596	+ bigThree = new cGridBag();
	1597	+ bigThree.addComponent(scenePanel);
	1598	+ bigThree.addComponent(centralPanel);
	1599	+ bigThree.addComponent(XYZPanel);
	1600	+
1354	1601	// // SIDE EFFECT!!!
1355	1602	// aConstraints.gridx = 0;
1356	1603	// aConstraints.gridy = 0;
..	..	@@ -1358,9 +1605,9 @@
1358	1605	// aConstraints.gridheight = 1;
1359	1606
1360	1607	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1361		- framePanel.setContinuousLayout(true);
1362		- framePanel.setOneTouchExpandable(true);
1363		- framePanel.setDividerLocation(0.8);
	1608	+ framePanel.setContinuousLayout(false);
	1609	+ framePanel.setOneTouchExpandable(false);
	1610	+ //.setDividerLocation(0.8);
1364	1611	//framePanel.setDividerSize(15);
1365	1612	//framePanel.setResizeWeight(0.15);
1366	1613	framePanel.setName("Frame");
..	..	@@ -1377,10 +1624,15 @@
1377	1624
1378	1625	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1379	1626
1380		- frame.setSize(1024, 768);
1381		- frame.show();
1382		-
	1627	+ frame.setSize(1280, 860);
	1628	+
	1629	+ cameraView.requestFocusInWindow();
	1630	+
1383	1631	gridPanel.setDividerLocation(1.0);
	1632	+
	1633	+ frame.validate();
	1634	+
	1635	+ frame.setVisible(true);
1384	1636
1385	1637	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1386	1638	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1393,6 +1645,10 @@
1393	1645	});
1394	1646	}
1395	1647
	1648	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1649	+ {
	1650	+ }
	1651	+
1396	1652	JTree GetTree()
1397	1653	{
1398	1654	return objEditor.jTree;
..	..	@@ -1404,260 +1660,161 @@
1404	1660	ctrlPanel.removeAll();
1405	1661	}
1406	1662
1407		- void SetupMaterial(JPanel ctrlPanel)
	1663	+ void SetupMaterial(cGridBag panel)
1408	1664	{
1409		- aConstraints.weighty = 0;
1410		- //aConstraints.weightx = 1;
1411		- /*
	1665	+ /*
1412	1666	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1413	1667	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1414		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1415		- aConstraints.gridx += 1;
1416	1668	*/
1417	1669
1418		- aConstraints.gridwidth = 1;
1419		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1420		- aConstraints.gridx += 1;
1421		- aConstraints.weighty = 0;
1422		- 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");
1423	1674
1424	1675	/*
1425	1676	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1426		- aConstraints.gridx += 1;
1427		- aConstraints.weighty = 0;
1428		- aConstraints.gridwidth = 1;
1429	1677	*/
1430	1678
1431		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1432		- 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	+ }
1433	1688
1434		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1435		-
1436		- aConstraints.gridx += 1;
1437		-
1438		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1439		-
1440		- aConstraints.gridx += 1;
1441		-
1442		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1443		-
1444		- aConstraints.gridx = 0;
1445		- aConstraints.gridy += 1;
1446		- aConstraints.weighty = 0;
1447		- aConstraints.gridwidth = 1;
	1689	+ editBar.preferredHeight = 15;
	1690	+
	1691	+ panel.add(editBar);
	1692	+
1448	1693	/**/
1449	1694	//aConstraints.weighty = 0;
1450	1695	////aConstraints.weightx = 1;
1451	1696	//aConstraints.weighty = 1;
1452	1697	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1453	1698	//aConstraints.gridx += 1;
1454		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1455		- aConstraints.weighty = 0;
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- aConstraints.gridwidth = 1;
	1699	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1459	1700
1460		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1461		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- //aConstraints.weightx = 0;
1466		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- 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);
1470	1709
1471		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1472		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- 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);
1480	1715
1481		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1482		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484		- aConstraints.gridx += 1;
1485		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487		- aConstraints.gridx = 0;
1488		- aConstraints.gridy += 1;
1489		- 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);
1490	1721
1491		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1492		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494		- aConstraints.gridx += 1;
1495		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497		- aConstraints.gridx = 0;
1498		- aConstraints.gridy += 1;
1499		- 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);
1500	1735
1501		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1502		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504		- aConstraints.gridx += 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1507		- aConstraints.gridx = 0;
1508		- aConstraints.gridy += 1;
1509		- 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);
1510	1741
1511		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1512		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1513		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1514		- aConstraints.gridx += 1;
1515		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1516		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1517		- aConstraints.gridx = 0;
1518		- aConstraints.gridy += 1;
1519		- 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);
1520	1747
1521		- //aConstraints.weighty = 1;
1522		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1523		- //aConstraints.gridx += 1;
1524		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1525		- aConstraints.weighty = 0;
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- 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);
1529	1753
1530		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1531		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- 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);
1539	1759
1540		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1541		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- 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);
1549	1765
1550		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1551		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- 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);
1559	1771
1560		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1561		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563		- aConstraints.gridx += 1;
1564		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1566		- aConstraints.gridx = 0;
1567		- aConstraints.gridy += 1;
1568		- 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);
1569	1777
1570		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1571		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573		- aConstraints.gridx += 1;
1574		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1576		- aConstraints.gridx = 0;
1577		- aConstraints.gridy += 1;
1578		- 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);
1579	1785
1580		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1581		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583		- aConstraints.gridx += 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1586		- aConstraints.gridx = 0;
1587		- aConstraints.gridy += 1;
1588		- 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);
1589	1791
1590		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1591		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1592		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1593		- aConstraints.gridx += 1;
1594		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1595		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1596		- aConstraints.gridx = 0;
1597		- aConstraints.gridy += 1;
1598		- 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);
1599	1797
1600		- //aConstraints.weighty = 1;
1601		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1602		- //aConstraints.gridx += 1;
1603		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1604		- aConstraints.weighty = 0;
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- 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);
1608	1803
1609		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1610		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- 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);
1618	1809
1619		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1620		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622		- aConstraints.gridx += 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1625		- aConstraints.gridx = 0;
1626		- aConstraints.gridy += 1;
1627		- 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);
1628	1815
1629		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1630		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632		- aConstraints.gridx += 1;
1633		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
1638		-
1639		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1640		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
1648		-
1649		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1650		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- aConstraints.gridwidth = 1;
1658		-
1659		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1660		- Return();
	1816	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1817	+ //Return();
1661	1818	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1662	1819	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663	1820	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1668,130 +1825,105 @@
1668	1825	// aConstraints.gridy += 1;
1669	1826	// aConstraints.gridwidth = 1;
1670	1827
1671		- //aConstraints.weighty = 1;
1672		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1673		- //aConstraints.gridx += 1;
1674		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1675		- aConstraints.weighty = 0;
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- 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);
1679	1833
1680		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1681		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- 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);
1689	1839
1690		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1691		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
1699	1840
1700		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1701		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- 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);
1709	1848
1710		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1711		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- aConstraints.gridwidth = 1;
1719		- 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);
1720	1854
1721		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1722		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- 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);
1730	1860
1731		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1732		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- 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);
1740	1866
1741		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1742		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744		- aConstraints.gridx += 1;
1745		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy += 1;
1749		- 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);
1750	1872
1751		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1752		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754		- aConstraints.gridx += 1;
1755		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1757		- aConstraints.gridx = 0;
1758		- aConstraints.gridy += 1;
1759		- 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);
1760	1880
1761		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1762		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764		- aConstraints.gridx += 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1767		- aConstraints.gridx = 0;
1768		- aConstraints.gridy += 1;
1769		- 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);
1770	1886
1771		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1772		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1773		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1774		- aConstraints.gridx += 1;
1775		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1776		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1777		- aConstraints.gridx = 0;
1778		- aConstraints.gridy += 1;
1779		- 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);
1780	1892
1781		- //aConstraints.weighty = 1;
1782		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1783		- //aConstraints.gridx += 1;
1784		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1785		- 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);
1786	1898
1787		- aConstraints.gridx = 0;
1788		- aConstraints.gridy = 0;
1789		- 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);
1790	1922
1791	1923	SetMaterial(copy); // .GetMaterial());
1792	1924
1793		- colorField.addChangeListener(this);
1794		- modulationField.addChangeListener(this);
	1925	+ //colorField.addChangeListener(this);
	1926	+// modulationField.addChangeListener(this);
1795	1927	metalnessField.addChangeListener(this);
1796	1928	diffuseField.addChangeListener(this);
1797	1929	specularField.addChangeListener(this);
..	..	@@ -1821,12 +1953,15 @@
1821	1953	opacityPowerField.addChangeListener(this);
1822	1954	/**/
1823	1955
1824		- resetSlidersButton.addActionListener(this);
1825	1956	clearMaterialButton.addActionListener(this);
1826	1957	createMaterialButton.addActionListener(this);
1827		-
1828		- propagateToggle.addItemListener(this);
1829		- multiplyToggle.addItemListener(this);
	1958	+
	1959	+ if (Globals.ADVANCED)
	1960	+ {
	1961	+ resetSlidersButton.addActionListener(this);
	1962	+ propagateToggle.addItemListener(this);
	1963	+ multiplyToggle.addItemListener(this);
	1964	+ }
1830	1965	}
1831	1966
1832	1967	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1844,8 +1979,9 @@
1844	1979	// 3D models
1845	1980	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1846	1981	{
1847		- lastConverter = new com.jmex.model.converters.MaxToJme();
1848		- LoadFile(filename, lastConverter);
	1982	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1983	+ //LoadFile(filename, lastConverter);
	1984	+ LoadObjFile(filename); // New 3ds loader
1849	1985	continue;
1850	1986	}
1851	1987	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1997,7 +2133,7 @@
1997	2133
1998	2134	//? flashIt = false;
1999	2135	CameraPane pane = (CameraPane) cameraView;
2000		- pane.clickStart(location.x, location.y, 0);
	2136	+ pane.clickStart(location.x, location.y, 0, 0);
2001	2137	pane.clickEnd(location.x, location.y, 0, true);
2002	2138
2003	2139	if (group.selection.size() == 1)
..	..	@@ -2046,6 +2182,7 @@
2046	2182	e2.printStackTrace();
2047	2183	}
2048	2184	}
	2185	+
2049	2186	LoadJMEThread loadThread;
2050	2187
2051	2188	class LoadJMEThread extends Thread
..	..	@@ -2103,6 +2240,7 @@
2103	2240	//LoadFile0(filename, converter);
2104	2241	}
2105	2242	}
	2243	+
2106	2244	LoadOBJThread loadObjThread;
2107	2245
2108	2246	class LoadOBJThread extends Thread
..	..	@@ -2181,19 +2319,19 @@
2181	2319
2182	2320	void LoadObjFile(String fullname)
2183	2321	{
2184		- /*
	2322	+ System.out.println("Loading " + fullname);
	2323	+ /**/
2185	2324	//lastFilename = fullname;
2186	2325	if(loadObjThread == null)
2187	2326	{
2188		- loadObjThread = new LoadOBJThread();
2189		- loadObjThread.start();
	2327	+ loadObjThread = new LoadOBJThread();
	2328	+ loadObjThread.start();
2190	2329	}
2191	2330
2192	2331	loadObjThread.add(fullname);
2193		- */
	2332	+ /**/
2194	2333
2195		- System.out.println("Loading " + fullname);
2196		- makeSomething(new FileObject(fullname, true), true);
	2334	+ //makeSomething(new FileObject(fullname, true), true);
2197	2335	}
2198	2336
2199	2337	void LoadGFDFile(String fullname)
..	..	@@ -2454,11 +2592,11 @@
2454	2592
2455	2593	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2456	2594	{
2457		- if (GrafreeD.standAlone)
	2595	+ if (Grafreed.standAlone)
2458	2596	{
2459	2597	/**/
2460	2598	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2461		- browser.show();
	2599	+ browser.setVisible(true);
2462	2600	String filename = browser.getFile();
2463	2601	if (filename != null && filename.length() > 0)
2464	2602	{
..	..	@@ -2569,6 +2707,7 @@
2569	2707	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2570	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2571	2709	}
	2710	+
2572	2711	//cJME.count++;
2573	2712	//cJME.count %= 12;
2574	2713	if (gc)
..	..	@@ -2603,6 +2742,7 @@
2603	2742	}
2604	2743	if (input == null)
2605	2744	{
	2745	+ new Exception().printStackTrace();
2606	2746	System.exit(0);
2607	2747	}
2608	2748
..	..	@@ -2751,6 +2891,7 @@
2751	2891	}
2752	2892	}
2753	2893	}
	2894	+
2754	2895	cFileSystemPane FSPane;
2755	2896
2756	2897	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2804,11 +2945,14 @@
2804	2945	}
2805	2946	}
2806	2947	}
	2948	+
2807	2949	freezematerial = false;
2808	2950	}
2809	2951
2810	2952	void SetMaterial(Object3D object)
2811	2953	{
	2954	+ latestObject = object;
	2955	+
2812	2956	cMaterial mat = object.material;
2813	2957
2814	2958	if (mat == null)
..	..	@@ -2817,7 +2961,8 @@
2817	2961	return;
2818	2962	}
2819	2963
2820		- multiplyToggle.setSelected(mat.multiply);
	2964	+ if (multiplyToggle != null)
	2965	+ multiplyToggle.setSelected(mat.multiply);
2821	2966
2822	2967	assert (object.projectedVertices != null);
2823	2968
..	..	@@ -2919,12 +3064,17 @@
2919	3064	// }
2920	3065
2921	3066	/**/
2922		- if (deselect)
	3067	+ if (deselect \|\| child == null)
2923	3068	{
2924	3069	//group.deselectAll();
2925	3070	//freeze = true;
2926	3071	GetTree().clearSelection();
2927	3072	//freeze = false;
	3073	+
	3074	+ if (child == null)
	3075	+ {
	3076	+ return;
	3077	+ }
2928	3078	}
2929	3079
2930	3080	//group.addSelectee(child);
..	..	@@ -2993,7 +3143,7 @@
2993	3143	cameraView.ToggleDL();
2994	3144	cameraView.repaint();
2995	3145	return;
2996		- } else if (event.getSource() == toggleTextureItem)
	3146	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2997	3147	{
2998	3148	cameraView.ToggleTexture();
2999	3149	// june 2013 copy.HardTouch();
..	..	@@ -3032,9 +3182,9 @@
3032	3182	frame.validate();
3033	3183
3034	3184	return;
3035		- } else if (event.getSource() == toggleRandomItem)
	3185	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3036	3186	{
3037		- cameraView.ToggleRandom();
	3187	+ cameraView.ToggleSwitch();
3038	3188	cameraView.repaint();
3039	3189	return;
3040	3190	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3063,6 +3213,10 @@
3063	3213	{
3064	3214	copy.live ^= true;
3065	3215	return;
	3216	+ } else if (event.getSource() == selectCB)
	3217	+ {
	3218	+ copy.dontselect ^= true;
	3219	+ return;
3066	3220	} else if (event.getSource() == hideCB)
3067	3221	{
3068	3222	copy.hide ^= true;
..	..	@@ -3077,6 +3231,7 @@
3077	3231	if (event.getSource() == randomCB)
3078	3232	{
3079	3233	copy.random ^= true;
	3234	+ objEditor.refreshContents();
3080	3235	return;
3081	3236	}
3082	3237	if (event.getSource() == speedupCB)
..	..	@@ -3100,8 +3255,9 @@
3100	3255
3101	3256	public void actionPerformed(ActionEvent event)
3102	3257	{
	3258	+ Object source = event.getSource();
3103	3259	// SCRIPT DIALOG
3104		- if (event.getSource() == okbutton)
	3260	+ if (source == okbutton)
3105	3261	{
3106	3262	textpanel.setVisible(false);
3107	3263	textpanel.remove(textarea);
..	..	@@ -3113,7 +3269,7 @@
3113	3269	textarea = null;
3114	3270	textpanel = null;
3115	3271	}
3116		- if (event.getSource() == cancelbutton)
	3272	+ if (source == cancelbutton)
3117	3273	{
3118	3274	textpanel.setVisible(false);
3119	3275	textpanel.remove(textarea);
..	..	@@ -3125,50 +3281,50 @@
3125	3281	//applySelf();
3126	3282	//client.refreshEditWindow();
3127	3283	//refreshContents();
3128		- if (event.getSource() == nameField)
	3284	+ if (source == nameField)
3129	3285	{
3130	3286	//System.out.println("ObjEditor " + event);
3131	3287	applySelf0(true);
3132	3288	//parent.applySelf();
3133	3289	objEditor.refreshContents();
3134		- } else if (event.getSource() == resetButton)
	3290	+ } else if (source == resetButton)
3135	3291	{
3136	3292	CameraPane.fullreset = true;
3137	3293	copy.Reset(); // ResetMeshes();
3138	3294	copy.Touch();
3139	3295	objEditor.refreshContents();
3140		- } else if (event.getSource() == stepItem)
	3296	+ } else if (source == stepItem)
3141	3297	{
3142	3298	//cameraView.ONESTEP = true;
3143	3299	Globals.ONESTEP = true;
3144	3300	cameraView.repaint();
3145	3301	return;
3146		- } else if (event.getSource() == stepButton)
	3302	+ } else if (source == stepButton)
3147	3303	{
3148	3304	copy.Step();
3149	3305	copy.Touch();
3150	3306	objEditor.refreshContents();
3151		- } else if (event.getSource() == slowerButton)
	3307	+ } else if (source == slowerButton)
3152	3308	{
3153	3309	copy.Slower();
3154	3310	copy.Touch();
3155	3311	objEditor.refreshContents();
3156		- } else if (event.getSource() == fasterButton)
	3312	+ } else if (source == fasterButton)
3157	3313	{
3158	3314	copy.Faster();
3159	3315	copy.Touch();
3160	3316	objEditor.refreshContents();
3161		- } else if (event.getSource() == remarkButton)
	3317	+ } else if (source == remarkButton)
3162	3318	{
3163	3319	copy.Remark();
3164	3320	copy.Touch();
3165	3321	objEditor.refreshContents();
3166		- } else if (event.getSource() == stepAllButton)
	3322	+ } else if (source == stepAllButton)
3167	3323	{
3168	3324	copy.StepAll();
3169	3325	copy.Touch();
3170	3326	objEditor.refreshContents();
3171		- } else if (event.getSource() == resetAllButton)
	3327	+ } else if (source == resetAllButton)
3172	3328	{
3173	3329	//CameraPane.fullreset = true;
3174	3330	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3201,53 +3357,79 @@
3201	3357	// Close();
3202	3358	// }
3203	3359	// else
3204		- if (event.getSource() == resetSlidersButton)
	3360	+ if (source == resetSlidersButton)
3205	3361	{
3206	3362	ResetSliders();
3207		- } else if (event.getSource() == clearMaterialButton)
	3363	+ } else if (source == clearMaterialButton)
3208	3364	{
3209	3365	ClearMaterial();
3210		- } else if (event.getSource() == createMaterialButton)
	3366	+ } else if (source == createMaterialButton)
3211	3367	{
3212	3368	CreateMaterial();
3213		- } else if (event.getSource() == clearPanelButton)
	3369	+ } else if (source == clearPanelButton)
3214	3370	{
3215	3371	copy.ClearUI();
3216	3372	refreshContents(true);
3217		- } /*
3218		- }
3219		-
3220		- public boolean action(Event event, Object arg)
3221		- {
3222		- */ 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)
3223	3398	{
3224	3399	Close();
3225	3400	//return true;
3226		- } else if (event.getSource() == loadItem)
	3401	+ } else if (source == openItem)
3227	3402	{
3228		- load();
	3403	+ Open();
3229	3404	//return true;
3230		- } else if (event.getSource() == saveItem)
	3405	+ } else if (source == newItem)
	3406	+ {
	3407	+ New();
	3408	+ } else if (source == saveItem)
3231	3409	{
3232	3410	save();
3233	3411	//return true;
3234		- } else if (event.getSource() == saveAsItem)
	3412	+ } else if (source == saveAsItem)
3235	3413	{
3236	3414	saveAs();
3237	3415	//return true;
3238		- } else if (event.getSource() == reexportItem)
	3416	+ } else if (source == reexportItem)
3239	3417	{
3240	3418	reexport();
3241	3419	//return true;
3242		- } else if (event.getSource() == exportAsItem)
	3420	+ } else if (source == exportAsItem)
3243	3421	{
3244	3422	export();
3245	3423	//return true;
3246		- } else if (event.getSource() == povItem)
	3424	+ } else if (source == povItem)
3247	3425	{
3248	3426	generatePOV();
3249	3427	//return true;
3250		- } else if (event.getSource() == zBufferItem)
	3428	+ } else if (event.getSource() == archiveItem)
	3429	+ {
	3430	+ cTools.Archive(frame);
	3431	+ return;
	3432	+ } else if (source == zBufferItem)
3251	3433	{
3252	3434	try
3253	3435	{
..	..	@@ -3269,21 +3451,8 @@
3269	3451	cameraView.repaint();
3270	3452	//return true;
3271	3453	}
3272		- */ else if (event.getSource() == editCameraItem)
3273		- {
3274		- cameraView.ProtectCamera();
3275		- cameraView.repaint();
3276		- return;
3277		- } else if (event.getSource() == revertCameraItem)
3278		- {
3279		- cameraView.RevertCamera();
3280		- cameraView.repaint();
3281		- return;
3282		-// } else if (event.getSource() == textureButton)
3283		-// {
3284		-// return; // true;
3285		- } else // combos...
3286		- if (event.getSource() == texresMenu)
	3454	+ */ else // combos...
	3455	+ if (source == texresMenu)
3287	3456	{
3288	3457	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3289	3458	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3295,27 +3464,353 @@
3295	3464	}
3296	3465	}
3297	3466
3298		- void ToggleAnimation()
	3467	+ void New()
3299	3468	{
3300		- if (!CameraPane.ANIMATION)
	3469	+ while (copy.Size() > 1)
3301	3470	{
3302		- 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);
3303	3764	browser.show();
3304	3765	String filename = browser.getFile();
3305	3766	if (filename != null && filename.length() > 0)
3306	3767	{
3307		- 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;
3308	3803	//CameraPane.framecount = 0;
3309		- CameraPane.imagecount = 0;
	3804	+ Globals.imagecount = 0;
3310	3805
3311		- CameraPane.ANIMATION ^= true;
	3806	+ Globals.ANIMATION ^= true;
3312	3807
3313		- GrafreeD.wav.cursor = 0;
3314		- GrafreeD.wav.loop = 0;
	3808	+ Grafreed.wav.cursor = 0;
	3809	+ Grafreed.wav.loop = 0;
3315	3810	}
3316	3811	} else
3317	3812	{
3318		- CameraPane.ANIMATION ^= true;
	3813	+ Globals.ANIMATION ^= true;
3319	3814	}
3320	3815	}
3321	3816
..	..	@@ -3361,7 +3856,7 @@
3361	3856	void CreateMaterial()
3362	3857	{
3363	3858	//copy.ClearMaterial(); // PATCH
3364		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3859	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3365	3860	if (copy.selection.size() > 0)
3366	3861	//SetMaterial(copy);
3367	3862	{
..	..	@@ -3412,7 +3907,7 @@
3412	3907	assert false;
3413	3908	}
3414	3909
3415		- void EditSelection()
	3910	+ void EditSelection(boolean newWindow)
3416	3911	{
3417	3912	}
3418	3913
..	..	@@ -3420,11 +3915,11 @@
3420	3915	{
3421	3916	copy.ResetBlockLoop(); // temporary problem
3422	3917
3423		- boolean random = CameraPane.RANDOM;
3424		- CameraPane.RANDOM = false; // parse everything
	3918	+ boolean random = CameraPane.SWITCH;
	3919	+ CameraPane.SWITCH = false; // parse everything
3425	3920	copy.ResetDisplayList();
3426	3921	copy.HardTouch();
3427		- CameraPane.RANDOM = random;
	3922	+ CameraPane.SWITCH = random;
3428	3923	}
3429	3924
3430	3925	// public void applySelf()
..	..	@@ -3494,10 +3989,40 @@
3494	3989	current.fakedepth = (float) fakedepthField.getFloat();
3495	3990	current.shadowbias = (float) shadowbiasField.getFloat();
3496	3991
3497		- if (!NumberSlider.frozen)
	3992	+ if (!cNumberSlider.frozen)
3498	3993	{
3499	3994	//System.out.println("Propagate = " + propagate);
3500	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	+
3501	4026	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3502	4027	{
3503	4028	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3542,6 +4067,7 @@
3542	4067	\|\| e.getSource() == apertureField
3543	4068	\|\| e.getSource() == shadowblurField)
3544	4069	{
	4070	+ new Exception().printStackTrace();
3545	4071	System.exit(0);
3546	4072	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3547	4073	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3612,7 +4138,7 @@
3612	4138	}
3613	4139
3614	4140	if (normalpushField != null)
3615		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4141	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3616	4142	}
3617	4143
3618	4144	void SnapObject()
..	..	@@ -3867,7 +4393,7 @@
3867	4393
3868	4394	radioPanel.revalidate();
3869	4395	radioPanel.repaint();
3870		- ctrlPanel.revalidate(); // ? new
	4396	+ ctrlPanel.validate(); // ? new
3871	4397	ctrlPanel.repaint();
3872	4398	}
3873	4399	}
..	..	@@ -3876,6 +4402,8 @@
3876	4402
3877	4403	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3878	4404	{
	4405	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4406	+ Save();
3879	4407	//Tween.set(thing, 0).target(1).start(tweenManager);
3880	4408	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3881	4409	// if (thing instanceof GenericJointDemo)
..	..	@@ -3962,6 +4490,12 @@
3962	4490	{
3963	4491	ResetModel();
3964	4492	Select(thing.GetTreePath(), true, false); // unselect... false);
	4493	+
	4494	+ if (thing.Size() == 0)
	4495	+ {
	4496	+ //EditSelection(false);
	4497	+ }
	4498	+
3965	4499	refreshContents();
3966	4500	}
3967	4501
..	..	@@ -4079,6 +4613,7 @@
4079	4613	}
4080	4614	}
4081	4615	}
	4616	+
4082	4617	LoadGFDThread loadGFDThread;
4083	4618
4084	4619	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4098,8 +4633,10 @@
4098	4633
4099	4634	try
4100	4635	{
	4636	+ // Try compressed version first.
4101	4637	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4102		- 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);
4103	4640
4104	4641	readobj = (Object3D) p.readObject();
4105	4642	istream.close();
..	..	@@ -4107,7 +4644,20 @@
4107	4644	readobj.ResetDisplayList();
4108	4645	} catch (Exception e)
4109	4646	{
4110		- 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	+ }
4111	4661	}
4112	4662	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4113	4663	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4153,6 +4703,12 @@
4153	4703
4154	4704	void LoadIt(Object obj)
4155	4705	{
	4706	+ if (obj == null)
	4707	+ {
	4708	+ // Invalid file
	4709	+ return;
	4710	+ }
	4711	+
4156	4712	System.out.println("Loaded " + obj);
4157	4713	//new Exception().printStackTrace();
4158	4714	Object3D readobj = (Object3D) obj;
..	..	@@ -4162,6 +4718,8 @@
4162	4718
4163	4719	if (readobj != null)
4164	4720	{
	4721	+ if (Globals.SAVEONMAKE)
	4722	+ Save();
4165	4723	try
4166	4724	{
4167	4725	//readobj.deepCopySelf(copy);
..	..	@@ -4222,9 +4780,9 @@
4222	4780	}
4223	4781	}
4224	4782
4225		- void load() // throws ClassNotFoundException
	4783	+ void Open() // throws ClassNotFoundException
4226	4784	{
4227		- if (GrafreeD.standAlone)
	4785	+ if (Grafreed.standAlone)
4228	4786	{
4229	4787	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4230	4788	browser.show();
..	..	@@ -4311,11 +4869,13 @@
4311	4869	try
4312	4870	{
4313	4871	FileOutputStream ostream = new FileOutputStream(lastname);
4314		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4872	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4873	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4315	4874
4316	4875	p.writeObject(copy);
4317	4876	p.flush();
4318	4877
	4878	+ zstream.close();
4319	4879	ostream.close();
4320	4880
4321	4881	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4325,17 +4885,20 @@
4325	4885	{
4326	4886	}
4327	4887	}
	4888	+
4328	4889	String lastname;
4329	4890
4330	4891	void saveAs()
4331	4892	{
4332		- if (GrafreeD.standAlone)
	4893	+ if (Grafreed.standAlone)
4333	4894	{
4334	4895	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4335	4896	browser.setVisible(true);
4336	4897	String filename = browser.getFile();
4337	4898	if (filename != null && filename.length() > 0)
4338	4899	{
	4900	+ if (!filename.endsWith(".gfd"))
	4901	+ filename += ".gfd";
4339	4902	lastname = browser.getDirectory() + filename;
4340	4903	save();
4341	4904	}
..	..	@@ -4434,13 +4997,13 @@
4434	4997	try
4435	4998	{
4436	4999	FileOutputStream ostream = new FileOutputStream(filename);
4437		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4438		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5000	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5001	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4439	5002
4440	5003	Object3D objectparent = obj.parent;
4441	5004	obj.parent = null;
4442	5005
4443		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5006	+ Object3D object = (Object3D) Grafreed.clone(obj);
4444	5007
4445	5008	obj.parent = objectparent;
4446	5009
..	..	@@ -4452,8 +5015,8 @@
4452	5015	p.writeObject(object);
4453	5016	p.flush();
4454	5017
	5018	+ zstream.close();
4455	5019	ostream.close();
4456		- // zstream.close();
4457	5020
4458	5021	// group.selection.get(0).parent = parent;
4459	5022	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4474,7 +5037,7 @@
4474	5037	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4475	5038	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4476	5039	copy.generatePOV(buffer);
4477		- if (GrafreeD.standAlone)
	5040	+ if (Grafreed.standAlone)
4478	5041	{
4479	5042	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4480	5043	browser.show();
..	..	@@ -4500,21 +5063,20 @@
4500	5063	Object3D client;
4501	5064	Object3D copy;
4502	5065	MenuBar menuBar;
4503		- Menu windowMenu;
4504		- MenuItem loadItem;
	5066	+ Menu fileMenu;
	5067	+ MenuItem newItem;
	5068	+ MenuItem openItem;
4505	5069	MenuItem saveItem;
4506	5070	MenuItem saveAsItem;
4507	5071	MenuItem exportAsItem;
4508	5072	MenuItem reexportItem;
4509	5073	MenuItem povItem;
4510	5074	MenuItem closeItem;
4511		- Menu cameraMenu;
	5075	+
4512	5076	CheckboxMenuItem zBufferItem;
4513	5077	//MenuItem normalLensItem;
4514		- MenuItem editCameraItem;
4515		- MenuItem revertCameraItem;
4516		- CheckboxMenuItem toggleLiveItem;
4517	5078	MenuItem stepItem;
	5079	+ CheckboxMenuItem toggleLiveItem;
4518	5080	CheckboxMenuItem toggleFullScreenItem;
4519	5081	CheckboxMenuItem toggleTimelineItem;
4520	5082	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4523,28 +5085,42 @@
4523	5085	CheckboxMenuItem toggleFootContactItem;
4524	5086	CheckboxMenuItem toggleDLItem;
4525	5087	CheckboxMenuItem toggleTextureItem;
4526		- CheckboxMenuItem toggleRandomItem;
	5088	+ CheckboxMenuItem toggleSwitchItem;
4527	5089	CheckboxMenuItem toggleRootItem;
4528	5090	CheckboxMenuItem animationItem;
	5091	+ MenuItem archiveItem;
4529	5092	CheckboxMenuItem toggleHandleItem;
4530	5093	CheckboxMenuItem togglePaintItem;
4531	5094	JSplitPane mainPanel;
4532	5095	JScrollPane scrollpane;
	5096	+
4533	5097	JPanel toolbarPanel;
4534		- JPanel treePanel;
	5098	+
	5099	+ cGridBag treePanel;
	5100	+
4535	5101	JPanel radioPanel;
4536	5102	ButtonGroup buttonGroup;
4537		- JPanel ctrlPanel;
4538		- JPanel materialPanel;
	5103	+
	5104	+ cGridBag toolboxPanel;
	5105	+ cGridBag materialPanel;
	5106	+ cGridBag ctrlPanel;
	5107	+
4539	5108	JScrollPane infoPanel;
4540		- JPanel optionsPanel;
	5109	+
	5110	+ cGridBag optionsPanel;
	5111	+
4541	5112	JTabbedPane objectPanel;
4542		- JPanel XYZPanel;
	5113	+ boolean materialFlushed;
	5114	+ Object3D latestObject;
	5115	+
	5116	+ cGridBag XYZPanel;
	5117	+
4543	5118	JSplitPane gridPanel;
4544	5119	JSplitPane bigPanel;
4545		- JPanel bigThree;
4546		- JTabbedPane scenePanel;
4547		- JPanel centralPanel;
	5120	+
	5121	+ cGridBag bigThree;
	5122	+ cGridBag scenePanel;
	5123	+ cGridBag centralPanel;
4548	5124	JSplitPane cameraPanel;
4549	5125	JPanel timelinePanel;
4550	5126	JMenuBar timelineMenubar;
..	..	@@ -4597,67 +5173,72 @@
4597	5173	// MATERIAL
4598	5174	JLabel materialLabel;
4599	5175	JLabel colorLabel;
4600		- NumberSlider colorField;
	5176	+ cNumberSlider colorField;
4601	5177	JLabel modulationLabel;
4602		- NumberSlider modulationField;
	5178	+ cNumberSlider modulationField;
4603	5179	JLabel metalnessLabel;
4604		- NumberSlider metalnessField;
	5180	+ cNumberSlider metalnessField;
4605	5181	JLabel diffuseLabel;
4606		- NumberSlider diffuseField;
	5182	+ cNumberSlider diffuseField;
4607	5183	JLabel specularLabel;
4608		- NumberSlider specularField;
	5184	+ cNumberSlider specularField;
4609	5185	JLabel shininessLabel;
4610		- NumberSlider shininessField;
	5186	+ cNumberSlider shininessField;
4611	5187	JLabel shiftLabel;
4612		- NumberSlider shiftField;
	5188	+ cNumberSlider shiftField;
4613	5189	JLabel ambientLabel;
4614		- NumberSlider ambientField;
	5190	+ cNumberSlider ambientField;
4615	5191	JLabel lightareaLabel;
4616		- NumberSlider lightareaField;
	5192	+ cNumberSlider lightareaField;
4617	5193	JLabel diffusenessLabel;
4618		- NumberSlider diffusenessField;
	5194	+ cNumberSlider diffusenessField;
4619	5195	JLabel velvetLabel;
4620		- NumberSlider velvetField;
	5196	+ cNumberSlider velvetField;
4621	5197	JLabel sheenLabel;
4622		- NumberSlider sheenField;
	5198	+ cNumberSlider sheenField;
4623	5199	JLabel subsurfaceLabel;
4624		- NumberSlider subsurfaceField;
	5200	+ cNumberSlider subsurfaceField;
4625	5201	//JLabel bumpLabel;
4626	5202	//NumberSlider bumpField;
4627	5203	JLabel backlitLabel;
4628		- NumberSlider backlitField;
	5204	+ cNumberSlider backlitField;
4629	5205	JLabel anisoLabel;
4630		- NumberSlider anisoField;
	5206	+ cNumberSlider anisoField;
4631	5207	JLabel anisoVLabel;
4632		- NumberSlider anisoVField;
	5208	+ cNumberSlider anisoVField;
4633	5209	JLabel cameraLabel;
4634		- NumberSlider cameraField;
	5210	+ cNumberSlider cameraField;
4635	5211	JLabel selfshadowLabel;
4636		- NumberSlider selfshadowField;
	5212	+ cNumberSlider selfshadowField;
4637	5213	JLabel shadowLabel;
4638		- NumberSlider shadowField;
	5214	+ cNumberSlider shadowField;
4639	5215	JLabel textureLabel;
4640		- NumberSlider textureField;
	5216	+ cNumberSlider textureField;
4641	5217	JLabel opacityLabel;
4642		- NumberSlider opacityField;
	5218	+ cNumberSlider opacityField;
4643	5219	JLabel fakedepthLabel;
4644		- NumberSlider fakedepthField;
	5220	+ cNumberSlider fakedepthField;
4645	5221	JLabel shadowbiasLabel;
4646		- NumberSlider shadowbiasField;
	5222	+ cNumberSlider shadowbiasField;
4647	5223	JLabel bumpLabel;
4648		- NumberSlider bumpField;
	5224	+ cNumberSlider bumpField;
4649	5225	JLabel noiseLabel;
4650		- NumberSlider noiseField;
	5226	+ cNumberSlider noiseField;
4651	5227	JLabel powerLabel;
4652		- NumberSlider powerField;
	5228	+ cNumberSlider powerField;
4653	5229	JLabel borderfadeLabel;
4654		- NumberSlider borderfadeField;
	5230	+ cNumberSlider borderfadeField;
4655	5231	JLabel fogLabel;
4656		- NumberSlider fogField;
	5232	+ cNumberSlider fogField;
4657	5233	JLabel opacityPowerLabel;
4658		- NumberSlider opacityPowerField;
4659		- JTree jTree;
	5234	+ cNumberSlider opacityPowerField;
	5235	+ cTree jTree;
4660	5236	//ObjectUI parent;
4661	5237
4662		- NumberSlider normalpushField;
	5238	+ cNumberSlider normalpushField;
	5239	+
	5240	+ private MenuItem importGFDItem;
	5241	+ private MenuItem importVRMLX3DItem;
	5242	+ private MenuItem import3DSItem;
	5243	+ private MenuItem importOBJItem;
4663	5244	}