~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(false);
239	313	objEditor = this;
240	314	this.callee = callee;
241	315
..	..	@@ -266,28 +340,49 @@
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(openItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
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
290		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
291	386	saveItem.addActionListener(this);
292	387	saveAsItem.addActionListener(this);
293	388	exportAsItem.addActionListener(this);
..	..	@@ -295,81 +390,66 @@
295	390	//povItem.addActionListener(this);
296	391	closeItem.addActionListener(this);
297	392
298		- menuBar.add(cameraMenu = new Menu("View"));
299		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300		- //zBufferItem.addActionListener(this);
301		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302		- //normalLensItem.addActionListener(this);
303		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304		- revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
307		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308		- toggleFullScreenItem.addItemListener(this);
309		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310		- cameraMenu.add("-");
311		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312		- toggleTextureItem.addItemListener(this);
313		- toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
337		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338		- toggleHandleItem.addItemListener(this);
339		- toggleHandleItem.setState(CameraPane.HANDLES);
340		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341		- togglePaintItem.addItemListener(this);
342		- togglePaintItem.setState(CameraPane.PAINTMODE);
343		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344		-// toggleRootItem.addItemListener(this);
345		-// toggleRootItem.setState(false);
346		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347		-// animationItem.addItemListener(this);
348		-// animationItem.setState(CameraPane.ANIMATION);
349		- cameraMenu.add("-");
350		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351		- editCameraItem.addActionListener(this);
352		-
353	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
354	420	toolbarPanel = new JPanel();
355	421	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
357	423	treePanel.setName("Tree");
358		- ctrlPanel = new cGridBag(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
	428	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
360	437	materialPanel = new cGridBag().setVertical(true);
361	438	materialPanel.setName("Material");
	439	+
362	440	/JTextPane/
363	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
364	444	infoarea.setEditable(true);
365	445	SetText();
366	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	447	// infoarea.setOpaque(false);
368	448	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
373	453	infoPanel.setName("Info");
374	454	//infoPanel.setLayout(new BorderLayout());
375	455	//infoPanel.add(createTextPane());
..	..	@@ -378,15 +458,22 @@
378	458	mainPanel.setName("Main");
379	459	mainPanel.setContinuousLayout(true);
380	460	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	461	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	462	+ mainPanel.setDividerLocation(0.5); //1.0);
	463	+ mainPanel.setResizeWeight(0.5);
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
385	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	473	//mainPanel.setLayout(new GridBagLayout());
387	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
390	477	//materialPanel.setLayout(new GridBagLayout());
391	478
392	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
..	..	@@ -426,7 +513,7 @@
426	513	static String newline = "\n";
427	514	protected static final String buttonString = "JButton";
428	515	StyledDocument doc;
429		- JTextArea infoarea;
	516	+ JTextPane infoarea;
430	517
431	518	void ClearInfo()
432	519	{
..	..	@@ -449,10 +536,10 @@
449	536	e.printStackTrace();
450	537	}
451	538
452		- String selection = infoarea.getText();
453		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454		- java.awt.datatransfer.Clipboard clipboard =
455		- Toolkit.getDefaultToolkit().getSystemClipboard();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	543	//clipboard.setContents(data, data);
457	544	}
458	545
..	..	@@ -475,13 +562,13 @@
475	562	//SendInfo("Name:", "bold");
476	563	if (sel.GetTextures() != null \|\| debug)
477	564	{
478		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	567	if (sel.Size() > 0)
481	568	{
482	569	si.SendInfo("#children = " + sel.Size(), "regular");
483	570	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	572	if (debug)
486	573	{
487	574	try
..	..	@@ -493,7 +580,10 @@
493	580	}
494	581
495	582	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
497	587
498	588	if (sel.bRep != null)
499	589	{
..	..	@@ -520,7 +610,7 @@
520	610	}
521	611	if (sel.support != null)
522	612	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	614	}
525	615	if (sel.scriptnode != null)
526	616	{
..	..	@@ -591,6 +681,9 @@
591	681	{
592	682	CameraPane.pointflow = (PointFlow) sel;
593	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
594	687	}
595	688	}
596	689
..	..	@@ -606,68 +699,191 @@
606	699	}
607	700	}
608	701
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
	720	+
	721	+ void Minimize()
	722	+ {
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
	725	+ }
	726	+
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	730	+ void Maximize()
	731	+ {
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
	737	+ if (maximized)
	738	+ {
	739	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	740	+ }
	741	+ else
	742	+ {
	743	+ keeprect = frame.getBounds();
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	747	+// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	749	+ }
	750	+
	751	+ maximized ^= true;
	752	+
	753	+ frame.validate();
	754	+ }
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
	759	+
609	760	void ToggleFullScreen()
610	761	{
611		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
612	767	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	768	+ device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
	774	+ //frame.setVisible(false);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(false);
	777	+// frame.addNotify();
	778	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	779	+
	780	+// X frame.getContentPane().remove(/"Center",/bigThree);
	781	+// X framePanel.add(bigThree);
	782	+// X frame.getContentPane().add(/"Center",/framePanel);
	783	+ framePanel.setDividerLocation(46);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
616	791	} else
617	792	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	793	+ keepButton = radio.layout;
	794	+ //keeprect = frame.getBounds();
	795	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	796	+// frame.getToolkit().getScreenSize().height);
	797	+ //frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
	801	+ device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
	804	+// frame.removeNotify();
	805	+// frame.setUndecorated(true);
	806	+// frame.addNotify();
	807	+// X frame.getContentPane().remove(/"Center",/framePanel);
	808	+// X framePanel.remove(bigThree);
	809	+// X frame.getContentPane().add(/"Center",/bigThree);
	810	+ framePanel.setDividerLocation(0);
	811	+
	812	+ radio.layout = fullscreenLayout;
	813	+ radio.layout.doClick();
	814	+ //frame.setVisible(true);
621	815	}
622		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
623	817	}
624	818
625		- private JTextArea createTextPane()
	819	+ private byte[] CompressCopy()
626	820	{
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		- };
	821	+ boolean temp = CameraPane.SWITCH;
	822	+ CameraPane.SWITCH = false;
	823	+
	824	+ copy.ExtractBigData(versiontable);
	825	+ // if (copy == client)
	826	+
	827	+ byte[] versions[] = copy.versions;
	828	+ copy.versions = null;
	829	+
	830	+ byte[] compress = Compress(copy);
	831	+
	832	+ copy.versions = versions;
	833	+
	834	+ copy.RestoreBigData(versiontable);
	835	+
	836	+ CameraPane.SWITCH = temp;
	837	+
	838	+ return compress;
	839	+ }
642	840
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
	841	+ private JTextPane createTextPane()
	842	+ {
	843	+// TEXTAREA String[] initString =
	844	+// {
	845	+// "This is an editable JTextPane, ", //regular
	846	+// "another ", //italic
	847	+// "styled ", //bold
	848	+// "text ", //small
	849	+// "component, ", //large
	850	+// "which supports embedded components..." + newline,//regular
	851	+// " " + newline, //button
	852	+// "...and embedded icons..." + newline, //regular
	853	+// " ", //icon
	854	+// newline + "JTextPane is a subclass of JEditorPane that "
	855	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	856	+// + "cover methods for interacting with those objects."
	857	+// };
	858	+//
	859	+// String[] initStyles =
	860	+// {
	861	+// "regular", "italic", "bold", "small", "large",
	862	+// "regular", "button", "regular", "icon",
	863	+// "regular"
	864	+// };
	865	+//
	866	+// JTextPane textPane = new JTextPane();
	867	+// textPane.setEditable(true);
	868	+// /StyledDocument/ doc = textPane.getStyledDocument();
	869	+// addStylesToDocument(doc);
	870	+//
	871	+// try
	872	+// {
	873	+// for (int j = 0; j < 2; j++)
	874	+// {
	875	+// for (int i = 0; i < initString.length; i++)
	876	+// {
	877	+// doc.insertString(doc.getLength(), initString[i],
	878	+// doc.getStyle(initStyles[i]));
	879	+// }
	880	+// }
	881	+// } catch (BadLocationException ble)
	882	+// {
	883	+// System.err.println("Couldn't insert initial text into text pane.");
	884	+// }
649	885
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;
	886	+ return new JTextPane(); // textPane;
671	887	}
672	888
673	889	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +936,7 @@
720	936	protected static ImageIcon createImageIcon(String path,
721	937	String description)
722	938	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	939	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	940	if (imgURL != null)
725	941	{
726	942	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +968,7 @@
752	968	// NumberSlider vDivsField;
753	969	// JCheckBox endcaps;
754	970	JCheckBox liveCB;
	971	+ JCheckBox selectCB;
755	972	JCheckBox hideCB;
756	973	JCheckBox link2masterCB;
757	974	JCheckBox markCB;
..	..	@@ -759,7 +976,12 @@
759	976	JCheckBox speedupCB;
760	977	JCheckBox rewindCB;
761	978	JCheckBox flipVCB;
	979	+
	980	+ cCheckBox toggleTextureCB;
	981	+ cCheckBox toggleSwitchCB;
	982	+
762	983	JComboBox texresMenu;
	984	+
763	985	JButton resetButton;
764	986	JButton stepButton;
765	987	JButton stepAllButton;
..	..	@@ -767,54 +989,48 @@
767	989	JButton slowerButton;
768	990	JButton fasterButton;
769	991	JButton remarkButton;
	992	+
	993	+ cGridBag editPanel;
	994	+ cGridBag editCommandsPanel;
	995	+
	996	+ cGridBag namePanel;
	997	+ cGridBag setupPanel;
	998	+ cGridBag setupPanel2;
	999	+ cGridBag objectCommandsPanel;
	1000	+ cGridBag pushPanel;
	1001	+ cGridBag fillPanel;
770	1002
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1003	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	1004	{
773	1005	JCheckBox cb;
774	1006
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);
	1007	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	1008	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	1009
785	1010	return cb;
786	1011	}
787	1012
788		- cButton AddButton(ObjEditor oe, String label)
	1013	+ cButton AddButton(cGridBag panel, String label)
789	1014	{
790	1015	cButton cb;
791	1016
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);
	1017	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	1018	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	1019
802	1020	return cb;
803	1021	}
804	1022
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1023	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1024	{
807	1025	JComboBox combo;
808	1026
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;
	1027	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1028	combo.addActionListener(this);
813	1029
814	1030	return combo;
815	1031	}
816	1032
817		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
	1033	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1034	{
819	1035	cGridBag control = new cGridBag();
820	1036
..	..	@@ -826,12 +1042,12 @@
826	1042	control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827	1043	combo.setFloat(current);
828	1044
829		- ctrlPanel.add(control);
	1045	+ panel.add(control);
830	1046
831		- return combo;
	1047	+ return control;
832	1048	}
833	1049
834		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
	1050	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835	1051	{
836	1052	cGridBag control = new cGridBag();
837	1053
..	..	@@ -839,25 +1055,21 @@
839	1055
840	1056	JLabel jlabel = new JLabel(label);
841	1057	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);
	1058	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1059	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844	1060	combo.setInteger(current);
845	1061
846		- ctrlPanel.add(control);
	1062	+ panel.add(control);
847	1063
848		- return combo;
	1064	+ return control;
849	1065	}
850	1066
851	1067	JTextArea AddText(cGridBag ctrlPanel, String name)
852	1068	{
853	1069	JTextArea text;
854	1070
855		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857	1071	ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1072	text.addCaretListener(this);
859		- aConstraints.gridx += 1;
860		- aConstraints.gridwidth = 1;
861	1073
862	1074	return text;
863	1075	}
..	..	@@ -896,7 +1108,7 @@
896	1108
897	1109	/*
898	1110	*/
899		- void Return() // ObjEditor oe)
	1111	+ void Return0() // ObjEditor oe)
900	1112	{
901	1113	aConstraints.gridy += 1;
902	1114	aConstraints.gridx = 0;
..	..	@@ -951,37 +1163,77 @@
951	1163
952	1164	void SetupUI2(ObjEditor oe)
953	1165	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958		- SetupName(oe);
	1166	+ //SetupName(oe);
959	1167
960		- if (!GroupEditor.allparams)
	1168	+ namePanel = new cGridBag();
	1169	+
	1170	+ nameField = AddText(namePanel, copy.GetName());
	1171	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1172	+ oe.ctrlPanel.add(namePanel);
	1173	+
	1174	+ oe.ctrlPanel.Return();
	1175	+
	1176	+ if (!allparams)
961	1177	return;
962	1178
963		- liveCB = AddCheckBox(oe, "Live", copy.live);
964		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1179	+ setupPanel = new cGridBag().setVertical(false);
	1180	+
	1181	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1182	+ liveCB.setToolTipText("Animate object");
	1183	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1184	+ selectCB.setToolTipText("Make object selectable");
966	1185	// 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");
	1186	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1187	+ hideCB.setToolTipText("Hide object");
	1188	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1189	+ markCB.setToolTipText("As animation target transform");
	1190	+
	1191	+ setupPanel2 = new cGridBag().setVertical(false);
	1192	+
	1193	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1194	+ rewindCB.setToolTipText("Rewind animation");
	1195	+
	1196	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1197	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1198	+
	1199	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1200	+ link2masterCB.setToolTipText("Attach to support");
	1201	+
	1202	+ if (Globals.ADVANCED)
	1203	+ {
	1204	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1205	+ speedupCB.setToolTipText("Option motion capture");
	1206	+ }
	1207	+
	1208	+ oe.ctrlPanel.add(setupPanel);
	1209	+ oe.ctrlPanel.Return();
	1210	+ oe.ctrlPanel.add(setupPanel2);
	1211	+ oe.ctrlPanel.Return();
	1212	+
	1213	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1214	+
	1215	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1216	+ resetButton.setToolTipText("Jump to frame zero");
	1217	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1218	+ stepButton.setToolTipText("Step one frame");
973	1219	// resetAllButton = AddButton(oe, "Reset All");
974	1220	// stepAllButton = AddButton(oe, "Step All");
975		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
976	1221	// Return();
977		- slowerButton = AddButton(oe, "Slow");
978		- fasterButton = AddButton(oe, "Fast");
979		- remarkButton = AddButton(oe, "Rem");
	1222	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1223	+ slowerButton.setToolTipText("Decrease animation speed");
	1224	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1225	+ fasterButton.setToolTipText("Increase animation speed");
	1226	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1227	+ remarkButton.setToolTipText("Set the current transform as the target");
980	1228
981		- Return();
	1229	+ oe.ctrlPanel.add(objectCommandsPanel);
	1230	+ oe.ctrlPanel.Return();
982	1231
983		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984		- Return();
	1232	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1233	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1234	+ //Return();
	1235	+
	1236	+ oe.ctrlPanel.Return();
985	1237
986	1238	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1239	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1076,7 +1328,7 @@
1076	1328	oe.aConstraints.gridwidth = 1;
1077	1329	/**/
1078	1330	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1331	+ oe.ctrlPanel.Return();
1080	1332
1081	1333	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1334	//textureButton.setEnabled(false);
..	..	@@ -1180,8 +1432,11 @@
1180	1432	//worldPanel.setName("World");
1181	1433	centralPanel = new cGridBag();
1182	1434	centralPanel.preferredWidth = 20;
1183		- timelinePanel = new JPanel(new BorderLayout());
1184		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1435	+
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ timelinePanel = new JPanel(new BorderLayout());
	1439	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1185	1440
1186	1441	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1187	1442	cameraPanel.setContinuousLayout(true);
..	..	@@ -1190,7 +1445,10 @@
1190	1445	// cameraPanel.setDividerSize(9);
1191	1446	cameraPanel.setResizeWeight(1.0);
1192	1447
	1448	+ }
	1449	+
1193	1450	centralPanel.add(cameraView);
	1451	+ centralPanel.setFocusable(true);
1194	1452	//frame.setJMenuBar(timelineMenubar);
1195	1453	//centralPanel.add(timelinePanel);
1196	1454
..	..	@@ -1253,11 +1511,16 @@
1253	1511	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254	1512	//tmp.setName("Edit");
1255	1513	objectPanel.add(materialPanel);
1256		- JPanel north = new JPanel(new BorderLayout());
1257		- north.setName("Edit");
1258		- north.add(ctrlPanel, BorderLayout.NORTH);
1259		- objectPanel.add(north);
1260		- objectPanel.add(infoPanel);
	1514	+// JPanel north = new JPanel(new BorderLayout());
	1515	+// north.setName("Edit");
	1516	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1517	+// objectPanel.add(north);
	1518	+ objectPanel.add(editPanel);
	1519	+
	1520	+ //if (Globals.ADVANCED)
	1521	+ objectPanel.add(infoPanel);
	1522	+
	1523	+ objectPanel.add(toolboxPanel);
1261	1524
1262	1525	/*
1263	1526	aConstraints.gridx = 0;
..	..	@@ -1266,7 +1529,7 @@
1266	1529	aConstraints.gridy += 1;
1267	1530	aConstraints.gridwidth = 1;
1268	1531	mainPanel.add(objectPanel, aConstraints);
1269		- */
	1532	+ */
1270	1533
1271	1534	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1272	1535	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1278,14 +1541,12 @@
1278	1541	scrollpane.addMouseWheelListener(this); // Default not fast enough
1279	1542
1280	1543	/JTabbedPane/ scenePanel = new cGridBag();
1281		- scenePanel.preferredWidth = 7;
	1544	+ scenePanel.preferredWidth = 6;
1282	1545
1283	1546	JTabbedPane tabbedPane = new JTabbedPane();
1284	1547	tabbedPane.add(scrollpane);
1285	1548
1286		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287		-
1288		- optionsPanel = new cGridBag().setVertical(true);
	1549	+ optionsPanel = new cGridBag().setVertical(false);
1289	1550
1290	1551	optionsPanel.setName("Options");
1291	1552
..	..	@@ -1293,6 +1554,8 @@
1293	1554
1294	1555	tabbedPane.add(optionsPanel);
1295	1556
	1557	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1558	+
1296	1559	scenePanel.add(tabbedPane);
1297	1560
1298	1561	/*
..	..	@@ -1365,9 +1628,9 @@
1365	1628	// aConstraints.gridheight = 1;
1366	1629
1367	1630	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1368		- framePanel.setContinuousLayout(true);
1369		- framePanel.setOneTouchExpandable(true);
1370		- framePanel.setDividerLocation(0.8);
	1631	+ framePanel.setContinuousLayout(false);
	1632	+ framePanel.setOneTouchExpandable(false);
	1633	+ //.setDividerLocation(0.8);
1371	1634	//framePanel.setDividerSize(15);
1372	1635	//framePanel.setResizeWeight(0.15);
1373	1636	framePanel.setName("Frame");
..	..	@@ -1384,10 +1647,15 @@
1384	1647
1385	1648	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1386	1649
1387		- frame.setSize(1024, 768);
1388		- frame.show();
1389		-
	1650	+ frame.setSize(1280, 860);
	1651	+
	1652	+ cameraView.requestFocusInWindow();
	1653	+
1390	1654	gridPanel.setDividerLocation(1.0);
	1655	+
	1656	+ frame.validate();
	1657	+
	1658	+ frame.setVisible(true);
1391	1659
1392	1660	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1393	1661	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1415,7 +1683,7 @@
1415	1683	ctrlPanel.removeAll();
1416	1684	}
1417	1685
1418		- void SetupMaterial(cGridBag ctrlPanel)
	1686	+ void SetupMaterial(cGridBag panel)
1419	1687	{
1420	1688	/*
1421	1689	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
..	..	@@ -1424,18 +1692,26 @@
1424	1692
1425	1693	cGridBag editBar = new cGridBag().setVertical(false);
1426	1694
1427		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1695	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1696	+ createMaterialButton.setToolTipText("Create material");
1428	1697
1429	1698	/*
1430	1699	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	1700	*/
1432	1701
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);
	1702	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1703	+ clearMaterialButton.setToolTipText("Clear material");
	1704	+
	1705	+ if (Globals.ADVANCED)
	1706	+ {
	1707	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1708	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1709	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1710	+ }
1437	1711
1438		- ctrlPanel.add(editBar);
	1712	+ editBar.preferredHeight = 15;
	1713	+
	1714	+ panel.add(editBar);
1439	1715
1440	1716	/**/
1441	1717	//aConstraints.weighty = 0;
..	..	@@ -1445,17 +1721,13 @@
1445	1721	//aConstraints.gridx += 1;
1446	1722	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1447	1723
1448		- JPanel colorPanel = new JPanel(new BorderLayout());
1449		- colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450		-
1451	1724	cGridBag colorSection = new cGridBag().setVertical(true);
1452		-
1453		- colorPanel.add(colorSection);
1454	1725
1455	1726	cGridBag color = new cGridBag();
1456	1727	color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1457	1728	colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458	1729	color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1730	+ //colorField.preferredWidth = 200;
1459	1731	colorSection.add(color);
1460	1732
1461	1733	cGridBag modulation = new cGridBag();
..	..	@@ -1470,34 +1742,13 @@
1470	1742	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1471	1743	colorSection.add(texture);
1472	1744
1473		- cGridBag anisoU = new cGridBag();
1474		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1477		- colorSection.add(anisoU);
1478		-
1479		- cGridBag anisoV = new cGridBag();
1480		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1481		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1482		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1483		- colorSection.add(anisoV);
1484		-
1485		- cGridBag shadowbias = new cGridBag();
1486		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1487		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1488		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1489		- colorSection.add(shadowbias);
1490		-
1491		- ctrlPanel.add(colorPanel);
	1745	+ panel.add(new JSeparator());
	1746	+
	1747	+ panel.add(colorSection);
1492	1748
1493	1749	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1494	1750
1495		- JPanel diffusePanel = new JPanel(new BorderLayout());
1496		- diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497		-
1498	1751	cGridBag diffuseSection = new cGridBag().setVertical(true);
1499		-
1500		- diffusePanel.add(diffuseSection);
1501	1752
1502	1753	cGridBag diffuse = new cGridBag();
1503	1754	diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
..	..	@@ -1541,16 +1792,19 @@
1541	1792	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	1793	diffuseSection.add(fakedepth);
1543	1794
1544		- ctrlPanel.add(diffusePanel);
	1795	+ cGridBag shadowbias = new cGridBag();
	1796	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1797	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1798	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1799	+ diffuseSection.add(shadowbias);
	1800	+
	1801	+ panel.add(new JSeparator());
	1802	+
	1803	+ panel.add(diffuseSection);
1545	1804
1546	1805	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1547	1806
1548		- JPanel specularPanel = new JPanel(new BorderLayout());
1549		- specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550		-
1551	1807	cGridBag specularSection = new cGridBag().setVertical(true);
1552		-
1553		- specularPanel.add(specularSection);
1554	1808
1555	1809	cGridBag specular = new cGridBag();
1556	1810	specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
..	..	@@ -1582,7 +1836,7 @@
1582	1836	velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1583	1837	specularSection.add(velvet);
1584	1838
1585		- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	1839	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1586	1840	//Return();
1587	1841	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1588	1842	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..	..	@@ -1594,52 +1848,58 @@
1594	1848	// aConstraints.gridy += 1;
1595	1849	// aConstraints.gridwidth = 1;
1596	1850
	1851	+ cGridBag anisoU = new cGridBag();
	1852	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1853	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1854	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1855	+ specularSection.add(anisoU);
1597	1856
1598		- ctrlPanel.add(specularPanel);
	1857	+ cGridBag anisoV = new cGridBag();
	1858	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1859	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1860	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1861	+ specularSection.add(anisoV);
	1862	+
	1863	+
	1864	+ panel.add(new JSeparator());
	1865	+
	1866	+ panel.add(specularSection);
1599	1867
1600	1868	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1601	1869
1602		- JPanel globalPanel = new JPanel(new BorderLayout());
1603		- globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1604		-
1605		- cGridBag globalSection = new cGridBag().setVertical(true);
1606		-
1607		- globalPanel.add(globalSection);
	1870	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	1871
1609	1872	cGridBag camera = new cGridBag();
1610	1873	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	1874	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1875	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	1876	+ colorSection.add(camera);
1614	1877
1615	1878	cGridBag ambient = new cGridBag();
1616	1879	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	1880	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1881	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	1882	+ colorSection.add(ambient);
1620	1883
1621	1884	cGridBag backlit = new cGridBag();
1622	1885	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	1886	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1887	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	1888	+ colorSection.add(backlit);
1626	1889
1627	1890	cGridBag opacity = new cGridBag();
1628	1891	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629	1892	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630	1893	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631		- globalSection.add(opacity);
	1894	+ colorSection.add(opacity);
1632	1895
1633		- ctrlPanel.add(globalPanel);
	1896	+ //panel.add(new JSeparator());
	1897	+
	1898	+ //panel.add(globalSection);
1634	1899
1635	1900	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1636	1901
1637		- JPanel texturePanel = new JPanel(new BorderLayout());
1638		- texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639		-
1640	1902	cGridBag textureSection = new cGridBag().setVertical(true);
1641		-
1642		- texturePanel.add(textureSection);
1643	1903
1644	1904	cGridBag bump = new cGridBag();
1645	1905	bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
..	..	@@ -1677,7 +1937,9 @@
1677	1937	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1678	1938	textureSection.add(opacityPower);
1679	1939
1680		- ctrlPanel.add(texturePanel);
	1940	+ panel.add(new JSeparator());
	1941	+
	1942	+ panel.add(textureSection);
1681	1943
1682	1944	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1683	1945
..	..	@@ -1714,12 +1976,15 @@
1714	1976	opacityPowerField.addChangeListener(this);
1715	1977	/**/
1716	1978
1717		- resetSlidersButton.addActionListener(this);
1718	1979	clearMaterialButton.addActionListener(this);
1719	1980	createMaterialButton.addActionListener(this);
1720		-
1721		- propagateToggle.addItemListener(this);
1722		- multiplyToggle.addItemListener(this);
	1981	+
	1982	+ if (Globals.ADVANCED)
	1983	+ {
	1984	+ resetSlidersButton.addActionListener(this);
	1985	+ propagateToggle.addItemListener(this);
	1986	+ multiplyToggle.addItemListener(this);
	1987	+ }
1723	1988	}
1724	1989
1725	1990	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1737,8 +2002,9 @@
1737	2002	// 3D models
1738	2003	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1739	2004	{
1740		- lastConverter = new com.jmex.model.converters.MaxToJme();
1741		- LoadFile(filename, lastConverter);
	2005	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2006	+ //LoadFile(filename, lastConverter);
	2007	+ LoadObjFile(filename); // New 3ds loader
1742	2008	continue;
1743	2009	}
1744	2010	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1890,7 +2156,7 @@
1890	2156
1891	2157	//? flashIt = false;
1892	2158	CameraPane pane = (CameraPane) cameraView;
1893		- pane.clickStart(location.x, location.y, 0);
	2159	+ pane.clickStart(location.x, location.y, 0, 0);
1894	2160	pane.clickEnd(location.x, location.y, 0, true);
1895	2161
1896	2162	if (group.selection.size() == 1)
..	..	@@ -1939,6 +2205,7 @@
1939	2205	e2.printStackTrace();
1940	2206	}
1941	2207	}
	2208	+
1942	2209	LoadJMEThread loadThread;
1943	2210
1944	2211	class LoadJMEThread extends Thread
..	..	@@ -1996,6 +2263,7 @@
1996	2263	//LoadFile0(filename, converter);
1997	2264	}
1998	2265	}
	2266	+
1999	2267	LoadOBJThread loadObjThread;
2000	2268
2001	2269	class LoadOBJThread extends Thread
..	..	@@ -2074,19 +2342,19 @@
2074	2342
2075	2343	void LoadObjFile(String fullname)
2076	2344	{
2077		- /*
	2345	+ System.out.println("Loading " + fullname);
	2346	+ /**/
2078	2347	//lastFilename = fullname;
2079	2348	if(loadObjThread == null)
2080	2349	{
2081		- loadObjThread = new LoadOBJThread();
2082		- loadObjThread.start();
	2350	+ loadObjThread = new LoadOBJThread();
	2351	+ loadObjThread.start();
2083	2352	}
2084	2353
2085	2354	loadObjThread.add(fullname);
2086		- */
	2355	+ /**/
2087	2356
2088		- System.out.println("Loading " + fullname);
2089		- makeSomething(new FileObject(fullname, true), true);
	2357	+ //makeSomething(new FileObject(fullname, true), true);
2090	2358	}
2091	2359
2092	2360	void LoadGFDFile(String fullname)
..	..	@@ -2347,11 +2615,11 @@
2347	2615
2348	2616	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2349	2617	{
2350		- if (GrafreeD.standAlone)
	2618	+ if (Grafreed.standAlone)
2351	2619	{
2352	2620	/**/
2353	2621	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2354		- browser.show();
	2622	+ browser.setVisible(true);
2355	2623	String filename = browser.getFile();
2356	2624	if (filename != null && filename.length() > 0)
2357	2625	{
..	..	@@ -2462,6 +2730,7 @@
2462	2730	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2463	2731	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2464	2732	}
	2733	+
2465	2734	//cJME.count++;
2466	2735	//cJME.count %= 12;
2467	2736	if (gc)
..	..	@@ -2496,6 +2765,7 @@
2496	2765	}
2497	2766	if (input == null)
2498	2767	{
	2768	+ new Exception().printStackTrace();
2499	2769	System.exit(0);
2500	2770	}
2501	2771
..	..	@@ -2644,6 +2914,7 @@
2644	2914	}
2645	2915	}
2646	2916	}
	2917	+
2647	2918	cFileSystemPane FSPane;
2648	2919
2649	2920	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2697,11 +2968,14 @@
2697	2968	}
2698	2969	}
2699	2970	}
	2971	+
2700	2972	freezematerial = false;
2701	2973	}
2702	2974
2703	2975	void SetMaterial(Object3D object)
2704	2976	{
	2977	+ latestObject = object;
	2978	+
2705	2979	cMaterial mat = object.material;
2706	2980
2707	2981	if (mat == null)
..	..	@@ -2710,7 +2984,8 @@
2710	2984	return;
2711	2985	}
2712	2986
2713		- multiplyToggle.setSelected(mat.multiply);
	2987	+ if (multiplyToggle != null)
	2988	+ multiplyToggle.setSelected(mat.multiply);
2714	2989
2715	2990	assert (object.projectedVertices != null);
2716	2991
..	..	@@ -2812,12 +3087,17 @@
2812	3087	// }
2813	3088
2814	3089	/**/
2815		- if (deselect)
	3090	+ if (deselect \|\| child == null)
2816	3091	{
2817	3092	//group.deselectAll();
2818	3093	//freeze = true;
2819	3094	GetTree().clearSelection();
2820	3095	//freeze = false;
	3096	+
	3097	+ if (child == null)
	3098	+ {
	3099	+ return;
	3100	+ }
2821	3101	}
2822	3102
2823	3103	//group.addSelectee(child);
..	..	@@ -2886,7 +3166,7 @@
2886	3166	cameraView.ToggleDL();
2887	3167	cameraView.repaint();
2888	3168	return;
2889		- } else if (event.getSource() == toggleTextureItem)
	3169	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2890	3170	{
2891	3171	cameraView.ToggleTexture();
2892	3172	// june 2013 copy.HardTouch();
..	..	@@ -2925,9 +3205,9 @@
2925	3205	frame.validate();
2926	3206
2927	3207	return;
2928		- } else if (event.getSource() == toggleRandomItem)
	3208	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2929	3209	{
2930		- cameraView.ToggleRandom();
	3210	+ cameraView.ToggleSwitch();
2931	3211	cameraView.repaint();
2932	3212	return;
2933	3213	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2956,6 +3236,10 @@
2956	3236	{
2957	3237	copy.live ^= true;
2958	3238	return;
	3239	+ } else if (event.getSource() == selectCB)
	3240	+ {
	3241	+ copy.dontselect ^= true;
	3242	+ return;
2959	3243	} else if (event.getSource() == hideCB)
2960	3244	{
2961	3245	copy.hide ^= true;
..	..	@@ -2970,6 +3254,7 @@
2970	3254	if (event.getSource() == randomCB)
2971	3255	{
2972	3256	copy.random ^= true;
	3257	+ objEditor.refreshContents();
2973	3258	return;
2974	3259	}
2975	3260	if (event.getSource() == speedupCB)
..	..	@@ -2993,8 +3278,9 @@
2993	3278
2994	3279	public void actionPerformed(ActionEvent event)
2995	3280	{
	3281	+ Object source = event.getSource();
2996	3282	// SCRIPT DIALOG
2997		- if (event.getSource() == okbutton)
	3283	+ if (source == okbutton)
2998	3284	{
2999	3285	textpanel.setVisible(false);
3000	3286	textpanel.remove(textarea);
..	..	@@ -3006,7 +3292,7 @@
3006	3292	textarea = null;
3007	3293	textpanel = null;
3008	3294	}
3009		- if (event.getSource() == cancelbutton)
	3295	+ if (source == cancelbutton)
3010	3296	{
3011	3297	textpanel.setVisible(false);
3012	3298	textpanel.remove(textarea);
..	..	@@ -3018,50 +3304,50 @@
3018	3304	//applySelf();
3019	3305	//client.refreshEditWindow();
3020	3306	//refreshContents();
3021		- if (event.getSource() == nameField)
	3307	+ if (source == nameField)
3022	3308	{
3023	3309	//System.out.println("ObjEditor " + event);
3024	3310	applySelf0(true);
3025	3311	//parent.applySelf();
3026	3312	objEditor.refreshContents();
3027		- } else if (event.getSource() == resetButton)
	3313	+ } else if (source == resetButton)
3028	3314	{
3029	3315	CameraPane.fullreset = true;
3030	3316	copy.Reset(); // ResetMeshes();
3031	3317	copy.Touch();
3032	3318	objEditor.refreshContents();
3033		- } else if (event.getSource() == stepItem)
	3319	+ } else if (source == stepItem)
3034	3320	{
3035	3321	//cameraView.ONESTEP = true;
3036	3322	Globals.ONESTEP = true;
3037	3323	cameraView.repaint();
3038	3324	return;
3039		- } else if (event.getSource() == stepButton)
	3325	+ } else if (source == stepButton)
3040	3326	{
3041	3327	copy.Step();
3042	3328	copy.Touch();
3043	3329	objEditor.refreshContents();
3044		- } else if (event.getSource() == slowerButton)
	3330	+ } else if (source == slowerButton)
3045	3331	{
3046	3332	copy.Slower();
3047	3333	copy.Touch();
3048	3334	objEditor.refreshContents();
3049		- } else if (event.getSource() == fasterButton)
	3335	+ } else if (source == fasterButton)
3050	3336	{
3051	3337	copy.Faster();
3052	3338	copy.Touch();
3053	3339	objEditor.refreshContents();
3054		- } else if (event.getSource() == remarkButton)
	3340	+ } else if (source == remarkButton)
3055	3341	{
3056	3342	copy.Remark();
3057	3343	copy.Touch();
3058	3344	objEditor.refreshContents();
3059		- } else if (event.getSource() == stepAllButton)
	3345	+ } else if (source == stepAllButton)
3060	3346	{
3061	3347	copy.StepAll();
3062	3348	copy.Touch();
3063	3349	objEditor.refreshContents();
3064		- } else if (event.getSource() == resetAllButton)
	3350	+ } else if (source == resetAllButton)
3065	3351	{
3066	3352	//CameraPane.fullreset = true;
3067	3353	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3094,53 +3380,79 @@
3094	3380	// Close();
3095	3381	// }
3096	3382	// else
3097		- if (event.getSource() == resetSlidersButton)
	3383	+ if (source == resetSlidersButton)
3098	3384	{
3099	3385	ResetSliders();
3100		- } else if (event.getSource() == clearMaterialButton)
	3386	+ } else if (source == clearMaterialButton)
3101	3387	{
3102	3388	ClearMaterial();
3103		- } else if (event.getSource() == createMaterialButton)
	3389	+ } else if (source == createMaterialButton)
3104	3390	{
3105	3391	CreateMaterial();
3106		- } else if (event.getSource() == clearPanelButton)
	3392	+ } else if (source == clearPanelButton)
3107	3393	{
3108	3394	copy.ClearUI();
3109	3395	refreshContents(true);
3110		- } /*
3111		- }
3112		-
3113		- public boolean action(Event event, Object arg)
3114		- {
3115		- */ else if (event.getSource() == closeItem)
	3396	+ } else if (source == importGFDItem)
	3397	+ {
	3398	+ ImportGFD();
	3399	+ } else
	3400	+ if (source == importVRMLX3DItem)
	3401	+ {
	3402	+ ImportVRMLX3D();
	3403	+ } else
	3404	+ if (source == import3DSItem)
	3405	+ {
	3406	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3407	+ } else
	3408	+ if (source == importOBJItem)
	3409	+ {
	3410	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3411	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3412	+ browser.setVisible(true);
	3413	+ String filename = browser.getFile();
	3414	+ if (filename != null && filename.length() > 0)
	3415	+ {
	3416	+ String fullname = browser.getDirectory() + filename;
	3417	+ makeSomething(ReadOBJ(fullname), true);
	3418	+ }
	3419	+ } else
	3420	+ if (source == closeItem)
3116	3421	{
3117	3422	Close();
3118	3423	//return true;
3119		- } else if (event.getSource() == loadItem)
	3424	+ } else if (source == openItem)
3120	3425	{
3121		- load();
	3426	+ Open();
3122	3427	//return true;
3123		- } else if (event.getSource() == saveItem)
	3428	+ } else if (source == newItem)
	3429	+ {
	3430	+ New();
	3431	+ } else if (source == saveItem)
3124	3432	{
3125	3433	save();
3126	3434	//return true;
3127		- } else if (event.getSource() == saveAsItem)
	3435	+ } else if (source == saveAsItem)
3128	3436	{
3129	3437	saveAs();
3130	3438	//return true;
3131		- } else if (event.getSource() == reexportItem)
	3439	+ } else if (source == reexportItem)
3132	3440	{
3133	3441	reexport();
3134	3442	//return true;
3135		- } else if (event.getSource() == exportAsItem)
	3443	+ } else if (source == exportAsItem)
3136	3444	{
3137	3445	export();
3138	3446	//return true;
3139		- } else if (event.getSource() == povItem)
	3447	+ } else if (source == povItem)
3140	3448	{
3141	3449	generatePOV();
3142	3450	//return true;
3143		- } else if (event.getSource() == zBufferItem)
	3451	+ } else if (event.getSource() == archiveItem)
	3452	+ {
	3453	+ cTools.Archive(frame);
	3454	+ return;
	3455	+ } else if (source == zBufferItem)
3144	3456	{
3145	3457	try
3146	3458	{
..	..	@@ -3162,21 +3474,8 @@
3162	3474	cameraView.repaint();
3163	3475	//return true;
3164	3476	}
3165		- */ else if (event.getSource() == editCameraItem)
3166		- {
3167		- cameraView.ProtectCamera();
3168		- cameraView.repaint();
3169		- return;
3170		- } else if (event.getSource() == revertCameraItem)
3171		- {
3172		- cameraView.RevertCamera();
3173		- cameraView.repaint();
3174		- return;
3175		-// } else if (event.getSource() == textureButton)
3176		-// {
3177		-// return; // true;
3178		- } else // combos...
3179		- if (event.getSource() == texresMenu)
	3477	+ */ else // combos...
	3478	+ if (source == texresMenu)
3180	3479	{
3181	3480	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3182	3481	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3188,12 +3487,382 @@
3188	3487	}
3189	3488	}
3190	3489
	3490	+ void New()
	3491	+ {
	3492	+ while (copy.Size() > 1)
	3493	+ {
	3494	+ copy.remove(1);
	3495	+ }
	3496	+
	3497	+ ResetModel();
	3498	+ objEditor.refreshContents();
	3499	+ }
	3500	+
	3501	+ static public byte[] Compress(Object3D o)
	3502	+ {
	3503	+ try
	3504	+ {
	3505	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3506	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3507	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3508	+
	3509	+ Object3D parent = o.parent;
	3510	+ o.parent = null;
	3511	+
	3512	+ out.writeObject(o);
	3513	+
	3514	+ o.parent = parent;
	3515	+
	3516	+ out.flush();
	3517	+
	3518	+ baos //zstream
	3519	+ .close();
	3520	+ out.close();
	3521	+
	3522	+ byte[] bytes = baos.toByteArray();
	3523	+
	3524	+ System.out.println("save #bytes = " + bytes.length);
	3525	+ return bytes;
	3526	+ } catch (Exception e)
	3527	+ {
	3528	+ System.err.println(e);
	3529	+ return null;
	3530	+ }
	3531	+ }
	3532	+
	3533	+ static public Object Uncompress(byte[] bytes)
	3534	+ {
	3535	+ System.out.println("restore #bytes = " + bytes.length);
	3536	+ try
	3537	+ {
	3538	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3539	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3540	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3541	+ Object obj = in.readObject();
	3542	+
	3543	+ bais //istream
	3544	+ .close();
	3545	+ in.close();
	3546	+
	3547	+ return obj;
	3548	+ } catch (Exception e)
	3549	+ {
	3550	+ System.err.println(e);
	3551	+ return null;
	3552	+ }
	3553	+ }
	3554	+
	3555	+ static public Object clone(Object o)
	3556	+ {
	3557	+ try
	3558	+ {
	3559	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3560	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3561	+
	3562	+ out.writeObject(o);
	3563	+
	3564	+ out.flush();
	3565	+ out.close();
	3566	+
	3567	+ byte[] bytes = baos.toByteArray();
	3568	+
	3569	+ System.out.println("clone = " + bytes.length);
	3570	+
	3571	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3572	+ ObjectInputStream in = new ObjectInputStream(bais);
	3573	+ Object obj = in.readObject();
	3574	+ in.close();
	3575	+
	3576	+ return obj;
	3577	+ } catch (Exception e)
	3578	+ {
	3579	+ System.err.println(e);
	3580	+ return null;
	3581	+ }
	3582	+ }
	3583	+
	3584	+ cRadio GetCurrentTab()
	3585	+ {
	3586	+ cRadio ab;
	3587	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3588	+ {
	3589	+ ab = (cRadio)e.nextElement();
	3590	+ if(ab.GetObject() == copy)
	3591	+ {
	3592	+ return ab;
	3593	+ }
	3594	+ }
	3595	+
	3596	+ return null;
	3597	+ }
	3598	+
	3599	+
	3600	+ public void Save()
	3601	+ {
	3602	+ //Save(true);
	3603	+ Replace();
	3604	+ }
	3605	+
	3606	+ private boolean Equal(byte[] compress, byte[] name)
	3607	+ {
	3608	+ if (compress.length != name.length)
	3609	+ {
	3610	+ return false;
	3611	+ }
	3612	+
	3613	+ for (int i=compress.length; --i>=0;)
	3614	+ {
	3615	+ if (compress[i] != name[i])
	3616	+ return false;
	3617	+ }
	3618	+
	3619	+ return true;
	3620	+ }
	3621	+
	3622	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3623	+
	3624	+ public boolean Save(boolean user)
	3625	+ {
	3626	+ System.err.println("Save");
	3627	+
	3628	+ cRadio tab = GetCurrentTab();
	3629	+
	3630	+ byte[] compress = CompressCopy();
	3631	+
	3632	+ boolean thesame = false;
	3633	+
	3634	+ // Quick heuristic using length. Works only when stream is compressed.
	3635	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3636	+ {
	3637	+ thesame = true;
	3638	+ }
	3639	+
	3640	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3641	+ if (!thesame)
	3642	+ {
	3643	+ //tab.user[tab.versionindex] = user;
	3644	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3645	+
	3646	+ copy.versions[++copy.versionindex] = compress;
	3647	+
	3648	+ // if (increment)
	3649	+ // tab.versionindex++;
	3650	+ }
	3651	+
	3652	+ //copy.RestoreBigData(versiontable);
	3653	+
	3654	+ //assert(hashtable.isEmpty());
	3655	+
	3656	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3657	+ {
	3658	+ //tab.user[i] = false;
	3659	+ copy.versions[i] = null;
	3660	+ }
	3661	+
	3662	+ SetUndoStates();
	3663	+
	3664	+ // test save
	3665	+ if (false)
	3666	+ {
	3667	+ try
	3668	+ {
	3669	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3670	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3671	+
	3672	+ p.writeObject(copy);
	3673	+
	3674	+ p.flush();
	3675	+
	3676	+ ostream.close();
	3677	+ } catch (Exception e)
	3678	+ {
	3679	+ e.printStackTrace();
	3680	+ }
	3681	+ }
	3682	+
	3683	+ return !thesame;
	3684	+ }
	3685	+
	3686	+ void CopyChanged(Object3D obj)
	3687	+ {
	3688	+ SetUndoStates();
	3689	+
	3690	+ boolean temp = CameraPane.SWITCH;
	3691	+ CameraPane.SWITCH = false;
	3692	+
	3693	+ copy.ExtractBigData(versiontable);
	3694	+
	3695	+ copy.clear();
	3696	+
	3697	+ for (int i=0; i<obj.Size(); i++)
	3698	+ {
	3699	+ copy.add(obj.get(i));
	3700	+ }
	3701	+
	3702	+ copy.RestoreBigData(versiontable);
	3703	+
	3704	+ CameraPane.SWITCH = temp;
	3705	+
	3706	+ //assert(hashtable.isEmpty());
	3707	+
	3708	+ copy.Touch();
	3709	+
	3710	+ ResetModel();
	3711	+ copy.HardTouch(); // recompile?
	3712	+
	3713	+ cRadio ab;
	3714	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3715	+ {
	3716	+ ab = (cRadio)e.nextElement();
	3717	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3718	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3719	+ if (test != null)
	3720	+ {
	3721	+ test.editWindow = ab.object.editWindow;
	3722	+ ab.object = test;
	3723	+ }
	3724	+ }
	3725	+
	3726	+ refreshContents();
	3727	+ }
	3728	+
	3729	+ cButton undoButton;
	3730	+ cButton restoreButton;
	3731	+ cButton replaceButton;
	3732	+ cButton redoButton;
	3733	+
	3734	+ void SetUndoStates()
	3735	+ {
	3736	+ cRadio tab = GetCurrentTab();
	3737	+
	3738	+ restoreButton.setEnabled(copy.versionindex != -1);
	3739	+ replaceButton.setEnabled(copy.versionindex != -1);
	3740	+ undoButton.setEnabled(copy.versionindex > 0);
	3741	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3742	+ }
	3743	+
	3744	+ public boolean Undo()
	3745	+ {
	3746	+ System.err.println("Undo");
	3747	+
	3748	+ cRadio tab = GetCurrentTab();
	3749	+
	3750	+ if (copy.versionindex == 0)
	3751	+ {
	3752	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3753	+ return false;
	3754	+ }
	3755	+
	3756	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3757	+// {
	3758	+// if (Save(false))
	3759	+// tab.versionindex -= 1;
	3760	+// else
	3761	+// {
	3762	+// if (tab.versionindex <= 0)
	3763	+// return false;
	3764	+// else
	3765	+// tab.versionindex -= 1;
	3766	+// }
	3767	+// }
	3768	+
	3769	+ copy.versionindex -= 1;
	3770	+
	3771	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3772	+
	3773	+ return true;
	3774	+ }
	3775	+
	3776	+ public boolean Restore()
	3777	+ {
	3778	+ System.err.println("Restore");
	3779	+
	3780	+ cRadio tab = GetCurrentTab();
	3781	+
	3782	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3783	+ {
	3784	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3785	+ return false;
	3786	+ }
	3787	+
	3788	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3789	+
	3790	+ return true;
	3791	+ }
	3792	+
	3793	+ public boolean Replace()
	3794	+ {
	3795	+ System.err.println("Replace");
	3796	+
	3797	+ cRadio tab = GetCurrentTab();
	3798	+
	3799	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3800	+ {
	3801	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3802	+ return false;
	3803	+ }
	3804	+
	3805	+ copy.versions[copy.versionindex] = CompressCopy();
	3806	+
	3807	+ return true;
	3808	+ }
	3809	+
	3810	+ public void Redo()
	3811	+ {
	3812	+ cRadio tab = GetCurrentTab();
	3813	+
	3814	+ if (copy.versions[copy.versionindex + 1] == null)
	3815	+ {
	3816	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3817	+ return;
	3818	+ }
	3819	+
	3820	+ copy.versionindex += 1;
	3821	+
	3822	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3823	+
	3824	+ //if (!tab.user[tab.versionindex])
	3825	+ // tab.graphs[tab.versionindex] = null;
	3826	+ }
	3827	+
	3828	+ void ImportGFD()
	3829	+ {
	3830	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3831	+ browser.show();
	3832	+ String filename = browser.getFile();
	3833	+ if (filename != null && filename.length() > 0)
	3834	+ {
	3835	+ String fullname = browser.getDirectory() + filename;
	3836	+
	3837	+ //Object3D readobj =
	3838	+ objEditor.ReadGFD(fullname, objEditor);
	3839	+ //makeSomething(readobj);
	3840	+ }
	3841	+ }
	3842	+
	3843	+ void ImportVRMLX3D()
	3844	+ {
	3845	+ if (Grafreed.standAlone)
	3846	+ {
	3847	+ /**/
	3848	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3849	+ browser.show();
	3850	+ String filename = browser.getFile();
	3851	+ if (filename != null && filename.length() > 0)
	3852	+ {
	3853	+ String fullname = browser.getDirectory() + filename;
	3854	+ LoadVRMLX3D(fullname);
	3855	+ }
	3856	+ /**/
	3857	+ }
	3858	+ }
	3859	+
3191	3860	void ToggleAnimation()
3192	3861	{
3193	3862	if (!Globals.ANIMATION)
3194	3863	{
3195	3864	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3196		- browser.show();
	3865	+ browser.setVisible(true);
3197	3866	String filename = browser.getFile();
3198	3867	if (filename != null && filename.length() > 0)
3199	3868	{
..	..	@@ -3203,8 +3872,8 @@
3203	3872
3204	3873	Globals.ANIMATION ^= true;
3205	3874
3206		- GrafreeD.wav.cursor = 0;
3207		- GrafreeD.wav.loop = 0;
	3875	+ Grafreed.wav.cursor = 0;
	3876	+ Grafreed.wav.loop = 0;
3208	3877	}
3209	3878	} else
3210	3879	{
..	..	@@ -3254,7 +3923,7 @@
3254	3923	void CreateMaterial()
3255	3924	{
3256	3925	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3926	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3927	if (copy.selection.size() > 0)
3259	3928	//SetMaterial(copy);
3260	3929	{
..	..	@@ -3305,7 +3974,7 @@
3305	3974	assert false;
3306	3975	}
3307	3976
3308		- void EditSelection()
	3977	+ void EditSelection(boolean newWindow)
3309	3978	{
3310	3979	}
3311	3980
..	..	@@ -3313,11 +3982,11 @@
3313	3982	{
3314	3983	copy.ResetBlockLoop(); // temporary problem
3315	3984
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	3985	+ boolean random = CameraPane.SWITCH;
	3986	+ CameraPane.SWITCH = false; // parse everything
3318	3987	copy.ResetDisplayList();
3319	3988	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	3989	+ CameraPane.SWITCH = random;
3321	3990	}
3322	3991
3323	3992	// public void applySelf()
..	..	@@ -3391,6 +4060,36 @@
3391	4060	{
3392	4061	//System.out.println("Propagate = " + propagate);
3393	4062	copy.UpdateMaterial(anchor, current, propagate);
	4063	+
	4064	+ if (copy.material != null)
	4065	+ {
	4066	+ cMaterial mat = copy.material;
	4067	+
	4068	+ colorField.SetToolTipValue((mat.color));
	4069	+ modulationField.SetToolTipValue((mat.modulation));
	4070	+ metalnessField.SetToolTipValue((mat.metalness));
	4071	+ diffuseField.SetToolTipValue((mat.diffuse));
	4072	+ specularField.SetToolTipValue((mat.specular));
	4073	+ shininessField.SetToolTipValue((mat.shininess));
	4074	+ shiftField.SetToolTipValue((mat.shift));
	4075	+ ambientField.SetToolTipValue((mat.ambient));
	4076	+ lightareaField.SetToolTipValue((mat.lightarea));
	4077	+ diffusenessField.SetToolTipValue((mat.factor));
	4078	+ velvetField.SetToolTipValue((mat.velvet));
	4079	+ sheenField.SetToolTipValue((mat.sheen));
	4080	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4081	+ backlitField.SetToolTipValue((mat.bump));
	4082	+ anisoField.SetToolTipValue((mat.aniso));
	4083	+ anisoVField.SetToolTipValue((mat.anisoV));
	4084	+ cameraField.SetToolTipValue((mat.cameralight));
	4085	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4086	+ shadowField.SetToolTipValue((mat.shadow));
	4087	+ textureField.SetToolTipValue((mat.texture));
	4088	+ opacityField.SetToolTipValue((mat.opacity));
	4089	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4090	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4091	+ }
	4092	+
3394	4093	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	4094	{
3396	4095	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3419,9 +4118,22 @@
3419	4118	//copy.Touch();
3420	4119	}
3421	4120
	4121	+ cNumberSlider versionField;
	4122	+
3422	4123	public void stateChanged(ChangeEvent e)
3423	4124	{
3424	4125	// assert(false);
	4126	+ if (e.getSource() == versionField)
	4127	+ {
	4128	+ int version = versionField.getInteger();
	4129	+
	4130	+ if (copy.versions[version] != null)
	4131	+ {
	4132	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4133	+ }
	4134	+
	4135	+ return;
	4136	+ }
3425	4137
3426	4138	if (freezematerial)
3427	4139	{
..	..	@@ -3435,6 +4147,7 @@
3435	4147	\|\| e.getSource() == apertureField
3436	4148	\|\| e.getSource() == shadowblurField)
3437	4149	{
	4150	+ new Exception().printStackTrace();
3438	4151	System.exit(0);
3439	4152	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3440	4153	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3505,7 +4218,7 @@
3505	4218	}
3506	4219
3507	4220	if (normalpushField != null)
3508		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4221	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3509	4222	}
3510	4223
3511	4224	void SnapObject()
..	..	@@ -3769,6 +4482,8 @@
3769	4482
3770	4483	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3771	4484	{
	4485	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4486	+ Save();
3772	4487	//Tween.set(thing, 0).target(1).start(tweenManager);
3773	4488	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3774	4489	// if (thing instanceof GenericJointDemo)
..	..	@@ -3855,6 +4570,12 @@
3855	4570	{
3856	4571	ResetModel();
3857	4572	Select(thing.GetTreePath(), true, false); // unselect... false);
	4573	+
	4574	+ if (thing.Size() == 0)
	4575	+ {
	4576	+ //EditSelection(false);
	4577	+ }
	4578	+
3858	4579	refreshContents();
3859	4580	}
3860	4581
..	..	@@ -3972,6 +4693,7 @@
3972	4693	}
3973	4694	}
3974	4695	}
	4696	+
3975	4697	LoadGFDThread loadGFDThread;
3976	4698
3977	4699	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3991,8 +4713,10 @@
3991	4713
3992	4714	try
3993	4715	{
	4716	+ // Try compressed version first.
3994	4717	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3995		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4718	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4719	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3996	4720
3997	4721	readobj = (Object3D) p.readObject();
3998	4722	istream.close();
..	..	@@ -4000,7 +4724,20 @@
4000	4724	readobj.ResetDisplayList();
4001	4725	} catch (Exception e)
4002	4726	{
4003		- e.printStackTrace();
	4727	+ //e.printStackTrace();
	4728	+ try
	4729	+ {
	4730	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4731	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4732	+
	4733	+ readobj = (Object3D) p.readObject();
	4734	+ istream.close();
	4735	+
	4736	+ readobj.ResetDisplayList();
	4737	+ } catch (Exception e2)
	4738	+ {
	4739	+ e2.printStackTrace();
	4740	+ }
4004	4741	}
4005	4742	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4006	4743	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4046,6 +4783,12 @@
4046	4783
4047	4784	void LoadIt(Object obj)
4048	4785	{
	4786	+ if (obj == null)
	4787	+ {
	4788	+ // Invalid file
	4789	+ return;
	4790	+ }
	4791	+
4049	4792	System.out.println("Loaded " + obj);
4050	4793	//new Exception().printStackTrace();
4051	4794	Object3D readobj = (Object3D) obj;
..	..	@@ -4055,6 +4798,8 @@
4055	4798
4056	4799	if (readobj != null)
4057	4800	{
	4801	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4802	+ // Save();
4058	4803	try
4059	4804	{
4060	4805	//readobj.deepCopySelf(copy);
..	..	@@ -4109,15 +4854,20 @@
4109	4854	c.addChild(csg);
4110	4855	}
4111	4856
	4857	+ copy.versions = readobj.versions;
	4858	+ copy.versionindex = readobj.versionindex;
	4859	+
	4860	+ SetUndoStates();
	4861	+
4112	4862	ResetModel();
4113	4863	copy.HardTouch(); // recompile?
4114	4864	refreshContents();
4115	4865	}
4116	4866	}
4117	4867
4118		- void load() // throws ClassNotFoundException
	4868	+ void Open() // throws ClassNotFoundException
4119	4869	{
4120		- if (GrafreeD.standAlone)
	4870	+ if (Grafreed.standAlone)
4121	4871	{
4122	4872	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4123	4873	browser.show();
..	..	@@ -4204,11 +4954,13 @@
4204	4954	try
4205	4955	{
4206	4956	FileOutputStream ostream = new FileOutputStream(lastname);
4207		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4957	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4958	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4208	4959
4209	4960	p.writeObject(copy);
4210	4961	p.flush();
4211	4962
	4963	+ zstream.close();
4212	4964	ostream.close();
4213	4965
4214	4966	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4218,17 +4970,20 @@
4218	4970	{
4219	4971	}
4220	4972	}
	4973	+
4221	4974	String lastname;
4222	4975
4223	4976	void saveAs()
4224	4977	{
4225		- if (GrafreeD.standAlone)
	4978	+ if (Grafreed.standAlone)
4226	4979	{
4227	4980	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4228	4981	browser.setVisible(true);
4229	4982	String filename = browser.getFile();
4230	4983	if (filename != null && filename.length() > 0)
4231	4984	{
	4985	+ if (!filename.endsWith(".gfd"))
	4986	+ filename += ".gfd";
4232	4987	lastname = browser.getDirectory() + filename;
4233	4988	save();
4234	4989	}
..	..	@@ -4327,13 +5082,13 @@
4327	5082	try
4328	5083	{
4329	5084	FileOutputStream ostream = new FileOutputStream(filename);
4330		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4331		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5085	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5086	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4332	5087
4333	5088	Object3D objectparent = obj.parent;
4334	5089	obj.parent = null;
4335	5090
4336		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5091	+ Object3D object = (Object3D) Grafreed.clone(obj);
4337	5092
4338	5093	obj.parent = objectparent;
4339	5094
..	..	@@ -4345,8 +5100,8 @@
4345	5100	p.writeObject(object);
4346	5101	p.flush();
4347	5102
	5103	+ zstream.close();
4348	5104	ostream.close();
4349		- // zstream.close();
4350	5105
4351	5106	// group.selection.get(0).parent = parent;
4352	5107	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4367,7 +5122,7 @@
4367	5122	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4368	5123	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4369	5124	copy.generatePOV(buffer);
4370		- if (GrafreeD.standAlone)
	5125	+ if (Grafreed.standAlone)
4371	5126	{
4372	5127	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4373	5128	browser.show();
..	..	@@ -4393,21 +5148,20 @@
4393	5148	Object3D client;
4394	5149	Object3D copy;
4395	5150	MenuBar menuBar;
4396		- Menu windowMenu;
4397		- MenuItem loadItem;
	5151	+ Menu fileMenu;
	5152	+ MenuItem newItem;
	5153	+ MenuItem openItem;
4398	5154	MenuItem saveItem;
4399	5155	MenuItem saveAsItem;
4400	5156	MenuItem exportAsItem;
4401	5157	MenuItem reexportItem;
4402	5158	MenuItem povItem;
4403	5159	MenuItem closeItem;
4404		- Menu cameraMenu;
	5160	+
4405	5161	CheckboxMenuItem zBufferItem;
4406	5162	//MenuItem normalLensItem;
4407		- MenuItem editCameraItem;
4408		- MenuItem revertCameraItem;
4409		- CheckboxMenuItem toggleLiveItem;
4410	5163	MenuItem stepItem;
	5164	+ CheckboxMenuItem toggleLiveItem;
4411	5165	CheckboxMenuItem toggleFullScreenItem;
4412	5166	CheckboxMenuItem toggleTimelineItem;
4413	5167	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4416,25 +5170,39 @@
4416	5170	CheckboxMenuItem toggleFootContactItem;
4417	5171	CheckboxMenuItem toggleDLItem;
4418	5172	CheckboxMenuItem toggleTextureItem;
4419		- CheckboxMenuItem toggleRandomItem;
	5173	+ CheckboxMenuItem toggleSwitchItem;
4420	5174	CheckboxMenuItem toggleRootItem;
4421	5175	CheckboxMenuItem animationItem;
	5176	+ MenuItem archiveItem;
4422	5177	CheckboxMenuItem toggleHandleItem;
4423	5178	CheckboxMenuItem togglePaintItem;
4424	5179	JSplitPane mainPanel;
4425	5180	JScrollPane scrollpane;
	5181	+
4426	5182	JPanel toolbarPanel;
4427		- JPanel treePanel;
	5183	+
	5184	+ cGridBag treePanel;
	5185	+
4428	5186	JPanel radioPanel;
4429	5187	ButtonGroup buttonGroup;
4430		- cGridBag ctrlPanel;
	5188	+
	5189	+ cGridBag toolboxPanel;
4431	5190	cGridBag materialPanel;
	5191	+ cGridBag ctrlPanel;
	5192	+
4432	5193	JScrollPane infoPanel;
	5194	+
4433	5195	cGridBag optionsPanel;
	5196	+
4434	5197	JTabbedPane objectPanel;
	5198	+ boolean materialFlushed;
	5199	+ Object3D latestObject;
	5200	+
4435	5201	cGridBag XYZPanel;
	5202	+
4436	5203	JSplitPane gridPanel;
4437	5204	JSplitPane bigPanel;
	5205	+
4438	5206	cGridBag bigThree;
4439	5207	cGridBag scenePanel;
4440	5208	cGridBag centralPanel;
..	..	@@ -4549,8 +5317,13 @@
4549	5317	cNumberSlider fogField;
4550	5318	JLabel opacityPowerLabel;
4551	5319	cNumberSlider opacityPowerField;
4552		- JTree jTree;
	5320	+ cTree jTree;
4553	5321	//ObjectUI parent;
4554	5322
4555	5323	cNumberSlider normalpushField;
	5324	+
	5325	+ private MenuItem importGFDItem;
	5326	+ private MenuItem importVRMLX3DItem;
	5327	+ private MenuItem import3DSItem;
	5328	+ private MenuItem importOBJItem;
4556	5329	}