~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.*;
..	..	@@ -35,6 +36,67 @@
35	36
36	37	GroupEditor callee;
37	38	JFrame frame;
	39	+
	40	+ static ObjEditor theFrame;
	41	+
	42	+ cButton GetButton(String name, boolean border)
	43	+ {
	44	+ try
	45	+ {
	46	+ ImageIcon icon = GetIcon(name);
	47	+ return new cButton(icon, border);
	48	+ }
	49	+ catch (Exception e)
	50	+ {
	51	+ return new cButton(name, border);
	52	+ }
	53	+ }
	54	+
	55	+ cToggleButton GetToggleButton(String name, boolean border)
	56	+ {
	57	+ try
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cToggleButton(icon, border);
	61	+ }
	62	+ catch (Exception e)
	63	+ {
	64	+ return new cToggleButton(name, border);
	65	+ }
	66	+ }
	67	+
	68	+ cCheckBox GetCheckBox(String name, boolean border)
	69	+ {
	70	+ try
	71	+ {
	72	+ ImageIcon icon = GetIcon(name);
	73	+ return new cCheckBox(icon, border);
	74	+ }
	75	+ catch (Exception e)
	76	+ {
	77	+ return new cCheckBox(name, border);
	78	+ }
	79	+ }
	80	+
	81	+ private ImageIcon GetIcon(String name) throws IOException
	82	+ {
	83	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	84	+
	85	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	86	+ {
	87	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	88	+ Graphics2D g = resized.createGraphics();
	89	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	90	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	91	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	92	+ g.dispose();
	93	+
	94	+ image = resized;
	95	+ }
	96	+
	97	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	98	+ return icon;
	99	+ }
38	100
39	101	// SCRIPT
40	102
..	..	@@ -138,34 +200,42 @@
138	200	public void closeUI()
139	201	{
140	202	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	203	+// System.out.println("this = " + this);
	204	+// System.out.println("objEditor = " + objEditor);
143	205	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	206	+// objEditor.ctrlPanel.remove(nameField);
145	207
146		- if (!GroupEditor.allparams)
	208	+ objEditor.ctrlPanel.remove(namePanel);
	209	+
	210	+ if (!allparams)
147	211	return;
148	212
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);
	213	+// objEditor.ctrlPanel.remove(liveCB);
	214	+// objEditor.ctrlPanel.remove(hideCB);
	215	+// objEditor.ctrlPanel.remove(markCB);
	216	+//
	217	+// objEditor.ctrlPanel.remove(randomCB);
	218	+// objEditor.ctrlPanel.remove(speedupCB);
	219	+// objEditor.ctrlPanel.remove(rewindCB);
	220	+//
	221	+// objEditor.ctrlPanel.remove(resetButton);
	222	+// objEditor.ctrlPanel.remove(stepButton);
	223	+//// objEditor.ctrlPanel.remove(stepAllButton);
	224	+//// objEditor.ctrlPanel.remove(resetAllButton);
	225	+// objEditor.ctrlPanel.remove(link2masterCB);
	226	+// //objEditor.ctrlPanel.remove(flipVCB);
	227	+// //objEditor.ctrlPanel.remove(texresMenu);
	228	+// objEditor.ctrlPanel.remove(slowerButton);
	229	+// objEditor.ctrlPanel.remove(fasterButton);
	230	+// objEditor.ctrlPanel.remove(remarkButton);
167	231
168		- Remove(normalpushField);
	232	+ objEditor.ctrlPanel.remove(setupPanel);
	233	+ objEditor.ctrlPanel.remove(setupPanel2);
	234	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	235	+ objEditor.ctrlPanel.remove(pushPanel);
	236	+ //objEditor.ctrlPanel.remove(fillPanel);
	237	+
	238	+ //Remove(normalpushField);
169	239	}
170	240
171	241	public ObjEditor GetEditor()
..	..	@@ -236,6 +306,7 @@
236	306	//localCopy.parent = null;
237	307
238	308	frame = new JFrame();
	309	+ frame.setUndecorated(true);
239	310	objEditor = this;
240	311	this.callee = callee;
241	312
..	..	@@ -266,27 +337,48 @@
266	337	return frame.action(event, obj);
267	338	}
268	339
	340	+ // Cannot work without static
	341	+ static boolean allparams = true;
	342	+
	343	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	344	+
269	345	void SetupMenu()
270	346	{
271	347	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..."));
	348	+ menuBar.add(fileMenu = new Menu("File"));
	349	+ fileMenu.add(newItem = new MenuItem("New"));
	350	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	351	+
	352	+ //oe.menuBar.add(menu = new Menu("Include"));
	353	+ Menu menu = new Menu("Import");
	354	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	355	+ importOBJItem.addActionListener(this);
	356	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	357	+ import3DSItem.addActionListener(this);
	358	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	359	+ importVRMLX3DItem.addActionListener(this);
	360	+ menu.add("-");
	361	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	362	+ importGFDItem.addActionListener(this);
	363	+ fileMenu.add(menu);
	364	+ fileMenu.add("-");
	365	+
	366	+ fileMenu.add(saveItem = new MenuItem("Save"));
	367	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	368	//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("-");
	369	+ fileMenu.add("-");
	370	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	371	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	372	+ fileMenu.add("-");
282	373	if (client.parent != null)
283	374	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	375	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	376	} else
286	377	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	378	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	379	}
289	380
	381	+ newItem.addActionListener(this);
290	382	loadItem.addActionListener(this);
291	383	saveItem.addActionListener(this);
292	384	saveAsItem.addActionListener(this);
..	..	@@ -295,79 +387,64 @@
295	387	//povItem.addActionListener(this);
296	388	closeItem.addActionListener(this);
297	389
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	390	objectPanel = new JTabbedPane();
	391	+
	392	+ ChangeListener changeListener = new ChangeListener()
	393	+ {
	394	+ public void stateChanged(ChangeEvent changeEvent)
	395	+ {
	396	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	397	+// {
	398	+// if (latestObject != null)
	399	+// {
	400	+// refreshContents(true);
	401	+// SetMaterial(latestObject);
	402	+// }
	403	+//
	404	+// materialFlushed = true;
	405	+// }
	406	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	407	+// {
	408	+// if (listUI.size() == 0)
	409	+// EditSelection(false);
	410	+// }
	411	+
	412	+ refreshContents(false); // To refresh Info tab
	413	+ }
	414	+ };
	415	+ objectPanel.addChangeListener(changeListener);
	416	+
354	417	toolbarPanel = new JPanel();
355	418	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	419	+ treePanel = new cGridBag();
357	420	treePanel.setName("Tree");
358		- ctrlPanel = new cGridBag(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
	421	+
	422	+ editPanel = new cGridBag().setVertical(true);
	423	+ editPanel.setName("Edit");
	424	+
	425	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	426	+
	427	+ editCommandsPanel = new cGridBag();
	428	+ editPanel.add(editCommandsPanel);
	429	+ editPanel.add(ctrlPanel);
	430	+
	431	+ toolboxPanel = new cGridBag().setVertical(false);
	432	+ toolboxPanel.setName("Toolbox");
	433	+
360	434	materialPanel = new cGridBag().setVertical(true);
361	435	materialPanel.setName("Material");
	436	+
362	437	/JTextPane/
363	438	infoarea = createTextPane();
	439	+ doc = infoarea.getStyledDocument();
	440	+
364	441	infoarea.setEditable(true);
365	442	SetText();
366	443	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	444	// infoarea.setOpaque(false);
368	445	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	446	+// TEXTAREA infoarea.setLineWrap(true);
	447	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	448	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372	449	infoPanel.setPreferredSize(new Dimension(50, 200));
373	450	infoPanel.setName("Info");
..	..	@@ -378,15 +455,15 @@
378	455	mainPanel.setName("Main");
379	456	mainPanel.setContinuousLayout(true);
380	457	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	458	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
	459	+ mainPanel.setDividerLocation(0.5); //1.0);
	460	+ mainPanel.setResizeWeight(0.5);
384	461
385	462	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	463	//mainPanel.setLayout(new GridBagLayout());
387	464	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
	465	+// treePanel.setLayout(new GridBagLayout());
	466	+ //ctrlPanel.setLayout(new GridBagLayout());
390	467	//materialPanel.setLayout(new GridBagLayout());
391	468
392	469	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
..	..	@@ -426,7 +503,7 @@
426	503	static String newline = "\n";
427	504	protected static final String buttonString = "JButton";
428	505	StyledDocument doc;
429		- JTextArea infoarea;
	506	+ JTextPane infoarea;
430	507
431	508	void ClearInfo()
432	509	{
..	..	@@ -449,10 +526,10 @@
449	526	e.printStackTrace();
450	527	}
451	528
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();
	529	+// String selection = infoarea.getText();
	530	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	531	+// java.awt.datatransfer.Clipboard clipboard =
	532	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	533	//clipboard.setContents(data, data);
457	534	}
458	535
..	..	@@ -475,13 +552,13 @@
475	552	//SendInfo("Name:", "bold");
476	553	if (sel.GetTextures() != null \|\| debug)
477	554	{
478		- si.SendInfo(sel.toString(), "bold");
	555	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	556	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	557	if (sel.Size() > 0)
481	558	{
482	559	si.SendInfo("#children = " + sel.Size(), "regular");
483	560	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	561	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	562	if (debug)
486	563	{
487	564	try
..	..	@@ -493,7 +570,10 @@
493	570	}
494	571
495	572	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	573	+ {
	574	+ si.SendInfo(" BBox min: " + minima, "regular");
	575	+ si.SendInfo(" BBox max: " + maxima, "regular");
	576	+ }
497	577
498	578	if (sel.bRep != null)
499	579	{
..	..	@@ -520,7 +600,7 @@
520	600	}
521	601	if (sel.support != null)
522	602	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	603	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	604	}
525	605	if (sel.scriptnode != null)
526	606	{
..	..	@@ -591,6 +671,9 @@
591	671	{
592	672	CameraPane.pointflow = (PointFlow) sel;
593	673	}
	674	+
	675	+ si.SendInfo("_____________________", "regular");
	676	+ si.SendInfo("", "regular");
594	677	}
595	678	}
596	679
..	..	@@ -606,68 +689,140 @@
606	689	}
607	690	}
608	691
	692	+static GraphicsDevice device = GraphicsEnvironment
	693	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	694	+
	695	+ Rectangle keeprect;
	696	+ cRadio radio;
	697	+
	698	+cButton keepButton;
	699	+ cButton twoButton; // Full 3D
	700	+ cButton sixButton;
	701	+ cButton threeButton;
	702	+ cButton sevenButton;
	703	+ cButton fourButton; // full panel
	704	+ cButton oneButton; // full XYZ
	705	+ //cButton currentLayout;
	706	+
	707	+ boolean maximized;
	708	+
	709	+ cButton fullscreenLayout;
	710	+
	711	+ void Minimize()
	712	+ {
	713	+ frame.setState(Frame.ICONIFIED);
	714	+ }
	715	+
	716	+ void Maximize()
	717	+ {
	718	+ if (maximized)
	719	+ {
	720	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	721	+ }
	722	+ else
	723	+ {
	724	+ keeprect = frame.getBounds();
	725	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	726	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	727	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	728	+// frame.setState(Frame.MAXIMIZED_BOTH);
	729	+ }
	730	+
	731	+ maximized ^= true;
	732	+ }
	733	+
609	734	void ToggleFullScreen()
610	735	{
611		- if (CameraPane.FULLSCREEN)
	736	+ cameraView.ToggleFullScreen();
	737	+
	738	+ if (!CameraPane.FULLSCREEN)
612	739	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	740	+ device.setFullScreenWindow(null);
	741	+ //frame.setVisible(false);
	742	+// frame.removeNotify();
	743	+// frame.setUndecorated(false);
	744	+// frame.addNotify();
	745	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	746	+
	747	+// X frame.getContentPane().remove(/"Center",/bigThree);
	748	+// X framePanel.add(bigThree);
	749	+// X frame.getContentPane().add(/"Center",/framePanel);
	750	+ framePanel.setDividerLocation(1);
	751	+
	752	+ //frame.setVisible(true);
	753	+ radio.layout = keepButton;
	754	+ //theFrame = null;
	755	+ keepButton = null;
	756	+ radio.layout.doClick();
	757	+
616	758	} else
617	759	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	760	+ keepButton = radio.layout;
	761	+ //keeprect = frame.getBounds();
	762	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	763	+// frame.getToolkit().getScreenSize().height);
	764	+ //frame.setVisible(false);
	765	+ device.setFullScreenWindow(frame);
	766	+// frame.removeNotify();
	767	+// frame.setUndecorated(true);
	768	+// frame.addNotify();
	769	+// X frame.getContentPane().remove(/"Center",/framePanel);
	770	+// X framePanel.remove(bigThree);
	771	+// X frame.getContentPane().add(/"Center",/bigThree);
	772	+ framePanel.setDividerLocation(0);
	773	+
	774	+ radio.layout = fullscreenLayout;
	775	+ radio.layout.doClick();
	776	+ //frame.setVisible(true);
621	777	}
622		- cameraView.ToggleFullScreen();
623	778	}
624	779
625		- private JTextArea createTextPane()
	780	+ private JTextPane createTextPane()
626	781	{
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		- };
	782	+// TEXTAREA String[] initString =
	783	+// {
	784	+// "This is an editable JTextPane, ", //regular
	785	+// "another ", //italic
	786	+// "styled ", //bold
	787	+// "text ", //small
	788	+// "component, ", //large
	789	+// "which supports embedded components..." + newline,//regular
	790	+// " " + newline, //button
	791	+// "...and embedded icons..." + newline, //regular
	792	+// " ", //icon
	793	+// newline + "JTextPane is a subclass of JEditorPane that "
	794	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	795	+// + "cover methods for interacting with those objects."
	796	+// };
	797	+//
	798	+// String[] initStyles =
	799	+// {
	800	+// "regular", "italic", "bold", "small", "large",
	801	+// "regular", "button", "regular", "icon",
	802	+// "regular"
	803	+// };
	804	+//
	805	+// JTextPane textPane = new JTextPane();
	806	+// textPane.setEditable(true);
	807	+// /StyledDocument/ doc = textPane.getStyledDocument();
	808	+// addStylesToDocument(doc);
	809	+//
	810	+// try
	811	+// {
	812	+// for (int j = 0; j < 2; j++)
	813	+// {
	814	+// for (int i = 0; i < initString.length; i++)
	815	+// {
	816	+// doc.insertString(doc.getLength(), initString[i],
	817	+// doc.getStyle(initStyles[i]));
	818	+// }
	819	+// }
	820	+// } catch (BadLocationException ble)
	821	+// {
	822	+// System.err.println("Couldn't insert initial text into text pane.");
	823	+// }
642	824
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;
	825	+ return new JTextPane(); // textPane;
671	826	}
672	827
673	828	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +875,7 @@
720	875	protected static ImageIcon createImageIcon(String path,
721	876	String description)
722	877	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	878	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	879	if (imgURL != null)
725	880	{
726	881	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +907,7 @@
752	907	// NumberSlider vDivsField;
753	908	// JCheckBox endcaps;
754	909	JCheckBox liveCB;
	910	+ JCheckBox selectCB;
755	911	JCheckBox hideCB;
756	912	JCheckBox link2masterCB;
757	913	JCheckBox markCB;
..	..	@@ -759,7 +915,12 @@
759	915	JCheckBox speedupCB;
760	916	JCheckBox rewindCB;
761	917	JCheckBox flipVCB;
	918	+
	919	+ cCheckBox toggleTextureCB;
	920	+ cCheckBox toggleSwitchCB;
	921	+
762	922	JComboBox texresMenu;
	923	+
763	924	JButton resetButton;
764	925	JButton stepButton;
765	926	JButton stepAllButton;
..	..	@@ -767,54 +928,48 @@
767	928	JButton slowerButton;
768	929	JButton fasterButton;
769	930	JButton remarkButton;
	931	+
	932	+ cGridBag editPanel;
	933	+ cGridBag editCommandsPanel;
	934	+
	935	+ cGridBag namePanel;
	936	+ cGridBag setupPanel;
	937	+ cGridBag setupPanel2;
	938	+ cGridBag objectCommandsPanel;
	939	+ cGridBag pushPanel;
	940	+ cGridBag fillPanel;
770	941
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	942	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	943	{
773	944	JCheckBox cb;
774	945
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);
	946	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	947	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	948
785	949	return cb;
786	950	}
787	951
788		- cButton AddButton(ObjEditor oe, String label)
	952	+ cButton AddButton(cGridBag panel, String label)
789	953	{
790	954	cButton cb;
791	955
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);
	956	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	957	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	958
802	959	return cb;
803	960	}
804	961
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	962	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	963	{
807	964	JComboBox combo;
808	965
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;
	966	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	967	combo.addActionListener(this);
813	968
814	969	return combo;
815	970	}
816	971
817		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
	972	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	973	{
819	974	cGridBag control = new cGridBag();
820	975
..	..	@@ -826,12 +981,12 @@
826	981	control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827	982	combo.setFloat(current);
828	983
829		- ctrlPanel.add(control);
	984	+ panel.add(control);
830	985
831		- return combo;
	986	+ return control;
832	987	}
833	988
834		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
	989	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835	990	{
836	991	cGridBag control = new cGridBag();
837	992
..	..	@@ -839,25 +994,21 @@
839	994
840	995	JLabel jlabel = new JLabel(label);
841	996	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);
	997	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	998	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844	999	combo.setInteger(current);
845	1000
846		- ctrlPanel.add(control);
	1001	+ panel.add(control);
847	1002
848		- return combo;
	1003	+ return control;
849	1004	}
850	1005
851	1006	JTextArea AddText(cGridBag ctrlPanel, String name)
852	1007	{
853	1008	JTextArea text;
854	1009
855		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857	1010	ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1011	text.addCaretListener(this);
859		- aConstraints.gridx += 1;
860		- aConstraints.gridwidth = 1;
861	1012
862	1013	return text;
863	1014	}
..	..	@@ -896,7 +1047,7 @@
896	1047
897	1048	/*
898	1049	*/
899		- void Return() // ObjEditor oe)
	1050	+ void Return0() // ObjEditor oe)
900	1051	{
901	1052	aConstraints.gridy += 1;
902	1053	aConstraints.gridx = 0;
..	..	@@ -951,37 +1102,76 @@
951	1102
952	1103	void SetupUI2(ObjEditor oe)
953	1104	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958		- SetupName(oe);
	1105	+ //SetupName(oe);
959	1106
960		- if (!GroupEditor.allparams)
	1107	+ namePanel = new cGridBag();
	1108	+
	1109	+ nameField = AddText(namePanel, copy.GetName());
	1110	+ namePanel.add(nameField);
	1111	+ oe.ctrlPanel.add(namePanel);
	1112	+
	1113	+ oe.ctrlPanel.Return();
	1114	+
	1115	+ if (!allparams)
961	1116	return;
962	1117
963		- liveCB = AddCheckBox(oe, "Live", copy.live);
964		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1118	+ setupPanel = new cGridBag().setVertical(false);
	1119	+
	1120	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1121	+ liveCB.setToolTipText("Animate object");
	1122	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1123	+ selectCB.setToolTipText("Make object selectable");
966	1124	// 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");
	1125	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1126	+ hideCB.setToolTipText("Hide object");
	1127	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1128	+ markCB.setToolTipText("Set the animation target transform");
	1129	+
	1130	+ setupPanel2 = new cGridBag().setVertical(false);
	1131	+
	1132	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1133	+ rewindCB.setToolTipText("Rewind animation");
	1134	+
	1135	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1136	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1137	+
	1138	+ if (Globals.ADVANCED)
	1139	+ {
	1140	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1141	+ link2masterCB.setToolTipText("Attach to support");
	1142	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1143	+ speedupCB.setToolTipText("Option motion capture");
	1144	+ }
	1145	+
	1146	+ oe.ctrlPanel.add(setupPanel);
	1147	+ oe.ctrlPanel.Return();
	1148	+ oe.ctrlPanel.add(setupPanel2);
	1149	+ oe.ctrlPanel.Return();
	1150	+
	1151	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1152	+
	1153	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1154	+ resetButton.setToolTipText("Jump to frame zero");
	1155	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1156	+ stepButton.setToolTipText("Step one frame");
973	1157	// resetAllButton = AddButton(oe, "Reset All");
974	1158	// stepAllButton = AddButton(oe, "Step All");
975		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
976	1159	// Return();
977		- slowerButton = AddButton(oe, "Slow");
978		- fasterButton = AddButton(oe, "Fast");
979		- remarkButton = AddButton(oe, "Rem");
	1160	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1161	+ slowerButton.setToolTipText("Decrease animation speed");
	1162	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1163	+ fasterButton.setToolTipText("Increase animation speed");
	1164	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1165	+ remarkButton.setToolTipText("Set the current transform as the target");
980	1166
981		- //Return();
	1167	+ oe.ctrlPanel.add(objectCommandsPanel);
	1168	+ oe.ctrlPanel.Return();
982	1169
983		- //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
	1170	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1171	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
984	1172	//Return();
	1173	+
	1174	+ oe.ctrlPanel.Return();
985	1175
986	1176	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1177	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1076,7 +1266,7 @@
1076	1266	oe.aConstraints.gridwidth = 1;
1077	1267	/**/
1078	1268	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1269	+ oe.ctrlPanel.Return();
1080	1270
1081	1271	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1272	//textureButton.setEnabled(false);
..	..	@@ -1180,8 +1370,11 @@
1180	1370	//worldPanel.setName("World");
1181	1371	centralPanel = new cGridBag();
1182	1372	centralPanel.preferredWidth = 20;
1183		- timelinePanel = new JPanel(new BorderLayout());
1184		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1373	+
	1374	+ if (Globals.ADVANCED)
	1375	+ {
	1376	+ timelinePanel = new JPanel(new BorderLayout());
	1377	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1185	1378
1186	1379	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1187	1380	cameraPanel.setContinuousLayout(true);
..	..	@@ -1190,7 +1383,10 @@
1190	1383	// cameraPanel.setDividerSize(9);
1191	1384	cameraPanel.setResizeWeight(1.0);
1192	1385
	1386	+ }
	1387	+
1193	1388	centralPanel.add(cameraView);
	1389	+ centralPanel.setFocusable(true);
1194	1390	//frame.setJMenuBar(timelineMenubar);
1195	1391	//centralPanel.add(timelinePanel);
1196	1392
..	..	@@ -1253,11 +1449,13 @@
1253	1449	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254	1450	//tmp.setName("Edit");
1255	1451	objectPanel.add(materialPanel);
1256		- JPanel north = new JPanel(new BorderLayout());
1257		- north.setName("Edit");
1258		- north.add(ctrlPanel, BorderLayout.NORTH);
1259		- objectPanel.add(north);
	1452	+// JPanel north = new JPanel(new BorderLayout());
	1453	+// north.setName("Edit");
	1454	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1455	+// objectPanel.add(north);
	1456	+ objectPanel.add(editPanel);
1260	1457	objectPanel.add(infoPanel);
	1458	+ objectPanel.add(toolboxPanel);
1261	1459
1262	1460	/*
1263	1461	aConstraints.gridx = 0;
..	..	@@ -1266,7 +1464,7 @@
1266	1464	aConstraints.gridy += 1;
1267	1465	aConstraints.gridwidth = 1;
1268	1466	mainPanel.add(objectPanel, aConstraints);
1269		- */
	1467	+ */
1270	1468
1271	1469	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1272	1470	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1278,14 +1476,12 @@
1278	1476	scrollpane.addMouseWheelListener(this); // Default not fast enough
1279	1477
1280	1478	/JTabbedPane/ scenePanel = new cGridBag();
1281		- scenePanel.preferredWidth = 7;
	1479	+ scenePanel.preferredWidth = 6;
1282	1480
1283	1481	JTabbedPane tabbedPane = new JTabbedPane();
1284	1482	tabbedPane.add(scrollpane);
1285	1483
1286		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287		-
1288		- optionsPanel = new cGridBag().setVertical(true);
	1484	+ optionsPanel = new cGridBag().setVertical(false);
1289	1485
1290	1486	optionsPanel.setName("Options");
1291	1487
..	..	@@ -1293,6 +1489,8 @@
1293	1489
1294	1490	tabbedPane.add(optionsPanel);
1295	1491
	1492	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1493	+
1296	1494	scenePanel.add(tabbedPane);
1297	1495
1298	1496	/*
..	..	@@ -1384,9 +1582,13 @@
1384	1582
1385	1583	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1386	1584
1387		- frame.setSize(1024, 768);
1388		- frame.show();
	1585	+ frame.setSize(1280, 860);
	1586	+
	1587	+ frame.validate();
	1588	+ frame.setVisible(true);
1389	1589
	1590	+ cameraView.requestFocusInWindow();
	1591	+
1390	1592	gridPanel.setDividerLocation(1.0);
1391	1593
1392	1594	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1415,7 +1617,7 @@
1415	1617	ctrlPanel.removeAll();
1416	1618	}
1417	1619
1418		- void SetupMaterial(cGridBag ctrlPanel)
	1620	+ void SetupMaterial(cGridBag panel)
1419	1621	{
1420	1622	/*
1421	1623	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
..	..	@@ -1424,18 +1626,26 @@
1424	1626
1425	1627	cGridBag editBar = new cGridBag().setVertical(false);
1426	1628
1427		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1629	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1630	+ createMaterialButton.setToolTipText("Create material");
1428	1631
1429	1632	/*
1430	1633	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	1634	*/
1432	1635
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);
	1636	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1637	+ clearMaterialButton.setToolTipText("Clear material");
	1638	+
	1639	+ if (Globals.ADVANCED)
	1640	+ {
	1641	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1642	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1643	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1644	+ }
1437	1645
1438		- ctrlPanel.add(editBar);
	1646	+ editBar.preferredHeight = 15;
	1647	+
	1648	+ panel.add(editBar);
1439	1649
1440	1650	/**/
1441	1651	//aConstraints.weighty = 0;
..	..	@@ -1484,9 +1694,9 @@
1484	1694	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1485	1695	colorSection.add(shadowbias);
1486	1696
1487		- ctrlPanel.add(new JSeparator());
	1697	+ panel.add(new JSeparator());
1488	1698
1489		- ctrlPanel.add(colorSection);
	1699	+ panel.add(colorSection);
1490	1700
1491	1701	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1492	1702
..	..	@@ -1534,9 +1744,9 @@
1534	1744	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1535	1745	diffuseSection.add(fakedepth);
1536	1746
1537		- ctrlPanel.add(new JSeparator());
	1747	+ panel.add(new JSeparator());
1538	1748
1539		- ctrlPanel.add(diffuseSection);
	1749	+ panel.add(diffuseSection);
1540	1750
1541	1751	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1542	1752
..	..	@@ -1572,7 +1782,7 @@
1572	1782	velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1573	1783	specularSection.add(velvet);
1574	1784
1575		- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	1785	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1576	1786	//Return();
1577	1787	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1578	1788	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..	..	@@ -1585,9 +1795,9 @@
1585	1795	// aConstraints.gridwidth = 1;
1586	1796
1587	1797
1588		- ctrlPanel.add(new JSeparator());
	1798	+ panel.add(new JSeparator());
1589	1799
1590		- ctrlPanel.add(specularSection);
	1800	+ panel.add(specularSection);
1591	1801
1592	1802	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1593	1803
..	..	@@ -1617,9 +1827,9 @@
1617	1827	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1618	1828	globalSection.add(opacity);
1619	1829
1620		- ctrlPanel.add(new JSeparator());
	1830	+ panel.add(new JSeparator());
1621	1831
1622		- ctrlPanel.add(globalSection);
	1832	+ panel.add(globalSection);
1623	1833
1624	1834	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1625	1835
..	..	@@ -1661,9 +1871,9 @@
1661	1871	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1662	1872	textureSection.add(opacityPower);
1663	1873
1664		- ctrlPanel.add(new JSeparator());
	1874	+ panel.add(new JSeparator());
1665	1875
1666		- ctrlPanel.add(textureSection);
	1876	+ panel.add(textureSection);
1667	1877
1668	1878	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1669	1879
..	..	@@ -1700,12 +1910,15 @@
1700	1910	opacityPowerField.addChangeListener(this);
1701	1911	/**/
1702	1912
1703		- resetSlidersButton.addActionListener(this);
1704	1913	clearMaterialButton.addActionListener(this);
1705	1914	createMaterialButton.addActionListener(this);
1706		-
1707		- propagateToggle.addItemListener(this);
1708		- multiplyToggle.addItemListener(this);
	1915	+
	1916	+ if (Globals.ADVANCED)
	1917	+ {
	1918	+ resetSlidersButton.addActionListener(this);
	1919	+ propagateToggle.addItemListener(this);
	1920	+ multiplyToggle.addItemListener(this);
	1921	+ }
1709	1922	}
1710	1923
1711	1924	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1876,7 +2089,7 @@
1876	2089
1877	2090	//? flashIt = false;
1878	2091	CameraPane pane = (CameraPane) cameraView;
1879		- pane.clickStart(location.x, location.y, 0);
	2092	+ pane.clickStart(location.x, location.y, 0, 0);
1880	2093	pane.clickEnd(location.x, location.y, 0, true);
1881	2094
1882	2095	if (group.selection.size() == 1)
..	..	@@ -1925,6 +2138,7 @@
1925	2138	e2.printStackTrace();
1926	2139	}
1927	2140	}
	2141	+
1928	2142	LoadJMEThread loadThread;
1929	2143
1930	2144	class LoadJMEThread extends Thread
..	..	@@ -1982,6 +2196,7 @@
1982	2196	//LoadFile0(filename, converter);
1983	2197	}
1984	2198	}
	2199	+
1985	2200	LoadOBJThread loadObjThread;
1986	2201
1987	2202	class LoadOBJThread extends Thread
..	..	@@ -2060,19 +2275,19 @@
2060	2275
2061	2276	void LoadObjFile(String fullname)
2062	2277	{
2063		- /*
	2278	+ System.out.println("Loading " + fullname);
	2279	+ /**/
2064	2280	//lastFilename = fullname;
2065	2281	if(loadObjThread == null)
2066	2282	{
2067		- loadObjThread = new LoadOBJThread();
2068		- loadObjThread.start();
	2283	+ loadObjThread = new LoadOBJThread();
	2284	+ loadObjThread.start();
2069	2285	}
2070	2286
2071	2287	loadObjThread.add(fullname);
2072		- */
	2288	+ /**/
2073	2289
2074		- System.out.println("Loading " + fullname);
2075		- makeSomething(new FileObject(fullname, true), true);
	2290	+ //makeSomething(new FileObject(fullname, true), true);
2076	2291	}
2077	2292
2078	2293	void LoadGFDFile(String fullname)
..	..	@@ -2333,11 +2548,11 @@
2333	2548
2334	2549	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2335	2550	{
2336		- if (GrafreeD.standAlone)
	2551	+ if (Grafreed.standAlone)
2337	2552	{
2338	2553	/**/
2339	2554	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2340		- browser.show();
	2555	+ browser.setVisible(true);
2341	2556	String filename = browser.getFile();
2342	2557	if (filename != null && filename.length() > 0)
2343	2558	{
..	..	@@ -2482,6 +2697,7 @@
2482	2697	}
2483	2698	if (input == null)
2484	2699	{
	2700	+ new Exception().printStackTrace();
2485	2701	System.exit(0);
2486	2702	}
2487	2703
..	..	@@ -2688,6 +2904,8 @@
2688	2904
2689	2905	void SetMaterial(Object3D object)
2690	2906	{
	2907	+ latestObject = object;
	2908	+
2691	2909	cMaterial mat = object.material;
2692	2910
2693	2911	if (mat == null)
..	..	@@ -2696,7 +2914,8 @@
2696	2914	return;
2697	2915	}
2698	2916
2699		- multiplyToggle.setSelected(mat.multiply);
	2917	+ if (multiplyToggle != null)
	2918	+ multiplyToggle.setSelected(mat.multiply);
2700	2919
2701	2920	assert (object.projectedVertices != null);
2702	2921
..	..	@@ -2872,7 +3091,7 @@
2872	3091	cameraView.ToggleDL();
2873	3092	cameraView.repaint();
2874	3093	return;
2875		- } else if (event.getSource() == toggleTextureItem)
	3094	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2876	3095	{
2877	3096	cameraView.ToggleTexture();
2878	3097	// june 2013 copy.HardTouch();
..	..	@@ -2911,9 +3130,9 @@
2911	3130	frame.validate();
2912	3131
2913	3132	return;
2914		- } else if (event.getSource() == toggleRandomItem)
	3133	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2915	3134	{
2916		- cameraView.ToggleRandom();
	3135	+ cameraView.ToggleSwitch();
2917	3136	cameraView.repaint();
2918	3137	return;
2919	3138	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2942,6 +3161,10 @@
2942	3161	{
2943	3162	copy.live ^= true;
2944	3163	return;
	3164	+ } else if (event.getSource() == selectCB)
	3165	+ {
	3166	+ copy.dontselect ^= true;
	3167	+ return;
2945	3168	} else if (event.getSource() == hideCB)
2946	3169	{
2947	3170	copy.hide ^= true;
..	..	@@ -2956,6 +3179,7 @@
2956	3179	if (event.getSource() == randomCB)
2957	3180	{
2958	3181	copy.random ^= true;
	3182	+ objEditor.refreshContents();
2959	3183	return;
2960	3184	}
2961	3185	if (event.getSource() == speedupCB)
..	..	@@ -2979,8 +3203,9 @@
2979	3203
2980	3204	public void actionPerformed(ActionEvent event)
2981	3205	{
	3206	+ Object source = event.getSource();
2982	3207	// SCRIPT DIALOG
2983		- if (event.getSource() == okbutton)
	3208	+ if (source == okbutton)
2984	3209	{
2985	3210	textpanel.setVisible(false);
2986	3211	textpanel.remove(textarea);
..	..	@@ -2992,7 +3217,7 @@
2992	3217	textarea = null;
2993	3218	textpanel = null;
2994	3219	}
2995		- if (event.getSource() == cancelbutton)
	3220	+ if (source == cancelbutton)
2996	3221	{
2997	3222	textpanel.setVisible(false);
2998	3223	textpanel.remove(textarea);
..	..	@@ -3004,50 +3229,50 @@
3004	3229	//applySelf();
3005	3230	//client.refreshEditWindow();
3006	3231	//refreshContents();
3007		- if (event.getSource() == nameField)
	3232	+ if (source == nameField)
3008	3233	{
3009	3234	//System.out.println("ObjEditor " + event);
3010	3235	applySelf0(true);
3011	3236	//parent.applySelf();
3012	3237	objEditor.refreshContents();
3013		- } else if (event.getSource() == resetButton)
	3238	+ } else if (source == resetButton)
3014	3239	{
3015	3240	CameraPane.fullreset = true;
3016	3241	copy.Reset(); // ResetMeshes();
3017	3242	copy.Touch();
3018	3243	objEditor.refreshContents();
3019		- } else if (event.getSource() == stepItem)
	3244	+ } else if (source == stepItem)
3020	3245	{
3021	3246	//cameraView.ONESTEP = true;
3022	3247	Globals.ONESTEP = true;
3023	3248	cameraView.repaint();
3024	3249	return;
3025		- } else if (event.getSource() == stepButton)
	3250	+ } else if (source == stepButton)
3026	3251	{
3027	3252	copy.Step();
3028	3253	copy.Touch();
3029	3254	objEditor.refreshContents();
3030		- } else if (event.getSource() == slowerButton)
	3255	+ } else if (source == slowerButton)
3031	3256	{
3032	3257	copy.Slower();
3033	3258	copy.Touch();
3034	3259	objEditor.refreshContents();
3035		- } else if (event.getSource() == fasterButton)
	3260	+ } else if (source == fasterButton)
3036	3261	{
3037	3262	copy.Faster();
3038	3263	copy.Touch();
3039	3264	objEditor.refreshContents();
3040		- } else if (event.getSource() == remarkButton)
	3265	+ } else if (source == remarkButton)
3041	3266	{
3042	3267	copy.Remark();
3043	3268	copy.Touch();
3044	3269	objEditor.refreshContents();
3045		- } else if (event.getSource() == stepAllButton)
	3270	+ } else if (source == stepAllButton)
3046	3271	{
3047	3272	copy.StepAll();
3048	3273	copy.Touch();
3049	3274	objEditor.refreshContents();
3050		- } else if (event.getSource() == resetAllButton)
	3275	+ } else if (source == resetAllButton)
3051	3276	{
3052	3277	//CameraPane.fullreset = true;
3053	3278	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3080,53 +3305,75 @@
3080	3305	// Close();
3081	3306	// }
3082	3307	// else
3083		- if (event.getSource() == resetSlidersButton)
	3308	+ if (source == resetSlidersButton)
3084	3309	{
3085	3310	ResetSliders();
3086		- } else if (event.getSource() == clearMaterialButton)
	3311	+ } else if (source == clearMaterialButton)
3087	3312	{
3088	3313	ClearMaterial();
3089		- } else if (event.getSource() == createMaterialButton)
	3314	+ } else if (source == createMaterialButton)
3090	3315	{
3091	3316	CreateMaterial();
3092		- } else if (event.getSource() == clearPanelButton)
	3317	+ } else if (source == clearPanelButton)
3093	3318	{
3094	3319	copy.ClearUI();
3095	3320	refreshContents(true);
3096		- } /*
3097		- }
3098		-
3099		- public boolean action(Event event, Object arg)
3100		- {
3101		- */ else if (event.getSource() == closeItem)
	3321	+ } else if (source == importGFDItem)
	3322	+ {
	3323	+ ImportGFD();
	3324	+ } else
	3325	+ if (source == importVRMLX3DItem)
	3326	+ {
	3327	+ ImportVRMLX3D();
	3328	+ } else
	3329	+ if (source == import3DSItem)
	3330	+ {
	3331	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3332	+ } else
	3333	+ if (source == importOBJItem)
	3334	+ {
	3335	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3336	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3337	+ browser.setVisible(true);
	3338	+ String filename = browser.getFile();
	3339	+ if (filename != null && filename.length() > 0)
	3340	+ {
	3341	+ String fullname = browser.getDirectory() + filename;
	3342	+ makeSomething(ReadOBJ(fullname), true);
	3343	+ }
	3344	+ } else
	3345	+ if (source == closeItem)
3102	3346	{
3103	3347	Close();
3104	3348	//return true;
3105		- } else if (event.getSource() == loadItem)
	3349	+ } else if (source == loadItem)
3106	3350	{
3107	3351	load();
3108	3352	//return true;
3109		- } else if (event.getSource() == saveItem)
	3353	+ } else if (source == newItem)
	3354	+ {
	3355	+ New();
	3356	+ } else if (source == saveItem)
3110	3357	{
3111	3358	save();
3112	3359	//return true;
3113		- } else if (event.getSource() == saveAsItem)
	3360	+ } else if (source == saveAsItem)
3114	3361	{
3115	3362	saveAs();
3116	3363	//return true;
3117		- } else if (event.getSource() == reexportItem)
	3364	+ } else if (source == reexportItem)
3118	3365	{
3119	3366	reexport();
3120	3367	//return true;
3121		- } else if (event.getSource() == exportAsItem)
	3368	+ } else if (source == exportAsItem)
3122	3369	{
3123	3370	export();
3124	3371	//return true;
3125		- } else if (event.getSource() == povItem)
	3372	+ } else if (source == povItem)
3126	3373	{
3127	3374	generatePOV();
3128	3375	//return true;
3129		- } else if (event.getSource() == zBufferItem)
	3376	+ } else if (source == zBufferItem)
3130	3377	{
3131	3378	try
3132	3379	{
..	..	@@ -3148,21 +3395,8 @@
3148	3395	cameraView.repaint();
3149	3396	//return true;
3150	3397	}
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)
	3398	+ */ else // combos...
	3399	+ if (source == texresMenu)
3166	3400	{
3167	3401	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3168	3402	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3174,12 +3408,287 @@
3174	3408	}
3175	3409	}
3176	3410
	3411	+ void New()
	3412	+ {
	3413	+ while (copy.Size() > 1)
	3414	+ {
	3415	+ copy.remove(1);
	3416	+ }
	3417	+
	3418	+ ResetModel();
	3419	+ objEditor.refreshContents();
	3420	+ }
	3421	+
	3422	+ static public byte[] Compress(Object3D o)
	3423	+ {
	3424	+ try
	3425	+ {
	3426	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3427	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3428	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3429	+
	3430	+ Object3D parent = o.parent;
	3431	+ o.parent = null;
	3432	+
	3433	+ out.writeObject(o);
	3434	+
	3435	+ o.parent = parent;
	3436	+
	3437	+ out.flush();
	3438	+
	3439	+ zstream.close();
	3440	+ out.close();
	3441	+
	3442	+ return baos.toByteArray();
	3443	+ } catch (Exception e)
	3444	+ {
	3445	+ System.err.println(e);
	3446	+ return null;
	3447	+ }
	3448	+ }
	3449	+
	3450	+ static public Object Uncompress(byte[] bytes)
	3451	+ {
	3452	+ System.out.println("#bytes = " + bytes.length);
	3453	+ try
	3454	+ {
	3455	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3456	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3457	+ ObjectInputStream in = new ObjectInputStream(istream);
	3458	+ Object obj = in.readObject();
	3459	+ in.close();
	3460	+
	3461	+ return obj;
	3462	+ } catch (Exception e)
	3463	+ {
	3464	+ System.err.println(e);
	3465	+ return null;
	3466	+ }
	3467	+ }
	3468	+
	3469	+ static public Object clone(Object o)
	3470	+ {
	3471	+ try
	3472	+ {
	3473	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3474	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3475	+
	3476	+ out.writeObject(o);
	3477	+
	3478	+ out.flush();
	3479	+ out.close();
	3480	+
	3481	+ byte[] bytes = baos.toByteArray();
	3482	+
	3483	+ System.out.println("clone = " + bytes.length);
	3484	+
	3485	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3486	+ ObjectInputStream in = new ObjectInputStream(bais);
	3487	+ Object obj = in.readObject();
	3488	+ in.close();
	3489	+
	3490	+ return obj;
	3491	+ } catch (Exception e)
	3492	+ {
	3493	+ System.err.println(e);
	3494	+ return null;
	3495	+ }
	3496	+ }
	3497	+
	3498	+ cRadio GetCurrentTab()
	3499	+ {
	3500	+ cRadio ab;
	3501	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3502	+ {
	3503	+ ab = (cRadio)e.nextElement();
	3504	+ if(ab.GetObject() == copy)
	3505	+ {
	3506	+ return ab;
	3507	+ }
	3508	+ }
	3509	+
	3510	+ return null;
	3511	+ }
	3512	+
	3513	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3514	+
	3515	+ public void Save()
	3516	+ {
	3517	+ System.err.println("Save");
	3518	+
	3519	+ cRadio tab = GetCurrentTab();
	3520	+
	3521	+ boolean temp = CameraPane.SWITCH;
	3522	+ CameraPane.SWITCH = false;
	3523	+
	3524	+ copy.ExtractBigData(hashtable);
	3525	+
	3526	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3527	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3528	+
	3529	+ copy.RestoreBigData(hashtable);
	3530	+
	3531	+ CameraPane.SWITCH = temp;
	3532	+
	3533	+ //assert(hashtable.isEmpty());
	3534	+
	3535	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3536	+ {
	3537	+ tab.graphs[i] = null;
	3538	+ }
	3539	+
	3540	+ SetUndoStates();
	3541	+
	3542	+ // test save
	3543	+ if (false)
	3544	+ {
	3545	+ try
	3546	+ {
	3547	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3548	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3549	+
	3550	+ p.writeObject(copy);
	3551	+
	3552	+ p.flush();
	3553	+
	3554	+ ostream.close();
	3555	+ } catch (Exception e)
	3556	+ {
	3557	+ e.printStackTrace();
	3558	+ }
	3559	+ }
	3560	+ }
	3561	+
	3562	+ void CopyChanged(Object3D obj)
	3563	+ {
	3564	+ SetUndoStates();
	3565	+
	3566	+ boolean temp = CameraPane.SWITCH;
	3567	+ CameraPane.SWITCH = false;
	3568	+
	3569	+ copy.ExtractBigData(hashtable);
	3570	+
	3571	+ copy.clear();
	3572	+
	3573	+ for (int i=0; i<obj.Size(); i++)
	3574	+ {
	3575	+ copy.add(obj.get(i));
	3576	+ }
	3577	+
	3578	+ copy.RestoreBigData(hashtable);
	3579	+
	3580	+ CameraPane.SWITCH = temp;
	3581	+
	3582	+ //assert(hashtable.isEmpty());
	3583	+
	3584	+ copy.Touch();
	3585	+
	3586	+ ResetModel();
	3587	+ copy.HardTouch(); // recompile?
	3588	+
	3589	+ cRadio ab;
	3590	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3591	+ {
	3592	+ ab = (cRadio)e.nextElement();
	3593	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3594	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3595	+ if (test != null)
	3596	+ {
	3597	+ test.editWindow = ab.object.editWindow;
	3598	+ ab.object = test;
	3599	+ }
	3600	+ }
	3601	+
	3602	+ refreshContents();
	3603	+ }
	3604	+
	3605	+ cButton undoButton;
	3606	+ cButton redoButton;
	3607	+
	3608	+ void SetUndoStates()
	3609	+ {
	3610	+ cRadio tab = GetCurrentTab();
	3611	+
	3612	+ undoButton.setEnabled(tab.undoindex > 0);
	3613	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3614	+ }
	3615	+
	3616	+ public void Undo()
	3617	+ {
	3618	+ System.err.println("Undo");
	3619	+
	3620	+ cRadio tab = GetCurrentTab();
	3621	+
	3622	+ if (tab.undoindex == 0)
	3623	+ {
	3624	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3625	+ return;
	3626	+ }
	3627	+
	3628	+ if (tab.graphs[tab.undoindex] == null)
	3629	+ {
	3630	+ Save();
	3631	+ tab.undoindex -= 1;
	3632	+ }
	3633	+
	3634	+ tab.undoindex -= 1;
	3635	+
	3636	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3637	+ }
	3638	+
	3639	+ public void Redo()
	3640	+ {
	3641	+ cRadio tab = GetCurrentTab();
	3642	+
	3643	+ if (tab.graphs[tab.undoindex + 1] == null)
	3644	+ {
	3645	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3646	+ return;
	3647	+ }
	3648	+
	3649	+ tab.undoindex += 1;
	3650	+
	3651	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3652	+ }
	3653	+
	3654	+ void ImportGFD()
	3655	+ {
	3656	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3657	+ browser.show();
	3658	+ String filename = browser.getFile();
	3659	+ if (filename != null && filename.length() > 0)
	3660	+ {
	3661	+ String fullname = browser.getDirectory() + filename;
	3662	+
	3663	+ //Object3D readobj =
	3664	+ objEditor.ReadGFD(fullname, objEditor);
	3665	+ //makeSomething(readobj);
	3666	+ }
	3667	+ }
	3668	+
	3669	+ void ImportVRMLX3D()
	3670	+ {
	3671	+ if (Grafreed.standAlone)
	3672	+ {
	3673	+ /**/
	3674	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3675	+ browser.show();
	3676	+ String filename = browser.getFile();
	3677	+ if (filename != null && filename.length() > 0)
	3678	+ {
	3679	+ String fullname = browser.getDirectory() + filename;
	3680	+ LoadVRMLX3D(fullname);
	3681	+ }
	3682	+ /**/
	3683	+ }
	3684	+ }
	3685	+
3177	3686	void ToggleAnimation()
3178	3687	{
3179	3688	if (!Globals.ANIMATION)
3180	3689	{
3181	3690	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3182		- browser.show();
	3691	+ browser.setVisible(true);
3183	3692	String filename = browser.getFile();
3184	3693	if (filename != null && filename.length() > 0)
3185	3694	{
..	..	@@ -3189,8 +3698,8 @@
3189	3698
3190	3699	Globals.ANIMATION ^= true;
3191	3700
3192		- GrafreeD.wav.cursor = 0;
3193		- GrafreeD.wav.loop = 0;
	3701	+ Grafreed.wav.cursor = 0;
	3702	+ Grafreed.wav.loop = 0;
3194	3703	}
3195	3704	} else
3196	3705	{
..	..	@@ -3240,7 +3749,7 @@
3240	3749	void CreateMaterial()
3241	3750	{
3242	3751	//copy.ClearMaterial(); // PATCH
3243		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3752	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3244	3753	if (copy.selection.size() > 0)
3245	3754	//SetMaterial(copy);
3246	3755	{
..	..	@@ -3291,7 +3800,7 @@
3291	3800	assert false;
3292	3801	}
3293	3802
3294		- void EditSelection()
	3803	+ void EditSelection(boolean newWindow)
3295	3804	{
3296	3805	}
3297	3806
..	..	@@ -3299,11 +3808,11 @@
3299	3808	{
3300	3809	copy.ResetBlockLoop(); // temporary problem
3301	3810
3302		- boolean random = CameraPane.RANDOM;
3303		- CameraPane.RANDOM = false; // parse everything
	3811	+ boolean random = CameraPane.SWITCH;
	3812	+ CameraPane.SWITCH = false; // parse everything
3304	3813	copy.ResetDisplayList();
3305	3814	copy.HardTouch();
3306		- CameraPane.RANDOM = random;
	3815	+ CameraPane.SWITCH = random;
3307	3816	}
3308	3817
3309	3818	// public void applySelf()
..	..	@@ -3377,6 +3886,36 @@
3377	3886	{
3378	3887	//System.out.println("Propagate = " + propagate);
3379	3888	copy.UpdateMaterial(anchor, current, propagate);
	3889	+
	3890	+ if (copy.material != null)
	3891	+ {
	3892	+ cMaterial mat = copy.material;
	3893	+
	3894	+ colorField.SetToolTipValue((mat.color));
	3895	+ modulationField.SetToolTipValue((mat.modulation));
	3896	+ metalnessField.SetToolTipValue((mat.metalness));
	3897	+ diffuseField.SetToolTipValue((mat.diffuse));
	3898	+ specularField.SetToolTipValue((mat.specular));
	3899	+ shininessField.SetToolTipValue((mat.shininess));
	3900	+ shiftField.SetToolTipValue((mat.shift));
	3901	+ ambientField.SetToolTipValue((mat.ambient));
	3902	+ lightareaField.SetToolTipValue((mat.lightarea));
	3903	+ diffusenessField.SetToolTipValue((mat.factor));
	3904	+ velvetField.SetToolTipValue((mat.velvet));
	3905	+ sheenField.SetToolTipValue((mat.sheen));
	3906	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3907	+ backlitField.SetToolTipValue((mat.bump));
	3908	+ anisoField.SetToolTipValue((mat.aniso));
	3909	+ anisoVField.SetToolTipValue((mat.anisoV));
	3910	+ cameraField.SetToolTipValue((mat.cameralight));
	3911	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3912	+ shadowField.SetToolTipValue((mat.shadow));
	3913	+ textureField.SetToolTipValue((mat.texture));
	3914	+ opacityField.SetToolTipValue((mat.opacity));
	3915	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3916	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3917	+ }
	3918	+
3380	3919	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3381	3920	{
3382	3921	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3421,6 +3960,7 @@
3421	3960	\|\| e.getSource() == apertureField
3422	3961	\|\| e.getSource() == shadowblurField)
3423	3962	{
	3963	+ new Exception().printStackTrace();
3424	3964	System.exit(0);
3425	3965	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3426	3966	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3491,7 +4031,7 @@
3491	4031	}
3492	4032
3493	4033	if (normalpushField != null)
3494		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4034	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3495	4035	}
3496	4036
3497	4037	void SnapObject()
..	..	@@ -3755,6 +4295,8 @@
3755	4295
3756	4296	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3757	4297	{
	4298	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4299	+ Save();
3758	4300	//Tween.set(thing, 0).target(1).start(tweenManager);
3759	4301	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3760	4302	// if (thing instanceof GenericJointDemo)
..	..	@@ -3841,6 +4383,12 @@
3841	4383	{
3842	4384	ResetModel();
3843	4385	Select(thing.GetTreePath(), true, false); // unselect... false);
	4386	+
	4387	+ if (thing.Size() == 0)
	4388	+ {
	4389	+ //EditSelection(false);
	4390	+ }
	4391	+
3844	4392	refreshContents();
3845	4393	}
3846	4394
..	..	@@ -3958,6 +4506,7 @@
3958	4506	}
3959	4507	}
3960	4508	}
	4509	+
3961	4510	LoadGFDThread loadGFDThread;
3962	4511
3963	4512	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3977,8 +4526,10 @@
3977	4526
3978	4527	try
3979	4528	{
	4529	+ // Try compressed version first.
3980	4530	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3981		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4531	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4532	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3982	4533
3983	4534	readobj = (Object3D) p.readObject();
3984	4535	istream.close();
..	..	@@ -3986,7 +4537,20 @@
3986	4537	readobj.ResetDisplayList();
3987	4538	} catch (Exception e)
3988	4539	{
3989		- e.printStackTrace();
	4540	+ //e.printStackTrace();
	4541	+ try
	4542	+ {
	4543	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4544	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4545	+
	4546	+ readobj = (Object3D) p.readObject();
	4547	+ istream.close();
	4548	+
	4549	+ readobj.ResetDisplayList();
	4550	+ } catch (Exception e2)
	4551	+ {
	4552	+ e2.printStackTrace();
	4553	+ }
3990	4554	}
3991	4555	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3992	4556	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4032,6 +4596,12 @@
4032	4596
4033	4597	void LoadIt(Object obj)
4034	4598	{
	4599	+ if (obj == null)
	4600	+ {
	4601	+ // Invalid file
	4602	+ return;
	4603	+ }
	4604	+
4035	4605	System.out.println("Loaded " + obj);
4036	4606	//new Exception().printStackTrace();
4037	4607	Object3D readobj = (Object3D) obj;
..	..	@@ -4041,6 +4611,8 @@
4041	4611
4042	4612	if (readobj != null)
4043	4613	{
	4614	+ if (Globals.SAVEONMAKE)
	4615	+ Save();
4044	4616	try
4045	4617	{
4046	4618	//readobj.deepCopySelf(copy);
..	..	@@ -4103,7 +4675,7 @@
4103	4675
4104	4676	void load() // throws ClassNotFoundException
4105	4677	{
4106		- if (GrafreeD.standAlone)
	4678	+ if (Grafreed.standAlone)
4107	4679	{
4108	4680	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4109	4681	browser.show();
..	..	@@ -4190,11 +4762,13 @@
4190	4762	try
4191	4763	{
4192	4764	FileOutputStream ostream = new FileOutputStream(lastname);
4193		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4765	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4766	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4194	4767
4195	4768	p.writeObject(copy);
4196	4769	p.flush();
4197	4770
	4771	+ zstream.close();
4198	4772	ostream.close();
4199	4773
4200	4774	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4204,17 +4778,20 @@
4204	4778	{
4205	4779	}
4206	4780	}
	4781	+
4207	4782	String lastname;
4208	4783
4209	4784	void saveAs()
4210	4785	{
4211		- if (GrafreeD.standAlone)
	4786	+ if (Grafreed.standAlone)
4212	4787	{
4213	4788	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4214	4789	browser.setVisible(true);
4215	4790	String filename = browser.getFile();
4216	4791	if (filename != null && filename.length() > 0)
4217	4792	{
	4793	+ if (!filename.endsWith(".gfd"))
	4794	+ filename += ".gfd";
4218	4795	lastname = browser.getDirectory() + filename;
4219	4796	save();
4220	4797	}
..	..	@@ -4313,13 +4890,13 @@
4313	4890	try
4314	4891	{
4315	4892	FileOutputStream ostream = new FileOutputStream(filename);
4316		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4317		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4893	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4894	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4318	4895
4319	4896	Object3D objectparent = obj.parent;
4320	4897	obj.parent = null;
4321	4898
4322		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4899	+ Object3D object = (Object3D) Grafreed.clone(obj);
4323	4900
4324	4901	obj.parent = objectparent;
4325	4902
..	..	@@ -4331,8 +4908,8 @@
4331	4908	p.writeObject(object);
4332	4909	p.flush();
4333	4910
	4911	+ zstream.close();
4334	4912	ostream.close();
4335		- // zstream.close();
4336	4913
4337	4914	// group.selection.get(0).parent = parent;
4338	4915	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4353,7 +4930,7 @@
4353	4930	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4354	4931	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4355	4932	copy.generatePOV(buffer);
4356		- if (GrafreeD.standAlone)
	4933	+ if (Grafreed.standAlone)
4357	4934	{
4358	4935	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4359	4936	browser.show();
..	..	@@ -4379,7 +4956,8 @@
4379	4956	Object3D client;
4380	4957	Object3D copy;
4381	4958	MenuBar menuBar;
4382		- Menu windowMenu;
	4959	+ Menu fileMenu;
	4960	+ MenuItem newItem;
4383	4961	MenuItem loadItem;
4384	4962	MenuItem saveItem;
4385	4963	MenuItem saveAsItem;
..	..	@@ -4387,13 +4965,11 @@
4387	4965	MenuItem reexportItem;
4388	4966	MenuItem povItem;
4389	4967	MenuItem closeItem;
4390		- Menu cameraMenu;
	4968	+
4391	4969	CheckboxMenuItem zBufferItem;
4392	4970	//MenuItem normalLensItem;
4393		- MenuItem editCameraItem;
4394		- MenuItem revertCameraItem;
4395		- CheckboxMenuItem toggleLiveItem;
4396	4971	MenuItem stepItem;
	4972	+ CheckboxMenuItem toggleLiveItem;
4397	4973	CheckboxMenuItem toggleFullScreenItem;
4398	4974	CheckboxMenuItem toggleTimelineItem;
4399	4975	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4402,25 +4978,38 @@
4402	4978	CheckboxMenuItem toggleFootContactItem;
4403	4979	CheckboxMenuItem toggleDLItem;
4404	4980	CheckboxMenuItem toggleTextureItem;
4405		- CheckboxMenuItem toggleRandomItem;
	4981	+ CheckboxMenuItem toggleSwitchItem;
4406	4982	CheckboxMenuItem toggleRootItem;
4407	4983	CheckboxMenuItem animationItem;
4408	4984	CheckboxMenuItem toggleHandleItem;
4409	4985	CheckboxMenuItem togglePaintItem;
4410	4986	JSplitPane mainPanel;
4411	4987	JScrollPane scrollpane;
	4988	+
4412	4989	JPanel toolbarPanel;
4413		- JPanel treePanel;
	4990	+
	4991	+ cGridBag treePanel;
	4992	+
4414	4993	JPanel radioPanel;
4415	4994	ButtonGroup buttonGroup;
4416		- cGridBag ctrlPanel;
	4995	+
	4996	+ cGridBag toolboxPanel;
4417	4997	cGridBag materialPanel;
	4998	+ cGridBag ctrlPanel;
	4999	+
4418	5000	JScrollPane infoPanel;
	5001	+
4419	5002	cGridBag optionsPanel;
	5003	+
4420	5004	JTabbedPane objectPanel;
	5005	+ boolean materialFlushed;
	5006	+ Object3D latestObject;
	5007	+
4421	5008	cGridBag XYZPanel;
	5009	+
4422	5010	JSplitPane gridPanel;
4423	5011	JSplitPane bigPanel;
	5012	+
4424	5013	cGridBag bigThree;
4425	5014	cGridBag scenePanel;
4426	5015	cGridBag centralPanel;
..	..	@@ -4535,8 +5124,13 @@
4535	5124	cNumberSlider fogField;
4536	5125	JLabel opacityPowerLabel;
4537	5126	cNumberSlider opacityPowerField;
4538		- JTree jTree;
	5127	+ cTree jTree;
4539	5128	//ObjectUI parent;
4540	5129
4541	5130	cNumberSlider normalpushField;
	5131	+
	5132	+ private MenuItem importGFDItem;
	5133	+ private MenuItem importVRMLX3DItem;
	5134	+ private MenuItem import3DSItem;
	5135	+ private MenuItem importOBJItem;
4542	5136	}