~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
..	..	@@ -143,7 +208,9 @@
143	208	//nameField.removeActionListener(this);
144	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	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -165,9 +232,9 @@
165	232	// objEditor.ctrlPanel.remove(fasterButton);
166	233	// objEditor.ctrlPanel.remove(remarkButton);
167	234
168		- objEditor.ctrlPanel.remove(namePanel);
169	235	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	238	objEditor.ctrlPanel.remove(pushPanel);
172	239	//objEditor.ctrlPanel.remove(fillPanel);
173	240
..	..	@@ -242,6 +309,7 @@
242	309	//localCopy.parent = null;
243	310
244	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
245	313	objEditor = this;
246	314	this.callee = callee;
247	315
..	..	@@ -272,28 +340,49 @@
272	340	return frame.action(event, obj);
273	341	}
274	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	+
275	348	void SetupMenu()
276	349	{
277	350	frame.setMenuBar(menuBar = new MenuBar());
278		- menuBar.add(windowMenu = new Menu("File"));
279		- windowMenu.add(loadItem = new MenuItem("Load..."));
280		- windowMenu.add("-");
281		- windowMenu.add(saveItem = new MenuItem("Save"));
282		- 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..."));
283	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
284		- windowMenu.add("-");
285		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
286		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
287		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
288	376	if (client.parent != null)
289	377	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	379	} else
292	380	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	382	}
295	383
296		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
297	386	saveItem.addActionListener(this);
298	387	saveAsItem.addActionListener(this);
299	388	exportAsItem.addActionListener(this);
..	..	@@ -301,81 +390,66 @@
301	390	//povItem.addActionListener(this);
302	391	closeItem.addActionListener(this);
303	392
304		- menuBar.add(cameraMenu = new Menu("View"));
305		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
306		- //zBufferItem.addActionListener(this);
307		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
308		- //normalLensItem.addActionListener(this);
309		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310		- revertCameraItem.addActionListener(this);
311		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312		- toggleTimelineItem.addItemListener(this);
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318		- toggleTextureItem.addItemListener(this);
319		- toggleTextureItem.setState(CameraPane.textureon);
320		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321		- toggleLiveItem.addItemListener(this);
322		- toggleLiveItem.setState(Globals.isLIVE());
323		- cameraMenu.add(stepItem = new MenuItem("Step"));
324		- stepItem.addActionListener(this);
325		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326		-// toggleDLItem.addItemListener(this);
327		-// toggleDLItem.setState(false);
328		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329		- toggleRenderItem.addItemListener(this);
330		- toggleRenderItem.setState(!CameraPane.frozen);
331		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332		- toggleDebugItem.addItemListener(this);
333		- toggleDebugItem.setState(CameraPane.DEBUG);
334		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335		- toggleFrustumItem.addItemListener(this);
336		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
337		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338		- toggleFootContactItem.addItemListener(this);
339		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341		- toggleRandomItem.addItemListener(this);
342		- toggleRandomItem.setState(CameraPane.RANDOM);
343		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344		- toggleHandleItem.addItemListener(this);
345		- toggleHandleItem.setState(CameraPane.HANDLES);
346		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347		- togglePaintItem.addItemListener(this);
348		- togglePaintItem.setState(CameraPane.PAINTMODE);
349		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350		-// toggleRootItem.addItemListener(this);
351		-// toggleRootItem.setState(false);
352		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
353		-// animationItem.addItemListener(this);
354		-// animationItem.setState(CameraPane.ANIMATION);
355		- cameraMenu.add("-");
356		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
357		- editCameraItem.addActionListener(this);
358		-
359	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	+
360	420	toolbarPanel = new JPanel();
361	421	toolbarPanel.setName("Toolbar");
362		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
363	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
364	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
	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	+
366	437	materialPanel = new cGridBag().setVertical(true);
367	438	materialPanel.setName("Material");
	439	+
368	440	/JTextPane/
369	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
370	444	infoarea.setEditable(true);
371	445	SetText();
372	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373	447	// infoarea.setOpaque(false);
374	448	// //infoarea.setForeground(textcolor);
375		- infoarea.setLineWrap(true);
376		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
377	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
378		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
379	453	infoPanel.setName("Info");
380	454	//infoPanel.setLayout(new BorderLayout());
381	455	//infoPanel.add(createTextPane());
..	..	@@ -384,14 +458,21 @@
384	458	mainPanel.setName("Main");
385	459	mainPanel.setContinuousLayout(true);
386	460	mainPanel.setOneTouchExpandable(true);
387		- mainPanel.setDividerLocation(1.0);
388	461	mainPanel.setDividerSize(9);
389		- mainPanel.setResizeWeight(0);
390		-
	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	+
391	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392	473	//mainPanel.setLayout(new GridBagLayout());
393	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394		- treePanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
395	476	//ctrlPanel.setLayout(new GridBagLayout());
396	477	//materialPanel.setLayout(new GridBagLayout());
397	478
..	..	@@ -432,7 +513,7 @@
432	513	static String newline = "\n";
433	514	protected static final String buttonString = "JButton";
434	515	StyledDocument doc;
435		- JTextArea infoarea;
	516	+ JTextPane infoarea;
436	517
437	518	void ClearInfo()
438	519	{
..	..	@@ -455,10 +536,10 @@
455	536	e.printStackTrace();
456	537	}
457	538
458		- String selection = infoarea.getText();
459		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
460		- java.awt.datatransfer.Clipboard clipboard =
461		- 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();
462	543	//clipboard.setContents(data, data);
463	544	}
464	545
..	..	@@ -481,13 +562,13 @@
481	562	//SendInfo("Name:", "bold");
482	563	if (sel.GetTextures() != null \|\| debug)
483	564	{
484		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486	567	if (sel.Size() > 0)
487	568	{
488	569	si.SendInfo("#children = " + sel.Size(), "regular");
489	570	}
490		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491	572	if (debug)
492	573	{
493	574	try
..	..	@@ -499,7 +580,10 @@
499	580	}
500	581
501	582	if (full)
502		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
503	587
504	588	if (sel.bRep != null)
505	589	{
..	..	@@ -526,7 +610,7 @@
526	610	}
527	611	if (sel.support != null)
528	612	{
529		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530	614	}
531	615	if (sel.scriptnode != null)
532	616	{
..	..	@@ -597,6 +681,9 @@
597	681	{
598	682	CameraPane.pointflow = (PointFlow) sel;
599	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
600	687	}
601	688	}
602	689
..	..	@@ -612,68 +699,169 @@
612	699	}
613	700	}
614	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	+
615	760	void ToggleFullScreen()
616	761	{
617		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
618	767	{
619		- frame.getContentPane().remove(/"Center",/bigThree);
620		- framePanel.add(bigThree);
621		- 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	+
622	791	} else
623	792	{
624		- frame.getContentPane().remove(/"Center",/framePanel);
625		- framePanel.remove(bigThree);
626		- 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);
627	815	}
628		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
629	817	}
630	818
631		- private JTextArea createTextPane()
	819	+ private JTextPane createTextPane()
632	820	{
633		- String[] initString =
634		- {
635		- "This is an editable JTextPane, ", //regular
636		- "another ", //italic
637		- "styled ", //bold
638		- "text ", //small
639		- "component, ", //large
640		- "which supports embedded components..." + newline,//regular
641		- " " + newline, //button
642		- "...and embedded icons..." + newline, //regular
643		- " ", //icon
644		- newline + "JTextPane is a subclass of JEditorPane that "
645		- + "uses a StyledEditorKit and StyledDocument, and provides "
646		- + "cover methods for interacting with those objects."
647		- };
	821	+// TEXTAREA String[] initString =
	822	+// {
	823	+// "This is an editable JTextPane, ", //regular
	824	+// "another ", //italic
	825	+// "styled ", //bold
	826	+// "text ", //small
	827	+// "component, ", //large
	828	+// "which supports embedded components..." + newline,//regular
	829	+// " " + newline, //button
	830	+// "...and embedded icons..." + newline, //regular
	831	+// " ", //icon
	832	+// newline + "JTextPane is a subclass of JEditorPane that "
	833	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	834	+// + "cover methods for interacting with those objects."
	835	+// };
	836	+//
	837	+// String[] initStyles =
	838	+// {
	839	+// "regular", "italic", "bold", "small", "large",
	840	+// "regular", "button", "regular", "icon",
	841	+// "regular"
	842	+// };
	843	+//
	844	+// JTextPane textPane = new JTextPane();
	845	+// textPane.setEditable(true);
	846	+// /StyledDocument/ doc = textPane.getStyledDocument();
	847	+// addStylesToDocument(doc);
	848	+//
	849	+// try
	850	+// {
	851	+// for (int j = 0; j < 2; j++)
	852	+// {
	853	+// for (int i = 0; i < initString.length; i++)
	854	+// {
	855	+// doc.insertString(doc.getLength(), initString[i],
	856	+// doc.getStyle(initStyles[i]));
	857	+// }
	858	+// }
	859	+// } catch (BadLocationException ble)
	860	+// {
	861	+// System.err.println("Couldn't insert initial text into text pane.");
	862	+// }
648	863
649		- String[] initStyles =
650		- {
651		- "regular", "italic", "bold", "small", "large",
652		- "regular", "button", "regular", "icon",
653		- "regular"
654		- };
655		-
656		- JTextPane textPane = new JTextPane();
657		- textPane.setEditable(true);
658		- /StyledDocument/ doc = textPane.getStyledDocument();
659		- addStylesToDocument(doc);
660		-
661		- try
662		- {
663		- for (int j = 0; j < 2; j++)
664		- {
665		- for (int i = 0; i < initString.length; i++)
666		- {
667		- doc.insertString(doc.getLength(), initString[i],
668		- doc.getStyle(initStyles[i]));
669		- }
670		- }
671		- } catch (BadLocationException ble)
672		- {
673		- System.err.println("Couldn't insert initial text into text pane.");
674		- }
675		-
676		- return new JTextArea(); // textPane;
	864	+ return new JTextPane(); // textPane;
677	865	}
678	866
679	867	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +914,7 @@
726	914	protected static ImageIcon createImageIcon(String path,
727	915	String description)
728	916	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	917	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	918	if (imgURL != null)
731	919	{
732	920	return new ImageIcon(imgURL, description);
..	..	@@ -758,6 +946,7 @@
758	946	// NumberSlider vDivsField;
759	947	// JCheckBox endcaps;
760	948	JCheckBox liveCB;
	949	+ JCheckBox selectCB;
761	950	JCheckBox hideCB;
762	951	JCheckBox link2masterCB;
763	952	JCheckBox markCB;
..	..	@@ -765,7 +954,12 @@
765	954	JCheckBox speedupCB;
766	955	JCheckBox rewindCB;
767	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
768	961	JComboBox texresMenu;
	962	+
769	963	JButton resetButton;
770	964	JButton stepButton;
771	965	JButton stepAllButton;
..	..	@@ -774,9 +968,13 @@
774	968	JButton fasterButton;
775	969	JButton remarkButton;
776	970
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
777	974	cGridBag namePanel;
778	975	cGridBag setupPanel;
779		- cGridBag commandsPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
780	978	cGridBag pushPanel;
781	979	cGridBag fillPanel;
782	980
..	..	@@ -943,52 +1141,73 @@
943	1141
944	1142	void SetupUI2(ObjEditor oe)
945	1143	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	1144	//SetupName(oe);
951	1145
952	1146	namePanel = new cGridBag();
953	1147
954	1148	nameField = AddText(namePanel, copy.GetName());
955		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
956	1150	oe.ctrlPanel.add(namePanel);
957	1151
958	1152	oe.ctrlPanel.Return();
959	1153
960		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
961	1155	return;
962	1156
963	1157	setupPanel = new cGridBag().setVertical(false);
964	1158
965	1159	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1160	+ liveCB.setToolTipText("Animate object");
	1161	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1162	+ selectCB.setToolTipText("Make object selectable");
968	1163	// Return();
	1164	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1165	+ hideCB.setToolTipText("Hide object");
969	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1167	+ markCB.setToolTipText("As animation target transform");
	1168	+
	1169	+ setupPanel2 = new cGridBag().setVertical(false);
	1170	+
	1171	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1172	+ rewindCB.setToolTipText("Rewind animation");
	1173	+
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
972	1176
	1177	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1178	+ link2masterCB.setToolTipText("Attach to support");
	1179	+
	1180	+ if (Globals.ADVANCED)
	1181	+ {
	1182	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1183	+ speedupCB.setToolTipText("Option motion capture");
	1184	+ }
	1185	+
973	1186	oe.ctrlPanel.add(setupPanel);
974	1187	oe.ctrlPanel.Return();
	1188	+ oe.ctrlPanel.add(setupPanel2);
	1189	+ oe.ctrlPanel.Return();
975	1190
976		- commandsPanel = new cGridBag().setVertical(false);
	1191	+ objectCommandsPanel = new cGridBag().setVertical(false);
977	1192
978		- resetButton = AddButton(commandsPanel, "Reset");
979		- stepButton = AddButton(commandsPanel, "Step");
	1193	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1194	+ resetButton.setToolTipText("Jump to frame zero");
	1195	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1196	+ stepButton.setToolTipText("Step one frame");
980	1197	// resetAllButton = AddButton(oe, "Reset All");
981	1198	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	1199	// Return();
984		- slowerButton = AddButton(commandsPanel, "Slow");
985		- fasterButton = AddButton(commandsPanel, "Fast");
986		- remarkButton = AddButton(commandsPanel, "Remark");
	1200	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1201	+ slowerButton.setToolTipText("Decrease animation speed");
	1202	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1203	+ fasterButton.setToolTipText("Increase animation speed");
	1204	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1205	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1206
988		- oe.ctrlPanel.add(commandsPanel);
	1207	+ oe.ctrlPanel.add(objectCommandsPanel);
989	1208	oe.ctrlPanel.Return();
990	1209
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1210	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	1211	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	1212	//Return();
994	1213
..	..	@@ -1191,8 +1410,11 @@
1191	1410	//worldPanel.setName("World");
1192	1411	centralPanel = new cGridBag();
1193	1412	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1413	+
	1414	+ if (Globals.ADVANCED)
	1415	+ {
	1416	+ timelinePanel = new JPanel(new BorderLayout());
	1417	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1418
1197	1419	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1420	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1423,10 @@
1201	1423	// cameraPanel.setDividerSize(9);
1202	1424	cameraPanel.setResizeWeight(1.0);
1203	1425
	1426	+ }
	1427	+
1204	1428	centralPanel.add(cameraView);
	1429	+ centralPanel.setFocusable(true);
1205	1430	//frame.setJMenuBar(timelineMenubar);
1206	1431	//centralPanel.add(timelinePanel);
1207	1432
..	..	@@ -1268,8 +1493,12 @@
1268	1493	// north.setName("Edit");
1269	1494	// north.add(ctrlPanel, BorderLayout.NORTH);
1270	1495	// objectPanel.add(north);
1271		- objectPanel.add(ctrlPanel);
1272		- objectPanel.add(infoPanel);
	1496	+ objectPanel.add(editPanel);
	1497	+
	1498	+ //if (Globals.ADVANCED)
	1499	+ objectPanel.add(infoPanel);
	1500	+
	1501	+ objectPanel.add(toolboxPanel);
1273	1502
1274	1503	/*
1275	1504	aConstraints.gridx = 0;
..	..	@@ -1278,7 +1507,7 @@
1278	1507	aConstraints.gridy += 1;
1279	1508	aConstraints.gridwidth = 1;
1280	1509	mainPanel.add(objectPanel, aConstraints);
1281		- */
	1510	+ */
1282	1511
1283	1512	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1284	1513	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1290,14 +1519,12 @@
1290	1519	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1520
1292	1521	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1522	+ scenePanel.preferredWidth = 6;
1294	1523
1295	1524	JTabbedPane tabbedPane = new JTabbedPane();
1296	1525	tabbedPane.add(scrollpane);
1297	1526
1298		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1299		-
1300		- optionsPanel = new cGridBag().setVertical(true);
	1527	+ optionsPanel = new cGridBag().setVertical(false);
1301	1528
1302	1529	optionsPanel.setName("Options");
1303	1530
..	..	@@ -1305,6 +1532,8 @@
1305	1532
1306	1533	tabbedPane.add(optionsPanel);
1307	1534
	1535	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1536	+
1308	1537	scenePanel.add(tabbedPane);
1309	1538
1310	1539	/*
..	..	@@ -1377,9 +1606,9 @@
1377	1606	// aConstraints.gridheight = 1;
1378	1607
1379	1608	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1380		- framePanel.setContinuousLayout(true);
1381		- framePanel.setOneTouchExpandable(true);
1382		- framePanel.setDividerLocation(0.8);
	1609	+ framePanel.setContinuousLayout(false);
	1610	+ framePanel.setOneTouchExpandable(false);
	1611	+ //.setDividerLocation(0.8);
1383	1612	//framePanel.setDividerSize(15);
1384	1613	//framePanel.setResizeWeight(0.15);
1385	1614	framePanel.setName("Frame");
..	..	@@ -1396,10 +1625,15 @@
1396	1625
1397	1626	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1627
1399		- frame.setSize(1024, 768);
1400		- frame.show();
1401		-
	1628	+ frame.setSize(1280, 860);
	1629	+
	1630	+ cameraView.requestFocusInWindow();
	1631	+
1402	1632	gridPanel.setDividerLocation(1.0);
	1633	+
	1634	+ frame.validate();
	1635	+
	1636	+ frame.setVisible(true);
1403	1637
1404	1638	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1405	1639	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1436,17 +1670,25 @@
1436	1670
1437	1671	cGridBag editBar = new cGridBag().setVertical(false);
1438	1672
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1673	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1674	+ createMaterialButton.setToolTipText("Create material");
1440	1675
1441	1676	/*
1442	1677	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	1678	*/
1444	1679
1445		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1446		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1447		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1448		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1680	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1681	+ clearMaterialButton.setToolTipText("Clear material");
	1682	+
	1683	+ if (Globals.ADVANCED)
	1684	+ {
	1685	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1686	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1687	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1688	+ }
1449	1689
	1690	+ editBar.preferredHeight = 15;
	1691	+
1450	1692	panel.add(editBar);
1451	1693
1452	1694	/**/
..	..	@@ -1477,24 +1719,6 @@
1477	1719	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478	1720	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479	1721	colorSection.add(texture);
1480		-
1481		- cGridBag anisoU = new cGridBag();
1482		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1483		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1485		- colorSection.add(anisoU);
1486		-
1487		- cGridBag anisoV = new cGridBag();
1488		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1489		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1491		- colorSection.add(anisoV);
1492		-
1493		- cGridBag shadowbias = new cGridBag();
1494		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1497		- colorSection.add(shadowbias);
1498	1722
1499	1723	panel.add(new JSeparator());
1500	1724
..	..	@@ -1546,6 +1770,12 @@
1546	1770	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1547	1771	diffuseSection.add(fakedepth);
1548	1772
	1773	+ cGridBag shadowbias = new cGridBag();
	1774	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1775	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1776	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1777	+ diffuseSection.add(shadowbias);
	1778	+
1549	1779	panel.add(new JSeparator());
1550	1780
1551	1781	panel.add(diffuseSection);
..	..	@@ -1596,6 +1826,18 @@
1596	1826	// aConstraints.gridy += 1;
1597	1827	// aConstraints.gridwidth = 1;
1598	1828
	1829	+ cGridBag anisoU = new cGridBag();
	1830	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1831	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1832	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1833	+ specularSection.add(anisoU);
	1834	+
	1835	+ cGridBag anisoV = new cGridBag();
	1836	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1837	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1838	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1839	+ specularSection.add(anisoV);
	1840	+
1599	1841
1600	1842	panel.add(new JSeparator());
1601	1843
..	..	@@ -1603,35 +1845,35 @@
1603	1845
1604	1846	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1605	1847
1606		- cGridBag globalSection = new cGridBag().setVertical(true);
	1848	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1607	1849
1608	1850	cGridBag camera = new cGridBag();
1609	1851	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1610	1852	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611	1853	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612		- globalSection.add(camera);
	1854	+ colorSection.add(camera);
1613	1855
1614	1856	cGridBag ambient = new cGridBag();
1615	1857	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1616	1858	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617	1859	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1618		- globalSection.add(ambient);
	1860	+ colorSection.add(ambient);
1619	1861
1620	1862	cGridBag backlit = new cGridBag();
1621	1863	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1622	1864	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	1865	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1624		- globalSection.add(backlit);
	1866	+ colorSection.add(backlit);
1625	1867
1626	1868	cGridBag opacity = new cGridBag();
1627	1869	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1628	1870	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1629	1871	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1630		- globalSection.add(opacity);
	1872	+ colorSection.add(opacity);
1631	1873
1632		- panel.add(new JSeparator());
	1874	+ //panel.add(new JSeparator());
1633	1875
1634		- panel.add(globalSection);
	1876	+ //panel.add(globalSection);
1635	1877
1636	1878	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1637	1879
..	..	@@ -1712,12 +1954,15 @@
1712	1954	opacityPowerField.addChangeListener(this);
1713	1955	/**/
1714	1956
1715		- resetSlidersButton.addActionListener(this);
1716	1957	clearMaterialButton.addActionListener(this);
1717	1958	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	1959	+
	1960	+ if (Globals.ADVANCED)
	1961	+ {
	1962	+ resetSlidersButton.addActionListener(this);
	1963	+ propagateToggle.addItemListener(this);
	1964	+ multiplyToggle.addItemListener(this);
	1965	+ }
1721	1966	}
1722	1967
1723	1968	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1735,8 +1980,9 @@
1735	1980	// 3D models
1736	1981	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1737	1982	{
1738		- lastConverter = new com.jmex.model.converters.MaxToJme();
1739		- LoadFile(filename, lastConverter);
	1983	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1984	+ //LoadFile(filename, lastConverter);
	1985	+ LoadObjFile(filename); // New 3ds loader
1740	1986	continue;
1741	1987	}
1742	1988	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1888,7 +2134,7 @@
1888	2134
1889	2135	//? flashIt = false;
1890	2136	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	2137	+ pane.clickStart(location.x, location.y, 0, 0);
1892	2138	pane.clickEnd(location.x, location.y, 0, true);
1893	2139
1894	2140	if (group.selection.size() == 1)
..	..	@@ -1937,6 +2183,7 @@
1937	2183	e2.printStackTrace();
1938	2184	}
1939	2185	}
	2186	+
1940	2187	LoadJMEThread loadThread;
1941	2188
1942	2189	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +2241,7 @@
1994	2241	//LoadFile0(filename, converter);
1995	2242	}
1996	2243	}
	2244	+
1997	2245	LoadOBJThread loadObjThread;
1998	2246
1999	2247	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2320,19 @@
2072	2320
2073	2321	void LoadObjFile(String fullname)
2074	2322	{
2075		- /*
	2323	+ System.out.println("Loading " + fullname);
	2324	+ /**/
2076	2325	//lastFilename = fullname;
2077	2326	if(loadObjThread == null)
2078	2327	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2328	+ loadObjThread = new LoadOBJThread();
	2329	+ loadObjThread.start();
2081	2330	}
2082	2331
2083	2332	loadObjThread.add(fullname);
2084		- */
	2333	+ /**/
2085	2334
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2335	+ //makeSomething(new FileObject(fullname, true), true);
2088	2336	}
2089	2337
2090	2338	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +2593,11 @@
2345	2593
2346	2594	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2595	{
2348		- if (GrafreeD.standAlone)
	2596	+ if (Grafreed.standAlone)
2349	2597	{
2350	2598	/**/
2351	2599	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2600	+ browser.setVisible(true);
2353	2601	String filename = browser.getFile();
2354	2602	if (filename != null && filename.length() > 0)
2355	2603	{
..	..	@@ -2460,6 +2708,7 @@
2460	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	2709	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	2710	}
	2711	+
2463	2712	//cJME.count++;
2464	2713	//cJME.count %= 12;
2465	2714	if (gc)
..	..	@@ -2643,6 +2892,7 @@
2643	2892	}
2644	2893	}
2645	2894	}
	2895	+
2646	2896	cFileSystemPane FSPane;
2647	2897
2648	2898	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2696,11 +2946,14 @@
2696	2946	}
2697	2947	}
2698	2948	}
	2949	+
2699	2950	freezematerial = false;
2700	2951	}
2701	2952
2702	2953	void SetMaterial(Object3D object)
2703	2954	{
	2955	+ latestObject = object;
	2956	+
2704	2957	cMaterial mat = object.material;
2705	2958
2706	2959	if (mat == null)
..	..	@@ -2709,7 +2962,8 @@
2709	2962	return;
2710	2963	}
2711	2964
2712		- multiplyToggle.setSelected(mat.multiply);
	2965	+ if (multiplyToggle != null)
	2966	+ multiplyToggle.setSelected(mat.multiply);
2713	2967
2714	2968	assert (object.projectedVertices != null);
2715	2969
..	..	@@ -2811,12 +3065,17 @@
2811	3065	// }
2812	3066
2813	3067	/**/
2814		- if (deselect)
	3068	+ if (deselect \|\| child == null)
2815	3069	{
2816	3070	//group.deselectAll();
2817	3071	//freeze = true;
2818	3072	GetTree().clearSelection();
2819	3073	//freeze = false;
	3074	+
	3075	+ if (child == null)
	3076	+ {
	3077	+ return;
	3078	+ }
2820	3079	}
2821	3080
2822	3081	//group.addSelectee(child);
..	..	@@ -2885,7 +3144,7 @@
2885	3144	cameraView.ToggleDL();
2886	3145	cameraView.repaint();
2887	3146	return;
2888		- } else if (event.getSource() == toggleTextureItem)
	3147	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2889	3148	{
2890	3149	cameraView.ToggleTexture();
2891	3150	// june 2013 copy.HardTouch();
..	..	@@ -2924,9 +3183,9 @@
2924	3183	frame.validate();
2925	3184
2926	3185	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	3186	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2928	3187	{
2929		- cameraView.ToggleRandom();
	3188	+ cameraView.ToggleSwitch();
2930	3189	cameraView.repaint();
2931	3190	return;
2932	3191	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,6 +3214,10 @@
2955	3214	{
2956	3215	copy.live ^= true;
2957	3216	return;
	3217	+ } else if (event.getSource() == selectCB)
	3218	+ {
	3219	+ copy.dontselect ^= true;
	3220	+ return;
2958	3221	} else if (event.getSource() == hideCB)
2959	3222	{
2960	3223	copy.hide ^= true;
..	..	@@ -2969,6 +3232,7 @@
2969	3232	if (event.getSource() == randomCB)
2970	3233	{
2971	3234	copy.random ^= true;
	3235	+ objEditor.refreshContents();
2972	3236	return;
2973	3237	}
2974	3238	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3256,9 @@
2992	3256
2993	3257	public void actionPerformed(ActionEvent event)
2994	3258	{
	3259	+ Object source = event.getSource();
2995	3260	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3261	+ if (source == okbutton)
2997	3262	{
2998	3263	textpanel.setVisible(false);
2999	3264	textpanel.remove(textarea);
..	..	@@ -3005,7 +3270,7 @@
3005	3270	textarea = null;
3006	3271	textpanel = null;
3007	3272	}
3008		- if (event.getSource() == cancelbutton)
	3273	+ if (source == cancelbutton)
3009	3274	{
3010	3275	textpanel.setVisible(false);
3011	3276	textpanel.remove(textarea);
..	..	@@ -3017,50 +3282,50 @@
3017	3282	//applySelf();
3018	3283	//client.refreshEditWindow();
3019	3284	//refreshContents();
3020		- if (event.getSource() == nameField)
	3285	+ if (source == nameField)
3021	3286	{
3022	3287	//System.out.println("ObjEditor " + event);
3023	3288	applySelf0(true);
3024	3289	//parent.applySelf();
3025	3290	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3291	+ } else if (source == resetButton)
3027	3292	{
3028	3293	CameraPane.fullreset = true;
3029	3294	copy.Reset(); // ResetMeshes();
3030	3295	copy.Touch();
3031	3296	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3297	+ } else if (source == stepItem)
3033	3298	{
3034	3299	//cameraView.ONESTEP = true;
3035	3300	Globals.ONESTEP = true;
3036	3301	cameraView.repaint();
3037	3302	return;
3038		- } else if (event.getSource() == stepButton)
	3303	+ } else if (source == stepButton)
3039	3304	{
3040	3305	copy.Step();
3041	3306	copy.Touch();
3042	3307	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3308	+ } else if (source == slowerButton)
3044	3309	{
3045	3310	copy.Slower();
3046	3311	copy.Touch();
3047	3312	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3313	+ } else if (source == fasterButton)
3049	3314	{
3050	3315	copy.Faster();
3051	3316	copy.Touch();
3052	3317	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3318	+ } else if (source == remarkButton)
3054	3319	{
3055	3320	copy.Remark();
3056	3321	copy.Touch();
3057	3322	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3323	+ } else if (source == stepAllButton)
3059	3324	{
3060	3325	copy.StepAll();
3061	3326	copy.Touch();
3062	3327	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3328	+ } else if (source == resetAllButton)
3064	3329	{
3065	3330	//CameraPane.fullreset = true;
3066	3331	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3358,79 @@
3093	3358	// Close();
3094	3359	// }
3095	3360	// else
3096		- if (event.getSource() == resetSlidersButton)
	3361	+ if (source == resetSlidersButton)
3097	3362	{
3098	3363	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3364	+ } else if (source == clearMaterialButton)
3100	3365	{
3101	3366	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3367	+ } else if (source == createMaterialButton)
3103	3368	{
3104	3369	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3370	+ } else if (source == clearPanelButton)
3106	3371	{
3107	3372	copy.ClearUI();
3108	3373	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	3374	+ } else if (source == importGFDItem)
	3375	+ {
	3376	+ ImportGFD();
	3377	+ } else
	3378	+ if (source == importVRMLX3DItem)
	3379	+ {
	3380	+ ImportVRMLX3D();
	3381	+ } else
	3382	+ if (source == import3DSItem)
	3383	+ {
	3384	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3385	+ } else
	3386	+ if (source == importOBJItem)
	3387	+ {
	3388	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3389	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3390	+ browser.setVisible(true);
	3391	+ String filename = browser.getFile();
	3392	+ if (filename != null && filename.length() > 0)
	3393	+ {
	3394	+ String fullname = browser.getDirectory() + filename;
	3395	+ makeSomething(ReadOBJ(fullname), true);
	3396	+ }
	3397	+ } else
	3398	+ if (source == closeItem)
3115	3399	{
3116	3400	Close();
3117	3401	//return true;
3118		- } else if (event.getSource() == loadItem)
	3402	+ } else if (source == openItem)
3119	3403	{
3120		- load();
	3404	+ Open();
3121	3405	//return true;
3122		- } else if (event.getSource() == saveItem)
	3406	+ } else if (source == newItem)
	3407	+ {
	3408	+ New();
	3409	+ } else if (source == saveItem)
3123	3410	{
3124	3411	save();
3125	3412	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	3413	+ } else if (source == saveAsItem)
3127	3414	{
3128	3415	saveAs();
3129	3416	//return true;
3130		- } else if (event.getSource() == reexportItem)
	3417	+ } else if (source == reexportItem)
3131	3418	{
3132	3419	reexport();
3133	3420	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	3421	+ } else if (source == exportAsItem)
3135	3422	{
3136	3423	export();
3137	3424	//return true;
3138		- } else if (event.getSource() == povItem)
	3425	+ } else if (source == povItem)
3139	3426	{
3140	3427	generatePOV();
3141	3428	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	3429	+ } else if (event.getSource() == archiveItem)
	3430	+ {
	3431	+ cTools.Archive(frame);
	3432	+ return;
	3433	+ } else if (source == zBufferItem)
3143	3434	{
3144	3435	try
3145	3436	{
..	..	@@ -3161,21 +3452,8 @@
3161	3452	cameraView.repaint();
3162	3453	//return true;
3163	3454	}
3164		- */ else if (event.getSource() == editCameraItem)
3165		- {
3166		- cameraView.ProtectCamera();
3167		- cameraView.repaint();
3168		- return;
3169		- } else if (event.getSource() == revertCameraItem)
3170		- {
3171		- cameraView.RevertCamera();
3172		- cameraView.repaint();
3173		- return;
3174		-// } else if (event.getSource() == textureButton)
3175		-// {
3176		-// return; // true;
3177		- } else // combos...
3178		- if (event.getSource() == texresMenu)
	3455	+ */ else // combos...
	3456	+ if (source == texresMenu)
3179	3457	{
3180	3458	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	3459	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +3465,349 @@
3187	3465	}
3188	3466	}
3189	3467
	3468	+ void New()
	3469	+ {
	3470	+ while (copy.Size() > 1)
	3471	+ {
	3472	+ copy.remove(1);
	3473	+ }
	3474	+
	3475	+ ResetModel();
	3476	+ objEditor.refreshContents();
	3477	+ }
	3478	+
	3479	+ static public byte[] Compress(Object3D o)
	3480	+ {
	3481	+ try
	3482	+ {
	3483	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3484	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3485	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3486	+
	3487	+ Object3D parent = o.parent;
	3488	+ o.parent = null;
	3489	+
	3490	+ out.writeObject(o);
	3491	+
	3492	+ o.parent = parent;
	3493	+
	3494	+ out.flush();
	3495	+
	3496	+ baos //zstream
	3497	+ .close();
	3498	+ out.close();
	3499	+
	3500	+ byte[] bytes = baos.toByteArray();
	3501	+
	3502	+ System.out.println("save #bytes = " + bytes.length);
	3503	+ return bytes;
	3504	+ } catch (Exception e)
	3505	+ {
	3506	+ System.err.println(e);
	3507	+ return null;
	3508	+ }
	3509	+ }
	3510	+
	3511	+ static public Object Uncompress(byte[] bytes)
	3512	+ {
	3513	+ System.out.println("restore #bytes = " + bytes.length);
	3514	+ try
	3515	+ {
	3516	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3517	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3518	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3519	+ Object obj = in.readObject();
	3520	+
	3521	+ bais //istream
	3522	+ .close();
	3523	+ in.close();
	3524	+
	3525	+ return obj;
	3526	+ } catch (Exception e)
	3527	+ {
	3528	+ System.err.println(e);
	3529	+ return null;
	3530	+ }
	3531	+ }
	3532	+
	3533	+ static public Object clone(Object o)
	3534	+ {
	3535	+ try
	3536	+ {
	3537	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3538	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3539	+
	3540	+ out.writeObject(o);
	3541	+
	3542	+ out.flush();
	3543	+ out.close();
	3544	+
	3545	+ byte[] bytes = baos.toByteArray();
	3546	+
	3547	+ System.out.println("clone = " + bytes.length);
	3548	+
	3549	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3550	+ ObjectInputStream in = new ObjectInputStream(bais);
	3551	+ Object obj = in.readObject();
	3552	+ in.close();
	3553	+
	3554	+ return obj;
	3555	+ } catch (Exception e)
	3556	+ {
	3557	+ System.err.println(e);
	3558	+ return null;
	3559	+ }
	3560	+ }
	3561	+
	3562	+ cRadio GetCurrentTab()
	3563	+ {
	3564	+ cRadio ab;
	3565	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3566	+ {
	3567	+ ab = (cRadio)e.nextElement();
	3568	+ if(ab.GetObject() == copy)
	3569	+ {
	3570	+ return ab;
	3571	+ }
	3572	+ }
	3573	+
	3574	+ return null;
	3575	+ }
	3576	+
	3577	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3578	+
	3579	+ public void Save()
	3580	+ {
	3581	+ Save(true);
	3582	+ }
	3583	+
	3584	+ private boolean Equal(byte[] compress, byte[] name)
	3585	+ {
	3586	+ if (compress.length != name.length)
	3587	+ {
	3588	+ return false;
	3589	+ }
	3590	+
	3591	+ for (int i=compress.length; --i>=0;)
	3592	+ {
	3593	+ if (compress[i] != name[i])
	3594	+ return false;
	3595	+ }
	3596	+
	3597	+ return true;
	3598	+ }
	3599	+
	3600	+ public boolean Save(boolean user)
	3601	+ {
	3602	+ System.err.println("Save");
	3603	+
	3604	+ cRadio tab = GetCurrentTab();
	3605	+
	3606	+ boolean temp = CameraPane.SWITCH;
	3607	+ CameraPane.SWITCH = false;
	3608	+
	3609	+ copy.ExtractBigData(hashtable);
	3610	+
	3611	+ byte[] compress = Compress(copy);
	3612	+
	3613	+ CameraPane.SWITCH = temp;
	3614	+
	3615	+ boolean thesame = false;
	3616	+
	3617	+ // Quick heuristic using length. Works only when stream is compressed.
	3618	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3619	+ {
	3620	+ thesame = true;
	3621	+ }
	3622	+
	3623	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3624	+ if (!thesame)
	3625	+ {
	3626	+ //tab.user[tab.undoindex] = user;
	3627	+ boolean increment = tab.graphs[tab.undoindex] == null;
	3628	+
	3629	+ tab.graphs[tab.undoindex] = compress;
	3630	+
	3631	+ if (increment)
	3632	+ tab.undoindex++;
	3633	+ }
	3634	+
	3635	+ copy.RestoreBigData(hashtable);
	3636	+
	3637	+ //assert(hashtable.isEmpty());
	3638	+
	3639	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3640	+ {
	3641	+ //tab.user[i] = false;
	3642	+ // tab.graphs[i] = null;
	3643	+ }
	3644	+
	3645	+ SetUndoStates();
	3646	+
	3647	+ // test save
	3648	+ if (false)
	3649	+ {
	3650	+ try
	3651	+ {
	3652	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3653	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3654	+
	3655	+ p.writeObject(copy);
	3656	+
	3657	+ p.flush();
	3658	+
	3659	+ ostream.close();
	3660	+ } catch (Exception e)
	3661	+ {
	3662	+ e.printStackTrace();
	3663	+ }
	3664	+ }
	3665	+
	3666	+ return !thesame;
	3667	+ }
	3668	+
	3669	+ void CopyChanged(Object3D obj)
	3670	+ {
	3671	+ SetUndoStates();
	3672	+
	3673	+ boolean temp = CameraPane.SWITCH;
	3674	+ CameraPane.SWITCH = false;
	3675	+
	3676	+ copy.ExtractBigData(hashtable);
	3677	+
	3678	+ copy.clear();
	3679	+
	3680	+ for (int i=0; i<obj.Size(); i++)
	3681	+ {
	3682	+ copy.add(obj.get(i));
	3683	+ }
	3684	+
	3685	+ copy.RestoreBigData(hashtable);
	3686	+
	3687	+ CameraPane.SWITCH = temp;
	3688	+
	3689	+ //assert(hashtable.isEmpty());
	3690	+
	3691	+ copy.Touch();
	3692	+
	3693	+ ResetModel();
	3694	+ copy.HardTouch(); // recompile?
	3695	+
	3696	+ cRadio ab;
	3697	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3698	+ {
	3699	+ ab = (cRadio)e.nextElement();
	3700	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3701	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3702	+ if (test != null)
	3703	+ {
	3704	+ test.editWindow = ab.object.editWindow;
	3705	+ ab.object = test;
	3706	+ }
	3707	+ }
	3708	+
	3709	+ refreshContents();
	3710	+ }
	3711	+
	3712	+ cButton undoButton;
	3713	+ cButton redoButton;
	3714	+
	3715	+ void SetUndoStates()
	3716	+ {
	3717	+ cRadio tab = GetCurrentTab();
	3718	+
	3719	+ undoButton.setEnabled(tab.undoindex > 0);
	3720	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3721	+ }
	3722	+
	3723	+ public boolean Undo()
	3724	+ {
	3725	+ System.err.println("Undo");
	3726	+
	3727	+ cRadio tab = GetCurrentTab();
	3728	+
	3729	+ if (tab.undoindex == 0)
	3730	+ {
	3731	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
	3736	+ {
	3737	+ if (Save(false))
	3738	+ tab.undoindex -= 1;
	3739	+ else
	3740	+ {
	3741	+ if (tab.undoindex <= 0)
	3742	+ return false;
	3743	+ else
	3744	+ tab.undoindex -= 1;
	3745	+ }
	3746	+ }
	3747	+
	3748	+ tab.undoindex -= 1;
	3749	+
	3750	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3751	+
	3752	+ return true;
	3753	+ }
	3754	+
	3755	+ public void Redo()
	3756	+ {
	3757	+ cRadio tab = GetCurrentTab();
	3758	+
	3759	+ if (tab.graphs[tab.undoindex + 1] == null)
	3760	+ {
	3761	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3762	+ return;
	3763	+ }
	3764	+
	3765	+ tab.undoindex += 1;
	3766	+
	3767	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3768	+
	3769	+ //if (!tab.user[tab.undoindex])
	3770	+ // tab.graphs[tab.undoindex] = null;
	3771	+ }
	3772	+
	3773	+ void ImportGFD()
	3774	+ {
	3775	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3776	+ browser.show();
	3777	+ String filename = browser.getFile();
	3778	+ if (filename != null && filename.length() > 0)
	3779	+ {
	3780	+ String fullname = browser.getDirectory() + filename;
	3781	+
	3782	+ //Object3D readobj =
	3783	+ objEditor.ReadGFD(fullname, objEditor);
	3784	+ //makeSomething(readobj);
	3785	+ }
	3786	+ }
	3787	+
	3788	+ void ImportVRMLX3D()
	3789	+ {
	3790	+ if (Grafreed.standAlone)
	3791	+ {
	3792	+ /**/
	3793	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3794	+ browser.show();
	3795	+ String filename = browser.getFile();
	3796	+ if (filename != null && filename.length() > 0)
	3797	+ {
	3798	+ String fullname = browser.getDirectory() + filename;
	3799	+ LoadVRMLX3D(fullname);
	3800	+ }
	3801	+ /**/
	3802	+ }
	3803	+ }
	3804	+
3190	3805	void ToggleAnimation()
3191	3806	{
3192	3807	if (!Globals.ANIMATION)
3193	3808	{
3194	3809	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	3810	+ browser.setVisible(true);
3196	3811	String filename = browser.getFile();
3197	3812	if (filename != null && filename.length() > 0)
3198	3813	{
..	..	@@ -3202,8 +3817,8 @@
3202	3817
3203	3818	Globals.ANIMATION ^= true;
3204	3819
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	3820	+ Grafreed.wav.cursor = 0;
	3821	+ Grafreed.wav.loop = 0;
3207	3822	}
3208	3823	} else
3209	3824	{
..	..	@@ -3224,7 +3839,6 @@
3224	3839	callee.refreshContents();
3225	3840	} else
3226	3841	{
3227		- new Exception().printStackTrace();
3228	3842	System.exit(0);
3229	3843	}
3230	3844	}
..	..	@@ -3254,7 +3868,7 @@
3254	3868	void CreateMaterial()
3255	3869	{
3256	3870	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3871	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3872	if (copy.selection.size() > 0)
3259	3873	//SetMaterial(copy);
3260	3874	{
..	..	@@ -3305,7 +3919,7 @@
3305	3919	assert false;
3306	3920	}
3307	3921
3308		- void EditSelection()
	3922	+ void EditSelection(boolean newWindow)
3309	3923	{
3310	3924	}
3311	3925
..	..	@@ -3313,11 +3927,11 @@
3313	3927	{
3314	3928	copy.ResetBlockLoop(); // temporary problem
3315	3929
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	3930	+ boolean random = CameraPane.SWITCH;
	3931	+ CameraPane.SWITCH = false; // parse everything
3318	3932	copy.ResetDisplayList();
3319	3933	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	3934	+ CameraPane.SWITCH = random;
3321	3935	}
3322	3936
3323	3937	// public void applySelf()
..	..	@@ -3391,6 +4005,36 @@
3391	4005	{
3392	4006	//System.out.println("Propagate = " + propagate);
3393	4007	copy.UpdateMaterial(anchor, current, propagate);
	4008	+
	4009	+ if (copy.material != null)
	4010	+ {
	4011	+ cMaterial mat = copy.material;
	4012	+
	4013	+ colorField.SetToolTipValue((mat.color));
	4014	+ modulationField.SetToolTipValue((mat.modulation));
	4015	+ metalnessField.SetToolTipValue((mat.metalness));
	4016	+ diffuseField.SetToolTipValue((mat.diffuse));
	4017	+ specularField.SetToolTipValue((mat.specular));
	4018	+ shininessField.SetToolTipValue((mat.shininess));
	4019	+ shiftField.SetToolTipValue((mat.shift));
	4020	+ ambientField.SetToolTipValue((mat.ambient));
	4021	+ lightareaField.SetToolTipValue((mat.lightarea));
	4022	+ diffusenessField.SetToolTipValue((mat.factor));
	4023	+ velvetField.SetToolTipValue((mat.velvet));
	4024	+ sheenField.SetToolTipValue((mat.sheen));
	4025	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4026	+ backlitField.SetToolTipValue((mat.bump));
	4027	+ anisoField.SetToolTipValue((mat.aniso));
	4028	+ anisoVField.SetToolTipValue((mat.anisoV));
	4029	+ cameraField.SetToolTipValue((mat.cameralight));
	4030	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4031	+ shadowField.SetToolTipValue((mat.shadow));
	4032	+ textureField.SetToolTipValue((mat.texture));
	4033	+ opacityField.SetToolTipValue((mat.opacity));
	4034	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4035	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4036	+ }
	4037	+
3394	4038	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	4039	{
3396	4040	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3506,7 +4150,7 @@
3506	4150	}
3507	4151
3508	4152	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4153	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	4154	}
3511	4155
3512	4156	void SnapObject()
..	..	@@ -3770,6 +4414,8 @@
3770	4414
3771	4415	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	4416	{
	4417	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4418	+ Save();
3773	4419	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	4420	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	4421	// if (thing instanceof GenericJointDemo)
..	..	@@ -3856,6 +4502,12 @@
3856	4502	{
3857	4503	ResetModel();
3858	4504	Select(thing.GetTreePath(), true, false); // unselect... false);
	4505	+
	4506	+ if (thing.Size() == 0)
	4507	+ {
	4508	+ //EditSelection(false);
	4509	+ }
	4510	+
3859	4511	refreshContents();
3860	4512	}
3861	4513
..	..	@@ -3973,6 +4625,7 @@
3973	4625	}
3974	4626	}
3975	4627	}
	4628	+
3976	4629	LoadGFDThread loadGFDThread;
3977	4630
3978	4631	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +4645,10 @@
3992	4645
3993	4646	try
3994	4647	{
	4648	+ // Try compressed version first.
3995	4649	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4650	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4651	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	4652
3998	4653	readobj = (Object3D) p.readObject();
3999	4654	istream.close();
..	..	@@ -4001,7 +4656,20 @@
4001	4656	readobj.ResetDisplayList();
4002	4657	} catch (Exception e)
4003	4658	{
4004		- e.printStackTrace();
	4659	+ //e.printStackTrace();
	4660	+ try
	4661	+ {
	4662	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4663	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4664	+
	4665	+ readobj = (Object3D) p.readObject();
	4666	+ istream.close();
	4667	+
	4668	+ readobj.ResetDisplayList();
	4669	+ } catch (Exception e2)
	4670	+ {
	4671	+ e2.printStackTrace();
	4672	+ }
4005	4673	}
4006	4674	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	4675	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +4715,12 @@
4047	4715
4048	4716	void LoadIt(Object obj)
4049	4717	{
	4718	+ if (obj == null)
	4719	+ {
	4720	+ // Invalid file
	4721	+ return;
	4722	+ }
	4723	+
4050	4724	System.out.println("Loaded " + obj);
4051	4725	//new Exception().printStackTrace();
4052	4726	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,6 +4730,8 @@
4056	4730
4057	4731	if (readobj != null)
4058	4732	{
	4733	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4734	+ // Save();
4059	4735	try
4060	4736	{
4061	4737	//readobj.deepCopySelf(copy);
..	..	@@ -4116,9 +4792,9 @@
4116	4792	}
4117	4793	}
4118	4794
4119		- void load() // throws ClassNotFoundException
	4795	+ void Open() // throws ClassNotFoundException
4120	4796	{
4121		- if (GrafreeD.standAlone)
	4797	+ if (Grafreed.standAlone)
4122	4798	{
4123	4799	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4124	4800	browser.show();
..	..	@@ -4205,11 +4881,13 @@
4205	4881	try
4206	4882	{
4207	4883	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4884	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4885	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	4886
4210	4887	p.writeObject(copy);
4211	4888	p.flush();
4212	4889
	4890	+ zstream.close();
4213	4891	ostream.close();
4214	4892
4215	4893	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4219,17 +4897,20 @@
4219	4897	{
4220	4898	}
4221	4899	}
	4900	+
4222	4901	String lastname;
4223	4902
4224	4903	void saveAs()
4225	4904	{
4226		- if (GrafreeD.standAlone)
	4905	+ if (Grafreed.standAlone)
4227	4906	{
4228	4907	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	4908	browser.setVisible(true);
4230	4909	String filename = browser.getFile();
4231	4910	if (filename != null && filename.length() > 0)
4232	4911	{
	4912	+ if (!filename.endsWith(".gfd"))
	4913	+ filename += ".gfd";
4233	4914	lastname = browser.getDirectory() + filename;
4234	4915	save();
4235	4916	}
..	..	@@ -4328,13 +5009,13 @@
4328	5009	try
4329	5010	{
4330	5011	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5012	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5013	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	5014
4334	5015	Object3D objectparent = obj.parent;
4335	5016	obj.parent = null;
4336	5017
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5018	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	5019
4339	5020	obj.parent = objectparent;
4340	5021
..	..	@@ -4346,8 +5027,8 @@
4346	5027	p.writeObject(object);
4347	5028	p.flush();
4348	5029
	5030	+ zstream.close();
4349	5031	ostream.close();
4350		- // zstream.close();
4351	5032
4352	5033	// group.selection.get(0).parent = parent;
4353	5034	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +5049,7 @@
4368	5049	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	5050	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	5051	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	5052	+ if (Grafreed.standAlone)
4372	5053	{
4373	5054	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	5055	browser.show();
..	..	@@ -4394,19 +5075,18 @@
4394	5075	Object3D client;
4395	5076	Object3D copy;
4396	5077	MenuBar menuBar;
4397		- Menu windowMenu;
4398		- MenuItem loadItem;
	5078	+ Menu fileMenu;
	5079	+ MenuItem newItem;
	5080	+ MenuItem openItem;
4399	5081	MenuItem saveItem;
4400	5082	MenuItem saveAsItem;
4401	5083	MenuItem exportAsItem;
4402	5084	MenuItem reexportItem;
4403	5085	MenuItem povItem;
4404	5086	MenuItem closeItem;
4405		- Menu cameraMenu;
	5087	+
4406	5088	CheckboxMenuItem zBufferItem;
4407	5089	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	5090	MenuItem stepItem;
4411	5091	CheckboxMenuItem toggleLiveItem;
4412	5092	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,25 +5097,39 @@
4417	5097	CheckboxMenuItem toggleFootContactItem;
4418	5098	CheckboxMenuItem toggleDLItem;
4419	5099	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	5100	+ CheckboxMenuItem toggleSwitchItem;
4421	5101	CheckboxMenuItem toggleRootItem;
4422	5102	CheckboxMenuItem animationItem;
	5103	+ MenuItem archiveItem;
4423	5104	CheckboxMenuItem toggleHandleItem;
4424	5105	CheckboxMenuItem togglePaintItem;
4425	5106	JSplitPane mainPanel;
4426	5107	JScrollPane scrollpane;
	5108	+
4427	5109	JPanel toolbarPanel;
4428		- JPanel treePanel;
	5110	+
	5111	+ cGridBag treePanel;
	5112	+
4429	5113	JPanel radioPanel;
4430	5114	ButtonGroup buttonGroup;
4431		- cGridBag ctrlPanel;
	5115	+
	5116	+ cGridBag toolboxPanel;
4432	5117	cGridBag materialPanel;
	5118	+ cGridBag ctrlPanel;
	5119	+
4433	5120	JScrollPane infoPanel;
	5121	+
4434	5122	cGridBag optionsPanel;
	5123	+
4435	5124	JTabbedPane objectPanel;
	5125	+ boolean materialFlushed;
	5126	+ Object3D latestObject;
	5127	+
4436	5128	cGridBag XYZPanel;
	5129	+
4437	5130	JSplitPane gridPanel;
4438	5131	JSplitPane bigPanel;
	5132	+
4439	5133	cGridBag bigThree;
4440	5134	cGridBag scenePanel;
4441	5135	cGridBag centralPanel;
..	..	@@ -4550,8 +5244,13 @@
4550	5244	cNumberSlider fogField;
4551	5245	JLabel opacityPowerLabel;
4552	5246	cNumberSlider opacityPowerField;
4553		- JTree jTree;
	5247	+ cTree jTree;
4554	5248	//ObjectUI parent;
4555	5249
4556	5250	cNumberSlider normalpushField;
	5251	+
	5252	+ private MenuItem importGFDItem;
	5253	+ private MenuItem importVRMLX3DItem;
	5254	+ private MenuItem import3DSItem;
	5255	+ private MenuItem importOBJItem;
4557	5256	}