~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	+ 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(getClass().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
..	..	@@ -143,7 +264,9 @@
143	264	//nameField.removeActionListener(this);
144	265	// objEditor.ctrlPanel.remove(nameField);
145	266
146		- if (!GroupEditor.allparams)
	267	+ objEditor.ctrlPanel.remove(namePanel);
	268	+
	269	+ if (!allparams)
147	270	return;
148	271
149	272	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -165,9 +288,9 @@
165	288	// objEditor.ctrlPanel.remove(fasterButton);
166	289	// objEditor.ctrlPanel.remove(remarkButton);
167	290
168		- objEditor.ctrlPanel.remove(namePanel);
169	291	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	292	+ objEditor.ctrlPanel.remove(setupPanel2);
	293	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	294	objEditor.ctrlPanel.remove(pushPanel);
172	295	//objEditor.ctrlPanel.remove(fillPanel);
173	296
..	..	@@ -215,6 +338,14 @@
215	338	client = inClient;
216	339	copy = client;
217	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
218	349	// "this" is not called: SetupUI2(objEditor);
219	350	}
220	351
..	..	@@ -228,6 +359,14 @@
228	359	client = inClient;
229	360	copy = client;
230	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
231	370	SetupUI2(callee.GetEditor());
232	371	}
233	372
..	..	@@ -242,13 +381,15 @@
242	381	//localCopy.parent = null;
243	382
244	383	frame = new JFrame();
	384	+ frame.setUndecorated(false);
245	385	objEditor = this;
246	386	this.callee = callee;
247	387
248	388	//parent = p;
249	389
250	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
251		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
252	393	//gd.setFullScreenWindow(this);
253	394	//setResizable(false);
254	395	//if (!isDisplayable())
..	..	@@ -259,6 +400,14 @@
259	400	copy = localCopy;
260	401	copy.editWindow = this;
261	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
262	411	SetupMenu();
263	412
264	413	//SetupName(objEditor); // new
..	..	@@ -272,28 +421,49 @@
272	421	return frame.action(event, obj);
273	422	}
274	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	+
275	429	void SetupMenu()
276	430	{
277	431	frame.setMenuBar(menuBar = new MenuBar());
278		- menuBar.add(windowMenu = new Menu("File"));
279		- windowMenu.add(loadItem = new MenuItem("Load..."));
280		- windowMenu.add("-");
281		- windowMenu.add(saveItem = new MenuItem("Save"));
282		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	432	+ menuBar.add(fileMenu = new Menu("File"));
	433	+ fileMenu.add(newItem = new MenuItem("New"));
	434	+ fileMenu.add(openItem = new MenuItem("Open..."));
	435	+
	436	+ //oe.menuBar.add(menu = new Menu("Include"));
	437	+ Menu menu = new Menu("Import");
	438	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	439	+ importOBJItem.addActionListener(this);
	440	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	441	+ import3DSItem.addActionListener(this);
	442	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	443	+ importVRMLX3DItem.addActionListener(this);
	444	+ menu.add("-");
	445	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	446	+ importGFDItem.addActionListener(this);
	447	+ fileMenu.add(menu);
	448	+ fileMenu.add("-");
	449	+
	450	+ fileMenu.add(saveItem = new MenuItem("Save"));
	451	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	452	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
284		- windowMenu.add("-");
285		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
286		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
287		- windowMenu.add("-");
	453	+ fileMenu.add("-");
	454	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	455	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	456	+ fileMenu.add("-");
288	457	if (client.parent != null)
289	458	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	459	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	460	} else
292	461	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	462	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	463	}
295	464
296		- loadItem.addActionListener(this);
	465	+ newItem.addActionListener(this);
	466	+ openItem.addActionListener(this);
297	467	saveItem.addActionListener(this);
298	468	saveAsItem.addActionListener(this);
299	469	exportAsItem.addActionListener(this);
..	..	@@ -301,82 +471,103 @@
301	471	//povItem.addActionListener(this);
302	472	closeItem.addActionListener(this);
303	473
304		- menuBar.add(cameraMenu = new Menu("View"));
305		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
306		- //zBufferItem.addActionListener(this);
307		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
308		- //normalLensItem.addActionListener(this);
309		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310		- revertCameraItem.addActionListener(this);
311		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312		- toggleTimelineItem.addItemListener(this);
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318		- toggleTextureItem.addItemListener(this);
319		- toggleTextureItem.setState(CameraPane.textureon);
320		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321		- toggleLiveItem.addItemListener(this);
322		- toggleLiveItem.setState(Globals.isLIVE());
323		- cameraMenu.add(stepItem = new MenuItem("Step"));
324		- stepItem.addActionListener(this);
325		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326		-// toggleDLItem.addItemListener(this);
327		-// toggleDLItem.setState(false);
328		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329		- toggleRenderItem.addItemListener(this);
330		- toggleRenderItem.setState(!CameraPane.frozen);
331		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332		- toggleDebugItem.addItemListener(this);
333		- toggleDebugItem.setState(CameraPane.DEBUG);
334		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335		- toggleFrustumItem.addItemListener(this);
336		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
337		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338		- toggleFootContactItem.addItemListener(this);
339		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341		- toggleRandomItem.addItemListener(this);
342		- toggleRandomItem.setState(CameraPane.RANDOM);
343		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344		- toggleHandleItem.addItemListener(this);
345		- toggleHandleItem.setState(CameraPane.HANDLES);
346		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347		- togglePaintItem.addItemListener(this);
348		- togglePaintItem.setState(CameraPane.PAINTMODE);
349		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350		-// toggleRootItem.addItemListener(this);
351		-// toggleRootItem.setState(false);
352		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
353		-// animationItem.addItemListener(this);
354		-// animationItem.setState(CameraPane.ANIMATION);
355		- cameraMenu.add("-");
356		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
357		- editCameraItem.addActionListener(this);
358		-
359	474	objectPanel = new JTabbedPane();
	475	+
	476	+ ChangeListener changeListener = new ChangeListener()
	477	+ {
	478	+ //String name;
	479	+
	480	+ public void stateChanged(ChangeEvent changeEvent)
	481	+ {
	482	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	483	+// {
	484	+// if (latestObject != null)
	485	+// {
	486	+// refreshContents(true);
	487	+// SetMaterial(latestObject);
	488	+// }
	489	+//
	490	+// materialFlushed = true;
	491	+// }
	492	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	493	+// {
	494	+// if (listUI.size() == 0)
	495	+// EditSelection(false);
	496	+// }
	497	+
	498	+// if (objectPanel.getSelectedIndex() == 4)
	499	+// {
	500	+// name = copy.skyboxname;
	501	+//
	502	+// if (name == null)
	503	+// {
	504	+// name = "";
	505	+// }
	506	+//
	507	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	508	+// copy.skyboxext = "jpg";
	509	+// }
	510	+// else
	511	+// {
	512	+// if (name != null)
	513	+// {
	514	+// if (name.equals(""))
	515	+// {
	516	+// copy.skyboxname = null;
	517	+// copy.skyboxext = null;
	518	+// }
	519	+// else
	520	+// {
	521	+// copy.skyboxname = name;
	522	+// }
	523	+// }
	524	+// }
	525	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	526	+
	527	+// refreshContents(false); // To refresh Info tab
	528	+ cameraView.repaint();
	529	+ }
	530	+ };
	531	+ objectPanel.addChangeListener(changeListener);
	532	+
360	533	toolbarPanel = new JPanel();
361	534	toolbarPanel.setName("Toolbar");
362		- treePanel = new JPanel();
	535	+
	536	+ treePanel = new cGridBag();
363	537	treePanel.setName("Tree");
	538	+
	539	+ editPanel = new cGridBag().setVertical(true);
	540	+ //editPanel.setName("Edit");
	541	+
364	542	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
366		- materialPanel = new cGridBag().setVertical(true);
367		- materialPanel.setName("Material");
	543	+
	544	+ editCommandsPanel = new cGridBag();
	545	+ editPanel.add(editCommandsPanel);
	546	+ editPanel.add(ctrlPanel);
	547	+
	548	+ toolboxPanel = new cGridBag().setVertical(true);
	549	+ //toolboxPanel.setName("Toolbox");
	550	+
	551	+ skyboxPanel = new cGridBag().setVertical(true);
	552	+
	553	+ materialPanel = new cGridBag().setVertical(false);
	554	+ //materialPanel.setName("Material");
	555	+
368	556	/JTextPane/
369	557	infoarea = createTextPane();
	558	+ doc = infoarea.getStyledDocument();
	559	+
370	560	infoarea.setEditable(true);
371	561	SetText();
	562	+
372	563	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373	564	// infoarea.setOpaque(false);
374	565	// //infoarea.setForeground(textcolor);
375		- infoarea.setLineWrap(true);
376		- infoarea.setWrapStyleWord(true);
	566	+// TEXTAREA infoarea.setLineWrap(true);
	567	+// TEXTAREA infoarea.setWrapStyleWord(true);
377	568	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
378		- infoPanel.setPreferredSize(new Dimension(50, 200));
379		- infoPanel.setName("Info");
	569	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	570	+ //infoPanel.setName("Info");
380	571	//infoPanel.setLayout(new BorderLayout());
381	572	//infoPanel.add(createTextPane());
382	573
..	..	@@ -384,14 +575,21 @@
384	575	mainPanel.setName("Main");
385	576	mainPanel.setContinuousLayout(true);
386	577	mainPanel.setOneTouchExpandable(true);
387		- mainPanel.setDividerLocation(1.0);
388	578	mainPanel.setDividerSize(9);
389		- mainPanel.setResizeWeight(0);
390		-
	579	+ mainPanel.setDividerLocation(0.5); //1.0);
	580	+ mainPanel.setResizeWeight(0.5);
	581	+
	582	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	583	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	584	+ divider.setDividerSize(15);
	585	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	586	+
	587	+ mainPanel.setUI(new BasicSplitPaneUI());
	588	+
391	589	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392	590	//mainPanel.setLayout(new GridBagLayout());
393	591	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394		- treePanel.setLayout(new GridBagLayout());
	592	+// treePanel.setLayout(new GridBagLayout());
395	593	//ctrlPanel.setLayout(new GridBagLayout());
396	594	//materialPanel.setLayout(new GridBagLayout());
397	595
..	..	@@ -432,7 +630,7 @@
432	630	static String newline = "\n";
433	631	protected static final String buttonString = "JButton";
434	632	StyledDocument doc;
435		- JTextArea infoarea;
	633	+ JTextPane infoarea;
436	634
437	635	void ClearInfo()
438	636	{
..	..	@@ -455,10 +653,10 @@
455	653	e.printStackTrace();
456	654	}
457	655
458		- String selection = infoarea.getText();
459		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
460		- java.awt.datatransfer.Clipboard clipboard =
461		- Toolkit.getDefaultToolkit().getSystemClipboard();
	656	+// String selection = infoarea.getText();
	657	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	658	+// java.awt.datatransfer.Clipboard clipboard =
	659	+// Toolkit.getDefaultToolkit().getSystemClipboard();
462	660	//clipboard.setContents(data, data);
463	661	}
464	662
..	..	@@ -481,13 +679,13 @@
481	679	//SendInfo("Name:", "bold");
482	680	if (sel.GetTextures() != null \|\| debug)
483	681	{
484		- si.SendInfo(sel.toString(), "bold");
	682	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485	683	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486	684	if (sel.Size() > 0)
487	685	{
488	686	si.SendInfo("#children = " + sel.Size(), "regular");
489	687	}
490		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	688	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491	689	if (debug)
492	690	{
493	691	try
..	..	@@ -499,7 +697,10 @@
499	697	}
500	698
501	699	if (full)
502		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	700	+ {
	701	+ si.SendInfo(" BBox min: " + minima, "regular");
	702	+ si.SendInfo(" BBox max: " + maxima, "regular");
	703	+ }
503	704
504	705	if (sel.bRep != null)
505	706	{
..	..	@@ -526,7 +727,7 @@
526	727	}
527	728	if (sel.support != null)
528	729	{
529		- si.SendInfo(" support: " + sel.support, "regular");
	730	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530	731	}
531	732	if (sel.scriptnode != null)
532	733	{
..	..	@@ -597,6 +798,9 @@
597	798	{
598	799	CameraPane.pointflow = (PointFlow) sel;
599	800	}
	801	+
	802	+ si.SendInfo("_____________________", "regular");
	803	+ si.SendInfo("", "regular");
600	804	}
601	805	}
602	806
..	..	@@ -612,68 +816,205 @@
612	816	}
613	817	}
614	818
	819	+//static GraphicsDevice device = GraphicsEnvironment
	820	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	821	+
	822	+ Rectangle keeprect;
	823	+ cRadio radio;
	824	+
	825	+cButton keepButton;
	826	+ cButton twoButton; // Full 3D
	827	+ cButton sixButton;
	828	+ cButton threeButton;
	829	+ cButton sevenButton;
	830	+ cButton fourButton; // full panel
	831	+ cButton oneButton; // full XYZ
	832	+ //cButton currentLayout;
	833	+
	834	+ boolean maximized;
	835	+
	836	+ cButton fullscreenLayout;
	837	+ cButton expandedLayout;
	838	+
	839	+ void Minimize()
	840	+ {
	841	+ frame.setState(Frame.ICONIFIED);
	842	+ frame.validate();
	843	+ }
	844	+
	845	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	846	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	847	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	848	+ void Maximize()
	849	+ {
	850	+ if (CameraPane.FULLSCREEN)
	851	+ {
	852	+ ToggleFullScreen();
	853	+ }
	854	+
	855	+ if (maximized)
	856	+ {
	857	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	858	+ }
	859	+ else
	860	+ {
	861	+ keeprect = frame.getBounds();
	862	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	863	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	864	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	865	+// frame.setState(Frame.MAXIMIZED_BOTH);
	866	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	867	+ }
	868	+
	869	+ maximized ^= true;
	870	+
	871	+ frame.validate();
	872	+ }
	873	+
	874	+ cButton minButton;
	875	+ cButton maxButton;
	876	+ cButton fullButton;
	877	+ cButton collapseButton;
	878	+ cButton maximize3DButton;
	879	+
615	880	void ToggleFullScreen()
616	881	{
617		- if (CameraPane.FULLSCREEN)
	882	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	883	+
	884	+ cameraView.ToggleFullScreen();
	885	+
	886	+ if (!CameraPane.FULLSCREEN)
618	887	{
619		- frame.getContentPane().remove(/"Center",/bigThree);
620		- framePanel.add(bigThree);
621		- frame.getContentPane().add(/"Center",/framePanel);
	888	+ device.setFullScreenWindow(null);
	889	+ frame.dispose();
	890	+ frame.setUndecorated(false);
	891	+ frame.validate();
	892	+ frame.setVisible(true);
	893	+
	894	+ //frame.setVisible(false);
	895	+// frame.removeNotify();
	896	+// frame.setUndecorated(false);
	897	+// frame.addNotify();
	898	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	899	+
	900	+// X frame.getContentPane().remove(/"Center",/bigThree);
	901	+// X framePanel.add(bigThree);
	902	+// X frame.getContentPane().add(/"Center",/framePanel);
	903	+// framePanel.setDividerLocation(46); // icons are 24x24
	904	+
	905	+ //frame.setVisible(true);
	906	+// radio.layout = keepButton;
	907	+ //theFrame = null;
	908	+ keepButton = null;
	909	+// radio.layout.doClick();
	910	+
622	911	} else
623	912	{
624		- frame.getContentPane().remove(/"Center",/framePanel);
625		- framePanel.remove(bigThree);
626		- frame.getContentPane().add(/"Center",/bigThree);
	913	+ keepButton = radio.layout;
	914	+ //keeprect = frame.getBounds();
	915	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	916	+// frame.getToolkit().getScreenSize().height);
	917	+ //frame.setVisible(false);
	918	+
	919	+ frame.dispose();
	920	+ frame.setUndecorated(true);
	921	+ device.setFullScreenWindow(frame);
	922	+ frame.validate();
	923	+ frame.setVisible(true);
	924	+// frame.removeNotify();
	925	+// frame.setUndecorated(true);
	926	+// frame.addNotify();
	927	+// X frame.getContentPane().remove(/"Center",/framePanel);
	928	+// X framePanel.remove(bigThree);
	929	+// X frame.getContentPane().add(/"Center",/bigThree);
	930	+// framePanel.setDividerLocation(0);
	931	+
	932	+// radio.layout = fullscreenLayout;
	933	+// radio.layout.doClick();
	934	+ //frame.setVisible(true);
627	935	}
628		- cameraView.ToggleFullScreen();
	936	+ frame.validate();
	937	+
	938	+ cameraView.requestFocusInWindow();
629	939	}
630	940
631		- private JTextArea createTextPane()
	941	+ void CollapseToolbar()
	942	+ {
	943	+ framePanel.setDividerLocation(0);
	944	+ //frame.validate();
	945	+
	946	+ cameraView.requestFocusInWindow();
	947	+ }
	948	+
	949	+ private Object3D Duplicate(Object3D object)
632	950	{
633		- String[] initString =
634		- {
635		- "This is an editable JTextPane, ", //regular
636		- "another ", //italic
637		- "styled ", //bold
638		- "text ", //small
639		- "component, ", //large
640		- "which supports embedded components..." + newline,//regular
641		- " " + newline, //button
642		- "...and embedded icons..." + newline, //regular
643		- " ", //icon
644		- newline + "JTextPane is a subclass of JEditorPane that "
645		- + "uses a StyledEditorKit and StyledDocument, and provides "
646		- + "cover methods for interacting with those objects."
647		- };
	951	+ boolean temp = CameraPane.SWITCH;
	952	+ CameraPane.SWITCH = false;
	953	+
	954	+ object.ExtractBigData(versiontable);
	955	+ // if (copy == client)
	956	+
	957	+ Object3D versions[] = object.versionlist;
	958	+ object.versionlist = null;
	959	+
	960	+ //byte[] compress = Compress(copy);
	961	+ Object3D compress = (Object3D)Grafreed.clone(object);
	962	+
	963	+ object.versionlist = versions;
	964	+
	965	+ object.RestoreBigData(versiontable);
	966	+
	967	+ CameraPane.SWITCH = temp;
	968	+
	969	+ return compress;
	970	+ }
648	971
649		- String[] initStyles =
650		- {
651		- "regular", "italic", "bold", "small", "large",
652		- "regular", "button", "regular", "icon",
653		- "regular"
654		- };
	972	+ private JTextPane createTextPane()
	973	+ {
	974	+// TEXTAREA String[] initString =
	975	+// {
	976	+// "This is an editable JTextPane, ", //regular
	977	+// "another ", //italic
	978	+// "styled ", //bold
	979	+// "text ", //small
	980	+// "component, ", //large
	981	+// "which supports embedded components..." + newline,//regular
	982	+// " " + newline, //button
	983	+// "...and embedded icons..." + newline, //regular
	984	+// " ", //icon
	985	+// newline + "JTextPane is a subclass of JEditorPane that "
	986	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	987	+// + "cover methods for interacting with those objects."
	988	+// };
	989	+//
	990	+// String[] initStyles =
	991	+// {
	992	+// "regular", "italic", "bold", "small", "large",
	993	+// "regular", "button", "regular", "icon",
	994	+// "regular"
	995	+// };
	996	+//
	997	+// JTextPane textPane = new JTextPane();
	998	+// textPane.setEditable(true);
	999	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1000	+// addStylesToDocument(doc);
	1001	+//
	1002	+// try
	1003	+// {
	1004	+// for (int j = 0; j < 2; j++)
	1005	+// {
	1006	+// for (int i = 0; i < initString.length; i++)
	1007	+// {
	1008	+// doc.insertString(doc.getLength(), initString[i],
	1009	+// doc.getStyle(initStyles[i]));
	1010	+// }
	1011	+// }
	1012	+// } catch (BadLocationException ble)
	1013	+// {
	1014	+// System.err.println("Couldn't insert initial text into text pane.");
	1015	+// }
655	1016
656		- JTextPane textPane = new JTextPane();
657		- textPane.setEditable(true);
658		- /StyledDocument/ doc = textPane.getStyledDocument();
659		- addStylesToDocument(doc);
660		-
661		- try
662		- {
663		- for (int j = 0; j < 2; j++)
664		- {
665		- for (int i = 0; i < initString.length; i++)
666		- {
667		- doc.insertString(doc.getLength(), initString[i],
668		- doc.getStyle(initStyles[i]));
669		- }
670		- }
671		- } catch (BadLocationException ble)
672		- {
673		- System.err.println("Couldn't insert initial text into text pane.");
674		- }
675		-
676		- return new JTextArea(); // textPane;
	1017	+ return new JTextPane(); // textPane;
677	1018	}
678	1019
679	1020	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +1067,7 @@
726	1067	protected static ImageIcon createImageIcon(String path,
727	1068	String description)
728	1069	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1070	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	1071	if (imgURL != null)
731	1072	{
732	1073	return new ImageIcon(imgURL, description);
..	..	@@ -749,6 +1090,7 @@
749	1090	{
750	1091	SetupMaterial(materialPanel);
751	1092	}
	1093	+
752	1094	//SetupName();
753	1095	//SetupViews();
754	1096	}
..	..	@@ -758,6 +1100,7 @@
758	1100	// NumberSlider vDivsField;
759	1101	// JCheckBox endcaps;
760	1102	JCheckBox liveCB;
	1103	+ JCheckBox selectableCB;
761	1104	JCheckBox hideCB;
762	1105	JCheckBox link2masterCB;
763	1106	JCheckBox markCB;
..	..	@@ -765,7 +1108,12 @@
765	1108	JCheckBox speedupCB;
766	1109	JCheckBox rewindCB;
767	1110	JCheckBox flipVCB;
	1111	+
	1112	+ cCheckBox toggleTextureCB;
	1113	+ cCheckBox toggleSwitchCB;
	1114	+
768	1115	JComboBox texresMenu;
	1116	+
769	1117	JButton resetButton;
770	1118	JButton stepButton;
771	1119	JButton stepAllButton;
..	..	@@ -774,9 +1122,13 @@
774	1122	JButton fasterButton;
775	1123	JButton remarkButton;
776	1124
	1125	+ cGridBag editPanel;
	1126	+ cGridBag editCommandsPanel;
	1127	+
777	1128	cGridBag namePanel;
778	1129	cGridBag setupPanel;
779		- cGridBag commandsPanel;
	1130	+ cGridBag setupPanel2;
	1131	+ cGridBag objectCommandsPanel;
780	1132	cGridBag pushPanel;
781	1133	cGridBag fillPanel;
782	1134
..	..	@@ -943,52 +1295,88 @@
943	1295
944	1296	void SetupUI2(ObjEditor oe)
945	1297	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	1298	//SetupName(oe);
951	1299
952	1300	namePanel = new cGridBag();
953	1301
	1302	+ //if (copy.pinned)
	1303	+ {
	1304	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1305	+ pinButton.setSelected(copy.pinned);
	1306	+ cGridBag t = new cGridBag();
	1307	+ t.preferredWidth = 2;
	1308	+ t.add(pinButton);
	1309	+ namePanel.add(t);
	1310	+
	1311	+ pinButton.addItemListener(this);
	1312	+ }
	1313	+
954	1314	nameField = AddText(namePanel, copy.GetName());
955		- namePanel.add(nameField);
	1315	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
956	1316	oe.ctrlPanel.add(namePanel);
957	1317
958	1318	oe.ctrlPanel.Return();
959	1319
960		- if (!GroupEditor.allparams)
	1320	+ if (!allparams)
961	1321	return;
962	1322
963	1323	setupPanel = new cGridBag().setVertical(false);
964	1324
965	1325	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1326	+ liveCB.setToolTipText("Animate object");
	1327	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1328	+ markCB.setToolTipText("Set target transform");
	1329	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1330	+ selectableCB.setToolTipText("Make object selectable");
968	1331	// Return();
969		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1332	+
	1333	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1334	+ hideCB.setToolTipText("Hide object");
	1335	+
	1336	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1337	+
	1338	+ setupPanel2 = new cGridBag().setVertical(false);
	1339	+
	1340	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1341	+ rewindCB.setToolTipText("Rewind animation");
	1342	+
	1343	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1344	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
972	1345
	1346	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1347	+ link2masterCB.setToolTipText("Attach to support");
	1348	+
	1349	+ if (Globals.ADVANCED)
	1350	+ {
	1351	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1352	+ speedupCB.setToolTipText("Option motion capture");
	1353	+ }
	1354	+
973	1355	oe.ctrlPanel.add(setupPanel);
974	1356	oe.ctrlPanel.Return();
	1357	+ oe.ctrlPanel.add(setupPanel2);
	1358	+ oe.ctrlPanel.Return();
975	1359
976		- commandsPanel = new cGridBag().setVertical(false);
	1360	+ objectCommandsPanel = new cGridBag().setVertical(false);
977	1361
978		- resetButton = AddButton(commandsPanel, "Reset");
979		- stepButton = AddButton(commandsPanel, "Step");
	1362	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1363	+ resetButton.setToolTipText("Jump to frame zero");
	1364	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1365	+ stepButton.setToolTipText("Step one frame");
980	1366	// resetAllButton = AddButton(oe, "Reset All");
981	1367	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	1368	// Return();
984		- slowerButton = AddButton(commandsPanel, "Slow");
985		- fasterButton = AddButton(commandsPanel, "Fast");
986		- remarkButton = AddButton(commandsPanel, "Remark");
	1369	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1370	+ slowerButton.setToolTipText("Decrease animation speed");
	1371	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1372	+ fasterButton.setToolTipText("Increase animation speed");
	1373	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1374	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1375
988		- oe.ctrlPanel.add(commandsPanel);
	1376	+ oe.ctrlPanel.add(objectCommandsPanel);
989	1377	oe.ctrlPanel.Return();
990	1378
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1379	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	1380	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	1381	//Return();
994	1382
..	..	@@ -1145,6 +1533,7 @@
1145	1533
1146	1534	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1147	1535	{
	1536	+ if (Globals.DEBUG)
1148	1537	System.out.println("CREATE CAMERAS");
1149	1538	cams = new cTemplate();
1150	1539	cams.name = "Cameras";
..	..	@@ -1191,8 +1580,11 @@
1191	1580	//worldPanel.setName("World");
1192	1581	centralPanel = new cGridBag();
1193	1582	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1583	+
	1584	+ if (Globals.ADVANCED)
	1585	+ {
	1586	+ timelinePanel = new JPanel(new BorderLayout());
	1587	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1588
1197	1589	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1590	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1593,10 @@
1201	1593	// cameraPanel.setDividerSize(9);
1202	1594	cameraPanel.setResizeWeight(1.0);
1203	1595
	1596	+ }
	1597	+
1204	1598	centralPanel.add(cameraView);
	1599	+ centralPanel.setFocusable(true);
1205	1600	//frame.setJMenuBar(timelineMenubar);
1206	1601	//centralPanel.add(timelinePanel);
1207	1602
..	..	@@ -1227,6 +1622,7 @@
1227	1622	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1228	1623	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1229	1624	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1625	+ //XYZPanel.setName("XYZ");
1230	1626
1231	1627	/*
1232	1628	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1264,13 +1660,29 @@
1264	1660	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1661	//tmp.setName("Edit");
1266	1662	objectPanel.add(materialPanel);
	1663	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1664	+ objectPanel.setToolTipTextAt(0, "Material");
	1665	+
	1666	+ objectPanel.add(toolboxPanel);
	1667	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1668	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1669	+
	1670	+ objectPanel.add(skyboxPanel);
	1671	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1672	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1673	+
1267	1674	// JPanel north = new JPanel(new BorderLayout());
1268	1675	// north.setName("Edit");
1269	1676	// north.add(ctrlPanel, BorderLayout.NORTH);
1270	1677	// objectPanel.add(north);
1271		- objectPanel.add(ctrlPanel);
1272		- objectPanel.add(infoPanel);
1273		-
	1678	+ objectPanel.add(editPanel);
	1679	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1680	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1681	+
	1682	+ objectPanel.add(XYZPanel);
	1683	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1684	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1685	+
1274	1686	/*
1275	1687	aConstraints.gridx = 0;
1276	1688	aConstraints.gridwidth = 1;
..	..	@@ -1278,7 +1690,7 @@
1278	1690	aConstraints.gridy += 1;
1279	1691	aConstraints.gridwidth = 1;
1280	1692	mainPanel.add(objectPanel, aConstraints);
1281		- */
	1693	+ */
1282	1694
1283	1695	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1284	1696	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1290,14 +1702,12 @@
1290	1702	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1703
1292	1704	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1705	+ scenePanel.preferredWidth = 5;
1294	1706
1295	1707	JTabbedPane tabbedPane = new JTabbedPane();
1296	1708	tabbedPane.add(scrollpane);
1297	1709
1298		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1299		-
1300		- optionsPanel = new cGridBag().setVertical(true);
	1710	+ optionsPanel = new cGridBag().setVertical(false);
1301	1711
1302	1712	optionsPanel.setName("Options");
1303	1713
..	..	@@ -1305,8 +1715,15 @@
1305	1715
1306	1716	tabbedPane.add(optionsPanel);
1307	1717
	1718	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1719	+
1308	1720	scenePanel.add(tabbedPane);
1309	1721
	1722	+ //if (Globals.ADVANCED)
	1723	+// tabbedPane.add(infoPanel);
	1724	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1725	+// tabbedPane.setToolTipTextAt(3, "Information");
	1726	+
1310	1727	/*
1311	1728	cTree jTree = new cTree(null);
1312	1729	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1368,7 +1785,7 @@
1368	1785	bigThree = new cGridBag();
1369	1786	bigThree.addComponent(scenePanel);
1370	1787	bigThree.addComponent(centralPanel);
1371		- bigThree.addComponent(XYZPanel);
	1788	+ //bigThree.addComponent(XYZPanel);
1372	1789
1373	1790	// // SIDE EFFECT!!!
1374	1791	// aConstraints.gridx = 0;
..	..	@@ -1377,16 +1794,33 @@
1377	1794	// aConstraints.gridheight = 1;
1378	1795
1379	1796	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1380		- framePanel.setContinuousLayout(true);
1381		- framePanel.setOneTouchExpandable(true);
1382		- framePanel.setDividerLocation(0.8);
	1797	+
	1798	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1799	+ new java.beans.PropertyChangeListener()
	1800	+ {
	1801	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1802	+ {
	1803	+ if ((Integer)pce.getOldValue() == 1)
	1804	+ {
	1805	+ if (radio.layout != expandedLayout)
	1806	+ {
	1807	+ radio.layout = expandedLayout;
	1808	+ radio.layout.doClick();
	1809	+ }
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
	1814	+ framePanel.setContinuousLayout(false);
	1815	+ framePanel.setOneTouchExpandable(false);
	1816	+ //.setDividerLocation(0.8);
1383	1817	//framePanel.setDividerSize(15);
1384	1818	//framePanel.setResizeWeight(0.15);
1385	1819	framePanel.setName("Frame");
1386	1820
1387	1821	frame.getContentPane().setLayout(new BorderLayout());
1388	1822	/**/
1389		- JTabbedPane worldPane = new JTabbedPane();
	1823	+ //JTabbedPane worldPane = new JTabbedPane();
1390	1824	//worldPane.add(bigPanel);
1391	1825	//worldPane.add(worldPanel);
1392	1826	/**/
..	..	@@ -1396,15 +1830,19 @@
1396	1830
1397	1831	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1832
1399		- frame.setSize(1024, 768);
1400		- frame.show();
1401		-
	1833	+ frame.setSize(1280, 860);
	1834	+
	1835	+ cameraView.requestFocusInWindow();
	1836	+
1402	1837	gridPanel.setDividerLocation(1.0);
	1838	+
	1839	+ frame.validate();
	1840	+
	1841	+ frame.setVisible(true);
1403	1842
1404	1843	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1405	1844	frame.addWindowListener(new WindowAdapter()
1406	1845	{
1407		-
1408	1846	public void windowClosing(WindowEvent e)
1409	1847	{
1410	1848	Close();
..	..	@@ -1427,26 +1865,440 @@
1427	1865	ctrlPanel.removeAll();
1428	1866	}
1429	1867
1430		- void SetupMaterial(cGridBag panel)
	1868	+ void SetupMaterial(cGridBag materialpanel)
1431	1869	{
1432		- /*
	1870	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1871	+
	1872	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1873	+ skin.setToolTipText("Skin");
	1874	+ skin.addMouseListener(new MouseAdapter()
	1875	+ {
	1876	+ public void mouseClicked(MouseEvent e)
	1877	+ {
	1878	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1879	+ cMaterial material = object.material;
	1880	+
	1881	+ // Skin
	1882	+ colorField.setFloat(material.color);
	1883	+ saturationField.setFloat(material.modulation);
	1884	+ subsurfaceField.setFloat(material.subsurface);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+ diffusenessField.setFloat(material.factor);
	1887	+ shininessField.setFloat(material.shininess);
	1888	+ shadowbiasField.setFloat(material.shadowbias);
	1889	+ diffuseField.setFloat(material.diffuse);
	1890	+ specularField.setFloat(material.specular);
	1891	+
	1892	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1893	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1894	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1895	+
	1896	+ materialtouched = true;
	1897	+ applySelf();
	1898	+ }
	1899	+ });
	1900	+ presetpanel.add(skin);
	1901	+
	1902	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1903	+ lambert.setToolTipText("Diffuse");
	1904	+ lambert.addMouseListener(new MouseAdapter()
	1905	+ {
	1906	+ public void mouseClicked(MouseEvent e)
	1907	+ {
	1908	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1909	+ cMaterial material = object.material;
	1910	+
	1911	+ diffusenessField.setFloat(material.factor);
	1912	+ selfshadowField.setFloat(material.diffuseness);
	1913	+
	1914	+ materialtouched = true;
	1915	+ applySelf();
	1916	+ }
	1917	+ });
	1918	+ presetpanel.add(lambert);
	1919	+
	1920	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1921	+ diffuse2.setToolTipText("Diffuse2");
	1922	+ diffuse2.addMouseListener(new MouseAdapter()
	1923	+ {
	1924	+ public void mouseClicked(MouseEvent e)
	1925	+ {
	1926	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1927	+ cMaterial material = object.material;
	1928	+
	1929	+ diffusenessField.setFloat(material.factor);
	1930	+ selfshadowField.setFloat(material.diffuseness);
	1931	+
	1932	+ materialtouched = true;
	1933	+ applySelf();
	1934	+ }
	1935	+ });
	1936	+ presetpanel.add(diffuse2);
	1937	+
	1938	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1939	+ diffusemoon.setToolTipText("Moon");
	1940	+ diffusemoon.addMouseListener(new MouseAdapter()
	1941	+ {
	1942	+ public void mouseClicked(MouseEvent e)
	1943	+ {
	1944	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1945	+ cMaterial material = object.material;
	1946	+
	1947	+ diffusenessField.setFloat(material.factor);
	1948	+ selfshadowField.setFloat(material.diffuseness);
	1949	+
	1950	+ materialtouched = true;
	1951	+ applySelf();
	1952	+ }
	1953	+ });
	1954	+ presetpanel.add(diffusemoon);
	1955	+
	1956	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1957	+ diffusemoon2.setToolTipText("Moon2");
	1958	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1959	+ {
	1960	+ public void mouseClicked(MouseEvent e)
	1961	+ {
	1962	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1963	+ cMaterial material = object.material;
	1964	+
	1965	+ diffusenessField.setFloat(material.factor);
	1966	+ selfshadowField.setFloat(material.diffuseness);
	1967	+
	1968	+ materialtouched = true;
	1969	+ applySelf();
	1970	+ }
	1971	+ });
	1972	+ presetpanel.add(diffusemoon2);
	1973	+
	1974	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1975	+ diffusemoon3.setToolTipText("Moon3");
	1976	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1977	+ {
	1978	+ public void mouseClicked(MouseEvent e)
	1979	+ {
	1980	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1981	+ cMaterial material = object.material;
	1982	+
	1983	+ diffusenessField.setFloat(material.factor);
	1984	+ selfshadowField.setFloat(material.diffuseness);
	1985	+
	1986	+ materialtouched = true;
	1987	+ applySelf();
	1988	+ }
	1989	+ });
	1990	+ presetpanel.add(diffusemoon3);
	1991	+
	1992	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1993	+ diffusesheen.setToolTipText("Sheen");
	1994	+ diffusesheen.addMouseListener(new MouseAdapter()
	1995	+ {
	1996	+ public void mouseClicked(MouseEvent e)
	1997	+ {
	1998	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1999	+ cMaterial material = object.material;
	2000	+
	2001	+ sheenField.setFloat(material.sheen);
	2002	+
	2003	+ materialtouched = true;
	2004	+ applySelf();
	2005	+ }
	2006	+ });
	2007	+ presetpanel.add(diffusesheen);
	2008	+
	2009	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2010	+ rough.setToolTipText("Rough metal");
	2011	+ rough.addMouseListener(new MouseAdapter()
	2012	+ {
	2013	+ public void mouseClicked(MouseEvent e)
	2014	+ {
	2015	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2016	+ cMaterial material = object.material;
	2017	+
	2018	+ shininessField.setFloat(material.shininess);
	2019	+ velvetField.setFloat(material.velvet);
	2020	+
	2021	+ materialtouched = true;
	2022	+ applySelf();
	2023	+ }
	2024	+ });
	2025	+ presetpanel.add(rough);
	2026	+
	2027	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2028	+ rough2.setToolTipText("Medium metal");
	2029	+ rough2.addMouseListener(new MouseAdapter()
	2030	+ {
	2031	+ public void mouseClicked(MouseEvent e)
	2032	+ {
	2033	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2034	+ cMaterial material = object.material;
	2035	+
	2036	+ shininessField.setFloat(material.shininess);
	2037	+ lightareaField.setFloat(material.lightarea);
	2038	+
	2039	+ materialtouched = true;
	2040	+ applySelf();
	2041	+ }
	2042	+ });
	2043	+ presetpanel.add(rough2);
	2044	+
	2045	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2046	+ shini0.setToolTipText("Shiny");
	2047	+ shini0.addMouseListener(new MouseAdapter()
	2048	+ {
	2049	+ public void mouseClicked(MouseEvent e)
	2050	+ {
	2051	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2052	+ cMaterial material = object.material;
	2053	+
	2054	+ shininessField.setFloat(material.shininess);
	2055	+ lightareaField.setFloat(material.lightarea);
	2056	+
	2057	+ materialtouched = true;
	2058	+ applySelf();
	2059	+ }
	2060	+ });
	2061	+ presetpanel.add(shini0);
	2062	+
	2063	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2064	+ shini1.setToolTipText("Shiny2");
	2065	+ shini1.addMouseListener(new MouseAdapter()
	2066	+ {
	2067	+ public void mouseClicked(MouseEvent e)
	2068	+ {
	2069	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2070	+ cMaterial material = object.material;
	2071	+
	2072	+ shininessField.setFloat(material.shininess);
	2073	+ lightareaField.setFloat(material.lightarea);
	2074	+
	2075	+ materialtouched = true;
	2076	+ applySelf();
	2077	+ }
	2078	+ });
	2079	+ presetpanel.add(shini1);
	2080	+
	2081	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2082	+ shini2.setToolTipText("Shiny3");
	2083	+ shini2.addMouseListener(new MouseAdapter()
	2084	+ {
	2085	+ public void mouseClicked(MouseEvent e)
	2086	+ {
	2087	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2088	+ cMaterial material = object.material;
	2089	+
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ lightareaField.setFloat(material.lightarea);
	2092	+
	2093	+ materialtouched = true;
	2094	+ applySelf();
	2095	+ }
	2096	+ });
	2097	+ presetpanel.add(shini2);
	2098	+
	2099	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2100	+ aniso.setToolTipText("AnisoU");
	2101	+ aniso.addMouseListener(new MouseAdapter()
	2102	+ {
	2103	+ public void mouseClicked(MouseEvent e)
	2104	+ {
	2105	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2106	+ cMaterial material = object.material;
	2107	+
	2108	+ anisoField.setFloat(material.aniso);
	2109	+ anisoVField.setFloat(material.anisoV);
	2110	+
	2111	+ materialtouched = true;
	2112	+ applySelf();
	2113	+ }
	2114	+ });
	2115	+ presetpanel.add(aniso);
	2116	+
	2117	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2118	+ aniso2.setToolTipText("AnisoV");
	2119	+ aniso2.addMouseListener(new MouseAdapter()
	2120	+ {
	2121	+ public void mouseClicked(MouseEvent e)
	2122	+ {
	2123	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2124	+ cMaterial material = object.material;
	2125	+
	2126	+ anisoField.setFloat(material.aniso);
	2127	+ anisoVField.setFloat(material.anisoV);
	2128	+
	2129	+ materialtouched = true;
	2130	+ applySelf();
	2131	+ }
	2132	+ });
	2133	+ presetpanel.add(aniso2);
	2134	+
	2135	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2136	+ aniso3.setToolTipText("AnisoUV");
	2137	+ aniso3.addMouseListener(new MouseAdapter()
	2138	+ {
	2139	+ public void mouseClicked(MouseEvent e)
	2140	+ {
	2141	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2142	+ cMaterial material = object.material;
	2143	+
	2144	+ anisoField.setFloat(material.aniso);
	2145	+ anisoVField.setFloat(material.anisoV);
	2146	+
	2147	+ materialtouched = true;
	2148	+ applySelf();
	2149	+ }
	2150	+ });
	2151	+ presetpanel.add(aniso3);
	2152	+
	2153	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2154	+ velvet0.setToolTipText("Velvet");
	2155	+ velvet0.addMouseListener(new MouseAdapter()
	2156	+ {
	2157	+ public void mouseClicked(MouseEvent e)
	2158	+ {
	2159	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2160	+ cMaterial material = object.material;
	2161	+
	2162	+ diffusenessField.setFloat(material.factor);
	2163	+ selfshadowField.setFloat(material.diffuseness);
	2164	+ sheenField.setFloat(material.sheen);
	2165	+ shininessField.setFloat(material.shininess);
	2166	+ velvetField.setFloat(material.velvet);
	2167	+ shiftField.setFloat(material.shift);
	2168	+
	2169	+ materialtouched = true;
	2170	+ applySelf();
	2171	+ }
	2172	+ });
	2173	+ presetpanel.add(velvet0);
	2174	+
	2175	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2176	+ bump0.setToolTipText("Bump texture");
	2177	+ bump0.addMouseListener(new MouseAdapter()
	2178	+ {
	2179	+ public void mouseClicked(MouseEvent e)
	2180	+ {
	2181	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2182	+ cMaterial material = object.material;
	2183	+
	2184	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2185	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2186	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2187	+
	2188	+ materialtouched = true;
	2189	+ applySelf();
	2190	+ }
	2191	+ });
	2192	+ presetpanel.add(bump0);
	2193	+
	2194	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2195	+ borderShader.setToolTipText("Border fade");
	2196	+ borderShader.addMouseListener(new MouseAdapter()
	2197	+ {
	2198	+ public void mouseClicked(MouseEvent e)
	2199	+ {
	2200	+ borderfadeField.setFloat(0.5);
	2201	+ opacityField.setFloat(0.75);
	2202	+
	2203	+ materialtouched = true;
	2204	+ applySelf();
	2205	+ }
	2206	+ });
	2207	+ presetpanel.add(borderShader);
	2208	+
	2209	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2210	+ halo.setToolTipText("Halo");
	2211	+ halo.addMouseListener(new MouseAdapter()
	2212	+ {
	2213	+ public void mouseClicked(MouseEvent e)
	2214	+ {
	2215	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2216	+ cMaterial material = object.material;
	2217	+
	2218	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2219	+
	2220	+ materialtouched = true;
	2221	+ applySelf();
	2222	+ }
	2223	+ });
	2224	+ presetpanel.add(halo);
	2225	+
	2226	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2227	+ candle.setToolTipText("Candle");
	2228	+ candle.addMouseListener(new MouseAdapter()
	2229	+ {
	2230	+ public void mouseClicked(MouseEvent e)
	2231	+ {
	2232	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2233	+ cMaterial material = object.material;
	2234	+
	2235	+ subsurfaceField.setFloat(material.subsurface);
	2236	+ shadowbiasField.setFloat(material.shadowbias);
	2237	+ ambientField.setFloat(material.ambient);
	2238	+ specularField.setFloat(material.specular);
	2239	+ lightareaField.setFloat(material.lightarea);
	2240	+ shininessField.setFloat(material.shininess);
	2241	+
	2242	+ materialtouched = true;
	2243	+ applySelf();
	2244	+ }
	2245	+ });
	2246	+ presetpanel.add(candle);
	2247	+
	2248	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2249	+ shadowShader.setToolTipText("Shadow");
	2250	+ shadowShader.addMouseListener(new MouseAdapter()
	2251	+ {
	2252	+ public void mouseClicked(MouseEvent e)
	2253	+ {
	2254	+ diffuseField.setFloat(0.001);
	2255	+ ambientField.setFloat(0.001);
	2256	+ cameraField.setFloat(0.001);
	2257	+ specularField.setFloat(0.001);
	2258	+ fakedepthField.setFloat(0.001);
	2259	+ opacityField.setFloat(0.6);
	2260	+
	2261	+ materialtouched = true;
	2262	+ applySelf();
	2263	+ }
	2264	+ });
	2265	+ presetpanel.add(shadowShader);
	2266	+
	2267	+ cGridBag panel = new cGridBag().setVertical(true);
	2268	+
	2269	+ presetpanel.preferredWidth = 1;
	2270	+
	2271	+ materialpanel.add(presetpanel);
	2272	+ materialpanel.add(panel);
	2273	+
	2274	+ panel.preferredWidth = 8;
	2275	+
	2276	+ /*
1433	2277	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1434	2278	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1435		- */
	2279	+ */
1436	2280
1437	2281	cGridBag editBar = new cGridBag().setVertical(false);
1438	2282
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	2283	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2284	+ createMaterialButton.setToolTipText("Create material");
1440	2285
1441	2286	/*
1442	2287	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	2288	*/
1444	2289
1445		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1446		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1447		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1448		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2290	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2291	+ clearMaterialButton.setToolTipText("Clear material");
	2292	+
	2293	+ if (Globals.ADVANCED)
	2294	+ {
	2295	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2296	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2297	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2298	+ }
1449	2299
	2300	+ editBar.preferredHeight = 15;
	2301	+
1450	2302	panel.add(editBar);
1451	2303
1452	2304	/**/
..	..	@@ -1458,45 +2310,61 @@
1458	2310	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1459	2311
1460	2312	cGridBag colorSection = new cGridBag().setVertical(true);
	2313	+
	2314	+ cGridBag huepanel = new cGridBag();
	2315	+ cGridBag huelabel = new cGridBag();
	2316	+ cLabel hue = GetLabel("icons/hue.png", false);
	2317	+ hue.fit = true;
	2318	+
	2319	+ hue.addMouseListener(new MouseAdapter()
	2320	+ {
	2321	+ public void mousePressed(MouseEvent e)
	2322	+ {
	2323	+ int x = e.getX();
	2324	+
	2325	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2326	+ }
	2327	+ });
	2328	+
	2329	+ huelabel.add(hue);
	2330	+ huelabel.preferredWidth = 20;
	2331	+ huepanel.add(new cGridBag()); // Label
	2332	+ huepanel.add(huelabel); // Field/slider
	2333	+
	2334	+ huepanel.preferredHeight = 7;
	2335	+
	2336	+ colorSection.add(huepanel);
1461	2337
1462	2338	cGridBag color = new cGridBag();
1463		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1464		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1465		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2339	+
	2340	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2341	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2342	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2343	+
1466	2344	//colorField.preferredWidth = 200;
1467	2345	colorSection.add(color);
1468	2346
1469	2347	cGridBag modulation = new cGridBag();
1470	2348	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1471	2349	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2350	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1473	2351	colorSection.add(modulation);
1474	2352
	2353	+ cGridBag opacity = new cGridBag();
	2354	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2355	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2356	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2357	+ colorSection.add(opacity);
	2358	+
	2359	+ colorSection.add(GetSeparator());
	2360	+
1475	2361	cGridBag texture = new cGridBag();
1476	2362	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1477	2363	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478	2364	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479	2365	colorSection.add(texture);
1480	2366
1481		- cGridBag anisoU = new cGridBag();
1482		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1483		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1485		- colorSection.add(anisoU);
1486		-
1487		- cGridBag anisoV = new cGridBag();
1488		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1489		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1491		- colorSection.add(anisoV);
1492		-
1493		- cGridBag shadowbias = new cGridBag();
1494		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1497		- colorSection.add(shadowbias);
1498		-
1499		- panel.add(new JSeparator());
	2367	+ panel.add(GetSeparator());
1500	2368
1501	2369	panel.add(colorSection);
1502	2370
..	..	@@ -1546,7 +2414,13 @@
1546	2414	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1547	2415	diffuseSection.add(fakedepth);
1548	2416
1549		- panel.add(new JSeparator());
	2417	+ cGridBag shadowbias = new cGridBag();
	2418	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2419	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2420	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2421	+ diffuseSection.add(shadowbias);
	2422	+
	2423	+ panel.add(GetSeparator());
1550	2424
1551	2425	panel.add(diffuseSection);
1552	2426
..	..	@@ -1596,42 +2470,48 @@
1596	2470	// aConstraints.gridy += 1;
1597	2471	// aConstraints.gridwidth = 1;
1598	2472
	2473	+ cGridBag anisoU = new cGridBag();
	2474	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2475	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2476	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2477	+ specularSection.add(anisoU);
1599	2478
1600		- panel.add(new JSeparator());
	2479	+ cGridBag anisoV = new cGridBag();
	2480	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2481	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2482	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2483	+ specularSection.add(anisoV);
	2484	+
	2485	+
	2486	+ panel.add(GetSeparator());
1601	2487
1602	2488	panel.add(specularSection);
1603	2489
1604	2490	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1605	2491
1606		- cGridBag globalSection = new cGridBag().setVertical(true);
	2492	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1607	2493
1608	2494	cGridBag camera = new cGridBag();
1609	2495	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1610	2496	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611	2497	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612		- globalSection.add(camera);
	2498	+ colorSection.add(camera);
1613	2499
1614	2500	cGridBag ambient = new cGridBag();
1615	2501	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1616	2502	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617	2503	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1618		- globalSection.add(ambient);
	2504	+ colorSection.add(ambient);
1619	2505
1620	2506	cGridBag backlit = new cGridBag();
1621	2507	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1622	2508	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	2509	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1624		- globalSection.add(backlit);
	2510	+ colorSection.add(backlit);
1625	2511
1626		- cGridBag opacity = new cGridBag();
1627		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1628		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1629		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1630		- globalSection.add(opacity);
1631		-
1632		- panel.add(new JSeparator());
	2512	+ //panel.add(new JSeparator());
1633	2513
1634		- panel.add(globalSection);
	2514	+ //panel.add(globalSection);
1635	2515
1636	2516	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1637	2517
..	..	@@ -1673,7 +2553,7 @@
1673	2553	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1674	2554	textureSection.add(opacityPower);
1675	2555
1676		- panel.add(new JSeparator());
	2556	+ panel.add(GetSeparator());
1677	2557
1678	2558	panel.add(textureSection);
1679	2559
..	..	@@ -1712,12 +2592,15 @@
1712	2592	opacityPowerField.addChangeListener(this);
1713	2593	/**/
1714	2594
1715		- resetSlidersButton.addActionListener(this);
1716	2595	clearMaterialButton.addActionListener(this);
1717	2596	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	2597	+
	2598	+ if (Globals.ADVANCED)
	2599	+ {
	2600	+ resetSlidersButton.addActionListener(this);
	2601	+ propagateToggle.addItemListener(this);
	2602	+ multiplyToggle.addItemListener(this);
	2603	+ }
1721	2604	}
1722	2605
1723	2606	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1735,8 +2618,9 @@
1735	2618	// 3D models
1736	2619	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1737	2620	{
1738		- lastConverter = new com.jmex.model.converters.MaxToJme();
1739		- LoadFile(filename, lastConverter);
	2621	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2622	+ //LoadFile(filename, lastConverter);
	2623	+ LoadObjFile(filename); // New 3ds loader
1740	2624	continue;
1741	2625	}
1742	2626	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1888,7 +2772,7 @@
1888	2772
1889	2773	//? flashIt = false;
1890	2774	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	2775	+ pane.clickStart(location.x, location.y, 0, 0);
1892	2776	pane.clickEnd(location.x, location.y, 0, true);
1893	2777
1894	2778	if (group.selection.size() == 1)
..	..	@@ -1937,6 +2821,7 @@
1937	2821	e2.printStackTrace();
1938	2822	}
1939	2823	}
	2824	+
1940	2825	LoadJMEThread loadThread;
1941	2826
1942	2827	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +2879,7 @@
1994	2879	//LoadFile0(filename, converter);
1995	2880	}
1996	2881	}
	2882	+
1997	2883	LoadOBJThread loadObjThread;
1998	2884
1999	2885	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2958,19 @@
2072	2958
2073	2959	void LoadObjFile(String fullname)
2074	2960	{
2075		- /*
	2961	+ System.out.println("Loading " + fullname);
	2962	+ /**/
2076	2963	//lastFilename = fullname;
2077	2964	if(loadObjThread == null)
2078	2965	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2966	+ loadObjThread = new LoadOBJThread();
	2967	+ loadObjThread.start();
2081	2968	}
2082	2969
2083	2970	loadObjThread.add(fullname);
2084		- */
	2971	+ /**/
2085	2972
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2973	+ //makeSomething(new FileObject(fullname, true), true);
2088	2974	}
2089	2975
2090	2976	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +3231,11 @@
2345	3231
2346	3232	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	3233	{
2348		- if (GrafreeD.standAlone)
	3234	+ if (Grafreed.standAlone)
2349	3235	{
2350	3236	/**/
2351	3237	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	3238	+ browser.setVisible(true);
2353	3239	String filename = browser.getFile();
2354	3240	if (filename != null && filename.length() > 0)
2355	3241	{
..	..	@@ -2460,6 +3346,7 @@
2460	3346	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	3347	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	3348	}
	3349	+
2463	3350	//cJME.count++;
2464	3351	//cJME.count %= 12;
2465	3352	if (gc)
..	..	@@ -2643,6 +3530,7 @@
2643	3530	}
2644	3531	}
2645	3532	}
	3533	+
2646	3534	cFileSystemPane FSPane;
2647	3535
2648	3536	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2652,7 +3540,7 @@
2652	3540
2653	3541	freezematerial = true;
2654	3542	colorField.setFloat(mat.color);
2655		- modulationField.setFloat(mat.modulation);
	3543	+ saturationField.setFloat(mat.modulation);
2656	3544	metalnessField.setFloat(mat.metalness);
2657	3545	diffuseField.setFloat(mat.diffuse);
2658	3546	specularField.setFloat(mat.specular);
..	..	@@ -2696,11 +3584,14 @@
2696	3584	}
2697	3585	}
2698	3586	}
	3587	+
2699	3588	freezematerial = false;
2700	3589	}
2701	3590
2702	3591	void SetMaterial(Object3D object)
2703	3592	{
	3593	+ latestObject = object;
	3594	+
2704	3595	cMaterial mat = object.material;
2705	3596
2706	3597	if (mat == null)
..	..	@@ -2709,33 +3600,10 @@
2709	3600	return;
2710	3601	}
2711	3602
2712		- multiplyToggle.setSelected(mat.multiply);
2713		-
2714		- assert (object.projectedVertices != null);
2715		-
2716		- if (object.projectedVertices.length <= 2)
2717		- {
2718		- // Side effect...
2719		- Object3D.cVector2[] keep = object.projectedVertices;
2720		- object.projectedVertices = new Object3D.cVector2[3];
2721		- for (int i = 0; i < 3; i++)
2722		- {
2723		- if (i < keep.length)
2724		- {
2725		- object.projectedVertices[i] = keep[i];
2726		- } else
2727		- {
2728		- object.projectedVertices[i] = new Object3D.cVector2();
2729		- }
2730		- /*
2731		- if(keep.length == 0)
2732		- object.projectedVertices[0] = new Object3D.cVector2();
2733		- else
2734		- object.projectedVertices[0] = keep[0];
2735		- object.projectedVertices[1] = new Object3D.cVector2();
2736		- */
2737		- }
2738		- }
	3603	+ if (multiplyToggle != null)
	3604	+ multiplyToggle.setSelected(mat.multiply);
	3605	+
	3606	+ AllocProjectedVertices(object);
2739	3607
2740	3608	SetMaterial(mat, object.projectedVertices);
2741	3609	}
..	..	@@ -2811,12 +3679,17 @@
2811	3679	// }
2812	3680
2813	3681	/**/
2814		- if (deselect)
	3682	+ if (deselect \|\| child == null)
2815	3683	{
2816	3684	//group.deselectAll();
2817	3685	//freeze = true;
2818	3686	GetTree().clearSelection();
2819	3687	//freeze = false;
	3688	+
	3689	+ if (child == null)
	3690	+ {
	3691	+ return;
	3692	+ }
2820	3693	}
2821	3694
2822	3695	//group.addSelectee(child);
..	..	@@ -2850,6 +3723,17 @@
2850	3723	public void itemStateChanged(ItemEvent event)
2851	3724	{
2852	3725	// System.out.println("Propagate = " + propagate);
	3726	+ if (event.getSource() == pinButton)
	3727	+ {
	3728	+ copy.pinned ^= true;
	3729	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3730	+ {
	3731	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3732	+ copy.CloseUI();
	3733	+ //copy.editWindow.refreshContents();
	3734	+ }
	3735	+ }
	3736	+ else
2853	3737	if (event.getSource() == propagateToggle)
2854	3738	{
2855	3739	propagate ^= true;
..	..	@@ -2885,7 +3769,7 @@
2885	3769	cameraView.ToggleDL();
2886	3770	cameraView.repaint();
2887	3771	return;
2888		- } else if (event.getSource() == toggleTextureItem)
	3772	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2889	3773	{
2890	3774	cameraView.ToggleTexture();
2891	3775	// june 2013 copy.HardTouch();
..	..	@@ -2924,9 +3808,9 @@
2924	3808	frame.validate();
2925	3809
2926	3810	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	3811	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2928	3812	{
2929		- cameraView.ToggleRandom();
	3813	+ cameraView.ToggleSwitch();
2930	3814	cameraView.repaint();
2931	3815	return;
2932	3816	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2954,12 +3838,17 @@
2954	3838	} else if (event.getSource() == liveCB)
2955	3839	{
2956	3840	copy.live ^= true;
	3841	+ objEditor.refreshContents(true); // To show item colors
	3842	+ return;
	3843	+ } else if (event.getSource() == selectableCB)
	3844	+ {
	3845	+ copy.dontselect ^= true;
2957	3846	return;
2958	3847	} else if (event.getSource() == hideCB)
2959	3848	{
2960	3849	copy.hide ^= true;
2961	3850	copy.Touch(); // display list issue
2962		- objEditor.refreshContents();
	3851	+ objEditor.refreshContents(true); // To show item colors
2963	3852	return;
2964	3853	} else if (event.getSource() == link2masterCB)
2965	3854	{
..	..	@@ -2969,6 +3858,7 @@
2969	3858	if (event.getSource() == randomCB)
2970	3859	{
2971	3860	copy.random ^= true;
	3861	+ objEditor.refreshContents();
2972	3862	return;
2973	3863	}
2974	3864	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3882,9 @@
2992	3882
2993	3883	public void actionPerformed(ActionEvent event)
2994	3884	{
	3885	+ Object source = event.getSource();
2995	3886	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3887	+ if (source == okbutton)
2997	3888	{
2998	3889	textpanel.setVisible(false);
2999	3890	textpanel.remove(textarea);
..	..	@@ -3005,7 +3896,7 @@
3005	3896	textarea = null;
3006	3897	textpanel = null;
3007	3898	}
3008		- if (event.getSource() == cancelbutton)
	3899	+ if (source == cancelbutton)
3009	3900	{
3010	3901	textpanel.setVisible(false);
3011	3902	textpanel.remove(textarea);
..	..	@@ -3017,50 +3908,50 @@
3017	3908	//applySelf();
3018	3909	//client.refreshEditWindow();
3019	3910	//refreshContents();
3020		- if (event.getSource() == nameField)
	3911	+ if (source == nameField)
3021	3912	{
3022	3913	//System.out.println("ObjEditor " + event);
3023	3914	applySelf0(true);
3024	3915	//parent.applySelf();
3025	3916	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3917	+ } else if (source == resetButton)
3027	3918	{
3028	3919	CameraPane.fullreset = true;
3029	3920	copy.Reset(); // ResetMeshes();
3030	3921	copy.Touch();
3031	3922	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3923	+ } else if (source == stepItem)
3033	3924	{
3034	3925	//cameraView.ONESTEP = true;
3035	3926	Globals.ONESTEP = true;
3036	3927	cameraView.repaint();
3037	3928	return;
3038		- } else if (event.getSource() == stepButton)
	3929	+ } else if (source == stepButton)
3039	3930	{
3040	3931	copy.Step();
3041	3932	copy.Touch();
3042	3933	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3934	+ } else if (source == slowerButton)
3044	3935	{
3045	3936	copy.Slower();
3046	3937	copy.Touch();
3047	3938	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3939	+ } else if (source == fasterButton)
3049	3940	{
3050	3941	copy.Faster();
3051	3942	copy.Touch();
3052	3943	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3944	+ } else if (source == remarkButton)
3054	3945	{
3055	3946	copy.Remark();
3056	3947	copy.Touch();
3057	3948	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3949	+ } else if (source == stepAllButton)
3059	3950	{
3060	3951	copy.StepAll();
3061	3952	copy.Touch();
3062	3953	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3954	+ } else if (source == resetAllButton)
3064	3955	{
3065	3956	//CameraPane.fullreset = true;
3066	3957	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3984,79 @@
3093	3984	// Close();
3094	3985	// }
3095	3986	// else
3096		- if (event.getSource() == resetSlidersButton)
	3987	+ if (source == resetSlidersButton)
3097	3988	{
3098	3989	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3990	+ } else if (source == clearMaterialButton)
3100	3991	{
3101	3992	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3993	+ } else if (source == createMaterialButton)
3103	3994	{
3104	3995	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3996	+ } else if (source == clearPanelButton)
3106	3997	{
3107	3998	copy.ClearUI();
3108	3999	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	4000	+ } else if (source == importGFDItem)
	4001	+ {
	4002	+ ImportGFD();
	4003	+ } else
	4004	+ if (source == importVRMLX3DItem)
	4005	+ {
	4006	+ ImportVRMLX3D();
	4007	+ } else
	4008	+ if (source == import3DSItem)
	4009	+ {
	4010	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4011	+ } else
	4012	+ if (source == importOBJItem)
	4013	+ {
	4014	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4015	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4016	+ browser.setVisible(true);
	4017	+ String filename = browser.getFile();
	4018	+ if (filename != null && filename.length() > 0)
	4019	+ {
	4020	+ String fullname = browser.getDirectory() + filename;
	4021	+ makeSomething(ReadOBJ(fullname), true);
	4022	+ }
	4023	+ } else
	4024	+ if (source == closeItem)
3115	4025	{
3116	4026	Close();
3117	4027	//return true;
3118		- } else if (event.getSource() == loadItem)
	4028	+ } else if (source == openItem)
3119	4029	{
3120		- load();
	4030	+ Open();
3121	4031	//return true;
3122		- } else if (event.getSource() == saveItem)
	4032	+ } else if (source == newItem)
	4033	+ {
	4034	+ New();
	4035	+ } else if (source == saveItem)
3123	4036	{
3124	4037	save();
3125	4038	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	4039	+ } else if (source == saveAsItem)
3127	4040	{
3128	4041	saveAs();
3129	4042	//return true;
3130		- } else if (event.getSource() == reexportItem)
	4043	+ } else if (source == reexportItem)
3131	4044	{
3132	4045	reexport();
3133	4046	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	4047	+ } else if (source == exportAsItem)
3135	4048	{
3136	4049	export();
3137	4050	//return true;
3138		- } else if (event.getSource() == povItem)
	4051	+ } else if (source == povItem)
3139	4052	{
3140	4053	generatePOV();
3141	4054	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	4055	+ } else if (event.getSource() == archiveItem)
	4056	+ {
	4057	+ cTools.Archive(frame);
	4058	+ return;
	4059	+ } else if (source == zBufferItem)
3143	4060	{
3144	4061	try
3145	4062	{
..	..	@@ -3161,21 +4078,8 @@
3161	4078	cameraView.repaint();
3162	4079	//return true;
3163	4080	}
3164		- */ else if (event.getSource() == editCameraItem)
3165		- {
3166		- cameraView.ProtectCamera();
3167		- cameraView.repaint();
3168		- return;
3169		- } else if (event.getSource() == revertCameraItem)
3170		- {
3171		- cameraView.RevertCamera();
3172		- cameraView.repaint();
3173		- return;
3174		-// } else if (event.getSource() == textureButton)
3175		-// {
3176		-// return; // true;
3177		- } else // combos...
3178		- if (event.getSource() == texresMenu)
	4081	+ */ else // combos...
	4082	+ if (source == texresMenu)
3179	4083	{
3180	4084	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	4085	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +4091,477 @@
3187	4091	}
3188	4092	}
3189	4093
	4094	+ void New()
	4095	+ {
	4096	+ while (copy.Size() > 1)
	4097	+ {
	4098	+ copy.remove(1);
	4099	+ }
	4100	+
	4101	+ ResetModel();
	4102	+ objEditor.refreshContents();
	4103	+ }
	4104	+
	4105	+ static public byte[] Compress(Object3D o)
	4106	+ {
	4107	+ // Slower to actually compress.
	4108	+ try
	4109	+ {
	4110	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4111	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4112	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4113	+
	4114	+ Object3D parent = o.parent;
	4115	+ o.parent = null;
	4116	+
	4117	+ out.writeObject(o);
	4118	+
	4119	+ o.parent = parent;
	4120	+
	4121	+ out.flush();
	4122	+
	4123	+ baos //zstream
	4124	+ .close();
	4125	+ out.close();
	4126	+
	4127	+ byte[] bytes = baos.toByteArray();
	4128	+
	4129	+ System.out.println("save #bytes = " + bytes.length);
	4130	+ return bytes;
	4131	+ } catch (Exception e)
	4132	+ {
	4133	+ System.err.println(e);
	4134	+ return null;
	4135	+ }
	4136	+ }
	4137	+
	4138	+ static public Object Uncompress(byte[] bytes)
	4139	+ {
	4140	+ System.out.println("restore #bytes = " + bytes.length);
	4141	+ try
	4142	+ {
	4143	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4144	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4145	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4146	+ Object obj = in.readObject();
	4147	+
	4148	+ bais //istream
	4149	+ .close();
	4150	+ in.close();
	4151	+
	4152	+ return obj;
	4153	+ } catch (Exception e)
	4154	+ {
	4155	+ System.err.println(e);
	4156	+ return null;
	4157	+ }
	4158	+ }
	4159	+
	4160	+ static public Object clone(Object o)
	4161	+ {
	4162	+ try
	4163	+ {
	4164	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4165	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4166	+
	4167	+ out.writeObject(o);
	4168	+
	4169	+ out.flush();
	4170	+ out.close();
	4171	+
	4172	+ byte[] bytes = baos.toByteArray();
	4173	+
	4174	+ System.out.println("clone = " + bytes.length);
	4175	+
	4176	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4177	+ ObjectInputStream in = new ObjectInputStream(bais);
	4178	+ Object obj = in.readObject();
	4179	+ in.close();
	4180	+
	4181	+ return obj;
	4182	+ } catch (Exception e)
	4183	+ {
	4184	+ System.err.println(e);
	4185	+ return null;
	4186	+ }
	4187	+ }
	4188	+
	4189	+ cRadio GetCurrentTab()
	4190	+ {
	4191	+ cRadio ab;
	4192	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4193	+ {
	4194	+ ab = (cRadio)e.nextElement();
	4195	+ if(ab.GetObject() == copy)
	4196	+ {
	4197	+ return ab;
	4198	+ }
	4199	+ }
	4200	+
	4201	+ return null;
	4202	+ }
	4203	+
	4204	+
	4205	+ public void Save()
	4206	+ {
	4207	+ //Save(true);
	4208	+ Replace();
	4209	+ SetVersionStates();
	4210	+ }
	4211	+
	4212	+ private boolean Equal(byte[] compress, byte[] name)
	4213	+ {
	4214	+ if (compress.length != name.length)
	4215	+ {
	4216	+ return false;
	4217	+ }
	4218	+
	4219	+ for (int i=compress.length; --i>=0;)
	4220	+ {
	4221	+ if (compress[i] != name[i])
	4222	+ return false;
	4223	+ }
	4224	+
	4225	+ return true;
	4226	+ }
	4227	+
	4228	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4229	+
	4230	+ void DeleteVersion()
	4231	+ {
	4232	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4233	+ {
	4234	+ copy.versionlist[i] = copy.versionlist[i+1];
	4235	+ }
	4236	+
	4237	+ CopyChanged();
	4238	+
	4239	+ SetVersionStates();
	4240	+ }
	4241	+
	4242	+ public boolean Save(boolean user)
	4243	+ {
	4244	+ System.err.println("Save");
	4245	+ Replace();
	4246	+
	4247	+ //cRadio tab = GetCurrentTab();
	4248	+
	4249	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4250	+
	4251	+ boolean thesame = false;
	4252	+
	4253	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4254	+// {
	4255	+// thesame = true;
	4256	+// }
	4257	+
	4258	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4259	+ if (!thesame)
	4260	+ {
	4261	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4262	+ {
	4263	+ copy.versionlist[i] = copy.versionlist[i-1];
	4264	+ }
	4265	+
	4266	+ //tab.user[tab.versionindex] = user;
	4267	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4268	+
	4269	+ copy.versionlist[++copy.versionindex] = compress;
	4270	+
	4271	+ // if (increment)
	4272	+ // tab.versionindex++;
	4273	+ }
	4274	+
	4275	+ //copy.RestoreBigData(versiontable);
	4276	+
	4277	+ //assert(hashtable.isEmpty());
	4278	+
	4279	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4280	+// {
	4281	+// //tab.user[i] = false;
	4282	+// copy.versionlist[i] = null;
	4283	+// }
	4284	+
	4285	+ SetVersionStates();
	4286	+
	4287	+ // test save
	4288	+ if (false)
	4289	+ {
	4290	+ try
	4291	+ {
	4292	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4293	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4294	+
	4295	+ p.writeObject(copy);
	4296	+
	4297	+ p.flush();
	4298	+
	4299	+ ostream.close();
	4300	+ } catch (Exception e)
	4301	+ {
	4302	+ e.printStackTrace();
	4303	+ }
	4304	+ }
	4305	+
	4306	+ return !thesame;
	4307	+ }
	4308	+
	4309	+ boolean flashIt = true;
	4310	+
	4311	+ void RefreshSelection()
	4312	+ {
	4313	+ Object3D selection = new Object3D();
	4314	+
	4315	+ for (int i = 0; i < copy.selection.size(); i++)
	4316	+ {
	4317	+ Object3D elem = copy.selection.elementAt(i);
	4318	+
	4319	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4320	+
	4321	+ if (obj == null)
	4322	+ {
	4323	+ copy.selection.remove(i--);
	4324	+ }
	4325	+ else
	4326	+ {
	4327	+ selection.add(obj);
	4328	+ copy.selection.setElementAt(obj, i);
	4329	+ }
	4330	+ }
	4331	+
	4332	+ flashIt = false;
	4333	+ GetTree().clearSelection();
	4334	+ for (int i = 0; i < selection.size(); i++)
	4335	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4336	+ flashIt = true;
	4337	+
	4338	+ //refreshContents(false);
	4339	+ }
	4340	+
	4341	+ void CopyChanged()
	4342	+ {
	4343	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4344	+
	4345	+ SetVersionStates();
	4346	+
	4347	+ boolean temp = CameraPane.SWITCH;
	4348	+ CameraPane.SWITCH = false;
	4349	+
	4350	+ copy.ExtractBigData(versiontable);
	4351	+
	4352	+ copy.clear();
	4353	+
	4354	+ copy.skyboxname = obj.skyboxname;
	4355	+ copy.skyboxext = obj.skyboxext;
	4356	+
	4357	+ for (int i=0; i<obj.Size(); i++)
	4358	+ {
	4359	+ copy.add(obj.get(i));
	4360	+ }
	4361	+
	4362	+ copy.RestoreBigData(versiontable);
	4363	+
	4364	+ CameraPane.SWITCH = temp;
	4365	+
	4366	+ RefreshSelection();
	4367	+ //assert(hashtable.isEmpty());
	4368	+
	4369	+ copy.Touch();
	4370	+
	4371	+ ResetModel();
	4372	+ copy.HardTouch(); // recompile?
	4373	+
	4374	+ cRadio ab;
	4375	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4376	+ {
	4377	+ ab = (cRadio)e.nextElement();
	4378	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4379	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4380	+ if (test != null)
	4381	+ {
	4382	+ test.editWindow = ab.object.editWindow;
	4383	+ ab.object = test;
	4384	+ }
	4385	+ }
	4386	+
	4387	+ refreshContents(true);
	4388	+ }
	4389	+
	4390	+ cButton previousVersionButton;
	4391	+ cButton restoreButton;
	4392	+ cButton replaceButton;
	4393	+ cButton nextVersionButton;
	4394	+ cButton saveVersionButton;
	4395	+ cButton deleteVersionButton;
	4396	+
	4397	+ boolean muteSlider;
	4398	+
	4399	+ int VersionCount()
	4400	+ {
	4401	+ int count = 0;
	4402	+
	4403	+ for (int i = copy.versionlist.length; --i >= 0;)
	4404	+ {
	4405	+ if (copy.versionlist[i] != null)
	4406	+ count++;
	4407	+ }
	4408	+
	4409	+ return count;
	4410	+ }
	4411	+
	4412	+ void SetVersionStates()
	4413	+ {
	4414	+ //if (true)
	4415	+ // return;
	4416	+
	4417	+ //cRadio tab = GetCurrentTab();
	4418	+
	4419	+ restoreButton.setEnabled(copy.versionindex != -1);
	4420	+ replaceButton.setEnabled(copy.versionindex != -1);
	4421	+
	4422	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4423	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4424	+
	4425	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4426	+ copy.versionlist[copy.versionindex + 1] != null);
	4427	+
	4428	+ muteSlider = true;
	4429	+ versionSlider.setMinimum(0);
	4430	+ versionSlider.setMaximum(VersionCount() - 1);
	4431	+ versionSlider.setInteger(copy.versionindex);
	4432	+ versionSlider.setEnabled(copy.versionindex != -1);
	4433	+ muteSlider = false;
	4434	+ }
	4435	+
	4436	+ public boolean PreviousVersion()
	4437	+ {
	4438	+ // Option?
	4439	+ Replace();
	4440	+
	4441	+ System.err.println("Undo");
	4442	+
	4443	+ //cRadio tab = GetCurrentTab();
	4444	+
	4445	+ if (copy.versionindex == 0)
	4446	+ {
	4447	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4448	+ return false;
	4449	+ }
	4450	+
	4451	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4452	+// {
	4453	+// if (Save(false))
	4454	+// tab.versionindex -= 1;
	4455	+// else
	4456	+// {
	4457	+// if (tab.versionindex <= 0)
	4458	+// return false;
	4459	+// else
	4460	+// tab.versionindex -= 1;
	4461	+// }
	4462	+// }
	4463	+
	4464	+ copy.versionindex -= 1;
	4465	+
	4466	+ CopyChanged();
	4467	+
	4468	+ return true;
	4469	+ }
	4470	+
	4471	+ public boolean Restore()
	4472	+ {
	4473	+ System.err.println("Restore");
	4474	+
	4475	+ //cRadio tab = GetCurrentTab();
	4476	+
	4477	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4478	+ {
	4479	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4480	+ return false;
	4481	+ }
	4482	+
	4483	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4484	+ CopyChanged();
	4485	+
	4486	+ return true;
	4487	+ }
	4488	+
	4489	+ public boolean Replace()
	4490	+ {
	4491	+ System.err.println("Replace");
	4492	+
	4493	+ //cRadio tab = GetCurrentTab();
	4494	+
	4495	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4496	+ {
	4497	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4498	+ return false;
	4499	+ }
	4500	+
	4501	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4502	+
	4503	+ return true;
	4504	+ }
	4505	+
	4506	+ public void NextVersion()
	4507	+ {
	4508	+ // Option?
	4509	+ Replace();
	4510	+
	4511	+ //cRadio tab = GetCurrentTab();
	4512	+
	4513	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4514	+ {
	4515	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4516	+ return;
	4517	+ }
	4518	+
	4519	+ copy.versionindex += 1;
	4520	+
	4521	+ CopyChanged();
	4522	+
	4523	+ //if (!tab.user[tab.versionindex])
	4524	+ // tab.graphs[tab.versionindex] = null;
	4525	+ }
	4526	+
	4527	+ void ImportGFD()
	4528	+ {
	4529	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4530	+ browser.show();
	4531	+ String filename = browser.getFile();
	4532	+ if (filename != null && filename.length() > 0)
	4533	+ {
	4534	+ String fullname = browser.getDirectory() + filename;
	4535	+
	4536	+ //Object3D readobj =
	4537	+ objEditor.ReadGFD(fullname, objEditor);
	4538	+ //makeSomething(readobj);
	4539	+ }
	4540	+ }
	4541	+
	4542	+ void ImportVRMLX3D()
	4543	+ {
	4544	+ if (Grafreed.standAlone)
	4545	+ {
	4546	+ /**/
	4547	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4548	+ browser.show();
	4549	+ String filename = browser.getFile();
	4550	+ if (filename != null && filename.length() > 0)
	4551	+ {
	4552	+ String fullname = browser.getDirectory() + filename;
	4553	+ LoadVRMLX3D(fullname);
	4554	+ }
	4555	+ /**/
	4556	+ }
	4557	+ }
	4558	+
3190	4559	void ToggleAnimation()
3191	4560	{
3192	4561	if (!Globals.ANIMATION)
3193	4562	{
3194	4563	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	4564	+ browser.setVisible(true);
3196	4565	String filename = browser.getFile();
3197	4566	if (filename != null && filename.length() > 0)
3198	4567	{
..	..	@@ -3202,8 +4571,8 @@
3202	4571
3203	4572	Globals.ANIMATION ^= true;
3204	4573
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	4574	+ Grafreed.wav.cursor = 0;
	4575	+ Grafreed.wav.loop = 0;
3207	4576	}
3208	4577	} else
3209	4578	{
..	..	@@ -3224,7 +4593,6 @@
3224	4593	callee.refreshContents();
3225	4594	} else
3226	4595	{
3227		- new Exception().printStackTrace();
3228	4596	System.exit(0);
3229	4597	}
3230	4598	}
..	..	@@ -3254,7 +4622,7 @@
3254	4622	void CreateMaterial()
3255	4623	{
3256	4624	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4625	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	4626	if (copy.selection.size() > 0)
3259	4627	//SetMaterial(copy);
3260	4628	{
..	..	@@ -3305,7 +4673,7 @@
3305	4673	assert false;
3306	4674	}
3307	4675
3308		- void EditSelection()
	4676	+ void EditSelection(boolean newWindow)
3309	4677	{
3310	4678	}
3311	4679
..	..	@@ -3313,11 +4681,11 @@
3313	4681	{
3314	4682	copy.ResetBlockLoop(); // temporary problem
3315	4683
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	4684	+ boolean random = CameraPane.SWITCH;
	4685	+ CameraPane.SWITCH = false; // parse everything
3318	4686	copy.ResetDisplayList();
3319	4687	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	4688	+ CameraPane.SWITCH = random;
3321	4689	}
3322	4690
3323	4691	// public void applySelf()
..	..	@@ -3364,7 +4732,7 @@
3364	4732	//copy.material = new cMaterial(copy.GetMaterial());
3365	4733
3366	4734	current.color = (float) colorField.getFloat();
3367		- current.modulation = (float) modulationField.getFloat();
	4735	+ current.modulation = (float) saturationField.getFloat();
3368	4736	current.metalness = (float) metalnessField.getFloat();
3369	4737	current.diffuse = (float) diffuseField.getFloat();
3370	4738	current.specular = (float) specularField.getFloat();
..	..	@@ -3391,6 +4759,36 @@
3391	4759	{
3392	4760	//System.out.println("Propagate = " + propagate);
3393	4761	copy.UpdateMaterial(anchor, current, propagate);
	4762	+
	4763	+ if (copy.material != null)
	4764	+ {
	4765	+ cMaterial mat = copy.material;
	4766	+
	4767	+ colorField.SetToolTipValue((mat.color));
	4768	+ saturationField.SetToolTipValue((mat.modulation));
	4769	+ metalnessField.SetToolTipValue((mat.metalness));
	4770	+ diffuseField.SetToolTipValue((mat.diffuse));
	4771	+ specularField.SetToolTipValue((mat.specular));
	4772	+ shininessField.SetToolTipValue((mat.shininess));
	4773	+ shiftField.SetToolTipValue((mat.shift));
	4774	+ ambientField.SetToolTipValue((mat.ambient));
	4775	+ lightareaField.SetToolTipValue((mat.lightarea));
	4776	+ diffusenessField.SetToolTipValue((mat.factor));
	4777	+ velvetField.SetToolTipValue((mat.velvet));
	4778	+ sheenField.SetToolTipValue((mat.sheen));
	4779	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4780	+ backlitField.SetToolTipValue((mat.bump));
	4781	+ anisoField.SetToolTipValue((mat.aniso));
	4782	+ anisoVField.SetToolTipValue((mat.anisoV));
	4783	+ cameraField.SetToolTipValue((mat.cameralight));
	4784	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4785	+ shadowField.SetToolTipValue((mat.shadow));
	4786	+ textureField.SetToolTipValue((mat.texture));
	4787	+ opacityField.SetToolTipValue((mat.opacity));
	4788	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4789	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4790	+ }
	4791	+
3394	4792	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	4793	{
3396	4794	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3419,9 +4817,28 @@
3419	4817	//copy.Touch();
3420	4818	}
3421	4819
	4820	+ cNumberSlider versionSlider;
	4821	+
3422	4822	public void stateChanged(ChangeEvent e)
3423	4823	{
3424	4824	// assert(false);
	4825	+ if (e.getSource() == versionSlider)
	4826	+ {
	4827	+ if (muteSlider)
	4828	+ return;
	4829	+
	4830	+ Replace();
	4831	+
	4832	+ int version = versionSlider.getInteger();
	4833	+
	4834	+ if (version != -1 && copy.versionlist[version] != null)
	4835	+ {
	4836	+ copy.versionindex = version;
	4837	+ CopyChanged();
	4838	+ }
	4839	+
	4840	+ return;
	4841	+ }
3425	4842
3426	4843	if (freezematerial)
3427	4844	{
..	..	@@ -3457,6 +4874,12 @@
3457	4874	{
3458	4875	//System.out.println("stateChanged = " + this);
3459	4876	materialtouched = true;
	4877	+
	4878	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4879	+ {
	4880	+ saturationField.setFloat(1);
	4881	+ }
	4882	+
3460	4883	applySelf();
3461	4884	//System.out.println("this = " + this);
3462	4885	//System.out.println("PARENT = " + parent);
..	..	@@ -3506,7 +4929,7 @@
3506	4929	}
3507	4930
3508	4931	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4932	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	4933	}
3511	4934
3512	4935	void SnapObject()
..	..	@@ -3756,6 +5179,7 @@
3756	5179	{
3757	5180	if (GetTree() != null)
3758	5181	{
	5182	+ GetTree().revalidate();
3759	5183	GetTree().repaint();
3760	5184	}
3761	5185
..	..	@@ -3764,12 +5188,19 @@
3764	5188	ctrlPanel.validate(); // ? new
3765	5189	ctrlPanel.repaint();
3766	5190	}
	5191	+
	5192	+ if (previousVersionButton != null && copy.versionlist != null)
	5193	+ SetVersionStates();
	5194	+
	5195	+ cameraView.requestFocusInWindow();
3767	5196	}
3768	5197
3769	5198	static TweenManager tweenManager = new TweenManager();
3770	5199
3771	5200	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	5201	{
	5202	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5203	+ Save();
3773	5204	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	5205	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	5206	// if (thing instanceof GenericJointDemo)
..	..	@@ -3793,7 +5224,7 @@
3793	5224	// group = (Composite) group.get(0);
3794	5225	// }
3795	5226
3796		- System.out.println("makeSomething of " + thing);
	5227	+ //System.out.println("makeSomething of " + thing);
3797	5228
3798	5229	/*
3799	5230	if (deselect && jList != null)
..	..	@@ -3856,6 +5287,12 @@
3856	5287	{
3857	5288	ResetModel();
3858	5289	Select(thing.GetTreePath(), true, false); // unselect... false);
	5290	+
	5291	+ if (thing.Size() == 0)
	5292	+ {
	5293	+ //EditSelection(false);
	5294	+ }
	5295	+
3859	5296	refreshContents();
3860	5297	}
3861	5298
..	..	@@ -3973,6 +5410,7 @@
3973	5410	}
3974	5411	}
3975	5412	}
	5413	+
3976	5414	LoadGFDThread loadGFDThread;
3977	5415
3978	5416	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +5430,10 @@
3992	5430
3993	5431	try
3994	5432	{
	5433	+ // Try compressed version first.
3995	5434	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5435	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5436	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	5437
3998	5438	readobj = (Object3D) p.readObject();
3999	5439	istream.close();
..	..	@@ -4001,7 +5441,22 @@
4001	5441	readobj.ResetDisplayList();
4002	5442	} catch (Exception e)
4003	5443	{
4004		- e.printStackTrace();
	5444	+ if (!e.toString().contains("GZIP"))
	5445	+ e.printStackTrace();
	5446	+
	5447	+ try
	5448	+ {
	5449	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5450	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5451	+
	5452	+ readobj = (Object3D) p.readObject();
	5453	+ istream.close();
	5454	+
	5455	+ readobj.ResetDisplayList();
	5456	+ } catch (Exception e2)
	5457	+ {
	5458	+ e2.printStackTrace();
	5459	+ }
4005	5460	}
4006	5461	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	5462	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +5502,12 @@
4047	5502
4048	5503	void LoadIt(Object obj)
4049	5504	{
	5505	+ if (obj == null)
	5506	+ {
	5507	+ // Invalid file
	5508	+ return;
	5509	+ }
	5510	+
4050	5511	System.out.println("Loaded " + obj);
4051	5512	//new Exception().printStackTrace();
4052	5513	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,10 +5517,14 @@
4056	5517
4057	5518	if (readobj != null)
4058	5519	{
	5520	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5521	+ // Save();
4059	5522	try
4060	5523	{
4061	5524	//readobj.deepCopySelf(copy);
4062	5525	copy.clear(); // june 2014
	5526	+ copy.skyboxname = readobj.skyboxname;
	5527	+ copy.skyboxext = readobj.skyboxext;
4063	5528	for (int i = 0; i < readobj.size(); i++)
4064	5529	{
4065	5530	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4100,6 +5565,7 @@
4100	5565	}
4101	5566	} catch (ClassCastException e)
4102	5567	{
	5568	+ e.printStackTrace();
4103	5569	assert (false);
4104	5570	Composite c = (Composite) copy;
4105	5571	c.children.clear();
..	..	@@ -4110,17 +5576,31 @@
4110	5576	c.addChild(csg);
4111	5577	}
4112	5578
	5579	+ copy.versionlist = readobj.versionlist;
	5580	+ copy.versionindex = readobj.versionindex;
	5581	+
	5582	+ if (copy.versionlist == null)
	5583	+ {
	5584	+ // Backward compatibility
	5585	+ copy.versionlist = new Object3D[100];
	5586	+ copy.versionindex = -1;
	5587	+
	5588	+ //Save(true);
	5589	+ }
	5590	+
	5591	+ //? SetUndoStates();
	5592	+
4113	5593	ResetModel();
4114	5594	copy.HardTouch(); // recompile?
4115	5595	refreshContents();
4116	5596	}
4117	5597	}
4118	5598
4119		- void load() // throws ClassNotFoundException
	5599	+ void Open() // throws ClassNotFoundException
4120	5600	{
4121		- if (GrafreeD.standAlone)
	5601	+ if (Grafreed.standAlone)
4122	5602	{
4123		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5603	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4124	5604	browser.show();
4125	5605	String filename = browser.getFile();
4126	5606	if (filename != null && filename.length() > 0)
..	..	@@ -4197,6 +5677,8 @@
4197	5677
4198	5678	void save()
4199	5679	{
	5680	+ Replace();
	5681	+
4200	5682	if (lastname == null)
4201	5683	{
4202	5684	return;
..	..	@@ -4205,11 +5687,13 @@
4205	5687	try
4206	5688	{
4207	5689	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5690	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5691	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	5692
4210	5693	p.writeObject(copy);
4211	5694	p.flush();
4212	5695
	5696	+ zstream.close();
4213	5697	ostream.close();
4214	5698
4215	5699	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4217,19 +5701,23 @@
4217	5701	//ps.print(buffer.toString());
4218	5702	} catch (IOException e)
4219	5703	{
	5704	+ e.printStackTrace();
4220	5705	}
4221	5706	}
	5707	+
4222	5708	String lastname;
4223	5709
4224	5710	void saveAs()
4225	5711	{
4226		- if (GrafreeD.standAlone)
	5712	+ if (Grafreed.standAlone)
4227	5713	{
4228	5714	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	5715	browser.setVisible(true);
4230	5716	String filename = browser.getFile();
4231	5717	if (filename != null && filename.length() > 0)
4232	5718	{
	5719	+ if (!filename.endsWith(".gfd"))
	5720	+ filename += ".gfd";
4233	5721	lastname = browser.getDirectory() + filename;
4234	5722	save();
4235	5723	}
..	..	@@ -4328,13 +5816,13 @@
4328	5816	try
4329	5817	{
4330	5818	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5819	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5820	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	5821
4334	5822	Object3D objectparent = obj.parent;
4335	5823	obj.parent = null;
4336	5824
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5825	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	5826
4339	5827	obj.parent = objectparent;
4340	5828
..	..	@@ -4346,8 +5834,8 @@
4346	5834	p.writeObject(object);
4347	5835	p.flush();
4348	5836
	5837	+ zstream.close();
4349	5838	ostream.close();
4350		- // zstream.close();
4351	5839
4352	5840	// group.selection.get(0).parent = parent;
4353	5841	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +5856,7 @@
4368	5856	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	5857	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	5858	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	5859	+ if (Grafreed.standAlone)
4372	5860	{
4373	5861	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	5862	browser.show();
..	..	@@ -4394,19 +5882,18 @@
4394	5882	Object3D client;
4395	5883	Object3D copy;
4396	5884	MenuBar menuBar;
4397		- Menu windowMenu;
4398		- MenuItem loadItem;
	5885	+ Menu fileMenu;
	5886	+ MenuItem newItem;
	5887	+ MenuItem openItem;
4399	5888	MenuItem saveItem;
4400	5889	MenuItem saveAsItem;
4401	5890	MenuItem exportAsItem;
4402	5891	MenuItem reexportItem;
4403	5892	MenuItem povItem;
4404	5893	MenuItem closeItem;
4405		- Menu cameraMenu;
	5894	+
4406	5895	CheckboxMenuItem zBufferItem;
4407	5896	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	5897	MenuItem stepItem;
4411	5898	CheckboxMenuItem toggleLiveItem;
4412	5899	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,25 +5904,40 @@
4417	5904	CheckboxMenuItem toggleFootContactItem;
4418	5905	CheckboxMenuItem toggleDLItem;
4419	5906	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	5907	+ CheckboxMenuItem toggleSwitchItem;
4421	5908	CheckboxMenuItem toggleRootItem;
4422	5909	CheckboxMenuItem animationItem;
	5910	+ MenuItem archiveItem;
4423	5911	CheckboxMenuItem toggleHandleItem;
4424	5912	CheckboxMenuItem togglePaintItem;
4425	5913	JSplitPane mainPanel;
4426	5914	JScrollPane scrollpane;
	5915	+
4427	5916	JPanel toolbarPanel;
4428		- JPanel treePanel;
	5917	+
	5918	+ cGridBag treePanel;
	5919	+
4429	5920	JPanel radioPanel;
4430	5921	ButtonGroup buttonGroup;
4431		- cGridBag ctrlPanel;
	5922	+
	5923	+ cGridBag toolboxPanel;
	5924	+ cGridBag skyboxPanel;
4432	5925	cGridBag materialPanel;
	5926	+ cGridBag ctrlPanel;
	5927	+
4433	5928	JScrollPane infoPanel;
	5929	+
4434	5930	cGridBag optionsPanel;
	5931	+
4435	5932	JTabbedPane objectPanel;
	5933	+ boolean materialFlushed;
	5934	+ Object3D latestObject;
	5935	+
4436	5936	cGridBag XYZPanel;
	5937	+
4437	5938	JSplitPane gridPanel;
4438	5939	JSplitPane bigPanel;
	5940	+
4439	5941	cGridBag bigThree;
4440	5942	cGridBag scenePanel;
4441	5943	cGridBag centralPanel;
..	..	@@ -4493,7 +5995,7 @@
4493	5995	JLabel colorLabel;
4494	5996	cNumberSlider colorField;
4495	5997	JLabel modulationLabel;
4496		- cNumberSlider modulationField;
	5998	+ cNumberSlider saturationField;
4497	5999	JLabel metalnessLabel;
4498	6000	cNumberSlider metalnessField;
4499	6001	JLabel diffuseLabel;
..	..	@@ -4524,6 +6026,7 @@
4524	6026	cNumberSlider anisoField;
4525	6027	JLabel anisoVLabel;
4526	6028	cNumberSlider anisoVField;
	6029	+
4527	6030	JLabel cameraLabel;
4528	6031	cNumberSlider cameraField;
4529	6032	JLabel selfshadowLabel;
..	..	@@ -4538,6 +6041,7 @@
4538	6041	cNumberSlider fakedepthField;
4539	6042	JLabel shadowbiasLabel;
4540	6043	cNumberSlider shadowbiasField;
	6044	+
4541	6045	JLabel bumpLabel;
4542	6046	cNumberSlider bumpField;
4543	6047	JLabel noiseLabel;
..	..	@@ -4550,8 +6054,13 @@
4550	6054	cNumberSlider fogField;
4551	6055	JLabel opacityPowerLabel;
4552	6056	cNumberSlider opacityPowerField;
4553		- JTree jTree;
	6057	+ cTree jTree;
4554	6058	//ObjectUI parent;
4555	6059
4556	6060	cNumberSlider normalpushField;
	6061	+
	6062	+ private MenuItem importGFDItem;
	6063	+ private MenuItem importVRMLX3DItem;
	6064	+ private MenuItem import3DSItem;
	6065	+ private MenuItem importOBJItem;
4557	6066	}