~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(true);
245	313	objEditor = this;
246	314	this.callee = callee;
247	315
..	..	@@ -272,27 +340,48 @@
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(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
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
	384	+ newItem.addActionListener(this);
296	385	loadItem.addActionListener(this);
297	386	saveItem.addActionListener(this);
298	387	saveAsItem.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(50, 200));
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,159 @@
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	+ }
	749	+
	750	+ maximized ^= true;
	751	+
	752	+ frame.validate();
	753	+ }
	754	+
	755	+ cButton minButton;
	756	+ cButton maxButton;
	757	+ cButton fullButton;
	758	+
615	759	void ToggleFullScreen()
616	760	{
617		- if (CameraPane.FULLSCREEN)
	761	+ cameraView.ToggleFullScreen();
	762	+
	763	+ if (!CameraPane.FULLSCREEN)
618	764	{
619		- frame.getContentPane().remove(/"Center",/bigThree);
620		- framePanel.add(bigThree);
621		- frame.getContentPane().add(/"Center",/framePanel);
	765	+ device.setFullScreenWindow(null);
	766	+ frame.validate();
	767	+
	768	+ //frame.setVisible(false);
	769	+// frame.removeNotify();
	770	+// frame.setUndecorated(false);
	771	+// frame.addNotify();
	772	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	773	+
	774	+// X frame.getContentPane().remove(/"Center",/bigThree);
	775	+// X framePanel.add(bigThree);
	776	+// X frame.getContentPane().add(/"Center",/framePanel);
	777	+ framePanel.setDividerLocation(1);
	778	+
	779	+ //frame.setVisible(true);
	780	+ radio.layout = keepButton;
	781	+ //theFrame = null;
	782	+ keepButton = null;
	783	+ radio.layout.doClick();
	784	+
622	785	} else
623	786	{
624		- frame.getContentPane().remove(/"Center",/framePanel);
625		- framePanel.remove(bigThree);
626		- frame.getContentPane().add(/"Center",/bigThree);
	787	+ keepButton = radio.layout;
	788	+ //keeprect = frame.getBounds();
	789	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	790	+// frame.getToolkit().getScreenSize().height);
	791	+ //frame.setVisible(false);
	792	+ device.setFullScreenWindow(frame);
	793	+ frame.validate();
	794	+// frame.removeNotify();
	795	+// frame.setUndecorated(true);
	796	+// frame.addNotify();
	797	+// X frame.getContentPane().remove(/"Center",/framePanel);
	798	+// X framePanel.remove(bigThree);
	799	+// X frame.getContentPane().add(/"Center",/bigThree);
	800	+ framePanel.setDividerLocation(0);
	801	+
	802	+ radio.layout = fullscreenLayout;
	803	+ radio.layout.doClick();
	804	+ //frame.setVisible(true);
627	805	}
628		- cameraView.ToggleFullScreen();
	806	+ frame.validate();
629	807	}
630	808
631		- private JTextArea createTextPane()
	809	+ private JTextPane createTextPane()
632	810	{
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		- };
	811	+// TEXTAREA String[] initString =
	812	+// {
	813	+// "This is an editable JTextPane, ", //regular
	814	+// "another ", //italic
	815	+// "styled ", //bold
	816	+// "text ", //small
	817	+// "component, ", //large
	818	+// "which supports embedded components..." + newline,//regular
	819	+// " " + newline, //button
	820	+// "...and embedded icons..." + newline, //regular
	821	+// " ", //icon
	822	+// newline + "JTextPane is a subclass of JEditorPane that "
	823	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	824	+// + "cover methods for interacting with those objects."
	825	+// };
	826	+//
	827	+// String[] initStyles =
	828	+// {
	829	+// "regular", "italic", "bold", "small", "large",
	830	+// "regular", "button", "regular", "icon",
	831	+// "regular"
	832	+// };
	833	+//
	834	+// JTextPane textPane = new JTextPane();
	835	+// textPane.setEditable(true);
	836	+// /StyledDocument/ doc = textPane.getStyledDocument();
	837	+// addStylesToDocument(doc);
	838	+//
	839	+// try
	840	+// {
	841	+// for (int j = 0; j < 2; j++)
	842	+// {
	843	+// for (int i = 0; i < initString.length; i++)
	844	+// {
	845	+// doc.insertString(doc.getLength(), initString[i],
	846	+// doc.getStyle(initStyles[i]));
	847	+// }
	848	+// }
	849	+// } catch (BadLocationException ble)
	850	+// {
	851	+// System.err.println("Couldn't insert initial text into text pane.");
	852	+// }
648	853
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;
	854	+ return new JTextPane(); // textPane;
677	855	}
678	856
679	857	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +904,7 @@
726	904	protected static ImageIcon createImageIcon(String path,
727	905	String description)
728	906	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	907	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	908	if (imgURL != null)
731	909	{
732	910	return new ImageIcon(imgURL, description);
..	..	@@ -758,6 +936,7 @@
758	936	// NumberSlider vDivsField;
759	937	// JCheckBox endcaps;
760	938	JCheckBox liveCB;
	939	+ JCheckBox selectCB;
761	940	JCheckBox hideCB;
762	941	JCheckBox link2masterCB;
763	942	JCheckBox markCB;
..	..	@@ -765,7 +944,12 @@
765	944	JCheckBox speedupCB;
766	945	JCheckBox rewindCB;
767	946	JCheckBox flipVCB;
	947	+
	948	+ cCheckBox toggleTextureCB;
	949	+ cCheckBox toggleSwitchCB;
	950	+
768	951	JComboBox texresMenu;
	952	+
769	953	JButton resetButton;
770	954	JButton stepButton;
771	955	JButton stepAllButton;
..	..	@@ -774,9 +958,13 @@
774	958	JButton fasterButton;
775	959	JButton remarkButton;
776	960
	961	+ cGridBag editPanel;
	962	+ cGridBag editCommandsPanel;
	963	+
777	964	cGridBag namePanel;
778	965	cGridBag setupPanel;
779		- cGridBag commandsPanel;
	966	+ cGridBag setupPanel2;
	967	+ cGridBag objectCommandsPanel;
780	968	cGridBag pushPanel;
781	969	cGridBag fillPanel;
782	970
..	..	@@ -943,52 +1131,72 @@
943	1131
944	1132	void SetupUI2(ObjEditor oe)
945	1133	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	1134	//SetupName(oe);
951	1135
952	1136	namePanel = new cGridBag();
953	1137
954	1138	nameField = AddText(namePanel, copy.GetName());
955		- namePanel.add(nameField);
	1139	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
956	1140	oe.ctrlPanel.add(namePanel);
957	1141
958	1142	oe.ctrlPanel.Return();
959	1143
960		- if (!GroupEditor.allparams)
	1144	+ if (!allparams)
961	1145	return;
962	1146
963	1147	setupPanel = new cGridBag().setVertical(false);
964	1148
965	1149	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1150	+ liveCB.setToolTipText("Animate object");
	1151	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1152	+ selectCB.setToolTipText("Make object selectable");
968	1153	// Return();
	1154	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1155	+ hideCB.setToolTipText("Hide object");
969	1156	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1157	+ markCB.setToolTipText("As animation target transform");
	1158	+
	1159	+ setupPanel2 = new cGridBag().setVertical(false);
	1160	+
	1161	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1162	+ rewindCB.setToolTipText("Rewind animation");
	1163	+
	1164	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1165	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
972	1166
	1167	+ if (Globals.ADVANCED)
	1168	+ {
	1169	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1170	+ link2masterCB.setToolTipText("Attach to support");
	1171	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1172	+ speedupCB.setToolTipText("Option motion capture");
	1173	+ }
	1174	+
973	1175	oe.ctrlPanel.add(setupPanel);
974	1176	oe.ctrlPanel.Return();
	1177	+ oe.ctrlPanel.add(setupPanel2);
	1178	+ oe.ctrlPanel.Return();
975	1179
976		- commandsPanel = new cGridBag().setVertical(false);
	1180	+ objectCommandsPanel = new cGridBag().setVertical(false);
977	1181
978		- resetButton = AddButton(commandsPanel, "Reset");
979		- stepButton = AddButton(commandsPanel, "Step");
	1182	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1183	+ resetButton.setToolTipText("Jump to frame zero");
	1184	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1185	+ stepButton.setToolTipText("Step one frame");
980	1186	// resetAllButton = AddButton(oe, "Reset All");
981	1187	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	1188	// Return();
984		- slowerButton = AddButton(commandsPanel, "Slow");
985		- fasterButton = AddButton(commandsPanel, "Fast");
986		- remarkButton = AddButton(commandsPanel, "Remark");
	1189	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1190	+ slowerButton.setToolTipText("Decrease animation speed");
	1191	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1192	+ fasterButton.setToolTipText("Increase animation speed");
	1193	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1194	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1195
988		- oe.ctrlPanel.add(commandsPanel);
	1196	+ oe.ctrlPanel.add(objectCommandsPanel);
989	1197	oe.ctrlPanel.Return();
990	1198
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1199	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	1200	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	1201	//Return();
994	1202
..	..	@@ -1191,8 +1399,11 @@
1191	1399	//worldPanel.setName("World");
1192	1400	centralPanel = new cGridBag();
1193	1401	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1402	+
	1403	+ if (Globals.ADVANCED)
	1404	+ {
	1405	+ timelinePanel = new JPanel(new BorderLayout());
	1406	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1407
1197	1408	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1409	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1412,10 @@
1201	1412	// cameraPanel.setDividerSize(9);
1202	1413	cameraPanel.setResizeWeight(1.0);
1203	1414
	1415	+ }
	1416	+
1204	1417	centralPanel.add(cameraView);
	1418	+ centralPanel.setFocusable(true);
1205	1419	//frame.setJMenuBar(timelineMenubar);
1206	1420	//centralPanel.add(timelinePanel);
1207	1421
..	..	@@ -1268,8 +1482,9 @@
1268	1482	// north.setName("Edit");
1269	1483	// north.add(ctrlPanel, BorderLayout.NORTH);
1270	1484	// objectPanel.add(north);
1271		- objectPanel.add(ctrlPanel);
	1485	+ objectPanel.add(editPanel);
1272	1486	objectPanel.add(infoPanel);
	1487	+ objectPanel.add(toolboxPanel);
1273	1488
1274	1489	/*
1275	1490	aConstraints.gridx = 0;
..	..	@@ -1278,7 +1493,7 @@
1278	1493	aConstraints.gridy += 1;
1279	1494	aConstraints.gridwidth = 1;
1280	1495	mainPanel.add(objectPanel, aConstraints);
1281		- */
	1496	+ */
1282	1497
1283	1498	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1284	1499	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1290,14 +1505,12 @@
1290	1505	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1506
1292	1507	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1508	+ scenePanel.preferredWidth = 6;
1294	1509
1295	1510	JTabbedPane tabbedPane = new JTabbedPane();
1296	1511	tabbedPane.add(scrollpane);
1297	1512
1298		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1299		-
1300		- optionsPanel = new cGridBag().setVertical(true);
	1513	+ optionsPanel = new cGridBag().setVertical(false);
1301	1514
1302	1515	optionsPanel.setName("Options");
1303	1516
..	..	@@ -1305,6 +1518,8 @@
1305	1518
1306	1519	tabbedPane.add(optionsPanel);
1307	1520
	1521	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1522	+
1308	1523	scenePanel.add(tabbedPane);
1309	1524
1310	1525	/*
..	..	@@ -1396,9 +1611,13 @@
1396	1611
1397	1612	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1613
1399		- frame.setSize(1024, 768);
1400		- frame.show();
	1614	+ frame.setSize(1280, 860);
	1615	+
	1616	+ frame.validate();
	1617	+ frame.setVisible(true);
1401	1618
	1619	+ cameraView.requestFocusInWindow();
	1620	+
1402	1621	gridPanel.setDividerLocation(1.0);
1403	1622
1404	1623	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1436,17 +1655,25 @@
1436	1655
1437	1656	cGridBag editBar = new cGridBag().setVertical(false);
1438	1657
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1658	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1659	+ createMaterialButton.setToolTipText("Create material");
1440	1660
1441	1661	/*
1442	1662	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	1663	*/
1444	1664
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);
	1665	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1666	+ clearMaterialButton.setToolTipText("Clear material");
	1667	+
	1668	+ if (Globals.ADVANCED)
	1669	+ {
	1670	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1671	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1672	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1673	+ }
1449	1674
	1675	+ editBar.preferredHeight = 15;
	1676	+
1450	1677	panel.add(editBar);
1451	1678
1452	1679	/**/
..	..	@@ -1477,24 +1704,6 @@
1477	1704	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478	1705	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479	1706	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	1707
1499	1708	panel.add(new JSeparator());
1500	1709
..	..	@@ -1546,6 +1755,12 @@
1546	1755	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1547	1756	diffuseSection.add(fakedepth);
1548	1757
	1758	+ cGridBag shadowbias = new cGridBag();
	1759	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1760	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1761	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1762	+ diffuseSection.add(shadowbias);
	1763	+
1549	1764	panel.add(new JSeparator());
1550	1765
1551	1766	panel.add(diffuseSection);
..	..	@@ -1596,6 +1811,18 @@
1596	1811	// aConstraints.gridy += 1;
1597	1812	// aConstraints.gridwidth = 1;
1598	1813
	1814	+ cGridBag anisoU = new cGridBag();
	1815	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1816	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1817	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1818	+ specularSection.add(anisoU);
	1819	+
	1820	+ cGridBag anisoV = new cGridBag();
	1821	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1822	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1823	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1824	+ specularSection.add(anisoV);
	1825	+
1599	1826
1600	1827	panel.add(new JSeparator());
1601	1828
..	..	@@ -1603,35 +1830,35 @@
1603	1830
1604	1831	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1605	1832
1606		- cGridBag globalSection = new cGridBag().setVertical(true);
	1833	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1607	1834
1608	1835	cGridBag camera = new cGridBag();
1609	1836	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1610	1837	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611	1838	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612		- globalSection.add(camera);
	1839	+ colorSection.add(camera);
1613	1840
1614	1841	cGridBag ambient = new cGridBag();
1615	1842	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1616	1843	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617	1844	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1618		- globalSection.add(ambient);
	1845	+ colorSection.add(ambient);
1619	1846
1620	1847	cGridBag backlit = new cGridBag();
1621	1848	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1622	1849	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	1850	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1624		- globalSection.add(backlit);
	1851	+ colorSection.add(backlit);
1625	1852
1626	1853	cGridBag opacity = new cGridBag();
1627	1854	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1628	1855	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1629	1856	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1630		- globalSection.add(opacity);
	1857	+ colorSection.add(opacity);
1631	1858
1632		- panel.add(new JSeparator());
	1859	+ //panel.add(new JSeparator());
1633	1860
1634		- panel.add(globalSection);
	1861	+ //panel.add(globalSection);
1635	1862
1636	1863	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1637	1864
..	..	@@ -1712,12 +1939,15 @@
1712	1939	opacityPowerField.addChangeListener(this);
1713	1940	/**/
1714	1941
1715		- resetSlidersButton.addActionListener(this);
1716	1942	clearMaterialButton.addActionListener(this);
1717	1943	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	1944	+
	1945	+ if (Globals.ADVANCED)
	1946	+ {
	1947	+ resetSlidersButton.addActionListener(this);
	1948	+ propagateToggle.addItemListener(this);
	1949	+ multiplyToggle.addItemListener(this);
	1950	+ }
1721	1951	}
1722	1952
1723	1953	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1888,7 +2118,7 @@
1888	2118
1889	2119	//? flashIt = false;
1890	2120	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	2121	+ pane.clickStart(location.x, location.y, 0, 0);
1892	2122	pane.clickEnd(location.x, location.y, 0, true);
1893	2123
1894	2124	if (group.selection.size() == 1)
..	..	@@ -1937,6 +2167,7 @@
1937	2167	e2.printStackTrace();
1938	2168	}
1939	2169	}
	2170	+
1940	2171	LoadJMEThread loadThread;
1941	2172
1942	2173	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +2225,7 @@
1994	2225	//LoadFile0(filename, converter);
1995	2226	}
1996	2227	}
	2228	+
1997	2229	LoadOBJThread loadObjThread;
1998	2230
1999	2231	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2304,19 @@
2072	2304
2073	2305	void LoadObjFile(String fullname)
2074	2306	{
2075		- /*
	2307	+ System.out.println("Loading " + fullname);
	2308	+ /**/
2076	2309	//lastFilename = fullname;
2077	2310	if(loadObjThread == null)
2078	2311	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2312	+ loadObjThread = new LoadOBJThread();
	2313	+ loadObjThread.start();
2081	2314	}
2082	2315
2083	2316	loadObjThread.add(fullname);
2084		- */
	2317	+ /**/
2085	2318
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2319	+ //makeSomething(new FileObject(fullname, true), true);
2088	2320	}
2089	2321
2090	2322	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +2577,11 @@
2345	2577
2346	2578	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2579	{
2348		- if (GrafreeD.standAlone)
	2580	+ if (Grafreed.standAlone)
2349	2581	{
2350	2582	/**/
2351	2583	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2584	+ browser.setVisible(true);
2353	2585	String filename = browser.getFile();
2354	2586	if (filename != null && filename.length() > 0)
2355	2587	{
..	..	@@ -2701,6 +2933,8 @@
2701	2933
2702	2934	void SetMaterial(Object3D object)
2703	2935	{
	2936	+ latestObject = object;
	2937	+
2704	2938	cMaterial mat = object.material;
2705	2939
2706	2940	if (mat == null)
..	..	@@ -2709,7 +2943,8 @@
2709	2943	return;
2710	2944	}
2711	2945
2712		- multiplyToggle.setSelected(mat.multiply);
	2946	+ if (multiplyToggle != null)
	2947	+ multiplyToggle.setSelected(mat.multiply);
2713	2948
2714	2949	assert (object.projectedVertices != null);
2715	2950
..	..	@@ -2811,12 +3046,17 @@
2811	3046	// }
2812	3047
2813	3048	/**/
2814		- if (deselect)
	3049	+ if (deselect \|\| child == null)
2815	3050	{
2816	3051	//group.deselectAll();
2817	3052	//freeze = true;
2818	3053	GetTree().clearSelection();
2819	3054	//freeze = false;
	3055	+
	3056	+ if (child == null)
	3057	+ {
	3058	+ return;
	3059	+ }
2820	3060	}
2821	3061
2822	3062	//group.addSelectee(child);
..	..	@@ -2885,7 +3125,7 @@
2885	3125	cameraView.ToggleDL();
2886	3126	cameraView.repaint();
2887	3127	return;
2888		- } else if (event.getSource() == toggleTextureItem)
	3128	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2889	3129	{
2890	3130	cameraView.ToggleTexture();
2891	3131	// june 2013 copy.HardTouch();
..	..	@@ -2924,9 +3164,9 @@
2924	3164	frame.validate();
2925	3165
2926	3166	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	3167	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2928	3168	{
2929		- cameraView.ToggleRandom();
	3169	+ cameraView.ToggleSwitch();
2930	3170	cameraView.repaint();
2931	3171	return;
2932	3172	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,6 +3195,10 @@
2955	3195	{
2956	3196	copy.live ^= true;
2957	3197	return;
	3198	+ } else if (event.getSource() == selectCB)
	3199	+ {
	3200	+ copy.dontselect ^= true;
	3201	+ return;
2958	3202	} else if (event.getSource() == hideCB)
2959	3203	{
2960	3204	copy.hide ^= true;
..	..	@@ -2969,6 +3213,7 @@
2969	3213	if (event.getSource() == randomCB)
2970	3214	{
2971	3215	copy.random ^= true;
	3216	+ objEditor.refreshContents();
2972	3217	return;
2973	3218	}
2974	3219	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3237,9 @@
2992	3237
2993	3238	public void actionPerformed(ActionEvent event)
2994	3239	{
	3240	+ Object source = event.getSource();
2995	3241	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3242	+ if (source == okbutton)
2997	3243	{
2998	3244	textpanel.setVisible(false);
2999	3245	textpanel.remove(textarea);
..	..	@@ -3005,7 +3251,7 @@
3005	3251	textarea = null;
3006	3252	textpanel = null;
3007	3253	}
3008		- if (event.getSource() == cancelbutton)
	3254	+ if (source == cancelbutton)
3009	3255	{
3010	3256	textpanel.setVisible(false);
3011	3257	textpanel.remove(textarea);
..	..	@@ -3017,50 +3263,50 @@
3017	3263	//applySelf();
3018	3264	//client.refreshEditWindow();
3019	3265	//refreshContents();
3020		- if (event.getSource() == nameField)
	3266	+ if (source == nameField)
3021	3267	{
3022	3268	//System.out.println("ObjEditor " + event);
3023	3269	applySelf0(true);
3024	3270	//parent.applySelf();
3025	3271	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3272	+ } else if (source == resetButton)
3027	3273	{
3028	3274	CameraPane.fullreset = true;
3029	3275	copy.Reset(); // ResetMeshes();
3030	3276	copy.Touch();
3031	3277	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3278	+ } else if (source == stepItem)
3033	3279	{
3034	3280	//cameraView.ONESTEP = true;
3035	3281	Globals.ONESTEP = true;
3036	3282	cameraView.repaint();
3037	3283	return;
3038		- } else if (event.getSource() == stepButton)
	3284	+ } else if (source == stepButton)
3039	3285	{
3040	3286	copy.Step();
3041	3287	copy.Touch();
3042	3288	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3289	+ } else if (source == slowerButton)
3044	3290	{
3045	3291	copy.Slower();
3046	3292	copy.Touch();
3047	3293	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3294	+ } else if (source == fasterButton)
3049	3295	{
3050	3296	copy.Faster();
3051	3297	copy.Touch();
3052	3298	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3299	+ } else if (source == remarkButton)
3054	3300	{
3055	3301	copy.Remark();
3056	3302	copy.Touch();
3057	3303	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3304	+ } else if (source == stepAllButton)
3059	3305	{
3060	3306	copy.StepAll();
3061	3307	copy.Touch();
3062	3308	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3309	+ } else if (source == resetAllButton)
3064	3310	{
3065	3311	//CameraPane.fullreset = true;
3066	3312	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3339,75 @@
3093	3339	// Close();
3094	3340	// }
3095	3341	// else
3096		- if (event.getSource() == resetSlidersButton)
	3342	+ if (source == resetSlidersButton)
3097	3343	{
3098	3344	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3345	+ } else if (source == clearMaterialButton)
3100	3346	{
3101	3347	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3348	+ } else if (source == createMaterialButton)
3103	3349	{
3104	3350	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3351	+ } else if (source == clearPanelButton)
3106	3352	{
3107	3353	copy.ClearUI();
3108	3354	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	3355	+ } else if (source == importGFDItem)
	3356	+ {
	3357	+ ImportGFD();
	3358	+ } else
	3359	+ if (source == importVRMLX3DItem)
	3360	+ {
	3361	+ ImportVRMLX3D();
	3362	+ } else
	3363	+ if (source == import3DSItem)
	3364	+ {
	3365	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3366	+ } else
	3367	+ if (source == importOBJItem)
	3368	+ {
	3369	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3370	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3371	+ browser.setVisible(true);
	3372	+ String filename = browser.getFile();
	3373	+ if (filename != null && filename.length() > 0)
	3374	+ {
	3375	+ String fullname = browser.getDirectory() + filename;
	3376	+ makeSomething(ReadOBJ(fullname), true);
	3377	+ }
	3378	+ } else
	3379	+ if (source == closeItem)
3115	3380	{
3116	3381	Close();
3117	3382	//return true;
3118		- } else if (event.getSource() == loadItem)
	3383	+ } else if (source == loadItem)
3119	3384	{
3120	3385	load();
3121	3386	//return true;
3122		- } else if (event.getSource() == saveItem)
	3387	+ } else if (source == newItem)
	3388	+ {
	3389	+ New();
	3390	+ } else if (source == saveItem)
3123	3391	{
3124	3392	save();
3125	3393	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	3394	+ } else if (source == saveAsItem)
3127	3395	{
3128	3396	saveAs();
3129	3397	//return true;
3130		- } else if (event.getSource() == reexportItem)
	3398	+ } else if (source == reexportItem)
3131	3399	{
3132	3400	reexport();
3133	3401	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	3402	+ } else if (source == exportAsItem)
3135	3403	{
3136	3404	export();
3137	3405	//return true;
3138		- } else if (event.getSource() == povItem)
	3406	+ } else if (source == povItem)
3139	3407	{
3140	3408	generatePOV();
3141	3409	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	3410	+ } else if (source == zBufferItem)
3143	3411	{
3144	3412	try
3145	3413	{
..	..	@@ -3161,21 +3429,8 @@
3161	3429	cameraView.repaint();
3162	3430	//return true;
3163	3431	}
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)
	3432	+ */ else // combos...
	3433	+ if (source == texresMenu)
3179	3434	{
3180	3435	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	3436	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +3442,289 @@
3187	3442	}
3188	3443	}
3189	3444
	3445	+ void New()
	3446	+ {
	3447	+ while (copy.Size() > 1)
	3448	+ {
	3449	+ copy.remove(1);
	3450	+ }
	3451	+
	3452	+ ResetModel();
	3453	+ objEditor.refreshContents();
	3454	+ }
	3455	+
	3456	+ static public byte[] Compress(Object3D o)
	3457	+ {
	3458	+ try
	3459	+ {
	3460	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3461	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3462	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3463	+
	3464	+ Object3D parent = o.parent;
	3465	+ o.parent = null;
	3466	+
	3467	+ out.writeObject(o);
	3468	+
	3469	+ o.parent = parent;
	3470	+
	3471	+ out.flush();
	3472	+
	3473	+ zstream.close();
	3474	+ out.close();
	3475	+
	3476	+ return baos.toByteArray();
	3477	+ } catch (Exception e)
	3478	+ {
	3479	+ System.err.println(e);
	3480	+ return null;
	3481	+ }
	3482	+ }
	3483	+
	3484	+ static public Object Uncompress(byte[] bytes)
	3485	+ {
	3486	+ System.out.println("#bytes = " + bytes.length);
	3487	+ try
	3488	+ {
	3489	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3490	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3491	+ ObjectInputStream in = new ObjectInputStream(istream);
	3492	+ Object obj = in.readObject();
	3493	+ in.close();
	3494	+
	3495	+ return obj;
	3496	+ } catch (Exception e)
	3497	+ {
	3498	+ System.err.println(e);
	3499	+ return null;
	3500	+ }
	3501	+ }
	3502	+
	3503	+ static public Object clone(Object o)
	3504	+ {
	3505	+ try
	3506	+ {
	3507	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3508	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3509	+
	3510	+ out.writeObject(o);
	3511	+
	3512	+ out.flush();
	3513	+ out.close();
	3514	+
	3515	+ byte[] bytes = baos.toByteArray();
	3516	+
	3517	+ System.out.println("clone = " + bytes.length);
	3518	+
	3519	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3520	+ ObjectInputStream in = new ObjectInputStream(bais);
	3521	+ Object obj = in.readObject();
	3522	+ in.close();
	3523	+
	3524	+ return obj;
	3525	+ } catch (Exception e)
	3526	+ {
	3527	+ System.err.println(e);
	3528	+ return null;
	3529	+ }
	3530	+ }
	3531	+
	3532	+ cRadio GetCurrentTab()
	3533	+ {
	3534	+ cRadio ab;
	3535	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3536	+ {
	3537	+ ab = (cRadio)e.nextElement();
	3538	+ if(ab.GetObject() == copy)
	3539	+ {
	3540	+ return ab;
	3541	+ }
	3542	+ }
	3543	+
	3544	+ return null;
	3545	+ }
	3546	+
	3547	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3548	+
	3549	+ public void Save()
	3550	+ {
	3551	+ System.err.println("Save");
	3552	+
	3553	+ cRadio tab = GetCurrentTab();
	3554	+
	3555	+ boolean temp = CameraPane.SWITCH;
	3556	+ CameraPane.SWITCH = false;
	3557	+
	3558	+ copy.ExtractBigData(hashtable);
	3559	+
	3560	+ byte[] compress = Compress(copy);
	3561	+
	3562	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3563	+ tab.graphs[tab.undoindex++] = compress;
	3564	+
	3565	+ copy.RestoreBigData(hashtable);
	3566	+
	3567	+ CameraPane.SWITCH = temp;
	3568	+
	3569	+ //assert(hashtable.isEmpty());
	3570	+
	3571	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3572	+ {
	3573	+ tab.graphs[i] = null;
	3574	+ }
	3575	+
	3576	+ SetUndoStates();
	3577	+
	3578	+ // test save
	3579	+ if (false)
	3580	+ {
	3581	+ try
	3582	+ {
	3583	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3584	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3585	+
	3586	+ p.writeObject(copy);
	3587	+
	3588	+ p.flush();
	3589	+
	3590	+ ostream.close();
	3591	+ } catch (Exception e)
	3592	+ {
	3593	+ e.printStackTrace();
	3594	+ }
	3595	+ }
	3596	+ }
	3597	+
	3598	+ void CopyChanged(Object3D obj)
	3599	+ {
	3600	+ SetUndoStates();
	3601	+
	3602	+ boolean temp = CameraPane.SWITCH;
	3603	+ CameraPane.SWITCH = false;
	3604	+
	3605	+ copy.ExtractBigData(hashtable);
	3606	+
	3607	+ copy.clear();
	3608	+
	3609	+ for (int i=0; i<obj.Size(); i++)
	3610	+ {
	3611	+ copy.add(obj.get(i));
	3612	+ }
	3613	+
	3614	+ copy.RestoreBigData(hashtable);
	3615	+
	3616	+ CameraPane.SWITCH = temp;
	3617	+
	3618	+ //assert(hashtable.isEmpty());
	3619	+
	3620	+ copy.Touch();
	3621	+
	3622	+ ResetModel();
	3623	+ copy.HardTouch(); // recompile?
	3624	+
	3625	+ cRadio ab;
	3626	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3627	+ {
	3628	+ ab = (cRadio)e.nextElement();
	3629	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3630	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3631	+ if (test != null)
	3632	+ {
	3633	+ test.editWindow = ab.object.editWindow;
	3634	+ ab.object = test;
	3635	+ }
	3636	+ }
	3637	+
	3638	+ refreshContents();
	3639	+ }
	3640	+
	3641	+ cButton undoButton;
	3642	+ cButton redoButton;
	3643	+
	3644	+ void SetUndoStates()
	3645	+ {
	3646	+ cRadio tab = GetCurrentTab();
	3647	+
	3648	+ undoButton.setEnabled(tab.undoindex > 0);
	3649	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3650	+ }
	3651	+
	3652	+ public void Undo()
	3653	+ {
	3654	+ System.err.println("Undo");
	3655	+
	3656	+ cRadio tab = GetCurrentTab();
	3657	+
	3658	+ if (tab.undoindex == 0)
	3659	+ {
	3660	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3661	+ return;
	3662	+ }
	3663	+
	3664	+ if (tab.graphs[tab.undoindex] == null)
	3665	+ {
	3666	+ Save();
	3667	+ tab.undoindex -= 1;
	3668	+ }
	3669	+
	3670	+ tab.undoindex -= 1;
	3671	+
	3672	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3673	+ }
	3674	+
	3675	+ public void Redo()
	3676	+ {
	3677	+ cRadio tab = GetCurrentTab();
	3678	+
	3679	+ if (tab.graphs[tab.undoindex + 1] == null)
	3680	+ {
	3681	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3682	+ return;
	3683	+ }
	3684	+
	3685	+ tab.undoindex += 1;
	3686	+
	3687	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3688	+ }
	3689	+
	3690	+ void ImportGFD()
	3691	+ {
	3692	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3693	+ browser.show();
	3694	+ String filename = browser.getFile();
	3695	+ if (filename != null && filename.length() > 0)
	3696	+ {
	3697	+ String fullname = browser.getDirectory() + filename;
	3698	+
	3699	+ //Object3D readobj =
	3700	+ objEditor.ReadGFD(fullname, objEditor);
	3701	+ //makeSomething(readobj);
	3702	+ }
	3703	+ }
	3704	+
	3705	+ void ImportVRMLX3D()
	3706	+ {
	3707	+ if (Grafreed.standAlone)
	3708	+ {
	3709	+ /**/
	3710	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3711	+ browser.show();
	3712	+ String filename = browser.getFile();
	3713	+ if (filename != null && filename.length() > 0)
	3714	+ {
	3715	+ String fullname = browser.getDirectory() + filename;
	3716	+ LoadVRMLX3D(fullname);
	3717	+ }
	3718	+ /**/
	3719	+ }
	3720	+ }
	3721	+
3190	3722	void ToggleAnimation()
3191	3723	{
3192	3724	if (!Globals.ANIMATION)
3193	3725	{
3194	3726	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	3727	+ browser.setVisible(true);
3196	3728	String filename = browser.getFile();
3197	3729	if (filename != null && filename.length() > 0)
3198	3730	{
..	..	@@ -3202,8 +3734,8 @@
3202	3734
3203	3735	Globals.ANIMATION ^= true;
3204	3736
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	3737	+ Grafreed.wav.cursor = 0;
	3738	+ Grafreed.wav.loop = 0;
3207	3739	}
3208	3740	} else
3209	3741	{
..	..	@@ -3224,7 +3756,6 @@
3224	3756	callee.refreshContents();
3225	3757	} else
3226	3758	{
3227		- new Exception().printStackTrace();
3228	3759	System.exit(0);
3229	3760	}
3230	3761	}
..	..	@@ -3254,7 +3785,7 @@
3254	3785	void CreateMaterial()
3255	3786	{
3256	3787	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3788	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3789	if (copy.selection.size() > 0)
3259	3790	//SetMaterial(copy);
3260	3791	{
..	..	@@ -3305,7 +3836,7 @@
3305	3836	assert false;
3306	3837	}
3307	3838
3308		- void EditSelection()
	3839	+ void EditSelection(boolean newWindow)
3309	3840	{
3310	3841	}
3311	3842
..	..	@@ -3313,11 +3844,11 @@
3313	3844	{
3314	3845	copy.ResetBlockLoop(); // temporary problem
3315	3846
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	3847	+ boolean random = CameraPane.SWITCH;
	3848	+ CameraPane.SWITCH = false; // parse everything
3318	3849	copy.ResetDisplayList();
3319	3850	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	3851	+ CameraPane.SWITCH = random;
3321	3852	}
3322	3853
3323	3854	// public void applySelf()
..	..	@@ -3391,6 +3922,36 @@
3391	3922	{
3392	3923	//System.out.println("Propagate = " + propagate);
3393	3924	copy.UpdateMaterial(anchor, current, propagate);
	3925	+
	3926	+ if (copy.material != null)
	3927	+ {
	3928	+ cMaterial mat = copy.material;
	3929	+
	3930	+ colorField.SetToolTipValue((mat.color));
	3931	+ modulationField.SetToolTipValue((mat.modulation));
	3932	+ metalnessField.SetToolTipValue((mat.metalness));
	3933	+ diffuseField.SetToolTipValue((mat.diffuse));
	3934	+ specularField.SetToolTipValue((mat.specular));
	3935	+ shininessField.SetToolTipValue((mat.shininess));
	3936	+ shiftField.SetToolTipValue((mat.shift));
	3937	+ ambientField.SetToolTipValue((mat.ambient));
	3938	+ lightareaField.SetToolTipValue((mat.lightarea));
	3939	+ diffusenessField.SetToolTipValue((mat.factor));
	3940	+ velvetField.SetToolTipValue((mat.velvet));
	3941	+ sheenField.SetToolTipValue((mat.sheen));
	3942	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3943	+ backlitField.SetToolTipValue((mat.bump));
	3944	+ anisoField.SetToolTipValue((mat.aniso));
	3945	+ anisoVField.SetToolTipValue((mat.anisoV));
	3946	+ cameraField.SetToolTipValue((mat.cameralight));
	3947	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3948	+ shadowField.SetToolTipValue((mat.shadow));
	3949	+ textureField.SetToolTipValue((mat.texture));
	3950	+ opacityField.SetToolTipValue((mat.opacity));
	3951	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3952	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3953	+ }
	3954	+
3394	3955	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	3956	{
3396	3957	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3506,7 +4067,7 @@
3506	4067	}
3507	4068
3508	4069	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4070	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	4071	}
3511	4072
3512	4073	void SnapObject()
..	..	@@ -3770,6 +4331,8 @@
3770	4331
3771	4332	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	4333	{
	4334	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4335	+ Save();
3773	4336	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	4337	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	4338	// if (thing instanceof GenericJointDemo)
..	..	@@ -3856,6 +4419,12 @@
3856	4419	{
3857	4420	ResetModel();
3858	4421	Select(thing.GetTreePath(), true, false); // unselect... false);
	4422	+
	4423	+ if (thing.Size() == 0)
	4424	+ {
	4425	+ //EditSelection(false);
	4426	+ }
	4427	+
3859	4428	refreshContents();
3860	4429	}
3861	4430
..	..	@@ -3973,6 +4542,7 @@
3973	4542	}
3974	4543	}
3975	4544	}
	4545	+
3976	4546	LoadGFDThread loadGFDThread;
3977	4547
3978	4548	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +4562,10 @@
3992	4562
3993	4563	try
3994	4564	{
	4565	+ // Try compressed version first.
3995	4566	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4567	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4568	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	4569
3998	4570	readobj = (Object3D) p.readObject();
3999	4571	istream.close();
..	..	@@ -4001,7 +4573,20 @@
4001	4573	readobj.ResetDisplayList();
4002	4574	} catch (Exception e)
4003	4575	{
4004		- e.printStackTrace();
	4576	+ //e.printStackTrace();
	4577	+ try
	4578	+ {
	4579	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4580	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4581	+
	4582	+ readobj = (Object3D) p.readObject();
	4583	+ istream.close();
	4584	+
	4585	+ readobj.ResetDisplayList();
	4586	+ } catch (Exception e2)
	4587	+ {
	4588	+ e2.printStackTrace();
	4589	+ }
4005	4590	}
4006	4591	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	4592	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +4632,12 @@
4047	4632
4048	4633	void LoadIt(Object obj)
4049	4634	{
	4635	+ if (obj == null)
	4636	+ {
	4637	+ // Invalid file
	4638	+ return;
	4639	+ }
	4640	+
4050	4641	System.out.println("Loaded " + obj);
4051	4642	//new Exception().printStackTrace();
4052	4643	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,6 +4647,8 @@
4056	4647
4057	4648	if (readobj != null)
4058	4649	{
	4650	+ if (Globals.SAVEONMAKE)
	4651	+ Save();
4059	4652	try
4060	4653	{
4061	4654	//readobj.deepCopySelf(copy);
..	..	@@ -4118,7 +4711,7 @@
4118	4711
4119	4712	void load() // throws ClassNotFoundException
4120	4713	{
4121		- if (GrafreeD.standAlone)
	4714	+ if (Grafreed.standAlone)
4122	4715	{
4123	4716	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4124	4717	browser.show();
..	..	@@ -4205,11 +4798,13 @@
4205	4798	try
4206	4799	{
4207	4800	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4801	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4802	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	4803
4210	4804	p.writeObject(copy);
4211	4805	p.flush();
4212	4806
	4807	+ zstream.close();
4213	4808	ostream.close();
4214	4809
4215	4810	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4219,17 +4814,20 @@
4219	4814	{
4220	4815	}
4221	4816	}
	4817	+
4222	4818	String lastname;
4223	4819
4224	4820	void saveAs()
4225	4821	{
4226		- if (GrafreeD.standAlone)
	4822	+ if (Grafreed.standAlone)
4227	4823	{
4228	4824	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	4825	browser.setVisible(true);
4230	4826	String filename = browser.getFile();
4231	4827	if (filename != null && filename.length() > 0)
4232	4828	{
	4829	+ if (!filename.endsWith(".gfd"))
	4830	+ filename += ".gfd";
4233	4831	lastname = browser.getDirectory() + filename;
4234	4832	save();
4235	4833	}
..	..	@@ -4328,13 +4926,13 @@
4328	4926	try
4329	4927	{
4330	4928	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4929	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4930	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	4931
4334	4932	Object3D objectparent = obj.parent;
4335	4933	obj.parent = null;
4336	4934
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4935	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	4936
4339	4937	obj.parent = objectparent;
4340	4938
..	..	@@ -4346,8 +4944,8 @@
4346	4944	p.writeObject(object);
4347	4945	p.flush();
4348	4946
	4947	+ zstream.close();
4349	4948	ostream.close();
4350		- // zstream.close();
4351	4949
4352	4950	// group.selection.get(0).parent = parent;
4353	4951	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +4966,7 @@
4368	4966	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	4967	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	4968	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	4969	+ if (Grafreed.standAlone)
4372	4970	{
4373	4971	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	4972	browser.show();
..	..	@@ -4394,7 +4992,8 @@
4394	4992	Object3D client;
4395	4993	Object3D copy;
4396	4994	MenuBar menuBar;
4397		- Menu windowMenu;
	4995	+ Menu fileMenu;
	4996	+ MenuItem newItem;
4398	4997	MenuItem loadItem;
4399	4998	MenuItem saveItem;
4400	4999	MenuItem saveAsItem;
..	..	@@ -4402,11 +5001,9 @@
4402	5001	MenuItem reexportItem;
4403	5002	MenuItem povItem;
4404	5003	MenuItem closeItem;
4405		- Menu cameraMenu;
	5004	+
4406	5005	CheckboxMenuItem zBufferItem;
4407	5006	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	5007	MenuItem stepItem;
4411	5008	CheckboxMenuItem toggleLiveItem;
4412	5009	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,25 +5014,38 @@
4417	5014	CheckboxMenuItem toggleFootContactItem;
4418	5015	CheckboxMenuItem toggleDLItem;
4419	5016	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	5017	+ CheckboxMenuItem toggleSwitchItem;
4421	5018	CheckboxMenuItem toggleRootItem;
4422	5019	CheckboxMenuItem animationItem;
4423	5020	CheckboxMenuItem toggleHandleItem;
4424	5021	CheckboxMenuItem togglePaintItem;
4425	5022	JSplitPane mainPanel;
4426	5023	JScrollPane scrollpane;
	5024	+
4427	5025	JPanel toolbarPanel;
4428		- JPanel treePanel;
	5026	+
	5027	+ cGridBag treePanel;
	5028	+
4429	5029	JPanel radioPanel;
4430	5030	ButtonGroup buttonGroup;
4431		- cGridBag ctrlPanel;
	5031	+
	5032	+ cGridBag toolboxPanel;
4432	5033	cGridBag materialPanel;
	5034	+ cGridBag ctrlPanel;
	5035	+
4433	5036	JScrollPane infoPanel;
	5037	+
4434	5038	cGridBag optionsPanel;
	5039	+
4435	5040	JTabbedPane objectPanel;
	5041	+ boolean materialFlushed;
	5042	+ Object3D latestObject;
	5043	+
4436	5044	cGridBag XYZPanel;
	5045	+
4437	5046	JSplitPane gridPanel;
4438	5047	JSplitPane bigPanel;
	5048	+
4439	5049	cGridBag bigThree;
4440	5050	cGridBag scenePanel;
4441	5051	cGridBag centralPanel;
..	..	@@ -4550,8 +5160,13 @@
4550	5160	cNumberSlider fogField;
4551	5161	JLabel opacityPowerLabel;
4552	5162	cNumberSlider opacityPowerField;
4553		- JTree jTree;
	5163	+ cTree jTree;
4554	5164	//ObjectUI parent;
4555	5165
4556	5166	cNumberSlider normalpushField;
	5167	+
	5168	+ private MenuItem importGFDItem;
	5169	+ private MenuItem importVRMLX3DItem;
	5170	+ private MenuItem import3DSItem;
	5171	+ private MenuItem importOBJItem;
4557	5172	}