~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,52 @@
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	+
	429	+ // This is to refresh the UI of the material panel.
	430	+ boolean patchMaterial;
	431	+
275	432	void SetupMenu()
276	433	{
277	434	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..."));
	435	+ menuBar.add(fileMenu = new Menu("File"));
	436	+ fileMenu.add(newItem = new MenuItem("New"));
	437	+ fileMenu.add(openItem = new MenuItem("Open..."));
	438	+
	439	+ //oe.menuBar.add(menu = new Menu("Include"));
	440	+ Menu menu = new Menu("Import");
	441	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	442	+ importOBJItem.addActionListener(this);
	443	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	444	+ import3DSItem.addActionListener(this);
	445	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	446	+ importVRMLX3DItem.addActionListener(this);
	447	+ menu.add("-");
	448	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	449	+ importGFDItem.addActionListener(this);
	450	+ fileMenu.add(menu);
	451	+ fileMenu.add("-");
	452	+
	453	+ fileMenu.add(saveItem = new MenuItem("Save"));
	454	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	455	//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("-");
	456	+ fileMenu.add("-");
	457	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	458	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	459	+ fileMenu.add("-");
288	460	if (client.parent != null)
289	461	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	462	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	463	} else
292	464	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	465	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	466	}
295	467
296		- loadItem.addActionListener(this);
	468	+ newItem.addActionListener(this);
	469	+ openItem.addActionListener(this);
297	470	saveItem.addActionListener(this);
298	471	saveAsItem.addActionListener(this);
299	472	exportAsItem.addActionListener(this);
..	..	@@ -301,82 +474,103 @@
301	474	//povItem.addActionListener(this);
302	475	closeItem.addActionListener(this);
303	476
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	477	objectPanel = new JTabbedPane();
	478	+
	479	+ ChangeListener changeListener = new ChangeListener()
	480	+ {
	481	+ //String name;
	482	+
	483	+ public void stateChanged(ChangeEvent changeEvent)
	484	+ {
	485	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	486	+// {
	487	+// if (latestObject != null)
	488	+// {
	489	+// refreshContents(true);
	490	+// SetMaterial(latestObject);
	491	+// }
	492	+//
	493	+// materialFlushed = true;
	494	+// }
	495	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	496	+// {
	497	+// if (listUI.size() == 0)
	498	+// EditSelection(false);
	499	+// }
	500	+
	501	+// if (objectPanel.getSelectedIndex() == 4)
	502	+// {
	503	+// name = copy.skyboxname;
	504	+//
	505	+// if (name == null)
	506	+// {
	507	+// name = "";
	508	+// }
	509	+//
	510	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	511	+// copy.skyboxext = "jpg";
	512	+// }
	513	+// else
	514	+// {
	515	+// if (name != null)
	516	+// {
	517	+// if (name.equals(""))
	518	+// {
	519	+// copy.skyboxname = null;
	520	+// copy.skyboxext = null;
	521	+// }
	522	+// else
	523	+// {
	524	+// copy.skyboxname = name;
	525	+// }
	526	+// }
	527	+// }
	528	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	529	+
	530	+// refreshContents(false); // To refresh Info tab
	531	+ cameraView.repaint();
	532	+ }
	533	+ };
	534	+ objectPanel.addChangeListener(changeListener);
	535	+
360	536	toolbarPanel = new JPanel();
361	537	toolbarPanel.setName("Toolbar");
362		- treePanel = new JPanel();
	538	+
	539	+ treePanel = new cGridBag();
363	540	treePanel.setName("Tree");
	541	+
	542	+ editPanel = new cGridBag().setVertical(true);
	543	+ //editPanel.setName("Edit");
	544	+
364	545	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
366		- materialPanel = new cGridBag().setVertical(true);
367		- materialPanel.setName("Material");
	546	+
	547	+ editCommandsPanel = new cGridBag();
	548	+ editPanel.add(editCommandsPanel);
	549	+ editPanel.add(ctrlPanel);
	550	+
	551	+ toolboxPanel = new cGridBag().setVertical(true);
	552	+ //toolboxPanel.setName("Toolbox");
	553	+
	554	+ skyboxPanel = new cGridBag().setVertical(true);
	555	+
	556	+ materialPanel = new cGridBag().setVertical(false);
	557	+ //materialPanel.setName("Material");
	558	+
368	559	/JTextPane/
369	560	infoarea = createTextPane();
	561	+ doc = infoarea.getStyledDocument();
	562	+
370	563	infoarea.setEditable(true);
371	564	SetText();
	565	+
372	566	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373	567	// infoarea.setOpaque(false);
374	568	// //infoarea.setForeground(textcolor);
375		- infoarea.setLineWrap(true);
376		- infoarea.setWrapStyleWord(true);
	569	+// TEXTAREA infoarea.setLineWrap(true);
	570	+// TEXTAREA infoarea.setWrapStyleWord(true);
377	571	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");
	572	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	573	+ //infoPanel.setName("Info");
380	574	//infoPanel.setLayout(new BorderLayout());
381	575	//infoPanel.add(createTextPane());
382	576
..	..	@@ -384,14 +578,21 @@
384	578	mainPanel.setName("Main");
385	579	mainPanel.setContinuousLayout(true);
386	580	mainPanel.setOneTouchExpandable(true);
387		- mainPanel.setDividerLocation(1.0);
388	581	mainPanel.setDividerSize(9);
389		- mainPanel.setResizeWeight(0);
390		-
	582	+ mainPanel.setDividerLocation(0.5); //1.0);
	583	+ mainPanel.setResizeWeight(0.5);
	584	+
	585	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	586	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	587	+ divider.setDividerSize(15);
	588	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	589	+
	590	+ mainPanel.setUI(new BasicSplitPaneUI());
	591	+
391	592	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392	593	//mainPanel.setLayout(new GridBagLayout());
393	594	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394		- treePanel.setLayout(new GridBagLayout());
	595	+// treePanel.setLayout(new GridBagLayout());
395	596	//ctrlPanel.setLayout(new GridBagLayout());
396	597	//materialPanel.setLayout(new GridBagLayout());
397	598
..	..	@@ -432,7 +633,7 @@
432	633	static String newline = "\n";
433	634	protected static final String buttonString = "JButton";
434	635	StyledDocument doc;
435		- JTextArea infoarea;
	636	+ JTextPane infoarea;
436	637
437	638	void ClearInfo()
438	639	{
..	..	@@ -455,10 +656,10 @@
455	656	e.printStackTrace();
456	657	}
457	658
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();
	659	+// String selection = infoarea.getText();
	660	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	661	+// java.awt.datatransfer.Clipboard clipboard =
	662	+// Toolkit.getDefaultToolkit().getSystemClipboard();
462	663	//clipboard.setContents(data, data);
463	664	}
464	665
..	..	@@ -481,13 +682,13 @@
481	682	//SendInfo("Name:", "bold");
482	683	if (sel.GetTextures() != null \|\| debug)
483	684	{
484		- si.SendInfo(sel.toString(), "bold");
	685	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485	686	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486	687	if (sel.Size() > 0)
487	688	{
488	689	si.SendInfo("#children = " + sel.Size(), "regular");
489	690	}
490		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	691	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491	692	if (debug)
492	693	{
493	694	try
..	..	@@ -499,7 +700,10 @@
499	700	}
500	701
501	702	if (full)
502		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	703	+ {
	704	+ si.SendInfo(" BBox min: " + minima, "regular");
	705	+ si.SendInfo(" BBox max: " + maxima, "regular");
	706	+ }
503	707
504	708	if (sel.bRep != null)
505	709	{
..	..	@@ -526,7 +730,7 @@
526	730	}
527	731	if (sel.support != null)
528	732	{
529		- si.SendInfo(" support: " + sel.support, "regular");
	733	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530	734	}
531	735	if (sel.scriptnode != null)
532	736	{
..	..	@@ -597,6 +801,9 @@
597	801	{
598	802	CameraPane.pointflow = (PointFlow) sel;
599	803	}
	804	+
	805	+ si.SendInfo("_____________________", "regular");
	806	+ si.SendInfo("", "regular");
600	807	}
601	808	}
602	809
..	..	@@ -612,68 +819,211 @@
612	819	}
613	820	}
614	821
	822	+//static GraphicsDevice device = GraphicsEnvironment
	823	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	824	+
	825	+ Rectangle keeprect;
	826	+ cRadio radio;
	827	+
	828	+cButton keepButton;
	829	+ cButton twoButton; // Full 3D
	830	+ cButton sixButton;
	831	+ cButton threeButton;
	832	+ cButton sevenButton;
	833	+ cButton fourButton; // full panel
	834	+ cButton oneButton; // full XYZ
	835	+ //cButton currentLayout;
	836	+
	837	+ boolean maximized;
	838	+
	839	+ cButton fullscreenLayout;
	840	+ cButton expandedLayout;
	841	+
	842	+ void Minimize()
	843	+ {
	844	+ frame.setState(Frame.ICONIFIED);
	845	+ frame.validate();
	846	+ }
	847	+
	848	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	849	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	850	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	851	+ void Maximize()
	852	+ {
	853	+ if (CameraPane.FULLSCREEN)
	854	+ {
	855	+ ToggleFullScreen();
	856	+ }
	857	+
	858	+ if (maximized)
	859	+ {
	860	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	861	+ }
	862	+ else
	863	+ {
	864	+ keeprect = frame.getBounds();
	865	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	866	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	867	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	868	+// frame.setState(Frame.MAXIMIZED_BOTH);
	869	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	870	+ }
	871	+
	872	+ maximized ^= true;
	873	+
	874	+ frame.validate();
	875	+ }
	876	+
	877	+ cButton minButton;
	878	+ cButton maxButton;
	879	+ cButton fullButton;
	880	+ cButton collapseButton;
	881	+ cButton maximize3DButton;
	882	+
615	883	void ToggleFullScreen()
616	884	{
617		- if (CameraPane.FULLSCREEN)
	885	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	886	+
	887	+ cameraView.ToggleFullScreen();
	888	+
	889	+ if (!CameraPane.FULLSCREEN)
618	890	{
619		- frame.getContentPane().remove(/"Center",/bigThree);
620		- framePanel.add(bigThree);
621		- frame.getContentPane().add(/"Center",/framePanel);
	891	+ device.setFullScreenWindow(null);
	892	+ frame.dispose();
	893	+ frame.setUndecorated(false);
	894	+ frame.validate();
	895	+ frame.setVisible(true);
	896	+
	897	+ //frame.setVisible(false);
	898	+// frame.removeNotify();
	899	+// frame.setUndecorated(false);
	900	+// frame.addNotify();
	901	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	902	+
	903	+// X frame.getContentPane().remove(/"Center",/bigThree);
	904	+// X framePanel.add(bigThree);
	905	+// X frame.getContentPane().add(/"Center",/framePanel);
	906	+// framePanel.setDividerLocation(46); // icons are 24x24
	907	+
	908	+ //frame.setVisible(true);
	909	+// radio.layout = keepButton;
	910	+ //theFrame = null;
	911	+ keepButton = null;
	912	+// radio.layout.doClick();
	913	+
622	914	} else
623	915	{
624		- frame.getContentPane().remove(/"Center",/framePanel);
625		- framePanel.remove(bigThree);
626		- frame.getContentPane().add(/"Center",/bigThree);
	916	+ keepButton = radio.layout;
	917	+ //keeprect = frame.getBounds();
	918	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	919	+// frame.getToolkit().getScreenSize().height);
	920	+ //frame.setVisible(false);
	921	+
	922	+ frame.dispose();
	923	+ frame.setUndecorated(true);
	924	+ device.setFullScreenWindow(frame);
	925	+ frame.validate();
	926	+ frame.setVisible(true);
	927	+// frame.removeNotify();
	928	+// frame.setUndecorated(true);
	929	+// frame.addNotify();
	930	+// X frame.getContentPane().remove(/"Center",/framePanel);
	931	+// X framePanel.remove(bigThree);
	932	+// X frame.getContentPane().add(/"Center",/bigThree);
	933	+// framePanel.setDividerLocation(0);
	934	+
	935	+// radio.layout = fullscreenLayout;
	936	+// radio.layout.doClick();
	937	+ //frame.setVisible(true);
627	938	}
628		- cameraView.ToggleFullScreen();
	939	+ frame.validate();
	940	+
	941	+ cameraView.requestFocusInWindow();
629	942	}
630	943
631		- private JTextArea createTextPane()
	944	+ void CollapseToolbar()
	945	+ {
	946	+ framePanel.setDividerLocation(0);
	947	+ //frame.validate();
	948	+
	949	+ cameraView.requestFocusInWindow();
	950	+ }
	951	+
	952	+ private Object3D Duplicate(Object3D object)
632	953	{
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		- };
	954	+ boolean temp = CameraPane.SWITCH;
	955	+ CameraPane.SWITCH = false;
	956	+
	957	+ if (Grafreed.grafreed.universe.versiontable == null)
	958	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	959	+
	960	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	961	+ // if (copy == client)
	962	+
	963	+ Object3D versions[] = object.versionlist;
	964	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	965	+ object.versionlist = null;
	966	+ object.versiontable = null;
	967	+
	968	+ //byte[] compress = Compress(copy);
	969	+ Object3D compress = (Object3D)Grafreed.clone(object);
	970	+
	971	+ object.versionlist = versions;
	972	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	973	+
	974	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	975	+
	976	+ CameraPane.SWITCH = temp;
	977	+
	978	+ return compress;
	979	+ }
648	980
649		- String[] initStyles =
650		- {
651		- "regular", "italic", "bold", "small", "large",
652		- "regular", "button", "regular", "icon",
653		- "regular"
654		- };
	981	+ private JTextPane createTextPane()
	982	+ {
	983	+// TEXTAREA String[] initString =
	984	+// {
	985	+// "This is an editable JTextPane, ", //regular
	986	+// "another ", //italic
	987	+// "styled ", //bold
	988	+// "text ", //small
	989	+// "component, ", //large
	990	+// "which supports embedded components..." + newline,//regular
	991	+// " " + newline, //button
	992	+// "...and embedded icons..." + newline, //regular
	993	+// " ", //icon
	994	+// newline + "JTextPane is a subclass of JEditorPane that "
	995	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	996	+// + "cover methods for interacting with those objects."
	997	+// };
	998	+//
	999	+// String[] initStyles =
	1000	+// {
	1001	+// "regular", "italic", "bold", "small", "large",
	1002	+// "regular", "button", "regular", "icon",
	1003	+// "regular"
	1004	+// };
	1005	+//
	1006	+// JTextPane textPane = new JTextPane();
	1007	+// textPane.setEditable(true);
	1008	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1009	+// addStylesToDocument(doc);
	1010	+//
	1011	+// try
	1012	+// {
	1013	+// for (int j = 0; j < 2; j++)
	1014	+// {
	1015	+// for (int i = 0; i < initString.length; i++)
	1016	+// {
	1017	+// doc.insertString(doc.getLength(), initString[i],
	1018	+// doc.getStyle(initStyles[i]));
	1019	+// }
	1020	+// }
	1021	+// } catch (BadLocationException ble)
	1022	+// {
	1023	+// System.err.println("Couldn't insert initial text into text pane.");
	1024	+// }
655	1025
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;
	1026	+ return new JTextPane(); // textPane;
677	1027	}
678	1028
679	1029	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +1076,7 @@
726	1076	protected static ImageIcon createImageIcon(String path,
727	1077	String description)
728	1078	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1079	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	1080	if (imgURL != null)
731	1081	{
732	1082	return new ImageIcon(imgURL, description);
..	..	@@ -749,6 +1099,7 @@
749	1099	{
750	1100	SetupMaterial(materialPanel);
751	1101	}
	1102	+
752	1103	//SetupName();
753	1104	//SetupViews();
754	1105	}
..	..	@@ -758,6 +1109,7 @@
758	1109	// NumberSlider vDivsField;
759	1110	// JCheckBox endcaps;
760	1111	JCheckBox liveCB;
	1112	+ JCheckBox selectableCB;
761	1113	JCheckBox hideCB;
762	1114	JCheckBox link2masterCB;
763	1115	JCheckBox markCB;
..	..	@@ -765,7 +1117,12 @@
765	1117	JCheckBox speedupCB;
766	1118	JCheckBox rewindCB;
767	1119	JCheckBox flipVCB;
	1120	+
	1121	+ cCheckBox toggleTextureCB;
	1122	+ cCheckBox toggleSwitchCB;
	1123	+
768	1124	JComboBox texresMenu;
	1125	+
769	1126	JButton resetButton;
770	1127	JButton stepButton;
771	1128	JButton stepAllButton;
..	..	@@ -774,9 +1131,13 @@
774	1131	JButton fasterButton;
775	1132	JButton remarkButton;
776	1133
	1134	+ cGridBag editPanel;
	1135	+ cGridBag editCommandsPanel;
	1136	+
777	1137	cGridBag namePanel;
778	1138	cGridBag setupPanel;
779		- cGridBag commandsPanel;
	1139	+ cGridBag setupPanel2;
	1140	+ cGridBag objectCommandsPanel;
780	1141	cGridBag pushPanel;
781	1142	cGridBag fillPanel;
782	1143
..	..	@@ -943,52 +1304,88 @@
943	1304
944	1305	void SetupUI2(ObjEditor oe)
945	1306	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	1307	//SetupName(oe);
951	1308
952	1309	namePanel = new cGridBag();
953	1310
	1311	+ //if (copy.pinned)
	1312	+ {
	1313	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1314	+ pinButton.setSelected(copy.pinned);
	1315	+ cGridBag t = new cGridBag();
	1316	+ t.preferredWidth = 2;
	1317	+ t.add(pinButton);
	1318	+ namePanel.add(t);
	1319	+
	1320	+ pinButton.addItemListener(this);
	1321	+ }
	1322	+
954	1323	nameField = AddText(namePanel, copy.GetName());
955		- namePanel.add(nameField);
	1324	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
956	1325	oe.ctrlPanel.add(namePanel);
957	1326
958	1327	oe.ctrlPanel.Return();
959	1328
960		- if (!GroupEditor.allparams)
	1329	+ if (!allparams)
961	1330	return;
962	1331
963	1332	setupPanel = new cGridBag().setVertical(false);
964	1333
965	1334	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1335	+ liveCB.setToolTipText("Animate object");
	1336	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1337	+ markCB.setToolTipText("Set target transform");
	1338	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1339	+ selectableCB.setToolTipText("Make object selectable");
968	1340	// Return();
969		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1341	+
	1342	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1343	+ hideCB.setToolTipText("Hide object");
	1344	+
	1345	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1346	+
	1347	+ setupPanel2 = new cGridBag().setVertical(false);
	1348	+
	1349	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1350	+ rewindCB.setToolTipText("Rewind animation");
	1351	+
	1352	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1353	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
972	1354
	1355	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1356	+ link2masterCB.setToolTipText("Attach to support");
	1357	+
	1358	+ if (Globals.ADVANCED)
	1359	+ {
	1360	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1361	+ speedupCB.setToolTipText("Option motion capture");
	1362	+ }
	1363	+
973	1364	oe.ctrlPanel.add(setupPanel);
974	1365	oe.ctrlPanel.Return();
	1366	+ oe.ctrlPanel.add(setupPanel2);
	1367	+ oe.ctrlPanel.Return();
975	1368
976		- commandsPanel = new cGridBag().setVertical(false);
	1369	+ objectCommandsPanel = new cGridBag().setVertical(false);
977	1370
978		- resetButton = AddButton(commandsPanel, "Reset");
979		- stepButton = AddButton(commandsPanel, "Step");
	1371	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1372	+ resetButton.setToolTipText("Jump to frame zero");
	1373	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1374	+ stepButton.setToolTipText("Step one frame");
980	1375	// resetAllButton = AddButton(oe, "Reset All");
981	1376	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	1377	// Return();
984		- slowerButton = AddButton(commandsPanel, "Slow");
985		- fasterButton = AddButton(commandsPanel, "Fast");
986		- remarkButton = AddButton(commandsPanel, "Remark");
	1378	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1379	+ slowerButton.setToolTipText("Decrease animation speed");
	1380	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1381	+ fasterButton.setToolTipText("Increase animation speed");
	1382	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1383	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1384
988		- oe.ctrlPanel.add(commandsPanel);
	1385	+ oe.ctrlPanel.add(objectCommandsPanel);
989	1386	oe.ctrlPanel.Return();
990	1387
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1388	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	1389	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	1390	//Return();
994	1391
..	..	@@ -1145,6 +1542,7 @@
1145	1542
1146	1543	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1147	1544	{
	1545	+ if (Globals.DEBUG)
1148	1546	System.out.println("CREATE CAMERAS");
1149	1547	cams = new cTemplate();
1150	1548	cams.name = "Cameras";
..	..	@@ -1191,8 +1589,11 @@
1191	1589	//worldPanel.setName("World");
1192	1590	centralPanel = new cGridBag();
1193	1591	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1592	+
	1593	+ if (Globals.ADVANCED)
	1594	+ {
	1595	+ timelinePanel = new JPanel(new BorderLayout());
	1596	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1597
1197	1598	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1599	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1602,10 @@
1201	1602	// cameraPanel.setDividerSize(9);
1202	1603	cameraPanel.setResizeWeight(1.0);
1203	1604
	1605	+ }
	1606	+
1204	1607	centralPanel.add(cameraView);
	1608	+ centralPanel.setFocusable(true);
1205	1609	//frame.setJMenuBar(timelineMenubar);
1206	1610	//centralPanel.add(timelinePanel);
1207	1611
..	..	@@ -1227,6 +1631,7 @@
1227	1631	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1228	1632	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1229	1633	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1634	+ //XYZPanel.setName("XYZ");
1230	1635
1231	1636	/*
1232	1637	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1263,14 +1668,34 @@
1263	1668
1264	1669	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1670	//tmp.setName("Edit");
	1671	+ objectPanel.add(toolboxPanel);
	1672	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1673	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1674	+
1266	1675	objectPanel.add(materialPanel);
	1676	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1677	+ objectPanel.setToolTipTextAt(1, "Material");
	1678	+
	1679	+ objectPanel.add(skyboxPanel);
	1680	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1681	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1682	+
1267	1683	// JPanel north = new JPanel(new BorderLayout());
1268	1684	// north.setName("Edit");
1269	1685	// north.add(ctrlPanel, BorderLayout.NORTH);
1270	1686	// objectPanel.add(north);
1271		- objectPanel.add(ctrlPanel);
1272		- objectPanel.add(infoPanel);
1273		-
	1687	+ objectPanel.add(editPanel);
	1688	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1689	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1690	+
	1691	+ objectPanel.add(XYZPanel);
	1692	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1693	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1694	+
	1695	+ patchMaterial = true;
	1696	+ cameraView.patchMaterial = this;
	1697	+ objectPanel.setSelectedIndex(1);
	1698	+
1274	1699	/*
1275	1700	aConstraints.gridx = 0;
1276	1701	aConstraints.gridwidth = 1;
..	..	@@ -1278,7 +1703,7 @@
1278	1703	aConstraints.gridy += 1;
1279	1704	aConstraints.gridwidth = 1;
1280	1705	mainPanel.add(objectPanel, aConstraints);
1281		- */
	1706	+ */
1282	1707
1283	1708	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1284	1709	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1290,14 +1715,12 @@
1290	1715	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1716
1292	1717	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1718	+ scenePanel.preferredWidth = 5;
1294	1719
1295	1720	JTabbedPane tabbedPane = new JTabbedPane();
1296	1721	tabbedPane.add(scrollpane);
1297	1722
1298		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1299		-
1300		- optionsPanel = new cGridBag().setVertical(true);
	1723	+ optionsPanel = new cGridBag().setVertical(false);
1301	1724
1302	1725	optionsPanel.setName("Options");
1303	1726
..	..	@@ -1305,8 +1728,15 @@
1305	1728
1306	1729	tabbedPane.add(optionsPanel);
1307	1730
	1731	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1732	+
1308	1733	scenePanel.add(tabbedPane);
1309	1734
	1735	+ //if (Globals.ADVANCED)
	1736	+// tabbedPane.add(infoPanel);
	1737	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1738	+// tabbedPane.setToolTipTextAt(3, "Information");
	1739	+
1310	1740	/*
1311	1741	cTree jTree = new cTree(null);
1312	1742	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1368,7 +1798,7 @@
1368	1798	bigThree = new cGridBag();
1369	1799	bigThree.addComponent(scenePanel);
1370	1800	bigThree.addComponent(centralPanel);
1371		- bigThree.addComponent(XYZPanel);
	1801	+ //bigThree.addComponent(XYZPanel);
1372	1802
1373	1803	// // SIDE EFFECT!!!
1374	1804	// aConstraints.gridx = 0;
..	..	@@ -1377,16 +1807,33 @@
1377	1807	// aConstraints.gridheight = 1;
1378	1808
1379	1809	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1380		- framePanel.setContinuousLayout(true);
1381		- framePanel.setOneTouchExpandable(true);
1382		- framePanel.setDividerLocation(0.8);
	1810	+
	1811	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1812	+ new java.beans.PropertyChangeListener()
	1813	+ {
	1814	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1815	+ {
	1816	+ if ((Integer)pce.getOldValue() == 1)
	1817	+ {
	1818	+ if (radio.layout != expandedLayout)
	1819	+ {
	1820	+ radio.layout = expandedLayout;
	1821	+ radio.layout.doClick();
	1822	+ }
	1823	+ }
	1824	+ }
	1825	+ });
	1826	+
	1827	+ framePanel.setContinuousLayout(false);
	1828	+ framePanel.setOneTouchExpandable(false);
	1829	+ //.setDividerLocation(0.8);
1383	1830	//framePanel.setDividerSize(15);
1384	1831	//framePanel.setResizeWeight(0.15);
1385	1832	framePanel.setName("Frame");
1386	1833
1387	1834	frame.getContentPane().setLayout(new BorderLayout());
1388	1835	/**/
1389		- JTabbedPane worldPane = new JTabbedPane();
	1836	+ //JTabbedPane worldPane = new JTabbedPane();
1390	1837	//worldPane.add(bigPanel);
1391	1838	//worldPane.add(worldPanel);
1392	1839	/**/
..	..	@@ -1396,15 +1843,19 @@
1396	1843
1397	1844	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1845
1399		- frame.setSize(1024, 768);
1400		- frame.show();
1401		-
	1846	+ frame.setSize(1280, 860);
	1847	+
	1848	+ cameraView.requestFocusInWindow();
	1849	+
1402	1850	gridPanel.setDividerLocation(1.0);
	1851	+
	1852	+ frame.validate();
	1853	+
	1854	+ frame.setVisible(true);
1403	1855
1404	1856	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1405	1857	frame.addWindowListener(new WindowAdapter()
1406	1858	{
1407		-
1408	1859	public void windowClosing(WindowEvent e)
1409	1860	{
1410	1861	Close();
..	..	@@ -1427,26 +1878,448 @@
1427	1878	ctrlPanel.removeAll();
1428	1879	}
1429	1880
1430		- void SetupMaterial(cGridBag panel)
	1881	+ void SetupMaterial(cGridBag materialpanel)
1431	1882	{
1432		- /*
	1883	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1884	+
	1885	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1886	+ skin.setToolTipText("Skin");
	1887	+ skin.addMouseListener(new MouseAdapter()
	1888	+ {
	1889	+ public void mouseClicked(MouseEvent e)
	1890	+ {
	1891	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1892	+ cMaterial material = object.material;
	1893	+
	1894	+ // Skin
	1895	+ colorField.setFloat(material.color);
	1896	+ float saturation = material.modulation;
	1897	+
	1898	+ if (!cameraView.Skinshader)
	1899	+ {
	1900	+ saturation /= 1.5;
	1901	+ }
	1902	+
	1903	+ saturationField.setFloat(saturation);
	1904	+
	1905	+ subsurfaceField.setFloat(material.subsurface);
	1906	+ selfshadowField.setFloat(material.diffuseness);
	1907	+ diffusenessField.setFloat(material.factor);
	1908	+ shininessField.setFloat(material.shininess);
	1909	+ shadowbiasField.setFloat(material.shadowbias);
	1910	+ diffuseField.setFloat(material.diffuse);
	1911	+ specularField.setFloat(material.specular);
	1912	+
	1913	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1914	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1915	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1916	+
	1917	+ materialtouched = true;
	1918	+ applySelf();
	1919	+ }
	1920	+ });
	1921	+ presetpanel.add(skin);
	1922	+
	1923	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1924	+ lambert.setToolTipText("Diffuse");
	1925	+ lambert.addMouseListener(new MouseAdapter()
	1926	+ {
	1927	+ public void mouseClicked(MouseEvent e)
	1928	+ {
	1929	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1930	+ cMaterial material = object.material;
	1931	+
	1932	+ diffusenessField.setFloat(material.factor);
	1933	+ selfshadowField.setFloat(material.diffuseness);
	1934	+
	1935	+ materialtouched = true;
	1936	+ applySelf();
	1937	+ }
	1938	+ });
	1939	+ presetpanel.add(lambert);
	1940	+
	1941	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1942	+ diffuse2.setToolTipText("Diffuse2");
	1943	+ diffuse2.addMouseListener(new MouseAdapter()
	1944	+ {
	1945	+ public void mouseClicked(MouseEvent e)
	1946	+ {
	1947	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1948	+ cMaterial material = object.material;
	1949	+
	1950	+ diffusenessField.setFloat(material.factor);
	1951	+ selfshadowField.setFloat(material.diffuseness);
	1952	+
	1953	+ materialtouched = true;
	1954	+ applySelf();
	1955	+ }
	1956	+ });
	1957	+ presetpanel.add(diffuse2);
	1958	+
	1959	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1960	+ diffusemoon.setToolTipText("Moon");
	1961	+ diffusemoon.addMouseListener(new MouseAdapter()
	1962	+ {
	1963	+ public void mouseClicked(MouseEvent e)
	1964	+ {
	1965	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1966	+ cMaterial material = object.material;
	1967	+
	1968	+ diffusenessField.setFloat(material.factor);
	1969	+ selfshadowField.setFloat(material.diffuseness);
	1970	+
	1971	+ materialtouched = true;
	1972	+ applySelf();
	1973	+ }
	1974	+ });
	1975	+ presetpanel.add(diffusemoon);
	1976	+
	1977	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1978	+ diffusemoon2.setToolTipText("Moon2");
	1979	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1980	+ {
	1981	+ public void mouseClicked(MouseEvent e)
	1982	+ {
	1983	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1984	+ cMaterial material = object.material;
	1985	+
	1986	+ diffusenessField.setFloat(material.factor);
	1987	+ selfshadowField.setFloat(material.diffuseness);
	1988	+
	1989	+ materialtouched = true;
	1990	+ applySelf();
	1991	+ }
	1992	+ });
	1993	+ presetpanel.add(diffusemoon2);
	1994	+
	1995	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1996	+ diffusemoon3.setToolTipText("Moon3");
	1997	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1998	+ {
	1999	+ public void mouseClicked(MouseEvent e)
	2000	+ {
	2001	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2002	+ cMaterial material = object.material;
	2003	+
	2004	+ diffusenessField.setFloat(material.factor);
	2005	+ selfshadowField.setFloat(material.diffuseness);
	2006	+
	2007	+ materialtouched = true;
	2008	+ applySelf();
	2009	+ }
	2010	+ });
	2011	+ presetpanel.add(diffusemoon3);
	2012	+
	2013	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2014	+ diffusesheen.setToolTipText("Sheen");
	2015	+ diffusesheen.addMouseListener(new MouseAdapter()
	2016	+ {
	2017	+ public void mouseClicked(MouseEvent e)
	2018	+ {
	2019	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2020	+ cMaterial material = object.material;
	2021	+
	2022	+ sheenField.setFloat(material.sheen);
	2023	+
	2024	+ materialtouched = true;
	2025	+ applySelf();
	2026	+ }
	2027	+ });
	2028	+ presetpanel.add(diffusesheen);
	2029	+
	2030	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2031	+ rough.setToolTipText("Rough metal");
	2032	+ rough.addMouseListener(new MouseAdapter()
	2033	+ {
	2034	+ public void mouseClicked(MouseEvent e)
	2035	+ {
	2036	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2037	+ cMaterial material = object.material;
	2038	+
	2039	+ shininessField.setFloat(material.shininess);
	2040	+ velvetField.setFloat(material.velvet);
	2041	+
	2042	+ materialtouched = true;
	2043	+ applySelf();
	2044	+ }
	2045	+ });
	2046	+ presetpanel.add(rough);
	2047	+
	2048	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2049	+ rough2.setToolTipText("Medium metal");
	2050	+ rough2.addMouseListener(new MouseAdapter()
	2051	+ {
	2052	+ public void mouseClicked(MouseEvent e)
	2053	+ {
	2054	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2055	+ cMaterial material = object.material;
	2056	+
	2057	+ shininessField.setFloat(material.shininess);
	2058	+ lightareaField.setFloat(material.lightarea);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(rough2);
	2065	+
	2066	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2067	+ shini0.setToolTipText("Shiny");
	2068	+ shini0.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ shininessField.setFloat(material.shininess);
	2076	+ lightareaField.setFloat(material.lightarea);
	2077	+
	2078	+ materialtouched = true;
	2079	+ applySelf();
	2080	+ }
	2081	+ });
	2082	+ presetpanel.add(shini0);
	2083	+
	2084	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2085	+ shini1.setToolTipText("Shiny2");
	2086	+ shini1.addMouseListener(new MouseAdapter()
	2087	+ {
	2088	+ public void mouseClicked(MouseEvent e)
	2089	+ {
	2090	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2091	+ cMaterial material = object.material;
	2092	+
	2093	+ shininessField.setFloat(material.shininess);
	2094	+ lightareaField.setFloat(material.lightarea);
	2095	+
	2096	+ materialtouched = true;
	2097	+ applySelf();
	2098	+ }
	2099	+ });
	2100	+ presetpanel.add(shini1);
	2101	+
	2102	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2103	+ shini2.setToolTipText("Shiny3");
	2104	+ shini2.addMouseListener(new MouseAdapter()
	2105	+ {
	2106	+ public void mouseClicked(MouseEvent e)
	2107	+ {
	2108	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2109	+ cMaterial material = object.material;
	2110	+
	2111	+ shininessField.setFloat(material.shininess);
	2112	+ lightareaField.setFloat(material.lightarea);
	2113	+
	2114	+ materialtouched = true;
	2115	+ applySelf();
	2116	+ }
	2117	+ });
	2118	+ presetpanel.add(shini2);
	2119	+
	2120	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2121	+ aniso.setToolTipText("AnisoU");
	2122	+ aniso.addMouseListener(new MouseAdapter()
	2123	+ {
	2124	+ public void mouseClicked(MouseEvent e)
	2125	+ {
	2126	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2127	+ cMaterial material = object.material;
	2128	+
	2129	+ anisoField.setFloat(material.aniso);
	2130	+ anisoVField.setFloat(material.anisoV);
	2131	+
	2132	+ materialtouched = true;
	2133	+ applySelf();
	2134	+ }
	2135	+ });
	2136	+ presetpanel.add(aniso);
	2137	+
	2138	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2139	+ aniso2.setToolTipText("AnisoV");
	2140	+ aniso2.addMouseListener(new MouseAdapter()
	2141	+ {
	2142	+ public void mouseClicked(MouseEvent e)
	2143	+ {
	2144	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2145	+ cMaterial material = object.material;
	2146	+
	2147	+ anisoField.setFloat(material.aniso);
	2148	+ anisoVField.setFloat(material.anisoV);
	2149	+
	2150	+ materialtouched = true;
	2151	+ applySelf();
	2152	+ }
	2153	+ });
	2154	+ presetpanel.add(aniso2);
	2155	+
	2156	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2157	+ aniso3.setToolTipText("AnisoUV");
	2158	+ aniso3.addMouseListener(new MouseAdapter()
	2159	+ {
	2160	+ public void mouseClicked(MouseEvent e)
	2161	+ {
	2162	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2163	+ cMaterial material = object.material;
	2164	+
	2165	+ anisoField.setFloat(material.aniso);
	2166	+ anisoVField.setFloat(material.anisoV);
	2167	+
	2168	+ materialtouched = true;
	2169	+ applySelf();
	2170	+ }
	2171	+ });
	2172	+ presetpanel.add(aniso3);
	2173	+
	2174	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2175	+ velvet0.setToolTipText("Velvet");
	2176	+ velvet0.addMouseListener(new MouseAdapter()
	2177	+ {
	2178	+ public void mouseClicked(MouseEvent e)
	2179	+ {
	2180	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2181	+ cMaterial material = object.material;
	2182	+
	2183	+ diffusenessField.setFloat(material.factor);
	2184	+ selfshadowField.setFloat(material.diffuseness);
	2185	+ sheenField.setFloat(material.sheen);
	2186	+ shininessField.setFloat(material.shininess);
	2187	+ velvetField.setFloat(material.velvet);
	2188	+ shiftField.setFloat(material.shift);
	2189	+
	2190	+ materialtouched = true;
	2191	+ applySelf();
	2192	+ }
	2193	+ });
	2194	+ presetpanel.add(velvet0);
	2195	+
	2196	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2197	+ bump0.setToolTipText("Bump texture");
	2198	+ bump0.addMouseListener(new MouseAdapter()
	2199	+ {
	2200	+ public void mouseClicked(MouseEvent e)
	2201	+ {
	2202	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2203	+ cMaterial material = object.material;
	2204	+
	2205	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2206	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2207	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2208	+
	2209	+ materialtouched = true;
	2210	+ applySelf();
	2211	+ }
	2212	+ });
	2213	+ presetpanel.add(bump0);
	2214	+
	2215	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2216	+ borderShader.setToolTipText("Border fade");
	2217	+ borderShader.addMouseListener(new MouseAdapter()
	2218	+ {
	2219	+ public void mouseClicked(MouseEvent e)
	2220	+ {
	2221	+ borderfadeField.setFloat(0.5);
	2222	+ opacityField.setFloat(0.75);
	2223	+
	2224	+ materialtouched = true;
	2225	+ applySelf();
	2226	+ }
	2227	+ });
	2228	+ presetpanel.add(borderShader);
	2229	+
	2230	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2231	+ halo.setToolTipText("Halo");
	2232	+ halo.addMouseListener(new MouseAdapter()
	2233	+ {
	2234	+ public void mouseClicked(MouseEvent e)
	2235	+ {
	2236	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2237	+ cMaterial material = object.material;
	2238	+
	2239	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2240	+
	2241	+ materialtouched = true;
	2242	+ applySelf();
	2243	+ }
	2244	+ });
	2245	+ presetpanel.add(halo);
	2246	+
	2247	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2248	+ candle.setToolTipText("Candle");
	2249	+ candle.addMouseListener(new MouseAdapter()
	2250	+ {
	2251	+ public void mouseClicked(MouseEvent e)
	2252	+ {
	2253	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2254	+ cMaterial material = object.material;
	2255	+
	2256	+ subsurfaceField.setFloat(material.subsurface);
	2257	+ shadowbiasField.setFloat(material.shadowbias);
	2258	+ ambientField.setFloat(material.ambient);
	2259	+ specularField.setFloat(material.specular);
	2260	+ lightareaField.setFloat(material.lightarea);
	2261	+ shininessField.setFloat(material.shininess);
	2262	+
	2263	+ materialtouched = true;
	2264	+ applySelf();
	2265	+ }
	2266	+ });
	2267	+ presetpanel.add(candle);
	2268	+
	2269	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2270	+ shadowShader.setToolTipText("Shadow");
	2271	+ shadowShader.addMouseListener(new MouseAdapter()
	2272	+ {
	2273	+ public void mouseClicked(MouseEvent e)
	2274	+ {
	2275	+ diffuseField.setFloat(0.001);
	2276	+ ambientField.setFloat(0.001);
	2277	+ cameraField.setFloat(0.001);
	2278	+ specularField.setFloat(0.001);
	2279	+ fakedepthField.setFloat(0.001);
	2280	+ opacityField.setFloat(0.6);
	2281	+
	2282	+ materialtouched = true;
	2283	+ applySelf();
	2284	+ }
	2285	+ });
	2286	+ presetpanel.add(shadowShader);
	2287	+
	2288	+ cGridBag panel = new cGridBag().setVertical(true);
	2289	+
	2290	+ presetpanel.preferredWidth = 1;
	2291	+
	2292	+ materialpanel.add(presetpanel);
	2293	+ materialpanel.add(panel);
	2294	+
	2295	+ panel.preferredWidth = 8;
	2296	+
	2297	+ /*
1433	2298	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1434	2299	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1435		- */
	2300	+ */
1436	2301
1437	2302	cGridBag editBar = new cGridBag().setVertical(false);
1438	2303
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	2304	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2305	+ createMaterialButton.setToolTipText("Create material");
1440	2306
1441	2307	/*
1442	2308	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	2309	*/
1444	2310
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);
	2311	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2312	+ clearMaterialButton.setToolTipText("Clear material");
	2313	+
	2314	+ if (Globals.ADVANCED)
	2315	+ {
	2316	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2317	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2318	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2319	+ }
1449	2320
	2321	+ editBar.preferredHeight = 15;
	2322	+
1450	2323	panel.add(editBar);
1451	2324
1452	2325	/**/
..	..	@@ -1458,45 +2331,61 @@
1458	2331	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1459	2332
1460	2333	cGridBag colorSection = new cGridBag().setVertical(true);
	2334	+
	2335	+ cGridBag huepanel = new cGridBag();
	2336	+ cGridBag huelabel = new cGridBag();
	2337	+ cLabel hue = GetLabel("icons/hue.png", false);
	2338	+ hue.fit = true;
	2339	+
	2340	+ hue.addMouseListener(new MouseAdapter()
	2341	+ {
	2342	+ public void mousePressed(MouseEvent e)
	2343	+ {
	2344	+ int x = e.getX();
	2345	+
	2346	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2347	+ }
	2348	+ });
	2349	+
	2350	+ huelabel.add(hue);
	2351	+ huelabel.preferredWidth = 20;
	2352	+ huepanel.add(new cGridBag()); // Label
	2353	+ huepanel.add(huelabel); // Field/slider
	2354	+
	2355	+ huepanel.preferredHeight = 7;
	2356	+
	2357	+ colorSection.add(huepanel);
1461	2358
1462	2359	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);
	2360	+
	2361	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2362	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2363	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2364	+
1466	2365	//colorField.preferredWidth = 200;
1467	2366	colorSection.add(color);
1468	2367
1469	2368	cGridBag modulation = new cGridBag();
1470	2369	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1471	2370	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2371	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1473	2372	colorSection.add(modulation);
1474	2373
	2374	+ cGridBag opacity = new cGridBag();
	2375	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2376	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2377	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2378	+ colorSection.add(opacity);
	2379	+
	2380	+ colorSection.add(GetSeparator());
	2381	+
1475	2382	cGridBag texture = new cGridBag();
1476	2383	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1477	2384	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478	2385	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479	2386	colorSection.add(texture);
1480	2387
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());
	2388	+ panel.add(GetSeparator());
1500	2389
1501	2390	panel.add(colorSection);
1502	2391
..	..	@@ -1546,7 +2435,13 @@
1546	2435	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1547	2436	diffuseSection.add(fakedepth);
1548	2437
1549		- panel.add(new JSeparator());
	2438	+ cGridBag shadowbias = new cGridBag();
	2439	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2440	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2441	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2442	+ diffuseSection.add(shadowbias);
	2443	+
	2444	+ panel.add(GetSeparator());
1550	2445
1551	2446	panel.add(diffuseSection);
1552	2447
..	..	@@ -1596,42 +2491,48 @@
1596	2491	// aConstraints.gridy += 1;
1597	2492	// aConstraints.gridwidth = 1;
1598	2493
	2494	+ cGridBag anisoU = new cGridBag();
	2495	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2496	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2497	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2498	+ specularSection.add(anisoU);
1599	2499
1600		- panel.add(new JSeparator());
	2500	+ cGridBag anisoV = new cGridBag();
	2501	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2502	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2503	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2504	+ specularSection.add(anisoV);
	2505	+
	2506	+
	2507	+ panel.add(GetSeparator());
1601	2508
1602	2509	panel.add(specularSection);
1603	2510
1604	2511	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1605	2512
1606		- cGridBag globalSection = new cGridBag().setVertical(true);
	2513	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1607	2514
1608	2515	cGridBag camera = new cGridBag();
1609	2516	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1610	2517	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611	2518	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612		- globalSection.add(camera);
	2519	+ colorSection.add(camera);
1613	2520
1614	2521	cGridBag ambient = new cGridBag();
1615	2522	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1616	2523	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617	2524	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1618		- globalSection.add(ambient);
	2525	+ colorSection.add(ambient);
1619	2526
1620	2527	cGridBag backlit = new cGridBag();
1621	2528	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1622	2529	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	2530	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1624		- globalSection.add(backlit);
	2531	+ colorSection.add(backlit);
1625	2532
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());
	2533	+ //panel.add(new JSeparator());
1633	2534
1634		- panel.add(globalSection);
	2535	+ //panel.add(globalSection);
1635	2536
1636	2537	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1637	2538
..	..	@@ -1673,7 +2574,7 @@
1673	2574	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1674	2575	textureSection.add(opacityPower);
1675	2576
1676		- panel.add(new JSeparator());
	2577	+ panel.add(GetSeparator());
1677	2578
1678	2579	panel.add(textureSection);
1679	2580
..	..	@@ -1712,12 +2613,15 @@
1712	2613	opacityPowerField.addChangeListener(this);
1713	2614	/**/
1714	2615
1715		- resetSlidersButton.addActionListener(this);
1716	2616	clearMaterialButton.addActionListener(this);
1717	2617	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	2618	+
	2619	+ if (Globals.ADVANCED)
	2620	+ {
	2621	+ resetSlidersButton.addActionListener(this);
	2622	+ propagateToggle.addItemListener(this);
	2623	+ multiplyToggle.addItemListener(this);
	2624	+ }
1721	2625	}
1722	2626
1723	2627	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1735,8 +2639,9 @@
1735	2639	// 3D models
1736	2640	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1737	2641	{
1738		- lastConverter = new com.jmex.model.converters.MaxToJme();
1739		- LoadFile(filename, lastConverter);
	2642	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2643	+ //LoadFile(filename, lastConverter);
	2644	+ LoadObjFile(filename); // New 3ds loader
1740	2645	continue;
1741	2646	}
1742	2647	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1888,7 +2793,7 @@
1888	2793
1889	2794	//? flashIt = false;
1890	2795	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	2796	+ pane.clickStart(location.x, location.y, 0, 0);
1892	2797	pane.clickEnd(location.x, location.y, 0, true);
1893	2798
1894	2799	if (group.selection.size() == 1)
..	..	@@ -1937,6 +2842,7 @@
1937	2842	e2.printStackTrace();
1938	2843	}
1939	2844	}
	2845	+
1940	2846	LoadJMEThread loadThread;
1941	2847
1942	2848	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +2900,7 @@
1994	2900	//LoadFile0(filename, converter);
1995	2901	}
1996	2902	}
	2903	+
1997	2904	LoadOBJThread loadObjThread;
1998	2905
1999	2906	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2979,19 @@
2072	2979
2073	2980	void LoadObjFile(String fullname)
2074	2981	{
2075		- /*
	2982	+ System.out.println("Loading " + fullname);
	2983	+ /**/
2076	2984	//lastFilename = fullname;
2077	2985	if(loadObjThread == null)
2078	2986	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2987	+ loadObjThread = new LoadOBJThread();
	2988	+ loadObjThread.start();
2081	2989	}
2082	2990
2083	2991	loadObjThread.add(fullname);
2084		- */
	2992	+ /**/
2085	2993
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2994	+ //makeSomething(new FileObject(fullname, true), true);
2088	2995	}
2089	2996
2090	2997	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +3252,11 @@
2345	3252
2346	3253	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	3254	{
2348		- if (GrafreeD.standAlone)
	3255	+ if (Grafreed.standAlone)
2349	3256	{
2350	3257	/**/
2351	3258	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	3259	+ browser.setVisible(true);
2353	3260	String filename = browser.getFile();
2354	3261	if (filename != null && filename.length() > 0)
2355	3262	{
..	..	@@ -2460,6 +3367,7 @@
2460	3367	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	3368	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	3369	}
	3370	+
2463	3371	//cJME.count++;
2464	3372	//cJME.count %= 12;
2465	3373	if (gc)
..	..	@@ -2643,6 +3551,7 @@
2643	3551	}
2644	3552	}
2645	3553	}
	3554	+
2646	3555	cFileSystemPane FSPane;
2647	3556
2648	3557	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2652,7 +3561,7 @@
2652	3561
2653	3562	freezematerial = true;
2654	3563	colorField.setFloat(mat.color);
2655		- modulationField.setFloat(mat.modulation);
	3564	+ saturationField.setFloat(mat.modulation);
2656	3565	metalnessField.setFloat(mat.metalness);
2657	3566	diffuseField.setFloat(mat.diffuse);
2658	3567	specularField.setFloat(mat.specular);
..	..	@@ -2696,11 +3605,14 @@
2696	3605	}
2697	3606	}
2698	3607	}
	3608	+
2699	3609	freezematerial = false;
2700	3610	}
2701	3611
2702	3612	void SetMaterial(Object3D object)
2703	3613	{
	3614	+ latestObject = object;
	3615	+
2704	3616	cMaterial mat = object.material;
2705	3617
2706	3618	if (mat == null)
..	..	@@ -2709,33 +3621,10 @@
2709	3621	return;
2710	3622	}
2711	3623
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		- }
	3624	+ if (multiplyToggle != null)
	3625	+ multiplyToggle.setSelected(mat.multiply);
	3626	+
	3627	+ AllocProjectedVertices(object);
2739	3628
2740	3629	SetMaterial(mat, object.projectedVertices);
2741	3630	}
..	..	@@ -2811,12 +3700,17 @@
2811	3700	// }
2812	3701
2813	3702	/**/
2814		- if (deselect)
	3703	+ if (deselect \|\| child == null)
2815	3704	{
2816	3705	//group.deselectAll();
2817	3706	//freeze = true;
2818	3707	GetTree().clearSelection();
2819	3708	//freeze = false;
	3709	+
	3710	+ if (child == null)
	3711	+ {
	3712	+ return;
	3713	+ }
2820	3714	}
2821	3715
2822	3716	//group.addSelectee(child);
..	..	@@ -2850,6 +3744,17 @@
2850	3744	public void itemStateChanged(ItemEvent event)
2851	3745	{
2852	3746	// System.out.println("Propagate = " + propagate);
	3747	+ if (event.getSource() == pinButton)
	3748	+ {
	3749	+ copy.pinned ^= true;
	3750	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3751	+ {
	3752	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3753	+ copy.CloseUI();
	3754	+ //copy.editWindow.refreshContents();
	3755	+ }
	3756	+ }
	3757	+ else
2853	3758	if (event.getSource() == propagateToggle)
2854	3759	{
2855	3760	propagate ^= true;
..	..	@@ -2885,7 +3790,7 @@
2885	3790	cameraView.ToggleDL();
2886	3791	cameraView.repaint();
2887	3792	return;
2888		- } else if (event.getSource() == toggleTextureItem)
	3793	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2889	3794	{
2890	3795	cameraView.ToggleTexture();
2891	3796	// june 2013 copy.HardTouch();
..	..	@@ -2924,9 +3829,9 @@
2924	3829	frame.validate();
2925	3830
2926	3831	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	3832	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2928	3833	{
2929		- cameraView.ToggleRandom();
	3834	+ cameraView.ToggleSwitch();
2930	3835	cameraView.repaint();
2931	3836	return;
2932	3837	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2954,12 +3859,17 @@
2954	3859	} else if (event.getSource() == liveCB)
2955	3860	{
2956	3861	copy.live ^= true;
	3862	+ objEditor.refreshContents(true); // To show item colors
	3863	+ return;
	3864	+ } else if (event.getSource() == selectableCB)
	3865	+ {
	3866	+ copy.dontselect ^= true;
2957	3867	return;
2958	3868	} else if (event.getSource() == hideCB)
2959	3869	{
2960	3870	copy.hide ^= true;
2961	3871	copy.Touch(); // display list issue
2962		- objEditor.refreshContents();
	3872	+ objEditor.refreshContents(true); // To show item colors
2963	3873	return;
2964	3874	} else if (event.getSource() == link2masterCB)
2965	3875	{
..	..	@@ -2969,6 +3879,7 @@
2969	3879	if (event.getSource() == randomCB)
2970	3880	{
2971	3881	copy.random ^= true;
	3882	+ objEditor.refreshContents();
2972	3883	return;
2973	3884	}
2974	3885	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3903,9 @@
2992	3903
2993	3904	public void actionPerformed(ActionEvent event)
2994	3905	{
	3906	+ Object source = event.getSource();
2995	3907	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3908	+ if (source == okbutton)
2997	3909	{
2998	3910	textpanel.setVisible(false);
2999	3911	textpanel.remove(textarea);
..	..	@@ -3005,7 +3917,7 @@
3005	3917	textarea = null;
3006	3918	textpanel = null;
3007	3919	}
3008		- if (event.getSource() == cancelbutton)
	3920	+ if (source == cancelbutton)
3009	3921	{
3010	3922	textpanel.setVisible(false);
3011	3923	textpanel.remove(textarea);
..	..	@@ -3017,50 +3929,50 @@
3017	3929	//applySelf();
3018	3930	//client.refreshEditWindow();
3019	3931	//refreshContents();
3020		- if (event.getSource() == nameField)
	3932	+ if (source == nameField)
3021	3933	{
3022	3934	//System.out.println("ObjEditor " + event);
3023	3935	applySelf0(true);
3024	3936	//parent.applySelf();
3025		- objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3937	+ // conflicts with requestFocus objEditor.refreshContents();
	3938	+ } else if (source == resetButton)
3027	3939	{
3028	3940	CameraPane.fullreset = true;
3029	3941	copy.Reset(); // ResetMeshes();
3030	3942	copy.Touch();
3031	3943	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3944	+ } else if (source == stepItem)
3033	3945	{
3034	3946	//cameraView.ONESTEP = true;
3035	3947	Globals.ONESTEP = true;
3036	3948	cameraView.repaint();
3037	3949	return;
3038		- } else if (event.getSource() == stepButton)
	3950	+ } else if (source == stepButton)
3039	3951	{
3040	3952	copy.Step();
3041	3953	copy.Touch();
3042	3954	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3955	+ } else if (source == slowerButton)
3044	3956	{
3045	3957	copy.Slower();
3046	3958	copy.Touch();
3047	3959	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3960	+ } else if (source == fasterButton)
3049	3961	{
3050	3962	copy.Faster();
3051	3963	copy.Touch();
3052	3964	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3965	+ } else if (source == remarkButton)
3054	3966	{
3055	3967	copy.Remark();
3056	3968	copy.Touch();
3057	3969	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3970	+ } else if (source == stepAllButton)
3059	3971	{
3060	3972	copy.StepAll();
3061	3973	copy.Touch();
3062	3974	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3975	+ } else if (source == resetAllButton)
3064	3976	{
3065	3977	//CameraPane.fullreset = true;
3066	3978	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +4005,79 @@
3093	4005	// Close();
3094	4006	// }
3095	4007	// else
3096		- if (event.getSource() == resetSlidersButton)
	4008	+ if (source == resetSlidersButton)
3097	4009	{
3098	4010	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	4011	+ } else if (source == clearMaterialButton)
3100	4012	{
3101	4013	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	4014	+ } else if (source == createMaterialButton)
3103	4015	{
3104	4016	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	4017	+ } else if (source == clearPanelButton)
3106	4018	{
3107	4019	copy.ClearUI();
3108	4020	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	4021	+ } else if (source == importGFDItem)
	4022	+ {
	4023	+ ImportGFD();
	4024	+ } else
	4025	+ if (source == importVRMLX3DItem)
	4026	+ {
	4027	+ ImportVRMLX3D();
	4028	+ } else
	4029	+ if (source == import3DSItem)
	4030	+ {
	4031	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4032	+ } else
	4033	+ if (source == importOBJItem)
	4034	+ {
	4035	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4036	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4037	+ browser.setVisible(true);
	4038	+ String filename = browser.getFile();
	4039	+ if (filename != null && filename.length() > 0)
	4040	+ {
	4041	+ String fullname = browser.getDirectory() + filename;
	4042	+ makeSomething(ReadOBJ(fullname), true);
	4043	+ }
	4044	+ } else
	4045	+ if (source == closeItem)
3115	4046	{
3116	4047	Close();
3117	4048	//return true;
3118		- } else if (event.getSource() == loadItem)
	4049	+ } else if (source == openItem)
3119	4050	{
3120		- load();
	4051	+ Open();
3121	4052	//return true;
3122		- } else if (event.getSource() == saveItem)
	4053	+ } else if (source == newItem)
	4054	+ {
	4055	+ New();
	4056	+ } else if (source == saveItem)
3123	4057	{
3124	4058	save();
3125	4059	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	4060	+ } else if (source == saveAsItem)
3127	4061	{
3128	4062	saveAs();
3129	4063	//return true;
3130		- } else if (event.getSource() == reexportItem)
	4064	+ } else if (source == reexportItem)
3131	4065	{
3132	4066	reexport();
3133	4067	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	4068	+ } else if (source == exportAsItem)
3135	4069	{
3136	4070	export();
3137	4071	//return true;
3138		- } else if (event.getSource() == povItem)
	4072	+ } else if (source == povItem)
3139	4073	{
3140	4074	generatePOV();
3141	4075	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	4076	+ } else if (event.getSource() == archiveItem)
	4077	+ {
	4078	+ cTools.Archive(frame);
	4079	+ return;
	4080	+ } else if (source == zBufferItem)
3143	4081	{
3144	4082	try
3145	4083	{
..	..	@@ -3161,21 +4099,8 @@
3161	4099	cameraView.repaint();
3162	4100	//return true;
3163	4101	}
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)
	4102	+ */ else // combos...
	4103	+ if (source == texresMenu)
3179	4104	{
3180	4105	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	4106	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +4112,479 @@
3187	4112	}
3188	4113	}
3189	4114
	4115	+ void New()
	4116	+ {
	4117	+ while (copy.Size() > 1)
	4118	+ {
	4119	+ copy.remove(1);
	4120	+ }
	4121	+
	4122	+ ResetModel();
	4123	+ objEditor.refreshContents();
	4124	+ }
	4125	+
	4126	+ static public byte[] Compress(Object3D o)
	4127	+ {
	4128	+ // Slower to actually compress.
	4129	+ try
	4130	+ {
	4131	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4132	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4133	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4134	+
	4135	+ Object3D parent = o.parent;
	4136	+ o.parent = null;
	4137	+
	4138	+ out.writeObject(o);
	4139	+
	4140	+ o.parent = parent;
	4141	+
	4142	+ out.flush();
	4143	+
	4144	+ baos //zstream
	4145	+ .close();
	4146	+ out.close();
	4147	+
	4148	+ byte[] bytes = baos.toByteArray();
	4149	+
	4150	+ System.out.println("save #bytes = " + bytes.length);
	4151	+ return bytes;
	4152	+ } catch (Exception e)
	4153	+ {
	4154	+ System.err.println(e);
	4155	+ return null;
	4156	+ }
	4157	+ }
	4158	+
	4159	+ static public Object Uncompress(byte[] bytes)
	4160	+ {
	4161	+ System.out.println("restore #bytes = " + bytes.length);
	4162	+ try
	4163	+ {
	4164	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4165	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4166	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4167	+ Object obj = in.readObject();
	4168	+
	4169	+ bais //istream
	4170	+ .close();
	4171	+ in.close();
	4172	+
	4173	+ return obj;
	4174	+ } catch (Exception e)
	4175	+ {
	4176	+ System.err.println(e);
	4177	+ return null;
	4178	+ }
	4179	+ }
	4180	+
	4181	+ static public Object clone(Object o)
	4182	+ {
	4183	+ try
	4184	+ {
	4185	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4186	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4187	+
	4188	+ out.writeObject(o);
	4189	+
	4190	+ out.flush();
	4191	+ out.close();
	4192	+
	4193	+ byte[] bytes = baos.toByteArray();
	4194	+
	4195	+ System.out.println("clone = " + bytes.length);
	4196	+
	4197	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4198	+ ObjectInputStream in = new ObjectInputStream(bais);
	4199	+ Object obj = in.readObject();
	4200	+ in.close();
	4201	+
	4202	+ return obj;
	4203	+ } catch (Exception e)
	4204	+ {
	4205	+ System.err.println(e);
	4206	+ return null;
	4207	+ }
	4208	+ }
	4209	+
	4210	+ cRadio GetCurrentTab()
	4211	+ {
	4212	+ cRadio ab;
	4213	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4214	+ {
	4215	+ ab = (cRadio)e.nextElement();
	4216	+ if(ab.GetObject() == copy)
	4217	+ {
	4218	+ return ab;
	4219	+ }
	4220	+ }
	4221	+
	4222	+ return null;
	4223	+ }
	4224	+
	4225	+
	4226	+ public void Save()
	4227	+ {
	4228	+ //Save(true);
	4229	+ Replace();
	4230	+ SetVersionStates();
	4231	+ }
	4232	+
	4233	+ private boolean Equal(byte[] compress, byte[] name)
	4234	+ {
	4235	+ if (compress.length != name.length)
	4236	+ {
	4237	+ return false;
	4238	+ }
	4239	+
	4240	+ for (int i=compress.length; --i>=0;)
	4241	+ {
	4242	+ if (compress[i] != name[i])
	4243	+ return false;
	4244	+ }
	4245	+
	4246	+ return true;
	4247	+ }
	4248	+
	4249	+ void DeleteVersion()
	4250	+ {
	4251	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4252	+ {
	4253	+ copy.versionlist[i] = copy.versionlist[i+1];
	4254	+ }
	4255	+
	4256	+ if (copy.versionlist[copy.versionindex] == null)
	4257	+ copy.versionindex -= 1;
	4258	+
	4259	+ if (copy.versionindex != -1)
	4260	+ CopyChanged();
	4261	+
	4262	+ SetVersionStates();
	4263	+ }
	4264	+
	4265	+ public boolean Save(boolean user)
	4266	+ {
	4267	+ System.err.println("Save");
	4268	+ Replace();
	4269	+
	4270	+ //cRadio tab = GetCurrentTab();
	4271	+
	4272	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4273	+
	4274	+ boolean thesame = false;
	4275	+
	4276	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4277	+// {
	4278	+// thesame = true;
	4279	+// }
	4280	+
	4281	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4282	+ if (!thesame)
	4283	+ {
	4284	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4285	+ {
	4286	+ copy.versionlist[i] = copy.versionlist[i-1];
	4287	+ }
	4288	+
	4289	+ //tab.user[tab.versionindex] = user;
	4290	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4291	+
	4292	+ copy.versionlist[++copy.versionindex] = compress;
	4293	+
	4294	+ // if (increment)
	4295	+ // tab.versionindex++;
	4296	+ }
	4297	+
	4298	+ //copy.RestoreBigData(versiontable);
	4299	+
	4300	+ //assert(hashtable.isEmpty());
	4301	+
	4302	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4303	+// {
	4304	+// //tab.user[i] = false;
	4305	+// copy.versionlist[i] = null;
	4306	+// }
	4307	+
	4308	+ SetVersionStates();
	4309	+
	4310	+ // test save
	4311	+ if (false)
	4312	+ {
	4313	+ try
	4314	+ {
	4315	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4316	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4317	+
	4318	+ p.writeObject(copy);
	4319	+
	4320	+ p.flush();
	4321	+
	4322	+ ostream.close();
	4323	+ } catch (Exception e)
	4324	+ {
	4325	+ e.printStackTrace();
	4326	+ }
	4327	+ }
	4328	+
	4329	+ return !thesame;
	4330	+ }
	4331	+
	4332	+ boolean flashIt = true;
	4333	+
	4334	+ void RefreshSelection()
	4335	+ {
	4336	+ Object3D selection = new Object3D();
	4337	+
	4338	+ for (int i = 0; i < copy.selection.size(); i++)
	4339	+ {
	4340	+ Object3D elem = copy.selection.elementAt(i);
	4341	+
	4342	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4343	+
	4344	+ if (obj == null)
	4345	+ {
	4346	+ copy.selection.remove(i--);
	4347	+ }
	4348	+ else
	4349	+ {
	4350	+ selection.add(obj);
	4351	+ copy.selection.setElementAt(obj, i);
	4352	+ }
	4353	+ }
	4354	+
	4355	+ flashIt = false;
	4356	+ GetTree().clearSelection();
	4357	+ for (int i = 0; i < selection.size(); i++)
	4358	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4359	+ flashIt = true;
	4360	+
	4361	+ //refreshContents(false);
	4362	+ }
	4363	+
	4364	+ void CopyChanged()
	4365	+ {
	4366	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4367	+
	4368	+ SetVersionStates();
	4369	+
	4370	+ boolean temp = CameraPane.SWITCH;
	4371	+ CameraPane.SWITCH = false;
	4372	+
	4373	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4374	+
	4375	+ copy.clear();
	4376	+
	4377	+ copy.skyboxname = obj.skyboxname;
	4378	+ copy.skyboxext = obj.skyboxext;
	4379	+
	4380	+ for (int i=0; i<obj.Size(); i++)
	4381	+ {
	4382	+ copy.add(obj.get(i));
	4383	+ }
	4384	+
	4385	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4386	+
	4387	+ CameraPane.SWITCH = temp;
	4388	+
	4389	+ RefreshSelection();
	4390	+ //assert(hashtable.isEmpty());
	4391	+
	4392	+ copy.Touch();
	4393	+
	4394	+ ResetModel();
	4395	+ copy.HardTouch(); // recompile?
	4396	+
	4397	+ cRadio ab;
	4398	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4399	+ {
	4400	+ ab = (cRadio)e.nextElement();
	4401	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4402	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4403	+ if (test != null)
	4404	+ {
	4405	+ test.editWindow = ab.object.editWindow;
	4406	+ ab.object = test;
	4407	+ }
	4408	+ }
	4409	+
	4410	+ refreshContents(true);
	4411	+ }
	4412	+
	4413	+ cButton previousVersionButton;
	4414	+ cButton restoreButton;
	4415	+ cButton replaceButton;
	4416	+ cButton nextVersionButton;
	4417	+ cButton saveVersionButton;
	4418	+ cButton deleteVersionButton;
	4419	+
	4420	+ boolean muteSlider;
	4421	+
	4422	+ int VersionCount()
	4423	+ {
	4424	+ int count = 0;
	4425	+
	4426	+ for (int i = copy.versionlist.length; --i >= 0;)
	4427	+ {
	4428	+ if (copy.versionlist[i] != null)
	4429	+ count++;
	4430	+ }
	4431	+
	4432	+ return count;
	4433	+ }
	4434	+
	4435	+ void SetVersionStates()
	4436	+ {
	4437	+ //if (true)
	4438	+ // return;
	4439	+
	4440	+ //cRadio tab = GetCurrentTab();
	4441	+
	4442	+ restoreButton.setEnabled(copy.versionindex != -1);
	4443	+ replaceButton.setEnabled(copy.versionindex != -1);
	4444	+
	4445	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4446	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4447	+
	4448	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4449	+ //copy.versionlist[copy.versionindex + 1] != null);
	4450	+
	4451	+ muteSlider = true;
	4452	+ versionSlider.setMinimum(0);
	4453	+ versionSlider.setMaximum(VersionCount() - 1);
	4454	+ versionSlider.setInteger(copy.versionindex);
	4455	+ versionSlider.setEnabled(copy.versionindex != -1);
	4456	+ muteSlider = false;
	4457	+ }
	4458	+
	4459	+ public boolean PreviousVersion()
	4460	+ {
	4461	+ // Option?
	4462	+ Replace();
	4463	+
	4464	+ System.err.println("Undo");
	4465	+
	4466	+ //cRadio tab = GetCurrentTab();
	4467	+
	4468	+ if (copy.versionindex == 0)
	4469	+ {
	4470	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4471	+ return false;
	4472	+ }
	4473	+
	4474	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4475	+// {
	4476	+// if (Save(false))
	4477	+// tab.versionindex -= 1;
	4478	+// else
	4479	+// {
	4480	+// if (tab.versionindex <= 0)
	4481	+// return false;
	4482	+// else
	4483	+// tab.versionindex -= 1;
	4484	+// }
	4485	+// }
	4486	+
	4487	+ copy.versionindex -= 1;
	4488	+
	4489	+ CopyChanged();
	4490	+
	4491	+ return true;
	4492	+ }
	4493	+
	4494	+ public boolean Restore()
	4495	+ {
	4496	+ System.err.println("Restore");
	4497	+
	4498	+ //cRadio tab = GetCurrentTab();
	4499	+
	4500	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4501	+ {
	4502	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4503	+ return false;
	4504	+ }
	4505	+
	4506	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4507	+ CopyChanged();
	4508	+
	4509	+ return true;
	4510	+ }
	4511	+
	4512	+ public boolean Replace()
	4513	+ {
	4514	+ //System.err.println("Replace");
	4515	+
	4516	+ //cRadio tab = GetCurrentTab();
	4517	+
	4518	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4519	+ {
	4520	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4521	+ return false;
	4522	+ }
	4523	+
	4524	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4525	+
	4526	+ return true;
	4527	+ }
	4528	+
	4529	+ public void NextVersion()
	4530	+ {
	4531	+ // Option?
	4532	+ Replace();
	4533	+
	4534	+ //cRadio tab = GetCurrentTab();
	4535	+
	4536	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4537	+ {
	4538	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4539	+ return;
	4540	+ }
	4541	+
	4542	+ copy.versionindex += 1;
	4543	+
	4544	+ CopyChanged();
	4545	+
	4546	+ //if (!tab.user[tab.versionindex])
	4547	+ // tab.graphs[tab.versionindex] = null;
	4548	+ }
	4549	+
	4550	+ void ImportGFD()
	4551	+ {
	4552	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4553	+ browser.show();
	4554	+ String filename = browser.getFile();
	4555	+ if (filename != null && filename.length() > 0)
	4556	+ {
	4557	+ String fullname = browser.getDirectory() + filename;
	4558	+
	4559	+ //Object3D readobj =
	4560	+ objEditor.ReadGFD(fullname, objEditor);
	4561	+ //makeSomething(readobj);
	4562	+ }
	4563	+ }
	4564	+
	4565	+ void ImportVRMLX3D()
	4566	+ {
	4567	+ if (Grafreed.standAlone)
	4568	+ {
	4569	+ /**/
	4570	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4571	+ browser.show();
	4572	+ String filename = browser.getFile();
	4573	+ if (filename != null && filename.length() > 0)
	4574	+ {
	4575	+ String fullname = browser.getDirectory() + filename;
	4576	+ LoadVRMLX3D(fullname);
	4577	+ }
	4578	+ /**/
	4579	+ }
	4580	+ }
	4581	+
3190	4582	void ToggleAnimation()
3191	4583	{
3192	4584	if (!Globals.ANIMATION)
3193	4585	{
3194	4586	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	4587	+ browser.setVisible(true);
3196	4588	String filename = browser.getFile();
3197	4589	if (filename != null && filename.length() > 0)
3198	4590	{
..	..	@@ -3202,8 +4594,8 @@
3202	4594
3203	4595	Globals.ANIMATION ^= true;
3204	4596
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	4597	+ Grafreed.wav.cursor = 0;
	4598	+ Grafreed.wav.loop = 0;
3207	4599	}
3208	4600	} else
3209	4601	{
..	..	@@ -3224,7 +4616,6 @@
3224	4616	callee.refreshContents();
3225	4617	} else
3226	4618	{
3227		- new Exception().printStackTrace();
3228	4619	System.exit(0);
3229	4620	}
3230	4621	}
..	..	@@ -3254,7 +4645,7 @@
3254	4645	void CreateMaterial()
3255	4646	{
3256	4647	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4648	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	4649	if (copy.selection.size() > 0)
3259	4650	//SetMaterial(copy);
3260	4651	{
..	..	@@ -3305,7 +4696,7 @@
3305	4696	assert false;
3306	4697	}
3307	4698
3308		- void EditSelection()
	4699	+ void EditSelection(boolean newWindow)
3309	4700	{
3310	4701	}
3311	4702
..	..	@@ -3313,11 +4704,11 @@
3313	4704	{
3314	4705	copy.ResetBlockLoop(); // temporary problem
3315	4706
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	4707	+ boolean random = CameraPane.SWITCH;
	4708	+ CameraPane.SWITCH = false; // parse everything
3318	4709	copy.ResetDisplayList();
3319	4710	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	4711	+ CameraPane.SWITCH = random;
3321	4712	}
3322	4713
3323	4714	// public void applySelf()
..	..	@@ -3364,7 +4755,7 @@
3364	4755	//copy.material = new cMaterial(copy.GetMaterial());
3365	4756
3366	4757	current.color = (float) colorField.getFloat();
3367		- current.modulation = (float) modulationField.getFloat();
	4758	+ current.modulation = (float) saturationField.getFloat();
3368	4759	current.metalness = (float) metalnessField.getFloat();
3369	4760	current.diffuse = (float) diffuseField.getFloat();
3370	4761	current.specular = (float) specularField.getFloat();
..	..	@@ -3391,6 +4782,36 @@
3391	4782	{
3392	4783	//System.out.println("Propagate = " + propagate);
3393	4784	copy.UpdateMaterial(anchor, current, propagate);
	4785	+
	4786	+ if (copy.material != null)
	4787	+ {
	4788	+ cMaterial mat = copy.material;
	4789	+
	4790	+ colorField.SetToolTipValue((mat.color));
	4791	+ saturationField.SetToolTipValue((mat.modulation));
	4792	+ metalnessField.SetToolTipValue((mat.metalness));
	4793	+ diffuseField.SetToolTipValue((mat.diffuse));
	4794	+ specularField.SetToolTipValue((mat.specular));
	4795	+ shininessField.SetToolTipValue((mat.shininess));
	4796	+ shiftField.SetToolTipValue((mat.shift));
	4797	+ ambientField.SetToolTipValue((mat.ambient));
	4798	+ lightareaField.SetToolTipValue((mat.lightarea));
	4799	+ diffusenessField.SetToolTipValue((mat.factor));
	4800	+ velvetField.SetToolTipValue((mat.velvet));
	4801	+ sheenField.SetToolTipValue((mat.sheen));
	4802	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4803	+ backlitField.SetToolTipValue((mat.bump));
	4804	+ anisoField.SetToolTipValue((mat.aniso));
	4805	+ anisoVField.SetToolTipValue((mat.anisoV));
	4806	+ cameraField.SetToolTipValue((mat.cameralight));
	4807	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4808	+ shadowField.SetToolTipValue((mat.shadow));
	4809	+ textureField.SetToolTipValue((mat.texture));
	4810	+ opacityField.SetToolTipValue((mat.opacity));
	4811	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4812	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4813	+ }
	4814	+
3394	4815	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	4816	{
3396	4817	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3419,9 +4840,28 @@
3419	4840	//copy.Touch();
3420	4841	}
3421	4842
	4843	+ cNumberSlider versionSlider;
	4844	+
3422	4845	public void stateChanged(ChangeEvent e)
3423	4846	{
3424	4847	// assert(false);
	4848	+ if (e.getSource() == versionSlider)
	4849	+ {
	4850	+ if (muteSlider)
	4851	+ return;
	4852	+
	4853	+ Replace();
	4854	+
	4855	+ int version = versionSlider.getInteger();
	4856	+
	4857	+ if (version != -1 && copy.versionlist[version] != null)
	4858	+ {
	4859	+ copy.versionindex = version;
	4860	+ CopyChanged();
	4861	+ }
	4862	+
	4863	+ return;
	4864	+ }
3425	4865
3426	4866	if (freezematerial)
3427	4867	{
..	..	@@ -3457,6 +4897,12 @@
3457	4897	{
3458	4898	//System.out.println("stateChanged = " + this);
3459	4899	materialtouched = true;
	4900	+
	4901	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4902	+ {
	4903	+ saturationField.setFloat(1);
	4904	+ }
	4905	+
3460	4906	applySelf();
3461	4907	//System.out.println("this = " + this);
3462	4908	//System.out.println("PARENT = " + parent);
..	..	@@ -3506,7 +4952,7 @@
3506	4952	}
3507	4953
3508	4954	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4955	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	4956	}
3511	4957
3512	4958	void SnapObject()
..	..	@@ -3756,6 +5202,7 @@
3756	5202	{
3757	5203	if (GetTree() != null)
3758	5204	{
	5205	+ GetTree().revalidate();
3759	5206	GetTree().repaint();
3760	5207	}
3761	5208
..	..	@@ -3764,12 +5211,19 @@
3764	5211	ctrlPanel.validate(); // ? new
3765	5212	ctrlPanel.repaint();
3766	5213	}
	5214	+
	5215	+ if (previousVersionButton != null && copy.versionlist != null)
	5216	+ SetVersionStates();
	5217	+
	5218	+ cameraView.requestFocusInWindow();
3767	5219	}
3768	5220
3769	5221	static TweenManager tweenManager = new TweenManager();
3770	5222
3771	5223	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	5224	{
	5225	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5226	+ Save();
3773	5227	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	5228	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	5229	// if (thing instanceof GenericJointDemo)
..	..	@@ -3793,7 +5247,7 @@
3793	5247	// group = (Composite) group.get(0);
3794	5248	// }
3795	5249
3796		- System.out.println("makeSomething of " + thing);
	5250	+ //System.out.println("makeSomething of " + thing);
3797	5251
3798	5252	/*
3799	5253	if (deselect && jList != null)
..	..	@@ -3856,6 +5310,12 @@
3856	5310	{
3857	5311	ResetModel();
3858	5312	Select(thing.GetTreePath(), true, false); // unselect... false);
	5313	+
	5314	+ if (thing.Size() == 0)
	5315	+ {
	5316	+ //EditSelection(false);
	5317	+ }
	5318	+
3859	5319	refreshContents();
3860	5320	}
3861	5321
..	..	@@ -3973,6 +5433,7 @@
3973	5433	}
3974	5434	}
3975	5435	}
	5436	+
3976	5437	LoadGFDThread loadGFDThread;
3977	5438
3978	5439	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +5453,10 @@
3992	5453
3993	5454	try
3994	5455	{
	5456	+ // Try compressed version first.
3995	5457	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5458	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5459	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	5460
3998	5461	readobj = (Object3D) p.readObject();
3999	5462	istream.close();
..	..	@@ -4001,7 +5464,22 @@
4001	5464	readobj.ResetDisplayList();
4002	5465	} catch (Exception e)
4003	5466	{
4004		- e.printStackTrace();
	5467	+ if (!e.toString().contains("GZIP"))
	5468	+ e.printStackTrace();
	5469	+
	5470	+ try
	5471	+ {
	5472	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5473	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5474	+
	5475	+ readobj = (Object3D) p.readObject();
	5476	+ istream.close();
	5477	+
	5478	+ readobj.ResetDisplayList();
	5479	+ } catch (Exception e2)
	5480	+ {
	5481	+ e2.printStackTrace();
	5482	+ }
4005	5483	}
4006	5484	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	5485	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +5525,12 @@
4047	5525
4048	5526	void LoadIt(Object obj)
4049	5527	{
	5528	+ if (obj == null)
	5529	+ {
	5530	+ // Invalid file
	5531	+ return;
	5532	+ }
	5533	+
4050	5534	System.out.println("Loaded " + obj);
4051	5535	//new Exception().printStackTrace();
4052	5536	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,10 +5540,14 @@
4056	5540
4057	5541	if (readobj != null)
4058	5542	{
	5543	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5544	+ // Save();
4059	5545	try
4060	5546	{
4061	5547	//readobj.deepCopySelf(copy);
4062	5548	copy.clear(); // june 2014
	5549	+ copy.skyboxname = readobj.skyboxname;
	5550	+ copy.skyboxext = readobj.skyboxext;
4063	5551	for (int i = 0; i < readobj.size(); i++)
4064	5552	{
4065	5553	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4100,6 +5588,7 @@
4100	5588	}
4101	5589	} catch (ClassCastException e)
4102	5590	{
	5591	+ e.printStackTrace();
4103	5592	assert (false);
4104	5593	Composite c = (Composite) copy;
4105	5594	c.children.clear();
..	..	@@ -4110,17 +5599,32 @@
4110	5599	c.addChild(csg);
4111	5600	}
4112	5601
	5602	+ copy.versionlist = readobj.versionlist;
	5603	+ copy.versionindex = readobj.versionindex;
	5604	+ copy.versiontable = readobj.versiontable;
	5605	+
	5606	+ if (copy.versionlist == null)
	5607	+ {
	5608	+ // Backward compatibility
	5609	+ copy.versionlist = new Object3D[100];
	5610	+ copy.versionindex = -1;
	5611	+
	5612	+ //Save(true);
	5613	+ }
	5614	+
	5615	+ //? SetUndoStates();
	5616	+
4113	5617	ResetModel();
4114	5618	copy.HardTouch(); // recompile?
4115	5619	refreshContents();
4116	5620	}
4117	5621	}
4118	5622
4119		- void load() // throws ClassNotFoundException
	5623	+ void Open() // throws ClassNotFoundException
4120	5624	{
4121		- if (GrafreeD.standAlone)
	5625	+ if (Grafreed.standAlone)
4122	5626	{
4123		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5627	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4124	5628	browser.show();
4125	5629	String filename = browser.getFile();
4126	5630	if (filename != null && filename.length() > 0)
..	..	@@ -4197,6 +5701,8 @@
4197	5701
4198	5702	void save()
4199	5703	{
	5704	+ Replace();
	5705	+
4200	5706	if (lastname == null)
4201	5707	{
4202	5708	return;
..	..	@@ -4205,11 +5711,13 @@
4205	5711	try
4206	5712	{
4207	5713	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5714	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5715	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	5716
4210	5717	p.writeObject(copy);
4211	5718	p.flush();
4212	5719
	5720	+ zstream.close();
4213	5721	ostream.close();
4214	5722
4215	5723	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4217,19 +5725,23 @@
4217	5725	//ps.print(buffer.toString());
4218	5726	} catch (IOException e)
4219	5727	{
	5728	+ e.printStackTrace();
4220	5729	}
4221	5730	}
	5731	+
4222	5732	String lastname;
4223	5733
4224	5734	void saveAs()
4225	5735	{
4226		- if (GrafreeD.standAlone)
	5736	+ if (Grafreed.standAlone)
4227	5737	{
4228	5738	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	5739	browser.setVisible(true);
4230	5740	String filename = browser.getFile();
4231	5741	if (filename != null && filename.length() > 0)
4232	5742	{
	5743	+ if (!filename.endsWith(".gfd"))
	5744	+ filename += ".gfd";
4233	5745	lastname = browser.getDirectory() + filename;
4234	5746	save();
4235	5747	}
..	..	@@ -4328,13 +5840,13 @@
4328	5840	try
4329	5841	{
4330	5842	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5843	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5844	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	5845
4334	5846	Object3D objectparent = obj.parent;
4335	5847	obj.parent = null;
4336	5848
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5849	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	5850
4339	5851	obj.parent = objectparent;
4340	5852
..	..	@@ -4346,8 +5858,8 @@
4346	5858	p.writeObject(object);
4347	5859	p.flush();
4348	5860
	5861	+ zstream.close();
4349	5862	ostream.close();
4350		- // zstream.close();
4351	5863
4352	5864	// group.selection.get(0).parent = parent;
4353	5865	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +5880,7 @@
4368	5880	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	5881	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	5882	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	5883	+ if (Grafreed.standAlone)
4372	5884	{
4373	5885	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	5886	browser.show();
..	..	@@ -4394,19 +5906,18 @@
4394	5906	Object3D client;
4395	5907	Object3D copy;
4396	5908	MenuBar menuBar;
4397		- Menu windowMenu;
4398		- MenuItem loadItem;
	5909	+ Menu fileMenu;
	5910	+ MenuItem newItem;
	5911	+ MenuItem openItem;
4399	5912	MenuItem saveItem;
4400	5913	MenuItem saveAsItem;
4401	5914	MenuItem exportAsItem;
4402	5915	MenuItem reexportItem;
4403	5916	MenuItem povItem;
4404	5917	MenuItem closeItem;
4405		- Menu cameraMenu;
	5918	+
4406	5919	CheckboxMenuItem zBufferItem;
4407	5920	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	5921	MenuItem stepItem;
4411	5922	CheckboxMenuItem toggleLiveItem;
4412	5923	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,25 +5928,40 @@
4417	5928	CheckboxMenuItem toggleFootContactItem;
4418	5929	CheckboxMenuItem toggleDLItem;
4419	5930	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	5931	+ CheckboxMenuItem toggleSwitchItem;
4421	5932	CheckboxMenuItem toggleRootItem;
4422	5933	CheckboxMenuItem animationItem;
	5934	+ MenuItem archiveItem;
4423	5935	CheckboxMenuItem toggleHandleItem;
4424	5936	CheckboxMenuItem togglePaintItem;
4425	5937	JSplitPane mainPanel;
4426	5938	JScrollPane scrollpane;
	5939	+
4427	5940	JPanel toolbarPanel;
4428		- JPanel treePanel;
	5941	+
	5942	+ cGridBag treePanel;
	5943	+
4429	5944	JPanel radioPanel;
4430	5945	ButtonGroup buttonGroup;
4431		- cGridBag ctrlPanel;
	5946	+
	5947	+ cGridBag toolboxPanel;
	5948	+ cGridBag skyboxPanel;
4432	5949	cGridBag materialPanel;
	5950	+ cGridBag ctrlPanel;
	5951	+
4433	5952	JScrollPane infoPanel;
	5953	+
4434	5954	cGridBag optionsPanel;
	5955	+
4435	5956	JTabbedPane objectPanel;
	5957	+ boolean materialFlushed;
	5958	+ Object3D latestObject;
	5959	+
4436	5960	cGridBag XYZPanel;
	5961	+
4437	5962	JSplitPane gridPanel;
4438	5963	JSplitPane bigPanel;
	5964	+
4439	5965	cGridBag bigThree;
4440	5966	cGridBag scenePanel;
4441	5967	cGridBag centralPanel;
..	..	@@ -4493,7 +6019,7 @@
4493	6019	JLabel colorLabel;
4494	6020	cNumberSlider colorField;
4495	6021	JLabel modulationLabel;
4496		- cNumberSlider modulationField;
	6022	+ cNumberSlider saturationField;
4497	6023	JLabel metalnessLabel;
4498	6024	cNumberSlider metalnessField;
4499	6025	JLabel diffuseLabel;
..	..	@@ -4524,6 +6050,7 @@
4524	6050	cNumberSlider anisoField;
4525	6051	JLabel anisoVLabel;
4526	6052	cNumberSlider anisoVField;
	6053	+
4527	6054	JLabel cameraLabel;
4528	6055	cNumberSlider cameraField;
4529	6056	JLabel selfshadowLabel;
..	..	@@ -4538,6 +6065,7 @@
4538	6065	cNumberSlider fakedepthField;
4539	6066	JLabel shadowbiasLabel;
4540	6067	cNumberSlider shadowbiasField;
	6068	+
4541	6069	JLabel bumpLabel;
4542	6070	cNumberSlider bumpField;
4543	6071	JLabel noiseLabel;
..	..	@@ -4550,8 +6078,13 @@
4550	6078	cNumberSlider fogField;
4551	6079	JLabel opacityPowerLabel;
4552	6080	cNumberSlider opacityPowerField;
4553		- JTree jTree;
	6081	+ cTree jTree;
4554	6082	//ObjectUI parent;
4555	6083
4556	6084	cNumberSlider normalpushField;
	6085	+
	6086	+ private MenuItem importGFDItem;
	6087	+ private MenuItem importVRMLX3DItem;
	6088	+ private MenuItem import3DSItem;
	6089	+ private MenuItem importOBJItem;
4557	6090	}