~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,81 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
38	117
39	118	// SCRIPT
40	119
..	..	@@ -143,7 +222,9 @@
143	222	//nameField.removeActionListener(this);
144	223	// objEditor.ctrlPanel.remove(nameField);
145	224
146		- if (!GroupEditor.allparams)
	225	+ objEditor.ctrlPanel.remove(namePanel);
	226	+
	227	+ if (!allparams)
147	228	return;
148	229
149	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -165,9 +246,9 @@
165	246	// objEditor.ctrlPanel.remove(fasterButton);
166	247	// objEditor.ctrlPanel.remove(remarkButton);
167	248
168		- objEditor.ctrlPanel.remove(namePanel);
169	249	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	250	+ objEditor.ctrlPanel.remove(setupPanel2);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	252	objEditor.ctrlPanel.remove(pushPanel);
172	253	//objEditor.ctrlPanel.remove(fillPanel);
173	254
..	..	@@ -215,6 +296,12 @@
215	296	client = inClient;
216	297	copy = client;
217	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
218	305	// "this" is not called: SetupUI2(objEditor);
219	306	}
220	307
..	..	@@ -228,6 +315,12 @@
228	315	client = inClient;
229	316	copy = client;
230	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
231	324	SetupUI2(callee.GetEditor());
232	325	}
233	326
..	..	@@ -242,6 +335,7 @@
242	335	//localCopy.parent = null;
243	336
244	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
245	339	objEditor = this;
246	340	this.callee = callee;
247	341
..	..	@@ -259,6 +353,12 @@
259	353	copy = localCopy;
260	354	copy.editWindow = this;
261	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
262	362	SetupMenu();
263	363
264	364	//SetupName(objEditor); // new
..	..	@@ -272,28 +372,49 @@
272	372	return frame.action(event, obj);
273	373	}
274	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
275	380	void SetupMenu()
276	381	{
277	382	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..."));
	383	+ menuBar.add(fileMenu = new Menu("File"));
	384	+ fileMenu.add(newItem = new MenuItem("New"));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
	386	+
	387	+ //oe.menuBar.add(menu = new Menu("Include"));
	388	+ Menu menu = new Menu("Import");
	389	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	390	+ importOBJItem.addActionListener(this);
	391	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	392	+ import3DSItem.addActionListener(this);
	393	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	394	+ importVRMLX3DItem.addActionListener(this);
	395	+ menu.add("-");
	396	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	397	+ importGFDItem.addActionListener(this);
	398	+ fileMenu.add(menu);
	399	+ fileMenu.add("-");
	400	+
	401	+ fileMenu.add(saveItem = new MenuItem("Save"));
	402	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	403	//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("-");
	404	+ fileMenu.add("-");
	405	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	406	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	407	+ fileMenu.add("-");
288	408	if (client.parent != null)
289	409	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	410	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	411	} else
292	412	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	413	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	414	}
295	415
296		- loadItem.addActionListener(this);
	416	+ newItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
297	418	saveItem.addActionListener(this);
298	419	saveAsItem.addActionListener(this);
299	420	exportAsItem.addActionListener(this);
..	..	@@ -301,82 +422,69 @@
301	422	//povItem.addActionListener(this);
302	423	closeItem.addActionListener(this);
303	424
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	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
360	452	toolbarPanel = new JPanel();
361	453	toolbarPanel.setName("Toolbar");
362		- treePanel = new JPanel();
	454	+
	455	+ treePanel = new cGridBag();
363	456	treePanel.setName("Tree");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
364	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
366		- materialPanel = new cGridBag().setVertical(true);
367		- materialPanel.setName("Material");
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
	472	+
368	473	/JTextPane/
369	474	infoarea = createTextPane();
	475	+ doc = infoarea.getStyledDocument();
	476	+
370	477	infoarea.setEditable(true);
371	478	SetText();
	479	+
372	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373	481	// infoarea.setOpaque(false);
374	482	// //infoarea.setForeground(textcolor);
375		- infoarea.setLineWrap(true);
376		- infoarea.setWrapStyleWord(true);
	483	+// TEXTAREA infoarea.setLineWrap(true);
	484	+// TEXTAREA infoarea.setWrapStyleWord(true);
377	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
378		- infoPanel.setPreferredSize(new Dimension(50, 200));
379		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
380	488	//infoPanel.setLayout(new BorderLayout());
381	489	//infoPanel.add(createTextPane());
382	490
..	..	@@ -384,14 +492,21 @@
384	492	mainPanel.setName("Main");
385	493	mainPanel.setContinuousLayout(true);
386	494	mainPanel.setOneTouchExpandable(true);
387		- mainPanel.setDividerLocation(1.0);
388	495	mainPanel.setDividerSize(9);
389		- mainPanel.setResizeWeight(0);
390		-
	496	+ mainPanel.setDividerLocation(0.5); //1.0);
	497	+ mainPanel.setResizeWeight(0.5);
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
391	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392	507	//mainPanel.setLayout(new GridBagLayout());
393	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394		- treePanel.setLayout(new GridBagLayout());
	509	+// treePanel.setLayout(new GridBagLayout());
395	510	//ctrlPanel.setLayout(new GridBagLayout());
396	511	//materialPanel.setLayout(new GridBagLayout());
397	512
..	..	@@ -432,7 +547,7 @@
432	547	static String newline = "\n";
433	548	protected static final String buttonString = "JButton";
434	549	StyledDocument doc;
435		- JTextArea infoarea;
	550	+ JTextPane infoarea;
436	551
437	552	void ClearInfo()
438	553	{
..	..	@@ -455,10 +570,10 @@
455	570	e.printStackTrace();
456	571	}
457	572
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();
	573	+// String selection = infoarea.getText();
	574	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	575	+// java.awt.datatransfer.Clipboard clipboard =
	576	+// Toolkit.getDefaultToolkit().getSystemClipboard();
462	577	//clipboard.setContents(data, data);
463	578	}
464	579
..	..	@@ -481,13 +596,13 @@
481	596	//SendInfo("Name:", "bold");
482	597	if (sel.GetTextures() != null \|\| debug)
483	598	{
484		- si.SendInfo(sel.toString(), "bold");
	599	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485	600	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486	601	if (sel.Size() > 0)
487	602	{
488	603	si.SendInfo("#children = " + sel.Size(), "regular");
489	604	}
490		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	605	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491	606	if (debug)
492	607	{
493	608	try
..	..	@@ -499,7 +614,10 @@
499	614	}
500	615
501	616	if (full)
502		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	617	+ {
	618	+ si.SendInfo(" BBox min: " + minima, "regular");
	619	+ si.SendInfo(" BBox max: " + maxima, "regular");
	620	+ }
503	621
504	622	if (sel.bRep != null)
505	623	{
..	..	@@ -526,7 +644,7 @@
526	644	}
527	645	if (sel.support != null)
528	646	{
529		- si.SendInfo(" support: " + sel.support, "regular");
	647	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530	648	}
531	649	if (sel.scriptnode != null)
532	650	{
..	..	@@ -597,6 +715,9 @@
597	715	{
598	716	CameraPane.pointflow = (PointFlow) sel;
599	717	}
	718	+
	719	+ si.SendInfo("_____________________", "regular");
	720	+ si.SendInfo("", "regular");
600	721	}
601	722	}
602	723
..	..	@@ -612,68 +733,192 @@
612	733	}
613	734	}
614	735
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	738	+
	739	+ Rectangle keeprect;
	740	+ cRadio radio;
	741	+
	742	+cButton keepButton;
	743	+ cButton twoButton; // Full 3D
	744	+ cButton sixButton;
	745	+ cButton threeButton;
	746	+ cButton sevenButton;
	747	+ cButton fourButton; // full panel
	748	+ cButton oneButton; // full XYZ
	749	+ //cButton currentLayout;
	750	+
	751	+ boolean maximized;
	752	+
	753	+ cButton fullscreenLayout;
	754	+
	755	+ void Minimize()
	756	+ {
	757	+ frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
	759	+ }
	760	+
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	764	+ void Maximize()
	765	+ {
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
	771	+ if (maximized)
	772	+ {
	773	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	774	+ }
	775	+ else
	776	+ {
	777	+ keeprect = frame.getBounds();
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	781	+// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	783	+ }
	784	+
	785	+ maximized ^= true;
	786	+
	787	+ frame.validate();
	788	+ }
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
	793	+
615	794	void ToggleFullScreen()
616	795	{
617		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
618	801	{
619		- frame.getContentPane().remove(/"Center",/bigThree);
620		- framePanel.add(bigThree);
621		- frame.getContentPane().add(/"Center",/framePanel);
	802	+ device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
	808	+ //frame.setVisible(false);
	809	+// frame.removeNotify();
	810	+// frame.setUndecorated(false);
	811	+// frame.addNotify();
	812	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	813	+
	814	+// X frame.getContentPane().remove(/"Center",/bigThree);
	815	+// X framePanel.add(bigThree);
	816	+// X frame.getContentPane().add(/"Center",/framePanel);
	817	+ framePanel.setDividerLocation(46);
	818	+
	819	+ //frame.setVisible(true);
	820	+ radio.layout = keepButton;
	821	+ //theFrame = null;
	822	+ keepButton = null;
	823	+ radio.layout.doClick();
	824	+
622	825	} else
623	826	{
624		- frame.getContentPane().remove(/"Center",/framePanel);
625		- framePanel.remove(bigThree);
626		- frame.getContentPane().add(/"Center",/bigThree);
	827	+ keepButton = radio.layout;
	828	+ //keeprect = frame.getBounds();
	829	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	830	+// frame.getToolkit().getScreenSize().height);
	831	+ //frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
	835	+ device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
	838	+// frame.removeNotify();
	839	+// frame.setUndecorated(true);
	840	+// frame.addNotify();
	841	+// X frame.getContentPane().remove(/"Center",/framePanel);
	842	+// X framePanel.remove(bigThree);
	843	+// X frame.getContentPane().add(/"Center",/bigThree);
	844	+ framePanel.setDividerLocation(0);
	845	+
	846	+ radio.layout = fullscreenLayout;
	847	+ radio.layout.doClick();
	848	+ //frame.setVisible(true);
627	849	}
628		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
629	851	}
630	852
631		- private JTextArea createTextPane()
	853	+ private Object3D CompressCopy()
632	854	{
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		- };
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versionlist;
	862	+ copy.versionlist = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versionlist = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
648	875
649		- String[] initStyles =
650		- {
651		- "regular", "italic", "bold", "small", "large",
652		- "regular", "button", "regular", "icon",
653		- "regular"
654		- };
	876	+ private JTextPane createTextPane()
	877	+ {
	878	+// TEXTAREA String[] initString =
	879	+// {
	880	+// "This is an editable JTextPane, ", //regular
	881	+// "another ", //italic
	882	+// "styled ", //bold
	883	+// "text ", //small
	884	+// "component, ", //large
	885	+// "which supports embedded components..." + newline,//regular
	886	+// " " + newline, //button
	887	+// "...and embedded icons..." + newline, //regular
	888	+// " ", //icon
	889	+// newline + "JTextPane is a subclass of JEditorPane that "
	890	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	891	+// + "cover methods for interacting with those objects."
	892	+// };
	893	+//
	894	+// String[] initStyles =
	895	+// {
	896	+// "regular", "italic", "bold", "small", "large",
	897	+// "regular", "button", "regular", "icon",
	898	+// "regular"
	899	+// };
	900	+//
	901	+// JTextPane textPane = new JTextPane();
	902	+// textPane.setEditable(true);
	903	+// /StyledDocument/ doc = textPane.getStyledDocument();
	904	+// addStylesToDocument(doc);
	905	+//
	906	+// try
	907	+// {
	908	+// for (int j = 0; j < 2; j++)
	909	+// {
	910	+// for (int i = 0; i < initString.length; i++)
	911	+// {
	912	+// doc.insertString(doc.getLength(), initString[i],
	913	+// doc.getStyle(initStyles[i]));
	914	+// }
	915	+// }
	916	+// } catch (BadLocationException ble)
	917	+// {
	918	+// System.err.println("Couldn't insert initial text into text pane.");
	919	+// }
655	920
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;
	921	+ return new JTextPane(); // textPane;
677	922	}
678	923
679	924	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +971,7 @@
726	971	protected static ImageIcon createImageIcon(String path,
727	972	String description)
728	973	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	974	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	975	if (imgURL != null)
731	976	{
732	977	return new ImageIcon(imgURL, description);
..	..	@@ -749,6 +994,7 @@
749	994	{
750	995	SetupMaterial(materialPanel);
751	996	}
	997	+
752	998	//SetupName();
753	999	//SetupViews();
754	1000	}
..	..	@@ -758,6 +1004,7 @@
758	1004	// NumberSlider vDivsField;
759	1005	// JCheckBox endcaps;
760	1006	JCheckBox liveCB;
	1007	+ JCheckBox selectableCB;
761	1008	JCheckBox hideCB;
762	1009	JCheckBox link2masterCB;
763	1010	JCheckBox markCB;
..	..	@@ -765,7 +1012,12 @@
765	1012	JCheckBox speedupCB;
766	1013	JCheckBox rewindCB;
767	1014	JCheckBox flipVCB;
	1015	+
	1016	+ cCheckBox toggleTextureCB;
	1017	+ cCheckBox toggleSwitchCB;
	1018	+
768	1019	JComboBox texresMenu;
	1020	+
769	1021	JButton resetButton;
770	1022	JButton stepButton;
771	1023	JButton stepAllButton;
..	..	@@ -774,9 +1026,13 @@
774	1026	JButton fasterButton;
775	1027	JButton remarkButton;
776	1028
	1029	+ cGridBag editPanel;
	1030	+ cGridBag editCommandsPanel;
	1031	+
777	1032	cGridBag namePanel;
778	1033	cGridBag setupPanel;
779		- cGridBag commandsPanel;
	1034	+ cGridBag setupPanel2;
	1035	+ cGridBag objectCommandsPanel;
780	1036	cGridBag pushPanel;
781	1037	cGridBag fillPanel;
782	1038
..	..	@@ -943,52 +1199,76 @@
943	1199
944	1200	void SetupUI2(ObjEditor oe)
945	1201	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	1202	//SetupName(oe);
951	1203
952	1204	namePanel = new cGridBag();
953	1205
954	1206	nameField = AddText(namePanel, copy.GetName());
955		- namePanel.add(nameField);
	1207	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
956	1208	oe.ctrlPanel.add(namePanel);
957	1209
958	1210	oe.ctrlPanel.Return();
959	1211
960		- if (!GroupEditor.allparams)
	1212	+ if (!allparams)
961	1213	return;
962	1214
963	1215	setupPanel = new cGridBag().setVertical(false);
964	1216
965	1217	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1218	+ liveCB.setToolTipText("Animate object");
	1219	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1220	+ selectableCB.setToolTipText("Make object selectable");
968	1221	// Return();
	1222	+
	1223	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1224	+ hideCB.setToolTipText("Hide object");
969	1225	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1226	+ markCB.setToolTipText("As animation target transform");
	1227	+
	1228	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1229	+
	1230	+ setupPanel2 = new cGridBag().setVertical(false);
	1231	+
	1232	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1233	+ rewindCB.setToolTipText("Rewind animation");
	1234	+
	1235	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1236	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
972	1237
	1238	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1239	+ link2masterCB.setToolTipText("Attach to support");
	1240	+
	1241	+ if (Globals.ADVANCED)
	1242	+ {
	1243	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1244	+ speedupCB.setToolTipText("Option motion capture");
	1245	+ }
	1246	+
973	1247	oe.ctrlPanel.add(setupPanel);
974	1248	oe.ctrlPanel.Return();
	1249	+ oe.ctrlPanel.add(setupPanel2);
	1250	+ oe.ctrlPanel.Return();
975	1251
976		- commandsPanel = new cGridBag().setVertical(false);
	1252	+ objectCommandsPanel = new cGridBag().setVertical(false);
977	1253
978		- resetButton = AddButton(commandsPanel, "Reset");
979		- stepButton = AddButton(commandsPanel, "Step");
	1254	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1255	+ resetButton.setToolTipText("Jump to frame zero");
	1256	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1257	+ stepButton.setToolTipText("Step one frame");
980	1258	// resetAllButton = AddButton(oe, "Reset All");
981	1259	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	1260	// Return();
984		- slowerButton = AddButton(commandsPanel, "Slow");
985		- fasterButton = AddButton(commandsPanel, "Fast");
986		- remarkButton = AddButton(commandsPanel, "Remark");
	1261	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1262	+ slowerButton.setToolTipText("Decrease animation speed");
	1263	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1264	+ fasterButton.setToolTipText("Increase animation speed");
	1265	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1266	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1267
988		- oe.ctrlPanel.add(commandsPanel);
	1268	+ oe.ctrlPanel.add(objectCommandsPanel);
989	1269	oe.ctrlPanel.Return();
990	1270
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1271	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	1272	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	1273	//Return();
994	1274
..	..	@@ -1191,8 +1471,11 @@
1191	1471	//worldPanel.setName("World");
1192	1472	centralPanel = new cGridBag();
1193	1473	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1474	+
	1475	+ if (Globals.ADVANCED)
	1476	+ {
	1477	+ timelinePanel = new JPanel(new BorderLayout());
	1478	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1479
1197	1480	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1481	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1484,10 @@
1201	1484	// cameraPanel.setDividerSize(9);
1202	1485	cameraPanel.setResizeWeight(1.0);
1203	1486
	1487	+ }
	1488	+
1204	1489	centralPanel.add(cameraView);
	1490	+ centralPanel.setFocusable(true);
1205	1491	//frame.setJMenuBar(timelineMenubar);
1206	1492	//centralPanel.add(timelinePanel);
1207	1493
..	..	@@ -1227,6 +1513,7 @@
1227	1513	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1228	1514	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1229	1515	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1516	+ //XYZPanel.setName("XYZ");
1230	1517
1231	1518	/*
1232	1519	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1264,12 +1551,29 @@
1264	1551	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1552	//tmp.setName("Edit");
1266	1553	objectPanel.add(materialPanel);
	1554	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1555	+ objectPanel.setToolTipTextAt(0, "Material");
	1556	+
1267	1557	// JPanel north = new JPanel(new BorderLayout());
1268	1558	// north.setName("Edit");
1269	1559	// north.add(ctrlPanel, BorderLayout.NORTH);
1270	1560	// objectPanel.add(north);
1271		- objectPanel.add(ctrlPanel);
1272		- objectPanel.add(infoPanel);
	1561	+ objectPanel.add(editPanel);
	1562	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1563	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1564	+
	1565	+ //if (Globals.ADVANCED)
	1566	+ objectPanel.add(infoPanel);
	1567	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1568	+ objectPanel.setToolTipTextAt(2, "Information");
	1569	+
	1570	+ objectPanel.add(XYZPanel);
	1571	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1572	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
	1573	+
	1574	+ objectPanel.add(toolboxPanel);
	1575	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1576	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1273	1577
1274	1578	/*
1275	1579	aConstraints.gridx = 0;
..	..	@@ -1278,7 +1582,7 @@
1278	1582	aConstraints.gridy += 1;
1279	1583	aConstraints.gridwidth = 1;
1280	1584	mainPanel.add(objectPanel, aConstraints);
1281		- */
	1585	+ */
1282	1586
1283	1587	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1284	1588	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1290,14 +1594,12 @@
1290	1594	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1595
1292	1596	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1597	+ scenePanel.preferredWidth = 5;
1294	1598
1295	1599	JTabbedPane tabbedPane = new JTabbedPane();
1296	1600	tabbedPane.add(scrollpane);
1297	1601
1298		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1299		-
1300		- optionsPanel = new cGridBag().setVertical(true);
	1602	+ optionsPanel = new cGridBag().setVertical(false);
1301	1603
1302	1604	optionsPanel.setName("Options");
1303	1605
..	..	@@ -1305,6 +1607,8 @@
1305	1607
1306	1608	tabbedPane.add(optionsPanel);
1307	1609
	1610	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1611	+
1308	1612	scenePanel.add(tabbedPane);
1309	1613
1310	1614	/*
..	..	@@ -1368,7 +1672,7 @@
1368	1672	bigThree = new cGridBag();
1369	1673	bigThree.addComponent(scenePanel);
1370	1674	bigThree.addComponent(centralPanel);
1371		- bigThree.addComponent(XYZPanel);
	1675	+ //bigThree.addComponent(XYZPanel);
1372	1676
1373	1677	// // SIDE EFFECT!!!
1374	1678	// aConstraints.gridx = 0;
..	..	@@ -1377,9 +1681,9 @@
1377	1681	// aConstraints.gridheight = 1;
1378	1682
1379	1683	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1380		- framePanel.setContinuousLayout(true);
1381		- framePanel.setOneTouchExpandable(true);
1382		- framePanel.setDividerLocation(0.8);
	1684	+ framePanel.setContinuousLayout(false);
	1685	+ framePanel.setOneTouchExpandable(false);
	1686	+ //.setDividerLocation(0.8);
1383	1687	//framePanel.setDividerSize(15);
1384	1688	//framePanel.setResizeWeight(0.15);
1385	1689	framePanel.setName("Frame");
..	..	@@ -1396,15 +1700,19 @@
1396	1700
1397	1701	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1702
1399		- frame.setSize(1024, 768);
1400		- frame.show();
1401		-
	1703	+ frame.setSize(1280, 860);
	1704	+
	1705	+ cameraView.requestFocusInWindow();
	1706	+
1402	1707	gridPanel.setDividerLocation(1.0);
	1708	+
	1709	+ frame.validate();
	1710	+
	1711	+ frame.setVisible(true);
1403	1712
1404	1713	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1405	1714	frame.addWindowListener(new WindowAdapter()
1406	1715	{
1407		-
1408	1716	public void windowClosing(WindowEvent e)
1409	1717	{
1410	1718	Close();
..	..	@@ -1427,26 +1735,78 @@
1427	1735	ctrlPanel.removeAll();
1428	1736	}
1429	1737
1430		- void SetupMaterial(cGridBag panel)
	1738	+ void SetupMaterial(cGridBag materialpanel)
1431	1739	{
1432		- /*
	1740	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1741	+ cLabel label = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1742	+ label.addMouseListener(new MouseAdapter()
	1743	+ {
	1744	+ public void mouseClicked(MouseEvent e)
	1745	+ {
	1746	+ colorField.setFloat(0);
	1747	+ saturationField.setFloat(1);
	1748	+ materialtouched = true;
	1749	+ applySelf();
	1750	+ }
	1751	+ });
	1752	+ presetpanel.add(label);
	1753	+
	1754	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF));
	1755	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1756	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1757	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1758	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1759	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1760	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1761	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1762	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1763	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1764	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1765	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1766	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1767	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1768	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1769	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1770	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1771	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF));
	1772	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00019.png", !Grafreed.NIMBUSLAF));
	1773	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00020.png", !Grafreed.NIMBUSLAF));
	1774	+
	1775	+ cGridBag panel = new cGridBag().setVertical(true);
	1776	+
	1777	+ presetpanel.preferredWidth = 1;
	1778	+
	1779	+ materialpanel.add(panel);
	1780	+ materialpanel.add(presetpanel);
	1781	+
	1782	+ panel.preferredWidth = 8;
	1783	+
	1784	+ /*
1433	1785	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1434	1786	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1435		- */
	1787	+ */
1436	1788
1437	1789	cGridBag editBar = new cGridBag().setVertical(false);
1438	1790
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1791	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1792	+ createMaterialButton.setToolTipText("Create material");
1440	1793
1441	1794	/*
1442	1795	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	1796	*/
1444	1797
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);
	1798	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1799	+ clearMaterialButton.setToolTipText("Clear material");
	1800	+
	1801	+ if (Globals.ADVANCED)
	1802	+ {
	1803	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1804	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1805	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1806	+ }
1449	1807
	1808	+ editBar.preferredHeight = 15;
	1809	+
1450	1810	panel.add(editBar);
1451	1811
1452	1812	/**/
..	..	@@ -1458,45 +1818,50 @@
1458	1818	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1459	1819
1460	1820	cGridBag colorSection = new cGridBag().setVertical(true);
	1821	+
	1822	+ cGridBag huepanel = new cGridBag();
	1823	+ cGridBag huelabel = new cGridBag();
	1824	+ label = GetLabel("icons/hue.png", false);
	1825	+ label.fit = true;
	1826	+ huelabel.add(label);
	1827	+ huelabel.preferredWidth = 20;
	1828	+ huepanel.add(new cGridBag()); // Label
	1829	+ huepanel.add(huelabel); // Field/slider
	1830	+
	1831	+ huepanel.preferredHeight = 7;
	1832	+
	1833	+ colorSection.add(huepanel);
1461	1834
1462	1835	cGridBag color = new cGridBag();
1463		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1464		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1465		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1836	+
	1837	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1838	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1839	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1840	+
1466	1841	//colorField.preferredWidth = 200;
1467	1842	colorSection.add(color);
1468	1843
1469	1844	cGridBag modulation = new cGridBag();
1470	1845	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1471	1846	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1847	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1473	1848	colorSection.add(modulation);
1474	1849
	1850	+ cGridBag opacity = new cGridBag();
	1851	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1852	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1853	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1854	+ colorSection.add(opacity);
	1855	+
	1856	+ colorSection.add(GetSeparator());
	1857	+
1475	1858	cGridBag texture = new cGridBag();
1476	1859	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1477	1860	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478	1861	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479	1862	colorSection.add(texture);
1480	1863
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		-
1499		- panel.add(new JSeparator());
	1864	+ panel.add(GetSeparator());
1500	1865
1501	1866	panel.add(colorSection);
1502	1867
..	..	@@ -1546,7 +1911,13 @@
1546	1911	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1547	1912	diffuseSection.add(fakedepth);
1548	1913
1549		- panel.add(new JSeparator());
	1914	+ cGridBag shadowbias = new cGridBag();
	1915	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1916	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1917	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1918	+ diffuseSection.add(shadowbias);
	1919	+
	1920	+ panel.add(GetSeparator());
1550	1921
1551	1922	panel.add(diffuseSection);
1552	1923
..	..	@@ -1596,42 +1967,48 @@
1596	1967	// aConstraints.gridy += 1;
1597	1968	// aConstraints.gridwidth = 1;
1598	1969
	1970	+ cGridBag anisoU = new cGridBag();
	1971	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1972	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1973	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1974	+ specularSection.add(anisoU);
1599	1975
1600		- panel.add(new JSeparator());
	1976	+ cGridBag anisoV = new cGridBag();
	1977	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1978	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1979	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1980	+ specularSection.add(anisoV);
	1981	+
	1982	+
	1983	+ panel.add(GetSeparator());
1601	1984
1602	1985	panel.add(specularSection);
1603	1986
1604	1987	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1605	1988
1606		- cGridBag globalSection = new cGridBag().setVertical(true);
	1989	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1607	1990
1608	1991	cGridBag camera = new cGridBag();
1609	1992	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1610	1993	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611	1994	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612		- globalSection.add(camera);
	1995	+ colorSection.add(camera);
1613	1996
1614	1997	cGridBag ambient = new cGridBag();
1615	1998	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1616	1999	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617	2000	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1618		- globalSection.add(ambient);
	2001	+ colorSection.add(ambient);
1619	2002
1620	2003	cGridBag backlit = new cGridBag();
1621	2004	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1622	2005	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	2006	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1624		- globalSection.add(backlit);
	2007	+ colorSection.add(backlit);
1625	2008
1626		- cGridBag opacity = new cGridBag();
1627		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1628		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1629		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1630		- globalSection.add(opacity);
1631		-
1632		- panel.add(new JSeparator());
	2009	+ //panel.add(new JSeparator());
1633	2010
1634		- panel.add(globalSection);
	2011	+ //panel.add(globalSection);
1635	2012
1636	2013	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1637	2014
..	..	@@ -1673,7 +2050,7 @@
1673	2050	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1674	2051	textureSection.add(opacityPower);
1675	2052
1676		- panel.add(new JSeparator());
	2053	+ panel.add(GetSeparator());
1677	2054
1678	2055	panel.add(textureSection);
1679	2056
..	..	@@ -1712,12 +2089,15 @@
1712	2089	opacityPowerField.addChangeListener(this);
1713	2090	/**/
1714	2091
1715		- resetSlidersButton.addActionListener(this);
1716	2092	clearMaterialButton.addActionListener(this);
1717	2093	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	2094	+
	2095	+ if (Globals.ADVANCED)
	2096	+ {
	2097	+ resetSlidersButton.addActionListener(this);
	2098	+ propagateToggle.addItemListener(this);
	2099	+ multiplyToggle.addItemListener(this);
	2100	+ }
1721	2101	}
1722	2102
1723	2103	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1735,8 +2115,9 @@
1735	2115	// 3D models
1736	2116	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1737	2117	{
1738		- lastConverter = new com.jmex.model.converters.MaxToJme();
1739		- LoadFile(filename, lastConverter);
	2118	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2119	+ //LoadFile(filename, lastConverter);
	2120	+ LoadObjFile(filename); // New 3ds loader
1740	2121	continue;
1741	2122	}
1742	2123	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1888,7 +2269,7 @@
1888	2269
1889	2270	//? flashIt = false;
1890	2271	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	2272	+ pane.clickStart(location.x, location.y, 0, 0);
1892	2273	pane.clickEnd(location.x, location.y, 0, true);
1893	2274
1894	2275	if (group.selection.size() == 1)
..	..	@@ -1937,6 +2318,7 @@
1937	2318	e2.printStackTrace();
1938	2319	}
1939	2320	}
	2321	+
1940	2322	LoadJMEThread loadThread;
1941	2323
1942	2324	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +2376,7 @@
1994	2376	//LoadFile0(filename, converter);
1995	2377	}
1996	2378	}
	2379	+
1997	2380	LoadOBJThread loadObjThread;
1998	2381
1999	2382	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2455,19 @@
2072	2455
2073	2456	void LoadObjFile(String fullname)
2074	2457	{
2075		- /*
	2458	+ System.out.println("Loading " + fullname);
	2459	+ /**/
2076	2460	//lastFilename = fullname;
2077	2461	if(loadObjThread == null)
2078	2462	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2463	+ loadObjThread = new LoadOBJThread();
	2464	+ loadObjThread.start();
2081	2465	}
2082	2466
2083	2467	loadObjThread.add(fullname);
2084		- */
	2468	+ /**/
2085	2469
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2470	+ //makeSomething(new FileObject(fullname, true), true);
2088	2471	}
2089	2472
2090	2473	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +2728,11 @@
2345	2728
2346	2729	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2730	{
2348		- if (GrafreeD.standAlone)
	2731	+ if (Grafreed.standAlone)
2349	2732	{
2350	2733	/**/
2351	2734	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2735	+ browser.setVisible(true);
2353	2736	String filename = browser.getFile();
2354	2737	if (filename != null && filename.length() > 0)
2355	2738	{
..	..	@@ -2460,6 +2843,7 @@
2460	2843	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	2844	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	2845	}
	2846	+
2463	2847	//cJME.count++;
2464	2848	//cJME.count %= 12;
2465	2849	if (gc)
..	..	@@ -2643,6 +3027,7 @@
2643	3027	}
2644	3028	}
2645	3029	}
	3030	+
2646	3031	cFileSystemPane FSPane;
2647	3032
2648	3033	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2652,7 +3037,7 @@
2652	3037
2653	3038	freezematerial = true;
2654	3039	colorField.setFloat(mat.color);
2655		- modulationField.setFloat(mat.modulation);
	3040	+ saturationField.setFloat(mat.modulation);
2656	3041	metalnessField.setFloat(mat.metalness);
2657	3042	diffuseField.setFloat(mat.diffuse);
2658	3043	specularField.setFloat(mat.specular);
..	..	@@ -2696,11 +3081,14 @@
2696	3081	}
2697	3082	}
2698	3083	}
	3084	+
2699	3085	freezematerial = false;
2700	3086	}
2701	3087
2702	3088	void SetMaterial(Object3D object)
2703	3089	{
	3090	+ latestObject = object;
	3091	+
2704	3092	cMaterial mat = object.material;
2705	3093
2706	3094	if (mat == null)
..	..	@@ -2709,7 +3097,8 @@
2709	3097	return;
2710	3098	}
2711	3099
2712		- multiplyToggle.setSelected(mat.multiply);
	3100	+ if (multiplyToggle != null)
	3101	+ multiplyToggle.setSelected(mat.multiply);
2713	3102
2714	3103	assert (object.projectedVertices != null);
2715	3104
..	..	@@ -2811,12 +3200,17 @@
2811	3200	// }
2812	3201
2813	3202	/**/
2814		- if (deselect)
	3203	+ if (deselect \|\| child == null)
2815	3204	{
2816	3205	//group.deselectAll();
2817	3206	//freeze = true;
2818	3207	GetTree().clearSelection();
2819	3208	//freeze = false;
	3209	+
	3210	+ if (child == null)
	3211	+ {
	3212	+ return;
	3213	+ }
2820	3214	}
2821	3215
2822	3216	//group.addSelectee(child);
..	..	@@ -2885,7 +3279,7 @@
2885	3279	cameraView.ToggleDL();
2886	3280	cameraView.repaint();
2887	3281	return;
2888		- } else if (event.getSource() == toggleTextureItem)
	3282	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2889	3283	{
2890	3284	cameraView.ToggleTexture();
2891	3285	// june 2013 copy.HardTouch();
..	..	@@ -2924,9 +3318,9 @@
2924	3318	frame.validate();
2925	3319
2926	3320	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	3321	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2928	3322	{
2929		- cameraView.ToggleRandom();
	3323	+ cameraView.ToggleSwitch();
2930	3324	cameraView.repaint();
2931	3325	return;
2932	3326	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2954,12 +3348,17 @@
2954	3348	} else if (event.getSource() == liveCB)
2955	3349	{
2956	3350	copy.live ^= true;
	3351	+ objEditor.refreshContents(true); // To show item colors
	3352	+ return;
	3353	+ } else if (event.getSource() == selectableCB)
	3354	+ {
	3355	+ copy.dontselect ^= true;
2957	3356	return;
2958	3357	} else if (event.getSource() == hideCB)
2959	3358	{
2960	3359	copy.hide ^= true;
2961	3360	copy.Touch(); // display list issue
2962		- objEditor.refreshContents();
	3361	+ objEditor.refreshContents(true); // To show item colors
2963	3362	return;
2964	3363	} else if (event.getSource() == link2masterCB)
2965	3364	{
..	..	@@ -2969,6 +3368,7 @@
2969	3368	if (event.getSource() == randomCB)
2970	3369	{
2971	3370	copy.random ^= true;
	3371	+ objEditor.refreshContents();
2972	3372	return;
2973	3373	}
2974	3374	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3392,9 @@
2992	3392
2993	3393	public void actionPerformed(ActionEvent event)
2994	3394	{
	3395	+ Object source = event.getSource();
2995	3396	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3397	+ if (source == okbutton)
2997	3398	{
2998	3399	textpanel.setVisible(false);
2999	3400	textpanel.remove(textarea);
..	..	@@ -3005,7 +3406,7 @@
3005	3406	textarea = null;
3006	3407	textpanel = null;
3007	3408	}
3008		- if (event.getSource() == cancelbutton)
	3409	+ if (source == cancelbutton)
3009	3410	{
3010	3411	textpanel.setVisible(false);
3011	3412	textpanel.remove(textarea);
..	..	@@ -3017,50 +3418,50 @@
3017	3418	//applySelf();
3018	3419	//client.refreshEditWindow();
3019	3420	//refreshContents();
3020		- if (event.getSource() == nameField)
	3421	+ if (source == nameField)
3021	3422	{
3022	3423	//System.out.println("ObjEditor " + event);
3023	3424	applySelf0(true);
3024	3425	//parent.applySelf();
3025	3426	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3427	+ } else if (source == resetButton)
3027	3428	{
3028	3429	CameraPane.fullreset = true;
3029	3430	copy.Reset(); // ResetMeshes();
3030	3431	copy.Touch();
3031	3432	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3433	+ } else if (source == stepItem)
3033	3434	{
3034	3435	//cameraView.ONESTEP = true;
3035	3436	Globals.ONESTEP = true;
3036	3437	cameraView.repaint();
3037	3438	return;
3038		- } else if (event.getSource() == stepButton)
	3439	+ } else if (source == stepButton)
3039	3440	{
3040	3441	copy.Step();
3041	3442	copy.Touch();
3042	3443	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3444	+ } else if (source == slowerButton)
3044	3445	{
3045	3446	copy.Slower();
3046	3447	copy.Touch();
3047	3448	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3449	+ } else if (source == fasterButton)
3049	3450	{
3050	3451	copy.Faster();
3051	3452	copy.Touch();
3052	3453	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3454	+ } else if (source == remarkButton)
3054	3455	{
3055	3456	copy.Remark();
3056	3457	copy.Touch();
3057	3458	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3459	+ } else if (source == stepAllButton)
3059	3460	{
3060	3461	copy.StepAll();
3061	3462	copy.Touch();
3062	3463	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3464	+ } else if (source == resetAllButton)
3064	3465	{
3065	3466	//CameraPane.fullreset = true;
3066	3467	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3494,79 @@
3093	3494	// Close();
3094	3495	// }
3095	3496	// else
3096		- if (event.getSource() == resetSlidersButton)
	3497	+ if (source == resetSlidersButton)
3097	3498	{
3098	3499	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3500	+ } else if (source == clearMaterialButton)
3100	3501	{
3101	3502	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3503	+ } else if (source == createMaterialButton)
3103	3504	{
3104	3505	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3506	+ } else if (source == clearPanelButton)
3106	3507	{
3107	3508	copy.ClearUI();
3108	3509	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	3510	+ } else if (source == importGFDItem)
	3511	+ {
	3512	+ ImportGFD();
	3513	+ } else
	3514	+ if (source == importVRMLX3DItem)
	3515	+ {
	3516	+ ImportVRMLX3D();
	3517	+ } else
	3518	+ if (source == import3DSItem)
	3519	+ {
	3520	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3521	+ } else
	3522	+ if (source == importOBJItem)
	3523	+ {
	3524	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3525	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3526	+ browser.setVisible(true);
	3527	+ String filename = browser.getFile();
	3528	+ if (filename != null && filename.length() > 0)
	3529	+ {
	3530	+ String fullname = browser.getDirectory() + filename;
	3531	+ makeSomething(ReadOBJ(fullname), true);
	3532	+ }
	3533	+ } else
	3534	+ if (source == closeItem)
3115	3535	{
3116	3536	Close();
3117	3537	//return true;
3118		- } else if (event.getSource() == loadItem)
	3538	+ } else if (source == openItem)
3119	3539	{
3120		- load();
	3540	+ Open();
3121	3541	//return true;
3122		- } else if (event.getSource() == saveItem)
	3542	+ } else if (source == newItem)
	3543	+ {
	3544	+ New();
	3545	+ } else if (source == saveItem)
3123	3546	{
3124	3547	save();
3125	3548	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	3549	+ } else if (source == saveAsItem)
3127	3550	{
3128	3551	saveAs();
3129	3552	//return true;
3130		- } else if (event.getSource() == reexportItem)
	3553	+ } else if (source == reexportItem)
3131	3554	{
3132	3555	reexport();
3133	3556	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	3557	+ } else if (source == exportAsItem)
3135	3558	{
3136	3559	export();
3137	3560	//return true;
3138		- } else if (event.getSource() == povItem)
	3561	+ } else if (source == povItem)
3139	3562	{
3140	3563	generatePOV();
3141	3564	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	3565	+ } else if (event.getSource() == archiveItem)
	3566	+ {
	3567	+ cTools.Archive(frame);
	3568	+ return;
	3569	+ } else if (source == zBufferItem)
3143	3570	{
3144	3571	try
3145	3572	{
..	..	@@ -3161,21 +3588,8 @@
3161	3588	cameraView.repaint();
3162	3589	//return true;
3163	3590	}
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)
	3591	+ */ else // combos...
	3592	+ if (source == texresMenu)
3179	3593	{
3180	3594	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	3595	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +3601,448 @@
3187	3601	}
3188	3602	}
3189	3603
	3604	+ void New()
	3605	+ {
	3606	+ while (copy.Size() > 1)
	3607	+ {
	3608	+ copy.remove(1);
	3609	+ }
	3610	+
	3611	+ ResetModel();
	3612	+ objEditor.refreshContents();
	3613	+ }
	3614	+
	3615	+ static public byte[] Compress(Object3D o)
	3616	+ {
	3617	+ // Slower to actually compress.
	3618	+ try
	3619	+ {
	3620	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3621	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3622	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3623	+
	3624	+ Object3D parent = o.parent;
	3625	+ o.parent = null;
	3626	+
	3627	+ out.writeObject(o);
	3628	+
	3629	+ o.parent = parent;
	3630	+
	3631	+ out.flush();
	3632	+
	3633	+ baos //zstream
	3634	+ .close();
	3635	+ out.close();
	3636	+
	3637	+ byte[] bytes = baos.toByteArray();
	3638	+
	3639	+ System.out.println("save #bytes = " + bytes.length);
	3640	+ return bytes;
	3641	+ } catch (Exception e)
	3642	+ {
	3643	+ System.err.println(e);
	3644	+ return null;
	3645	+ }
	3646	+ }
	3647	+
	3648	+ static public Object Uncompress(byte[] bytes)
	3649	+ {
	3650	+ System.out.println("restore #bytes = " + bytes.length);
	3651	+ try
	3652	+ {
	3653	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3654	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3655	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3656	+ Object obj = in.readObject();
	3657	+
	3658	+ bais //istream
	3659	+ .close();
	3660	+ in.close();
	3661	+
	3662	+ return obj;
	3663	+ } catch (Exception e)
	3664	+ {
	3665	+ System.err.println(e);
	3666	+ return null;
	3667	+ }
	3668	+ }
	3669	+
	3670	+ static public Object clone(Object o)
	3671	+ {
	3672	+ try
	3673	+ {
	3674	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3675	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3676	+
	3677	+ out.writeObject(o);
	3678	+
	3679	+ out.flush();
	3680	+ out.close();
	3681	+
	3682	+ byte[] bytes = baos.toByteArray();
	3683	+
	3684	+ System.out.println("clone = " + bytes.length);
	3685	+
	3686	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3687	+ ObjectInputStream in = new ObjectInputStream(bais);
	3688	+ Object obj = in.readObject();
	3689	+ in.close();
	3690	+
	3691	+ return obj;
	3692	+ } catch (Exception e)
	3693	+ {
	3694	+ System.err.println(e);
	3695	+ return null;
	3696	+ }
	3697	+ }
	3698	+
	3699	+ cRadio GetCurrentTab()
	3700	+ {
	3701	+ cRadio ab;
	3702	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3703	+ {
	3704	+ ab = (cRadio)e.nextElement();
	3705	+ if(ab.GetObject() == copy)
	3706	+ {
	3707	+ return ab;
	3708	+ }
	3709	+ }
	3710	+
	3711	+ return null;
	3712	+ }
	3713	+
	3714	+
	3715	+ public void Save()
	3716	+ {
	3717	+ //Save(true);
	3718	+ Replace();
	3719	+ SetUndoStates();
	3720	+ }
	3721	+
	3722	+ private boolean Equal(byte[] compress, byte[] name)
	3723	+ {
	3724	+ if (compress.length != name.length)
	3725	+ {
	3726	+ return false;
	3727	+ }
	3728	+
	3729	+ for (int i=compress.length; --i>=0;)
	3730	+ {
	3731	+ if (compress[i] != name[i])
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ return true;
	3736	+ }
	3737	+
	3738	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3739	+
	3740	+ public boolean Save(boolean user)
	3741	+ {
	3742	+ System.err.println("Save");
	3743	+ Replace();
	3744	+
	3745	+ cRadio tab = GetCurrentTab();
	3746	+
	3747	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
	3748	+
	3749	+ boolean thesame = false;
	3750	+
	3751	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3752	+// {
	3753	+// thesame = true;
	3754	+// }
	3755	+
	3756	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3757	+ if (!thesame)
	3758	+ {
	3759	+ //tab.user[tab.versionindex] = user;
	3760	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3761	+
	3762	+ copy.versionlist[++copy.versionindex] = compress;
	3763	+
	3764	+ // if (increment)
	3765	+ // tab.versionindex++;
	3766	+ }
	3767	+
	3768	+ //copy.RestoreBigData(versiontable);
	3769	+
	3770	+ //assert(hashtable.isEmpty());
	3771	+
	3772	+ for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3773	+ {
	3774	+ //tab.user[i] = false;
	3775	+ copy.versionlist[i] = null;
	3776	+ }
	3777	+
	3778	+ SetUndoStates();
	3779	+
	3780	+ // test save
	3781	+ if (false)
	3782	+ {
	3783	+ try
	3784	+ {
	3785	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3786	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3787	+
	3788	+ p.writeObject(copy);
	3789	+
	3790	+ p.flush();
	3791	+
	3792	+ ostream.close();
	3793	+ } catch (Exception e)
	3794	+ {
	3795	+ e.printStackTrace();
	3796	+ }
	3797	+ }
	3798	+
	3799	+ return !thesame;
	3800	+ }
	3801	+
	3802	+ boolean flashIt = true;
	3803	+
	3804	+ void RefreshSelection()
	3805	+ {
	3806	+ Object3D selection = new Object3D();
	3807	+
	3808	+ for (int i = 0; i < copy.selection.size(); i++)
	3809	+ {
	3810	+ Object3D elem = copy.selection.elementAt(i);
	3811	+
	3812	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3813	+
	3814	+ if (obj == null)
	3815	+ {
	3816	+ copy.selection.remove(i--);
	3817	+ }
	3818	+ else
	3819	+ {
	3820	+ selection.add(obj);
	3821	+ copy.selection.setElementAt(obj, i);
	3822	+ }
	3823	+ }
	3824	+
	3825	+ flashIt = false;
	3826	+ GetTree().clearSelection();
	3827	+ for (int i = 0; i < selection.size(); i++)
	3828	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3829	+ flashIt = true;
	3830	+
	3831	+ refreshContents(false);
	3832	+ }
	3833	+
	3834	+ void CopyChanged(Object3D obj)
	3835	+ {
	3836	+ SetUndoStates();
	3837	+
	3838	+ boolean temp = CameraPane.SWITCH;
	3839	+ CameraPane.SWITCH = false;
	3840	+
	3841	+ copy.ExtractBigData(versiontable);
	3842	+
	3843	+ copy.clear();
	3844	+
	3845	+ copy.skyboxname = obj.skyboxname;
	3846	+ copy.skyboxext = obj.skyboxext;
	3847	+
	3848	+ for (int i=0; i<obj.Size(); i++)
	3849	+ {
	3850	+ copy.add(obj.get(i));
	3851	+ }
	3852	+
	3853	+ copy.RestoreBigData(versiontable);
	3854	+
	3855	+ CameraPane.SWITCH = temp;
	3856	+
	3857	+ RefreshSelection();
	3858	+ //assert(hashtable.isEmpty());
	3859	+
	3860	+ copy.Touch();
	3861	+
	3862	+ ResetModel();
	3863	+ copy.HardTouch(); // recompile?
	3864	+
	3865	+ cRadio ab;
	3866	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3867	+ {
	3868	+ ab = (cRadio)e.nextElement();
	3869	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3870	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3871	+ if (test != null)
	3872	+ {
	3873	+ test.editWindow = ab.object.editWindow;
	3874	+ ab.object = test;
	3875	+ }
	3876	+ }
	3877	+
	3878	+ refreshContents();
	3879	+ }
	3880	+
	3881	+ cButton undoButton;
	3882	+ cButton restoreButton;
	3883	+ cButton replaceButton;
	3884	+ cButton redoButton;
	3885	+
	3886	+ boolean muteSlider;
	3887	+
	3888	+ int VersionCount()
	3889	+ {
	3890	+ int count = 0;
	3891	+
	3892	+ for (int i = copy.versionlist.length; --i >= 0;)
	3893	+ {
	3894	+ if (copy.versionlist[i] != null)
	3895	+ count++;
	3896	+ }
	3897	+
	3898	+ return count;
	3899	+ }
	3900	+
	3901	+ void SetUndoStates()
	3902	+ {
	3903	+ cRadio tab = GetCurrentTab();
	3904	+
	3905	+ restoreButton.setEnabled(copy.versionindex != -1);
	3906	+ replaceButton.setEnabled(copy.versionindex != -1);
	3907	+
	3908	+ undoButton.setEnabled(copy.versionindex > 0);
	3909	+ redoButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3910	+
	3911	+ muteSlider = true;
	3912	+ versionSlider.setMaximum(VersionCount() - 1);
	3913	+ versionSlider.setInteger(copy.versionindex);
	3914	+ muteSlider = false;
	3915	+ }
	3916	+
	3917	+ public boolean Undo()
	3918	+ {
	3919	+ // Option?
	3920	+ Replace();
	3921	+
	3922	+ System.err.println("Undo");
	3923	+
	3924	+ cRadio tab = GetCurrentTab();
	3925	+
	3926	+ if (copy.versionindex == 0)
	3927	+ {
	3928	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3929	+ return false;
	3930	+ }
	3931	+
	3932	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3933	+// {
	3934	+// if (Save(false))
	3935	+// tab.versionindex -= 1;
	3936	+// else
	3937	+// {
	3938	+// if (tab.versionindex <= 0)
	3939	+// return false;
	3940	+// else
	3941	+// tab.versionindex -= 1;
	3942	+// }
	3943	+// }
	3944	+
	3945	+ copy.versionindex -= 1;
	3946	+
	3947	+ CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
	3948	+
	3949	+ return true;
	3950	+ }
	3951	+
	3952	+ public boolean Restore()
	3953	+ {
	3954	+ System.err.println("Restore");
	3955	+
	3956	+ cRadio tab = GetCurrentTab();
	3957	+
	3958	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3959	+ {
	3960	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3961	+ return false;
	3962	+ }
	3963	+
	3964	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3965	+ CopyChanged(copy.versionlist[copy.versionindex]);
	3966	+
	3967	+ return true;
	3968	+ }
	3969	+
	3970	+ public boolean Replace()
	3971	+ {
	3972	+ System.err.println("Replace");
	3973	+
	3974	+ cRadio tab = GetCurrentTab();
	3975	+
	3976	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3977	+ {
	3978	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3979	+ return false;
	3980	+ }
	3981	+
	3982	+ copy.versionlist[copy.versionindex] = CompressCopy();
	3983	+
	3984	+ return true;
	3985	+ }
	3986	+
	3987	+ public void Redo()
	3988	+ {
	3989	+ // Option?
	3990	+ Replace();
	3991	+
	3992	+ cRadio tab = GetCurrentTab();
	3993	+
	3994	+ if (copy.versionlist[copy.versionindex + 1] == null)
	3995	+ {
	3996	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3997	+ return;
	3998	+ }
	3999	+
	4000	+ copy.versionindex += 1;
	4001	+
	4002	+ CopyChanged(copy.versionlist[copy.versionindex]);
	4003	+
	4004	+ //if (!tab.user[tab.versionindex])
	4005	+ // tab.graphs[tab.versionindex] = null;
	4006	+ }
	4007	+
	4008	+ void ImportGFD()
	4009	+ {
	4010	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4011	+ browser.show();
	4012	+ String filename = browser.getFile();
	4013	+ if (filename != null && filename.length() > 0)
	4014	+ {
	4015	+ String fullname = browser.getDirectory() + filename;
	4016	+
	4017	+ //Object3D readobj =
	4018	+ objEditor.ReadGFD(fullname, objEditor);
	4019	+ //makeSomething(readobj);
	4020	+ }
	4021	+ }
	4022	+
	4023	+ void ImportVRMLX3D()
	4024	+ {
	4025	+ if (Grafreed.standAlone)
	4026	+ {
	4027	+ /**/
	4028	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4029	+ browser.show();
	4030	+ String filename = browser.getFile();
	4031	+ if (filename != null && filename.length() > 0)
	4032	+ {
	4033	+ String fullname = browser.getDirectory() + filename;
	4034	+ LoadVRMLX3D(fullname);
	4035	+ }
	4036	+ /**/
	4037	+ }
	4038	+ }
	4039	+
3190	4040	void ToggleAnimation()
3191	4041	{
3192	4042	if (!Globals.ANIMATION)
3193	4043	{
3194	4044	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	4045	+ browser.setVisible(true);
3196	4046	String filename = browser.getFile();
3197	4047	if (filename != null && filename.length() > 0)
3198	4048	{
..	..	@@ -3202,8 +4052,8 @@
3202	4052
3203	4053	Globals.ANIMATION ^= true;
3204	4054
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	4055	+ Grafreed.wav.cursor = 0;
	4056	+ Grafreed.wav.loop = 0;
3207	4057	}
3208	4058	} else
3209	4059	{
..	..	@@ -3224,7 +4074,6 @@
3224	4074	callee.refreshContents();
3225	4075	} else
3226	4076	{
3227		- new Exception().printStackTrace();
3228	4077	System.exit(0);
3229	4078	}
3230	4079	}
..	..	@@ -3254,7 +4103,7 @@
3254	4103	void CreateMaterial()
3255	4104	{
3256	4105	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4106	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	4107	if (copy.selection.size() > 0)
3259	4108	//SetMaterial(copy);
3260	4109	{
..	..	@@ -3305,7 +4154,7 @@
3305	4154	assert false;
3306	4155	}
3307	4156
3308		- void EditSelection()
	4157	+ void EditSelection(boolean newWindow)
3309	4158	{
3310	4159	}
3311	4160
..	..	@@ -3313,11 +4162,11 @@
3313	4162	{
3314	4163	copy.ResetBlockLoop(); // temporary problem
3315	4164
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	4165	+ boolean random = CameraPane.SWITCH;
	4166	+ CameraPane.SWITCH = false; // parse everything
3318	4167	copy.ResetDisplayList();
3319	4168	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	4169	+ CameraPane.SWITCH = random;
3321	4170	}
3322	4171
3323	4172	// public void applySelf()
..	..	@@ -3364,7 +4213,7 @@
3364	4213	//copy.material = new cMaterial(copy.GetMaterial());
3365	4214
3366	4215	current.color = (float) colorField.getFloat();
3367		- current.modulation = (float) modulationField.getFloat();
	4216	+ current.modulation = (float) saturationField.getFloat();
3368	4217	current.metalness = (float) metalnessField.getFloat();
3369	4218	current.diffuse = (float) diffuseField.getFloat();
3370	4219	current.specular = (float) specularField.getFloat();
..	..	@@ -3391,6 +4240,36 @@
3391	4240	{
3392	4241	//System.out.println("Propagate = " + propagate);
3393	4242	copy.UpdateMaterial(anchor, current, propagate);
	4243	+
	4244	+ if (copy.material != null)
	4245	+ {
	4246	+ cMaterial mat = copy.material;
	4247	+
	4248	+ colorField.SetToolTipValue((mat.color));
	4249	+ saturationField.SetToolTipValue((mat.modulation));
	4250	+ metalnessField.SetToolTipValue((mat.metalness));
	4251	+ diffuseField.SetToolTipValue((mat.diffuse));
	4252	+ specularField.SetToolTipValue((mat.specular));
	4253	+ shininessField.SetToolTipValue((mat.shininess));
	4254	+ shiftField.SetToolTipValue((mat.shift));
	4255	+ ambientField.SetToolTipValue((mat.ambient));
	4256	+ lightareaField.SetToolTipValue((mat.lightarea));
	4257	+ diffusenessField.SetToolTipValue((mat.factor));
	4258	+ velvetField.SetToolTipValue((mat.velvet));
	4259	+ sheenField.SetToolTipValue((mat.sheen));
	4260	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4261	+ backlitField.SetToolTipValue((mat.bump));
	4262	+ anisoField.SetToolTipValue((mat.aniso));
	4263	+ anisoVField.SetToolTipValue((mat.anisoV));
	4264	+ cameraField.SetToolTipValue((mat.cameralight));
	4265	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4266	+ shadowField.SetToolTipValue((mat.shadow));
	4267	+ textureField.SetToolTipValue((mat.texture));
	4268	+ opacityField.SetToolTipValue((mat.opacity));
	4269	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4270	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4271	+ }
	4272	+
3394	4273	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	4274	{
3396	4275	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3419,9 +4298,25 @@
3419	4298	//copy.Touch();
3420	4299	}
3421	4300
	4301	+ cNumberSlider versionSlider;
	4302	+
3422	4303	public void stateChanged(ChangeEvent e)
3423	4304	{
3424	4305	// assert(false);
	4306	+ if (e.getSource() == versionSlider)
	4307	+ {
	4308	+ if (muteSlider)
	4309	+ return;
	4310	+
	4311	+ int version = versionSlider.getInteger();
	4312	+
	4313	+ if (copy.versionlist[version] != null)
	4314	+ {
	4315	+ CopyChanged(copy.versionlist[copy.versionindex = version]);
	4316	+ }
	4317	+
	4318	+ return;
	4319	+ }
3425	4320
3426	4321	if (freezematerial)
3427	4322	{
..	..	@@ -3457,6 +4352,12 @@
3457	4352	{
3458	4353	//System.out.println("stateChanged = " + this);
3459	4354	materialtouched = true;
	4355	+
	4356	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4357	+ {
	4358	+ saturationField.setFloat(1);
	4359	+ }
	4360	+
3460	4361	applySelf();
3461	4362	//System.out.println("this = " + this);
3462	4363	//System.out.println("PARENT = " + parent);
..	..	@@ -3506,7 +4407,7 @@
3506	4407	}
3507	4408
3508	4409	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4410	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	4411	}
3511	4412
3512	4413	void SnapObject()
..	..	@@ -3756,6 +4657,7 @@
3756	4657	{
3757	4658	if (GetTree() != null)
3758	4659	{
	4660	+ GetTree().revalidate();
3759	4661	GetTree().repaint();
3760	4662	}
3761	4663
..	..	@@ -3770,6 +4672,8 @@
3770	4672
3771	4673	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	4674	{
	4675	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4676	+ Save();
3773	4677	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	4678	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	4679	// if (thing instanceof GenericJointDemo)
..	..	@@ -3856,6 +4760,12 @@
3856	4760	{
3857	4761	ResetModel();
3858	4762	Select(thing.GetTreePath(), true, false); // unselect... false);
	4763	+
	4764	+ if (thing.Size() == 0)
	4765	+ {
	4766	+ //EditSelection(false);
	4767	+ }
	4768	+
3859	4769	refreshContents();
3860	4770	}
3861	4771
..	..	@@ -3973,6 +4883,7 @@
3973	4883	}
3974	4884	}
3975	4885	}
	4886	+
3976	4887	LoadGFDThread loadGFDThread;
3977	4888
3978	4889	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +4903,10 @@
3992	4903
3993	4904	try
3994	4905	{
	4906	+ // Try compressed version first.
3995	4907	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4908	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4909	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	4910
3998	4911	readobj = (Object3D) p.readObject();
3999	4912	istream.close();
..	..	@@ -4001,7 +4914,22 @@
4001	4914	readobj.ResetDisplayList();
4002	4915	} catch (Exception e)
4003	4916	{
4004		- e.printStackTrace();
	4917	+ if (!e.toString().contains("GZIP"))
	4918	+ e.printStackTrace();
	4919	+
	4920	+ try
	4921	+ {
	4922	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4923	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4924	+
	4925	+ readobj = (Object3D) p.readObject();
	4926	+ istream.close();
	4927	+
	4928	+ readobj.ResetDisplayList();
	4929	+ } catch (Exception e2)
	4930	+ {
	4931	+ e2.printStackTrace();
	4932	+ }
4005	4933	}
4006	4934	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	4935	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +4975,12 @@
4047	4975
4048	4976	void LoadIt(Object obj)
4049	4977	{
	4978	+ if (obj == null)
	4979	+ {
	4980	+ // Invalid file
	4981	+ return;
	4982	+ }
	4983	+
4050	4984	System.out.println("Loaded " + obj);
4051	4985	//new Exception().printStackTrace();
4052	4986	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,10 +4990,14 @@
4056	4990
4057	4991	if (readobj != null)
4058	4992	{
	4993	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4994	+ // Save();
4059	4995	try
4060	4996	{
4061	4997	//readobj.deepCopySelf(copy);
4062	4998	copy.clear(); // june 2014
	4999	+ copy.skyboxname = readobj.skyboxname;
	5000	+ copy.skyboxext = readobj.skyboxext;
4063	5001	for (int i = 0; i < readobj.size(); i++)
4064	5002	{
4065	5003	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4100,6 +5038,7 @@
4100	5038	}
4101	5039	} catch (ClassCastException e)
4102	5040	{
	5041	+ e.printStackTrace();
4103	5042	assert (false);
4104	5043	Composite c = (Composite) copy;
4105	5044	c.children.clear();
..	..	@@ -4110,15 +5049,26 @@
4110	5049	c.addChild(csg);
4111	5050	}
4112	5051
	5052	+ copy.versionlist = readobj.versionlist;
	5053	+ copy.versionindex = readobj.versionindex;
	5054	+
	5055	+ if (copy.versionlist == null)
	5056	+ {
	5057	+ copy.versionlist = new Object3D[100];
	5058	+ copy.versionindex = -1;
	5059	+ }
	5060	+
	5061	+ //? SetUndoStates();
	5062	+
4113	5063	ResetModel();
4114	5064	copy.HardTouch(); // recompile?
4115	5065	refreshContents();
4116	5066	}
4117	5067	}
4118	5068
4119		- void load() // throws ClassNotFoundException
	5069	+ void Open() // throws ClassNotFoundException
4120	5070	{
4121		- if (GrafreeD.standAlone)
	5071	+ if (Grafreed.standAlone)
4122	5072	{
4123	5073	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4124	5074	browser.show();
..	..	@@ -4205,11 +5155,13 @@
4205	5155	try
4206	5156	{
4207	5157	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5158	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5159	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	5160
4210	5161	p.writeObject(copy);
4211	5162	p.flush();
4212	5163
	5164	+ zstream.close();
4213	5165	ostream.close();
4214	5166
4215	5167	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4217,19 +5169,23 @@
4217	5169	//ps.print(buffer.toString());
4218	5170	} catch (IOException e)
4219	5171	{
	5172	+ e.printStackTrace();
4220	5173	}
4221	5174	}
	5175	+
4222	5176	String lastname;
4223	5177
4224	5178	void saveAs()
4225	5179	{
4226		- if (GrafreeD.standAlone)
	5180	+ if (Grafreed.standAlone)
4227	5181	{
4228	5182	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	5183	browser.setVisible(true);
4230	5184	String filename = browser.getFile();
4231	5185	if (filename != null && filename.length() > 0)
4232	5186	{
	5187	+ if (!filename.endsWith(".gfd"))
	5188	+ filename += ".gfd";
4233	5189	lastname = browser.getDirectory() + filename;
4234	5190	save();
4235	5191	}
..	..	@@ -4328,13 +5284,13 @@
4328	5284	try
4329	5285	{
4330	5286	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5287	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5288	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	5289
4334	5290	Object3D objectparent = obj.parent;
4335	5291	obj.parent = null;
4336	5292
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5293	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	5294
4339	5295	obj.parent = objectparent;
4340	5296
..	..	@@ -4346,8 +5302,8 @@
4346	5302	p.writeObject(object);
4347	5303	p.flush();
4348	5304
	5305	+ zstream.close();
4349	5306	ostream.close();
4350		- // zstream.close();
4351	5307
4352	5308	// group.selection.get(0).parent = parent;
4353	5309	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +5324,7 @@
4368	5324	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	5325	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	5326	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	5327	+ if (Grafreed.standAlone)
4372	5328	{
4373	5329	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	5330	browser.show();
..	..	@@ -4394,19 +5350,18 @@
4394	5350	Object3D client;
4395	5351	Object3D copy;
4396	5352	MenuBar menuBar;
4397		- Menu windowMenu;
4398		- MenuItem loadItem;
	5353	+ Menu fileMenu;
	5354	+ MenuItem newItem;
	5355	+ MenuItem openItem;
4399	5356	MenuItem saveItem;
4400	5357	MenuItem saveAsItem;
4401	5358	MenuItem exportAsItem;
4402	5359	MenuItem reexportItem;
4403	5360	MenuItem povItem;
4404	5361	MenuItem closeItem;
4405		- Menu cameraMenu;
	5362	+
4406	5363	CheckboxMenuItem zBufferItem;
4407	5364	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	5365	MenuItem stepItem;
4411	5366	CheckboxMenuItem toggleLiveItem;
4412	5367	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,25 +5372,39 @@
4417	5372	CheckboxMenuItem toggleFootContactItem;
4418	5373	CheckboxMenuItem toggleDLItem;
4419	5374	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	5375	+ CheckboxMenuItem toggleSwitchItem;
4421	5376	CheckboxMenuItem toggleRootItem;
4422	5377	CheckboxMenuItem animationItem;
	5378	+ MenuItem archiveItem;
4423	5379	CheckboxMenuItem toggleHandleItem;
4424	5380	CheckboxMenuItem togglePaintItem;
4425	5381	JSplitPane mainPanel;
4426	5382	JScrollPane scrollpane;
	5383	+
4427	5384	JPanel toolbarPanel;
4428		- JPanel treePanel;
	5385	+
	5386	+ cGridBag treePanel;
	5387	+
4429	5388	JPanel radioPanel;
4430	5389	ButtonGroup buttonGroup;
4431		- cGridBag ctrlPanel;
	5390	+
	5391	+ cGridBag toolboxPanel;
4432	5392	cGridBag materialPanel;
	5393	+ cGridBag ctrlPanel;
	5394	+
4433	5395	JScrollPane infoPanel;
	5396	+
4434	5397	cGridBag optionsPanel;
	5398	+
4435	5399	JTabbedPane objectPanel;
	5400	+ boolean materialFlushed;
	5401	+ Object3D latestObject;
	5402	+
4436	5403	cGridBag XYZPanel;
	5404	+
4437	5405	JSplitPane gridPanel;
4438	5406	JSplitPane bigPanel;
	5407	+
4439	5408	cGridBag bigThree;
4440	5409	cGridBag scenePanel;
4441	5410	cGridBag centralPanel;
..	..	@@ -4493,7 +5462,7 @@
4493	5462	JLabel colorLabel;
4494	5463	cNumberSlider colorField;
4495	5464	JLabel modulationLabel;
4496		- cNumberSlider modulationField;
	5465	+ cNumberSlider saturationField;
4497	5466	JLabel metalnessLabel;
4498	5467	cNumberSlider metalnessField;
4499	5468	JLabel diffuseLabel;
..	..	@@ -4550,8 +5519,13 @@
4550	5519	cNumberSlider fogField;
4551	5520	JLabel opacityPowerLabel;
4552	5521	cNumberSlider opacityPowerField;
4553		- JTree jTree;
	5522	+ cTree jTree;
4554	5523	//ObjectUI parent;
4555	5524
4556	5525	cNumberSlider normalpushField;
	5526	+
	5527	+ private MenuItem importGFDItem;
	5528	+ private MenuItem importVRMLX3DItem;
	5529	+ private MenuItem import3DSItem;
	5530	+ private MenuItem importOBJItem;
4557	5531	}