~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,79 +390,64 @@
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	452	infoPanel.setPreferredSize(new Dimension(50, 200));
373	453	infoPanel.setName("Info");
..	..	@@ -378,15 +458,21 @@
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	+
385	471	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	472	//mainPanel.setLayout(new GridBagLayout());
387	473	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
	474	+// treePanel.setLayout(new GridBagLayout());
	475	+ //ctrlPanel.setLayout(new GridBagLayout());
390	476	//materialPanel.setLayout(new GridBagLayout());
391	477
392	478	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
..	..	@@ -426,7 +512,7 @@
426	512	static String newline = "\n";
427	513	protected static final String buttonString = "JButton";
428	514	StyledDocument doc;
429		- JTextArea infoarea;
	515	+ JTextPane infoarea;
430	516
431	517	void ClearInfo()
432	518	{
..	..	@@ -449,10 +535,10 @@
449	535	e.printStackTrace();
450	536	}
451	537
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();
	538	+// String selection = infoarea.getText();
	539	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	540	+// java.awt.datatransfer.Clipboard clipboard =
	541	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	542	//clipboard.setContents(data, data);
457	543	}
458	544
..	..	@@ -475,13 +561,13 @@
475	561	//SendInfo("Name:", "bold");
476	562	if (sel.GetTextures() != null \|\| debug)
477	563	{
478		- si.SendInfo(sel.toString(), "bold");
	564	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	565	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	566	if (sel.Size() > 0)
481	567	{
482	568	si.SendInfo("#children = " + sel.Size(), "regular");
483	569	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	570	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	571	if (debug)
486	572	{
487	573	try
..	..	@@ -493,7 +579,10 @@
493	579	}
494	580
495	581	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	582	+ {
	583	+ si.SendInfo(" BBox min: " + minima, "regular");
	584	+ si.SendInfo(" BBox max: " + maxima, "regular");
	585	+ }
497	586
498	587	if (sel.bRep != null)
499	588	{
..	..	@@ -520,7 +609,7 @@
520	609	}
521	610	if (sel.support != null)
522	611	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	612	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	613	}
525	614	if (sel.scriptnode != null)
526	615	{
..	..	@@ -591,6 +680,9 @@
591	680	{
592	681	CameraPane.pointflow = (PointFlow) sel;
593	682	}
	683	+
	684	+ si.SendInfo("_____________________", "regular");
	685	+ si.SendInfo("", "regular");
594	686	}
595	687	}
596	688
..	..	@@ -606,68 +698,140 @@
606	698	}
607	699	}
608	700
	701	+static GraphicsDevice device = GraphicsEnvironment
	702	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	703	+
	704	+ Rectangle keeprect;
	705	+ cRadio radio;
	706	+
	707	+cButton keepButton;
	708	+ cButton twoButton; // Full 3D
	709	+ cButton sixButton;
	710	+ cButton threeButton;
	711	+ cButton sevenButton;
	712	+ cButton fourButton; // full panel
	713	+ cButton oneButton; // full XYZ
	714	+ //cButton currentLayout;
	715	+
	716	+ boolean maximized;
	717	+
	718	+ cButton fullscreenLayout;
	719	+
	720	+ void Minimize()
	721	+ {
	722	+ frame.setState(Frame.ICONIFIED);
	723	+ }
	724	+
	725	+ void Maximize()
	726	+ {
	727	+ if (maximized)
	728	+ {
	729	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	730	+ }
	731	+ else
	732	+ {
	733	+ keeprect = frame.getBounds();
	734	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	735	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	736	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	737	+// frame.setState(Frame.MAXIMIZED_BOTH);
	738	+ }
	739	+
	740	+ maximized ^= true;
	741	+ }
	742	+
609	743	void ToggleFullScreen()
610	744	{
611		- if (CameraPane.FULLSCREEN)
	745	+ cameraView.ToggleFullScreen();
	746	+
	747	+ if (!CameraPane.FULLSCREEN)
612	748	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	749	+ device.setFullScreenWindow(null);
	750	+ //frame.setVisible(false);
	751	+// frame.removeNotify();
	752	+// frame.setUndecorated(false);
	753	+// frame.addNotify();
	754	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	755	+
	756	+// X frame.getContentPane().remove(/"Center",/bigThree);
	757	+// X framePanel.add(bigThree);
	758	+// X frame.getContentPane().add(/"Center",/framePanel);
	759	+ framePanel.setDividerLocation(1);
	760	+
	761	+ //frame.setVisible(true);
	762	+ radio.layout = keepButton;
	763	+ //theFrame = null;
	764	+ keepButton = null;
	765	+ radio.layout.doClick();
	766	+
616	767	} else
617	768	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	769	+ keepButton = radio.layout;
	770	+ //keeprect = frame.getBounds();
	771	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	772	+// frame.getToolkit().getScreenSize().height);
	773	+ //frame.setVisible(false);
	774	+ device.setFullScreenWindow(frame);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(true);
	777	+// frame.addNotify();
	778	+// X frame.getContentPane().remove(/"Center",/framePanel);
	779	+// X framePanel.remove(bigThree);
	780	+// X frame.getContentPane().add(/"Center",/bigThree);
	781	+ framePanel.setDividerLocation(0);
	782	+
	783	+ radio.layout = fullscreenLayout;
	784	+ radio.layout.doClick();
	785	+ //frame.setVisible(true);
621	786	}
622		- cameraView.ToggleFullScreen();
623	787	}
624	788
625		- private JTextArea createTextPane()
	789	+ private JTextPane createTextPane()
626	790	{
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		- };
	791	+// TEXTAREA String[] initString =
	792	+// {
	793	+// "This is an editable JTextPane, ", //regular
	794	+// "another ", //italic
	795	+// "styled ", //bold
	796	+// "text ", //small
	797	+// "component, ", //large
	798	+// "which supports embedded components..." + newline,//regular
	799	+// " " + newline, //button
	800	+// "...and embedded icons..." + newline, //regular
	801	+// " ", //icon
	802	+// newline + "JTextPane is a subclass of JEditorPane that "
	803	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	804	+// + "cover methods for interacting with those objects."
	805	+// };
	806	+//
	807	+// String[] initStyles =
	808	+// {
	809	+// "regular", "italic", "bold", "small", "large",
	810	+// "regular", "button", "regular", "icon",
	811	+// "regular"
	812	+// };
	813	+//
	814	+// JTextPane textPane = new JTextPane();
	815	+// textPane.setEditable(true);
	816	+// /StyledDocument/ doc = textPane.getStyledDocument();
	817	+// addStylesToDocument(doc);
	818	+//
	819	+// try
	820	+// {
	821	+// for (int j = 0; j < 2; j++)
	822	+// {
	823	+// for (int i = 0; i < initString.length; i++)
	824	+// {
	825	+// doc.insertString(doc.getLength(), initString[i],
	826	+// doc.getStyle(initStyles[i]));
	827	+// }
	828	+// }
	829	+// } catch (BadLocationException ble)
	830	+// {
	831	+// System.err.println("Couldn't insert initial text into text pane.");
	832	+// }
642	833
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;
	834	+ return new JTextPane(); // textPane;
671	835	}
672	836
673	837	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +884,7 @@
720	884	protected static ImageIcon createImageIcon(String path,
721	885	String description)
722	886	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	887	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	888	if (imgURL != null)
725	889	{
726	890	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +916,7 @@
752	916	// NumberSlider vDivsField;
753	917	// JCheckBox endcaps;
754	918	JCheckBox liveCB;
	919	+ JCheckBox selectCB;
755	920	JCheckBox hideCB;
756	921	JCheckBox link2masterCB;
757	922	JCheckBox markCB;
..	..	@@ -759,7 +924,12 @@
759	924	JCheckBox speedupCB;
760	925	JCheckBox rewindCB;
761	926	JCheckBox flipVCB;
	927	+
	928	+ cCheckBox toggleTextureCB;
	929	+ cCheckBox toggleSwitchCB;
	930	+
762	931	JComboBox texresMenu;
	932	+
763	933	JButton resetButton;
764	934	JButton stepButton;
765	935	JButton stepAllButton;
..	..	@@ -767,54 +937,48 @@
767	937	JButton slowerButton;
768	938	JButton fasterButton;
769	939	JButton remarkButton;
	940	+
	941	+ cGridBag editPanel;
	942	+ cGridBag editCommandsPanel;
	943	+
	944	+ cGridBag namePanel;
	945	+ cGridBag setupPanel;
	946	+ cGridBag setupPanel2;
	947	+ cGridBag objectCommandsPanel;
	948	+ cGridBag pushPanel;
	949	+ cGridBag fillPanel;
770	950
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	951	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	952	{
773	953	JCheckBox cb;
774	954
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);
	955	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	956	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	957
785	958	return cb;
786	959	}
787	960
788		- cButton AddButton(ObjEditor oe, String label)
	961	+ cButton AddButton(cGridBag panel, String label)
789	962	{
790	963	cButton cb;
791	964
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);
	965	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	966	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	967
802	968	return cb;
803	969	}
804	970
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	971	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	972	{
807	973	JComboBox combo;
808	974
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;
	975	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	976	combo.addActionListener(this);
813	977
814	978	return combo;
815	979	}
816	980
817		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
	981	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	982	{
819	983	cGridBag control = new cGridBag();
820	984
..	..	@@ -826,12 +990,12 @@
826	990	control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827	991	combo.setFloat(current);
828	992
829		- ctrlPanel.add(control);
	993	+ panel.add(control);
830	994
831		- return combo;
	995	+ return control;
832	996	}
833	997
834		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
	998	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835	999	{
836	1000	cGridBag control = new cGridBag();
837	1001
..	..	@@ -839,25 +1003,21 @@
839	1003
840	1004	JLabel jlabel = new JLabel(label);
841	1005	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);
	1006	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1007	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844	1008	combo.setInteger(current);
845	1009
846		- ctrlPanel.add(control);
	1010	+ panel.add(control);
847	1011
848		- return combo;
	1012	+ return control;
849	1013	}
850	1014
851	1015	JTextArea AddText(cGridBag ctrlPanel, String name)
852	1016	{
853	1017	JTextArea text;
854	1018
855		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857	1019	ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1020	text.addCaretListener(this);
859		- aConstraints.gridx += 1;
860		- aConstraints.gridwidth = 1;
861	1021
862	1022	return text;
863	1023	}
..	..	@@ -896,7 +1056,7 @@
896	1056
897	1057	/*
898	1058	*/
899		- void Return() // ObjEditor oe)
	1059	+ void Return0() // ObjEditor oe)
900	1060	{
901	1061	aConstraints.gridy += 1;
902	1062	aConstraints.gridx = 0;
..	..	@@ -951,37 +1111,76 @@
951	1111
952	1112	void SetupUI2(ObjEditor oe)
953	1113	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958		- SetupName(oe);
	1114	+ //SetupName(oe);
959	1115
960		- if (!GroupEditor.allparams)
	1116	+ namePanel = new cGridBag();
	1117	+
	1118	+ nameField = AddText(namePanel, copy.GetName());
	1119	+ namePanel.add(nameField);
	1120	+ oe.ctrlPanel.add(namePanel);
	1121	+
	1122	+ oe.ctrlPanel.Return();
	1123	+
	1124	+ if (!allparams)
961	1125	return;
962	1126
963		- liveCB = AddCheckBox(oe, "Live", copy.live);
964		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1127	+ setupPanel = new cGridBag().setVertical(false);
	1128	+
	1129	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1130	+ liveCB.setToolTipText("Animate object");
	1131	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1132	+ selectCB.setToolTipText("Make object selectable");
966	1133	// 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");
	1134	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1135	+ hideCB.setToolTipText("Hide object");
	1136	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1137	+ markCB.setToolTipText("As animation target transform");
	1138	+
	1139	+ setupPanel2 = new cGridBag().setVertical(false);
	1140	+
	1141	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1142	+ rewindCB.setToolTipText("Rewind animation");
	1143	+
	1144	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1145	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1146	+
	1147	+ if (Globals.ADVANCED)
	1148	+ {
	1149	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1150	+ link2masterCB.setToolTipText("Attach to support");
	1151	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1152	+ speedupCB.setToolTipText("Option motion capture");
	1153	+ }
	1154	+
	1155	+ oe.ctrlPanel.add(setupPanel);
	1156	+ oe.ctrlPanel.Return();
	1157	+ oe.ctrlPanel.add(setupPanel2);
	1158	+ oe.ctrlPanel.Return();
	1159	+
	1160	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1161	+
	1162	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1163	+ resetButton.setToolTipText("Jump to frame zero");
	1164	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1165	+ stepButton.setToolTipText("Step one frame");
973	1166	// resetAllButton = AddButton(oe, "Reset All");
974	1167	// stepAllButton = AddButton(oe, "Step All");
975		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
976	1168	// Return();
977		- slowerButton = AddButton(oe, "Slow");
978		- fasterButton = AddButton(oe, "Fast");
979		- remarkButton = AddButton(oe, "Rem");
	1169	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1170	+ slowerButton.setToolTipText("Decrease animation speed");
	1171	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1172	+ fasterButton.setToolTipText("Increase animation speed");
	1173	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1174	+ remarkButton.setToolTipText("Set the current transform as the target");
980	1175
981		- //Return();
	1176	+ oe.ctrlPanel.add(objectCommandsPanel);
	1177	+ oe.ctrlPanel.Return();
982	1178
983		- //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
	1179	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1180	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
984	1181	//Return();
	1182	+
	1183	+ oe.ctrlPanel.Return();
985	1184
986	1185	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1186	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1076,7 +1275,7 @@
1076	1275	oe.aConstraints.gridwidth = 1;
1077	1276	/**/
1078	1277	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1278	+ oe.ctrlPanel.Return();
1080	1279
1081	1280	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1281	//textureButton.setEnabled(false);
..	..	@@ -1180,8 +1379,11 @@
1180	1379	//worldPanel.setName("World");
1181	1380	centralPanel = new cGridBag();
1182	1381	centralPanel.preferredWidth = 20;
1183		- timelinePanel = new JPanel(new BorderLayout());
1184		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1382	+
	1383	+ if (Globals.ADVANCED)
	1384	+ {
	1385	+ timelinePanel = new JPanel(new BorderLayout());
	1386	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1185	1387
1186	1388	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1187	1389	cameraPanel.setContinuousLayout(true);
..	..	@@ -1190,7 +1392,10 @@
1190	1392	// cameraPanel.setDividerSize(9);
1191	1393	cameraPanel.setResizeWeight(1.0);
1192	1394
	1395	+ }
	1396	+
1193	1397	centralPanel.add(cameraView);
	1398	+ centralPanel.setFocusable(true);
1194	1399	//frame.setJMenuBar(timelineMenubar);
1195	1400	//centralPanel.add(timelinePanel);
1196	1401
..	..	@@ -1253,11 +1458,13 @@
1253	1458	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254	1459	//tmp.setName("Edit");
1255	1460	objectPanel.add(materialPanel);
1256		- JPanel north = new JPanel(new BorderLayout());
1257		- north.setName("Edit");
1258		- north.add(ctrlPanel, BorderLayout.NORTH);
1259		- objectPanel.add(north);
	1461	+// JPanel north = new JPanel(new BorderLayout());
	1462	+// north.setName("Edit");
	1463	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1464	+// objectPanel.add(north);
	1465	+ objectPanel.add(editPanel);
1260	1466	objectPanel.add(infoPanel);
	1467	+ objectPanel.add(toolboxPanel);
1261	1468
1262	1469	/*
1263	1470	aConstraints.gridx = 0;
..	..	@@ -1266,7 +1473,7 @@
1266	1473	aConstraints.gridy += 1;
1267	1474	aConstraints.gridwidth = 1;
1268	1475	mainPanel.add(objectPanel, aConstraints);
1269		- */
	1476	+ */
1270	1477
1271	1478	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1272	1479	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1278,14 +1485,12 @@
1278	1485	scrollpane.addMouseWheelListener(this); // Default not fast enough
1279	1486
1280	1487	/JTabbedPane/ scenePanel = new cGridBag();
1281		- scenePanel.preferredWidth = 7;
	1488	+ scenePanel.preferredWidth = 6;
1282	1489
1283	1490	JTabbedPane tabbedPane = new JTabbedPane();
1284	1491	tabbedPane.add(scrollpane);
1285	1492
1286		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287		-
1288		- optionsPanel = new cGridBag().setVertical(true);
	1493	+ optionsPanel = new cGridBag().setVertical(false);
1289	1494
1290	1495	optionsPanel.setName("Options");
1291	1496
..	..	@@ -1293,6 +1498,8 @@
1293	1498
1294	1499	tabbedPane.add(optionsPanel);
1295	1500
	1501	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1502	+
1296	1503	scenePanel.add(tabbedPane);
1297	1504
1298	1505	/*
..	..	@@ -1384,9 +1591,13 @@
1384	1591
1385	1592	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1386	1593
1387		- frame.setSize(1024, 768);
1388		- frame.show();
	1594	+ frame.setSize(1280, 860);
	1595	+
	1596	+ frame.validate();
	1597	+ frame.setVisible(true);
1389	1598
	1599	+ cameraView.requestFocusInWindow();
	1600	+
1390	1601	gridPanel.setDividerLocation(1.0);
1391	1602
1392	1603	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1415,7 +1626,7 @@
1415	1626	ctrlPanel.removeAll();
1416	1627	}
1417	1628
1418		- void SetupMaterial(cGridBag ctrlPanel)
	1629	+ void SetupMaterial(cGridBag panel)
1419	1630	{
1420	1631	/*
1421	1632	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
..	..	@@ -1424,18 +1635,26 @@
1424	1635
1425	1636	cGridBag editBar = new cGridBag().setVertical(false);
1426	1637
1427		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1638	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1639	+ createMaterialButton.setToolTipText("Create material");
1428	1640
1429	1641	/*
1430	1642	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	1643	*/
1432	1644
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);
	1645	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1646	+ clearMaterialButton.setToolTipText("Clear material");
	1647	+
	1648	+ if (Globals.ADVANCED)
	1649	+ {
	1650	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1651	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1652	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1653	+ }
1437	1654
1438		- ctrlPanel.add(editBar);
	1655	+ editBar.preferredHeight = 15;
	1656	+
	1657	+ panel.add(editBar);
1439	1658
1440	1659	/**/
1441	1660	//aConstraints.weighty = 0;
..	..	@@ -1484,9 +1703,9 @@
1484	1703	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1485	1704	colorSection.add(shadowbias);
1486	1705
1487		- ctrlPanel.add(new JSeparator());
	1706	+ panel.add(new JSeparator());
1488	1707
1489		- ctrlPanel.add(colorSection);
	1708	+ panel.add(colorSection);
1490	1709
1491	1710	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1492	1711
..	..	@@ -1534,9 +1753,9 @@
1534	1753	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1535	1754	diffuseSection.add(fakedepth);
1536	1755
1537		- ctrlPanel.add(new JSeparator());
	1756	+ panel.add(new JSeparator());
1538	1757
1539		- ctrlPanel.add(diffuseSection);
	1758	+ panel.add(diffuseSection);
1540	1759
1541	1760	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1542	1761
..	..	@@ -1572,7 +1791,7 @@
1572	1791	velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1573	1792	specularSection.add(velvet);
1574	1793
1575		- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	1794	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1576	1795	//Return();
1577	1796	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1578	1797	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..	..	@@ -1585,9 +1804,9 @@
1585	1804	// aConstraints.gridwidth = 1;
1586	1805
1587	1806
1588		- ctrlPanel.add(new JSeparator());
	1807	+ panel.add(new JSeparator());
1589	1808
1590		- ctrlPanel.add(specularSection);
	1809	+ panel.add(specularSection);
1591	1810
1592	1811	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1593	1812
..	..	@@ -1617,9 +1836,9 @@
1617	1836	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1618	1837	globalSection.add(opacity);
1619	1838
1620		- ctrlPanel.add(new JSeparator());
	1839	+ panel.add(new JSeparator());
1621	1840
1622		- ctrlPanel.add(globalSection);
	1841	+ panel.add(globalSection);
1623	1842
1624	1843	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1625	1844
..	..	@@ -1661,9 +1880,9 @@
1661	1880	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1662	1881	textureSection.add(opacityPower);
1663	1882
1664		- ctrlPanel.add(new JSeparator());
	1883	+ panel.add(new JSeparator());
1665	1884
1666		- ctrlPanel.add(textureSection);
	1885	+ panel.add(textureSection);
1667	1886
1668	1887	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1669	1888
..	..	@@ -1700,12 +1919,15 @@
1700	1919	opacityPowerField.addChangeListener(this);
1701	1920	/**/
1702	1921
1703		- resetSlidersButton.addActionListener(this);
1704	1922	clearMaterialButton.addActionListener(this);
1705	1923	createMaterialButton.addActionListener(this);
1706		-
1707		- propagateToggle.addItemListener(this);
1708		- multiplyToggle.addItemListener(this);
	1924	+
	1925	+ if (Globals.ADVANCED)
	1926	+ {
	1927	+ resetSlidersButton.addActionListener(this);
	1928	+ propagateToggle.addItemListener(this);
	1929	+ multiplyToggle.addItemListener(this);
	1930	+ }
1709	1931	}
1710	1932
1711	1933	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1876,7 +2098,7 @@
1876	2098
1877	2099	//? flashIt = false;
1878	2100	CameraPane pane = (CameraPane) cameraView;
1879		- pane.clickStart(location.x, location.y, 0);
	2101	+ pane.clickStart(location.x, location.y, 0, 0);
1880	2102	pane.clickEnd(location.x, location.y, 0, true);
1881	2103
1882	2104	if (group.selection.size() == 1)
..	..	@@ -1925,6 +2147,7 @@
1925	2147	e2.printStackTrace();
1926	2148	}
1927	2149	}
	2150	+
1928	2151	LoadJMEThread loadThread;
1929	2152
1930	2153	class LoadJMEThread extends Thread
..	..	@@ -1982,6 +2205,7 @@
1982	2205	//LoadFile0(filename, converter);
1983	2206	}
1984	2207	}
	2208	+
1985	2209	LoadOBJThread loadObjThread;
1986	2210
1987	2211	class LoadOBJThread extends Thread
..	..	@@ -2060,19 +2284,19 @@
2060	2284
2061	2285	void LoadObjFile(String fullname)
2062	2286	{
2063		- /*
	2287	+ System.out.println("Loading " + fullname);
	2288	+ /**/
2064	2289	//lastFilename = fullname;
2065	2290	if(loadObjThread == null)
2066	2291	{
2067		- loadObjThread = new LoadOBJThread();
2068		- loadObjThread.start();
	2292	+ loadObjThread = new LoadOBJThread();
	2293	+ loadObjThread.start();
2069	2294	}
2070	2295
2071	2296	loadObjThread.add(fullname);
2072		- */
	2297	+ /**/
2073	2298
2074		- System.out.println("Loading " + fullname);
2075		- makeSomething(new FileObject(fullname, true), true);
	2299	+ //makeSomething(new FileObject(fullname, true), true);
2076	2300	}
2077	2301
2078	2302	void LoadGFDFile(String fullname)
..	..	@@ -2333,11 +2557,11 @@
2333	2557
2334	2558	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2335	2559	{
2336		- if (GrafreeD.standAlone)
	2560	+ if (Grafreed.standAlone)
2337	2561	{
2338	2562	/**/
2339	2563	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2340		- browser.show();
	2564	+ browser.setVisible(true);
2341	2565	String filename = browser.getFile();
2342	2566	if (filename != null && filename.length() > 0)
2343	2567	{
..	..	@@ -2482,6 +2706,7 @@
2482	2706	}
2483	2707	if (input == null)
2484	2708	{
	2709	+ new Exception().printStackTrace();
2485	2710	System.exit(0);
2486	2711	}
2487	2712
..	..	@@ -2688,6 +2913,8 @@
2688	2913
2689	2914	void SetMaterial(Object3D object)
2690	2915	{
	2916	+ latestObject = object;
	2917	+
2691	2918	cMaterial mat = object.material;
2692	2919
2693	2920	if (mat == null)
..	..	@@ -2696,7 +2923,8 @@
2696	2923	return;
2697	2924	}
2698	2925
2699		- multiplyToggle.setSelected(mat.multiply);
	2926	+ if (multiplyToggle != null)
	2927	+ multiplyToggle.setSelected(mat.multiply);
2700	2928
2701	2929	assert (object.projectedVertices != null);
2702	2930
..	..	@@ -2798,12 +3026,17 @@
2798	3026	// }
2799	3027
2800	3028	/**/
2801		- if (deselect)
	3029	+ if (deselect \|\| child == null)
2802	3030	{
2803	3031	//group.deselectAll();
2804	3032	//freeze = true;
2805	3033	GetTree().clearSelection();
2806	3034	//freeze = false;
	3035	+
	3036	+ if (child == null)
	3037	+ {
	3038	+ return;
	3039	+ }
2807	3040	}
2808	3041
2809	3042	//group.addSelectee(child);
..	..	@@ -2872,7 +3105,7 @@
2872	3105	cameraView.ToggleDL();
2873	3106	cameraView.repaint();
2874	3107	return;
2875		- } else if (event.getSource() == toggleTextureItem)
	3108	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2876	3109	{
2877	3110	cameraView.ToggleTexture();
2878	3111	// june 2013 copy.HardTouch();
..	..	@@ -2911,9 +3144,9 @@
2911	3144	frame.validate();
2912	3145
2913	3146	return;
2914		- } else if (event.getSource() == toggleRandomItem)
	3147	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2915	3148	{
2916		- cameraView.ToggleRandom();
	3149	+ cameraView.ToggleSwitch();
2917	3150	cameraView.repaint();
2918	3151	return;
2919	3152	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2942,6 +3175,10 @@
2942	3175	{
2943	3176	copy.live ^= true;
2944	3177	return;
	3178	+ } else if (event.getSource() == selectCB)
	3179	+ {
	3180	+ copy.dontselect ^= true;
	3181	+ return;
2945	3182	} else if (event.getSource() == hideCB)
2946	3183	{
2947	3184	copy.hide ^= true;
..	..	@@ -2956,6 +3193,7 @@
2956	3193	if (event.getSource() == randomCB)
2957	3194	{
2958	3195	copy.random ^= true;
	3196	+ objEditor.refreshContents();
2959	3197	return;
2960	3198	}
2961	3199	if (event.getSource() == speedupCB)
..	..	@@ -2979,8 +3217,9 @@
2979	3217
2980	3218	public void actionPerformed(ActionEvent event)
2981	3219	{
	3220	+ Object source = event.getSource();
2982	3221	// SCRIPT DIALOG
2983		- if (event.getSource() == okbutton)
	3222	+ if (source == okbutton)
2984	3223	{
2985	3224	textpanel.setVisible(false);
2986	3225	textpanel.remove(textarea);
..	..	@@ -2992,7 +3231,7 @@
2992	3231	textarea = null;
2993	3232	textpanel = null;
2994	3233	}
2995		- if (event.getSource() == cancelbutton)
	3234	+ if (source == cancelbutton)
2996	3235	{
2997	3236	textpanel.setVisible(false);
2998	3237	textpanel.remove(textarea);
..	..	@@ -3004,50 +3243,50 @@
3004	3243	//applySelf();
3005	3244	//client.refreshEditWindow();
3006	3245	//refreshContents();
3007		- if (event.getSource() == nameField)
	3246	+ if (source == nameField)
3008	3247	{
3009	3248	//System.out.println("ObjEditor " + event);
3010	3249	applySelf0(true);
3011	3250	//parent.applySelf();
3012	3251	objEditor.refreshContents();
3013		- } else if (event.getSource() == resetButton)
	3252	+ } else if (source == resetButton)
3014	3253	{
3015	3254	CameraPane.fullreset = true;
3016	3255	copy.Reset(); // ResetMeshes();
3017	3256	copy.Touch();
3018	3257	objEditor.refreshContents();
3019		- } else if (event.getSource() == stepItem)
	3258	+ } else if (source == stepItem)
3020	3259	{
3021	3260	//cameraView.ONESTEP = true;
3022	3261	Globals.ONESTEP = true;
3023	3262	cameraView.repaint();
3024	3263	return;
3025		- } else if (event.getSource() == stepButton)
	3264	+ } else if (source == stepButton)
3026	3265	{
3027	3266	copy.Step();
3028	3267	copy.Touch();
3029	3268	objEditor.refreshContents();
3030		- } else if (event.getSource() == slowerButton)
	3269	+ } else if (source == slowerButton)
3031	3270	{
3032	3271	copy.Slower();
3033	3272	copy.Touch();
3034	3273	objEditor.refreshContents();
3035		- } else if (event.getSource() == fasterButton)
	3274	+ } else if (source == fasterButton)
3036	3275	{
3037	3276	copy.Faster();
3038	3277	copy.Touch();
3039	3278	objEditor.refreshContents();
3040		- } else if (event.getSource() == remarkButton)
	3279	+ } else if (source == remarkButton)
3041	3280	{
3042	3281	copy.Remark();
3043	3282	copy.Touch();
3044	3283	objEditor.refreshContents();
3045		- } else if (event.getSource() == stepAllButton)
	3284	+ } else if (source == stepAllButton)
3046	3285	{
3047	3286	copy.StepAll();
3048	3287	copy.Touch();
3049	3288	objEditor.refreshContents();
3050		- } else if (event.getSource() == resetAllButton)
	3289	+ } else if (source == resetAllButton)
3051	3290	{
3052	3291	//CameraPane.fullreset = true;
3053	3292	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3080,53 +3319,75 @@
3080	3319	// Close();
3081	3320	// }
3082	3321	// else
3083		- if (event.getSource() == resetSlidersButton)
	3322	+ if (source == resetSlidersButton)
3084	3323	{
3085	3324	ResetSliders();
3086		- } else if (event.getSource() == clearMaterialButton)
	3325	+ } else if (source == clearMaterialButton)
3087	3326	{
3088	3327	ClearMaterial();
3089		- } else if (event.getSource() == createMaterialButton)
	3328	+ } else if (source == createMaterialButton)
3090	3329	{
3091	3330	CreateMaterial();
3092		- } else if (event.getSource() == clearPanelButton)
	3331	+ } else if (source == clearPanelButton)
3093	3332	{
3094	3333	copy.ClearUI();
3095	3334	refreshContents(true);
3096		- } /*
3097		- }
3098		-
3099		- public boolean action(Event event, Object arg)
3100		- {
3101		- */ else if (event.getSource() == closeItem)
	3335	+ } else if (source == importGFDItem)
	3336	+ {
	3337	+ ImportGFD();
	3338	+ } else
	3339	+ if (source == importVRMLX3DItem)
	3340	+ {
	3341	+ ImportVRMLX3D();
	3342	+ } else
	3343	+ if (source == import3DSItem)
	3344	+ {
	3345	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3346	+ } else
	3347	+ if (source == importOBJItem)
	3348	+ {
	3349	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3350	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3351	+ browser.setVisible(true);
	3352	+ String filename = browser.getFile();
	3353	+ if (filename != null && filename.length() > 0)
	3354	+ {
	3355	+ String fullname = browser.getDirectory() + filename;
	3356	+ makeSomething(ReadOBJ(fullname), true);
	3357	+ }
	3358	+ } else
	3359	+ if (source == closeItem)
3102	3360	{
3103	3361	Close();
3104	3362	//return true;
3105		- } else if (event.getSource() == loadItem)
	3363	+ } else if (source == loadItem)
3106	3364	{
3107	3365	load();
3108	3366	//return true;
3109		- } else if (event.getSource() == saveItem)
	3367	+ } else if (source == newItem)
	3368	+ {
	3369	+ New();
	3370	+ } else if (source == saveItem)
3110	3371	{
3111	3372	save();
3112	3373	//return true;
3113		- } else if (event.getSource() == saveAsItem)
	3374	+ } else if (source == saveAsItem)
3114	3375	{
3115	3376	saveAs();
3116	3377	//return true;
3117		- } else if (event.getSource() == reexportItem)
	3378	+ } else if (source == reexportItem)
3118	3379	{
3119	3380	reexport();
3120	3381	//return true;
3121		- } else if (event.getSource() == exportAsItem)
	3382	+ } else if (source == exportAsItem)
3122	3383	{
3123	3384	export();
3124	3385	//return true;
3125		- } else if (event.getSource() == povItem)
	3386	+ } else if (source == povItem)
3126	3387	{
3127	3388	generatePOV();
3128	3389	//return true;
3129		- } else if (event.getSource() == zBufferItem)
	3390	+ } else if (source == zBufferItem)
3130	3391	{
3131	3392	try
3132	3393	{
..	..	@@ -3148,21 +3409,8 @@
3148	3409	cameraView.repaint();
3149	3410	//return true;
3150	3411	}
3151		- */ else if (event.getSource() == editCameraItem)
3152		- {
3153		- cameraView.ProtectCamera();
3154		- cameraView.repaint();
3155		- return;
3156		- } else if (event.getSource() == revertCameraItem)
3157		- {
3158		- cameraView.RevertCamera();
3159		- cameraView.repaint();
3160		- return;
3161		-// } else if (event.getSource() == textureButton)
3162		-// {
3163		-// return; // true;
3164		- } else // combos...
3165		- if (event.getSource() == texresMenu)
	3412	+ */ else // combos...
	3413	+ if (source == texresMenu)
3166	3414	{
3167	3415	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3168	3416	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3174,12 +3422,287 @@
3174	3422	}
3175	3423	}
3176	3424
	3425	+ void New()
	3426	+ {
	3427	+ while (copy.Size() > 1)
	3428	+ {
	3429	+ copy.remove(1);
	3430	+ }
	3431	+
	3432	+ ResetModel();
	3433	+ objEditor.refreshContents();
	3434	+ }
	3435	+
	3436	+ static public byte[] Compress(Object3D o)
	3437	+ {
	3438	+ try
	3439	+ {
	3440	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3441	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3442	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3443	+
	3444	+ Object3D parent = o.parent;
	3445	+ o.parent = null;
	3446	+
	3447	+ out.writeObject(o);
	3448	+
	3449	+ o.parent = parent;
	3450	+
	3451	+ out.flush();
	3452	+
	3453	+ zstream.close();
	3454	+ out.close();
	3455	+
	3456	+ return baos.toByteArray();
	3457	+ } catch (Exception e)
	3458	+ {
	3459	+ System.err.println(e);
	3460	+ return null;
	3461	+ }
	3462	+ }
	3463	+
	3464	+ static public Object Uncompress(byte[] bytes)
	3465	+ {
	3466	+ System.out.println("#bytes = " + bytes.length);
	3467	+ try
	3468	+ {
	3469	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3470	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3471	+ ObjectInputStream in = new ObjectInputStream(istream);
	3472	+ Object obj = in.readObject();
	3473	+ in.close();
	3474	+
	3475	+ return obj;
	3476	+ } catch (Exception e)
	3477	+ {
	3478	+ System.err.println(e);
	3479	+ return null;
	3480	+ }
	3481	+ }
	3482	+
	3483	+ static public Object clone(Object o)
	3484	+ {
	3485	+ try
	3486	+ {
	3487	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3488	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3489	+
	3490	+ out.writeObject(o);
	3491	+
	3492	+ out.flush();
	3493	+ out.close();
	3494	+
	3495	+ byte[] bytes = baos.toByteArray();
	3496	+
	3497	+ System.out.println("clone = " + bytes.length);
	3498	+
	3499	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3500	+ ObjectInputStream in = new ObjectInputStream(bais);
	3501	+ Object obj = in.readObject();
	3502	+ in.close();
	3503	+
	3504	+ return obj;
	3505	+ } catch (Exception e)
	3506	+ {
	3507	+ System.err.println(e);
	3508	+ return null;
	3509	+ }
	3510	+ }
	3511	+
	3512	+ cRadio GetCurrentTab()
	3513	+ {
	3514	+ cRadio ab;
	3515	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3516	+ {
	3517	+ ab = (cRadio)e.nextElement();
	3518	+ if(ab.GetObject() == copy)
	3519	+ {
	3520	+ return ab;
	3521	+ }
	3522	+ }
	3523	+
	3524	+ return null;
	3525	+ }
	3526	+
	3527	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3528	+
	3529	+ public void Save()
	3530	+ {
	3531	+ System.err.println("Save");
	3532	+
	3533	+ cRadio tab = GetCurrentTab();
	3534	+
	3535	+ boolean temp = CameraPane.SWITCH;
	3536	+ CameraPane.SWITCH = false;
	3537	+
	3538	+ copy.ExtractBigData(hashtable);
	3539	+
	3540	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3541	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3542	+
	3543	+ copy.RestoreBigData(hashtable);
	3544	+
	3545	+ CameraPane.SWITCH = temp;
	3546	+
	3547	+ //assert(hashtable.isEmpty());
	3548	+
	3549	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3550	+ {
	3551	+ tab.graphs[i] = null;
	3552	+ }
	3553	+
	3554	+ SetUndoStates();
	3555	+
	3556	+ // test save
	3557	+ if (false)
	3558	+ {
	3559	+ try
	3560	+ {
	3561	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3562	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3563	+
	3564	+ p.writeObject(copy);
	3565	+
	3566	+ p.flush();
	3567	+
	3568	+ ostream.close();
	3569	+ } catch (Exception e)
	3570	+ {
	3571	+ e.printStackTrace();
	3572	+ }
	3573	+ }
	3574	+ }
	3575	+
	3576	+ void CopyChanged(Object3D obj)
	3577	+ {
	3578	+ SetUndoStates();
	3579	+
	3580	+ boolean temp = CameraPane.SWITCH;
	3581	+ CameraPane.SWITCH = false;
	3582	+
	3583	+ copy.ExtractBigData(hashtable);
	3584	+
	3585	+ copy.clear();
	3586	+
	3587	+ for (int i=0; i<obj.Size(); i++)
	3588	+ {
	3589	+ copy.add(obj.get(i));
	3590	+ }
	3591	+
	3592	+ copy.RestoreBigData(hashtable);
	3593	+
	3594	+ CameraPane.SWITCH = temp;
	3595	+
	3596	+ //assert(hashtable.isEmpty());
	3597	+
	3598	+ copy.Touch();
	3599	+
	3600	+ ResetModel();
	3601	+ copy.HardTouch(); // recompile?
	3602	+
	3603	+ cRadio ab;
	3604	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3605	+ {
	3606	+ ab = (cRadio)e.nextElement();
	3607	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3608	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3609	+ if (test != null)
	3610	+ {
	3611	+ test.editWindow = ab.object.editWindow;
	3612	+ ab.object = test;
	3613	+ }
	3614	+ }
	3615	+
	3616	+ refreshContents();
	3617	+ }
	3618	+
	3619	+ cButton undoButton;
	3620	+ cButton redoButton;
	3621	+
	3622	+ void SetUndoStates()
	3623	+ {
	3624	+ cRadio tab = GetCurrentTab();
	3625	+
	3626	+ undoButton.setEnabled(tab.undoindex > 0);
	3627	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3628	+ }
	3629	+
	3630	+ public void Undo()
	3631	+ {
	3632	+ System.err.println("Undo");
	3633	+
	3634	+ cRadio tab = GetCurrentTab();
	3635	+
	3636	+ if (tab.undoindex == 0)
	3637	+ {
	3638	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3639	+ return;
	3640	+ }
	3641	+
	3642	+ if (tab.graphs[tab.undoindex] == null)
	3643	+ {
	3644	+ Save();
	3645	+ tab.undoindex -= 1;
	3646	+ }
	3647	+
	3648	+ tab.undoindex -= 1;
	3649	+
	3650	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3651	+ }
	3652	+
	3653	+ public void Redo()
	3654	+ {
	3655	+ cRadio tab = GetCurrentTab();
	3656	+
	3657	+ if (tab.graphs[tab.undoindex + 1] == null)
	3658	+ {
	3659	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3660	+ return;
	3661	+ }
	3662	+
	3663	+ tab.undoindex += 1;
	3664	+
	3665	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3666	+ }
	3667	+
	3668	+ void ImportGFD()
	3669	+ {
	3670	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3671	+ browser.show();
	3672	+ String filename = browser.getFile();
	3673	+ if (filename != null && filename.length() > 0)
	3674	+ {
	3675	+ String fullname = browser.getDirectory() + filename;
	3676	+
	3677	+ //Object3D readobj =
	3678	+ objEditor.ReadGFD(fullname, objEditor);
	3679	+ //makeSomething(readobj);
	3680	+ }
	3681	+ }
	3682	+
	3683	+ void ImportVRMLX3D()
	3684	+ {
	3685	+ if (Grafreed.standAlone)
	3686	+ {
	3687	+ /**/
	3688	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3689	+ browser.show();
	3690	+ String filename = browser.getFile();
	3691	+ if (filename != null && filename.length() > 0)
	3692	+ {
	3693	+ String fullname = browser.getDirectory() + filename;
	3694	+ LoadVRMLX3D(fullname);
	3695	+ }
	3696	+ /**/
	3697	+ }
	3698	+ }
	3699	+
3177	3700	void ToggleAnimation()
3178	3701	{
3179	3702	if (!Globals.ANIMATION)
3180	3703	{
3181	3704	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3182		- browser.show();
	3705	+ browser.setVisible(true);
3183	3706	String filename = browser.getFile();
3184	3707	if (filename != null && filename.length() > 0)
3185	3708	{
..	..	@@ -3189,8 +3712,8 @@
3189	3712
3190	3713	Globals.ANIMATION ^= true;
3191	3714
3192		- GrafreeD.wav.cursor = 0;
3193		- GrafreeD.wav.loop = 0;
	3715	+ Grafreed.wav.cursor = 0;
	3716	+ Grafreed.wav.loop = 0;
3194	3717	}
3195	3718	} else
3196	3719	{
..	..	@@ -3240,7 +3763,7 @@
3240	3763	void CreateMaterial()
3241	3764	{
3242	3765	//copy.ClearMaterial(); // PATCH
3243		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3766	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3244	3767	if (copy.selection.size() > 0)
3245	3768	//SetMaterial(copy);
3246	3769	{
..	..	@@ -3291,7 +3814,7 @@
3291	3814	assert false;
3292	3815	}
3293	3816
3294		- void EditSelection()
	3817	+ void EditSelection(boolean newWindow)
3295	3818	{
3296	3819	}
3297	3820
..	..	@@ -3299,11 +3822,11 @@
3299	3822	{
3300	3823	copy.ResetBlockLoop(); // temporary problem
3301	3824
3302		- boolean random = CameraPane.RANDOM;
3303		- CameraPane.RANDOM = false; // parse everything
	3825	+ boolean random = CameraPane.SWITCH;
	3826	+ CameraPane.SWITCH = false; // parse everything
3304	3827	copy.ResetDisplayList();
3305	3828	copy.HardTouch();
3306		- CameraPane.RANDOM = random;
	3829	+ CameraPane.SWITCH = random;
3307	3830	}
3308	3831
3309	3832	// public void applySelf()
..	..	@@ -3377,6 +3900,36 @@
3377	3900	{
3378	3901	//System.out.println("Propagate = " + propagate);
3379	3902	copy.UpdateMaterial(anchor, current, propagate);
	3903	+
	3904	+ if (copy.material != null)
	3905	+ {
	3906	+ cMaterial mat = copy.material;
	3907	+
	3908	+ colorField.SetToolTipValue((mat.color));
	3909	+ modulationField.SetToolTipValue((mat.modulation));
	3910	+ metalnessField.SetToolTipValue((mat.metalness));
	3911	+ diffuseField.SetToolTipValue((mat.diffuse));
	3912	+ specularField.SetToolTipValue((mat.specular));
	3913	+ shininessField.SetToolTipValue((mat.shininess));
	3914	+ shiftField.SetToolTipValue((mat.shift));
	3915	+ ambientField.SetToolTipValue((mat.ambient));
	3916	+ lightareaField.SetToolTipValue((mat.lightarea));
	3917	+ diffusenessField.SetToolTipValue((mat.factor));
	3918	+ velvetField.SetToolTipValue((mat.velvet));
	3919	+ sheenField.SetToolTipValue((mat.sheen));
	3920	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3921	+ backlitField.SetToolTipValue((mat.bump));
	3922	+ anisoField.SetToolTipValue((mat.aniso));
	3923	+ anisoVField.SetToolTipValue((mat.anisoV));
	3924	+ cameraField.SetToolTipValue((mat.cameralight));
	3925	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3926	+ shadowField.SetToolTipValue((mat.shadow));
	3927	+ textureField.SetToolTipValue((mat.texture));
	3928	+ opacityField.SetToolTipValue((mat.opacity));
	3929	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3930	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3931	+ }
	3932	+
3380	3933	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3381	3934	{
3382	3935	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3421,6 +3974,7 @@
3421	3974	\|\| e.getSource() == apertureField
3422	3975	\|\| e.getSource() == shadowblurField)
3423	3976	{
	3977	+ new Exception().printStackTrace();
3424	3978	System.exit(0);
3425	3979	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3426	3980	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3491,7 +4045,7 @@
3491	4045	}
3492	4046
3493	4047	if (normalpushField != null)
3494		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4048	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3495	4049	}
3496	4050
3497	4051	void SnapObject()
..	..	@@ -3755,6 +4309,8 @@
3755	4309
3756	4310	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3757	4311	{
	4312	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4313	+ Save();
3758	4314	//Tween.set(thing, 0).target(1).start(tweenManager);
3759	4315	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3760	4316	// if (thing instanceof GenericJointDemo)
..	..	@@ -3841,6 +4397,12 @@
3841	4397	{
3842	4398	ResetModel();
3843	4399	Select(thing.GetTreePath(), true, false); // unselect... false);
	4400	+
	4401	+ if (thing.Size() == 0)
	4402	+ {
	4403	+ //EditSelection(false);
	4404	+ }
	4405	+
3844	4406	refreshContents();
3845	4407	}
3846	4408
..	..	@@ -3958,6 +4520,7 @@
3958	4520	}
3959	4521	}
3960	4522	}
	4523	+
3961	4524	LoadGFDThread loadGFDThread;
3962	4525
3963	4526	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3977,8 +4540,10 @@
3977	4540
3978	4541	try
3979	4542	{
	4543	+ // Try compressed version first.
3980	4544	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3981		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4545	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4546	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3982	4547
3983	4548	readobj = (Object3D) p.readObject();
3984	4549	istream.close();
..	..	@@ -3986,7 +4551,20 @@
3986	4551	readobj.ResetDisplayList();
3987	4552	} catch (Exception e)
3988	4553	{
3989		- e.printStackTrace();
	4554	+ //e.printStackTrace();
	4555	+ try
	4556	+ {
	4557	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4558	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4559	+
	4560	+ readobj = (Object3D) p.readObject();
	4561	+ istream.close();
	4562	+
	4563	+ readobj.ResetDisplayList();
	4564	+ } catch (Exception e2)
	4565	+ {
	4566	+ e2.printStackTrace();
	4567	+ }
3990	4568	}
3991	4569	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3992	4570	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4032,6 +4610,12 @@
4032	4610
4033	4611	void LoadIt(Object obj)
4034	4612	{
	4613	+ if (obj == null)
	4614	+ {
	4615	+ // Invalid file
	4616	+ return;
	4617	+ }
	4618	+
4035	4619	System.out.println("Loaded " + obj);
4036	4620	//new Exception().printStackTrace();
4037	4621	Object3D readobj = (Object3D) obj;
..	..	@@ -4041,6 +4625,8 @@
4041	4625
4042	4626	if (readobj != null)
4043	4627	{
	4628	+ if (Globals.SAVEONMAKE)
	4629	+ Save();
4044	4630	try
4045	4631	{
4046	4632	//readobj.deepCopySelf(copy);
..	..	@@ -4103,7 +4689,7 @@
4103	4689
4104	4690	void load() // throws ClassNotFoundException
4105	4691	{
4106		- if (GrafreeD.standAlone)
	4692	+ if (Grafreed.standAlone)
4107	4693	{
4108	4694	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4109	4695	browser.show();
..	..	@@ -4190,11 +4776,13 @@
4190	4776	try
4191	4777	{
4192	4778	FileOutputStream ostream = new FileOutputStream(lastname);
4193		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4779	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4780	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4194	4781
4195	4782	p.writeObject(copy);
4196	4783	p.flush();
4197	4784
	4785	+ zstream.close();
4198	4786	ostream.close();
4199	4787
4200	4788	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4204,17 +4792,20 @@
4204	4792	{
4205	4793	}
4206	4794	}
	4795	+
4207	4796	String lastname;
4208	4797
4209	4798	void saveAs()
4210	4799	{
4211		- if (GrafreeD.standAlone)
	4800	+ if (Grafreed.standAlone)
4212	4801	{
4213	4802	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4214	4803	browser.setVisible(true);
4215	4804	String filename = browser.getFile();
4216	4805	if (filename != null && filename.length() > 0)
4217	4806	{
	4807	+ if (!filename.endsWith(".gfd"))
	4808	+ filename += ".gfd";
4218	4809	lastname = browser.getDirectory() + filename;
4219	4810	save();
4220	4811	}
..	..	@@ -4313,13 +4904,13 @@
4313	4904	try
4314	4905	{
4315	4906	FileOutputStream ostream = new FileOutputStream(filename);
4316		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4317		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4907	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4908	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4318	4909
4319	4910	Object3D objectparent = obj.parent;
4320	4911	obj.parent = null;
4321	4912
4322		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4913	+ Object3D object = (Object3D) Grafreed.clone(obj);
4323	4914
4324	4915	obj.parent = objectparent;
4325	4916
..	..	@@ -4331,8 +4922,8 @@
4331	4922	p.writeObject(object);
4332	4923	p.flush();
4333	4924
	4925	+ zstream.close();
4334	4926	ostream.close();
4335		- // zstream.close();
4336	4927
4337	4928	// group.selection.get(0).parent = parent;
4338	4929	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4353,7 +4944,7 @@
4353	4944	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4354	4945	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4355	4946	copy.generatePOV(buffer);
4356		- if (GrafreeD.standAlone)
	4947	+ if (Grafreed.standAlone)
4357	4948	{
4358	4949	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4359	4950	browser.show();
..	..	@@ -4379,7 +4970,8 @@
4379	4970	Object3D client;
4380	4971	Object3D copy;
4381	4972	MenuBar menuBar;
4382		- Menu windowMenu;
	4973	+ Menu fileMenu;
	4974	+ MenuItem newItem;
4383	4975	MenuItem loadItem;
4384	4976	MenuItem saveItem;
4385	4977	MenuItem saveAsItem;
..	..	@@ -4387,13 +4979,11 @@
4387	4979	MenuItem reexportItem;
4388	4980	MenuItem povItem;
4389	4981	MenuItem closeItem;
4390		- Menu cameraMenu;
	4982	+
4391	4983	CheckboxMenuItem zBufferItem;
4392	4984	//MenuItem normalLensItem;
4393		- MenuItem editCameraItem;
4394		- MenuItem revertCameraItem;
4395		- CheckboxMenuItem toggleLiveItem;
4396	4985	MenuItem stepItem;
	4986	+ CheckboxMenuItem toggleLiveItem;
4397	4987	CheckboxMenuItem toggleFullScreenItem;
4398	4988	CheckboxMenuItem toggleTimelineItem;
4399	4989	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4402,25 +4992,38 @@
4402	4992	CheckboxMenuItem toggleFootContactItem;
4403	4993	CheckboxMenuItem toggleDLItem;
4404	4994	CheckboxMenuItem toggleTextureItem;
4405		- CheckboxMenuItem toggleRandomItem;
	4995	+ CheckboxMenuItem toggleSwitchItem;
4406	4996	CheckboxMenuItem toggleRootItem;
4407	4997	CheckboxMenuItem animationItem;
4408	4998	CheckboxMenuItem toggleHandleItem;
4409	4999	CheckboxMenuItem togglePaintItem;
4410	5000	JSplitPane mainPanel;
4411	5001	JScrollPane scrollpane;
	5002	+
4412	5003	JPanel toolbarPanel;
4413		- JPanel treePanel;
	5004	+
	5005	+ cGridBag treePanel;
	5006	+
4414	5007	JPanel radioPanel;
4415	5008	ButtonGroup buttonGroup;
4416		- cGridBag ctrlPanel;
	5009	+
	5010	+ cGridBag toolboxPanel;
4417	5011	cGridBag materialPanel;
	5012	+ cGridBag ctrlPanel;
	5013	+
4418	5014	JScrollPane infoPanel;
	5015	+
4419	5016	cGridBag optionsPanel;
	5017	+
4420	5018	JTabbedPane objectPanel;
	5019	+ boolean materialFlushed;
	5020	+ Object3D latestObject;
	5021	+
4421	5022	cGridBag XYZPanel;
	5023	+
4422	5024	JSplitPane gridPanel;
4423	5025	JSplitPane bigPanel;
	5026	+
4424	5027	cGridBag bigThree;
4425	5028	cGridBag scenePanel;
4426	5029	cGridBag centralPanel;
..	..	@@ -4535,8 +5138,13 @@
4535	5138	cNumberSlider fogField;
4536	5139	JLabel opacityPowerLabel;
4537	5140	cNumberSlider opacityPowerField;
4538		- JTree jTree;
	5141	+ cTree jTree;
4539	5142	//ObjectUI parent;
4540	5143
4541	5144	cNumberSlider normalpushField;
	5145	+
	5146	+ private MenuItem importGFDItem;
	5147	+ private MenuItem importVRMLX3DItem;
	5148	+ private MenuItem import3DSItem;
	5149	+ private MenuItem importOBJItem;
4542	5150	}