~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
..	..	@@ -30,11 +34,87 @@
30	34	iSendInfo
31	35	//KeyListener
32	36	{
	37	+ public cToggleButton pinButton;
33	38	boolean timeline;
34	39	boolean wasFullScreen;
35	40
36	41	GroupEditor callee;
37	42	JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
	53	+
	54	+ cButton GetButton(String name, boolean border)
	55	+ {
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
	64	+ }
	65	+
	66	+ cToggleButton GetToggleButton(String name, boolean border)
	67	+ {
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
	70	+ }
	71	+
	72	+ cCheckBox GetCheckBox(String name, boolean border)
	73	+ {
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
	80	+ try
	81	+ {
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
	98	+ }
	99	+ catch (Exception e)
	100	+ {
	101	+ return null;
	102	+ }
	103	+ }
	104	+
	105	+ BufferedImage GetImage(String name)
	106	+ {
	107	+ try
	108	+ {
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
	112	+ }
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
	117	+ }
38	118
39	119	// SCRIPT
40	120
..	..	@@ -143,7 +223,9 @@
143	223	//nameField.removeActionListener(this);
144	224	// objEditor.ctrlPanel.remove(nameField);
145	225
146		- if (!GroupEditor.allparams)
	226	+ objEditor.ctrlPanel.remove(namePanel);
	227	+
	228	+ if (!allparams)
147	229	return;
148	230
149	231	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -165,9 +247,9 @@
165	247	// objEditor.ctrlPanel.remove(fasterButton);
166	248	// objEditor.ctrlPanel.remove(remarkButton);
167	249
168		- objEditor.ctrlPanel.remove(namePanel);
169	250	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	251	+ objEditor.ctrlPanel.remove(setupPanel2);
	252	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	253	objEditor.ctrlPanel.remove(pushPanel);
172	254	//objEditor.ctrlPanel.remove(fillPanel);
173	255
..	..	@@ -215,6 +297,12 @@
215	297	client = inClient;
216	298	copy = client;
217	299
	300	+ if (copy.versionlist == null)
	301	+ {
	302	+ copy.versionlist = new Object3D[100];
	303	+ copy.versionindex = -1;
	304	+ }
	305	+
218	306	// "this" is not called: SetupUI2(objEditor);
219	307	}
220	308
..	..	@@ -228,6 +316,12 @@
228	316	client = inClient;
229	317	copy = client;
230	318
	319	+ if (copy.versionlist == null)
	320	+ {
	321	+ copy.versionlist = new Object3D[100];
	322	+ copy.versionindex = -1;
	323	+ }
	324	+
231	325	SetupUI2(callee.GetEditor());
232	326	}
233	327
..	..	@@ -242,6 +336,7 @@
242	336	//localCopy.parent = null;
243	337
244	338	frame = new JFrame();
	339	+ frame.setUndecorated(false);
245	340	objEditor = this;
246	341	this.callee = callee;
247	342
..	..	@@ -259,6 +354,12 @@
259	354	copy = localCopy;
260	355	copy.editWindow = this;
261	356
	357	+ if (copy.versionlist == null)
	358	+ {
	359	+// copy.versions = new byte[100][];
	360	+// copy.versionindex = -1;
	361	+ }
	362	+
262	363	SetupMenu();
263	364
264	365	//SetupName(objEditor); // new
..	..	@@ -272,28 +373,49 @@
272	373	return frame.action(event, obj);
273	374	}
274	375
	376	+ // Cannot work without static
	377	+ static boolean allparams = true;
	378	+
	379	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	380	+
275	381	void SetupMenu()
276	382	{
277	383	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..."));
	384	+ menuBar.add(fileMenu = new Menu("File"));
	385	+ fileMenu.add(newItem = new MenuItem("New"));
	386	+ fileMenu.add(openItem = new MenuItem("Open..."));
	387	+
	388	+ //oe.menuBar.add(menu = new Menu("Include"));
	389	+ Menu menu = new Menu("Import");
	390	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	391	+ importOBJItem.addActionListener(this);
	392	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	393	+ import3DSItem.addActionListener(this);
	394	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	395	+ importVRMLX3DItem.addActionListener(this);
	396	+ menu.add("-");
	397	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	398	+ importGFDItem.addActionListener(this);
	399	+ fileMenu.add(menu);
	400	+ fileMenu.add("-");
	401	+
	402	+ fileMenu.add(saveItem = new MenuItem("Save"));
	403	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	404	//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("-");
	405	+ fileMenu.add("-");
	406	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	407	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	408	+ fileMenu.add("-");
288	409	if (client.parent != null)
289	410	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	411	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	412	} else
292	413	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	414	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	415	}
295	416
296		- loadItem.addActionListener(this);
	417	+ newItem.addActionListener(this);
	418	+ openItem.addActionListener(this);
297	419	saveItem.addActionListener(this);
298	420	saveAsItem.addActionListener(this);
299	421	exportAsItem.addActionListener(this);
..	..	@@ -301,82 +423,71 @@
301	423	//povItem.addActionListener(this);
302	424	closeItem.addActionListener(this);
303	425
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	426	objectPanel = new JTabbedPane();
	427	+
	428	+ ChangeListener changeListener = new ChangeListener()
	429	+ {
	430	+ public void stateChanged(ChangeEvent changeEvent)
	431	+ {
	432	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	433	+// {
	434	+// if (latestObject != null)
	435	+// {
	436	+// refreshContents(true);
	437	+// SetMaterial(latestObject);
	438	+// }
	439	+//
	440	+// materialFlushed = true;
	441	+// }
	442	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	443	+// {
	444	+// if (listUI.size() == 0)
	445	+// EditSelection(false);
	446	+// }
	447	+
	448	+ refreshContents(false); // To refresh Info tab
	449	+ }
	450	+ };
	451	+ objectPanel.addChangeListener(changeListener);
	452	+
360	453	toolbarPanel = new JPanel();
361	454	toolbarPanel.setName("Toolbar");
362		- treePanel = new JPanel();
	455	+
	456	+ treePanel = new cGridBag();
363	457	treePanel.setName("Tree");
	458	+
	459	+ editPanel = new cGridBag().setVertical(true);
	460	+ //editPanel.setName("Edit");
	461	+
364	462	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
366		- materialPanel = new cGridBag().setVertical(true);
367		- materialPanel.setName("Material");
	463	+
	464	+ editCommandsPanel = new cGridBag();
	465	+ editPanel.add(editCommandsPanel);
	466	+ editPanel.add(ctrlPanel);
	467	+
	468	+ toolboxPanel = new cGridBag().setVertical(true);
	469	+ //toolboxPanel.setName("Toolbox");
	470	+
	471	+ skyboxPanel = new cGridBag().setVertical(true);
	472	+
	473	+ materialPanel = new cGridBag().setVertical(false);
	474	+ //materialPanel.setName("Material");
	475	+
368	476	/JTextPane/
369	477	infoarea = createTextPane();
	478	+ doc = infoarea.getStyledDocument();
	479	+
370	480	infoarea.setEditable(true);
371	481	SetText();
	482	+
372	483	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373	484	// infoarea.setOpaque(false);
374	485	// //infoarea.setForeground(textcolor);
375		- infoarea.setLineWrap(true);
376		- infoarea.setWrapStyleWord(true);
	486	+// TEXTAREA infoarea.setLineWrap(true);
	487	+// TEXTAREA infoarea.setWrapStyleWord(true);
377	488	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");
	489	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	490	+ //infoPanel.setName("Info");
380	491	//infoPanel.setLayout(new BorderLayout());
381	492	//infoPanel.add(createTextPane());
382	493
..	..	@@ -384,14 +495,21 @@
384	495	mainPanel.setName("Main");
385	496	mainPanel.setContinuousLayout(true);
386	497	mainPanel.setOneTouchExpandable(true);
387		- mainPanel.setDividerLocation(1.0);
388	498	mainPanel.setDividerSize(9);
389		- mainPanel.setResizeWeight(0);
390		-
	499	+ mainPanel.setDividerLocation(0.5); //1.0);
	500	+ mainPanel.setResizeWeight(0.5);
	501	+
	502	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	503	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	504	+ divider.setDividerSize(15);
	505	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	506	+
	507	+ mainPanel.setUI(new BasicSplitPaneUI());
	508	+
391	509	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392	510	//mainPanel.setLayout(new GridBagLayout());
393	511	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394		- treePanel.setLayout(new GridBagLayout());
	512	+// treePanel.setLayout(new GridBagLayout());
395	513	//ctrlPanel.setLayout(new GridBagLayout());
396	514	//materialPanel.setLayout(new GridBagLayout());
397	515
..	..	@@ -432,7 +550,7 @@
432	550	static String newline = "\n";
433	551	protected static final String buttonString = "JButton";
434	552	StyledDocument doc;
435		- JTextArea infoarea;
	553	+ JTextPane infoarea;
436	554
437	555	void ClearInfo()
438	556	{
..	..	@@ -455,10 +573,10 @@
455	573	e.printStackTrace();
456	574	}
457	575
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();
	576	+// String selection = infoarea.getText();
	577	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	578	+// java.awt.datatransfer.Clipboard clipboard =
	579	+// Toolkit.getDefaultToolkit().getSystemClipboard();
462	580	//clipboard.setContents(data, data);
463	581	}
464	582
..	..	@@ -481,13 +599,13 @@
481	599	//SendInfo("Name:", "bold");
482	600	if (sel.GetTextures() != null \|\| debug)
483	601	{
484		- si.SendInfo(sel.toString(), "bold");
	602	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485	603	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486	604	if (sel.Size() > 0)
487	605	{
488	606	si.SendInfo("#children = " + sel.Size(), "regular");
489	607	}
490		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	608	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491	609	if (debug)
492	610	{
493	611	try
..	..	@@ -499,7 +617,10 @@
499	617	}
500	618
501	619	if (full)
502		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	620	+ {
	621	+ si.SendInfo(" BBox min: " + minima, "regular");
	622	+ si.SendInfo(" BBox max: " + maxima, "regular");
	623	+ }
503	624
504	625	if (sel.bRep != null)
505	626	{
..	..	@@ -526,7 +647,7 @@
526	647	}
527	648	if (sel.support != null)
528	649	{
529		- si.SendInfo(" support: " + sel.support, "regular");
	650	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530	651	}
531	652	if (sel.scriptnode != null)
532	653	{
..	..	@@ -597,6 +718,9 @@
597	718	{
598	719	CameraPane.pointflow = (PointFlow) sel;
599	720	}
	721	+
	722	+ si.SendInfo("_____________________", "regular");
	723	+ si.SendInfo("", "regular");
600	724	}
601	725	}
602	726
..	..	@@ -612,68 +736,205 @@
612	736	}
613	737	}
614	738
	739	+//static GraphicsDevice device = GraphicsEnvironment
	740	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	741	+
	742	+ Rectangle keeprect;
	743	+ cRadio radio;
	744	+
	745	+cButton keepButton;
	746	+ cButton twoButton; // Full 3D
	747	+ cButton sixButton;
	748	+ cButton threeButton;
	749	+ cButton sevenButton;
	750	+ cButton fourButton; // full panel
	751	+ cButton oneButton; // full XYZ
	752	+ //cButton currentLayout;
	753	+
	754	+ boolean maximized;
	755	+
	756	+ cButton fullscreenLayout;
	757	+ cButton expandedLayout;
	758	+
	759	+ void Minimize()
	760	+ {
	761	+ frame.setState(Frame.ICONIFIED);
	762	+ frame.validate();
	763	+ }
	764	+
	765	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	766	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	767	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	768	+ void Maximize()
	769	+ {
	770	+ if (CameraPane.FULLSCREEN)
	771	+ {
	772	+ ToggleFullScreen();
	773	+ }
	774	+
	775	+ if (maximized)
	776	+ {
	777	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	778	+ }
	779	+ else
	780	+ {
	781	+ keeprect = frame.getBounds();
	782	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	783	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	784	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	785	+// frame.setState(Frame.MAXIMIZED_BOTH);
	786	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	787	+ }
	788	+
	789	+ maximized ^= true;
	790	+
	791	+ frame.validate();
	792	+ }
	793	+
	794	+ cButton minButton;
	795	+ cButton maxButton;
	796	+ cButton fullButton;
	797	+ cButton collapseButton;
	798	+ cButton maximize3DButton;
	799	+
615	800	void ToggleFullScreen()
616	801	{
617		- if (CameraPane.FULLSCREEN)
	802	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	803	+
	804	+ cameraView.ToggleFullScreen();
	805	+
	806	+ if (!CameraPane.FULLSCREEN)
618	807	{
619		- frame.getContentPane().remove(/"Center",/bigThree);
620		- framePanel.add(bigThree);
621		- frame.getContentPane().add(/"Center",/framePanel);
	808	+ device.setFullScreenWindow(null);
	809	+ frame.dispose();
	810	+ frame.setUndecorated(false);
	811	+ frame.validate();
	812	+ frame.setVisible(true);
	813	+
	814	+ //frame.setVisible(false);
	815	+// frame.removeNotify();
	816	+// frame.setUndecorated(false);
	817	+// frame.addNotify();
	818	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	819	+
	820	+// X frame.getContentPane().remove(/"Center",/bigThree);
	821	+// X framePanel.add(bigThree);
	822	+// X frame.getContentPane().add(/"Center",/framePanel);
	823	+// framePanel.setDividerLocation(46); // icons are 24x24
	824	+
	825	+ //frame.setVisible(true);
	826	+// radio.layout = keepButton;
	827	+ //theFrame = null;
	828	+ keepButton = null;
	829	+// radio.layout.doClick();
	830	+
622	831	} else
623	832	{
624		- frame.getContentPane().remove(/"Center",/framePanel);
625		- framePanel.remove(bigThree);
626		- frame.getContentPane().add(/"Center",/bigThree);
	833	+ keepButton = radio.layout;
	834	+ //keeprect = frame.getBounds();
	835	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	836	+// frame.getToolkit().getScreenSize().height);
	837	+ //frame.setVisible(false);
	838	+
	839	+ frame.dispose();
	840	+ frame.setUndecorated(true);
	841	+ device.setFullScreenWindow(frame);
	842	+ frame.validate();
	843	+ frame.setVisible(true);
	844	+// frame.removeNotify();
	845	+// frame.setUndecorated(true);
	846	+// frame.addNotify();
	847	+// X frame.getContentPane().remove(/"Center",/framePanel);
	848	+// X framePanel.remove(bigThree);
	849	+// X frame.getContentPane().add(/"Center",/bigThree);
	850	+// framePanel.setDividerLocation(0);
	851	+
	852	+// radio.layout = fullscreenLayout;
	853	+// radio.layout.doClick();
	854	+ //frame.setVisible(true);
627	855	}
628		- cameraView.ToggleFullScreen();
	856	+ frame.validate();
	857	+
	858	+ cameraView.requestFocusInWindow();
629	859	}
630	860
631		- private JTextArea createTextPane()
	861	+ void CollapseToolbar()
	862	+ {
	863	+ framePanel.setDividerLocation(0);
	864	+ //frame.validate();
	865	+
	866	+ cameraView.requestFocusInWindow();
	867	+ }
	868	+
	869	+ private Object3D Duplicate(Object3D object)
632	870	{
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		- };
	871	+ boolean temp = CameraPane.SWITCH;
	872	+ CameraPane.SWITCH = false;
	873	+
	874	+ object.ExtractBigData(versiontable);
	875	+ // if (copy == client)
	876	+
	877	+ Object3D versions[] = object.versionlist;
	878	+ object.versionlist = null;
	879	+
	880	+ //byte[] compress = Compress(copy);
	881	+ Object3D compress = (Object3D)Grafreed.clone(object);
	882	+
	883	+ object.versionlist = versions;
	884	+
	885	+ object.RestoreBigData(versiontable);
	886	+
	887	+ CameraPane.SWITCH = temp;
	888	+
	889	+ return compress;
	890	+ }
648	891
649		- String[] initStyles =
650		- {
651		- "regular", "italic", "bold", "small", "large",
652		- "regular", "button", "regular", "icon",
653		- "regular"
654		- };
	892	+ private JTextPane createTextPane()
	893	+ {
	894	+// TEXTAREA String[] initString =
	895	+// {
	896	+// "This is an editable JTextPane, ", //regular
	897	+// "another ", //italic
	898	+// "styled ", //bold
	899	+// "text ", //small
	900	+// "component, ", //large
	901	+// "which supports embedded components..." + newline,//regular
	902	+// " " + newline, //button
	903	+// "...and embedded icons..." + newline, //regular
	904	+// " ", //icon
	905	+// newline + "JTextPane is a subclass of JEditorPane that "
	906	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	907	+// + "cover methods for interacting with those objects."
	908	+// };
	909	+//
	910	+// String[] initStyles =
	911	+// {
	912	+// "regular", "italic", "bold", "small", "large",
	913	+// "regular", "button", "regular", "icon",
	914	+// "regular"
	915	+// };
	916	+//
	917	+// JTextPane textPane = new JTextPane();
	918	+// textPane.setEditable(true);
	919	+// /StyledDocument/ doc = textPane.getStyledDocument();
	920	+// addStylesToDocument(doc);
	921	+//
	922	+// try
	923	+// {
	924	+// for (int j = 0; j < 2; j++)
	925	+// {
	926	+// for (int i = 0; i < initString.length; i++)
	927	+// {
	928	+// doc.insertString(doc.getLength(), initString[i],
	929	+// doc.getStyle(initStyles[i]));
	930	+// }
	931	+// }
	932	+// } catch (BadLocationException ble)
	933	+// {
	934	+// System.err.println("Couldn't insert initial text into text pane.");
	935	+// }
655	936
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;
	937	+ return new JTextPane(); // textPane;
677	938	}
678	939
679	940	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +987,7 @@
726	987	protected static ImageIcon createImageIcon(String path,
727	988	String description)
728	989	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	990	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	991	if (imgURL != null)
731	992	{
732	993	return new ImageIcon(imgURL, description);
..	..	@@ -749,6 +1010,7 @@
749	1010	{
750	1011	SetupMaterial(materialPanel);
751	1012	}
	1013	+
752	1014	//SetupName();
753	1015	//SetupViews();
754	1016	}
..	..	@@ -758,6 +1020,7 @@
758	1020	// NumberSlider vDivsField;
759	1021	// JCheckBox endcaps;
760	1022	JCheckBox liveCB;
	1023	+ JCheckBox selectableCB;
761	1024	JCheckBox hideCB;
762	1025	JCheckBox link2masterCB;
763	1026	JCheckBox markCB;
..	..	@@ -765,7 +1028,12 @@
765	1028	JCheckBox speedupCB;
766	1029	JCheckBox rewindCB;
767	1030	JCheckBox flipVCB;
	1031	+
	1032	+ cCheckBox toggleTextureCB;
	1033	+ cCheckBox toggleSwitchCB;
	1034	+
768	1035	JComboBox texresMenu;
	1036	+
769	1037	JButton resetButton;
770	1038	JButton stepButton;
771	1039	JButton stepAllButton;
..	..	@@ -774,9 +1042,13 @@
774	1042	JButton fasterButton;
775	1043	JButton remarkButton;
776	1044
	1045	+ cGridBag editPanel;
	1046	+ cGridBag editCommandsPanel;
	1047	+
777	1048	cGridBag namePanel;
778	1049	cGridBag setupPanel;
779		- cGridBag commandsPanel;
	1050	+ cGridBag setupPanel2;
	1051	+ cGridBag objectCommandsPanel;
780	1052	cGridBag pushPanel;
781	1053	cGridBag fillPanel;
782	1054
..	..	@@ -943,52 +1215,88 @@
943	1215
944	1216	void SetupUI2(ObjEditor oe)
945	1217	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	1218	//SetupName(oe);
951	1219
952	1220	namePanel = new cGridBag();
953	1221
	1222	+ //if (copy.pinned)
	1223	+ {
	1224	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1225	+ pinButton.setSelected(copy.pinned);
	1226	+ cGridBag t = new cGridBag();
	1227	+ t.preferredWidth = 2;
	1228	+ t.add(pinButton);
	1229	+ namePanel.add(t);
	1230	+
	1231	+ pinButton.addItemListener(this);
	1232	+ }
	1233	+
954	1234	nameField = AddText(namePanel, copy.GetName());
955		- namePanel.add(nameField);
	1235	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
956	1236	oe.ctrlPanel.add(namePanel);
957	1237
958	1238	oe.ctrlPanel.Return();
959	1239
960		- if (!GroupEditor.allparams)
	1240	+ if (!allparams)
961	1241	return;
962	1242
963	1243	setupPanel = new cGridBag().setVertical(false);
964	1244
965	1245	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1246	+ liveCB.setToolTipText("Animate object");
	1247	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1248	+ selectableCB.setToolTipText("Make object selectable");
968	1249	// Return();
	1250	+
	1251	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1252	+ hideCB.setToolTipText("Hide object");
969	1253	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1254	+ markCB.setToolTipText("As animation target transform");
	1255	+
	1256	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1257	+
	1258	+ setupPanel2 = new cGridBag().setVertical(false);
	1259	+
	1260	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1261	+ rewindCB.setToolTipText("Rewind animation");
	1262	+
	1263	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1264	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
972	1265
	1266	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1267	+ link2masterCB.setToolTipText("Attach to support");
	1268	+
	1269	+ if (Globals.ADVANCED)
	1270	+ {
	1271	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1272	+ speedupCB.setToolTipText("Option motion capture");
	1273	+ }
	1274	+
973	1275	oe.ctrlPanel.add(setupPanel);
974	1276	oe.ctrlPanel.Return();
	1277	+ oe.ctrlPanel.add(setupPanel2);
	1278	+ oe.ctrlPanel.Return();
975	1279
976		- commandsPanel = new cGridBag().setVertical(false);
	1280	+ objectCommandsPanel = new cGridBag().setVertical(false);
977	1281
978		- resetButton = AddButton(commandsPanel, "Reset");
979		- stepButton = AddButton(commandsPanel, "Step");
	1282	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1283	+ resetButton.setToolTipText("Jump to frame zero");
	1284	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1285	+ stepButton.setToolTipText("Step one frame");
980	1286	// resetAllButton = AddButton(oe, "Reset All");
981	1287	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	1288	// Return();
984		- slowerButton = AddButton(commandsPanel, "Slow");
985		- fasterButton = AddButton(commandsPanel, "Fast");
986		- remarkButton = AddButton(commandsPanel, "Remark");
	1289	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1290	+ slowerButton.setToolTipText("Decrease animation speed");
	1291	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1292	+ fasterButton.setToolTipText("Increase animation speed");
	1293	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1294	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1295
988		- oe.ctrlPanel.add(commandsPanel);
	1296	+ oe.ctrlPanel.add(objectCommandsPanel);
989	1297	oe.ctrlPanel.Return();
990	1298
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1299	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	1300	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	1301	//Return();
994	1302
..	..	@@ -1191,8 +1499,11 @@
1191	1499	//worldPanel.setName("World");
1192	1500	centralPanel = new cGridBag();
1193	1501	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1502	+
	1503	+ if (Globals.ADVANCED)
	1504	+ {
	1505	+ timelinePanel = new JPanel(new BorderLayout());
	1506	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1507
1197	1508	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1509	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1512,10 @@
1201	1512	// cameraPanel.setDividerSize(9);
1202	1513	cameraPanel.setResizeWeight(1.0);
1203	1514
	1515	+ }
	1516	+
1204	1517	centralPanel.add(cameraView);
	1518	+ centralPanel.setFocusable(true);
1205	1519	//frame.setJMenuBar(timelineMenubar);
1206	1520	//centralPanel.add(timelinePanel);
1207	1521
..	..	@@ -1227,6 +1541,7 @@
1227	1541	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1228	1542	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1229	1543	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1544	+ //XYZPanel.setName("XYZ");
1230	1545
1231	1546	/*
1232	1547	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1264,13 +1579,29 @@
1264	1579	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1580	//tmp.setName("Edit");
1266	1581	objectPanel.add(materialPanel);
	1582	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1583	+ objectPanel.setToolTipTextAt(0, "Material");
	1584	+
	1585	+ objectPanel.add(toolboxPanel);
	1586	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1587	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1588	+
	1589	+ objectPanel.add(skyboxPanel);
	1590	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1591	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1592	+
1267	1593	// JPanel north = new JPanel(new BorderLayout());
1268	1594	// north.setName("Edit");
1269	1595	// north.add(ctrlPanel, BorderLayout.NORTH);
1270	1596	// objectPanel.add(north);
1271		- objectPanel.add(ctrlPanel);
1272		- objectPanel.add(infoPanel);
1273		-
	1597	+ objectPanel.add(editPanel);
	1598	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1599	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1600	+
	1601	+ objectPanel.add(XYZPanel);
	1602	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1603	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1604	+
1274	1605	/*
1275	1606	aConstraints.gridx = 0;
1276	1607	aConstraints.gridwidth = 1;
..	..	@@ -1278,7 +1609,7 @@
1278	1609	aConstraints.gridy += 1;
1279	1610	aConstraints.gridwidth = 1;
1280	1611	mainPanel.add(objectPanel, aConstraints);
1281		- */
	1612	+ */
1282	1613
1283	1614	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1284	1615	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1290,14 +1621,12 @@
1290	1621	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1622
1292	1623	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1624	+ scenePanel.preferredWidth = 5;
1294	1625
1295	1626	JTabbedPane tabbedPane = new JTabbedPane();
1296	1627	tabbedPane.add(scrollpane);
1297	1628
1298		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1299		-
1300		- optionsPanel = new cGridBag().setVertical(true);
	1629	+ optionsPanel = new cGridBag().setVertical(false);
1301	1630
1302	1631	optionsPanel.setName("Options");
1303	1632
..	..	@@ -1305,8 +1634,15 @@
1305	1634
1306	1635	tabbedPane.add(optionsPanel);
1307	1636
	1637	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1638	+
1308	1639	scenePanel.add(tabbedPane);
1309	1640
	1641	+ //if (Globals.ADVANCED)
	1642	+ tabbedPane.add(infoPanel);
	1643	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1644	+ tabbedPane.setToolTipTextAt(3, "Information");
	1645	+
1310	1646	/*
1311	1647	cTree jTree = new cTree(null);
1312	1648	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1368,7 +1704,7 @@
1368	1704	bigThree = new cGridBag();
1369	1705	bigThree.addComponent(scenePanel);
1370	1706	bigThree.addComponent(centralPanel);
1371		- bigThree.addComponent(XYZPanel);
	1707	+ //bigThree.addComponent(XYZPanel);
1372	1708
1373	1709	// // SIDE EFFECT!!!
1374	1710	// aConstraints.gridx = 0;
..	..	@@ -1377,9 +1713,26 @@
1377	1713	// aConstraints.gridheight = 1;
1378	1714
1379	1715	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1380		- framePanel.setContinuousLayout(true);
1381		- framePanel.setOneTouchExpandable(true);
1382		- framePanel.setDividerLocation(0.8);
	1716	+
	1717	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1718	+ new java.beans.PropertyChangeListener()
	1719	+ {
	1720	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1721	+ {
	1722	+ if ((Integer)pce.getOldValue() == 1)
	1723	+ {
	1724	+ if (radio.layout != expandedLayout)
	1725	+ {
	1726	+ radio.layout = expandedLayout;
	1727	+ radio.layout.doClick();
	1728	+ }
	1729	+ }
	1730	+ }
	1731	+ });
	1732	+
	1733	+ framePanel.setContinuousLayout(false);
	1734	+ framePanel.setOneTouchExpandable(false);
	1735	+ //.setDividerLocation(0.8);
1383	1736	//framePanel.setDividerSize(15);
1384	1737	//framePanel.setResizeWeight(0.15);
1385	1738	framePanel.setName("Frame");
..	..	@@ -1396,15 +1749,19 @@
1396	1749
1397	1750	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1751
1399		- frame.setSize(1024, 768);
1400		- frame.show();
1401		-
	1752	+ frame.setSize(1280, 860);
	1753	+
	1754	+ cameraView.requestFocusInWindow();
	1755	+
1402	1756	gridPanel.setDividerLocation(1.0);
	1757	+
	1758	+ frame.validate();
	1759	+
	1760	+ frame.setVisible(true);
1403	1761
1404	1762	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1405	1763	frame.addWindowListener(new WindowAdapter()
1406	1764	{
1407		-
1408	1765	public void windowClosing(WindowEvent e)
1409	1766	{
1410	1767	Close();
..	..	@@ -1427,26 +1784,425 @@
1427	1784	ctrlPanel.removeAll();
1428	1785	}
1429	1786
1430		- void SetupMaterial(cGridBag panel)
	1787	+ void SetupMaterial(cGridBag materialpanel)
1431	1788	{
1432		- /*
	1789	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1790	+
	1791	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1792	+ skin.setToolTipText("Skin");
	1793	+ skin.addMouseListener(new MouseAdapter()
	1794	+ {
	1795	+ public void mouseClicked(MouseEvent e)
	1796	+ {
	1797	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1798	+ cMaterial material = object.material;
	1799	+
	1800	+ // Skin
	1801	+ colorField.setFloat(material.color);
	1802	+ saturationField.setFloat(material.modulation);
	1803	+ subsurfaceField.setFloat(material.subsurface);
	1804	+ selfshadowField.setFloat(material.diffuseness);
	1805	+ diffusenessField.setFloat(material.factor);
	1806	+ shininessField.setFloat(material.shininess);
	1807	+ shadowbiasField.setFloat(material.shadowbias);
	1808	+ diffuseField.setFloat(material.diffuse);
	1809	+ specularField.setFloat(material.specular);
	1810	+
	1811	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1812	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1813	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1814	+
	1815	+ materialtouched = true;
	1816	+ applySelf();
	1817	+ }
	1818	+ });
	1819	+ presetpanel.add(skin);
	1820	+
	1821	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1822	+ lambert.setToolTipText("Diffuse");
	1823	+ lambert.addMouseListener(new MouseAdapter()
	1824	+ {
	1825	+ public void mouseClicked(MouseEvent e)
	1826	+ {
	1827	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1828	+ cMaterial material = object.material;
	1829	+
	1830	+ diffusenessField.setFloat(material.factor);
	1831	+ selfshadowField.setFloat(material.diffuseness);
	1832	+
	1833	+ materialtouched = true;
	1834	+ applySelf();
	1835	+ }
	1836	+ });
	1837	+ presetpanel.add(lambert);
	1838	+
	1839	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1840	+ diffuse2.setToolTipText("Diffuse2");
	1841	+ diffuse2.addMouseListener(new MouseAdapter()
	1842	+ {
	1843	+ public void mouseClicked(MouseEvent e)
	1844	+ {
	1845	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1846	+ cMaterial material = object.material;
	1847	+
	1848	+ diffusenessField.setFloat(material.factor);
	1849	+ selfshadowField.setFloat(material.diffuseness);
	1850	+
	1851	+ materialtouched = true;
	1852	+ applySelf();
	1853	+ }
	1854	+ });
	1855	+ presetpanel.add(diffuse2);
	1856	+
	1857	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1858	+ diffusemoon.setToolTipText("Moon");
	1859	+ diffusemoon.addMouseListener(new MouseAdapter()
	1860	+ {
	1861	+ public void mouseClicked(MouseEvent e)
	1862	+ {
	1863	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1864	+ cMaterial material = object.material;
	1865	+
	1866	+ diffusenessField.setFloat(material.factor);
	1867	+ selfshadowField.setFloat(material.diffuseness);
	1868	+
	1869	+ materialtouched = true;
	1870	+ applySelf();
	1871	+ }
	1872	+ });
	1873	+ presetpanel.add(diffusemoon);
	1874	+
	1875	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1876	+ diffusemoon2.setToolTipText("Moon2");
	1877	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1878	+ {
	1879	+ public void mouseClicked(MouseEvent e)
	1880	+ {
	1881	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1882	+ cMaterial material = object.material;
	1883	+
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+
	1887	+ materialtouched = true;
	1888	+ applySelf();
	1889	+ }
	1890	+ });
	1891	+ presetpanel.add(diffusemoon2);
	1892	+
	1893	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1894	+ diffusemoon3.setToolTipText("Moon3");
	1895	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1896	+ {
	1897	+ public void mouseClicked(MouseEvent e)
	1898	+ {
	1899	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1900	+ cMaterial material = object.material;
	1901	+
	1902	+ diffusenessField.setFloat(material.factor);
	1903	+ selfshadowField.setFloat(material.diffuseness);
	1904	+
	1905	+ materialtouched = true;
	1906	+ applySelf();
	1907	+ }
	1908	+ });
	1909	+ presetpanel.add(diffusemoon3);
	1910	+
	1911	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1912	+ diffusesheen.setToolTipText("Sheen");
	1913	+ diffusesheen.addMouseListener(new MouseAdapter()
	1914	+ {
	1915	+ public void mouseClicked(MouseEvent e)
	1916	+ {
	1917	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1918	+ cMaterial material = object.material;
	1919	+
	1920	+ sheenField.setFloat(material.sheen);
	1921	+
	1922	+ materialtouched = true;
	1923	+ applySelf();
	1924	+ }
	1925	+ });
	1926	+ presetpanel.add(diffusesheen);
	1927	+
	1928	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1929	+ rough.setToolTipText("Rough metal");
	1930	+ rough.addMouseListener(new MouseAdapter()
	1931	+ {
	1932	+ public void mouseClicked(MouseEvent e)
	1933	+ {
	1934	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1935	+ cMaterial material = object.material;
	1936	+
	1937	+ shininessField.setFloat(material.shininess);
	1938	+ velvetField.setFloat(material.velvet);
	1939	+
	1940	+ materialtouched = true;
	1941	+ applySelf();
	1942	+ }
	1943	+ });
	1944	+ presetpanel.add(rough);
	1945	+
	1946	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1947	+ rough2.setToolTipText("Medium metal");
	1948	+ rough2.addMouseListener(new MouseAdapter()
	1949	+ {
	1950	+ public void mouseClicked(MouseEvent e)
	1951	+ {
	1952	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1953	+ cMaterial material = object.material;
	1954	+
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ lightareaField.setFloat(material.lightarea);
	1957	+
	1958	+ materialtouched = true;
	1959	+ applySelf();
	1960	+ }
	1961	+ });
	1962	+ presetpanel.add(rough2);
	1963	+
	1964	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1965	+ shini0.setToolTipText("Shiny");
	1966	+ shini0.addMouseListener(new MouseAdapter()
	1967	+ {
	1968	+ public void mouseClicked(MouseEvent e)
	1969	+ {
	1970	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1971	+ cMaterial material = object.material;
	1972	+
	1973	+ shininessField.setFloat(material.shininess);
	1974	+ lightareaField.setFloat(material.lightarea);
	1975	+
	1976	+ materialtouched = true;
	1977	+ applySelf();
	1978	+ }
	1979	+ });
	1980	+ presetpanel.add(shini0);
	1981	+
	1982	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1983	+ shini1.setToolTipText("Shiny2");
	1984	+ shini1.addMouseListener(new MouseAdapter()
	1985	+ {
	1986	+ public void mouseClicked(MouseEvent e)
	1987	+ {
	1988	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1989	+ cMaterial material = object.material;
	1990	+
	1991	+ shininessField.setFloat(material.shininess);
	1992	+ lightareaField.setFloat(material.lightarea);
	1993	+
	1994	+ materialtouched = true;
	1995	+ applySelf();
	1996	+ }
	1997	+ });
	1998	+ presetpanel.add(shini1);
	1999	+
	2000	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2001	+ shini2.setToolTipText("Shiny3");
	2002	+ shini2.addMouseListener(new MouseAdapter()
	2003	+ {
	2004	+ public void mouseClicked(MouseEvent e)
	2005	+ {
	2006	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2007	+ cMaterial material = object.material;
	2008	+
	2009	+ shininessField.setFloat(material.shininess);
	2010	+ lightareaField.setFloat(material.lightarea);
	2011	+
	2012	+ materialtouched = true;
	2013	+ applySelf();
	2014	+ }
	2015	+ });
	2016	+ presetpanel.add(shini2);
	2017	+
	2018	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2019	+ aniso.setToolTipText("AnisoU");
	2020	+ aniso.addMouseListener(new MouseAdapter()
	2021	+ {
	2022	+ public void mouseClicked(MouseEvent e)
	2023	+ {
	2024	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2025	+ cMaterial material = object.material;
	2026	+
	2027	+ anisoField.setFloat(material.aniso);
	2028	+ anisoVField.setFloat(material.anisoV);
	2029	+
	2030	+ materialtouched = true;
	2031	+ applySelf();
	2032	+ }
	2033	+ });
	2034	+ presetpanel.add(aniso);
	2035	+
	2036	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2037	+ aniso2.setToolTipText("AnisoV");
	2038	+ aniso2.addMouseListener(new MouseAdapter()
	2039	+ {
	2040	+ public void mouseClicked(MouseEvent e)
	2041	+ {
	2042	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2043	+ cMaterial material = object.material;
	2044	+
	2045	+ anisoField.setFloat(material.aniso);
	2046	+ anisoVField.setFloat(material.anisoV);
	2047	+
	2048	+ materialtouched = true;
	2049	+ applySelf();
	2050	+ }
	2051	+ });
	2052	+ presetpanel.add(aniso2);
	2053	+
	2054	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2055	+ aniso3.setToolTipText("AnisoUV");
	2056	+ aniso3.addMouseListener(new MouseAdapter()
	2057	+ {
	2058	+ public void mouseClicked(MouseEvent e)
	2059	+ {
	2060	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2061	+ cMaterial material = object.material;
	2062	+
	2063	+ anisoField.setFloat(material.aniso);
	2064	+ anisoVField.setFloat(material.anisoV);
	2065	+
	2066	+ materialtouched = true;
	2067	+ applySelf();
	2068	+ }
	2069	+ });
	2070	+ presetpanel.add(aniso3);
	2071	+
	2072	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2073	+ velvet0.setToolTipText("Velvet");
	2074	+ velvet0.addMouseListener(new MouseAdapter()
	2075	+ {
	2076	+ public void mouseClicked(MouseEvent e)
	2077	+ {
	2078	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2079	+ cMaterial material = object.material;
	2080	+
	2081	+ diffusenessField.setFloat(material.factor);
	2082	+ selfshadowField.setFloat(material.diffuseness);
	2083	+ sheenField.setFloat(material.sheen);
	2084	+ shininessField.setFloat(material.shininess);
	2085	+ velvetField.setFloat(material.velvet);
	2086	+ shiftField.setFloat(material.shift);
	2087	+
	2088	+ materialtouched = true;
	2089	+ applySelf();
	2090	+ }
	2091	+ });
	2092	+ presetpanel.add(velvet0);
	2093	+
	2094	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2095	+ bump0.setToolTipText("Bump texture");
	2096	+ bump0.addMouseListener(new MouseAdapter()
	2097	+ {
	2098	+ public void mouseClicked(MouseEvent e)
	2099	+ {
	2100	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2101	+ cMaterial material = object.material;
	2102	+
	2103	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2104	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2105	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(bump0);
	2112	+
	2113	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2114	+ halo.setToolTipText("Halo");
	2115	+ halo.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2123	+
	2124	+ materialtouched = true;
	2125	+ applySelf();
	2126	+ }
	2127	+ });
	2128	+ presetpanel.add(halo);
	2129	+
	2130	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2131	+ candle.setToolTipText("Candle");
	2132	+ candle.addMouseListener(new MouseAdapter()
	2133	+ {
	2134	+ public void mouseClicked(MouseEvent e)
	2135	+ {
	2136	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2137	+ cMaterial material = object.material;
	2138	+
	2139	+ subsurfaceField.setFloat(material.subsurface);
	2140	+ shadowbiasField.setFloat(material.shadowbias);
	2141	+ ambientField.setFloat(material.ambient);
	2142	+ specularField.setFloat(material.specular);
	2143	+ lightareaField.setFloat(material.lightarea);
	2144	+ shininessField.setFloat(material.shininess);
	2145	+
	2146	+ materialtouched = true;
	2147	+ applySelf();
	2148	+ }
	2149	+ });
	2150	+ presetpanel.add(candle);
	2151	+
	2152	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2153	+ shadowShader.setToolTipText("Shadow");
	2154	+ shadowShader.addMouseListener(new MouseAdapter()
	2155	+ {
	2156	+ public void mouseClicked(MouseEvent e)
	2157	+ {
	2158	+ diffuseField.setFloat(0.001);
	2159	+ ambientField.setFloat(0.001);
	2160	+ cameraField.setFloat(0.001);
	2161	+ specularField.setFloat(0.001);
	2162	+ fakedepthField.setFloat(0.001);
	2163	+ opacityField.setFloat(0.6);
	2164	+
	2165	+ materialtouched = true;
	2166	+ applySelf();
	2167	+ }
	2168	+ });
	2169	+ presetpanel.add(shadowShader);
	2170	+
	2171	+ cGridBag panel = new cGridBag().setVertical(true);
	2172	+
	2173	+ presetpanel.preferredWidth = 1;
	2174	+
	2175	+ materialpanel.add(presetpanel);
	2176	+ materialpanel.add(panel);
	2177	+
	2178	+ panel.preferredWidth = 8;
	2179	+
	2180	+ /*
1433	2181	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1434	2182	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1435		- */
	2183	+ */
1436	2184
1437	2185	cGridBag editBar = new cGridBag().setVertical(false);
1438	2186
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	2187	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2188	+ createMaterialButton.setToolTipText("Create material");
1440	2189
1441	2190	/*
1442	2191	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	2192	*/
1444	2193
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);
	2194	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2195	+ clearMaterialButton.setToolTipText("Clear material");
	2196	+
	2197	+ if (Globals.ADVANCED)
	2198	+ {
	2199	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2200	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2201	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2202	+ }
1449	2203
	2204	+ editBar.preferredHeight = 15;
	2205	+
1450	2206	panel.add(editBar);
1451	2207
1452	2208	/**/
..	..	@@ -1458,45 +2214,50 @@
1458	2214	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1459	2215
1460	2216	cGridBag colorSection = new cGridBag().setVertical(true);
	2217	+
	2218	+ cGridBag huepanel = new cGridBag();
	2219	+ cGridBag huelabel = new cGridBag();
	2220	+ skin = GetLabel("icons/hue.png", false);
	2221	+ skin.fit = true;
	2222	+ huelabel.add(skin);
	2223	+ huelabel.preferredWidth = 20;
	2224	+ huepanel.add(new cGridBag()); // Label
	2225	+ huepanel.add(huelabel); // Field/slider
	2226	+
	2227	+ huepanel.preferredHeight = 7;
	2228	+
	2229	+ colorSection.add(huepanel);
1461	2230
1462	2231	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);
	2232	+
	2233	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2234	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2235	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2236	+
1466	2237	//colorField.preferredWidth = 200;
1467	2238	colorSection.add(color);
1468	2239
1469	2240	cGridBag modulation = new cGridBag();
1470	2241	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1471	2242	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2243	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1473	2244	colorSection.add(modulation);
1474	2245
	2246	+ cGridBag opacity = new cGridBag();
	2247	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2248	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2249	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2250	+ colorSection.add(opacity);
	2251	+
	2252	+ colorSection.add(GetSeparator());
	2253	+
1475	2254	cGridBag texture = new cGridBag();
1476	2255	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1477	2256	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478	2257	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479	2258	colorSection.add(texture);
1480	2259
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());
	2260	+ panel.add(GetSeparator());
1500	2261
1501	2262	panel.add(colorSection);
1502	2263
..	..	@@ -1546,7 +2307,13 @@
1546	2307	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1547	2308	diffuseSection.add(fakedepth);
1548	2309
1549		- panel.add(new JSeparator());
	2310	+ cGridBag shadowbias = new cGridBag();
	2311	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2312	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2313	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2314	+ diffuseSection.add(shadowbias);
	2315	+
	2316	+ panel.add(GetSeparator());
1550	2317
1551	2318	panel.add(diffuseSection);
1552	2319
..	..	@@ -1596,42 +2363,48 @@
1596	2363	// aConstraints.gridy += 1;
1597	2364	// aConstraints.gridwidth = 1;
1598	2365
	2366	+ cGridBag anisoU = new cGridBag();
	2367	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2368	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2369	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2370	+ specularSection.add(anisoU);
1599	2371
1600		- panel.add(new JSeparator());
	2372	+ cGridBag anisoV = new cGridBag();
	2373	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2374	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2375	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2376	+ specularSection.add(anisoV);
	2377	+
	2378	+
	2379	+ panel.add(GetSeparator());
1601	2380
1602	2381	panel.add(specularSection);
1603	2382
1604	2383	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1605	2384
1606		- cGridBag globalSection = new cGridBag().setVertical(true);
	2385	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1607	2386
1608	2387	cGridBag camera = new cGridBag();
1609	2388	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1610	2389	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611	2390	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612		- globalSection.add(camera);
	2391	+ colorSection.add(camera);
1613	2392
1614	2393	cGridBag ambient = new cGridBag();
1615	2394	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1616	2395	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617	2396	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1618		- globalSection.add(ambient);
	2397	+ colorSection.add(ambient);
1619	2398
1620	2399	cGridBag backlit = new cGridBag();
1621	2400	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1622	2401	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	2402	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1624		- globalSection.add(backlit);
	2403	+ colorSection.add(backlit);
1625	2404
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());
	2405	+ //panel.add(new JSeparator());
1633	2406
1634		- panel.add(globalSection);
	2407	+ //panel.add(globalSection);
1635	2408
1636	2409	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1637	2410
..	..	@@ -1673,7 +2446,7 @@
1673	2446	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1674	2447	textureSection.add(opacityPower);
1675	2448
1676		- panel.add(new JSeparator());
	2449	+ panel.add(GetSeparator());
1677	2450
1678	2451	panel.add(textureSection);
1679	2452
..	..	@@ -1712,12 +2485,15 @@
1712	2485	opacityPowerField.addChangeListener(this);
1713	2486	/**/
1714	2487
1715		- resetSlidersButton.addActionListener(this);
1716	2488	clearMaterialButton.addActionListener(this);
1717	2489	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	2490	+
	2491	+ if (Globals.ADVANCED)
	2492	+ {
	2493	+ resetSlidersButton.addActionListener(this);
	2494	+ propagateToggle.addItemListener(this);
	2495	+ multiplyToggle.addItemListener(this);
	2496	+ }
1721	2497	}
1722	2498
1723	2499	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1735,8 +2511,9 @@
1735	2511	// 3D models
1736	2512	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1737	2513	{
1738		- lastConverter = new com.jmex.model.converters.MaxToJme();
1739		- LoadFile(filename, lastConverter);
	2514	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2515	+ //LoadFile(filename, lastConverter);
	2516	+ LoadObjFile(filename); // New 3ds loader
1740	2517	continue;
1741	2518	}
1742	2519	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1888,7 +2665,7 @@
1888	2665
1889	2666	//? flashIt = false;
1890	2667	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	2668	+ pane.clickStart(location.x, location.y, 0, 0);
1892	2669	pane.clickEnd(location.x, location.y, 0, true);
1893	2670
1894	2671	if (group.selection.size() == 1)
..	..	@@ -1937,6 +2714,7 @@
1937	2714	e2.printStackTrace();
1938	2715	}
1939	2716	}
	2717	+
1940	2718	LoadJMEThread loadThread;
1941	2719
1942	2720	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +2772,7 @@
1994	2772	//LoadFile0(filename, converter);
1995	2773	}
1996	2774	}
	2775	+
1997	2776	LoadOBJThread loadObjThread;
1998	2777
1999	2778	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2851,19 @@
2072	2851
2073	2852	void LoadObjFile(String fullname)
2074	2853	{
2075		- /*
	2854	+ System.out.println("Loading " + fullname);
	2855	+ /**/
2076	2856	//lastFilename = fullname;
2077	2857	if(loadObjThread == null)
2078	2858	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2859	+ loadObjThread = new LoadOBJThread();
	2860	+ loadObjThread.start();
2081	2861	}
2082	2862
2083	2863	loadObjThread.add(fullname);
2084		- */
	2864	+ /**/
2085	2865
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2866	+ //makeSomething(new FileObject(fullname, true), true);
2088	2867	}
2089	2868
2090	2869	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +3124,11 @@
2345	3124
2346	3125	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	3126	{
2348		- if (GrafreeD.standAlone)
	3127	+ if (Grafreed.standAlone)
2349	3128	{
2350	3129	/**/
2351	3130	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	3131	+ browser.setVisible(true);
2353	3132	String filename = browser.getFile();
2354	3133	if (filename != null && filename.length() > 0)
2355	3134	{
..	..	@@ -2460,6 +3239,7 @@
2460	3239	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	3240	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	3241	}
	3242	+
2463	3243	//cJME.count++;
2464	3244	//cJME.count %= 12;
2465	3245	if (gc)
..	..	@@ -2643,6 +3423,7 @@
2643	3423	}
2644	3424	}
2645	3425	}
	3426	+
2646	3427	cFileSystemPane FSPane;
2647	3428
2648	3429	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2652,7 +3433,7 @@
2652	3433
2653	3434	freezematerial = true;
2654	3435	colorField.setFloat(mat.color);
2655		- modulationField.setFloat(mat.modulation);
	3436	+ saturationField.setFloat(mat.modulation);
2656	3437	metalnessField.setFloat(mat.metalness);
2657	3438	diffuseField.setFloat(mat.diffuse);
2658	3439	specularField.setFloat(mat.specular);
..	..	@@ -2696,11 +3477,14 @@
2696	3477	}
2697	3478	}
2698	3479	}
	3480	+
2699	3481	freezematerial = false;
2700	3482	}
2701	3483
2702	3484	void SetMaterial(Object3D object)
2703	3485	{
	3486	+ latestObject = object;
	3487	+
2704	3488	cMaterial mat = object.material;
2705	3489
2706	3490	if (mat == null)
..	..	@@ -2709,7 +3493,8 @@
2709	3493	return;
2710	3494	}
2711	3495
2712		- multiplyToggle.setSelected(mat.multiply);
	3496	+ if (multiplyToggle != null)
	3497	+ multiplyToggle.setSelected(mat.multiply);
2713	3498
2714	3499	assert (object.projectedVertices != null);
2715	3500
..	..	@@ -2811,12 +3596,17 @@
2811	3596	// }
2812	3597
2813	3598	/**/
2814		- if (deselect)
	3599	+ if (deselect \|\| child == null)
2815	3600	{
2816	3601	//group.deselectAll();
2817	3602	//freeze = true;
2818	3603	GetTree().clearSelection();
2819	3604	//freeze = false;
	3605	+
	3606	+ if (child == null)
	3607	+ {
	3608	+ return;
	3609	+ }
2820	3610	}
2821	3611
2822	3612	//group.addSelectee(child);
..	..	@@ -2850,6 +3640,17 @@
2850	3640	public void itemStateChanged(ItemEvent event)
2851	3641	{
2852	3642	// System.out.println("Propagate = " + propagate);
	3643	+ if (event.getSource() == pinButton)
	3644	+ {
	3645	+ copy.pinned ^= true;
	3646	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3647	+ {
	3648	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3649	+ copy.CloseUI();
	3650	+ //copy.editWindow.refreshContents();
	3651	+ }
	3652	+ }
	3653	+ else
2853	3654	if (event.getSource() == propagateToggle)
2854	3655	{
2855	3656	propagate ^= true;
..	..	@@ -2885,7 +3686,7 @@
2885	3686	cameraView.ToggleDL();
2886	3687	cameraView.repaint();
2887	3688	return;
2888		- } else if (event.getSource() == toggleTextureItem)
	3689	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2889	3690	{
2890	3691	cameraView.ToggleTexture();
2891	3692	// june 2013 copy.HardTouch();
..	..	@@ -2924,9 +3725,9 @@
2924	3725	frame.validate();
2925	3726
2926	3727	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	3728	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2928	3729	{
2929		- cameraView.ToggleRandom();
	3730	+ cameraView.ToggleSwitch();
2930	3731	cameraView.repaint();
2931	3732	return;
2932	3733	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2954,12 +3755,17 @@
2954	3755	} else if (event.getSource() == liveCB)
2955	3756	{
2956	3757	copy.live ^= true;
	3758	+ objEditor.refreshContents(true); // To show item colors
	3759	+ return;
	3760	+ } else if (event.getSource() == selectableCB)
	3761	+ {
	3762	+ copy.dontselect ^= true;
2957	3763	return;
2958	3764	} else if (event.getSource() == hideCB)
2959	3765	{
2960	3766	copy.hide ^= true;
2961	3767	copy.Touch(); // display list issue
2962		- objEditor.refreshContents();
	3768	+ objEditor.refreshContents(true); // To show item colors
2963	3769	return;
2964	3770	} else if (event.getSource() == link2masterCB)
2965	3771	{
..	..	@@ -2969,6 +3775,7 @@
2969	3775	if (event.getSource() == randomCB)
2970	3776	{
2971	3777	copy.random ^= true;
	3778	+ objEditor.refreshContents();
2972	3779	return;
2973	3780	}
2974	3781	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3799,9 @@
2992	3799
2993	3800	public void actionPerformed(ActionEvent event)
2994	3801	{
	3802	+ Object source = event.getSource();
2995	3803	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3804	+ if (source == okbutton)
2997	3805	{
2998	3806	textpanel.setVisible(false);
2999	3807	textpanel.remove(textarea);
..	..	@@ -3005,7 +3813,7 @@
3005	3813	textarea = null;
3006	3814	textpanel = null;
3007	3815	}
3008		- if (event.getSource() == cancelbutton)
	3816	+ if (source == cancelbutton)
3009	3817	{
3010	3818	textpanel.setVisible(false);
3011	3819	textpanel.remove(textarea);
..	..	@@ -3017,50 +3825,50 @@
3017	3825	//applySelf();
3018	3826	//client.refreshEditWindow();
3019	3827	//refreshContents();
3020		- if (event.getSource() == nameField)
	3828	+ if (source == nameField)
3021	3829	{
3022	3830	//System.out.println("ObjEditor " + event);
3023	3831	applySelf0(true);
3024	3832	//parent.applySelf();
3025	3833	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3834	+ } else if (source == resetButton)
3027	3835	{
3028	3836	CameraPane.fullreset = true;
3029	3837	copy.Reset(); // ResetMeshes();
3030	3838	copy.Touch();
3031	3839	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3840	+ } else if (source == stepItem)
3033	3841	{
3034	3842	//cameraView.ONESTEP = true;
3035	3843	Globals.ONESTEP = true;
3036	3844	cameraView.repaint();
3037	3845	return;
3038		- } else if (event.getSource() == stepButton)
	3846	+ } else if (source == stepButton)
3039	3847	{
3040	3848	copy.Step();
3041	3849	copy.Touch();
3042	3850	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3851	+ } else if (source == slowerButton)
3044	3852	{
3045	3853	copy.Slower();
3046	3854	copy.Touch();
3047	3855	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3856	+ } else if (source == fasterButton)
3049	3857	{
3050	3858	copy.Faster();
3051	3859	copy.Touch();
3052	3860	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3861	+ } else if (source == remarkButton)
3054	3862	{
3055	3863	copy.Remark();
3056	3864	copy.Touch();
3057	3865	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3866	+ } else if (source == stepAllButton)
3059	3867	{
3060	3868	copy.StepAll();
3061	3869	copy.Touch();
3062	3870	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3871	+ } else if (source == resetAllButton)
3064	3872	{
3065	3873	//CameraPane.fullreset = true;
3066	3874	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3901,79 @@
3093	3901	// Close();
3094	3902	// }
3095	3903	// else
3096		- if (event.getSource() == resetSlidersButton)
	3904	+ if (source == resetSlidersButton)
3097	3905	{
3098	3906	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3907	+ } else if (source == clearMaterialButton)
3100	3908	{
3101	3909	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3910	+ } else if (source == createMaterialButton)
3103	3911	{
3104	3912	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3913	+ } else if (source == clearPanelButton)
3106	3914	{
3107	3915	copy.ClearUI();
3108	3916	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	3917	+ } else if (source == importGFDItem)
	3918	+ {
	3919	+ ImportGFD();
	3920	+ } else
	3921	+ if (source == importVRMLX3DItem)
	3922	+ {
	3923	+ ImportVRMLX3D();
	3924	+ } else
	3925	+ if (source == import3DSItem)
	3926	+ {
	3927	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3928	+ } else
	3929	+ if (source == importOBJItem)
	3930	+ {
	3931	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3932	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3933	+ browser.setVisible(true);
	3934	+ String filename = browser.getFile();
	3935	+ if (filename != null && filename.length() > 0)
	3936	+ {
	3937	+ String fullname = browser.getDirectory() + filename;
	3938	+ makeSomething(ReadOBJ(fullname), true);
	3939	+ }
	3940	+ } else
	3941	+ if (source == closeItem)
3115	3942	{
3116	3943	Close();
3117	3944	//return true;
3118		- } else if (event.getSource() == loadItem)
	3945	+ } else if (source == openItem)
3119	3946	{
3120		- load();
	3947	+ Open();
3121	3948	//return true;
3122		- } else if (event.getSource() == saveItem)
	3949	+ } else if (source == newItem)
	3950	+ {
	3951	+ New();
	3952	+ } else if (source == saveItem)
3123	3953	{
3124	3954	save();
3125	3955	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	3956	+ } else if (source == saveAsItem)
3127	3957	{
3128	3958	saveAs();
3129	3959	//return true;
3130		- } else if (event.getSource() == reexportItem)
	3960	+ } else if (source == reexportItem)
3131	3961	{
3132	3962	reexport();
3133	3963	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	3964	+ } else if (source == exportAsItem)
3135	3965	{
3136	3966	export();
3137	3967	//return true;
3138		- } else if (event.getSource() == povItem)
	3968	+ } else if (source == povItem)
3139	3969	{
3140	3970	generatePOV();
3141	3971	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	3972	+ } else if (event.getSource() == archiveItem)
	3973	+ {
	3974	+ cTools.Archive(frame);
	3975	+ return;
	3976	+ } else if (source == zBufferItem)
3143	3977	{
3144	3978	try
3145	3979	{
..	..	@@ -3161,21 +3995,8 @@
3161	3995	cameraView.repaint();
3162	3996	//return true;
3163	3997	}
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)
	3998	+ */ else // combos...
	3999	+ if (source == texresMenu)
3179	4000	{
3180	4001	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	4002	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +4008,472 @@
3187	4008	}
3188	4009	}
3189	4010
	4011	+ void New()
	4012	+ {
	4013	+ while (copy.Size() > 1)
	4014	+ {
	4015	+ copy.remove(1);
	4016	+ }
	4017	+
	4018	+ ResetModel();
	4019	+ objEditor.refreshContents();
	4020	+ }
	4021	+
	4022	+ static public byte[] Compress(Object3D o)
	4023	+ {
	4024	+ // Slower to actually compress.
	4025	+ try
	4026	+ {
	4027	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4028	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4029	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4030	+
	4031	+ Object3D parent = o.parent;
	4032	+ o.parent = null;
	4033	+
	4034	+ out.writeObject(o);
	4035	+
	4036	+ o.parent = parent;
	4037	+
	4038	+ out.flush();
	4039	+
	4040	+ baos //zstream
	4041	+ .close();
	4042	+ out.close();
	4043	+
	4044	+ byte[] bytes = baos.toByteArray();
	4045	+
	4046	+ System.out.println("save #bytes = " + bytes.length);
	4047	+ return bytes;
	4048	+ } catch (Exception e)
	4049	+ {
	4050	+ System.err.println(e);
	4051	+ return null;
	4052	+ }
	4053	+ }
	4054	+
	4055	+ static public Object Uncompress(byte[] bytes)
	4056	+ {
	4057	+ System.out.println("restore #bytes = " + bytes.length);
	4058	+ try
	4059	+ {
	4060	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4061	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4062	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4063	+ Object obj = in.readObject();
	4064	+
	4065	+ bais //istream
	4066	+ .close();
	4067	+ in.close();
	4068	+
	4069	+ return obj;
	4070	+ } catch (Exception e)
	4071	+ {
	4072	+ System.err.println(e);
	4073	+ return null;
	4074	+ }
	4075	+ }
	4076	+
	4077	+ static public Object clone(Object o)
	4078	+ {
	4079	+ try
	4080	+ {
	4081	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4082	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4083	+
	4084	+ out.writeObject(o);
	4085	+
	4086	+ out.flush();
	4087	+ out.close();
	4088	+
	4089	+ byte[] bytes = baos.toByteArray();
	4090	+
	4091	+ System.out.println("clone = " + bytes.length);
	4092	+
	4093	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4094	+ ObjectInputStream in = new ObjectInputStream(bais);
	4095	+ Object obj = in.readObject();
	4096	+ in.close();
	4097	+
	4098	+ return obj;
	4099	+ } catch (Exception e)
	4100	+ {
	4101	+ System.err.println(e);
	4102	+ return null;
	4103	+ }
	4104	+ }
	4105	+
	4106	+ cRadio GetCurrentTab()
	4107	+ {
	4108	+ cRadio ab;
	4109	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4110	+ {
	4111	+ ab = (cRadio)e.nextElement();
	4112	+ if(ab.GetObject() == copy)
	4113	+ {
	4114	+ return ab;
	4115	+ }
	4116	+ }
	4117	+
	4118	+ return null;
	4119	+ }
	4120	+
	4121	+
	4122	+ public void Save()
	4123	+ {
	4124	+ //Save(true);
	4125	+ Replace();
	4126	+ SetUndoStates();
	4127	+ }
	4128	+
	4129	+ private boolean Equal(byte[] compress, byte[] name)
	4130	+ {
	4131	+ if (compress.length != name.length)
	4132	+ {
	4133	+ return false;
	4134	+ }
	4135	+
	4136	+ for (int i=compress.length; --i>=0;)
	4137	+ {
	4138	+ if (compress[i] != name[i])
	4139	+ return false;
	4140	+ }
	4141	+
	4142	+ return true;
	4143	+ }
	4144	+
	4145	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4146	+
	4147	+ void DeleteVersion()
	4148	+ {
	4149	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4150	+ {
	4151	+ copy.versionlist[i] = copy.versionlist[i+1];
	4152	+ }
	4153	+
	4154	+ CopyChanged();
	4155	+
	4156	+ SetUndoStates();
	4157	+ }
	4158	+
	4159	+ public boolean Save(boolean user)
	4160	+ {
	4161	+ System.err.println("Save");
	4162	+ Replace();
	4163	+
	4164	+ cRadio tab = GetCurrentTab();
	4165	+
	4166	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4167	+
	4168	+ boolean thesame = false;
	4169	+
	4170	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4171	+// {
	4172	+// thesame = true;
	4173	+// }
	4174	+
	4175	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4176	+ if (!thesame)
	4177	+ {
	4178	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4179	+ {
	4180	+ copy.versionlist[i] = copy.versionlist[i-1];
	4181	+ }
	4182	+
	4183	+ //tab.user[tab.versionindex] = user;
	4184	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4185	+
	4186	+ copy.versionlist[++copy.versionindex] = compress;
	4187	+
	4188	+ // if (increment)
	4189	+ // tab.versionindex++;
	4190	+ }
	4191	+
	4192	+ //copy.RestoreBigData(versiontable);
	4193	+
	4194	+ //assert(hashtable.isEmpty());
	4195	+
	4196	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4197	+// {
	4198	+// //tab.user[i] = false;
	4199	+// copy.versionlist[i] = null;
	4200	+// }
	4201	+
	4202	+ SetUndoStates();
	4203	+
	4204	+ // test save
	4205	+ if (false)
	4206	+ {
	4207	+ try
	4208	+ {
	4209	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4210	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4211	+
	4212	+ p.writeObject(copy);
	4213	+
	4214	+ p.flush();
	4215	+
	4216	+ ostream.close();
	4217	+ } catch (Exception e)
	4218	+ {
	4219	+ e.printStackTrace();
	4220	+ }
	4221	+ }
	4222	+
	4223	+ return !thesame;
	4224	+ }
	4225	+
	4226	+ boolean flashIt = true;
	4227	+
	4228	+ void RefreshSelection()
	4229	+ {
	4230	+ Object3D selection = new Object3D();
	4231	+
	4232	+ for (int i = 0; i < copy.selection.size(); i++)
	4233	+ {
	4234	+ Object3D elem = copy.selection.elementAt(i);
	4235	+
	4236	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4237	+
	4238	+ if (obj == null)
	4239	+ {
	4240	+ copy.selection.remove(i--);
	4241	+ }
	4242	+ else
	4243	+ {
	4244	+ selection.add(obj);
	4245	+ copy.selection.setElementAt(obj, i);
	4246	+ }
	4247	+ }
	4248	+
	4249	+ flashIt = false;
	4250	+ GetTree().clearSelection();
	4251	+ for (int i = 0; i < selection.size(); i++)
	4252	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4253	+ flashIt = true;
	4254	+
	4255	+ //refreshContents(false);
	4256	+ }
	4257	+
	4258	+ void CopyChanged()
	4259	+ {
	4260	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4261	+
	4262	+ SetUndoStates();
	4263	+
	4264	+ boolean temp = CameraPane.SWITCH;
	4265	+ CameraPane.SWITCH = false;
	4266	+
	4267	+ copy.ExtractBigData(versiontable);
	4268	+
	4269	+ copy.clear();
	4270	+
	4271	+ copy.skyboxname = obj.skyboxname;
	4272	+ copy.skyboxext = obj.skyboxext;
	4273	+
	4274	+ for (int i=0; i<obj.Size(); i++)
	4275	+ {
	4276	+ copy.add(obj.get(i));
	4277	+ }
	4278	+
	4279	+ copy.RestoreBigData(versiontable);
	4280	+
	4281	+ CameraPane.SWITCH = temp;
	4282	+
	4283	+ RefreshSelection();
	4284	+ //assert(hashtable.isEmpty());
	4285	+
	4286	+ copy.Touch();
	4287	+
	4288	+ ResetModel();
	4289	+ copy.HardTouch(); // recompile?
	4290	+
	4291	+ cRadio ab;
	4292	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4293	+ {
	4294	+ ab = (cRadio)e.nextElement();
	4295	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4296	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4297	+ if (test != null)
	4298	+ {
	4299	+ test.editWindow = ab.object.editWindow;
	4300	+ ab.object = test;
	4301	+ }
	4302	+ }
	4303	+
	4304	+ refreshContents(true);
	4305	+ }
	4306	+
	4307	+ cButton previousVersionButton;
	4308	+ cButton restoreButton;
	4309	+ cButton replaceButton;
	4310	+ cButton nextVersionButton;
	4311	+ cButton saveVersionButton;
	4312	+ cButton deleteVersionButton;
	4313	+
	4314	+ boolean muteSlider;
	4315	+
	4316	+ int VersionCount()
	4317	+ {
	4318	+ int count = 0;
	4319	+
	4320	+ for (int i = copy.versionlist.length; --i >= 0;)
	4321	+ {
	4322	+ if (copy.versionlist[i] != null)
	4323	+ count++;
	4324	+ }
	4325	+
	4326	+ return count;
	4327	+ }
	4328	+
	4329	+ void SetUndoStates()
	4330	+ {
	4331	+ cRadio tab = GetCurrentTab();
	4332	+
	4333	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4334	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4335	+
	4336	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4337	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4338	+
	4339	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4340	+ copy.versionlist[copy.versionindex + 1] != null);
	4341	+
	4342	+ muteSlider = true;
	4343	+ versionSlider.setMaximum(VersionCount() - 1);
	4344	+ versionSlider.setInteger(copy.versionindex);
	4345	+ muteSlider = false;
	4346	+ }
	4347	+
	4348	+ public boolean PreviousVersion()
	4349	+ {
	4350	+ // Option?
	4351	+ Replace();
	4352	+
	4353	+ System.err.println("Undo");
	4354	+
	4355	+ cRadio tab = GetCurrentTab();
	4356	+
	4357	+ if (copy.versionindex == 0)
	4358	+ {
	4359	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4360	+ return false;
	4361	+ }
	4362	+
	4363	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4364	+// {
	4365	+// if (Save(false))
	4366	+// tab.versionindex -= 1;
	4367	+// else
	4368	+// {
	4369	+// if (tab.versionindex <= 0)
	4370	+// return false;
	4371	+// else
	4372	+// tab.versionindex -= 1;
	4373	+// }
	4374	+// }
	4375	+
	4376	+ copy.versionindex -= 1;
	4377	+
	4378	+ CopyChanged();
	4379	+
	4380	+ return true;
	4381	+ }
	4382	+
	4383	+ public boolean Restore()
	4384	+ {
	4385	+ System.err.println("Restore");
	4386	+
	4387	+ cRadio tab = GetCurrentTab();
	4388	+
	4389	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4390	+ {
	4391	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4392	+ return false;
	4393	+ }
	4394	+
	4395	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4396	+ CopyChanged();
	4397	+
	4398	+ return true;
	4399	+ }
	4400	+
	4401	+ public boolean Replace()
	4402	+ {
	4403	+ System.err.println("Replace");
	4404	+
	4405	+ cRadio tab = GetCurrentTab();
	4406	+
	4407	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4408	+ {
	4409	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4410	+ return false;
	4411	+ }
	4412	+
	4413	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4414	+
	4415	+ return true;
	4416	+ }
	4417	+
	4418	+ public void NextVersion()
	4419	+ {
	4420	+ // Option?
	4421	+ Replace();
	4422	+
	4423	+ cRadio tab = GetCurrentTab();
	4424	+
	4425	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4426	+ {
	4427	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4428	+ return;
	4429	+ }
	4430	+
	4431	+ copy.versionindex += 1;
	4432	+
	4433	+ CopyChanged();
	4434	+
	4435	+ //if (!tab.user[tab.versionindex])
	4436	+ // tab.graphs[tab.versionindex] = null;
	4437	+ }
	4438	+
	4439	+ void ImportGFD()
	4440	+ {
	4441	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4442	+ browser.show();
	4443	+ String filename = browser.getFile();
	4444	+ if (filename != null && filename.length() > 0)
	4445	+ {
	4446	+ String fullname = browser.getDirectory() + filename;
	4447	+
	4448	+ //Object3D readobj =
	4449	+ objEditor.ReadGFD(fullname, objEditor);
	4450	+ //makeSomething(readobj);
	4451	+ }
	4452	+ }
	4453	+
	4454	+ void ImportVRMLX3D()
	4455	+ {
	4456	+ if (Grafreed.standAlone)
	4457	+ {
	4458	+ /**/
	4459	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4460	+ browser.show();
	4461	+ String filename = browser.getFile();
	4462	+ if (filename != null && filename.length() > 0)
	4463	+ {
	4464	+ String fullname = browser.getDirectory() + filename;
	4465	+ LoadVRMLX3D(fullname);
	4466	+ }
	4467	+ /**/
	4468	+ }
	4469	+ }
	4470	+
3190	4471	void ToggleAnimation()
3191	4472	{
3192	4473	if (!Globals.ANIMATION)
3193	4474	{
3194	4475	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	4476	+ browser.setVisible(true);
3196	4477	String filename = browser.getFile();
3197	4478	if (filename != null && filename.length() > 0)
3198	4479	{
..	..	@@ -3202,8 +4483,8 @@
3202	4483
3203	4484	Globals.ANIMATION ^= true;
3204	4485
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	4486	+ Grafreed.wav.cursor = 0;
	4487	+ Grafreed.wav.loop = 0;
3207	4488	}
3208	4489	} else
3209	4490	{
..	..	@@ -3224,7 +4505,6 @@
3224	4505	callee.refreshContents();
3225	4506	} else
3226	4507	{
3227		- new Exception().printStackTrace();
3228	4508	System.exit(0);
3229	4509	}
3230	4510	}
..	..	@@ -3254,7 +4534,7 @@
3254	4534	void CreateMaterial()
3255	4535	{
3256	4536	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4537	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	4538	if (copy.selection.size() > 0)
3259	4539	//SetMaterial(copy);
3260	4540	{
..	..	@@ -3305,7 +4585,7 @@
3305	4585	assert false;
3306	4586	}
3307	4587
3308		- void EditSelection()
	4588	+ void EditSelection(boolean newWindow)
3309	4589	{
3310	4590	}
3311	4591
..	..	@@ -3313,11 +4593,11 @@
3313	4593	{
3314	4594	copy.ResetBlockLoop(); // temporary problem
3315	4595
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	4596	+ boolean random = CameraPane.SWITCH;
	4597	+ CameraPane.SWITCH = false; // parse everything
3318	4598	copy.ResetDisplayList();
3319	4599	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	4600	+ CameraPane.SWITCH = random;
3321	4601	}
3322	4602
3323	4603	// public void applySelf()
..	..	@@ -3364,7 +4644,7 @@
3364	4644	//copy.material = new cMaterial(copy.GetMaterial());
3365	4645
3366	4646	current.color = (float) colorField.getFloat();
3367		- current.modulation = (float) modulationField.getFloat();
	4647	+ current.modulation = (float) saturationField.getFloat();
3368	4648	current.metalness = (float) metalnessField.getFloat();
3369	4649	current.diffuse = (float) diffuseField.getFloat();
3370	4650	current.specular = (float) specularField.getFloat();
..	..	@@ -3391,6 +4671,36 @@
3391	4671	{
3392	4672	//System.out.println("Propagate = " + propagate);
3393	4673	copy.UpdateMaterial(anchor, current, propagate);
	4674	+
	4675	+ if (copy.material != null)
	4676	+ {
	4677	+ cMaterial mat = copy.material;
	4678	+
	4679	+ colorField.SetToolTipValue((mat.color));
	4680	+ saturationField.SetToolTipValue((mat.modulation));
	4681	+ metalnessField.SetToolTipValue((mat.metalness));
	4682	+ diffuseField.SetToolTipValue((mat.diffuse));
	4683	+ specularField.SetToolTipValue((mat.specular));
	4684	+ shininessField.SetToolTipValue((mat.shininess));
	4685	+ shiftField.SetToolTipValue((mat.shift));
	4686	+ ambientField.SetToolTipValue((mat.ambient));
	4687	+ lightareaField.SetToolTipValue((mat.lightarea));
	4688	+ diffusenessField.SetToolTipValue((mat.factor));
	4689	+ velvetField.SetToolTipValue((mat.velvet));
	4690	+ sheenField.SetToolTipValue((mat.sheen));
	4691	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4692	+ backlitField.SetToolTipValue((mat.bump));
	4693	+ anisoField.SetToolTipValue((mat.aniso));
	4694	+ anisoVField.SetToolTipValue((mat.anisoV));
	4695	+ cameraField.SetToolTipValue((mat.cameralight));
	4696	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4697	+ shadowField.SetToolTipValue((mat.shadow));
	4698	+ textureField.SetToolTipValue((mat.texture));
	4699	+ opacityField.SetToolTipValue((mat.opacity));
	4700	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4701	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4702	+ }
	4703	+
3394	4704	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	4705	{
3396	4706	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3419,9 +4729,26 @@
3419	4729	//copy.Touch();
3420	4730	}
3421	4731
	4732	+ cNumberSlider versionSlider;
	4733	+
3422	4734	public void stateChanged(ChangeEvent e)
3423	4735	{
3424	4736	// assert(false);
	4737	+ if (e.getSource() == versionSlider)
	4738	+ {
	4739	+ if (muteSlider)
	4740	+ return;
	4741	+
	4742	+ int version = versionSlider.getInteger();
	4743	+
	4744	+ if (copy.versionlist[version] != null)
	4745	+ {
	4746	+ copy.versionindex = version;
	4747	+ CopyChanged();
	4748	+ }
	4749	+
	4750	+ return;
	4751	+ }
3425	4752
3426	4753	if (freezematerial)
3427	4754	{
..	..	@@ -3457,6 +4784,12 @@
3457	4784	{
3458	4785	//System.out.println("stateChanged = " + this);
3459	4786	materialtouched = true;
	4787	+
	4788	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4789	+ {
	4790	+ saturationField.setFloat(1);
	4791	+ }
	4792	+
3460	4793	applySelf();
3461	4794	//System.out.println("this = " + this);
3462	4795	//System.out.println("PARENT = " + parent);
..	..	@@ -3506,7 +4839,7 @@
3506	4839	}
3507	4840
3508	4841	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4842	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	4843	}
3511	4844
3512	4845	void SnapObject()
..	..	@@ -3756,6 +5089,7 @@
3756	5089	{
3757	5090	if (GetTree() != null)
3758	5091	{
	5092	+ GetTree().revalidate();
3759	5093	GetTree().repaint();
3760	5094	}
3761	5095
..	..	@@ -3764,12 +5098,17 @@
3764	5098	ctrlPanel.validate(); // ? new
3765	5099	ctrlPanel.repaint();
3766	5100	}
	5101	+
	5102	+ if (previousVersionButton != null && copy.versionlist != null)
	5103	+ SetUndoStates();
3767	5104	}
3768	5105
3769	5106	static TweenManager tweenManager = new TweenManager();
3770	5107
3771	5108	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	5109	{
	5110	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5111	+ Save();
3773	5112	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	5113	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	5114	// if (thing instanceof GenericJointDemo)
..	..	@@ -3856,6 +5195,12 @@
3856	5195	{
3857	5196	ResetModel();
3858	5197	Select(thing.GetTreePath(), true, false); // unselect... false);
	5198	+
	5199	+ if (thing.Size() == 0)
	5200	+ {
	5201	+ //EditSelection(false);
	5202	+ }
	5203	+
3859	5204	refreshContents();
3860	5205	}
3861	5206
..	..	@@ -3973,6 +5318,7 @@
3973	5318	}
3974	5319	}
3975	5320	}
	5321	+
3976	5322	LoadGFDThread loadGFDThread;
3977	5323
3978	5324	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +5338,10 @@
3992	5338
3993	5339	try
3994	5340	{
	5341	+ // Try compressed version first.
3995	5342	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5343	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5344	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	5345
3998	5346	readobj = (Object3D) p.readObject();
3999	5347	istream.close();
..	..	@@ -4001,7 +5349,22 @@
4001	5349	readobj.ResetDisplayList();
4002	5350	} catch (Exception e)
4003	5351	{
4004		- e.printStackTrace();
	5352	+ if (!e.toString().contains("GZIP"))
	5353	+ e.printStackTrace();
	5354	+
	5355	+ try
	5356	+ {
	5357	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5358	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5359	+
	5360	+ readobj = (Object3D) p.readObject();
	5361	+ istream.close();
	5362	+
	5363	+ readobj.ResetDisplayList();
	5364	+ } catch (Exception e2)
	5365	+ {
	5366	+ e2.printStackTrace();
	5367	+ }
4005	5368	}
4006	5369	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	5370	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +5410,12 @@
4047	5410
4048	5411	void LoadIt(Object obj)
4049	5412	{
	5413	+ if (obj == null)
	5414	+ {
	5415	+ // Invalid file
	5416	+ return;
	5417	+ }
	5418	+
4050	5419	System.out.println("Loaded " + obj);
4051	5420	//new Exception().printStackTrace();
4052	5421	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,10 +5425,14 @@
4056	5425
4057	5426	if (readobj != null)
4058	5427	{
	5428	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5429	+ // Save();
4059	5430	try
4060	5431	{
4061	5432	//readobj.deepCopySelf(copy);
4062	5433	copy.clear(); // june 2014
	5434	+ copy.skyboxname = readobj.skyboxname;
	5435	+ copy.skyboxext = readobj.skyboxext;
4063	5436	for (int i = 0; i < readobj.size(); i++)
4064	5437	{
4065	5438	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4100,6 +5473,7 @@
4100	5473	}
4101	5474	} catch (ClassCastException e)
4102	5475	{
	5476	+ e.printStackTrace();
4103	5477	assert (false);
4104	5478	Composite c = (Composite) copy;
4105	5479	c.children.clear();
..	..	@@ -4110,17 +5484,28 @@
4110	5484	c.addChild(csg);
4111	5485	}
4112	5486
	5487	+ copy.versionlist = readobj.versionlist;
	5488	+ copy.versionindex = readobj.versionindex;
	5489	+
	5490	+ if (copy.versionlist == null)
	5491	+ {
	5492	+ copy.versionlist = new Object3D[100];
	5493	+ copy.versionindex = -1;
	5494	+ }
	5495	+
	5496	+ //? SetUndoStates();
	5497	+
4113	5498	ResetModel();
4114	5499	copy.HardTouch(); // recompile?
4115	5500	refreshContents();
4116	5501	}
4117	5502	}
4118	5503
4119		- void load() // throws ClassNotFoundException
	5504	+ void Open() // throws ClassNotFoundException
4120	5505	{
4121		- if (GrafreeD.standAlone)
	5506	+ if (Grafreed.standAlone)
4122	5507	{
4123		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5508	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4124	5509	browser.show();
4125	5510	String filename = browser.getFile();
4126	5511	if (filename != null && filename.length() > 0)
..	..	@@ -4205,11 +5590,13 @@
4205	5590	try
4206	5591	{
4207	5592	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5593	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5594	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	5595
4210	5596	p.writeObject(copy);
4211	5597	p.flush();
4212	5598
	5599	+ zstream.close();
4213	5600	ostream.close();
4214	5601
4215	5602	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4217,19 +5604,23 @@
4217	5604	//ps.print(buffer.toString());
4218	5605	} catch (IOException e)
4219	5606	{
	5607	+ e.printStackTrace();
4220	5608	}
4221	5609	}
	5610	+
4222	5611	String lastname;
4223	5612
4224	5613	void saveAs()
4225	5614	{
4226		- if (GrafreeD.standAlone)
	5615	+ if (Grafreed.standAlone)
4227	5616	{
4228	5617	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	5618	browser.setVisible(true);
4230	5619	String filename = browser.getFile();
4231	5620	if (filename != null && filename.length() > 0)
4232	5621	{
	5622	+ if (!filename.endsWith(".gfd"))
	5623	+ filename += ".gfd";
4233	5624	lastname = browser.getDirectory() + filename;
4234	5625	save();
4235	5626	}
..	..	@@ -4328,13 +5719,13 @@
4328	5719	try
4329	5720	{
4330	5721	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5722	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5723	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	5724
4334	5725	Object3D objectparent = obj.parent;
4335	5726	obj.parent = null;
4336	5727
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5728	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	5729
4339	5730	obj.parent = objectparent;
4340	5731
..	..	@@ -4346,8 +5737,8 @@
4346	5737	p.writeObject(object);
4347	5738	p.flush();
4348	5739
	5740	+ zstream.close();
4349	5741	ostream.close();
4350		- // zstream.close();
4351	5742
4352	5743	// group.selection.get(0).parent = parent;
4353	5744	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +5759,7 @@
4368	5759	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	5760	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	5761	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	5762	+ if (Grafreed.standAlone)
4372	5763	{
4373	5764	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	5765	browser.show();
..	..	@@ -4394,19 +5785,18 @@
4394	5785	Object3D client;
4395	5786	Object3D copy;
4396	5787	MenuBar menuBar;
4397		- Menu windowMenu;
4398		- MenuItem loadItem;
	5788	+ Menu fileMenu;
	5789	+ MenuItem newItem;
	5790	+ MenuItem openItem;
4399	5791	MenuItem saveItem;
4400	5792	MenuItem saveAsItem;
4401	5793	MenuItem exportAsItem;
4402	5794	MenuItem reexportItem;
4403	5795	MenuItem povItem;
4404	5796	MenuItem closeItem;
4405		- Menu cameraMenu;
	5797	+
4406	5798	CheckboxMenuItem zBufferItem;
4407	5799	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	5800	MenuItem stepItem;
4411	5801	CheckboxMenuItem toggleLiveItem;
4412	5802	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,25 +5807,40 @@
4417	5807	CheckboxMenuItem toggleFootContactItem;
4418	5808	CheckboxMenuItem toggleDLItem;
4419	5809	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	5810	+ CheckboxMenuItem toggleSwitchItem;
4421	5811	CheckboxMenuItem toggleRootItem;
4422	5812	CheckboxMenuItem animationItem;
	5813	+ MenuItem archiveItem;
4423	5814	CheckboxMenuItem toggleHandleItem;
4424	5815	CheckboxMenuItem togglePaintItem;
4425	5816	JSplitPane mainPanel;
4426	5817	JScrollPane scrollpane;
	5818	+
4427	5819	JPanel toolbarPanel;
4428		- JPanel treePanel;
	5820	+
	5821	+ cGridBag treePanel;
	5822	+
4429	5823	JPanel radioPanel;
4430	5824	ButtonGroup buttonGroup;
4431		- cGridBag ctrlPanel;
	5825	+
	5826	+ cGridBag toolboxPanel;
	5827	+ cGridBag skyboxPanel;
4432	5828	cGridBag materialPanel;
	5829	+ cGridBag ctrlPanel;
	5830	+
4433	5831	JScrollPane infoPanel;
	5832	+
4434	5833	cGridBag optionsPanel;
	5834	+
4435	5835	JTabbedPane objectPanel;
	5836	+ boolean materialFlushed;
	5837	+ Object3D latestObject;
	5838	+
4436	5839	cGridBag XYZPanel;
	5840	+
4437	5841	JSplitPane gridPanel;
4438	5842	JSplitPane bigPanel;
	5843	+
4439	5844	cGridBag bigThree;
4440	5845	cGridBag scenePanel;
4441	5846	cGridBag centralPanel;
..	..	@@ -4493,7 +5898,7 @@
4493	5898	JLabel colorLabel;
4494	5899	cNumberSlider colorField;
4495	5900	JLabel modulationLabel;
4496		- cNumberSlider modulationField;
	5901	+ cNumberSlider saturationField;
4497	5902	JLabel metalnessLabel;
4498	5903	cNumberSlider metalnessField;
4499	5904	JLabel diffuseLabel;
..	..	@@ -4524,6 +5929,7 @@
4524	5929	cNumberSlider anisoField;
4525	5930	JLabel anisoVLabel;
4526	5931	cNumberSlider anisoVField;
	5932	+
4527	5933	JLabel cameraLabel;
4528	5934	cNumberSlider cameraField;
4529	5935	JLabel selfshadowLabel;
..	..	@@ -4538,6 +5944,7 @@
4538	5944	cNumberSlider fakedepthField;
4539	5945	JLabel shadowbiasLabel;
4540	5946	cNumberSlider shadowbiasField;
	5947	+
4541	5948	JLabel bumpLabel;
4542	5949	cNumberSlider bumpField;
4543	5950	JLabel noiseLabel;
..	..	@@ -4550,8 +5957,13 @@
4550	5957	cNumberSlider fogField;
4551	5958	JLabel opacityPowerLabel;
4552	5959	cNumberSlider opacityPowerField;
4553		- JTree jTree;
	5960	+ cTree jTree;
4554	5961	//ObjectUI parent;
4555	5962
4556	5963	cNumberSlider normalpushField;
	5964	+
	5965	+ private MenuItem importGFDItem;
	5966	+ private MenuItem importVRMLX3DItem;
	5967	+ private MenuItem import3DSItem;
	5968	+ private MenuItem importOBJItem;
4557	5969	}