~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,128 @@
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 void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
	82	+
	83	+ cButton GetButton(String name, boolean border)
	84	+ {
	85	+ ImageIcon icon = GetIcon(name);
	86	+ return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
	93	+ }
	94	+
	95	+ cToggleButton GetToggleButton(String name, boolean border)
	96	+ {
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
	99	+ }
	100	+
	101	+ cCheckBox GetCheckBox(String name, boolean border)
	102	+ {
	103	+ ImageIcon icon = GetIcon(name);
	104	+ return new cCheckBox(icon, border);
	105	+ }
	106	+
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
	109	+ static ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
	117	+ try
	118	+ {
	119	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	120	+
	121	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	122	+// {
	123	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	124	+// Graphics2D g = resized.createGraphics();
	125	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	126	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	127	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	128	+// g.dispose();
	129	+//
	130	+// image = resized;
	131	+// }
	132	+
	133	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
	137	+ return icon;
	138	+ }
	139	+ catch (Exception e)
	140	+ {
	141	+ //icons.put(name, null);
	142	+ return null;
	143	+ }
	144	+ }
	145	+
	146	+ BufferedImage GetImage(String name)
	147	+ {
	148	+ try
	149	+ {
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
	153	+ }
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
	158	+ }
38	159
39	160	// SCRIPT
40	161
..	..	@@ -145,7 +266,7 @@
145	266
146	267	objEditor.ctrlPanel.remove(namePanel);
147	268
148		- if (!GroupEditor.allparams)
	269	+ if (!allparams)
149	270	return;
150	271
151	272	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +289,8 @@
168	289	// objEditor.ctrlPanel.remove(remarkButton);
169	290
170	291	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	292	+ objEditor.ctrlPanel.remove(setupPanel2);
	293	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	294	objEditor.ctrlPanel.remove(pushPanel);
173	295	//objEditor.ctrlPanel.remove(fillPanel);
174	296
..	..	@@ -216,6 +338,14 @@
216	338	client = inClient;
217	339	copy = client;
218	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
219	349	// "this" is not called: SetupUI2(objEditor);
220	350	}
221	351
..	..	@@ -229,6 +359,14 @@
229	359	client = inClient;
230	360	copy = client;
231	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
232	370	SetupUI2(callee.GetEditor());
233	371	}
234	372
..	..	@@ -243,13 +381,15 @@
243	381	//localCopy.parent = null;
244	382
245	383	frame = new JFrame();
	384	+ frame.setUndecorated(false);
246	385	objEditor = this;
247	386	this.callee = callee;
248	387
249	388	//parent = p;
250	389
251	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
252		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
253	393	//gd.setFullScreenWindow(this);
254	394	//setResizable(false);
255	395	//if (!isDisplayable())
..	..	@@ -260,6 +400,14 @@
260	400	copy = localCopy;
261	401	copy.editWindow = this;
262	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
263	411	SetupMenu();
264	412
265	413	//SetupName(objEditor); // new
..	..	@@ -273,28 +421,52 @@
273	421	return frame.action(event, obj);
274	422	}
275	423
	424	+ // Cannot work without static
	425	+ static boolean allparams = true;
	426	+
	427	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	428	+
	429	+ // This is to refresh the UI of the material panel.
	430	+ boolean patchMaterial;
	431	+
276	432	void SetupMenu()
277	433	{
278	434	frame.setMenuBar(menuBar = new MenuBar());
279		- menuBar.add(windowMenu = new Menu("File"));
280		- windowMenu.add(loadItem = new MenuItem("Load..."));
281		- windowMenu.add("-");
282		- windowMenu.add(saveItem = new MenuItem("Save"));
283		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	435	+ menuBar.add(fileMenu = new Menu("File"));
	436	+ fileMenu.add(newItem = new MenuItem("New"));
	437	+ fileMenu.add(openItem = new MenuItem("Open..."));
	438	+
	439	+ //oe.menuBar.add(menu = new Menu("Include"));
	440	+ Menu menu = new Menu("Import");
	441	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	442	+ importOBJItem.addActionListener(this);
	443	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	444	+ import3DSItem.addActionListener(this);
	445	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	446	+ importVRMLX3DItem.addActionListener(this);
	447	+ menu.add("-");
	448	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	449	+ importGFDItem.addActionListener(this);
	450	+ fileMenu.add(menu);
	451	+ fileMenu.add("-");
	452	+
	453	+ fileMenu.add(saveItem = new MenuItem("Save"));
	454	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	455	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285		- windowMenu.add("-");
286		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288		- windowMenu.add("-");
	456	+ fileMenu.add("-");
	457	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	458	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	459	+ fileMenu.add("-");
289	460	if (client.parent != null)
290	461	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	462	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	463	} else
293	464	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	465	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	466	}
296	467
297		- loadItem.addActionListener(this);
	468	+ newItem.addActionListener(this);
	469	+ openItem.addActionListener(this);
298	470	saveItem.addActionListener(this);
299	471	saveAsItem.addActionListener(this);
300	472	exportAsItem.addActionListener(this);
..	..	@@ -302,84 +474,103 @@
302	474	//povItem.addActionListener(this);
303	475	closeItem.addActionListener(this);
304	476
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
313		- toggleTimelineItem.addItemListener(this);
314		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
315		- toggleFullScreenItem.addItemListener(this);
316		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
317		- cameraMenu.add("-");
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
322		- toggleLiveItem.addItemListener(this);
323		- toggleLiveItem.setState(Globals.isLIVE());
324		- cameraMenu.add(stepItem = new MenuItem("Step"));
325		- stepItem.addActionListener(this);
326		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
327		-// toggleDLItem.addItemListener(this);
328		-// toggleDLItem.setState(false);
329		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
330		- toggleRenderItem.addItemListener(this);
331		- toggleRenderItem.setState(!CameraPane.frozen);
332		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
333		- toggleDebugItem.addItemListener(this);
334		- toggleDebugItem.setState(CameraPane.DEBUG);
335		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
336		- toggleFrustumItem.addItemListener(this);
337		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
338		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
339		- toggleFootContactItem.addItemListener(this);
340		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
341		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
342		- toggleRandomItem.addItemListener(this);
343		- toggleRandomItem.setState(CameraPane.RANDOM);
344		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
345		- toggleHandleItem.addItemListener(this);
346		- toggleHandleItem.setState(CameraPane.HANDLES);
347		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
348		- togglePaintItem.addItemListener(this);
349		- togglePaintItem.setState(CameraPane.PAINTMODE);
350		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
351		-// toggleRootItem.addItemListener(this);
352		-// toggleRootItem.setState(false);
353		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
354		-// animationItem.addItemListener(this);
355		-// animationItem.setState(CameraPane.ANIMATION);
356		- cameraMenu.add("-");
357		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
358		- editCameraItem.addActionListener(this);
359		-
360	477	objectPanel = new JTabbedPane();
	478	+
	479	+ ChangeListener changeListener = new ChangeListener()
	480	+ {
	481	+ //String name;
	482	+
	483	+ public void stateChanged(ChangeEvent changeEvent)
	484	+ {
	485	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	486	+// {
	487	+// if (latestObject != null)
	488	+// {
	489	+// refreshContents(true);
	490	+// SetMaterial(latestObject);
	491	+// }
	492	+//
	493	+// materialFlushed = true;
	494	+// }
	495	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	496	+// {
	497	+// if (listUI.size() == 0)
	498	+// EditSelection(false);
	499	+// }
	500	+
	501	+// if (objectPanel.getSelectedIndex() == 4)
	502	+// {
	503	+// name = copy.skyboxname;
	504	+//
	505	+// if (name == null)
	506	+// {
	507	+// name = "";
	508	+// }
	509	+//
	510	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	511	+// copy.skyboxext = "jpg";
	512	+// }
	513	+// else
	514	+// {
	515	+// if (name != null)
	516	+// {
	517	+// if (name.equals(""))
	518	+// {
	519	+// copy.skyboxname = null;
	520	+// copy.skyboxext = null;
	521	+// }
	522	+// else
	523	+// {
	524	+// copy.skyboxname = name;
	525	+// }
	526	+// }
	527	+// }
	528	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	529	+
	530	+// refreshContents(false); // To refresh Info tab
	531	+ cameraView.repaint();
	532	+ }
	533	+ };
	534	+ objectPanel.addChangeListener(changeListener);
	535	+
361	536	toolbarPanel = new JPanel();
362	537	toolbarPanel.setName("Toolbar");
	538	+
363	539	treePanel = new cGridBag();
364	540	treePanel.setName("Tree");
	541	+
	542	+ editPanel = new cGridBag().setVertical(true);
	543	+ //editPanel.setName("Edit");
	544	+
365	545	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
366		- ctrlPanel.setName("Edit");
367		- materialPanel = new cGridBag().setVertical(true);
368		- materialPanel.setName("Material");
	546	+
	547	+ editCommandsPanel = new cGridBag();
	548	+ editPanel.add(editCommandsPanel);
	549	+ editPanel.add(ctrlPanel);
	550	+
	551	+ toolboxPanel = new cGridBag().setVertical(true);
	552	+ //toolboxPanel.setName("Toolbox");
	553	+
	554	+ skyboxPanel = new cGridBag().setVertical(true);
	555	+
	556	+ materialPanel = new cGridBag().setVertical(false);
	557	+ //materialPanel.setName("Material");
	558	+
369	559	/JTextPane/
370	560	infoarea = createTextPane();
371	561	doc = infoarea.getStyledDocument();
372	562
373	563	infoarea.setEditable(true);
374	564	SetText();
	565	+
375	566	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
376	567	// infoarea.setOpaque(false);
377	568	// //infoarea.setForeground(textcolor);
378	569	// TEXTAREA infoarea.setLineWrap(true);
379	570	// TEXTAREA infoarea.setWrapStyleWord(true);
380	571	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
381		- infoPanel.setPreferredSize(new Dimension(50, 200));
382		- infoPanel.setName("Info");
	572	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	573	+ //infoPanel.setName("Info");
383	574	//infoPanel.setLayout(new BorderLayout());
384	575	//infoPanel.add(createTextPane());
385	576
..	..	@@ -390,7 +581,14 @@
390	581	mainPanel.setDividerSize(9);
391	582	mainPanel.setDividerLocation(0.5); //1.0);
392	583	mainPanel.setResizeWeight(0.5);
393		-
	584	+
	585	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	586	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	587	+ divider.setDividerSize(15);
	588	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	589	+
	590	+ mainPanel.setUI(new BasicSplitPaneUI());
	591	+
394	592	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
395	593	//mainPanel.setLayout(new GridBagLayout());
396	594	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -458,10 +656,10 @@
458	656	e.printStackTrace();
459	657	}
460	658
461		- String selection = infoarea.getText();
462		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
463		- java.awt.datatransfer.Clipboard clipboard =
464		- Toolkit.getDefaultToolkit().getSystemClipboard();
	659	+// String selection = infoarea.getText();
	660	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	661	+// java.awt.datatransfer.Clipboard clipboard =
	662	+// Toolkit.getDefaultToolkit().getSystemClipboard();
465	663	//clipboard.setContents(data, data);
466	664	}
467	665
..	..	@@ -484,13 +682,13 @@
484	682	//SendInfo("Name:", "bold");
485	683	if (sel.GetTextures() != null \|\| debug)
486	684	{
487		- si.SendInfo(sel.toString(), "bold");
	685	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488	686	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489	687	if (sel.Size() > 0)
490	688	{
491	689	si.SendInfo("#children = " + sel.Size(), "regular");
492	690	}
493		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	691	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494	692	if (debug)
495	693	{
496	694	try
..	..	@@ -532,7 +730,7 @@
532	730	}
533	731	if (sel.support != null)
534	732	{
535		- si.SendInfo(" support: " + sel.support, "regular");
	733	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536	734	}
537	735	if (sel.scriptnode != null)
538	736	{
..	..	@@ -621,21 +819,164 @@
621	819	}
622	820	}
623	821
	822	+//static GraphicsDevice device = GraphicsEnvironment
	823	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	824	+
	825	+ Rectangle keeprect;
	826	+ cRadio radio;
	827	+
	828	+cButton keepButton;
	829	+ cButton twoButton; // Full 3D
	830	+ cButton sixButton;
	831	+ cButton threeButton;
	832	+ cButton sevenButton;
	833	+ cButton fourButton; // full panel
	834	+ cButton oneButton; // full XYZ
	835	+ //cButton currentLayout;
	836	+
	837	+ boolean maximized;
	838	+
	839	+ cButton fullscreenLayout;
	840	+ cButton expandedLayout;
	841	+
	842	+ void Minimize()
	843	+ {
	844	+ frame.setState(Frame.ICONIFIED);
	845	+ frame.validate();
	846	+ }
	847	+
	848	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	849	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	850	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	851	+ void Maximize()
	852	+ {
	853	+ if (CameraPane.FULLSCREEN)
	854	+ {
	855	+ ToggleFullScreen();
	856	+ }
	857	+
	858	+ if (maximized)
	859	+ {
	860	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	861	+ }
	862	+ else
	863	+ {
	864	+ keeprect = frame.getBounds();
	865	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	866	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	867	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	868	+// frame.setState(Frame.MAXIMIZED_BOTH);
	869	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	870	+ }
	871	+
	872	+ maximized ^= true;
	873	+
	874	+ frame.validate();
	875	+ }
	876	+
	877	+ cButton minButton;
	878	+ cButton maxButton;
	879	+ cButton fullButton;
	880	+ cButton collapseButton;
	881	+ cButton maximize3DButton;
	882	+
624	883	void ToggleFullScreen()
625	884	{
626		- if (CameraPane.FULLSCREEN)
	885	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	886	+
	887	+ cameraView.ToggleFullScreen();
	888	+
	889	+ if (!CameraPane.FULLSCREEN)
627	890	{
628		- frame.getContentPane().remove(/"Center",/bigThree);
629		- framePanel.add(bigThree);
630		- frame.getContentPane().add(/"Center",/framePanel);
	891	+ device.setFullScreenWindow(null);
	892	+ frame.dispose();
	893	+ frame.setUndecorated(false);
	894	+ frame.validate();
	895	+ frame.setVisible(true);
	896	+
	897	+ //frame.setVisible(false);
	898	+// frame.removeNotify();
	899	+// frame.setUndecorated(false);
	900	+// frame.addNotify();
	901	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	902	+
	903	+// X frame.getContentPane().remove(/"Center",/bigThree);
	904	+// X framePanel.add(bigThree);
	905	+// X frame.getContentPane().add(/"Center",/framePanel);
	906	+// framePanel.setDividerLocation(46); // icons are 24x24
	907	+
	908	+ //frame.setVisible(true);
	909	+// radio.layout = keepButton;
	910	+ //theFrame = null;
	911	+ keepButton = null;
	912	+// radio.layout.doClick();
	913	+
631	914	} else
632	915	{
633		- frame.getContentPane().remove(/"Center",/framePanel);
634		- framePanel.remove(bigThree);
635		- frame.getContentPane().add(/"Center",/bigThree);
	916	+ keepButton = radio.layout;
	917	+ //keeprect = frame.getBounds();
	918	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	919	+// frame.getToolkit().getScreenSize().height);
	920	+ //frame.setVisible(false);
	921	+
	922	+ frame.dispose();
	923	+ frame.setUndecorated(true);
	924	+ device.setFullScreenWindow(frame);
	925	+ frame.validate();
	926	+ frame.setVisible(true);
	927	+// frame.removeNotify();
	928	+// frame.setUndecorated(true);
	929	+// frame.addNotify();
	930	+// X frame.getContentPane().remove(/"Center",/framePanel);
	931	+// X framePanel.remove(bigThree);
	932	+// X frame.getContentPane().add(/"Center",/bigThree);
	933	+// framePanel.setDividerLocation(0);
	934	+
	935	+// radio.layout = fullscreenLayout;
	936	+// radio.layout.doClick();
	937	+ //frame.setVisible(true);
636	938	}
637		- cameraView.ToggleFullScreen();
	939	+ frame.validate();
	940	+
	941	+ cameraView.requestFocusInWindow();
638	942	}
	943	+
	944	+ void CollapseToolbar()
	945	+ {
	946	+ framePanel.setDividerLocation(0);
	947	+ //frame.validate();
	948	+
	949	+ cameraView.requestFocusInWindow();
	950	+ }
	951	+
	952	+ private Object3D Duplicate(Object3D object)
	953	+ {
	954	+ boolean temp = CameraPane.SWITCH;
	955	+ CameraPane.SWITCH = false;
	956	+
	957	+ if (Grafreed.grafreed.universe.versiontable == null)
	958	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	959	+
	960	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	961	+ // if (copy == client)
	962	+
	963	+ Object3D versions[] = object.versionlist;
	964	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	965	+ object.versionlist = null;
	966	+ object.versiontable = null;
	967	+
	968	+ //byte[] compress = Compress(copy);
	969	+ Object3D compress = (Object3D)Grafreed.clone(object);
	970	+
	971	+ object.versionlist = versions;
	972	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	973	+
	974	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	975	+
	976	+ CameraPane.SWITCH = temp;
	977	+
	978	+ return compress;
	979	+ }
639	980
640	981	private JTextPane createTextPane()
641	982	{
..	..	@@ -735,7 +1076,7 @@
735	1076	protected static ImageIcon createImageIcon(String path,
736	1077	String description)
737	1078	{
738		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1079	+ java.net.URL imgURL = Grafreed.class.getResource(path);
739	1080	if (imgURL != null)
740	1081	{
741	1082	return new ImageIcon(imgURL, description);
..	..	@@ -758,6 +1099,7 @@
758	1099	{
759	1100	SetupMaterial(materialPanel);
760	1101	}
	1102	+
761	1103	//SetupName();
762	1104	//SetupViews();
763	1105	}
..	..	@@ -767,6 +1109,7 @@
767	1109	// NumberSlider vDivsField;
768	1110	// JCheckBox endcaps;
769	1111	JCheckBox liveCB;
	1112	+ JCheckBox selectableCB;
770	1113	JCheckBox hideCB;
771	1114	JCheckBox link2masterCB;
772	1115	JCheckBox markCB;
..	..	@@ -774,7 +1117,12 @@
774	1117	JCheckBox speedupCB;
775	1118	JCheckBox rewindCB;
776	1119	JCheckBox flipVCB;
	1120	+
	1121	+ cCheckBox toggleTextureCB;
	1122	+ cCheckBox toggleSwitchCB;
	1123	+
777	1124	JComboBox texresMenu;
	1125	+
778	1126	JButton resetButton;
779	1127	JButton stepButton;
780	1128	JButton stepAllButton;
..	..	@@ -783,9 +1131,13 @@
783	1131	JButton fasterButton;
784	1132	JButton remarkButton;
785	1133
	1134	+ cGridBag editPanel;
	1135	+ cGridBag editCommandsPanel;
	1136	+
786	1137	cGridBag namePanel;
787	1138	cGridBag setupPanel;
788		- cGridBag commandsPanel;
	1139	+ cGridBag setupPanel2;
	1140	+ cGridBag objectCommandsPanel;
789	1141	cGridBag pushPanel;
790	1142	cGridBag fillPanel;
791	1143
..	..	@@ -956,62 +1308,84 @@
956	1308
957	1309	namePanel = new cGridBag();
958	1310
	1311	+ //if (copy.pinned)
	1312	+ {
	1313	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1314	+ pinButton.setSelected(copy.pinned);
	1315	+ cGridBag t = new cGridBag();
	1316	+ t.preferredWidth = 2;
	1317	+ t.add(pinButton);
	1318	+ namePanel.add(t);
	1319	+
	1320	+ pinButton.addItemListener(this);
	1321	+ }
	1322	+
959	1323	nameField = AddText(namePanel, copy.GetName());
960		- namePanel.add(nameField);
	1324	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
961	1325	oe.ctrlPanel.add(namePanel);
962	1326
963	1327	oe.ctrlPanel.Return();
964	1328
965		- if (!GroupEditor.allparams)
	1329	+ if (!allparams)
966	1330	return;
967	1331
968	1332	setupPanel = new cGridBag().setVertical(false);
969	1333
970	1334	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971	1335	liveCB.setToolTipText("Animate object");
	1336	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1337	+ markCB.setToolTipText("Set target transform");
	1338	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1339	+ selectableCB.setToolTipText("Make object selectable");
	1340	+// Return();
	1341	+
972	1342	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973	1343	hideCB.setToolTipText("Hide object");
974		-// Return();
975		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976		- markCB.setToolTipText("Set the animation target transform");
977	1344
978		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1345	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1346	+
	1347	+ setupPanel2 = new cGridBag().setVertical(false);
	1348	+
	1349	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
979	1350	rewindCB.setToolTipText("Rewind animation");
980	1351
981		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982		- randomCB.setToolTipText("Option for switch node");
	1352	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1353	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
983	1354
	1355	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1356	+ link2masterCB.setToolTipText("Attach to support");
	1357	+
984	1358	if (Globals.ADVANCED)
985	1359	{
986		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
987		- link2masterCB.setToolTipText("Attach to support");
988		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1360	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
989	1361	speedupCB.setToolTipText("Option motion capture");
990	1362	}
991	1363
992	1364	oe.ctrlPanel.add(setupPanel);
993	1365	oe.ctrlPanel.Return();
	1366	+ oe.ctrlPanel.add(setupPanel2);
	1367	+ oe.ctrlPanel.Return();
994	1368
995		- commandsPanel = new cGridBag().setVertical(false);
	1369	+ objectCommandsPanel = new cGridBag().setVertical(false);
996	1370
997		- resetButton = AddButton(commandsPanel, "Reset");
	1371	+ resetButton = AddButton(objectCommandsPanel, "Reset");
998	1372	resetButton.setToolTipText("Jump to frame zero");
999		- stepButton = AddButton(commandsPanel, "Step");
	1373	+ stepButton = AddButton(objectCommandsPanel, "Step");
1000	1374	stepButton.setToolTipText("Step one frame");
1001	1375	// resetAllButton = AddButton(oe, "Reset All");
1002	1376	// stepAllButton = AddButton(oe, "Step All");
1003	1377	// Return();
1004		- slowerButton = AddButton(commandsPanel, "Slow");
	1378	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1005	1379	slowerButton.setToolTipText("Decrease animation speed");
1006		- fasterButton = AddButton(commandsPanel, "Fast");
	1380	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1007	1381	fasterButton.setToolTipText("Increase animation speed");
1008		- remarkButton = AddButton(commandsPanel, "Remark");
	1382	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1009	1383	remarkButton.setToolTipText("Set the current transform as the target");
1010	1384
1011		- oe.ctrlPanel.add(commandsPanel);
	1385	+ oe.ctrlPanel.add(objectCommandsPanel);
1012	1386	oe.ctrlPanel.Return();
1013	1387
1014		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1388	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1015	1389	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016	1390	//Return();
1017	1391
..	..	@@ -1168,6 +1542,7 @@
1168	1542
1169	1543	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1170	1544	{
	1545	+ if (Globals.DEBUG)
1171	1546	System.out.println("CREATE CAMERAS");
1172	1547	cams = new cTemplate();
1173	1548	cams.name = "Cameras";
..	..	@@ -1214,8 +1589,11 @@
1214	1589	//worldPanel.setName("World");
1215	1590	centralPanel = new cGridBag();
1216	1591	centralPanel.preferredWidth = 20;
1217		- timelinePanel = new JPanel(new BorderLayout());
1218		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1592	+
	1593	+ if (Globals.ADVANCED)
	1594	+ {
	1595	+ timelinePanel = new JPanel(new BorderLayout());
	1596	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1219	1597
1220	1598	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1221	1599	cameraPanel.setContinuousLayout(true);
..	..	@@ -1224,7 +1602,10 @@
1224	1602	// cameraPanel.setDividerSize(9);
1225	1603	cameraPanel.setResizeWeight(1.0);
1226	1604
	1605	+ }
	1606	+
1227	1607	centralPanel.add(cameraView);
	1608	+ centralPanel.setFocusable(true);
1228	1609	//frame.setJMenuBar(timelineMenubar);
1229	1610	//centralPanel.add(timelinePanel);
1230	1611
..	..	@@ -1250,6 +1631,7 @@
1250	1631	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1251	1632	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1252	1633	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1634	+ //XYZPanel.setName("XYZ");
1253	1635
1254	1636	/*
1255	1637	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1286,14 +1668,34 @@
1286	1668
1287	1669	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1288	1670	//tmp.setName("Edit");
	1671	+ objectPanel.add(toolboxPanel);
	1672	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1673	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1674	+
1289	1675	objectPanel.add(materialPanel);
	1676	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1677	+ objectPanel.setToolTipTextAt(1, "Material");
	1678	+
	1679	+ objectPanel.add(skyboxPanel);
	1680	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1681	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1682	+
1290	1683	// JPanel north = new JPanel(new BorderLayout());
1291	1684	// north.setName("Edit");
1292	1685	// north.add(ctrlPanel, BorderLayout.NORTH);
1293	1686	// objectPanel.add(north);
1294		- objectPanel.add(ctrlPanel);
1295		- objectPanel.add(infoPanel);
1296		-
	1687	+ objectPanel.add(editPanel);
	1688	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1689	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1690	+
	1691	+ objectPanel.add(XYZPanel);
	1692	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1693	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1694	+
	1695	+ patchMaterial = true;
	1696	+ cameraView.patchMaterial = this;
	1697	+ objectPanel.setSelectedIndex(1);
	1698	+
1297	1699	/*
1298	1700	aConstraints.gridx = 0;
1299	1701	aConstraints.gridwidth = 1;
..	..	@@ -1301,7 +1703,7 @@
1301	1703	aConstraints.gridy += 1;
1302	1704	aConstraints.gridwidth = 1;
1303	1705	mainPanel.add(objectPanel, aConstraints);
1304		- */
	1706	+ */
1305	1707
1306	1708	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1307	1709	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1313,14 +1715,12 @@
1313	1715	scrollpane.addMouseWheelListener(this); // Default not fast enough
1314	1716
1315	1717	/JTabbedPane/ scenePanel = new cGridBag();
1316		- scenePanel.preferredWidth = 7;
	1718	+ scenePanel.preferredWidth = 6;
1317	1719
1318	1720	JTabbedPane tabbedPane = new JTabbedPane();
1319	1721	tabbedPane.add(scrollpane);
1320	1722
1321		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1322		-
1323		- optionsPanel = new cGridBag().setVertical(true);
	1723	+ optionsPanel = new cGridBag().setVertical(false);
1324	1724
1325	1725	optionsPanel.setName("Options");
1326	1726
..	..	@@ -1328,8 +1728,15 @@
1328	1728
1329	1729	tabbedPane.add(optionsPanel);
1330	1730
	1731	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1732	+
1331	1733	scenePanel.add(tabbedPane);
1332	1734
	1735	+ //if (Globals.ADVANCED)
	1736	+// tabbedPane.add(infoPanel);
	1737	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1738	+// tabbedPane.setToolTipTextAt(3, "Information");
	1739	+
1333	1740	/*
1334	1741	cTree jTree = new cTree(null);
1335	1742	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1391,7 +1798,7 @@
1391	1798	bigThree = new cGridBag();
1392	1799	bigThree.addComponent(scenePanel);
1393	1800	bigThree.addComponent(centralPanel);
1394		- bigThree.addComponent(XYZPanel);
	1801	+ //bigThree.addComponent(XYZPanel);
1395	1802
1396	1803	// // SIDE EFFECT!!!
1397	1804	// aConstraints.gridx = 0;
..	..	@@ -1400,16 +1807,33 @@
1400	1807	// aConstraints.gridheight = 1;
1401	1808
1402	1809	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1403		- framePanel.setContinuousLayout(true);
1404		- framePanel.setOneTouchExpandable(true);
1405		- framePanel.setDividerLocation(0.8);
	1810	+
	1811	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1812	+ new java.beans.PropertyChangeListener()
	1813	+ {
	1814	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1815	+ {
	1816	+ if ((Integer)pce.getOldValue() == 1)
	1817	+ {
	1818	+ if (radio.layout != expandedLayout)
	1819	+ {
	1820	+ radio.layout = expandedLayout;
	1821	+ radio.layout.doClick();
	1822	+ }
	1823	+ }
	1824	+ }
	1825	+ });
	1826	+
	1827	+ framePanel.setContinuousLayout(false);
	1828	+ framePanel.setOneTouchExpandable(false);
	1829	+ //.setDividerLocation(0.8);
1406	1830	//framePanel.setDividerSize(15);
1407	1831	//framePanel.setResizeWeight(0.15);
1408	1832	framePanel.setName("Frame");
1409	1833
1410	1834	frame.getContentPane().setLayout(new BorderLayout());
1411	1835	/**/
1412		- JTabbedPane worldPane = new JTabbedPane();
	1836	+ //JTabbedPane worldPane = new JTabbedPane();
1413	1837	//worldPane.add(bigPanel);
1414	1838	//worldPane.add(worldPanel);
1415	1839	/**/
..	..	@@ -1419,15 +1843,19 @@
1419	1843
1420	1844	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421	1845
1422		- frame.setSize(1024, 768);
1423		- frame.show();
1424		-
	1846	+ frame.setSize(1280, 860);
	1847	+
	1848	+ cameraView.requestFocusInWindow();
	1849	+
1425	1850	gridPanel.setDividerLocation(1.0);
	1851	+
	1852	+ frame.validate();
	1853	+
	1854	+ frame.setVisible(true);
1426	1855
1427	1856	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1428	1857	frame.addWindowListener(new WindowAdapter()
1429	1858	{
1430		-
1431	1859	public void windowClosing(WindowEvent e)
1432	1860	{
1433	1861	Close();
..	..	@@ -1450,28 +1878,445 @@
1450	1878	ctrlPanel.removeAll();
1451	1879	}
1452	1880
1453		- void SetupMaterial(cGridBag panel)
	1881	+ void SetupMaterial(cGridBag materialpanel)
1454	1882	{
1455		- /*
	1883	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1884	+
	1885	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1886	+ skin.setToolTipText("Skin");
	1887	+ skin.addMouseListener(new MouseAdapter()
	1888	+ {
	1889	+ public void mouseClicked(MouseEvent e)
	1890	+ {
	1891	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1892	+ cMaterial material = object.material;
	1893	+
	1894	+ // Skin
	1895	+ colorField.setFloat(material.color);
	1896	+ float saturation = material.modulation;
	1897	+
	1898	+ if (!cameraView.Skinshader)
	1899	+ {
	1900	+ saturation /= 1.5;
	1901	+ }
	1902	+
	1903	+ saturationField.setFloat(saturation);
	1904	+
	1905	+ subsurfaceField.setFloat(material.subsurface);
	1906	+ selfshadowField.setFloat(material.diffuseness);
	1907	+ diffusenessField.setFloat(material.factor);
	1908	+ shininessField.setFloat(material.shininess);
	1909	+ shadowbiasField.setFloat(material.shadowbias);
	1910	+ diffuseField.setFloat(material.diffuse);
	1911	+ specularField.setFloat(material.specular);
	1912	+
	1913	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1914	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1915	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1916	+
	1917	+ materialtouched = true;
	1918	+ applySelf();
	1919	+ }
	1920	+ });
	1921	+ presetpanel.add(skin);
	1922	+
	1923	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1924	+ lambert.setToolTipText("Diffuse");
	1925	+ lambert.addMouseListener(new MouseAdapter()
	1926	+ {
	1927	+ public void mouseClicked(MouseEvent e)
	1928	+ {
	1929	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1930	+ cMaterial material = object.material;
	1931	+
	1932	+ diffusenessField.setFloat(material.factor);
	1933	+ selfshadowField.setFloat(material.diffuseness);
	1934	+
	1935	+ materialtouched = true;
	1936	+ applySelf();
	1937	+ }
	1938	+ });
	1939	+ presetpanel.add(lambert);
	1940	+
	1941	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1942	+ diffuse2.setToolTipText("Diffuse2");
	1943	+ diffuse2.addMouseListener(new MouseAdapter()
	1944	+ {
	1945	+ public void mouseClicked(MouseEvent e)
	1946	+ {
	1947	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1948	+ cMaterial material = object.material;
	1949	+
	1950	+ diffusenessField.setFloat(material.factor);
	1951	+ selfshadowField.setFloat(material.diffuseness);
	1952	+
	1953	+ materialtouched = true;
	1954	+ applySelf();
	1955	+ }
	1956	+ });
	1957	+ presetpanel.add(diffuse2);
	1958	+
	1959	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1960	+ diffusemoon.setToolTipText("Moon");
	1961	+ diffusemoon.addMouseListener(new MouseAdapter()
	1962	+ {
	1963	+ public void mouseClicked(MouseEvent e)
	1964	+ {
	1965	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1966	+ cMaterial material = object.material;
	1967	+
	1968	+ diffusenessField.setFloat(material.factor);
	1969	+ selfshadowField.setFloat(material.diffuseness);
	1970	+
	1971	+ materialtouched = true;
	1972	+ applySelf();
	1973	+ }
	1974	+ });
	1975	+ presetpanel.add(diffusemoon);
	1976	+
	1977	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1978	+ diffusemoon2.setToolTipText("Moon2");
	1979	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1980	+ {
	1981	+ public void mouseClicked(MouseEvent e)
	1982	+ {
	1983	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1984	+ cMaterial material = object.material;
	1985	+
	1986	+ diffusenessField.setFloat(material.factor);
	1987	+ selfshadowField.setFloat(material.diffuseness);
	1988	+
	1989	+ materialtouched = true;
	1990	+ applySelf();
	1991	+ }
	1992	+ });
	1993	+ presetpanel.add(diffusemoon2);
	1994	+
	1995	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1996	+ diffusemoon3.setToolTipText("Moon3");
	1997	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1998	+ {
	1999	+ public void mouseClicked(MouseEvent e)
	2000	+ {
	2001	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2002	+ cMaterial material = object.material;
	2003	+
	2004	+ diffusenessField.setFloat(material.factor);
	2005	+ selfshadowField.setFloat(material.diffuseness);
	2006	+
	2007	+ materialtouched = true;
	2008	+ applySelf();
	2009	+ }
	2010	+ });
	2011	+ presetpanel.add(diffusemoon3);
	2012	+
	2013	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2014	+ diffusesheen.setToolTipText("Sheen");
	2015	+ diffusesheen.addMouseListener(new MouseAdapter()
	2016	+ {
	2017	+ public void mouseClicked(MouseEvent e)
	2018	+ {
	2019	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2020	+ cMaterial material = object.material;
	2021	+
	2022	+ sheenField.setFloat(material.sheen);
	2023	+
	2024	+ materialtouched = true;
	2025	+ applySelf();
	2026	+ }
	2027	+ });
	2028	+ presetpanel.add(diffusesheen);
	2029	+
	2030	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2031	+ rough.setToolTipText("Rough metal");
	2032	+ rough.addMouseListener(new MouseAdapter()
	2033	+ {
	2034	+ public void mouseClicked(MouseEvent e)
	2035	+ {
	2036	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2037	+ cMaterial material = object.material;
	2038	+
	2039	+ shininessField.setFloat(material.shininess);
	2040	+ velvetField.setFloat(material.velvet);
	2041	+
	2042	+ materialtouched = true;
	2043	+ applySelf();
	2044	+ }
	2045	+ });
	2046	+ presetpanel.add(rough);
	2047	+
	2048	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2049	+ rough2.setToolTipText("Medium metal");
	2050	+ rough2.addMouseListener(new MouseAdapter()
	2051	+ {
	2052	+ public void mouseClicked(MouseEvent e)
	2053	+ {
	2054	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2055	+ cMaterial material = object.material;
	2056	+
	2057	+ shininessField.setFloat(material.shininess);
	2058	+ lightareaField.setFloat(material.lightarea);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(rough2);
	2065	+
	2066	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2067	+ shini0.setToolTipText("Shiny");
	2068	+ shini0.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ shininessField.setFloat(material.shininess);
	2076	+ lightareaField.setFloat(material.lightarea);
	2077	+
	2078	+ materialtouched = true;
	2079	+ applySelf();
	2080	+ }
	2081	+ });
	2082	+ presetpanel.add(shini0);
	2083	+
	2084	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2085	+ shini1.setToolTipText("Shiny2");
	2086	+ shini1.addMouseListener(new MouseAdapter()
	2087	+ {
	2088	+ public void mouseClicked(MouseEvent e)
	2089	+ {
	2090	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2091	+ cMaterial material = object.material;
	2092	+
	2093	+ shininessField.setFloat(material.shininess);
	2094	+ lightareaField.setFloat(material.lightarea);
	2095	+
	2096	+ materialtouched = true;
	2097	+ applySelf();
	2098	+ }
	2099	+ });
	2100	+ presetpanel.add(shini1);
	2101	+
	2102	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2103	+ shini2.setToolTipText("Shiny3");
	2104	+ shini2.addMouseListener(new MouseAdapter()
	2105	+ {
	2106	+ public void mouseClicked(MouseEvent e)
	2107	+ {
	2108	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2109	+ cMaterial material = object.material;
	2110	+
	2111	+ shininessField.setFloat(material.shininess);
	2112	+ lightareaField.setFloat(material.lightarea);
	2113	+
	2114	+ materialtouched = true;
	2115	+ applySelf();
	2116	+ }
	2117	+ });
	2118	+ presetpanel.add(shini2);
	2119	+
	2120	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2121	+ aniso.setToolTipText("AnisoU");
	2122	+ aniso.addMouseListener(new MouseAdapter()
	2123	+ {
	2124	+ public void mouseClicked(MouseEvent e)
	2125	+ {
	2126	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2127	+ cMaterial material = object.material;
	2128	+
	2129	+ anisoField.setFloat(material.aniso);
	2130	+ anisoVField.setFloat(material.anisoV);
	2131	+
	2132	+ materialtouched = true;
	2133	+ applySelf();
	2134	+ }
	2135	+ });
	2136	+ presetpanel.add(aniso);
	2137	+
	2138	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2139	+ aniso2.setToolTipText("AnisoV");
	2140	+ aniso2.addMouseListener(new MouseAdapter()
	2141	+ {
	2142	+ public void mouseClicked(MouseEvent e)
	2143	+ {
	2144	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2145	+ cMaterial material = object.material;
	2146	+
	2147	+ anisoField.setFloat(material.aniso);
	2148	+ anisoVField.setFloat(material.anisoV);
	2149	+
	2150	+ materialtouched = true;
	2151	+ applySelf();
	2152	+ }
	2153	+ });
	2154	+ presetpanel.add(aniso2);
	2155	+
	2156	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2157	+ aniso3.setToolTipText("AnisoUV");
	2158	+ aniso3.addMouseListener(new MouseAdapter()
	2159	+ {
	2160	+ public void mouseClicked(MouseEvent e)
	2161	+ {
	2162	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2163	+ cMaterial material = object.material;
	2164	+
	2165	+ anisoField.setFloat(material.aniso);
	2166	+ anisoVField.setFloat(material.anisoV);
	2167	+
	2168	+ materialtouched = true;
	2169	+ applySelf();
	2170	+ }
	2171	+ });
	2172	+ presetpanel.add(aniso3);
	2173	+
	2174	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2175	+ velvet0.setToolTipText("Velvet");
	2176	+ velvet0.addMouseListener(new MouseAdapter()
	2177	+ {
	2178	+ public void mouseClicked(MouseEvent e)
	2179	+ {
	2180	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2181	+ cMaterial material = object.material;
	2182	+
	2183	+ diffusenessField.setFloat(material.factor);
	2184	+ selfshadowField.setFloat(material.diffuseness);
	2185	+ sheenField.setFloat(material.sheen);
	2186	+ shininessField.setFloat(material.shininess);
	2187	+ velvetField.setFloat(material.velvet);
	2188	+ shiftField.setFloat(material.shift);
	2189	+
	2190	+ materialtouched = true;
	2191	+ applySelf();
	2192	+ }
	2193	+ });
	2194	+ presetpanel.add(velvet0);
	2195	+
	2196	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2197	+ bump0.setToolTipText("Bump texture");
	2198	+ bump0.addMouseListener(new MouseAdapter()
	2199	+ {
	2200	+ public void mouseClicked(MouseEvent e)
	2201	+ {
	2202	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2203	+ cMaterial material = object.material;
	2204	+
	2205	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2206	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2207	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2208	+
	2209	+ materialtouched = true;
	2210	+ applySelf();
	2211	+ }
	2212	+ });
	2213	+ presetpanel.add(bump0);
	2214	+
	2215	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2216	+ borderShader.setToolTipText("Border fade");
	2217	+ borderShader.addMouseListener(new MouseAdapter()
	2218	+ {
	2219	+ public void mouseClicked(MouseEvent e)
	2220	+ {
	2221	+ borderfadeField.setFloat(0.5);
	2222	+ opacityField.setFloat(0.75);
	2223	+
	2224	+ materialtouched = true;
	2225	+ applySelf();
	2226	+ }
	2227	+ });
	2228	+ presetpanel.add(borderShader);
	2229	+
	2230	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2231	+ halo.setToolTipText("Halo");
	2232	+ halo.addMouseListener(new MouseAdapter()
	2233	+ {
	2234	+ public void mouseClicked(MouseEvent e)
	2235	+ {
	2236	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2237	+ cMaterial material = object.material;
	2238	+
	2239	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2240	+
	2241	+ materialtouched = true;
	2242	+ applySelf();
	2243	+ }
	2244	+ });
	2245	+ presetpanel.add(halo);
	2246	+
	2247	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2248	+ candle.setToolTipText("Candle");
	2249	+ candle.addMouseListener(new MouseAdapter()
	2250	+ {
	2251	+ public void mouseClicked(MouseEvent e)
	2252	+ {
	2253	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2254	+ cMaterial material = object.material;
	2255	+
	2256	+ subsurfaceField.setFloat(material.subsurface);
	2257	+ shadowbiasField.setFloat(material.shadowbias);
	2258	+ ambientField.setFloat(material.ambient);
	2259	+ specularField.setFloat(material.specular);
	2260	+ lightareaField.setFloat(material.lightarea);
	2261	+ shininessField.setFloat(material.shininess);
	2262	+
	2263	+ materialtouched = true;
	2264	+ applySelf();
	2265	+ }
	2266	+ });
	2267	+ presetpanel.add(candle);
	2268	+
	2269	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2270	+ shadowShader.setToolTipText("Shadow");
	2271	+ shadowShader.addMouseListener(new MouseAdapter()
	2272	+ {
	2273	+ public void mouseClicked(MouseEvent e)
	2274	+ {
	2275	+ diffuseField.setFloat(0.001);
	2276	+ ambientField.setFloat(0.001);
	2277	+ cameraField.setFloat(0.001);
	2278	+ specularField.setFloat(0.001);
	2279	+ fakedepthField.setFloat(0.001);
	2280	+ opacityField.setFloat(0.6);
	2281	+
	2282	+ materialtouched = true;
	2283	+ applySelf();
	2284	+ }
	2285	+ });
	2286	+ presetpanel.add(shadowShader);
	2287	+
	2288	+ cGridBag panel = new cGridBag().setVertical(true);
	2289	+
	2290	+ presetpanel.preferredWidth = 1;
	2291	+
	2292	+ materialpanel.add(presetpanel);
	2293	+ materialpanel.add(panel);
	2294	+
	2295	+ panel.preferredWidth = 8;
	2296	+
	2297	+ /*
1456	2298	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1457	2299	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458		- */
	2300	+ */
1459	2301
1460	2302	cGridBag editBar = new cGridBag().setVertical(false);
1461	2303
1462		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	2304	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1463	2305	createMaterialButton.setToolTipText("Create material");
1464	2306
1465	2307	/*
1466	2308	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1467	2309	*/
1468	2310
1469		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	2311	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1470	2312	clearMaterialButton.setToolTipText("Clear material");
1471	2313
1472		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1473		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1474		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2314	+ if (Globals.ADVANCED)
	2315	+ {
	2316	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2317	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2318	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2319	+ }
1475	2320
1476	2321	editBar.preferredHeight = 15;
1477	2322
..	..	@@ -1486,45 +2331,61 @@
1486	2331	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1487	2332
1488	2333	cGridBag colorSection = new cGridBag().setVertical(true);
	2334	+
	2335	+ cGridBag huepanel = new cGridBag();
	2336	+ cGridBag huelabel = new cGridBag();
	2337	+ cLabel hue = GetLabel("icons/hue.png", false);
	2338	+ hue.fit = true;
	2339	+
	2340	+ hue.addMouseListener(new MouseAdapter()
	2341	+ {
	2342	+ public void mousePressed(MouseEvent e)
	2343	+ {
	2344	+ int x = e.getX();
	2345	+
	2346	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2347	+ }
	2348	+ });
	2349	+
	2350	+ huelabel.add(hue);
	2351	+ huelabel.preferredWidth = 20;
	2352	+ huepanel.add(new cGridBag()); // Label
	2353	+ huepanel.add(huelabel); // Field/slider
	2354	+
	2355	+ huepanel.preferredHeight = 7;
	2356	+
	2357	+ colorSection.add(huepanel);
1489	2358
1490	2359	cGridBag color = new cGridBag();
1491		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1492		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2360	+
	2361	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2362	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2363	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2364	+
1494	2365	//colorField.preferredWidth = 200;
1495	2366	colorSection.add(color);
1496	2367
1497	2368	cGridBag modulation = new cGridBag();
1498	2369	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1499	2370	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2371	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1501	2372	colorSection.add(modulation);
1502	2373
	2374	+ cGridBag opacity = new cGridBag();
	2375	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2376	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2377	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2378	+ colorSection.add(opacity);
	2379	+
	2380	+ colorSection.add(GetSeparator());
	2381	+
1503	2382	cGridBag texture = new cGridBag();
1504	2383	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1505	2384	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1506	2385	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1507	2386	colorSection.add(texture);
1508	2387
1509		- cGridBag anisoU = new cGridBag();
1510		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1511		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1512		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1513		- colorSection.add(anisoU);
1514		-
1515		- cGridBag anisoV = new cGridBag();
1516		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1517		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1518		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1519		- colorSection.add(anisoV);
1520		-
1521		- cGridBag shadowbias = new cGridBag();
1522		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1523		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1524		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1525		- colorSection.add(shadowbias);
1526		-
1527		- panel.add(new JSeparator());
	2388	+ panel.add(GetSeparator());
1528	2389
1529	2390	panel.add(colorSection);
1530	2391
..	..	@@ -1574,7 +2435,13 @@
1574	2435	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1575	2436	diffuseSection.add(fakedepth);
1576	2437
1577		- panel.add(new JSeparator());
	2438	+ cGridBag shadowbias = new cGridBag();
	2439	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2440	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2441	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2442	+ diffuseSection.add(shadowbias);
	2443	+
	2444	+ panel.add(GetSeparator());
1578	2445
1579	2446	panel.add(diffuseSection);
1580	2447
..	..	@@ -1624,42 +2491,48 @@
1624	2491	// aConstraints.gridy += 1;
1625	2492	// aConstraints.gridwidth = 1;
1626	2493
	2494	+ cGridBag anisoU = new cGridBag();
	2495	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2496	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2497	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2498	+ specularSection.add(anisoU);
1627	2499
1628		- panel.add(new JSeparator());
	2500	+ cGridBag anisoV = new cGridBag();
	2501	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2502	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2503	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2504	+ specularSection.add(anisoV);
	2505	+
	2506	+
	2507	+ panel.add(GetSeparator());
1629	2508
1630	2509	panel.add(specularSection);
1631	2510
1632	2511	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1633	2512
1634		- cGridBag globalSection = new cGridBag().setVertical(true);
	2513	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1635	2514
1636	2515	cGridBag camera = new cGridBag();
1637	2516	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1638	2517	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1639	2518	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1640		- globalSection.add(camera);
	2519	+ colorSection.add(camera);
1641	2520
1642	2521	cGridBag ambient = new cGridBag();
1643	2522	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1644	2523	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1645	2524	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1646		- globalSection.add(ambient);
	2525	+ colorSection.add(ambient);
1647	2526
1648	2527	cGridBag backlit = new cGridBag();
1649	2528	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1650	2529	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651	2530	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1652		- globalSection.add(backlit);
	2531	+ colorSection.add(backlit);
1653	2532
1654		- cGridBag opacity = new cGridBag();
1655		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1656		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1658		- globalSection.add(opacity);
1659		-
1660		- panel.add(new JSeparator());
	2533	+ //panel.add(new JSeparator());
1661	2534
1662		- panel.add(globalSection);
	2535	+ //panel.add(globalSection);
1663	2536
1664	2537	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1665	2538
..	..	@@ -1701,7 +2574,7 @@
1701	2574	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1702	2575	textureSection.add(opacityPower);
1703	2576
1704		- panel.add(new JSeparator());
	2577	+ panel.add(GetSeparator());
1705	2578
1706	2579	panel.add(textureSection);
1707	2580
..	..	@@ -1740,12 +2613,15 @@
1740	2613	opacityPowerField.addChangeListener(this);
1741	2614	/**/
1742	2615
1743		- resetSlidersButton.addActionListener(this);
1744	2616	clearMaterialButton.addActionListener(this);
1745	2617	createMaterialButton.addActionListener(this);
1746		-
1747		- propagateToggle.addItemListener(this);
1748		- multiplyToggle.addItemListener(this);
	2618	+
	2619	+ if (Globals.ADVANCED)
	2620	+ {
	2621	+ resetSlidersButton.addActionListener(this);
	2622	+ propagateToggle.addItemListener(this);
	2623	+ multiplyToggle.addItemListener(this);
	2624	+ }
1749	2625	}
1750	2626
1751	2627	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1763,8 +2639,9 @@
1763	2639	// 3D models
1764	2640	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1765	2641	{
1766		- lastConverter = new com.jmex.model.converters.MaxToJme();
1767		- LoadFile(filename, lastConverter);
	2642	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2643	+ //LoadFile(filename, lastConverter);
	2644	+ LoadObjFile(filename); // New 3ds loader
1768	2645	continue;
1769	2646	}
1770	2647	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1916,7 +2793,7 @@
1916	2793
1917	2794	//? flashIt = false;
1918	2795	CameraPane pane = (CameraPane) cameraView;
1919		- pane.clickStart(location.x, location.y, 0);
	2796	+ pane.clickStart(location.x, location.y, 0, 0);
1920	2797	pane.clickEnd(location.x, location.y, 0, true);
1921	2798
1922	2799	if (group.selection.size() == 1)
..	..	@@ -1965,6 +2842,7 @@
1965	2842	e2.printStackTrace();
1966	2843	}
1967	2844	}
	2845	+
1968	2846	LoadJMEThread loadThread;
1969	2847
1970	2848	class LoadJMEThread extends Thread
..	..	@@ -2022,6 +2900,7 @@
2022	2900	//LoadFile0(filename, converter);
2023	2901	}
2024	2902	}
	2903	+
2025	2904	LoadOBJThread loadObjThread;
2026	2905
2027	2906	class LoadOBJThread extends Thread
..	..	@@ -2100,19 +2979,19 @@
2100	2979
2101	2980	void LoadObjFile(String fullname)
2102	2981	{
2103		- /*
	2982	+ System.out.println("Loading " + fullname);
	2983	+ /**/
2104	2984	//lastFilename = fullname;
2105	2985	if(loadObjThread == null)
2106	2986	{
2107		- loadObjThread = new LoadOBJThread();
2108		- loadObjThread.start();
	2987	+ loadObjThread = new LoadOBJThread();
	2988	+ loadObjThread.start();
2109	2989	}
2110	2990
2111	2991	loadObjThread.add(fullname);
2112		- */
	2992	+ /**/
2113	2993
2114		- System.out.println("Loading " + fullname);
2115		- makeSomething(new FileObject(fullname, true), true);
	2994	+ //makeSomething(new FileObject(fullname, true), true);
2116	2995	}
2117	2996
2118	2997	void LoadGFDFile(String fullname)
..	..	@@ -2373,11 +3252,11 @@
2373	3252
2374	3253	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	3254	{
2376		- if (GrafreeD.standAlone)
	3255	+ if (Grafreed.standAlone)
2377	3256	{
2378	3257	/**/
2379	3258	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	3259	+ browser.setVisible(true);
2381	3260	String filename = browser.getFile();
2382	3261	if (filename != null && filename.length() > 0)
2383	3262	{
..	..	@@ -2488,6 +3367,7 @@
2488	3367	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2489	3368	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2490	3369	}
	3370	+
2491	3371	//cJME.count++;
2492	3372	//cJME.count %= 12;
2493	3373	if (gc)
..	..	@@ -2671,6 +3551,7 @@
2671	3551	}
2672	3552	}
2673	3553	}
	3554	+
2674	3555	cFileSystemPane FSPane;
2675	3556
2676	3557	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2680,7 +3561,7 @@
2680	3561
2681	3562	freezematerial = true;
2682	3563	colorField.setFloat(mat.color);
2683		- modulationField.setFloat(mat.modulation);
	3564	+ saturationField.setFloat(mat.modulation);
2684	3565	metalnessField.setFloat(mat.metalness);
2685	3566	diffuseField.setFloat(mat.diffuse);
2686	3567	specularField.setFloat(mat.specular);
..	..	@@ -2724,11 +3605,14 @@
2724	3605	}
2725	3606	}
2726	3607	}
	3608	+
2727	3609	freezematerial = false;
2728	3610	}
2729	3611
2730	3612	void SetMaterial(Object3D object)
2731	3613	{
	3614	+ latestObject = object;
	3615	+
2732	3616	cMaterial mat = object.material;
2733	3617
2734	3618	if (mat == null)
..	..	@@ -2737,33 +3621,10 @@
2737	3621	return;
2738	3622	}
2739	3623
2740		- multiplyToggle.setSelected(mat.multiply);
2741		-
2742		- assert (object.projectedVertices != null);
2743		-
2744		- if (object.projectedVertices.length <= 2)
2745		- {
2746		- // Side effect...
2747		- Object3D.cVector2[] keep = object.projectedVertices;
2748		- object.projectedVertices = new Object3D.cVector2[3];
2749		- for (int i = 0; i < 3; i++)
2750		- {
2751		- if (i < keep.length)
2752		- {
2753		- object.projectedVertices[i] = keep[i];
2754		- } else
2755		- {
2756		- object.projectedVertices[i] = new Object3D.cVector2();
2757		- }
2758		- /*
2759		- if(keep.length == 0)
2760		- object.projectedVertices[0] = new Object3D.cVector2();
2761		- else
2762		- object.projectedVertices[0] = keep[0];
2763		- object.projectedVertices[1] = new Object3D.cVector2();
2764		- */
2765		- }
2766		- }
	3624	+ if (multiplyToggle != null)
	3625	+ multiplyToggle.setSelected(mat.multiply);
	3626	+
	3627	+ AllocProjectedVertices(object);
2767	3628
2768	3629	SetMaterial(mat, object.projectedVertices);
2769	3630	}
..	..	@@ -2839,12 +3700,17 @@
2839	3700	// }
2840	3701
2841	3702	/**/
2842		- if (deselect)
	3703	+ if (deselect \|\| child == null)
2843	3704	{
2844	3705	//group.deselectAll();
2845	3706	//freeze = true;
2846	3707	GetTree().clearSelection();
2847	3708	//freeze = false;
	3709	+
	3710	+ if (child == null)
	3711	+ {
	3712	+ return;
	3713	+ }
2848	3714	}
2849	3715
2850	3716	//group.addSelectee(child);
..	..	@@ -2878,6 +3744,17 @@
2878	3744	public void itemStateChanged(ItemEvent event)
2879	3745	{
2880	3746	// System.out.println("Propagate = " + propagate);
	3747	+ if (event.getSource() == pinButton)
	3748	+ {
	3749	+ copy.pinned ^= true;
	3750	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3751	+ {
	3752	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3753	+ copy.CloseUI();
	3754	+ //copy.editWindow.refreshContents();
	3755	+ }
	3756	+ }
	3757	+ else
2881	3758	if (event.getSource() == propagateToggle)
2882	3759	{
2883	3760	propagate ^= true;
..	..	@@ -2913,7 +3790,7 @@
2913	3790	cameraView.ToggleDL();
2914	3791	cameraView.repaint();
2915	3792	return;
2916		- } else if (event.getSource() == toggleTextureItem)
	3793	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2917	3794	{
2918	3795	cameraView.ToggleTexture();
2919	3796	// june 2013 copy.HardTouch();
..	..	@@ -2952,9 +3829,9 @@
2952	3829	frame.validate();
2953	3830
2954	3831	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	3832	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2956	3833	{
2957		- cameraView.ToggleRandom();
	3834	+ cameraView.ToggleSwitch();
2958	3835	cameraView.repaint();
2959	3836	return;
2960	3837	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2982,12 +3859,17 @@
2982	3859	} else if (event.getSource() == liveCB)
2983	3860	{
2984	3861	copy.live ^= true;
	3862	+ objEditor.refreshContents(true); // To show item colors
	3863	+ return;
	3864	+ } else if (event.getSource() == selectableCB)
	3865	+ {
	3866	+ copy.dontselect ^= true;
2985	3867	return;
2986	3868	} else if (event.getSource() == hideCB)
2987	3869	{
2988	3870	copy.hide ^= true;
2989	3871	copy.Touch(); // display list issue
2990		- objEditor.refreshContents();
	3872	+ objEditor.refreshContents(true); // To show item colors
2991	3873	return;
2992	3874	} else if (event.getSource() == link2masterCB)
2993	3875	{
..	..	@@ -3021,8 +3903,9 @@
3021	3903
3022	3904	public void actionPerformed(ActionEvent event)
3023	3905	{
	3906	+ Object source = event.getSource();
3024	3907	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3908	+ if (source == okbutton)
3026	3909	{
3027	3910	textpanel.setVisible(false);
3028	3911	textpanel.remove(textarea);
..	..	@@ -3034,7 +3917,7 @@
3034	3917	textarea = null;
3035	3918	textpanel = null;
3036	3919	}
3037		- if (event.getSource() == cancelbutton)
	3920	+ if (source == cancelbutton)
3038	3921	{
3039	3922	textpanel.setVisible(false);
3040	3923	textpanel.remove(textarea);
..	..	@@ -3046,50 +3929,50 @@
3046	3929	//applySelf();
3047	3930	//client.refreshEditWindow();
3048	3931	//refreshContents();
3049		- if (event.getSource() == nameField)
	3932	+ if (source == nameField)
3050	3933	{
3051	3934	//System.out.println("ObjEditor " + event);
3052	3935	applySelf0(true);
3053	3936	//parent.applySelf();
3054		- objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3937	+ // conflicts with requestFocus objEditor.refreshContents();
	3938	+ } else if (source == resetButton)
3056	3939	{
3057	3940	CameraPane.fullreset = true;
3058	3941	copy.Reset(); // ResetMeshes();
3059	3942	copy.Touch();
3060	3943	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3944	+ } else if (source == stepItem)
3062	3945	{
3063	3946	//cameraView.ONESTEP = true;
3064	3947	Globals.ONESTEP = true;
3065	3948	cameraView.repaint();
3066	3949	return;
3067		- } else if (event.getSource() == stepButton)
	3950	+ } else if (source == stepButton)
3068	3951	{
3069	3952	copy.Step();
3070	3953	copy.Touch();
3071	3954	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3955	+ } else if (source == slowerButton)
3073	3956	{
3074	3957	copy.Slower();
3075	3958	copy.Touch();
3076	3959	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3960	+ } else if (source == fasterButton)
3078	3961	{
3079	3962	copy.Faster();
3080	3963	copy.Touch();
3081	3964	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3965	+ } else if (source == remarkButton)
3083	3966	{
3084	3967	copy.Remark();
3085	3968	copy.Touch();
3086	3969	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3970	+ } else if (source == stepAllButton)
3088	3971	{
3089	3972	copy.StepAll();
3090	3973	copy.Touch();
3091	3974	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3975	+ } else if (source == resetAllButton)
3093	3976	{
3094	3977	//CameraPane.fullreset = true;
3095	3978	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +4005,79 @@
3122	4005	// Close();
3123	4006	// }
3124	4007	// else
3125		- if (event.getSource() == resetSlidersButton)
	4008	+ if (source == resetSlidersButton)
3126	4009	{
3127	4010	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	4011	+ } else if (source == clearMaterialButton)
3129	4012	{
3130	4013	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	4014	+ } else if (source == createMaterialButton)
3132	4015	{
3133	4016	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	4017	+ } else if (source == clearPanelButton)
3135	4018	{
3136	4019	copy.ClearUI();
3137	4020	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ else if (event.getSource() == closeItem)
	4021	+ } else if (source == importGFDItem)
	4022	+ {
	4023	+ ImportGFD();
	4024	+ } else
	4025	+ if (source == importVRMLX3DItem)
	4026	+ {
	4027	+ ImportVRMLX3D();
	4028	+ } else
	4029	+ if (source == import3DSItem)
	4030	+ {
	4031	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4032	+ } else
	4033	+ if (source == importOBJItem)
	4034	+ {
	4035	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4036	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4037	+ browser.setVisible(true);
	4038	+ String filename = browser.getFile();
	4039	+ if (filename != null && filename.length() > 0)
	4040	+ {
	4041	+ String fullname = browser.getDirectory() + filename;
	4042	+ makeSomething(ReadOBJ(fullname), true);
	4043	+ }
	4044	+ } else
	4045	+ if (source == closeItem)
3144	4046	{
3145	4047	Close();
3146	4048	//return true;
3147		- } else if (event.getSource() == loadItem)
	4049	+ } else if (source == openItem)
3148	4050	{
3149		- load();
	4051	+ Open();
3150	4052	//return true;
3151		- } else if (event.getSource() == saveItem)
	4053	+ } else if (source == newItem)
	4054	+ {
	4055	+ New();
	4056	+ } else if (source == saveItem)
3152	4057	{
3153	4058	save();
3154	4059	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	4060	+ } else if (source == saveAsItem)
3156	4061	{
3157	4062	saveAs();
3158	4063	//return true;
3159		- } else if (event.getSource() == reexportItem)
	4064	+ } else if (source == reexportItem)
3160	4065	{
3161	4066	reexport();
3162	4067	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	4068	+ } else if (source == exportAsItem)
3164	4069	{
3165	4070	export();
3166	4071	//return true;
3167		- } else if (event.getSource() == povItem)
	4072	+ } else if (source == povItem)
3168	4073	{
3169	4074	generatePOV();
3170	4075	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	4076	+ } else if (event.getSource() == archiveItem)
	4077	+ {
	4078	+ cTools.Archive(frame);
	4079	+ return;
	4080	+ } else if (source == zBufferItem)
3172	4081	{
3173	4082	try
3174	4083	{
..	..	@@ -3190,21 +4099,8 @@
3190	4099	cameraView.repaint();
3191	4100	//return true;
3192	4101	}
3193		- */ else if (event.getSource() == editCameraItem)
3194		- {
3195		- cameraView.ProtectCamera();
3196		- cameraView.repaint();
3197		- return;
3198		- } else if (event.getSource() == revertCameraItem)
3199		- {
3200		- cameraView.RevertCamera();
3201		- cameraView.repaint();
3202		- return;
3203		-// } else if (event.getSource() == textureButton)
3204		-// {
3205		-// return; // true;
3206		- } else // combos...
3207		- if (event.getSource() == texresMenu)
	4102	+ */ else // combos...
	4103	+ if (source == texresMenu)
3208	4104	{
3209	4105	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	4106	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +4112,473 @@
3216	4112	}
3217	4113	}
3218	4114
	4115	+ void New()
	4116	+ {
	4117	+ while (copy.Size() > 1)
	4118	+ {
	4119	+ copy.remove(1);
	4120	+ }
	4121	+
	4122	+ ResetModel();
	4123	+ objEditor.refreshContents();
	4124	+ }
	4125	+
	4126	+ static public byte[] Compress(Object3D o)
	4127	+ {
	4128	+ // Slower to actually compress.
	4129	+ try
	4130	+ {
	4131	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4132	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4133	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4134	+
	4135	+ Object3D parent = o.parent;
	4136	+ o.parent = null;
	4137	+
	4138	+ out.writeObject(o);
	4139	+
	4140	+ o.parent = parent;
	4141	+
	4142	+ out.flush();
	4143	+
	4144	+ baos //zstream
	4145	+ .close();
	4146	+ out.close();
	4147	+
	4148	+ byte[] bytes = baos.toByteArray();
	4149	+
	4150	+ System.out.println("save #bytes = " + bytes.length);
	4151	+ return bytes;
	4152	+ } catch (Exception e)
	4153	+ {
	4154	+ System.err.println(e);
	4155	+ return null;
	4156	+ }
	4157	+ }
	4158	+
	4159	+ static public Object Uncompress(byte[] bytes)
	4160	+ {
	4161	+ System.out.println("restore #bytes = " + bytes.length);
	4162	+ try
	4163	+ {
	4164	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4165	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4166	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4167	+ Object obj = in.readObject();
	4168	+
	4169	+ bais //istream
	4170	+ .close();
	4171	+ in.close();
	4172	+
	4173	+ return obj;
	4174	+ } catch (Exception e)
	4175	+ {
	4176	+ System.err.println(e);
	4177	+ return null;
	4178	+ }
	4179	+ }
	4180	+
	4181	+ static public Object clone(Object o)
	4182	+ {
	4183	+ try
	4184	+ {
	4185	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4186	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4187	+
	4188	+ out.writeObject(o);
	4189	+
	4190	+ out.flush();
	4191	+ out.close();
	4192	+
	4193	+ byte[] bytes = baos.toByteArray();
	4194	+
	4195	+ System.out.println("clone = " + bytes.length);
	4196	+
	4197	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4198	+ ObjectInputStream in = new ObjectInputStream(bais);
	4199	+ Object obj = in.readObject();
	4200	+ in.close();
	4201	+
	4202	+ return obj;
	4203	+ } catch (Exception e)
	4204	+ {
	4205	+ System.err.println(e);
	4206	+ return null;
	4207	+ }
	4208	+ }
	4209	+
	4210	+ cRadio GetCurrentTab()
	4211	+ {
	4212	+ cRadio ab;
	4213	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4214	+ {
	4215	+ ab = (cRadio)e.nextElement();
	4216	+ if(ab.GetObject() == copy)
	4217	+ {
	4218	+ return ab;
	4219	+ }
	4220	+ }
	4221	+
	4222	+ return null;
	4223	+ }
	4224	+
	4225	+
	4226	+ public void Save()
	4227	+ {
	4228	+ //Save(true);
	4229	+ Replace();
	4230	+ SetVersionStates();
	4231	+ }
	4232	+
	4233	+ private boolean Equal(byte[] compress, byte[] name)
	4234	+ {
	4235	+ if (compress.length != name.length)
	4236	+ {
	4237	+ return false;
	4238	+ }
	4239	+
	4240	+ for (int i=compress.length; --i>=0;)
	4241	+ {
	4242	+ if (compress[i] != name[i])
	4243	+ return false;
	4244	+ }
	4245	+
	4246	+ return true;
	4247	+ }
	4248	+
	4249	+ void DeleteVersion()
	4250	+ {
	4251	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4252	+ {
	4253	+ copy.versionlist[i] = copy.versionlist[i+1];
	4254	+ }
	4255	+
	4256	+ if (copy.versionlist[copy.versionindex] == null)
	4257	+ copy.versionindex -= 1;
	4258	+
	4259	+ if (copy.versionindex != -1)
	4260	+ CopyChanged();
	4261	+
	4262	+ SetVersionStates();
	4263	+ }
	4264	+
	4265	+ public boolean Save(boolean user)
	4266	+ {
	4267	+ System.err.println("Save");
	4268	+ Replace();
	4269	+
	4270	+ //cRadio tab = GetCurrentTab();
	4271	+
	4272	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4273	+
	4274	+ boolean thesame = false;
	4275	+
	4276	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4277	+// {
	4278	+// thesame = true;
	4279	+// }
	4280	+
	4281	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4282	+ if (!thesame)
	4283	+ {
	4284	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4285	+ {
	4286	+ copy.versionlist[i] = copy.versionlist[i-1];
	4287	+ }
	4288	+
	4289	+ //tab.user[tab.versionindex] = user;
	4290	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4291	+
	4292	+ copy.versionlist[++copy.versionindex] = compress;
	4293	+
	4294	+ // if (increment)
	4295	+ // tab.versionindex++;
	4296	+ }
	4297	+
	4298	+ //copy.RestoreBigData(versiontable);
	4299	+
	4300	+ //assert(hashtable.isEmpty());
	4301	+
	4302	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4303	+// {
	4304	+// //tab.user[i] = false;
	4305	+// copy.versionlist[i] = null;
	4306	+// }
	4307	+
	4308	+ SetVersionStates();
	4309	+
	4310	+ // test save
	4311	+ if (false)
	4312	+ {
	4313	+ try
	4314	+ {
	4315	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4316	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4317	+
	4318	+ p.writeObject(copy);
	4319	+
	4320	+ p.flush();
	4321	+
	4322	+ ostream.close();
	4323	+ } catch (Exception e)
	4324	+ {
	4325	+ e.printStackTrace();
	4326	+ }
	4327	+ }
	4328	+
	4329	+ return !thesame;
	4330	+ }
	4331	+
	4332	+ boolean flashIt = true;
	4333	+
	4334	+ void RefreshSelection()
	4335	+ {
	4336	+ Object3D selection = new Object3D();
	4337	+
	4338	+ for (int i = 0; i < copy.selection.size(); i++)
	4339	+ {
	4340	+ Object3D elem = copy.selection.elementAt(i);
	4341	+
	4342	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4343	+
	4344	+ if (obj == null)
	4345	+ {
	4346	+ copy.selection.remove(i--);
	4347	+ }
	4348	+ else
	4349	+ {
	4350	+ selection.add(obj);
	4351	+ copy.selection.setElementAt(obj, i);
	4352	+ }
	4353	+ }
	4354	+
	4355	+ flashIt = false;
	4356	+ GetTree().clearSelection();
	4357	+ for (int i = 0; i < selection.size(); i++)
	4358	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4359	+ flashIt = true;
	4360	+
	4361	+ //refreshContents(false);
	4362	+ }
	4363	+
	4364	+ void CopyChanged()
	4365	+ {
	4366	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4367	+
	4368	+ SetVersionStates();
	4369	+
	4370	+ boolean temp = CameraPane.SWITCH;
	4371	+ CameraPane.SWITCH = false;
	4372	+
	4373	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4374	+
	4375	+ copy.clear();
	4376	+
	4377	+ copy.skyboxname = obj.skyboxname;
	4378	+ copy.skyboxext = obj.skyboxext;
	4379	+
	4380	+ for (int i=0; i<obj.Size(); i++)
	4381	+ {
	4382	+ copy.add(obj.get(i));
	4383	+ }
	4384	+
	4385	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4386	+
	4387	+ CameraPane.SWITCH = temp;
	4388	+
	4389	+ RefreshSelection();
	4390	+ //assert(hashtable.isEmpty());
	4391	+
	4392	+ copy.Touch();
	4393	+
	4394	+ ResetModel();
	4395	+ copy.HardTouch(); // recompile?
	4396	+
	4397	+ cRadio ab;
	4398	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4399	+ {
	4400	+ ab = (cRadio)e.nextElement();
	4401	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4402	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4403	+ if (test != null)
	4404	+ {
	4405	+ test.editWindow = ab.object.editWindow;
	4406	+ ab.object = test;
	4407	+ }
	4408	+ }
	4409	+
	4410	+ refreshContents(true);
	4411	+ }
	4412	+
	4413	+ cButton previousVersionButton;
	4414	+ cButton restoreButton;
	4415	+ cButton replaceButton;
	4416	+ cButton nextVersionButton;
	4417	+ cButton saveVersionButton;
	4418	+ cButton deleteVersionButton;
	4419	+
	4420	+ boolean muteSlider;
	4421	+
	4422	+ int VersionCount()
	4423	+ {
	4424	+ int count = 0;
	4425	+
	4426	+ for (int i = copy.versionlist.length; --i >= 0;)
	4427	+ {
	4428	+ if (copy.versionlist[i] != null)
	4429	+ count++;
	4430	+ }
	4431	+
	4432	+ return count;
	4433	+ }
	4434	+
	4435	+ void SetVersionStates()
	4436	+ {
	4437	+ //if (true)
	4438	+ // return;
	4439	+
	4440	+ //cRadio tab = GetCurrentTab();
	4441	+
	4442	+ restoreButton.setEnabled(copy.versionindex != -1);
	4443	+ replaceButton.setEnabled(copy.versionindex != -1);
	4444	+
	4445	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4446	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4447	+
	4448	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4449	+ //copy.versionlist[copy.versionindex + 1] != null);
	4450	+
	4451	+ muteSlider = true;
	4452	+ versionSlider.setMinimum(0);
	4453	+ versionSlider.setMaximum(VersionCount() - 1);
	4454	+ versionSlider.setInteger(copy.versionindex);
	4455	+ versionSlider.setEnabled(copy.versionindex != -1);
	4456	+ muteSlider = false;
	4457	+ }
	4458	+
	4459	+ public boolean PreviousVersion()
	4460	+ {
	4461	+ // Option?
	4462	+ Replace();
	4463	+
	4464	+ System.err.println("Undo");
	4465	+
	4466	+ //cRadio tab = GetCurrentTab();
	4467	+
	4468	+ if (copy.versionindex == 0)
	4469	+ {
	4470	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4471	+ return false;
	4472	+ }
	4473	+
	4474	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4475	+// {
	4476	+// if (Save(false))
	4477	+// tab.versionindex -= 1;
	4478	+// else
	4479	+// {
	4480	+// if (tab.versionindex <= 0)
	4481	+// return false;
	4482	+// else
	4483	+// tab.versionindex -= 1;
	4484	+// }
	4485	+// }
	4486	+
	4487	+ copy.versionindex -= 1;
	4488	+
	4489	+ CopyChanged();
	4490	+
	4491	+ return true;
	4492	+ }
	4493	+
	4494	+ public boolean Restore()
	4495	+ {
	4496	+ System.err.println("Restore");
	4497	+
	4498	+ //cRadio tab = GetCurrentTab();
	4499	+
	4500	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4501	+ {
	4502	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4503	+ return false;
	4504	+ }
	4505	+
	4506	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4507	+ CopyChanged();
	4508	+
	4509	+ return true;
	4510	+ }
	4511	+
	4512	+ public boolean Replace()
	4513	+ {
	4514	+ //System.err.println("Replace");
	4515	+
	4516	+ //cRadio tab = GetCurrentTab();
	4517	+
	4518	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4519	+ {
	4520	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4521	+ return false;
	4522	+ }
	4523	+
	4524	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4525	+
	4526	+ return true;
	4527	+ }
	4528	+
	4529	+ public void NextVersion()
	4530	+ {
	4531	+ // Option?
	4532	+ Replace();
	4533	+
	4534	+ //cRadio tab = GetCurrentTab();
	4535	+
	4536	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4537	+ {
	4538	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4539	+ return;
	4540	+ }
	4541	+
	4542	+ copy.versionindex += 1;
	4543	+
	4544	+ CopyChanged();
	4545	+
	4546	+ //if (!tab.user[tab.versionindex])
	4547	+ // tab.graphs[tab.versionindex] = null;
	4548	+ }
	4549	+
	4550	+ void ImportGFD()
	4551	+ {
	4552	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4553	+ browser.show();
	4554	+ String filename = browser.getFile();
	4555	+ if (filename != null && filename.length() > 0)
	4556	+ {
	4557	+ String fullname = browser.getDirectory() + filename;
	4558	+
	4559	+ //Object3D readobj =
	4560	+ objEditor.ReadGFD(fullname, objEditor);
	4561	+ //makeSomething(readobj);
	4562	+ }
	4563	+ }
	4564	+
	4565	+ void ImportVRMLX3D()
	4566	+ {
	4567	+ if (Grafreed.standAlone)
	4568	+ {
	4569	+ /**/
	4570	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4571	+ browser.show();
	4572	+ String filename = browser.getFile();
	4573	+ if (filename != null && filename.length() > 0)
	4574	+ {
	4575	+ String fullname = browser.getDirectory() + filename;
	4576	+ LoadVRMLX3D(fullname);
	4577	+ }
	4578	+ /**/
	4579	+ }
	4580	+ }
	4581	+
3219	4582	void ToggleAnimation()
3220	4583	{
3221	4584	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +4594,8 @@
3231	4594
3232	4595	Globals.ANIMATION ^= true;
3233	4596
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	4597	+ Grafreed.wav.cursor = 0;
	4598	+ Grafreed.wav.loop = 0;
3236	4599	}
3237	4600	} else
3238	4601	{
..	..	@@ -3253,7 +4616,6 @@
3253	4616	callee.refreshContents();
3254	4617	} else
3255	4618	{
3256		- new Exception().printStackTrace();
3257	4619	System.exit(0);
3258	4620	}
3259	4621	}
..	..	@@ -3283,7 +4645,7 @@
3283	4645	void CreateMaterial()
3284	4646	{
3285	4647	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4648	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	4649	if (copy.selection.size() > 0)
3288	4650	//SetMaterial(copy);
3289	4651	{
..	..	@@ -3334,7 +4696,7 @@
3334	4696	assert false;
3335	4697	}
3336	4698
3337		- void EditSelection()
	4699	+ void EditSelection(boolean newWindow)
3338	4700	{
3339	4701	}
3340	4702
..	..	@@ -3342,11 +4704,11 @@
3342	4704	{
3343	4705	copy.ResetBlockLoop(); // temporary problem
3344	4706
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	4707	+ boolean random = CameraPane.SWITCH;
	4708	+ CameraPane.SWITCH = false; // parse everything
3347	4709	copy.ResetDisplayList();
3348	4710	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	4711	+ CameraPane.SWITCH = random;
3350	4712	}
3351	4713
3352	4714	// public void applySelf()
..	..	@@ -3376,6 +4738,12 @@
3376	4738	// else
3377	4739	// applySelf(true);
3378	4740	// }
	4741	+
	4742	+ boolean Equal(double a, double b)
	4743	+ {
	4744	+ return Math.abs(a - b) < 0.001;
	4745	+ }
	4746	+
3379	4747	void applySelf0(boolean name)
3380	4748	{
3381	4749	if (name)
..	..	@@ -3393,7 +4761,7 @@
3393	4761	//copy.material = new cMaterial(copy.GetMaterial());
3394	4762
3395	4763	current.color = (float) colorField.getFloat();
3396		- current.modulation = (float) modulationField.getFloat();
	4764	+ current.modulation = (float) saturationField.getFloat();
3397	4765	current.metalness = (float) metalnessField.getFloat();
3398	4766	current.diffuse = (float) diffuseField.getFloat();
3399	4767	current.specular = (float) specularField.getFloat();
..	..	@@ -3420,6 +4788,59 @@
3420	4788	{
3421	4789	//System.out.println("Propagate = " + propagate);
3422	4790	copy.UpdateMaterial(anchor, current, propagate);
	4791	+
	4792	+ if (copy.material != null)
	4793	+ {
	4794	+ cMaterial mat = copy.material;
	4795	+
	4796	+ if (!Equal(colorField.getFloat(), mat.color))
	4797	+ colorField.SetToolTipValue((mat.color));
	4798	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4799	+ saturationField.SetToolTipValue((mat.modulation));
	4800	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4801	+ metalnessField.SetToolTipValue((mat.metalness));
	4802	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4803	+ diffuseField.SetToolTipValue((mat.diffuse));
	4804	+ if (!Equal(specularField.getFloat(), mat.specular))
	4805	+ specularField.SetToolTipValue((mat.specular));
	4806	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4807	+ shininessField.SetToolTipValue((mat.shininess));
	4808	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4809	+ shiftField.SetToolTipValue((mat.shift));
	4810	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4811	+ ambientField.SetToolTipValue((mat.ambient));
	4812	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4813	+ lightareaField.SetToolTipValue((mat.lightarea));
	4814	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4815	+ diffusenessField.SetToolTipValue((mat.factor));
	4816	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4817	+ velvetField.SetToolTipValue((mat.velvet));
	4818	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4819	+ sheenField.SetToolTipValue((mat.sheen));
	4820	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4821	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4822	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4823	+ backlitField.SetToolTipValue((mat.bump));
	4824	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4825	+ anisoField.SetToolTipValue((mat.aniso));
	4826	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4827	+ anisoVField.SetToolTipValue((mat.anisoV));
	4828	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4829	+ cameraField.SetToolTipValue((mat.cameralight));
	4830	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4831	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4832	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4833	+ shadowField.SetToolTipValue((mat.shadow));
	4834	+ if (!Equal(textureField.getFloat(), mat.texture))
	4835	+ textureField.SetToolTipValue((mat.texture));
	4836	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4837	+ opacityField.SetToolTipValue((mat.opacity));
	4838	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4839	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4840	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4841	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4842	+ }
	4843	+
3423	4844	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	4845	{
3425	4846	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3448,9 +4869,28 @@
3448	4869	//copy.Touch();
3449	4870	}
3450	4871
	4872	+ cNumberSlider versionSlider;
	4873	+
3451	4874	public void stateChanged(ChangeEvent e)
3452	4875	{
3453	4876	// assert(false);
	4877	+ if (e.getSource() == versionSlider)
	4878	+ {
	4879	+ if (muteSlider)
	4880	+ return;
	4881	+
	4882	+ Replace();
	4883	+
	4884	+ int version = versionSlider.getInteger();
	4885	+
	4886	+ if (version != -1 && copy.versionlist[version] != null)
	4887	+ {
	4888	+ copy.versionindex = version;
	4889	+ CopyChanged();
	4890	+ }
	4891	+
	4892	+ return;
	4893	+ }
3454	4894
3455	4895	if (freezematerial)
3456	4896	{
..	..	@@ -3486,6 +4926,12 @@
3486	4926	{
3487	4927	//System.out.println("stateChanged = " + this);
3488	4928	materialtouched = true;
	4929	+
	4930	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4931	+ {
	4932	+ saturationField.setFloat(1);
	4933	+ }
	4934	+
3489	4935	applySelf();
3490	4936	//System.out.println("this = " + this);
3491	4937	//System.out.println("PARENT = " + parent);
..	..	@@ -3535,7 +4981,7 @@
3535	4981	}
3536	4982
3537	4983	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4984	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	4985	}
3540	4986
3541	4987	void SnapObject()
..	..	@@ -3785,6 +5231,7 @@
3785	5231	{
3786	5232	if (GetTree() != null)
3787	5233	{
	5234	+ GetTree().revalidate();
3788	5235	GetTree().repaint();
3789	5236	}
3790	5237
..	..	@@ -3793,12 +5240,19 @@
3793	5240	ctrlPanel.validate(); // ? new
3794	5241	ctrlPanel.repaint();
3795	5242	}
	5243	+
	5244	+ if (previousVersionButton != null && copy.versionlist != null)
	5245	+ SetVersionStates();
	5246	+
	5247	+ cameraView.requestFocusInWindow();
3796	5248	}
3797	5249
3798	5250	static TweenManager tweenManager = new TweenManager();
3799	5251
3800	5252	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	5253	{
	5254	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5255	+ Save();
3802	5256	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	5257	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	5258	// if (thing instanceof GenericJointDemo)
..	..	@@ -3822,7 +5276,7 @@
3822	5276	// group = (Composite) group.get(0);
3823	5277	// }
3824	5278
3825		- System.out.println("makeSomething of " + thing);
	5279	+ //System.out.println("makeSomething of " + thing);
3826	5280
3827	5281	/*
3828	5282	if (deselect && jList != null)
..	..	@@ -3885,6 +5339,12 @@
3885	5339	{
3886	5340	ResetModel();
3887	5341	Select(thing.GetTreePath(), true, false); // unselect... false);
	5342	+
	5343	+ if (thing.Size() == 0)
	5344	+ {
	5345	+ //EditSelection(false);
	5346	+ }
	5347	+
3888	5348	refreshContents();
3889	5349	}
3890	5350
..	..	@@ -4002,6 +5462,7 @@
4002	5462	}
4003	5463	}
4004	5464	}
	5465	+
4005	5466	LoadGFDThread loadGFDThread;
4006	5467
4007	5468	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4021,8 +5482,10 @@
4021	5482
4022	5483	try
4023	5484	{
	5485	+ // Try compressed version first.
4024	5486	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5487	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5488	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4026	5489
4027	5490	readobj = (Object3D) p.readObject();
4028	5491	istream.close();
..	..	@@ -4030,7 +5493,22 @@
4030	5493	readobj.ResetDisplayList();
4031	5494	} catch (Exception e)
4032	5495	{
4033		- e.printStackTrace();
	5496	+ if (!e.toString().contains("GZIP"))
	5497	+ e.printStackTrace();
	5498	+
	5499	+ try
	5500	+ {
	5501	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5502	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5503	+
	5504	+ readobj = (Object3D) p.readObject();
	5505	+ istream.close();
	5506	+
	5507	+ readobj.ResetDisplayList();
	5508	+ } catch (Exception e2)
	5509	+ {
	5510	+ e2.printStackTrace();
	5511	+ }
4034	5512	}
4035	5513	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	5514	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4076,6 +5554,12 @@
4076	5554
4077	5555	void LoadIt(Object obj)
4078	5556	{
	5557	+ if (obj == null)
	5558	+ {
	5559	+ // Invalid file
	5560	+ return;
	5561	+ }
	5562	+
4079	5563	System.out.println("Loaded " + obj);
4080	5564	//new Exception().printStackTrace();
4081	5565	Object3D readobj = (Object3D) obj;
..	..	@@ -4085,10 +5569,14 @@
4085	5569
4086	5570	if (readobj != null)
4087	5571	{
	5572	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5573	+ // Save();
4088	5574	try
4089	5575	{
4090	5576	//readobj.deepCopySelf(copy);
4091	5577	copy.clear(); // june 2014
	5578	+ copy.skyboxname = readobj.skyboxname;
	5579	+ copy.skyboxext = readobj.skyboxext;
4092	5580	for (int i = 0; i < readobj.size(); i++)
4093	5581	{
4094	5582	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4129,6 +5617,7 @@
4129	5617	}
4130	5618	} catch (ClassCastException e)
4131	5619	{
	5620	+ e.printStackTrace();
4132	5621	assert (false);
4133	5622	Composite c = (Composite) copy;
4134	5623	c.children.clear();
..	..	@@ -4139,17 +5628,32 @@
4139	5628	c.addChild(csg);
4140	5629	}
4141	5630
	5631	+ copy.versionlist = readobj.versionlist;
	5632	+ copy.versionindex = readobj.versionindex;
	5633	+ copy.versiontable = readobj.versiontable;
	5634	+
	5635	+ if (copy.versionlist == null)
	5636	+ {
	5637	+ // Backward compatibility
	5638	+ copy.versionlist = new Object3D[100];
	5639	+ copy.versionindex = -1;
	5640	+
	5641	+ //Save(true);
	5642	+ }
	5643	+
	5644	+ //? SetUndoStates();
	5645	+
4142	5646	ResetModel();
4143	5647	copy.HardTouch(); // recompile?
4144	5648	refreshContents();
4145	5649	}
4146	5650	}
4147	5651
4148		- void load() // throws ClassNotFoundException
	5652	+ void Open() // throws ClassNotFoundException
4149	5653	{
4150		- if (GrafreeD.standAlone)
	5654	+ if (Grafreed.standAlone)
4151	5655	{
4152		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5656	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4153	5657	browser.show();
4154	5658	String filename = browser.getFile();
4155	5659	if (filename != null && filename.length() > 0)
..	..	@@ -4226,6 +5730,8 @@
4226	5730
4227	5731	void save()
4228	5732	{
	5733	+ Replace();
	5734	+
4229	5735	if (lastname == null)
4230	5736	{
4231	5737	return;
..	..	@@ -4234,11 +5740,13 @@
4234	5740	try
4235	5741	{
4236	5742	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5743	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5744	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	5745
4239	5746	p.writeObject(copy);
4240	5747	p.flush();
4241	5748
	5749	+ zstream.close();
4242	5750	ostream.close();
4243	5751
4244	5752	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4246,19 +5754,23 @@
4246	5754	//ps.print(buffer.toString());
4247	5755	} catch (IOException e)
4248	5756	{
	5757	+ e.printStackTrace();
4249	5758	}
4250	5759	}
	5760	+
4251	5761	String lastname;
4252	5762
4253	5763	void saveAs()
4254	5764	{
4255		- if (GrafreeD.standAlone)
	5765	+ if (Grafreed.standAlone)
4256	5766	{
4257	5767	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	5768	browser.setVisible(true);
4259	5769	String filename = browser.getFile();
4260	5770	if (filename != null && filename.length() > 0)
4261	5771	{
	5772	+ if (!filename.endsWith(".gfd"))
	5773	+ filename += ".gfd";
4262	5774	lastname = browser.getDirectory() + filename;
4263	5775	save();
4264	5776	}
..	..	@@ -4357,13 +5869,13 @@
4357	5869	try
4358	5870	{
4359	5871	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5872	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5873	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	5874
4363	5875	Object3D objectparent = obj.parent;
4364	5876	obj.parent = null;
4365	5877
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5878	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	5879
4368	5880	obj.parent = objectparent;
4369	5881
..	..	@@ -4375,8 +5887,8 @@
4375	5887	p.writeObject(object);
4376	5888	p.flush();
4377	5889
	5890	+ zstream.close();
4378	5891	ostream.close();
4379		- // zstream.close();
4380	5892
4381	5893	// group.selection.get(0).parent = parent;
4382	5894	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +5909,7 @@
4397	5909	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	5910	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	5911	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	5912	+ if (Grafreed.standAlone)
4401	5913	{
4402	5914	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	5915	browser.show();
..	..	@@ -4423,19 +5935,18 @@
4423	5935	Object3D client;
4424	5936	Object3D copy;
4425	5937	MenuBar menuBar;
4426		- Menu windowMenu;
4427		- MenuItem loadItem;
	5938	+ Menu fileMenu;
	5939	+ MenuItem newItem;
	5940	+ MenuItem openItem;
4428	5941	MenuItem saveItem;
4429	5942	MenuItem saveAsItem;
4430	5943	MenuItem exportAsItem;
4431	5944	MenuItem reexportItem;
4432	5945	MenuItem povItem;
4433	5946	MenuItem closeItem;
4434		- Menu cameraMenu;
	5947	+
4435	5948	CheckboxMenuItem zBufferItem;
4436	5949	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	5950	MenuItem stepItem;
4440	5951	CheckboxMenuItem toggleLiveItem;
4441	5952	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,25 +5957,40 @@
4446	5957	CheckboxMenuItem toggleFootContactItem;
4447	5958	CheckboxMenuItem toggleDLItem;
4448	5959	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	5960	+ CheckboxMenuItem toggleSwitchItem;
4450	5961	CheckboxMenuItem toggleRootItem;
4451	5962	CheckboxMenuItem animationItem;
	5963	+ MenuItem archiveItem;
4452	5964	CheckboxMenuItem toggleHandleItem;
4453	5965	CheckboxMenuItem togglePaintItem;
4454	5966	JSplitPane mainPanel;
4455	5967	JScrollPane scrollpane;
	5968	+
4456	5969	JPanel toolbarPanel;
	5970	+
4457	5971	cGridBag treePanel;
	5972	+
4458	5973	JPanel radioPanel;
4459	5974	ButtonGroup buttonGroup;
4460		- cGridBag ctrlPanel;
	5975	+
	5976	+ cGridBag toolboxPanel;
	5977	+ cGridBag skyboxPanel;
4461	5978	cGridBag materialPanel;
	5979	+ cGridBag ctrlPanel;
	5980	+
4462	5981	JScrollPane infoPanel;
	5982	+
4463	5983	cGridBag optionsPanel;
	5984	+
4464	5985	JTabbedPane objectPanel;
	5986	+ boolean materialFlushed;
	5987	+ Object3D latestObject;
	5988	+
4465	5989	cGridBag XYZPanel;
	5990	+
4466	5991	JSplitPane gridPanel;
4467	5992	JSplitPane bigPanel;
	5993	+
4468	5994	cGridBag bigThree;
4469	5995	cGridBag scenePanel;
4470	5996	cGridBag centralPanel;
..	..	@@ -4522,7 +6048,7 @@
4522	6048	JLabel colorLabel;
4523	6049	cNumberSlider colorField;
4524	6050	JLabel modulationLabel;
4525		- cNumberSlider modulationField;
	6051	+ cNumberSlider saturationField;
4526	6052	JLabel metalnessLabel;
4527	6053	cNumberSlider metalnessField;
4528	6054	JLabel diffuseLabel;
..	..	@@ -4553,6 +6079,7 @@
4553	6079	cNumberSlider anisoField;
4554	6080	JLabel anisoVLabel;
4555	6081	cNumberSlider anisoVField;
	6082	+
4556	6083	JLabel cameraLabel;
4557	6084	cNumberSlider cameraField;
4558	6085	JLabel selfshadowLabel;
..	..	@@ -4567,6 +6094,7 @@
4567	6094	cNumberSlider fakedepthField;
4568	6095	JLabel shadowbiasLabel;
4569	6096	cNumberSlider shadowbiasField;
	6097	+
4570	6098	JLabel bumpLabel;
4571	6099	cNumberSlider bumpField;
4572	6100	JLabel noiseLabel;
..	..	@@ -4579,8 +6107,13 @@
4579	6107	cNumberSlider fogField;
4580	6108	JLabel opacityPowerLabel;
4581	6109	cNumberSlider opacityPowerField;
4582		- JTree jTree;
	6110	+ cTree jTree;
4583	6111	//ObjectUI parent;
4584	6112
4585	6113	cNumberSlider normalpushField;
	6114	+
	6115	+ private MenuItem importGFDItem;
	6116	+ private MenuItem importVRMLX3DItem;
	6117	+ private MenuItem import3DSItem;
	6118	+ private MenuItem importOBJItem;
4586	6119	}