~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,67 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -138,34 +203,42 @@
138	203	public void closeUI()
139	204	{
140	205	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
143	208	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
145	210
146		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
147	214	return;
148	215
149		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- objEditor.ctrlPanel.remove(remarkButton);
	216	+// objEditor.ctrlPanel.remove(liveCB);
	217	+// objEditor.ctrlPanel.remove(hideCB);
	218	+// objEditor.ctrlPanel.remove(markCB);
	219	+//
	220	+// objEditor.ctrlPanel.remove(randomCB);
	221	+// objEditor.ctrlPanel.remove(speedupCB);
	222	+// objEditor.ctrlPanel.remove(rewindCB);
	223	+//
	224	+// objEditor.ctrlPanel.remove(resetButton);
	225	+// objEditor.ctrlPanel.remove(stepButton);
	226	+//// objEditor.ctrlPanel.remove(stepAllButton);
	227	+//// objEditor.ctrlPanel.remove(resetAllButton);
	228	+// objEditor.ctrlPanel.remove(link2masterCB);
	229	+// //objEditor.ctrlPanel.remove(flipVCB);
	230	+// //objEditor.ctrlPanel.remove(texresMenu);
	231	+// objEditor.ctrlPanel.remove(slowerButton);
	232	+// objEditor.ctrlPanel.remove(fasterButton);
	233	+// objEditor.ctrlPanel.remove(remarkButton);
167	234
168		- Remove(normalpushField);
	235	+ objEditor.ctrlPanel.remove(setupPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	238	+ objEditor.ctrlPanel.remove(pushPanel);
	239	+ //objEditor.ctrlPanel.remove(fillPanel);
	240	+
	241	+ //Remove(normalpushField);
169	242	}
170	243
171	244	public ObjEditor GetEditor()
..	..	@@ -236,6 +309,7 @@
236	309	//localCopy.parent = null;
237	310
238	311	frame = new JFrame();
	312	+ frame.setUndecorated(true);
239	313	objEditor = this;
240	314	this.callee = callee;
241	315
..	..	@@ -266,27 +340,48 @@
266	340	return frame.action(event, obj);
267	341	}
268	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
269	348	void SetupMenu()
270	349	{
271	350	frame.setMenuBar(menuBar = new MenuBar());
272		- menuBar.add(windowMenu = new Menu("File"));
273		- windowMenu.add(loadItem = new MenuItem("Load..."));
274		- windowMenu.add("-");
275		- windowMenu.add(saveItem = new MenuItem("Save"));
276		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278		- windowMenu.add("-");
279		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
282	376	if (client.parent != null)
283	377	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	379	} else
286	380	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	382	}
289	383
	384	+ newItem.addActionListener(this);
290	385	loadItem.addActionListener(this);
291	386	saveItem.addActionListener(this);
292	387	saveAsItem.addActionListener(this);
..	..	@@ -295,81 +390,66 @@
295	390	//povItem.addActionListener(this);
296	391	closeItem.addActionListener(this);
297	392
298		- menuBar.add(cameraMenu = new Menu("View"));
299		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300		- //zBufferItem.addActionListener(this);
301		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302		- //normalLensItem.addActionListener(this);
303		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304		- revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
307		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308		- toggleFullScreenItem.addItemListener(this);
309		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310		- cameraMenu.add("-");
311		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312		- toggleTextureItem.addItemListener(this);
313		- toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
337		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338		- toggleHandleItem.addItemListener(this);
339		- toggleHandleItem.setState(CameraPane.HANDLES);
340		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341		- togglePaintItem.addItemListener(this);
342		- togglePaintItem.setState(CameraPane.PAINTMODE);
343		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344		-// toggleRootItem.addItemListener(this);
345		-// toggleRootItem.setState(false);
346		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347		-// animationItem.addItemListener(this);
348		-// animationItem.setState(CameraPane.ANIMATION);
349		- cameraMenu.add("-");
350		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351		- editCameraItem.addActionListener(this);
352		-
353	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
354	420	toolbarPanel = new JPanel();
355	421	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
357	423	treePanel.setName("Tree");
358		- ctrlPanel = new cGridBag(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
	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	+
360	437	materialPanel = new cGridBag().setVertical(true);
361	438	materialPanel.setName("Material");
	439	+
362	440	/JTextPane/
363	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
364	444	infoarea.setEditable(true);
365	445	SetText();
366	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	447	// infoarea.setOpaque(false);
368	448	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ //infoPanel.setPreferredSize(new Dimension(50, 200));
373	453	infoPanel.setName("Info");
374	454	//infoPanel.setLayout(new BorderLayout());
375	455	//infoPanel.add(createTextPane());
..	..	@@ -378,15 +458,22 @@
378	458	mainPanel.setName("Main");
379	459	mainPanel.setContinuousLayout(true);
380	460	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	461	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	462	+ mainPanel.setDividerLocation(0.5); //1.0);
	463	+ mainPanel.setResizeWeight(0.5);
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
385	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	473	//mainPanel.setLayout(new GridBagLayout());
387	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
390	477	//materialPanel.setLayout(new GridBagLayout());
391	478
392	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
..	..	@@ -426,7 +513,7 @@
426	513	static String newline = "\n";
427	514	protected static final String buttonString = "JButton";
428	515	StyledDocument doc;
429		- JTextArea infoarea;
	516	+ JTextPane infoarea;
430	517
431	518	void ClearInfo()
432	519	{
..	..	@@ -449,10 +536,10 @@
449	536	e.printStackTrace();
450	537	}
451	538
452		- String selection = infoarea.getText();
453		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454		- java.awt.datatransfer.Clipboard clipboard =
455		- Toolkit.getDefaultToolkit().getSystemClipboard();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	543	//clipboard.setContents(data, data);
457	544	}
458	545
..	..	@@ -475,13 +562,13 @@
475	562	//SendInfo("Name:", "bold");
476	563	if (sel.GetTextures() != null \|\| debug)
477	564	{
478		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	567	if (sel.Size() > 0)
481	568	{
482	569	si.SendInfo("#children = " + sel.Size(), "regular");
483	570	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	572	if (debug)
486	573	{
487	574	try
..	..	@@ -493,7 +580,10 @@
493	580	}
494	581
495	582	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
497	587
498	588	if (sel.bRep != null)
499	589	{
..	..	@@ -520,7 +610,7 @@
520	610	}
521	611	if (sel.support != null)
522	612	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	614	}
525	615	if (sel.scriptnode != null)
526	616	{
..	..	@@ -591,6 +681,9 @@
591	681	{
592	682	CameraPane.pointflow = (PointFlow) sel;
593	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
594	687	}
595	688	}
596	689
..	..	@@ -606,68 +699,159 @@
606	699	}
607	700	}
608	701
	702	+static GraphicsDevice device = GraphicsEnvironment
	703	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
	720	+
	721	+ void Minimize()
	722	+ {
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
	725	+ }
	726	+
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	730	+ void Maximize()
	731	+ {
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
	737	+ if (maximized)
	738	+ {
	739	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	740	+ }
	741	+ else
	742	+ {
	743	+ keeprect = frame.getBounds();
	744	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	747	+// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ }
	749	+
	750	+ maximized ^= true;
	751	+
	752	+ frame.validate();
	753	+ }
	754	+
	755	+ cButton minButton;
	756	+ cButton maxButton;
	757	+ cButton fullButton;
	758	+
609	759	void ToggleFullScreen()
610	760	{
611		- if (CameraPane.FULLSCREEN)
	761	+ cameraView.ToggleFullScreen();
	762	+
	763	+ if (!CameraPane.FULLSCREEN)
612	764	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	765	+ device.setFullScreenWindow(null);
	766	+ frame.validate();
	767	+
	768	+ //frame.setVisible(false);
	769	+// frame.removeNotify();
	770	+// frame.setUndecorated(false);
	771	+// frame.addNotify();
	772	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	773	+
	774	+// X frame.getContentPane().remove(/"Center",/bigThree);
	775	+// X framePanel.add(bigThree);
	776	+// X frame.getContentPane().add(/"Center",/framePanel);
	777	+ framePanel.setDividerLocation(1);
	778	+
	779	+ //frame.setVisible(true);
	780	+ radio.layout = keepButton;
	781	+ //theFrame = null;
	782	+ keepButton = null;
	783	+ radio.layout.doClick();
	784	+
616	785	} else
617	786	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	787	+ keepButton = radio.layout;
	788	+ //keeprect = frame.getBounds();
	789	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	790	+// frame.getToolkit().getScreenSize().height);
	791	+ //frame.setVisible(false);
	792	+ device.setFullScreenWindow(frame);
	793	+ frame.validate();
	794	+// frame.removeNotify();
	795	+// frame.setUndecorated(true);
	796	+// frame.addNotify();
	797	+// X frame.getContentPane().remove(/"Center",/framePanel);
	798	+// X framePanel.remove(bigThree);
	799	+// X frame.getContentPane().add(/"Center",/bigThree);
	800	+ framePanel.setDividerLocation(0);
	801	+
	802	+ radio.layout = fullscreenLayout;
	803	+ radio.layout.doClick();
	804	+ //frame.setVisible(true);
621	805	}
622		- cameraView.ToggleFullScreen();
	806	+ frame.validate();
623	807	}
624	808
625		- private JTextArea createTextPane()
	809	+ private JTextPane createTextPane()
626	810	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	811	+// TEXTAREA String[] initString =
	812	+// {
	813	+// "This is an editable JTextPane, ", //regular
	814	+// "another ", //italic
	815	+// "styled ", //bold
	816	+// "text ", //small
	817	+// "component, ", //large
	818	+// "which supports embedded components..." + newline,//regular
	819	+// " " + newline, //button
	820	+// "...and embedded icons..." + newline, //regular
	821	+// " ", //icon
	822	+// newline + "JTextPane is a subclass of JEditorPane that "
	823	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	824	+// + "cover methods for interacting with those objects."
	825	+// };
	826	+//
	827	+// String[] initStyles =
	828	+// {
	829	+// "regular", "italic", "bold", "small", "large",
	830	+// "regular", "button", "regular", "icon",
	831	+// "regular"
	832	+// };
	833	+//
	834	+// JTextPane textPane = new JTextPane();
	835	+// textPane.setEditable(true);
	836	+// /StyledDocument/ doc = textPane.getStyledDocument();
	837	+// addStylesToDocument(doc);
	838	+//
	839	+// try
	840	+// {
	841	+// for (int j = 0; j < 2; j++)
	842	+// {
	843	+// for (int i = 0; i < initString.length; i++)
	844	+// {
	845	+// doc.insertString(doc.getLength(), initString[i],
	846	+// doc.getStyle(initStyles[i]));
	847	+// }
	848	+// }
	849	+// } catch (BadLocationException ble)
	850	+// {
	851	+// System.err.println("Couldn't insert initial text into text pane.");
	852	+// }
642	853
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
649		-
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	854	+ return new JTextPane(); // textPane;
671	855	}
672	856
673	857	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +904,7 @@
720	904	protected static ImageIcon createImageIcon(String path,
721	905	String description)
722	906	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	907	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	908	if (imgURL != null)
725	909	{
726	910	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +936,7 @@
752	936	// NumberSlider vDivsField;
753	937	// JCheckBox endcaps;
754	938	JCheckBox liveCB;
	939	+ JCheckBox selectCB;
755	940	JCheckBox hideCB;
756	941	JCheckBox link2masterCB;
757	942	JCheckBox markCB;
..	..	@@ -759,7 +944,12 @@
759	944	JCheckBox speedupCB;
760	945	JCheckBox rewindCB;
761	946	JCheckBox flipVCB;
	947	+
	948	+ cCheckBox toggleTextureCB;
	949	+ cCheckBox toggleSwitchCB;
	950	+
762	951	JComboBox texresMenu;
	952	+
763	953	JButton resetButton;
764	954	JButton stepButton;
765	955	JButton stepAllButton;
..	..	@@ -767,54 +957,48 @@
767	957	JButton slowerButton;
768	958	JButton fasterButton;
769	959	JButton remarkButton;
	960	+
	961	+ cGridBag editPanel;
	962	+ cGridBag editCommandsPanel;
	963	+
	964	+ cGridBag namePanel;
	965	+ cGridBag setupPanel;
	966	+ cGridBag setupPanel2;
	967	+ cGridBag objectCommandsPanel;
	968	+ cGridBag pushPanel;
	969	+ cGridBag fillPanel;
770	970
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	971	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	972	{
773	973	JCheckBox cb;
774	974
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	975	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	976	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	977
785	978	return cb;
786	979	}
787	980
788		- cButton AddButton(ObjEditor oe, String label)
	981	+ cButton AddButton(cGridBag panel, String label)
789	982	{
790	983	cButton cb;
791	984
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	985	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	986	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	987
802	988	return cb;
803	989	}
804	990
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	991	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	992	{
807	993	JComboBox combo;
808	994
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	995	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	996	combo.addActionListener(this);
813	997
814	998	return combo;
815	999	}
816	1000
817		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
	1001	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1002	{
819	1003	cGridBag control = new cGridBag();
820	1004
..	..	@@ -826,12 +1010,12 @@
826	1010	control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827	1011	combo.setFloat(current);
828	1012
829		- ctrlPanel.add(control);
	1013	+ panel.add(control);
830	1014
831		- return combo;
	1015	+ return control;
832	1016	}
833	1017
834		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
	1018	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835	1019	{
836	1020	cGridBag control = new cGridBag();
837	1021
..	..	@@ -839,25 +1023,21 @@
839	1023
840	1024	JLabel jlabel = new JLabel(label);
841	1025	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
842		- ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843		- ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1026	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1027	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844	1028	combo.setInteger(current);
845	1029
846		- ctrlPanel.add(control);
	1030	+ panel.add(control);
847	1031
848		- return combo;
	1032	+ return control;
849	1033	}
850	1034
851	1035	JTextArea AddText(cGridBag ctrlPanel, String name)
852	1036	{
853	1037	JTextArea text;
854	1038
855		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857	1039	ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1040	text.addCaretListener(this);
859		- aConstraints.gridx += 1;
860		- aConstraints.gridwidth = 1;
861	1041
862	1042	return text;
863	1043	}
..	..	@@ -896,7 +1076,7 @@
896	1076
897	1077	/*
898	1078	*/
899		- void Return() // ObjEditor oe)
	1079	+ void Return0() // ObjEditor oe)
900	1080	{
901	1081	aConstraints.gridy += 1;
902	1082	aConstraints.gridx = 0;
..	..	@@ -951,37 +1131,76 @@
951	1131
952	1132	void SetupUI2(ObjEditor oe)
953	1133	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958		- SetupName(oe);
	1134	+ //SetupName(oe);
959	1135
960		- if (!GroupEditor.allparams)
	1136	+ namePanel = new cGridBag();
	1137	+
	1138	+ nameField = AddText(namePanel, copy.GetName());
	1139	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1140	+ oe.ctrlPanel.add(namePanel);
	1141	+
	1142	+ oe.ctrlPanel.Return();
	1143	+
	1144	+ if (!allparams)
961	1145	return;
962	1146
963		- liveCB = AddCheckBox(oe, "Live", copy.live);
964		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1147	+ setupPanel = new cGridBag().setVertical(false);
	1148	+
	1149	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1150	+ liveCB.setToolTipText("Animate object");
	1151	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1152	+ selectCB.setToolTipText("Make object selectable");
966	1153	// Return();
967		- markCB = AddCheckBox(oe, "Mark", copy.marked);
968		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
969		- randomCB = AddCheckBox(oe, "Rand", copy.random);
970		- Return();
971		- resetButton = AddButton(oe, "Reset");
972		- stepButton = AddButton(oe, "Step");
	1154	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1155	+ hideCB.setToolTipText("Hide object");
	1156	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1157	+ markCB.setToolTipText("As animation target transform");
	1158	+
	1159	+ setupPanel2 = new cGridBag().setVertical(false);
	1160	+
	1161	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1162	+ rewindCB.setToolTipText("Rewind animation");
	1163	+
	1164	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1165	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1166	+
	1167	+ if (Globals.ADVANCED)
	1168	+ {
	1169	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1170	+ link2masterCB.setToolTipText("Attach to support");
	1171	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1172	+ speedupCB.setToolTipText("Option motion capture");
	1173	+ }
	1174	+
	1175	+ oe.ctrlPanel.add(setupPanel);
	1176	+ oe.ctrlPanel.Return();
	1177	+ oe.ctrlPanel.add(setupPanel2);
	1178	+ oe.ctrlPanel.Return();
	1179	+
	1180	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1181	+
	1182	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1183	+ resetButton.setToolTipText("Jump to frame zero");
	1184	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1185	+ stepButton.setToolTipText("Step one frame");
973	1186	// resetAllButton = AddButton(oe, "Reset All");
974	1187	// stepAllButton = AddButton(oe, "Step All");
975		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
976	1188	// Return();
977		- slowerButton = AddButton(oe, "Slow");
978		- fasterButton = AddButton(oe, "Fast");
979		- remarkButton = AddButton(oe, "Rem");
	1189	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1190	+ slowerButton.setToolTipText("Decrease animation speed");
	1191	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1192	+ fasterButton.setToolTipText("Increase animation speed");
	1193	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1194	+ remarkButton.setToolTipText("Set the current transform as the target");
980	1195
981		- Return();
	1196	+ oe.ctrlPanel.add(objectCommandsPanel);
	1197	+ oe.ctrlPanel.Return();
982	1198
983		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984		- Return();
	1199	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1200	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1201	+ //Return();
	1202	+
	1203	+ oe.ctrlPanel.Return();
985	1204
986	1205	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1206	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1076,7 +1295,7 @@
1076	1295	oe.aConstraints.gridwidth = 1;
1077	1296	/**/
1078	1297	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1298	+ oe.ctrlPanel.Return();
1080	1299
1081	1300	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1301	//textureButton.setEnabled(false);
..	..	@@ -1180,8 +1399,11 @@
1180	1399	//worldPanel.setName("World");
1181	1400	centralPanel = new cGridBag();
1182	1401	centralPanel.preferredWidth = 20;
1183		- timelinePanel = new JPanel(new BorderLayout());
1184		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1402	+
	1403	+ if (Globals.ADVANCED)
	1404	+ {
	1405	+ timelinePanel = new JPanel(new BorderLayout());
	1406	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1185	1407
1186	1408	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1187	1409	cameraPanel.setContinuousLayout(true);
..	..	@@ -1190,7 +1412,10 @@
1190	1412	// cameraPanel.setDividerSize(9);
1191	1413	cameraPanel.setResizeWeight(1.0);
1192	1414
	1415	+ }
	1416	+
1193	1417	centralPanel.add(cameraView);
	1418	+ centralPanel.setFocusable(true);
1194	1419	//frame.setJMenuBar(timelineMenubar);
1195	1420	//centralPanel.add(timelinePanel);
1196	1421
..	..	@@ -1253,11 +1478,13 @@
1253	1478	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254	1479	//tmp.setName("Edit");
1255	1480	objectPanel.add(materialPanel);
1256		- JPanel north = new JPanel(new BorderLayout());
1257		- north.setName("Edit");
1258		- north.add(ctrlPanel, BorderLayout.NORTH);
1259		- objectPanel.add(north);
	1481	+// JPanel north = new JPanel(new BorderLayout());
	1482	+// north.setName("Edit");
	1483	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1484	+// objectPanel.add(north);
	1485	+ objectPanel.add(editPanel);
1260	1486	objectPanel.add(infoPanel);
	1487	+ objectPanel.add(toolboxPanel);
1261	1488
1262	1489	/*
1263	1490	aConstraints.gridx = 0;
..	..	@@ -1266,7 +1493,7 @@
1266	1493	aConstraints.gridy += 1;
1267	1494	aConstraints.gridwidth = 1;
1268	1495	mainPanel.add(objectPanel, aConstraints);
1269		- */
	1496	+ */
1270	1497
1271	1498	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1272	1499	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1278,14 +1505,12 @@
1278	1505	scrollpane.addMouseWheelListener(this); // Default not fast enough
1279	1506
1280	1507	/JTabbedPane/ scenePanel = new cGridBag();
1281		- scenePanel.preferredWidth = 7;
	1508	+ scenePanel.preferredWidth = 6;
1282	1509
1283	1510	JTabbedPane tabbedPane = new JTabbedPane();
1284	1511	tabbedPane.add(scrollpane);
1285	1512
1286		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287		-
1288		- optionsPanel = new cGridBag().setVertical(true);
	1513	+ optionsPanel = new cGridBag().setVertical(false);
1289	1514
1290	1515	optionsPanel.setName("Options");
1291	1516
..	..	@@ -1293,6 +1518,8 @@
1293	1518
1294	1519	tabbedPane.add(optionsPanel);
1295	1520
	1521	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1522	+
1296	1523	scenePanel.add(tabbedPane);
1297	1524
1298	1525	/*
..	..	@@ -1384,9 +1611,13 @@
1384	1611
1385	1612	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1386	1613
1387		- frame.setSize(1024, 768);
1388		- frame.show();
	1614	+ frame.setSize(1280, 860);
	1615	+
	1616	+ frame.validate();
	1617	+ frame.setVisible(true);
1389	1618
	1619	+ cameraView.requestFocusInWindow();
	1620	+
1390	1621	gridPanel.setDividerLocation(1.0);
1391	1622
1392	1623	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1415,7 +1646,7 @@
1415	1646	ctrlPanel.removeAll();
1416	1647	}
1417	1648
1418		- void SetupMaterial(cGridBag ctrlPanel)
	1649	+ void SetupMaterial(cGridBag panel)
1419	1650	{
1420	1651	/*
1421	1652	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
..	..	@@ -1424,18 +1655,26 @@
1424	1655
1425	1656	cGridBag editBar = new cGridBag().setVertical(false);
1426	1657
1427		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1658	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1659	+ createMaterialButton.setToolTipText("Create material");
1428	1660
1429	1661	/*
1430	1662	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	1663	*/
1432	1664
1433		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1434		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1435		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1436		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1665	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1666	+ clearMaterialButton.setToolTipText("Clear material");
	1667	+
	1668	+ if (Globals.ADVANCED)
	1669	+ {
	1670	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1671	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1672	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1673	+ }
1437	1674
1438		- ctrlPanel.add(editBar);
	1675	+ editBar.preferredHeight = 15;
	1676	+
	1677	+ panel.add(editBar);
1439	1678
1440	1679	/**/
1441	1680	//aConstraints.weighty = 0;
..	..	@@ -1445,17 +1684,13 @@
1445	1684	//aConstraints.gridx += 1;
1446	1685	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1447	1686
1448		- JPanel colorPanel = new JPanel(new BorderLayout());
1449		- colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450		-
1451	1687	cGridBag colorSection = new cGridBag().setVertical(true);
1452		-
1453		- colorPanel.add(colorSection);
1454	1688
1455	1689	cGridBag color = new cGridBag();
1456	1690	color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1457	1691	colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458	1692	color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1693	+ //colorField.preferredWidth = 200;
1459	1694	colorSection.add(color);
1460	1695
1461	1696	cGridBag modulation = new cGridBag();
..	..	@@ -1470,34 +1705,13 @@
1470	1705	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1471	1706	colorSection.add(texture);
1472	1707
1473		- cGridBag anisoU = new cGridBag();
1474		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1477		- colorSection.add(anisoU);
1478		-
1479		- cGridBag anisoV = new cGridBag();
1480		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1481		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1482		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1483		- colorSection.add(anisoV);
1484		-
1485		- cGridBag shadowbias = new cGridBag();
1486		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1487		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1488		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1489		- colorSection.add(shadowbias);
1490		-
1491		- ctrlPanel.add(colorPanel);
	1708	+ panel.add(new JSeparator());
	1709	+
	1710	+ panel.add(colorSection);
1492	1711
1493	1712	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1494	1713
1495		- JPanel diffusePanel = new JPanel(new BorderLayout());
1496		- diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497		-
1498	1714	cGridBag diffuseSection = new cGridBag().setVertical(true);
1499		-
1500		- diffusePanel.add(diffuseSection);
1501	1715
1502	1716	cGridBag diffuse = new cGridBag();
1503	1717	diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
..	..	@@ -1541,16 +1755,19 @@
1541	1755	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	1756	diffuseSection.add(fakedepth);
1543	1757
1544		- ctrlPanel.add(diffusePanel);
	1758	+ cGridBag shadowbias = new cGridBag();
	1759	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1760	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1761	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1762	+ diffuseSection.add(shadowbias);
	1763	+
	1764	+ panel.add(new JSeparator());
	1765	+
	1766	+ panel.add(diffuseSection);
1545	1767
1546	1768	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1547	1769
1548		- JPanel specularPanel = new JPanel(new BorderLayout());
1549		- specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550		-
1551	1770	cGridBag specularSection = new cGridBag().setVertical(true);
1552		-
1553		- specularPanel.add(specularSection);
1554	1771
1555	1772	cGridBag specular = new cGridBag();
1556	1773	specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
..	..	@@ -1582,7 +1799,7 @@
1582	1799	velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1583	1800	specularSection.add(velvet);
1584	1801
1585		- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	1802	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1586	1803	//Return();
1587	1804	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1588	1805	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..	..	@@ -1594,52 +1811,58 @@
1594	1811	// aConstraints.gridy += 1;
1595	1812	// aConstraints.gridwidth = 1;
1596	1813
	1814	+ cGridBag anisoU = new cGridBag();
	1815	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1816	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1817	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1818	+ specularSection.add(anisoU);
1597	1819
1598		- ctrlPanel.add(specularPanel);
	1820	+ cGridBag anisoV = new cGridBag();
	1821	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1822	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1823	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1824	+ specularSection.add(anisoV);
	1825	+
	1826	+
	1827	+ panel.add(new JSeparator());
	1828	+
	1829	+ panel.add(specularSection);
1599	1830
1600	1831	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1601	1832
1602		- JPanel globalPanel = new JPanel(new BorderLayout());
1603		- globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1604		-
1605		- cGridBag globalSection = new cGridBag().setVertical(true);
1606		-
1607		- globalPanel.add(globalSection);
	1833	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	1834
1609	1835	cGridBag camera = new cGridBag();
1610	1836	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	1837	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1838	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	1839	+ colorSection.add(camera);
1614	1840
1615	1841	cGridBag ambient = new cGridBag();
1616	1842	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	1843	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1844	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	1845	+ colorSection.add(ambient);
1620	1846
1621	1847	cGridBag backlit = new cGridBag();
1622	1848	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	1849	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1850	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	1851	+ colorSection.add(backlit);
1626	1852
1627	1853	cGridBag opacity = new cGridBag();
1628	1854	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629	1855	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630	1856	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631		- globalSection.add(opacity);
	1857	+ colorSection.add(opacity);
1632	1858
1633		- ctrlPanel.add(globalPanel);
	1859	+ //panel.add(new JSeparator());
	1860	+
	1861	+ //panel.add(globalSection);
1634	1862
1635	1863	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1636	1864
1637		- JPanel texturePanel = new JPanel(new BorderLayout());
1638		- texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639		-
1640	1865	cGridBag textureSection = new cGridBag().setVertical(true);
1641		-
1642		- texturePanel.add(textureSection);
1643	1866
1644	1867	cGridBag bump = new cGridBag();
1645	1868	bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
..	..	@@ -1677,7 +1900,9 @@
1677	1900	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1678	1901	textureSection.add(opacityPower);
1679	1902
1680		- ctrlPanel.add(texturePanel);
	1903	+ panel.add(new JSeparator());
	1904	+
	1905	+ panel.add(textureSection);
1681	1906
1682	1907	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1683	1908
..	..	@@ -1714,12 +1939,15 @@
1714	1939	opacityPowerField.addChangeListener(this);
1715	1940	/**/
1716	1941
1717		- resetSlidersButton.addActionListener(this);
1718	1942	clearMaterialButton.addActionListener(this);
1719	1943	createMaterialButton.addActionListener(this);
1720		-
1721		- propagateToggle.addItemListener(this);
1722		- multiplyToggle.addItemListener(this);
	1944	+
	1945	+ if (Globals.ADVANCED)
	1946	+ {
	1947	+ resetSlidersButton.addActionListener(this);
	1948	+ propagateToggle.addItemListener(this);
	1949	+ multiplyToggle.addItemListener(this);
	1950	+ }
1723	1951	}
1724	1952
1725	1953	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1890,7 +2118,7 @@
1890	2118
1891	2119	//? flashIt = false;
1892	2120	CameraPane pane = (CameraPane) cameraView;
1893		- pane.clickStart(location.x, location.y, 0);
	2121	+ pane.clickStart(location.x, location.y, 0, 0);
1894	2122	pane.clickEnd(location.x, location.y, 0, true);
1895	2123
1896	2124	if (group.selection.size() == 1)
..	..	@@ -1939,6 +2167,7 @@
1939	2167	e2.printStackTrace();
1940	2168	}
1941	2169	}
	2170	+
1942	2171	LoadJMEThread loadThread;
1943	2172
1944	2173	class LoadJMEThread extends Thread
..	..	@@ -1996,6 +2225,7 @@
1996	2225	//LoadFile0(filename, converter);
1997	2226	}
1998	2227	}
	2228	+
1999	2229	LoadOBJThread loadObjThread;
2000	2230
2001	2231	class LoadOBJThread extends Thread
..	..	@@ -2074,19 +2304,19 @@
2074	2304
2075	2305	void LoadObjFile(String fullname)
2076	2306	{
2077		- /*
	2307	+ System.out.println("Loading " + fullname);
	2308	+ /**/
2078	2309	//lastFilename = fullname;
2079	2310	if(loadObjThread == null)
2080	2311	{
2081		- loadObjThread = new LoadOBJThread();
2082		- loadObjThread.start();
	2312	+ loadObjThread = new LoadOBJThread();
	2313	+ loadObjThread.start();
2083	2314	}
2084	2315
2085	2316	loadObjThread.add(fullname);
2086		- */
	2317	+ /**/
2087	2318
2088		- System.out.println("Loading " + fullname);
2089		- makeSomething(new FileObject(fullname, true), true);
	2319	+ //makeSomething(new FileObject(fullname, true), true);
2090	2320	}
2091	2321
2092	2322	void LoadGFDFile(String fullname)
..	..	@@ -2347,11 +2577,11 @@
2347	2577
2348	2578	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2349	2579	{
2350		- if (GrafreeD.standAlone)
	2580	+ if (Grafreed.standAlone)
2351	2581	{
2352	2582	/**/
2353	2583	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2354		- browser.show();
	2584	+ browser.setVisible(true);
2355	2585	String filename = browser.getFile();
2356	2586	if (filename != null && filename.length() > 0)
2357	2587	{
..	..	@@ -2496,6 +2726,7 @@
2496	2726	}
2497	2727	if (input == null)
2498	2728	{
	2729	+ new Exception().printStackTrace();
2499	2730	System.exit(0);
2500	2731	}
2501	2732
..	..	@@ -2702,6 +2933,8 @@
2702	2933
2703	2934	void SetMaterial(Object3D object)
2704	2935	{
	2936	+ latestObject = object;
	2937	+
2705	2938	cMaterial mat = object.material;
2706	2939
2707	2940	if (mat == null)
..	..	@@ -2710,7 +2943,8 @@
2710	2943	return;
2711	2944	}
2712	2945
2713		- multiplyToggle.setSelected(mat.multiply);
	2946	+ if (multiplyToggle != null)
	2947	+ multiplyToggle.setSelected(mat.multiply);
2714	2948
2715	2949	assert (object.projectedVertices != null);
2716	2950
..	..	@@ -2812,12 +3046,17 @@
2812	3046	// }
2813	3047
2814	3048	/**/
2815		- if (deselect)
	3049	+ if (deselect \|\| child == null)
2816	3050	{
2817	3051	//group.deselectAll();
2818	3052	//freeze = true;
2819	3053	GetTree().clearSelection();
2820	3054	//freeze = false;
	3055	+
	3056	+ if (child == null)
	3057	+ {
	3058	+ return;
	3059	+ }
2821	3060	}
2822	3061
2823	3062	//group.addSelectee(child);
..	..	@@ -2886,7 +3125,7 @@
2886	3125	cameraView.ToggleDL();
2887	3126	cameraView.repaint();
2888	3127	return;
2889		- } else if (event.getSource() == toggleTextureItem)
	3128	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2890	3129	{
2891	3130	cameraView.ToggleTexture();
2892	3131	// june 2013 copy.HardTouch();
..	..	@@ -2925,9 +3164,9 @@
2925	3164	frame.validate();
2926	3165
2927	3166	return;
2928		- } else if (event.getSource() == toggleRandomItem)
	3167	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2929	3168	{
2930		- cameraView.ToggleRandom();
	3169	+ cameraView.ToggleSwitch();
2931	3170	cameraView.repaint();
2932	3171	return;
2933	3172	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2956,6 +3195,10 @@
2956	3195	{
2957	3196	copy.live ^= true;
2958	3197	return;
	3198	+ } else if (event.getSource() == selectCB)
	3199	+ {
	3200	+ copy.dontselect ^= true;
	3201	+ return;
2959	3202	} else if (event.getSource() == hideCB)
2960	3203	{
2961	3204	copy.hide ^= true;
..	..	@@ -2970,6 +3213,7 @@
2970	3213	if (event.getSource() == randomCB)
2971	3214	{
2972	3215	copy.random ^= true;
	3216	+ objEditor.refreshContents();
2973	3217	return;
2974	3218	}
2975	3219	if (event.getSource() == speedupCB)
..	..	@@ -2993,8 +3237,9 @@
2993	3237
2994	3238	public void actionPerformed(ActionEvent event)
2995	3239	{
	3240	+ Object source = event.getSource();
2996	3241	// SCRIPT DIALOG
2997		- if (event.getSource() == okbutton)
	3242	+ if (source == okbutton)
2998	3243	{
2999	3244	textpanel.setVisible(false);
3000	3245	textpanel.remove(textarea);
..	..	@@ -3006,7 +3251,7 @@
3006	3251	textarea = null;
3007	3252	textpanel = null;
3008	3253	}
3009		- if (event.getSource() == cancelbutton)
	3254	+ if (source == cancelbutton)
3010	3255	{
3011	3256	textpanel.setVisible(false);
3012	3257	textpanel.remove(textarea);
..	..	@@ -3018,50 +3263,50 @@
3018	3263	//applySelf();
3019	3264	//client.refreshEditWindow();
3020	3265	//refreshContents();
3021		- if (event.getSource() == nameField)
	3266	+ if (source == nameField)
3022	3267	{
3023	3268	//System.out.println("ObjEditor " + event);
3024	3269	applySelf0(true);
3025	3270	//parent.applySelf();
3026	3271	objEditor.refreshContents();
3027		- } else if (event.getSource() == resetButton)
	3272	+ } else if (source == resetButton)
3028	3273	{
3029	3274	CameraPane.fullreset = true;
3030	3275	copy.Reset(); // ResetMeshes();
3031	3276	copy.Touch();
3032	3277	objEditor.refreshContents();
3033		- } else if (event.getSource() == stepItem)
	3278	+ } else if (source == stepItem)
3034	3279	{
3035	3280	//cameraView.ONESTEP = true;
3036	3281	Globals.ONESTEP = true;
3037	3282	cameraView.repaint();
3038	3283	return;
3039		- } else if (event.getSource() == stepButton)
	3284	+ } else if (source == stepButton)
3040	3285	{
3041	3286	copy.Step();
3042	3287	copy.Touch();
3043	3288	objEditor.refreshContents();
3044		- } else if (event.getSource() == slowerButton)
	3289	+ } else if (source == slowerButton)
3045	3290	{
3046	3291	copy.Slower();
3047	3292	copy.Touch();
3048	3293	objEditor.refreshContents();
3049		- } else if (event.getSource() == fasterButton)
	3294	+ } else if (source == fasterButton)
3050	3295	{
3051	3296	copy.Faster();
3052	3297	copy.Touch();
3053	3298	objEditor.refreshContents();
3054		- } else if (event.getSource() == remarkButton)
	3299	+ } else if (source == remarkButton)
3055	3300	{
3056	3301	copy.Remark();
3057	3302	copy.Touch();
3058	3303	objEditor.refreshContents();
3059		- } else if (event.getSource() == stepAllButton)
	3304	+ } else if (source == stepAllButton)
3060	3305	{
3061	3306	copy.StepAll();
3062	3307	copy.Touch();
3063	3308	objEditor.refreshContents();
3064		- } else if (event.getSource() == resetAllButton)
	3309	+ } else if (source == resetAllButton)
3065	3310	{
3066	3311	//CameraPane.fullreset = true;
3067	3312	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3094,53 +3339,75 @@
3094	3339	// Close();
3095	3340	// }
3096	3341	// else
3097		- if (event.getSource() == resetSlidersButton)
	3342	+ if (source == resetSlidersButton)
3098	3343	{
3099	3344	ResetSliders();
3100		- } else if (event.getSource() == clearMaterialButton)
	3345	+ } else if (source == clearMaterialButton)
3101	3346	{
3102	3347	ClearMaterial();
3103		- } else if (event.getSource() == createMaterialButton)
	3348	+ } else if (source == createMaterialButton)
3104	3349	{
3105	3350	CreateMaterial();
3106		- } else if (event.getSource() == clearPanelButton)
	3351	+ } else if (source == clearPanelButton)
3107	3352	{
3108	3353	copy.ClearUI();
3109	3354	refreshContents(true);
3110		- } /*
3111		- }
3112		-
3113		- public boolean action(Event event, Object arg)
3114		- {
3115		- */ else if (event.getSource() == closeItem)
	3355	+ } else if (source == importGFDItem)
	3356	+ {
	3357	+ ImportGFD();
	3358	+ } else
	3359	+ if (source == importVRMLX3DItem)
	3360	+ {
	3361	+ ImportVRMLX3D();
	3362	+ } else
	3363	+ if (source == import3DSItem)
	3364	+ {
	3365	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3366	+ } else
	3367	+ if (source == importOBJItem)
	3368	+ {
	3369	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3370	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3371	+ browser.setVisible(true);
	3372	+ String filename = browser.getFile();
	3373	+ if (filename != null && filename.length() > 0)
	3374	+ {
	3375	+ String fullname = browser.getDirectory() + filename;
	3376	+ makeSomething(ReadOBJ(fullname), true);
	3377	+ }
	3378	+ } else
	3379	+ if (source == closeItem)
3116	3380	{
3117	3381	Close();
3118	3382	//return true;
3119		- } else if (event.getSource() == loadItem)
	3383	+ } else if (source == loadItem)
3120	3384	{
3121	3385	load();
3122	3386	//return true;
3123		- } else if (event.getSource() == saveItem)
	3387	+ } else if (source == newItem)
	3388	+ {
	3389	+ New();
	3390	+ } else if (source == saveItem)
3124	3391	{
3125	3392	save();
3126	3393	//return true;
3127		- } else if (event.getSource() == saveAsItem)
	3394	+ } else if (source == saveAsItem)
3128	3395	{
3129	3396	saveAs();
3130	3397	//return true;
3131		- } else if (event.getSource() == reexportItem)
	3398	+ } else if (source == reexportItem)
3132	3399	{
3133	3400	reexport();
3134	3401	//return true;
3135		- } else if (event.getSource() == exportAsItem)
	3402	+ } else if (source == exportAsItem)
3136	3403	{
3137	3404	export();
3138	3405	//return true;
3139		- } else if (event.getSource() == povItem)
	3406	+ } else if (source == povItem)
3140	3407	{
3141	3408	generatePOV();
3142	3409	//return true;
3143		- } else if (event.getSource() == zBufferItem)
	3410	+ } else if (source == zBufferItem)
3144	3411	{
3145	3412	try
3146	3413	{
..	..	@@ -3162,21 +3429,8 @@
3162	3429	cameraView.repaint();
3163	3430	//return true;
3164	3431	}
3165		- */ else if (event.getSource() == editCameraItem)
3166		- {
3167		- cameraView.ProtectCamera();
3168		- cameraView.repaint();
3169		- return;
3170		- } else if (event.getSource() == revertCameraItem)
3171		- {
3172		- cameraView.RevertCamera();
3173		- cameraView.repaint();
3174		- return;
3175		-// } else if (event.getSource() == textureButton)
3176		-// {
3177		-// return; // true;
3178		- } else // combos...
3179		- if (event.getSource() == texresMenu)
	3432	+ */ else // combos...
	3433	+ if (source == texresMenu)
3180	3434	{
3181	3435	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3182	3436	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3188,12 +3442,289 @@
3188	3442	}
3189	3443	}
3190	3444
	3445	+ void New()
	3446	+ {
	3447	+ while (copy.Size() > 1)
	3448	+ {
	3449	+ copy.remove(1);
	3450	+ }
	3451	+
	3452	+ ResetModel();
	3453	+ objEditor.refreshContents();
	3454	+ }
	3455	+
	3456	+ static public byte[] Compress(Object3D o)
	3457	+ {
	3458	+ try
	3459	+ {
	3460	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3461	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3462	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3463	+
	3464	+ Object3D parent = o.parent;
	3465	+ o.parent = null;
	3466	+
	3467	+ out.writeObject(o);
	3468	+
	3469	+ o.parent = parent;
	3470	+
	3471	+ out.flush();
	3472	+
	3473	+ zstream.close();
	3474	+ out.close();
	3475	+
	3476	+ return baos.toByteArray();
	3477	+ } catch (Exception e)
	3478	+ {
	3479	+ System.err.println(e);
	3480	+ return null;
	3481	+ }
	3482	+ }
	3483	+
	3484	+ static public Object Uncompress(byte[] bytes)
	3485	+ {
	3486	+ System.out.println("#bytes = " + bytes.length);
	3487	+ try
	3488	+ {
	3489	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3490	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3491	+ ObjectInputStream in = new ObjectInputStream(istream);
	3492	+ Object obj = in.readObject();
	3493	+ in.close();
	3494	+
	3495	+ return obj;
	3496	+ } catch (Exception e)
	3497	+ {
	3498	+ System.err.println(e);
	3499	+ return null;
	3500	+ }
	3501	+ }
	3502	+
	3503	+ static public Object clone(Object o)
	3504	+ {
	3505	+ try
	3506	+ {
	3507	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3508	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3509	+
	3510	+ out.writeObject(o);
	3511	+
	3512	+ out.flush();
	3513	+ out.close();
	3514	+
	3515	+ byte[] bytes = baos.toByteArray();
	3516	+
	3517	+ System.out.println("clone = " + bytes.length);
	3518	+
	3519	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3520	+ ObjectInputStream in = new ObjectInputStream(bais);
	3521	+ Object obj = in.readObject();
	3522	+ in.close();
	3523	+
	3524	+ return obj;
	3525	+ } catch (Exception e)
	3526	+ {
	3527	+ System.err.println(e);
	3528	+ return null;
	3529	+ }
	3530	+ }
	3531	+
	3532	+ cRadio GetCurrentTab()
	3533	+ {
	3534	+ cRadio ab;
	3535	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3536	+ {
	3537	+ ab = (cRadio)e.nextElement();
	3538	+ if(ab.GetObject() == copy)
	3539	+ {
	3540	+ return ab;
	3541	+ }
	3542	+ }
	3543	+
	3544	+ return null;
	3545	+ }
	3546	+
	3547	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3548	+
	3549	+ public void Save()
	3550	+ {
	3551	+ System.err.println("Save");
	3552	+
	3553	+ cRadio tab = GetCurrentTab();
	3554	+
	3555	+ boolean temp = CameraPane.SWITCH;
	3556	+ CameraPane.SWITCH = false;
	3557	+
	3558	+ copy.ExtractBigData(hashtable);
	3559	+
	3560	+ byte[] compress = Compress(copy);
	3561	+
	3562	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3563	+ tab.graphs[tab.undoindex++] = compress;
	3564	+
	3565	+ copy.RestoreBigData(hashtable);
	3566	+
	3567	+ CameraPane.SWITCH = temp;
	3568	+
	3569	+ //assert(hashtable.isEmpty());
	3570	+
	3571	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3572	+ {
	3573	+ tab.graphs[i] = null;
	3574	+ }
	3575	+
	3576	+ SetUndoStates();
	3577	+
	3578	+ // test save
	3579	+ if (false)
	3580	+ {
	3581	+ try
	3582	+ {
	3583	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3584	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3585	+
	3586	+ p.writeObject(copy);
	3587	+
	3588	+ p.flush();
	3589	+
	3590	+ ostream.close();
	3591	+ } catch (Exception e)
	3592	+ {
	3593	+ e.printStackTrace();
	3594	+ }
	3595	+ }
	3596	+ }
	3597	+
	3598	+ void CopyChanged(Object3D obj)
	3599	+ {
	3600	+ SetUndoStates();
	3601	+
	3602	+ boolean temp = CameraPane.SWITCH;
	3603	+ CameraPane.SWITCH = false;
	3604	+
	3605	+ copy.ExtractBigData(hashtable);
	3606	+
	3607	+ copy.clear();
	3608	+
	3609	+ for (int i=0; i<obj.Size(); i++)
	3610	+ {
	3611	+ copy.add(obj.get(i));
	3612	+ }
	3613	+
	3614	+ copy.RestoreBigData(hashtable);
	3615	+
	3616	+ CameraPane.SWITCH = temp;
	3617	+
	3618	+ //assert(hashtable.isEmpty());
	3619	+
	3620	+ copy.Touch();
	3621	+
	3622	+ ResetModel();
	3623	+ copy.HardTouch(); // recompile?
	3624	+
	3625	+ cRadio ab;
	3626	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3627	+ {
	3628	+ ab = (cRadio)e.nextElement();
	3629	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3630	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3631	+ if (test != null)
	3632	+ {
	3633	+ test.editWindow = ab.object.editWindow;
	3634	+ ab.object = test;
	3635	+ }
	3636	+ }
	3637	+
	3638	+ refreshContents();
	3639	+ }
	3640	+
	3641	+ cButton undoButton;
	3642	+ cButton redoButton;
	3643	+
	3644	+ void SetUndoStates()
	3645	+ {
	3646	+ cRadio tab = GetCurrentTab();
	3647	+
	3648	+ undoButton.setEnabled(tab.undoindex > 0);
	3649	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3650	+ }
	3651	+
	3652	+ public void Undo()
	3653	+ {
	3654	+ System.err.println("Undo");
	3655	+
	3656	+ cRadio tab = GetCurrentTab();
	3657	+
	3658	+ if (tab.undoindex == 0)
	3659	+ {
	3660	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3661	+ return;
	3662	+ }
	3663	+
	3664	+ if (tab.graphs[tab.undoindex] == null)
	3665	+ {
	3666	+ Save();
	3667	+ tab.undoindex -= 1;
	3668	+ }
	3669	+
	3670	+ tab.undoindex -= 1;
	3671	+
	3672	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3673	+ }
	3674	+
	3675	+ public void Redo()
	3676	+ {
	3677	+ cRadio tab = GetCurrentTab();
	3678	+
	3679	+ if (tab.graphs[tab.undoindex + 1] == null)
	3680	+ {
	3681	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3682	+ return;
	3683	+ }
	3684	+
	3685	+ tab.undoindex += 1;
	3686	+
	3687	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3688	+ }
	3689	+
	3690	+ void ImportGFD()
	3691	+ {
	3692	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3693	+ browser.show();
	3694	+ String filename = browser.getFile();
	3695	+ if (filename != null && filename.length() > 0)
	3696	+ {
	3697	+ String fullname = browser.getDirectory() + filename;
	3698	+
	3699	+ //Object3D readobj =
	3700	+ objEditor.ReadGFD(fullname, objEditor);
	3701	+ //makeSomething(readobj);
	3702	+ }
	3703	+ }
	3704	+
	3705	+ void ImportVRMLX3D()
	3706	+ {
	3707	+ if (Grafreed.standAlone)
	3708	+ {
	3709	+ /**/
	3710	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3711	+ browser.show();
	3712	+ String filename = browser.getFile();
	3713	+ if (filename != null && filename.length() > 0)
	3714	+ {
	3715	+ String fullname = browser.getDirectory() + filename;
	3716	+ LoadVRMLX3D(fullname);
	3717	+ }
	3718	+ /**/
	3719	+ }
	3720	+ }
	3721	+
3191	3722	void ToggleAnimation()
3192	3723	{
3193	3724	if (!Globals.ANIMATION)
3194	3725	{
3195	3726	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3196		- browser.show();
	3727	+ browser.setVisible(true);
3197	3728	String filename = browser.getFile();
3198	3729	if (filename != null && filename.length() > 0)
3199	3730	{
..	..	@@ -3203,8 +3734,8 @@
3203	3734
3204	3735	Globals.ANIMATION ^= true;
3205	3736
3206		- GrafreeD.wav.cursor = 0;
3207		- GrafreeD.wav.loop = 0;
	3737	+ Grafreed.wav.cursor = 0;
	3738	+ Grafreed.wav.loop = 0;
3208	3739	}
3209	3740	} else
3210	3741	{
..	..	@@ -3254,7 +3785,7 @@
3254	3785	void CreateMaterial()
3255	3786	{
3256	3787	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3788	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3789	if (copy.selection.size() > 0)
3259	3790	//SetMaterial(copy);
3260	3791	{
..	..	@@ -3305,7 +3836,7 @@
3305	3836	assert false;
3306	3837	}
3307	3838
3308		- void EditSelection()
	3839	+ void EditSelection(boolean newWindow)
3309	3840	{
3310	3841	}
3311	3842
..	..	@@ -3313,11 +3844,11 @@
3313	3844	{
3314	3845	copy.ResetBlockLoop(); // temporary problem
3315	3846
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	3847	+ boolean random = CameraPane.SWITCH;
	3848	+ CameraPane.SWITCH = false; // parse everything
3318	3849	copy.ResetDisplayList();
3319	3850	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	3851	+ CameraPane.SWITCH = random;
3321	3852	}
3322	3853
3323	3854	// public void applySelf()
..	..	@@ -3391,6 +3922,36 @@
3391	3922	{
3392	3923	//System.out.println("Propagate = " + propagate);
3393	3924	copy.UpdateMaterial(anchor, current, propagate);
	3925	+
	3926	+ if (copy.material != null)
	3927	+ {
	3928	+ cMaterial mat = copy.material;
	3929	+
	3930	+ colorField.SetToolTipValue((mat.color));
	3931	+ modulationField.SetToolTipValue((mat.modulation));
	3932	+ metalnessField.SetToolTipValue((mat.metalness));
	3933	+ diffuseField.SetToolTipValue((mat.diffuse));
	3934	+ specularField.SetToolTipValue((mat.specular));
	3935	+ shininessField.SetToolTipValue((mat.shininess));
	3936	+ shiftField.SetToolTipValue((mat.shift));
	3937	+ ambientField.SetToolTipValue((mat.ambient));
	3938	+ lightareaField.SetToolTipValue((mat.lightarea));
	3939	+ diffusenessField.SetToolTipValue((mat.factor));
	3940	+ velvetField.SetToolTipValue((mat.velvet));
	3941	+ sheenField.SetToolTipValue((mat.sheen));
	3942	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3943	+ backlitField.SetToolTipValue((mat.bump));
	3944	+ anisoField.SetToolTipValue((mat.aniso));
	3945	+ anisoVField.SetToolTipValue((mat.anisoV));
	3946	+ cameraField.SetToolTipValue((mat.cameralight));
	3947	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3948	+ shadowField.SetToolTipValue((mat.shadow));
	3949	+ textureField.SetToolTipValue((mat.texture));
	3950	+ opacityField.SetToolTipValue((mat.opacity));
	3951	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3952	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3953	+ }
	3954	+
3394	3955	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	3956	{
3396	3957	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3435,6 +3996,7 @@
3435	3996	\|\| e.getSource() == apertureField
3436	3997	\|\| e.getSource() == shadowblurField)
3437	3998	{
	3999	+ new Exception().printStackTrace();
3438	4000	System.exit(0);
3439	4001	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3440	4002	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3505,7 +4067,7 @@
3505	4067	}
3506	4068
3507	4069	if (normalpushField != null)
3508		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4070	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3509	4071	}
3510	4072
3511	4073	void SnapObject()
..	..	@@ -3769,6 +4331,8 @@
3769	4331
3770	4332	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3771	4333	{
	4334	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4335	+ Save();
3772	4336	//Tween.set(thing, 0).target(1).start(tweenManager);
3773	4337	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3774	4338	// if (thing instanceof GenericJointDemo)
..	..	@@ -3855,6 +4419,12 @@
3855	4419	{
3856	4420	ResetModel();
3857	4421	Select(thing.GetTreePath(), true, false); // unselect... false);
	4422	+
	4423	+ if (thing.Size() == 0)
	4424	+ {
	4425	+ //EditSelection(false);
	4426	+ }
	4427	+
3858	4428	refreshContents();
3859	4429	}
3860	4430
..	..	@@ -3972,6 +4542,7 @@
3972	4542	}
3973	4543	}
3974	4544	}
	4545	+
3975	4546	LoadGFDThread loadGFDThread;
3976	4547
3977	4548	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3991,8 +4562,10 @@
3991	4562
3992	4563	try
3993	4564	{
	4565	+ // Try compressed version first.
3994	4566	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3995		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4567	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4568	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3996	4569
3997	4570	readobj = (Object3D) p.readObject();
3998	4571	istream.close();
..	..	@@ -4000,7 +4573,20 @@
4000	4573	readobj.ResetDisplayList();
4001	4574	} catch (Exception e)
4002	4575	{
4003		- e.printStackTrace();
	4576	+ //e.printStackTrace();
	4577	+ try
	4578	+ {
	4579	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4580	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4581	+
	4582	+ readobj = (Object3D) p.readObject();
	4583	+ istream.close();
	4584	+
	4585	+ readobj.ResetDisplayList();
	4586	+ } catch (Exception e2)
	4587	+ {
	4588	+ e2.printStackTrace();
	4589	+ }
4004	4590	}
4005	4591	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4006	4592	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4046,6 +4632,12 @@
4046	4632
4047	4633	void LoadIt(Object obj)
4048	4634	{
	4635	+ if (obj == null)
	4636	+ {
	4637	+ // Invalid file
	4638	+ return;
	4639	+ }
	4640	+
4049	4641	System.out.println("Loaded " + obj);
4050	4642	//new Exception().printStackTrace();
4051	4643	Object3D readobj = (Object3D) obj;
..	..	@@ -4055,6 +4647,8 @@
4055	4647
4056	4648	if (readobj != null)
4057	4649	{
	4650	+ if (Globals.SAVEONMAKE)
	4651	+ Save();
4058	4652	try
4059	4653	{
4060	4654	//readobj.deepCopySelf(copy);
..	..	@@ -4117,7 +4711,7 @@
4117	4711
4118	4712	void load() // throws ClassNotFoundException
4119	4713	{
4120		- if (GrafreeD.standAlone)
	4714	+ if (Grafreed.standAlone)
4121	4715	{
4122	4716	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4123	4717	browser.show();
..	..	@@ -4204,11 +4798,13 @@
4204	4798	try
4205	4799	{
4206	4800	FileOutputStream ostream = new FileOutputStream(lastname);
4207		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4801	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4802	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4208	4803
4209	4804	p.writeObject(copy);
4210	4805	p.flush();
4211	4806
	4807	+ zstream.close();
4212	4808	ostream.close();
4213	4809
4214	4810	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4218,17 +4814,20 @@
4218	4814	{
4219	4815	}
4220	4816	}
	4817	+
4221	4818	String lastname;
4222	4819
4223	4820	void saveAs()
4224	4821	{
4225		- if (GrafreeD.standAlone)
	4822	+ if (Grafreed.standAlone)
4226	4823	{
4227	4824	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4228	4825	browser.setVisible(true);
4229	4826	String filename = browser.getFile();
4230	4827	if (filename != null && filename.length() > 0)
4231	4828	{
	4829	+ if (!filename.endsWith(".gfd"))
	4830	+ filename += ".gfd";
4232	4831	lastname = browser.getDirectory() + filename;
4233	4832	save();
4234	4833	}
..	..	@@ -4327,13 +4926,13 @@
4327	4926	try
4328	4927	{
4329	4928	FileOutputStream ostream = new FileOutputStream(filename);
4330		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4331		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4929	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4930	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4332	4931
4333	4932	Object3D objectparent = obj.parent;
4334	4933	obj.parent = null;
4335	4934
4336		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4935	+ Object3D object = (Object3D) Grafreed.clone(obj);
4337	4936
4338	4937	obj.parent = objectparent;
4339	4938
..	..	@@ -4345,8 +4944,8 @@
4345	4944	p.writeObject(object);
4346	4945	p.flush();
4347	4946
	4947	+ zstream.close();
4348	4948	ostream.close();
4349		- // zstream.close();
4350	4949
4351	4950	// group.selection.get(0).parent = parent;
4352	4951	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4367,7 +4966,7 @@
4367	4966	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4368	4967	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4369	4968	copy.generatePOV(buffer);
4370		- if (GrafreeD.standAlone)
	4969	+ if (Grafreed.standAlone)
4371	4970	{
4372	4971	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4373	4972	browser.show();
..	..	@@ -4393,7 +4992,8 @@
4393	4992	Object3D client;
4394	4993	Object3D copy;
4395	4994	MenuBar menuBar;
4396		- Menu windowMenu;
	4995	+ Menu fileMenu;
	4996	+ MenuItem newItem;
4397	4997	MenuItem loadItem;
4398	4998	MenuItem saveItem;
4399	4999	MenuItem saveAsItem;
..	..	@@ -4401,13 +5001,11 @@
4401	5001	MenuItem reexportItem;
4402	5002	MenuItem povItem;
4403	5003	MenuItem closeItem;
4404		- Menu cameraMenu;
	5004	+
4405	5005	CheckboxMenuItem zBufferItem;
4406	5006	//MenuItem normalLensItem;
4407		- MenuItem editCameraItem;
4408		- MenuItem revertCameraItem;
4409		- CheckboxMenuItem toggleLiveItem;
4410	5007	MenuItem stepItem;
	5008	+ CheckboxMenuItem toggleLiveItem;
4411	5009	CheckboxMenuItem toggleFullScreenItem;
4412	5010	CheckboxMenuItem toggleTimelineItem;
4413	5011	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4416,25 +5014,38 @@
4416	5014	CheckboxMenuItem toggleFootContactItem;
4417	5015	CheckboxMenuItem toggleDLItem;
4418	5016	CheckboxMenuItem toggleTextureItem;
4419		- CheckboxMenuItem toggleRandomItem;
	5017	+ CheckboxMenuItem toggleSwitchItem;
4420	5018	CheckboxMenuItem toggleRootItem;
4421	5019	CheckboxMenuItem animationItem;
4422	5020	CheckboxMenuItem toggleHandleItem;
4423	5021	CheckboxMenuItem togglePaintItem;
4424	5022	JSplitPane mainPanel;
4425	5023	JScrollPane scrollpane;
	5024	+
4426	5025	JPanel toolbarPanel;
4427		- JPanel treePanel;
	5026	+
	5027	+ cGridBag treePanel;
	5028	+
4428	5029	JPanel radioPanel;
4429	5030	ButtonGroup buttonGroup;
4430		- cGridBag ctrlPanel;
	5031	+
	5032	+ cGridBag toolboxPanel;
4431	5033	cGridBag materialPanel;
	5034	+ cGridBag ctrlPanel;
	5035	+
4432	5036	JScrollPane infoPanel;
	5037	+
4433	5038	cGridBag optionsPanel;
	5039	+
4434	5040	JTabbedPane objectPanel;
	5041	+ boolean materialFlushed;
	5042	+ Object3D latestObject;
	5043	+
4435	5044	cGridBag XYZPanel;
	5045	+
4436	5046	JSplitPane gridPanel;
4437	5047	JSplitPane bigPanel;
	5048	+
4438	5049	cGridBag bigThree;
4439	5050	cGridBag scenePanel;
4440	5051	cGridBag centralPanel;
..	..	@@ -4549,8 +5160,13 @@
4549	5160	cNumberSlider fogField;
4550	5161	JLabel opacityPowerLabel;
4551	5162	cNumberSlider opacityPowerField;
4552		- JTree jTree;
	5163	+ cTree jTree;
4553	5164	//ObjectUI parent;
4554	5165
4555	5166	cNumberSlider normalpushField;
	5167	+
	5168	+ private MenuItem importGFDItem;
	5169	+ private MenuItem importVRMLX3DItem;
	5170	+ private MenuItem import3DSItem;
	5171	+ private MenuItem importOBJItem;
4556	5172	}