~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -30,11 +34,87 @@
30	34	iSendInfo
31	35	//KeyListener
32	36	{
	37	+ public cToggleButton pinButton;
33	38	boolean timeline;
34	39	boolean wasFullScreen;
35	40
36	41	GroupEditor callee;
37	42	JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
	53	+
	54	+ cButton GetButton(String name, boolean border)
	55	+ {
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
	64	+ }
	65	+
	66	+ cToggleButton GetToggleButton(String name, boolean border)
	67	+ {
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
	70	+ }
	71	+
	72	+ cCheckBox GetCheckBox(String name, boolean border)
	73	+ {
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
	80	+ try
	81	+ {
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
	98	+ }
	99	+ catch (Exception e)
	100	+ {
	101	+ return null;
	102	+ }
	103	+ }
	104	+
	105	+ BufferedImage GetImage(String name)
	106	+ {
	107	+ try
	108	+ {
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
	112	+ }
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
	117	+ }
38	118
39	119	// SCRIPT
40	120
..	..	@@ -145,7 +225,7 @@
145	225
146	226	objEditor.ctrlPanel.remove(namePanel);
147	227
148		- if (!GroupEditor.allparams)
	228	+ if (!allparams)
149	229	return;
150	230
151	231	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +248,8 @@
168	248	// objEditor.ctrlPanel.remove(remarkButton);
169	249
170	250	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	251	+ objEditor.ctrlPanel.remove(setupPanel2);
	252	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	253	objEditor.ctrlPanel.remove(pushPanel);
173	254	//objEditor.ctrlPanel.remove(fillPanel);
174	255
..	..	@@ -216,6 +297,14 @@
216	297	client = inClient;
217	298	copy = client;
218	299
	300	+// if (copy.versionlist == null)
	301	+// {
	302	+// copy.versionlist = new Object3D[100];
	303	+// copy.versionindex = -1;
	304	+//
	305	+// callee.Save(true);
	306	+// }
	307	+
219	308	// "this" is not called: SetupUI2(objEditor);
220	309	}
221	310
..	..	@@ -229,6 +318,14 @@
229	318	client = inClient;
230	319	copy = client;
231	320
	321	+ if (copy.versionlist == null)
	322	+ {
	323	+ copy.versionlist = new Object3D[100];
	324	+ copy.versionindex = -1;
	325	+
	326	+// Save(true);
	327	+ }
	328	+
232	329	SetupUI2(callee.GetEditor());
233	330	}
234	331
..	..	@@ -243,6 +340,7 @@
243	340	//localCopy.parent = null;
244	341
245	342	frame = new JFrame();
	343	+ frame.setUndecorated(false);
246	344	objEditor = this;
247	345	this.callee = callee;
248	346
..	..	@@ -260,6 +358,14 @@
260	358	copy = localCopy;
261	359	copy.editWindow = this;
262	360
	361	+// if (copy.versionlist == null)
	362	+// {
	363	+// copy.versionlist = new Object3D[100];
	364	+// copy.versionindex = -1;
	365	+//
	366	+// Save(true);
	367	+// }
	368	+
263	369	SetupMenu();
264	370
265	371	//SetupName(objEditor); // new
..	..	@@ -273,28 +379,49 @@
273	379	return frame.action(event, obj);
274	380	}
275	381
	382	+ // Cannot work without static
	383	+ static boolean allparams = true;
	384	+
	385	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	386	+
276	387	void SetupMenu()
277	388	{
278	389	frame.setMenuBar(menuBar = new MenuBar());
279		- menuBar.add(windowMenu = new Menu("File"));
280		- windowMenu.add(loadItem = new MenuItem("Load..."));
281		- windowMenu.add("-");
282		- windowMenu.add(saveItem = new MenuItem("Save"));
283		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	390	+ menuBar.add(fileMenu = new Menu("File"));
	391	+ fileMenu.add(newItem = new MenuItem("New"));
	392	+ fileMenu.add(openItem = new MenuItem("Open..."));
	393	+
	394	+ //oe.menuBar.add(menu = new Menu("Include"));
	395	+ Menu menu = new Menu("Import");
	396	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	397	+ importOBJItem.addActionListener(this);
	398	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	399	+ import3DSItem.addActionListener(this);
	400	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	401	+ importVRMLX3DItem.addActionListener(this);
	402	+ menu.add("-");
	403	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	404	+ importGFDItem.addActionListener(this);
	405	+ fileMenu.add(menu);
	406	+ fileMenu.add("-");
	407	+
	408	+ fileMenu.add(saveItem = new MenuItem("Save"));
	409	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	410	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285		- windowMenu.add("-");
286		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288		- windowMenu.add("-");
	411	+ fileMenu.add("-");
	412	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	413	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	414	+ fileMenu.add("-");
289	415	if (client.parent != null)
290	416	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	417	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	418	} else
293	419	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	420	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	421	}
296	422
297		- loadItem.addActionListener(this);
	423	+ newItem.addActionListener(this);
	424	+ openItem.addActionListener(this);
298	425	saveItem.addActionListener(this);
299	426	saveAsItem.addActionListener(this);
300	427	exportAsItem.addActionListener(this);
..	..	@@ -302,100 +429,102 @@
302	429	//povItem.addActionListener(this);
303	430	closeItem.addActionListener(this);
304	431
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		-
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		-
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		-
322		- if (Globals.ADVANCED)
323		- {
324		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
325		- toggleLiveItem.addItemListener(this);
326		- toggleLiveItem.setState(Globals.isLIVE());
327		-
328		- cameraMenu.add(stepItem = new MenuItem("Step"));
329		- stepItem.addActionListener(this);
330		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
331		- // toggleDLItem.addItemListener(this);
332		- // toggleDLItem.setState(false);
333		-
334		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
335		- toggleRenderItem.addItemListener(this);
336		- toggleRenderItem.setState(!CameraPane.frozen);
337		-
338		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
339		- toggleDebugItem.addItemListener(this);
340		- toggleDebugItem.setState(CameraPane.DEBUG);
341		-
342		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
343		- toggleFrustumItem.addItemListener(this);
344		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
345		-
346		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
347		- toggleFootContactItem.addItemListener(this);
348		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
349		-
350		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
351		- toggleTimelineItem.addItemListener(this);
352		- }
353		-
354		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
355		- toggleSwitchItem.addItemListener(this);
356		- toggleSwitchItem.setState(CameraPane.SWITCH);
357		-
358		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
359		- toggleHandleItem.addItemListener(this);
360		- toggleHandleItem.setState(CameraPane.HANDLES);
361		-
362		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
363		- togglePaintItem.addItemListener(this);
364		- togglePaintItem.setState(CameraPane.PAINTMODE);
365		-
366		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
367		-// toggleRootItem.addItemListener(this);
368		-// toggleRootItem.setState(false);
369		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
370		-// animationItem.addItemListener(this);
371		-// animationItem.setState(CameraPane.ANIMATION);
372		- cameraMenu.add("-");
373		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
374		- editCameraItem.addActionListener(this);
375		-
376	432	objectPanel = new JTabbedPane();
	433	+
	434	+ ChangeListener changeListener = new ChangeListener()
	435	+ {
	436	+ String name;
	437	+
	438	+ public void stateChanged(ChangeEvent changeEvent)
	439	+ {
	440	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	441	+// {
	442	+// if (latestObject != null)
	443	+// {
	444	+// refreshContents(true);
	445	+// SetMaterial(latestObject);
	446	+// }
	447	+//
	448	+// materialFlushed = true;
	449	+// }
	450	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	451	+// {
	452	+// if (listUI.size() == 0)
	453	+// EditSelection(false);
	454	+// }
	455	+
	456	+ if (objectPanel.getSelectedIndex() == 4)
	457	+ {
	458	+ name = copy.skyboxname;
	459	+
	460	+ if (name == null)
	461	+ {
	462	+ name = "";
	463	+ }
	464	+
	465	+ copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	466	+ copy.skyboxext = "jpg";
	467	+ }
	468	+ else
	469	+ {
	470	+ if (name != null)
	471	+ {
	472	+ if (name.equals(""))
	473	+ {
	474	+ copy.skyboxname = null;
	475	+ copy.skyboxext = null;
	476	+ }
	477	+ else
	478	+ {
	479	+ copy.skyboxname = name;
	480	+ }
	481	+ }
	482	+ }
	483	+
	484	+// refreshContents(false); // To refresh Info tab
	485	+ cameraView.repaint();
	486	+ }
	487	+ };
	488	+ objectPanel.addChangeListener(changeListener);
	489	+
377	490	toolbarPanel = new JPanel();
378	491	toolbarPanel.setName("Toolbar");
	492	+
379	493	treePanel = new cGridBag();
380	494	treePanel.setName("Tree");
	495	+
	496	+ editPanel = new cGridBag().setVertical(true);
	497	+ //editPanel.setName("Edit");
	498	+
381	499	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
382		- ctrlPanel.setName("Edit");
383		- materialPanel = new cGridBag().setVertical(true);
384		- materialPanel.setName("Material");
	500	+
	501	+ editCommandsPanel = new cGridBag();
	502	+ editPanel.add(editCommandsPanel);
	503	+ editPanel.add(ctrlPanel);
	504	+
	505	+ toolboxPanel = new cGridBag().setVertical(true);
	506	+ //toolboxPanel.setName("Toolbox");
	507	+
	508	+ skyboxPanel = new cGridBag().setVertical(true);
	509	+
	510	+ materialPanel = new cGridBag().setVertical(false);
	511	+ //materialPanel.setName("Material");
	512	+
385	513	/JTextPane/
386	514	infoarea = createTextPane();
387	515	doc = infoarea.getStyledDocument();
388	516
389	517	infoarea.setEditable(true);
390	518	SetText();
	519	+
391	520	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
392	521	// infoarea.setOpaque(false);
393	522	// //infoarea.setForeground(textcolor);
394	523	// TEXTAREA infoarea.setLineWrap(true);
395	524	// TEXTAREA infoarea.setWrapStyleWord(true);
396	525	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
397		- infoPanel.setPreferredSize(new Dimension(50, 200));
398		- infoPanel.setName("Info");
	526	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	527	+ //infoPanel.setName("Info");
399	528	//infoPanel.setLayout(new BorderLayout());
400	529	//infoPanel.add(createTextPane());
401	530
..	..	@@ -406,7 +535,14 @@
406	535	mainPanel.setDividerSize(9);
407	536	mainPanel.setDividerLocation(0.5); //1.0);
408	537	mainPanel.setResizeWeight(0.5);
409		-
	538	+
	539	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	540	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	541	+ divider.setDividerSize(15);
	542	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	543	+
	544	+ mainPanel.setUI(new BasicSplitPaneUI());
	545	+
410	546	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
411	547	//mainPanel.setLayout(new GridBagLayout());
412	548	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -474,10 +610,10 @@
474	610	e.printStackTrace();
475	611	}
476	612
477		- String selection = infoarea.getText();
478		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
479		- java.awt.datatransfer.Clipboard clipboard =
480		- Toolkit.getDefaultToolkit().getSystemClipboard();
	613	+// String selection = infoarea.getText();
	614	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	615	+// java.awt.datatransfer.Clipboard clipboard =
	616	+// Toolkit.getDefaultToolkit().getSystemClipboard();
481	617	//clipboard.setContents(data, data);
482	618	}
483	619
..	..	@@ -500,13 +636,13 @@
500	636	//SendInfo("Name:", "bold");
501	637	if (sel.GetTextures() != null \|\| debug)
502	638	{
503		- si.SendInfo(sel.toString(), "bold");
	639	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
504	640	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
505	641	if (sel.Size() > 0)
506	642	{
507	643	si.SendInfo("#children = " + sel.Size(), "regular");
508	644	}
509		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	645	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
510	646	if (debug)
511	647	{
512	648	try
..	..	@@ -548,7 +684,7 @@
548	684	}
549	685	if (sel.support != null)
550	686	{
551		- si.SendInfo(" support: " + sel.support, "regular");
	687	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
552	688	}
553	689	if (sel.scriptnode != null)
554	690	{
..	..	@@ -637,21 +773,158 @@
637	773	}
638	774	}
639	775
	776	+//static GraphicsDevice device = GraphicsEnvironment
	777	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	778	+
	779	+ Rectangle keeprect;
	780	+ cRadio radio;
	781	+
	782	+cButton keepButton;
	783	+ cButton twoButton; // Full 3D
	784	+ cButton sixButton;
	785	+ cButton threeButton;
	786	+ cButton sevenButton;
	787	+ cButton fourButton; // full panel
	788	+ cButton oneButton; // full XYZ
	789	+ //cButton currentLayout;
	790	+
	791	+ boolean maximized;
	792	+
	793	+ cButton fullscreenLayout;
	794	+ cButton expandedLayout;
	795	+
	796	+ void Minimize()
	797	+ {
	798	+ frame.setState(Frame.ICONIFIED);
	799	+ frame.validate();
	800	+ }
	801	+
	802	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	803	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	804	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	805	+ void Maximize()
	806	+ {
	807	+ if (CameraPane.FULLSCREEN)
	808	+ {
	809	+ ToggleFullScreen();
	810	+ }
	811	+
	812	+ if (maximized)
	813	+ {
	814	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	815	+ }
	816	+ else
	817	+ {
	818	+ keeprect = frame.getBounds();
	819	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	820	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	821	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	822	+// frame.setState(Frame.MAXIMIZED_BOTH);
	823	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	824	+ }
	825	+
	826	+ maximized ^= true;
	827	+
	828	+ frame.validate();
	829	+ }
	830	+
	831	+ cButton minButton;
	832	+ cButton maxButton;
	833	+ cButton fullButton;
	834	+ cButton collapseButton;
	835	+ cButton maximize3DButton;
	836	+
640	837	void ToggleFullScreen()
641	838	{
642		- if (CameraPane.FULLSCREEN)
	839	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	840	+
	841	+ cameraView.ToggleFullScreen();
	842	+
	843	+ if (!CameraPane.FULLSCREEN)
643	844	{
644		- frame.getContentPane().remove(/"Center",/bigThree);
645		- framePanel.add(bigThree);
646		- frame.getContentPane().add(/"Center",/framePanel);
	845	+ device.setFullScreenWindow(null);
	846	+ frame.dispose();
	847	+ frame.setUndecorated(false);
	848	+ frame.validate();
	849	+ frame.setVisible(true);
	850	+
	851	+ //frame.setVisible(false);
	852	+// frame.removeNotify();
	853	+// frame.setUndecorated(false);
	854	+// frame.addNotify();
	855	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	856	+
	857	+// X frame.getContentPane().remove(/"Center",/bigThree);
	858	+// X framePanel.add(bigThree);
	859	+// X frame.getContentPane().add(/"Center",/framePanel);
	860	+// framePanel.setDividerLocation(46); // icons are 24x24
	861	+
	862	+ //frame.setVisible(true);
	863	+// radio.layout = keepButton;
	864	+ //theFrame = null;
	865	+ keepButton = null;
	866	+// radio.layout.doClick();
	867	+
647	868	} else
648	869	{
649		- frame.getContentPane().remove(/"Center",/framePanel);
650		- framePanel.remove(bigThree);
651		- frame.getContentPane().add(/"Center",/bigThree);
	870	+ keepButton = radio.layout;
	871	+ //keeprect = frame.getBounds();
	872	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	873	+// frame.getToolkit().getScreenSize().height);
	874	+ //frame.setVisible(false);
	875	+
	876	+ frame.dispose();
	877	+ frame.setUndecorated(true);
	878	+ device.setFullScreenWindow(frame);
	879	+ frame.validate();
	880	+ frame.setVisible(true);
	881	+// frame.removeNotify();
	882	+// frame.setUndecorated(true);
	883	+// frame.addNotify();
	884	+// X frame.getContentPane().remove(/"Center",/framePanel);
	885	+// X framePanel.remove(bigThree);
	886	+// X frame.getContentPane().add(/"Center",/bigThree);
	887	+// framePanel.setDividerLocation(0);
	888	+
	889	+// radio.layout = fullscreenLayout;
	890	+// radio.layout.doClick();
	891	+ //frame.setVisible(true);
652	892	}
653		- cameraView.ToggleFullScreen();
	893	+ frame.validate();
	894	+
	895	+ cameraView.requestFocusInWindow();
654	896	}
	897	+
	898	+ void CollapseToolbar()
	899	+ {
	900	+ framePanel.setDividerLocation(0);
	901	+ //frame.validate();
	902	+
	903	+ cameraView.requestFocusInWindow();
	904	+ }
	905	+
	906	+ private Object3D Duplicate(Object3D object)
	907	+ {
	908	+ boolean temp = CameraPane.SWITCH;
	909	+ CameraPane.SWITCH = false;
	910	+
	911	+ object.ExtractBigData(versiontable);
	912	+ // if (copy == client)
	913	+
	914	+ Object3D versions[] = object.versionlist;
	915	+ object.versionlist = null;
	916	+
	917	+ //byte[] compress = Compress(copy);
	918	+ Object3D compress = (Object3D)Grafreed.clone(object);
	919	+
	920	+ object.versionlist = versions;
	921	+
	922	+ object.RestoreBigData(versiontable);
	923	+
	924	+ CameraPane.SWITCH = temp;
	925	+
	926	+ return compress;
	927	+ }
655	928
656	929	private JTextPane createTextPane()
657	930	{
..	..	@@ -751,7 +1024,7 @@
751	1024	protected static ImageIcon createImageIcon(String path,
752	1025	String description)
753	1026	{
754		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1027	+ java.net.URL imgURL = Grafreed.class.getResource(path);
755	1028	if (imgURL != null)
756	1029	{
757	1030	return new ImageIcon(imgURL, description);
..	..	@@ -774,6 +1047,7 @@
774	1047	{
775	1048	SetupMaterial(materialPanel);
776	1049	}
	1050	+
777	1051	//SetupName();
778	1052	//SetupViews();
779	1053	}
..	..	@@ -783,6 +1057,7 @@
783	1057	// NumberSlider vDivsField;
784	1058	// JCheckBox endcaps;
785	1059	JCheckBox liveCB;
	1060	+ JCheckBox selectableCB;
786	1061	JCheckBox hideCB;
787	1062	JCheckBox link2masterCB;
788	1063	JCheckBox markCB;
..	..	@@ -790,7 +1065,12 @@
790	1065	JCheckBox speedupCB;
791	1066	JCheckBox rewindCB;
792	1067	JCheckBox flipVCB;
	1068	+
	1069	+ cCheckBox toggleTextureCB;
	1070	+ cCheckBox toggleSwitchCB;
	1071	+
793	1072	JComboBox texresMenu;
	1073	+
794	1074	JButton resetButton;
795	1075	JButton stepButton;
796	1076	JButton stepAllButton;
..	..	@@ -799,9 +1079,13 @@
799	1079	JButton fasterButton;
800	1080	JButton remarkButton;
801	1081
	1082	+ cGridBag editPanel;
	1083	+ cGridBag editCommandsPanel;
	1084	+
802	1085	cGridBag namePanel;
803	1086	cGridBag setupPanel;
804		- cGridBag commandsPanel;
	1087	+ cGridBag setupPanel2;
	1088	+ cGridBag objectCommandsPanel;
805	1089	cGridBag pushPanel;
806	1090	cGridBag fillPanel;
807	1091
..	..	@@ -972,62 +1256,84 @@
972	1256
973	1257	namePanel = new cGridBag();
974	1258
	1259	+ //if (copy.pinned)
	1260	+ {
	1261	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1262	+ pinButton.setSelected(copy.pinned);
	1263	+ cGridBag t = new cGridBag();
	1264	+ t.preferredWidth = 2;
	1265	+ t.add(pinButton);
	1266	+ namePanel.add(t);
	1267	+
	1268	+ pinButton.addItemListener(this);
	1269	+ }
	1270	+
975	1271	nameField = AddText(namePanel, copy.GetName());
976		- namePanel.add(nameField);
	1272	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
977	1273	oe.ctrlPanel.add(namePanel);
978	1274
979	1275	oe.ctrlPanel.Return();
980	1276
981		- if (!GroupEditor.allparams)
	1277	+ if (!allparams)
982	1278	return;
983	1279
984	1280	setupPanel = new cGridBag().setVertical(false);
985	1281
986	1282	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
987	1283	liveCB.setToolTipText("Animate object");
	1284	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1285	+ selectableCB.setToolTipText("Make object selectable");
	1286	+// Return();
	1287	+
988	1288	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
989	1289	hideCB.setToolTipText("Hide object");
990		-// Return();
991	1290	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
992		- markCB.setToolTipText("Set the animation target transform");
	1291	+ markCB.setToolTipText("As animation target transform");
993	1292
994		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1293	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1294	+
	1295	+ setupPanel2 = new cGridBag().setVertical(false);
	1296	+
	1297	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
995	1298	rewindCB.setToolTipText("Rewind animation");
996	1299
997		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
998		- randomCB.setToolTipText("Option for switch node");
	1300	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1301	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
999	1302
	1303	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1304	+ link2masterCB.setToolTipText("Attach to support");
	1305	+
1000	1306	if (Globals.ADVANCED)
1001	1307	{
1002		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1003		- link2masterCB.setToolTipText("Attach to support");
1004		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1308	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1005	1309	speedupCB.setToolTipText("Option motion capture");
1006	1310	}
1007	1311
1008	1312	oe.ctrlPanel.add(setupPanel);
1009	1313	oe.ctrlPanel.Return();
	1314	+ oe.ctrlPanel.add(setupPanel2);
	1315	+ oe.ctrlPanel.Return();
1010	1316
1011		- commandsPanel = new cGridBag().setVertical(false);
	1317	+ objectCommandsPanel = new cGridBag().setVertical(false);
1012	1318
1013		- resetButton = AddButton(commandsPanel, "Reset");
	1319	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1014	1320	resetButton.setToolTipText("Jump to frame zero");
1015		- stepButton = AddButton(commandsPanel, "Step");
	1321	+ stepButton = AddButton(objectCommandsPanel, "Step");
1016	1322	stepButton.setToolTipText("Step one frame");
1017	1323	// resetAllButton = AddButton(oe, "Reset All");
1018	1324	// stepAllButton = AddButton(oe, "Step All");
1019	1325	// Return();
1020		- slowerButton = AddButton(commandsPanel, "Slow");
	1326	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1021	1327	slowerButton.setToolTipText("Decrease animation speed");
1022		- fasterButton = AddButton(commandsPanel, "Fast");
	1328	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1023	1329	fasterButton.setToolTipText("Increase animation speed");
1024		- remarkButton = AddButton(commandsPanel, "Remark");
	1330	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1025	1331	remarkButton.setToolTipText("Set the current transform as the target");
1026	1332
1027		- oe.ctrlPanel.add(commandsPanel);
	1333	+ oe.ctrlPanel.add(objectCommandsPanel);
1028	1334	oe.ctrlPanel.Return();
1029	1335
1030		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1336	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1031	1337	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1032	1338	//Return();
1033	1339
..	..	@@ -1230,8 +1536,11 @@
1230	1536	//worldPanel.setName("World");
1231	1537	centralPanel = new cGridBag();
1232	1538	centralPanel.preferredWidth = 20;
1233		- timelinePanel = new JPanel(new BorderLayout());
1234		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1539	+
	1540	+ if (Globals.ADVANCED)
	1541	+ {
	1542	+ timelinePanel = new JPanel(new BorderLayout());
	1543	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1235	1544
1236	1545	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1237	1546	cameraPanel.setContinuousLayout(true);
..	..	@@ -1240,7 +1549,10 @@
1240	1549	// cameraPanel.setDividerSize(9);
1241	1550	cameraPanel.setResizeWeight(1.0);
1242	1551
	1552	+ }
	1553	+
1243	1554	centralPanel.add(cameraView);
	1555	+ centralPanel.setFocusable(true);
1244	1556	//frame.setJMenuBar(timelineMenubar);
1245	1557	//centralPanel.add(timelinePanel);
1246	1558
..	..	@@ -1266,6 +1578,7 @@
1266	1578	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1267	1579	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1268	1580	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1581	+ //XYZPanel.setName("XYZ");
1269	1582
1270	1583	/*
1271	1584	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1303,13 +1616,29 @@
1303	1616	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1304	1617	//tmp.setName("Edit");
1305	1618	objectPanel.add(materialPanel);
	1619	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1620	+ objectPanel.setToolTipTextAt(0, "Material");
	1621	+
	1622	+ objectPanel.add(toolboxPanel);
	1623	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1624	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1625	+
	1626	+ objectPanel.add(skyboxPanel);
	1627	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1628	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1629	+
1306	1630	// JPanel north = new JPanel(new BorderLayout());
1307	1631	// north.setName("Edit");
1308	1632	// north.add(ctrlPanel, BorderLayout.NORTH);
1309	1633	// objectPanel.add(north);
1310		- objectPanel.add(ctrlPanel);
1311		- objectPanel.add(infoPanel);
1312		-
	1634	+ objectPanel.add(editPanel);
	1635	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1636	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1637	+
	1638	+ objectPanel.add(XYZPanel);
	1639	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1640	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1641	+
1313	1642	/*
1314	1643	aConstraints.gridx = 0;
1315	1644	aConstraints.gridwidth = 1;
..	..	@@ -1317,7 +1646,7 @@
1317	1646	aConstraints.gridy += 1;
1318	1647	aConstraints.gridwidth = 1;
1319	1648	mainPanel.add(objectPanel, aConstraints);
1320		- */
	1649	+ */
1321	1650
1322	1651	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1323	1652	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1329,14 +1658,12 @@
1329	1658	scrollpane.addMouseWheelListener(this); // Default not fast enough
1330	1659
1331	1660	/JTabbedPane/ scenePanel = new cGridBag();
1332		- scenePanel.preferredWidth = 7;
	1661	+ scenePanel.preferredWidth = 5;
1333	1662
1334	1663	JTabbedPane tabbedPane = new JTabbedPane();
1335	1664	tabbedPane.add(scrollpane);
1336	1665
1337		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1338		-
1339		- optionsPanel = new cGridBag().setVertical(true);
	1666	+ optionsPanel = new cGridBag().setVertical(false);
1340	1667
1341	1668	optionsPanel.setName("Options");
1342	1669
..	..	@@ -1344,8 +1671,15 @@
1344	1671
1345	1672	tabbedPane.add(optionsPanel);
1346	1673
	1674	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1675	+
1347	1676	scenePanel.add(tabbedPane);
1348	1677
	1678	+ //if (Globals.ADVANCED)
	1679	+ tabbedPane.add(infoPanel);
	1680	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1681	+ tabbedPane.setToolTipTextAt(3, "Information");
	1682	+
1349	1683	/*
1350	1684	cTree jTree = new cTree(null);
1351	1685	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1407,7 +1741,7 @@
1407	1741	bigThree = new cGridBag();
1408	1742	bigThree.addComponent(scenePanel);
1409	1743	bigThree.addComponent(centralPanel);
1410		- bigThree.addComponent(XYZPanel);
	1744	+ //bigThree.addComponent(XYZPanel);
1411	1745
1412	1746	// // SIDE EFFECT!!!
1413	1747	// aConstraints.gridx = 0;
..	..	@@ -1416,9 +1750,26 @@
1416	1750	// aConstraints.gridheight = 1;
1417	1751
1418	1752	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1419		- framePanel.setContinuousLayout(true);
1420		- framePanel.setOneTouchExpandable(true);
1421		- framePanel.setDividerLocation(0.8);
	1753	+
	1754	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1755	+ new java.beans.PropertyChangeListener()
	1756	+ {
	1757	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1758	+ {
	1759	+ if ((Integer)pce.getOldValue() == 1)
	1760	+ {
	1761	+ if (radio.layout != expandedLayout)
	1762	+ {
	1763	+ radio.layout = expandedLayout;
	1764	+ radio.layout.doClick();
	1765	+ }
	1766	+ }
	1767	+ }
	1768	+ });
	1769	+
	1770	+ framePanel.setContinuousLayout(false);
	1771	+ framePanel.setOneTouchExpandable(false);
	1772	+ //.setDividerLocation(0.8);
1422	1773	//framePanel.setDividerSize(15);
1423	1774	//framePanel.setResizeWeight(0.15);
1424	1775	framePanel.setName("Frame");
..	..	@@ -1435,15 +1786,19 @@
1435	1786
1436	1787	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1437	1788
1438		- frame.setSize(1024, 768);
1439		- frame.show();
1440		-
	1789	+ frame.setSize(1280, 860);
	1790	+
	1791	+ cameraView.requestFocusInWindow();
	1792	+
1441	1793	gridPanel.setDividerLocation(1.0);
	1794	+
	1795	+ frame.validate();
	1796	+
	1797	+ frame.setVisible(true);
1442	1798
1443	1799	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1444	1800	frame.addWindowListener(new WindowAdapter()
1445	1801	{
1446		-
1447	1802	public void windowClosing(WindowEvent e)
1448	1803	{
1449	1804	Close();
..	..	@@ -1466,28 +1821,419 @@
1466	1821	ctrlPanel.removeAll();
1467	1822	}
1468	1823
1469		- void SetupMaterial(cGridBag panel)
	1824	+ void SetupMaterial(cGridBag materialpanel)
1470	1825	{
1471		- /*
	1826	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1827	+
	1828	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1829	+ skin.setToolTipText("Skin");
	1830	+ skin.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ // Skin
	1838	+ colorField.setFloat(material.color);
	1839	+ saturationField.setFloat(material.modulation);
	1840	+ subsurfaceField.setFloat(material.subsurface);
	1841	+ selfshadowField.setFloat(material.diffuseness);
	1842	+ diffusenessField.setFloat(material.factor);
	1843	+ shininessField.setFloat(material.shininess);
	1844	+ shadowbiasField.setFloat(material.shadowbias);
	1845	+ diffuseField.setFloat(material.diffuse);
	1846	+ specularField.setFloat(material.specular);
	1847	+
	1848	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1849	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1850	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1851	+
	1852	+ materialtouched = true;
	1853	+ applySelf();
	1854	+ }
	1855	+ });
	1856	+ presetpanel.add(skin);
	1857	+
	1858	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1859	+ lambert.setToolTipText("Diffuse");
	1860	+ lambert.addMouseListener(new MouseAdapter()
	1861	+ {
	1862	+ public void mouseClicked(MouseEvent e)
	1863	+ {
	1864	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1865	+ cMaterial material = object.material;
	1866	+
	1867	+ diffusenessField.setFloat(material.factor);
	1868	+ selfshadowField.setFloat(material.diffuseness);
	1869	+
	1870	+ materialtouched = true;
	1871	+ applySelf();
	1872	+ }
	1873	+ });
	1874	+ presetpanel.add(lambert);
	1875	+
	1876	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1877	+ diffuse2.setToolTipText("Diffuse2");
	1878	+ diffuse2.addMouseListener(new MouseAdapter()
	1879	+ {
	1880	+ public void mouseClicked(MouseEvent e)
	1881	+ {
	1882	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1883	+ cMaterial material = object.material;
	1884	+
	1885	+ diffusenessField.setFloat(material.factor);
	1886	+ selfshadowField.setFloat(material.diffuseness);
	1887	+
	1888	+ materialtouched = true;
	1889	+ applySelf();
	1890	+ }
	1891	+ });
	1892	+ presetpanel.add(diffuse2);
	1893	+
	1894	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1895	+ diffusemoon.setToolTipText("Moon");
	1896	+ diffusemoon.addMouseListener(new MouseAdapter()
	1897	+ {
	1898	+ public void mouseClicked(MouseEvent e)
	1899	+ {
	1900	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1901	+ cMaterial material = object.material;
	1902	+
	1903	+ diffusenessField.setFloat(material.factor);
	1904	+ selfshadowField.setFloat(material.diffuseness);
	1905	+
	1906	+ materialtouched = true;
	1907	+ applySelf();
	1908	+ }
	1909	+ });
	1910	+ presetpanel.add(diffusemoon);
	1911	+
	1912	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1913	+ diffusemoon2.setToolTipText("Moon2");
	1914	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1915	+ {
	1916	+ public void mouseClicked(MouseEvent e)
	1917	+ {
	1918	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1919	+ cMaterial material = object.material;
	1920	+
	1921	+ diffusenessField.setFloat(material.factor);
	1922	+ selfshadowField.setFloat(material.diffuseness);
	1923	+
	1924	+ materialtouched = true;
	1925	+ applySelf();
	1926	+ }
	1927	+ });
	1928	+ presetpanel.add(diffusemoon2);
	1929	+
	1930	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1931	+ diffusemoon3.setToolTipText("Moon3");
	1932	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1933	+ {
	1934	+ public void mouseClicked(MouseEvent e)
	1935	+ {
	1936	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1937	+ cMaterial material = object.material;
	1938	+
	1939	+ diffusenessField.setFloat(material.factor);
	1940	+ selfshadowField.setFloat(material.diffuseness);
	1941	+
	1942	+ materialtouched = true;
	1943	+ applySelf();
	1944	+ }
	1945	+ });
	1946	+ presetpanel.add(diffusemoon3);
	1947	+
	1948	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1949	+ diffusesheen.setToolTipText("Sheen");
	1950	+ diffusesheen.addMouseListener(new MouseAdapter()
	1951	+ {
	1952	+ public void mouseClicked(MouseEvent e)
	1953	+ {
	1954	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1955	+ cMaterial material = object.material;
	1956	+
	1957	+ sheenField.setFloat(material.sheen);
	1958	+
	1959	+ materialtouched = true;
	1960	+ applySelf();
	1961	+ }
	1962	+ });
	1963	+ presetpanel.add(diffusesheen);
	1964	+
	1965	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1966	+ rough.setToolTipText("Rough metal");
	1967	+ rough.addMouseListener(new MouseAdapter()
	1968	+ {
	1969	+ public void mouseClicked(MouseEvent e)
	1970	+ {
	1971	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1972	+ cMaterial material = object.material;
	1973	+
	1974	+ shininessField.setFloat(material.shininess);
	1975	+ velvetField.setFloat(material.velvet);
	1976	+
	1977	+ materialtouched = true;
	1978	+ applySelf();
	1979	+ }
	1980	+ });
	1981	+ presetpanel.add(rough);
	1982	+
	1983	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1984	+ rough2.setToolTipText("Medium metal");
	1985	+ rough2.addMouseListener(new MouseAdapter()
	1986	+ {
	1987	+ public void mouseClicked(MouseEvent e)
	1988	+ {
	1989	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1990	+ cMaterial material = object.material;
	1991	+
	1992	+ shininessField.setFloat(material.shininess);
	1993	+ lightareaField.setFloat(material.lightarea);
	1994	+
	1995	+ materialtouched = true;
	1996	+ applySelf();
	1997	+ }
	1998	+ });
	1999	+ presetpanel.add(rough2);
	2000	+
	2001	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2002	+ shini0.setToolTipText("Shiny");
	2003	+ shini0.addMouseListener(new MouseAdapter()
	2004	+ {
	2005	+ public void mouseClicked(MouseEvent e)
	2006	+ {
	2007	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2008	+ cMaterial material = object.material;
	2009	+
	2010	+ shininessField.setFloat(material.shininess);
	2011	+ lightareaField.setFloat(material.lightarea);
	2012	+
	2013	+ materialtouched = true;
	2014	+ applySelf();
	2015	+ }
	2016	+ });
	2017	+ presetpanel.add(shini0);
	2018	+
	2019	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2020	+ shini1.setToolTipText("Shiny2");
	2021	+ shini1.addMouseListener(new MouseAdapter()
	2022	+ {
	2023	+ public void mouseClicked(MouseEvent e)
	2024	+ {
	2025	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2026	+ cMaterial material = object.material;
	2027	+
	2028	+ shininessField.setFloat(material.shininess);
	2029	+ lightareaField.setFloat(material.lightarea);
	2030	+
	2031	+ materialtouched = true;
	2032	+ applySelf();
	2033	+ }
	2034	+ });
	2035	+ presetpanel.add(shini1);
	2036	+
	2037	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2038	+ shini2.setToolTipText("Shiny3");
	2039	+ shini2.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ shininessField.setFloat(material.shininess);
	2047	+ lightareaField.setFloat(material.lightarea);
	2048	+
	2049	+ materialtouched = true;
	2050	+ applySelf();
	2051	+ }
	2052	+ });
	2053	+ presetpanel.add(shini2);
	2054	+
	2055	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2056	+ aniso.setToolTipText("AnisoU");
	2057	+ aniso.addMouseListener(new MouseAdapter()
	2058	+ {
	2059	+ public void mouseClicked(MouseEvent e)
	2060	+ {
	2061	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2062	+ cMaterial material = object.material;
	2063	+
	2064	+ anisoField.setFloat(material.aniso);
	2065	+ anisoVField.setFloat(material.anisoV);
	2066	+
	2067	+ materialtouched = true;
	2068	+ applySelf();
	2069	+ }
	2070	+ });
	2071	+ presetpanel.add(aniso);
	2072	+
	2073	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2074	+ aniso2.setToolTipText("AnisoV");
	2075	+ aniso2.addMouseListener(new MouseAdapter()
	2076	+ {
	2077	+ public void mouseClicked(MouseEvent e)
	2078	+ {
	2079	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2080	+ cMaterial material = object.material;
	2081	+
	2082	+ anisoField.setFloat(material.aniso);
	2083	+ anisoVField.setFloat(material.anisoV);
	2084	+
	2085	+ materialtouched = true;
	2086	+ applySelf();
	2087	+ }
	2088	+ });
	2089	+ presetpanel.add(aniso2);
	2090	+
	2091	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2092	+ aniso3.setToolTipText("AnisoUV");
	2093	+ aniso3.addMouseListener(new MouseAdapter()
	2094	+ {
	2095	+ public void mouseClicked(MouseEvent e)
	2096	+ {
	2097	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2098	+ cMaterial material = object.material;
	2099	+
	2100	+ anisoField.setFloat(material.aniso);
	2101	+ anisoVField.setFloat(material.anisoV);
	2102	+
	2103	+ materialtouched = true;
	2104	+ applySelf();
	2105	+ }
	2106	+ });
	2107	+ presetpanel.add(aniso3);
	2108	+
	2109	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2110	+ velvet0.setToolTipText("Velvet");
	2111	+ velvet0.addMouseListener(new MouseAdapter()
	2112	+ {
	2113	+ public void mouseClicked(MouseEvent e)
	2114	+ {
	2115	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2116	+ cMaterial material = object.material;
	2117	+
	2118	+ diffusenessField.setFloat(material.factor);
	2119	+ selfshadowField.setFloat(material.diffuseness);
	2120	+ sheenField.setFloat(material.sheen);
	2121	+ shininessField.setFloat(material.shininess);
	2122	+ velvetField.setFloat(material.velvet);
	2123	+ shiftField.setFloat(material.shift);
	2124	+
	2125	+ materialtouched = true;
	2126	+ applySelf();
	2127	+ }
	2128	+ });
	2129	+ presetpanel.add(velvet0);
	2130	+
	2131	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2132	+ bump0.setToolTipText("Bump texture");
	2133	+ bump0.addMouseListener(new MouseAdapter()
	2134	+ {
	2135	+ public void mouseClicked(MouseEvent e)
	2136	+ {
	2137	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2138	+ cMaterial material = object.material;
	2139	+
	2140	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2141	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2142	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2143	+
	2144	+ materialtouched = true;
	2145	+ applySelf();
	2146	+ }
	2147	+ });
	2148	+ presetpanel.add(bump0);
	2149	+
	2150	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2151	+ halo.setToolTipText("Halo");
	2152	+ halo.addMouseListener(new MouseAdapter()
	2153	+ {
	2154	+ public void mouseClicked(MouseEvent e)
	2155	+ {
	2156	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2157	+ cMaterial material = object.material;
	2158	+
	2159	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2160	+
	2161	+ materialtouched = true;
	2162	+ applySelf();
	2163	+ }
	2164	+ });
	2165	+ presetpanel.add(halo);
	2166	+
	2167	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2168	+ candle.setToolTipText("Candle");
	2169	+ candle.addMouseListener(new MouseAdapter()
	2170	+ {
	2171	+ public void mouseClicked(MouseEvent e)
	2172	+ {
	2173	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2174	+ cMaterial material = object.material;
	2175	+
	2176	+ subsurfaceField.setFloat(material.subsurface);
	2177	+ shadowbiasField.setFloat(material.shadowbias);
	2178	+ ambientField.setFloat(material.ambient);
	2179	+ specularField.setFloat(material.specular);
	2180	+ lightareaField.setFloat(material.lightarea);
	2181	+ shininessField.setFloat(material.shininess);
	2182	+
	2183	+ materialtouched = true;
	2184	+ applySelf();
	2185	+ }
	2186	+ });
	2187	+ presetpanel.add(candle);
	2188	+
	2189	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2190	+ shadowShader.setToolTipText("Shadow");
	2191	+ shadowShader.addMouseListener(new MouseAdapter()
	2192	+ {
	2193	+ public void mouseClicked(MouseEvent e)
	2194	+ {
	2195	+ diffuseField.setFloat(0.001);
	2196	+ ambientField.setFloat(0.001);
	2197	+ cameraField.setFloat(0.001);
	2198	+ specularField.setFloat(0.001);
	2199	+ fakedepthField.setFloat(0.001);
	2200	+ opacityField.setFloat(0.6);
	2201	+
	2202	+ materialtouched = true;
	2203	+ applySelf();
	2204	+ }
	2205	+ });
	2206	+ presetpanel.add(shadowShader);
	2207	+
	2208	+ cGridBag panel = new cGridBag().setVertical(true);
	2209	+
	2210	+ presetpanel.preferredWidth = 1;
	2211	+
	2212	+ materialpanel.add(presetpanel);
	2213	+ materialpanel.add(panel);
	2214	+
	2215	+ panel.preferredWidth = 8;
	2216	+
	2217	+ /*
1472	2218	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1473	2219	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1474		- */
	2220	+ */
1475	2221
1476	2222	cGridBag editBar = new cGridBag().setVertical(false);
1477	2223
1478		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	2224	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1479	2225	createMaterialButton.setToolTipText("Create material");
1480	2226
1481	2227	/*
1482	2228	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1483	2229	*/
1484	2230
1485		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	2231	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1486	2232	clearMaterialButton.setToolTipText("Clear material");
1487	2233
1488	2234	if (Globals.ADVANCED)
1489	2235	{
1490		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	2236	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1491	2237	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1492	2238	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1493	2239	}
..	..	@@ -1505,45 +2251,50 @@
1505	2251	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1506	2252
1507	2253	cGridBag colorSection = new cGridBag().setVertical(true);
	2254	+
	2255	+ cGridBag huepanel = new cGridBag();
	2256	+ cGridBag huelabel = new cGridBag();
	2257	+ skin = GetLabel("icons/hue.png", false);
	2258	+ skin.fit = true;
	2259	+ huelabel.add(skin);
	2260	+ huelabel.preferredWidth = 20;
	2261	+ huepanel.add(new cGridBag()); // Label
	2262	+ huepanel.add(huelabel); // Field/slider
	2263	+
	2264	+ huepanel.preferredHeight = 7;
	2265	+
	2266	+ colorSection.add(huepanel);
1508	2267
1509	2268	cGridBag color = new cGridBag();
1510		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1511		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1512		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2269	+
	2270	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2271	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2272	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2273	+
1513	2274	//colorField.preferredWidth = 200;
1514	2275	colorSection.add(color);
1515	2276
1516	2277	cGridBag modulation = new cGridBag();
1517	2278	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1518	2279	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1519		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2280	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1520	2281	colorSection.add(modulation);
1521	2282
	2283	+ cGridBag opacity = new cGridBag();
	2284	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2285	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2286	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2287	+ colorSection.add(opacity);
	2288	+
	2289	+ colorSection.add(GetSeparator());
	2290	+
1522	2291	cGridBag texture = new cGridBag();
1523	2292	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1524	2293	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525	2294	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1526	2295	colorSection.add(texture);
1527	2296
1528		- cGridBag anisoU = new cGridBag();
1529		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1530		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1532		- colorSection.add(anisoU);
1533		-
1534		- cGridBag anisoV = new cGridBag();
1535		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1536		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1537		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1538		- colorSection.add(anisoV);
1539		-
1540		- cGridBag shadowbias = new cGridBag();
1541		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1542		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1543		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1544		- colorSection.add(shadowbias);
1545		-
1546		- panel.add(new JSeparator());
	2297	+ panel.add(GetSeparator());
1547	2298
1548	2299	panel.add(colorSection);
1549	2300
..	..	@@ -1593,7 +2344,13 @@
1593	2344	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1594	2345	diffuseSection.add(fakedepth);
1595	2346
1596		- panel.add(new JSeparator());
	2347	+ cGridBag shadowbias = new cGridBag();
	2348	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2349	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2350	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2351	+ diffuseSection.add(shadowbias);
	2352	+
	2353	+ panel.add(GetSeparator());
1597	2354
1598	2355	panel.add(diffuseSection);
1599	2356
..	..	@@ -1643,42 +2400,48 @@
1643	2400	// aConstraints.gridy += 1;
1644	2401	// aConstraints.gridwidth = 1;
1645	2402
	2403	+ cGridBag anisoU = new cGridBag();
	2404	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2405	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2406	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2407	+ specularSection.add(anisoU);
1646	2408
1647		- panel.add(new JSeparator());
	2409	+ cGridBag anisoV = new cGridBag();
	2410	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2411	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2412	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2413	+ specularSection.add(anisoV);
	2414	+
	2415	+
	2416	+ panel.add(GetSeparator());
1648	2417
1649	2418	panel.add(specularSection);
1650	2419
1651	2420	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1652	2421
1653		- cGridBag globalSection = new cGridBag().setVertical(true);
	2422	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1654	2423
1655	2424	cGridBag camera = new cGridBag();
1656	2425	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1657	2426	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1658	2427	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1659		- globalSection.add(camera);
	2428	+ colorSection.add(camera);
1660	2429
1661	2430	cGridBag ambient = new cGridBag();
1662	2431	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1663	2432	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1664	2433	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1665		- globalSection.add(ambient);
	2434	+ colorSection.add(ambient);
1666	2435
1667	2436	cGridBag backlit = new cGridBag();
1668	2437	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1669	2438	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670	2439	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1671		- globalSection.add(backlit);
	2440	+ colorSection.add(backlit);
1672	2441
1673		- cGridBag opacity = new cGridBag();
1674		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1675		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1676		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1677		- globalSection.add(opacity);
1678		-
1679		- panel.add(new JSeparator());
	2442	+ //panel.add(new JSeparator());
1680	2443
1681		- panel.add(globalSection);
	2444	+ //panel.add(globalSection);
1682	2445
1683	2446	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1684	2447
..	..	@@ -1720,7 +2483,7 @@
1720	2483	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1721	2484	textureSection.add(opacityPower);
1722	2485
1723		- panel.add(new JSeparator());
	2486	+ panel.add(GetSeparator());
1724	2487
1725	2488	panel.add(textureSection);
1726	2489
..	..	@@ -1785,8 +2548,9 @@
1785	2548	// 3D models
1786	2549	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1787	2550	{
1788		- lastConverter = new com.jmex.model.converters.MaxToJme();
1789		- LoadFile(filename, lastConverter);
	2551	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2552	+ //LoadFile(filename, lastConverter);
	2553	+ LoadObjFile(filename); // New 3ds loader
1790	2554	continue;
1791	2555	}
1792	2556	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1938,7 +2702,7 @@
1938	2702
1939	2703	//? flashIt = false;
1940	2704	CameraPane pane = (CameraPane) cameraView;
1941		- pane.clickStart(location.x, location.y, 0);
	2705	+ pane.clickStart(location.x, location.y, 0, 0);
1942	2706	pane.clickEnd(location.x, location.y, 0, true);
1943	2707
1944	2708	if (group.selection.size() == 1)
..	..	@@ -1987,6 +2751,7 @@
1987	2751	e2.printStackTrace();
1988	2752	}
1989	2753	}
	2754	+
1990	2755	LoadJMEThread loadThread;
1991	2756
1992	2757	class LoadJMEThread extends Thread
..	..	@@ -2044,6 +2809,7 @@
2044	2809	//LoadFile0(filename, converter);
2045	2810	}
2046	2811	}
	2812	+
2047	2813	LoadOBJThread loadObjThread;
2048	2814
2049	2815	class LoadOBJThread extends Thread
..	..	@@ -2122,19 +2888,19 @@
2122	2888
2123	2889	void LoadObjFile(String fullname)
2124	2890	{
2125		- /*
	2891	+ System.out.println("Loading " + fullname);
	2892	+ /**/
2126	2893	//lastFilename = fullname;
2127	2894	if(loadObjThread == null)
2128	2895	{
2129		- loadObjThread = new LoadOBJThread();
2130		- loadObjThread.start();
	2896	+ loadObjThread = new LoadOBJThread();
	2897	+ loadObjThread.start();
2131	2898	}
2132	2899
2133	2900	loadObjThread.add(fullname);
2134		- */
	2901	+ /**/
2135	2902
2136		- System.out.println("Loading " + fullname);
2137		- makeSomething(new FileObject(fullname, true), true);
	2903	+ //makeSomething(new FileObject(fullname, true), true);
2138	2904	}
2139	2905
2140	2906	void LoadGFDFile(String fullname)
..	..	@@ -2395,11 +3161,11 @@
2395	3161
2396	3162	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2397	3163	{
2398		- if (GrafreeD.standAlone)
	3164	+ if (Grafreed.standAlone)
2399	3165	{
2400	3166	/**/
2401	3167	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2402		- browser.show();
	3168	+ browser.setVisible(true);
2403	3169	String filename = browser.getFile();
2404	3170	if (filename != null && filename.length() > 0)
2405	3171	{
..	..	@@ -2510,6 +3276,7 @@
2510	3276	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2511	3277	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2512	3278	}
	3279	+
2513	3280	//cJME.count++;
2514	3281	//cJME.count %= 12;
2515	3282	if (gc)
..	..	@@ -2693,6 +3460,7 @@
2693	3460	}
2694	3461	}
2695	3462	}
	3463	+
2696	3464	cFileSystemPane FSPane;
2697	3465
2698	3466	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2702,7 +3470,7 @@
2702	3470
2703	3471	freezematerial = true;
2704	3472	colorField.setFloat(mat.color);
2705		- modulationField.setFloat(mat.modulation);
	3473	+ saturationField.setFloat(mat.modulation);
2706	3474	metalnessField.setFloat(mat.metalness);
2707	3475	diffuseField.setFloat(mat.diffuse);
2708	3476	specularField.setFloat(mat.specular);
..	..	@@ -2746,11 +3514,14 @@
2746	3514	}
2747	3515	}
2748	3516	}
	3517	+
2749	3518	freezematerial = false;
2750	3519	}
2751	3520
2752	3521	void SetMaterial(Object3D object)
2753	3522	{
	3523	+ latestObject = object;
	3524	+
2754	3525	cMaterial mat = object.material;
2755	3526
2756	3527	if (mat == null)
..	..	@@ -2862,12 +3633,17 @@
2862	3633	// }
2863	3634
2864	3635	/**/
2865		- if (deselect)
	3636	+ if (deselect \|\| child == null)
2866	3637	{
2867	3638	//group.deselectAll();
2868	3639	//freeze = true;
2869	3640	GetTree().clearSelection();
2870	3641	//freeze = false;
	3642	+
	3643	+ if (child == null)
	3644	+ {
	3645	+ return;
	3646	+ }
2871	3647	}
2872	3648
2873	3649	//group.addSelectee(child);
..	..	@@ -2901,6 +3677,17 @@
2901	3677	public void itemStateChanged(ItemEvent event)
2902	3678	{
2903	3679	// System.out.println("Propagate = " + propagate);
	3680	+ if (event.getSource() == pinButton)
	3681	+ {
	3682	+ copy.pinned ^= true;
	3683	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3684	+ {
	3685	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3686	+ copy.CloseUI();
	3687	+ //copy.editWindow.refreshContents();
	3688	+ }
	3689	+ }
	3690	+ else
2904	3691	if (event.getSource() == propagateToggle)
2905	3692	{
2906	3693	propagate ^= true;
..	..	@@ -2936,7 +3723,7 @@
2936	3723	cameraView.ToggleDL();
2937	3724	cameraView.repaint();
2938	3725	return;
2939		- } else if (event.getSource() == toggleTextureItem)
	3726	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2940	3727	{
2941	3728	cameraView.ToggleTexture();
2942	3729	// june 2013 copy.HardTouch();
..	..	@@ -2975,9 +3762,9 @@
2975	3762	frame.validate();
2976	3763
2977	3764	return;
2978		- } else if (event.getSource() == toggleSwitchItem)
	3765	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2979	3766	{
2980		- cameraView.ToggleRandom();
	3767	+ cameraView.ToggleSwitch();
2981	3768	cameraView.repaint();
2982	3769	return;
2983	3770	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3005,12 +3792,17 @@
3005	3792	} else if (event.getSource() == liveCB)
3006	3793	{
3007	3794	copy.live ^= true;
	3795	+ objEditor.refreshContents(true); // To show item colors
	3796	+ return;
	3797	+ } else if (event.getSource() == selectableCB)
	3798	+ {
	3799	+ copy.dontselect ^= true;
3008	3800	return;
3009	3801	} else if (event.getSource() == hideCB)
3010	3802	{
3011	3803	copy.hide ^= true;
3012	3804	copy.Touch(); // display list issue
3013		- objEditor.refreshContents();
	3805	+ objEditor.refreshContents(true); // To show item colors
3014	3806	return;
3015	3807	} else if (event.getSource() == link2masterCB)
3016	3808	{
..	..	@@ -3044,8 +3836,9 @@
3044	3836
3045	3837	public void actionPerformed(ActionEvent event)
3046	3838	{
	3839	+ Object source = event.getSource();
3047	3840	// SCRIPT DIALOG
3048		- if (event.getSource() == okbutton)
	3841	+ if (source == okbutton)
3049	3842	{
3050	3843	textpanel.setVisible(false);
3051	3844	textpanel.remove(textarea);
..	..	@@ -3057,7 +3850,7 @@
3057	3850	textarea = null;
3058	3851	textpanel = null;
3059	3852	}
3060		- if (event.getSource() == cancelbutton)
	3853	+ if (source == cancelbutton)
3061	3854	{
3062	3855	textpanel.setVisible(false);
3063	3856	textpanel.remove(textarea);
..	..	@@ -3069,50 +3862,50 @@
3069	3862	//applySelf();
3070	3863	//client.refreshEditWindow();
3071	3864	//refreshContents();
3072		- if (event.getSource() == nameField)
	3865	+ if (source == nameField)
3073	3866	{
3074	3867	//System.out.println("ObjEditor " + event);
3075	3868	applySelf0(true);
3076	3869	//parent.applySelf();
3077	3870	objEditor.refreshContents();
3078		- } else if (event.getSource() == resetButton)
	3871	+ } else if (source == resetButton)
3079	3872	{
3080	3873	CameraPane.fullreset = true;
3081	3874	copy.Reset(); // ResetMeshes();
3082	3875	copy.Touch();
3083	3876	objEditor.refreshContents();
3084		- } else if (event.getSource() == stepItem)
	3877	+ } else if (source == stepItem)
3085	3878	{
3086	3879	//cameraView.ONESTEP = true;
3087	3880	Globals.ONESTEP = true;
3088	3881	cameraView.repaint();
3089	3882	return;
3090		- } else if (event.getSource() == stepButton)
	3883	+ } else if (source == stepButton)
3091	3884	{
3092	3885	copy.Step();
3093	3886	copy.Touch();
3094	3887	objEditor.refreshContents();
3095		- } else if (event.getSource() == slowerButton)
	3888	+ } else if (source == slowerButton)
3096	3889	{
3097	3890	copy.Slower();
3098	3891	copy.Touch();
3099	3892	objEditor.refreshContents();
3100		- } else if (event.getSource() == fasterButton)
	3893	+ } else if (source == fasterButton)
3101	3894	{
3102	3895	copy.Faster();
3103	3896	copy.Touch();
3104	3897	objEditor.refreshContents();
3105		- } else if (event.getSource() == remarkButton)
	3898	+ } else if (source == remarkButton)
3106	3899	{
3107	3900	copy.Remark();
3108	3901	copy.Touch();
3109	3902	objEditor.refreshContents();
3110		- } else if (event.getSource() == stepAllButton)
	3903	+ } else if (source == stepAllButton)
3111	3904	{
3112	3905	copy.StepAll();
3113	3906	copy.Touch();
3114	3907	objEditor.refreshContents();
3115		- } else if (event.getSource() == resetAllButton)
	3908	+ } else if (source == resetAllButton)
3116	3909	{
3117	3910	//CameraPane.fullreset = true;
3118	3911	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3145,53 +3938,79 @@
3145	3938	// Close();
3146	3939	// }
3147	3940	// else
3148		- if (event.getSource() == resetSlidersButton)
	3941	+ if (source == resetSlidersButton)
3149	3942	{
3150	3943	ResetSliders();
3151		- } else if (event.getSource() == clearMaterialButton)
	3944	+ } else if (source == clearMaterialButton)
3152	3945	{
3153	3946	ClearMaterial();
3154		- } else if (event.getSource() == createMaterialButton)
	3947	+ } else if (source == createMaterialButton)
3155	3948	{
3156	3949	CreateMaterial();
3157		- } else if (event.getSource() == clearPanelButton)
	3950	+ } else if (source == clearPanelButton)
3158	3951	{
3159	3952	copy.ClearUI();
3160	3953	refreshContents(true);
3161		- } /*
3162		- }
3163		-
3164		- public boolean action(Event event, Object arg)
3165		- {
3166		- */ else if (event.getSource() == closeItem)
	3954	+ } else if (source == importGFDItem)
	3955	+ {
	3956	+ ImportGFD();
	3957	+ } else
	3958	+ if (source == importVRMLX3DItem)
	3959	+ {
	3960	+ ImportVRMLX3D();
	3961	+ } else
	3962	+ if (source == import3DSItem)
	3963	+ {
	3964	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3965	+ } else
	3966	+ if (source == importOBJItem)
	3967	+ {
	3968	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3969	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3970	+ browser.setVisible(true);
	3971	+ String filename = browser.getFile();
	3972	+ if (filename != null && filename.length() > 0)
	3973	+ {
	3974	+ String fullname = browser.getDirectory() + filename;
	3975	+ makeSomething(ReadOBJ(fullname), true);
	3976	+ }
	3977	+ } else
	3978	+ if (source == closeItem)
3167	3979	{
3168	3980	Close();
3169	3981	//return true;
3170		- } else if (event.getSource() == loadItem)
	3982	+ } else if (source == openItem)
3171	3983	{
3172		- load();
	3984	+ Open();
3173	3985	//return true;
3174		- } else if (event.getSource() == saveItem)
	3986	+ } else if (source == newItem)
	3987	+ {
	3988	+ New();
	3989	+ } else if (source == saveItem)
3175	3990	{
3176	3991	save();
3177	3992	//return true;
3178		- } else if (event.getSource() == saveAsItem)
	3993	+ } else if (source == saveAsItem)
3179	3994	{
3180	3995	saveAs();
3181	3996	//return true;
3182		- } else if (event.getSource() == reexportItem)
	3997	+ } else if (source == reexportItem)
3183	3998	{
3184	3999	reexport();
3185	4000	//return true;
3186		- } else if (event.getSource() == exportAsItem)
	4001	+ } else if (source == exportAsItem)
3187	4002	{
3188	4003	export();
3189	4004	//return true;
3190		- } else if (event.getSource() == povItem)
	4005	+ } else if (source == povItem)
3191	4006	{
3192	4007	generatePOV();
3193	4008	//return true;
3194		- } else if (event.getSource() == zBufferItem)
	4009	+ } else if (event.getSource() == archiveItem)
	4010	+ {
	4011	+ cTools.Archive(frame);
	4012	+ return;
	4013	+ } else if (source == zBufferItem)
3195	4014	{
3196	4015	try
3197	4016	{
..	..	@@ -3213,21 +4032,8 @@
3213	4032	cameraView.repaint();
3214	4033	//return true;
3215	4034	}
3216		- */ else if (event.getSource() == editCameraItem)
3217		- {
3218		- cameraView.ProtectCamera();
3219		- cameraView.repaint();
3220		- return;
3221		- } else if (event.getSource() == revertCameraItem)
3222		- {
3223		- cameraView.RevertCamera();
3224		- cameraView.repaint();
3225		- return;
3226		-// } else if (event.getSource() == textureButton)
3227		-// {
3228		-// return; // true;
3229		- } else // combos...
3230		- if (event.getSource() == texresMenu)
	4035	+ */ else // combos...
	4036	+ if (source == texresMenu)
3231	4037	{
3232	4038	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3233	4039	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3239,6 +4045,471 @@
3239	4045	}
3240	4046	}
3241	4047
	4048	+ void New()
	4049	+ {
	4050	+ while (copy.Size() > 1)
	4051	+ {
	4052	+ copy.remove(1);
	4053	+ }
	4054	+
	4055	+ ResetModel();
	4056	+ objEditor.refreshContents();
	4057	+ }
	4058	+
	4059	+ static public byte[] Compress(Object3D o)
	4060	+ {
	4061	+ // Slower to actually compress.
	4062	+ try
	4063	+ {
	4064	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4065	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4066	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4067	+
	4068	+ Object3D parent = o.parent;
	4069	+ o.parent = null;
	4070	+
	4071	+ out.writeObject(o);
	4072	+
	4073	+ o.parent = parent;
	4074	+
	4075	+ out.flush();
	4076	+
	4077	+ baos //zstream
	4078	+ .close();
	4079	+ out.close();
	4080	+
	4081	+ byte[] bytes = baos.toByteArray();
	4082	+
	4083	+ System.out.println("save #bytes = " + bytes.length);
	4084	+ return bytes;
	4085	+ } catch (Exception e)
	4086	+ {
	4087	+ System.err.println(e);
	4088	+ return null;
	4089	+ }
	4090	+ }
	4091	+
	4092	+ static public Object Uncompress(byte[] bytes)
	4093	+ {
	4094	+ System.out.println("restore #bytes = " + bytes.length);
	4095	+ try
	4096	+ {
	4097	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4098	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4099	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4100	+ Object obj = in.readObject();
	4101	+
	4102	+ bais //istream
	4103	+ .close();
	4104	+ in.close();
	4105	+
	4106	+ return obj;
	4107	+ } catch (Exception e)
	4108	+ {
	4109	+ System.err.println(e);
	4110	+ return null;
	4111	+ }
	4112	+ }
	4113	+
	4114	+ static public Object clone(Object o)
	4115	+ {
	4116	+ try
	4117	+ {
	4118	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4119	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4120	+
	4121	+ out.writeObject(o);
	4122	+
	4123	+ out.flush();
	4124	+ out.close();
	4125	+
	4126	+ byte[] bytes = baos.toByteArray();
	4127	+
	4128	+ System.out.println("clone = " + bytes.length);
	4129	+
	4130	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4131	+ ObjectInputStream in = new ObjectInputStream(bais);
	4132	+ Object obj = in.readObject();
	4133	+ in.close();
	4134	+
	4135	+ return obj;
	4136	+ } catch (Exception e)
	4137	+ {
	4138	+ System.err.println(e);
	4139	+ return null;
	4140	+ }
	4141	+ }
	4142	+
	4143	+ cRadio GetCurrentTab()
	4144	+ {
	4145	+ cRadio ab;
	4146	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4147	+ {
	4148	+ ab = (cRadio)e.nextElement();
	4149	+ if(ab.GetObject() == copy)
	4150	+ {
	4151	+ return ab;
	4152	+ }
	4153	+ }
	4154	+
	4155	+ return null;
	4156	+ }
	4157	+
	4158	+
	4159	+ public void Save()
	4160	+ {
	4161	+ //Save(true);
	4162	+ Replace();
	4163	+ SetVersionStates();
	4164	+ }
	4165	+
	4166	+ private boolean Equal(byte[] compress, byte[] name)
	4167	+ {
	4168	+ if (compress.length != name.length)
	4169	+ {
	4170	+ return false;
	4171	+ }
	4172	+
	4173	+ for (int i=compress.length; --i>=0;)
	4174	+ {
	4175	+ if (compress[i] != name[i])
	4176	+ return false;
	4177	+ }
	4178	+
	4179	+ return true;
	4180	+ }
	4181	+
	4182	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4183	+
	4184	+ void DeleteVersion()
	4185	+ {
	4186	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4187	+ {
	4188	+ copy.versionlist[i] = copy.versionlist[i+1];
	4189	+ }
	4190	+
	4191	+ CopyChanged();
	4192	+
	4193	+ SetVersionStates();
	4194	+ }
	4195	+
	4196	+ public boolean Save(boolean user)
	4197	+ {
	4198	+ System.err.println("Save");
	4199	+ Replace();
	4200	+
	4201	+ //cRadio tab = GetCurrentTab();
	4202	+
	4203	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4204	+
	4205	+ boolean thesame = false;
	4206	+
	4207	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4208	+// {
	4209	+// thesame = true;
	4210	+// }
	4211	+
	4212	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4213	+ if (!thesame)
	4214	+ {
	4215	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4216	+ {
	4217	+ copy.versionlist[i] = copy.versionlist[i-1];
	4218	+ }
	4219	+
	4220	+ //tab.user[tab.versionindex] = user;
	4221	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4222	+
	4223	+ copy.versionlist[++copy.versionindex] = compress;
	4224	+
	4225	+ // if (increment)
	4226	+ // tab.versionindex++;
	4227	+ }
	4228	+
	4229	+ //copy.RestoreBigData(versiontable);
	4230	+
	4231	+ //assert(hashtable.isEmpty());
	4232	+
	4233	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4234	+// {
	4235	+// //tab.user[i] = false;
	4236	+// copy.versionlist[i] = null;
	4237	+// }
	4238	+
	4239	+ SetVersionStates();
	4240	+
	4241	+ // test save
	4242	+ if (false)
	4243	+ {
	4244	+ try
	4245	+ {
	4246	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4247	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4248	+
	4249	+ p.writeObject(copy);
	4250	+
	4251	+ p.flush();
	4252	+
	4253	+ ostream.close();
	4254	+ } catch (Exception e)
	4255	+ {
	4256	+ e.printStackTrace();
	4257	+ }
	4258	+ }
	4259	+
	4260	+ return !thesame;
	4261	+ }
	4262	+
	4263	+ boolean flashIt = true;
	4264	+
	4265	+ void RefreshSelection()
	4266	+ {
	4267	+ Object3D selection = new Object3D();
	4268	+
	4269	+ for (int i = 0; i < copy.selection.size(); i++)
	4270	+ {
	4271	+ Object3D elem = copy.selection.elementAt(i);
	4272	+
	4273	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4274	+
	4275	+ if (obj == null)
	4276	+ {
	4277	+ copy.selection.remove(i--);
	4278	+ }
	4279	+ else
	4280	+ {
	4281	+ selection.add(obj);
	4282	+ copy.selection.setElementAt(obj, i);
	4283	+ }
	4284	+ }
	4285	+
	4286	+ flashIt = false;
	4287	+ GetTree().clearSelection();
	4288	+ for (int i = 0; i < selection.size(); i++)
	4289	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4290	+ flashIt = true;
	4291	+
	4292	+ //refreshContents(false);
	4293	+ }
	4294	+
	4295	+ void CopyChanged()
	4296	+ {
	4297	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4298	+
	4299	+ SetVersionStates();
	4300	+
	4301	+ boolean temp = CameraPane.SWITCH;
	4302	+ CameraPane.SWITCH = false;
	4303	+
	4304	+ copy.ExtractBigData(versiontable);
	4305	+
	4306	+ copy.clear();
	4307	+
	4308	+ copy.skyboxname = obj.skyboxname;
	4309	+ copy.skyboxext = obj.skyboxext;
	4310	+
	4311	+ for (int i=0; i<obj.Size(); i++)
	4312	+ {
	4313	+ copy.add(obj.get(i));
	4314	+ }
	4315	+
	4316	+ copy.RestoreBigData(versiontable);
	4317	+
	4318	+ CameraPane.SWITCH = temp;
	4319	+
	4320	+ RefreshSelection();
	4321	+ //assert(hashtable.isEmpty());
	4322	+
	4323	+ copy.Touch();
	4324	+
	4325	+ ResetModel();
	4326	+ copy.HardTouch(); // recompile?
	4327	+
	4328	+ cRadio ab;
	4329	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4330	+ {
	4331	+ ab = (cRadio)e.nextElement();
	4332	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4333	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4334	+ if (test != null)
	4335	+ {
	4336	+ test.editWindow = ab.object.editWindow;
	4337	+ ab.object = test;
	4338	+ }
	4339	+ }
	4340	+
	4341	+ refreshContents(true);
	4342	+ }
	4343	+
	4344	+ cButton previousVersionButton;
	4345	+ cButton restoreButton;
	4346	+ cButton replaceButton;
	4347	+ cButton nextVersionButton;
	4348	+ cButton saveVersionButton;
	4349	+ cButton deleteVersionButton;
	4350	+
	4351	+ boolean muteSlider;
	4352	+
	4353	+ int VersionCount()
	4354	+ {
	4355	+ int count = 0;
	4356	+
	4357	+ for (int i = copy.versionlist.length; --i >= 0;)
	4358	+ {
	4359	+ if (copy.versionlist[i] != null)
	4360	+ count++;
	4361	+ }
	4362	+
	4363	+ return count;
	4364	+ }
	4365	+
	4366	+ void SetVersionStates()
	4367	+ {
	4368	+ //if (true)
	4369	+ // return;
	4370	+
	4371	+ //cRadio tab = GetCurrentTab();
	4372	+
	4373	+ restoreButton.setEnabled(copy.versionindex != -1);
	4374	+ replaceButton.setEnabled(copy.versionindex != -1);
	4375	+
	4376	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4377	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4378	+
	4379	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4380	+ copy.versionlist[copy.versionindex + 1] != null);
	4381	+
	4382	+ muteSlider = true;
	4383	+ versionSlider.setMinimum(0);
	4384	+ versionSlider.setMaximum(VersionCount() - 1);
	4385	+ versionSlider.setInteger(copy.versionindex);
	4386	+ versionSlider.setEnabled(copy.versionindex != -1);
	4387	+ muteSlider = false;
	4388	+ }
	4389	+
	4390	+ public boolean PreviousVersion()
	4391	+ {
	4392	+ // Option?
	4393	+ Replace();
	4394	+
	4395	+ System.err.println("Undo");
	4396	+
	4397	+ //cRadio tab = GetCurrentTab();
	4398	+
	4399	+ if (copy.versionindex == 0)
	4400	+ {
	4401	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4402	+ return false;
	4403	+ }
	4404	+
	4405	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4406	+// {
	4407	+// if (Save(false))
	4408	+// tab.versionindex -= 1;
	4409	+// else
	4410	+// {
	4411	+// if (tab.versionindex <= 0)
	4412	+// return false;
	4413	+// else
	4414	+// tab.versionindex -= 1;
	4415	+// }
	4416	+// }
	4417	+
	4418	+ copy.versionindex -= 1;
	4419	+
	4420	+ CopyChanged();
	4421	+
	4422	+ return true;
	4423	+ }
	4424	+
	4425	+ public boolean Restore()
	4426	+ {
	4427	+ System.err.println("Restore");
	4428	+
	4429	+ //cRadio tab = GetCurrentTab();
	4430	+
	4431	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4432	+ {
	4433	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4434	+ return false;
	4435	+ }
	4436	+
	4437	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4438	+ CopyChanged();
	4439	+
	4440	+ return true;
	4441	+ }
	4442	+
	4443	+ public boolean Replace()
	4444	+ {
	4445	+ System.err.println("Replace");
	4446	+
	4447	+ //cRadio tab = GetCurrentTab();
	4448	+
	4449	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4450	+ {
	4451	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4452	+ return false;
	4453	+ }
	4454	+
	4455	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4456	+
	4457	+ return true;
	4458	+ }
	4459	+
	4460	+ public void NextVersion()
	4461	+ {
	4462	+ // Option?
	4463	+ Replace();
	4464	+
	4465	+ //cRadio tab = GetCurrentTab();
	4466	+
	4467	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4468	+ {
	4469	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4470	+ return;
	4471	+ }
	4472	+
	4473	+ copy.versionindex += 1;
	4474	+
	4475	+ CopyChanged();
	4476	+
	4477	+ //if (!tab.user[tab.versionindex])
	4478	+ // tab.graphs[tab.versionindex] = null;
	4479	+ }
	4480	+
	4481	+ void ImportGFD()
	4482	+ {
	4483	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4484	+ browser.show();
	4485	+ String filename = browser.getFile();
	4486	+ if (filename != null && filename.length() > 0)
	4487	+ {
	4488	+ String fullname = browser.getDirectory() + filename;
	4489	+
	4490	+ //Object3D readobj =
	4491	+ objEditor.ReadGFD(fullname, objEditor);
	4492	+ //makeSomething(readobj);
	4493	+ }
	4494	+ }
	4495	+
	4496	+ void ImportVRMLX3D()
	4497	+ {
	4498	+ if (Grafreed.standAlone)
	4499	+ {
	4500	+ /**/
	4501	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4502	+ browser.show();
	4503	+ String filename = browser.getFile();
	4504	+ if (filename != null && filename.length() > 0)
	4505	+ {
	4506	+ String fullname = browser.getDirectory() + filename;
	4507	+ LoadVRMLX3D(fullname);
	4508	+ }
	4509	+ /**/
	4510	+ }
	4511	+ }
	4512	+
3242	4513	void ToggleAnimation()
3243	4514	{
3244	4515	if (!Globals.ANIMATION)
..	..	@@ -3254,8 +4525,8 @@
3254	4525
3255	4526	Globals.ANIMATION ^= true;
3256	4527
3257		- GrafreeD.wav.cursor = 0;
3258		- GrafreeD.wav.loop = 0;
	4528	+ Grafreed.wav.cursor = 0;
	4529	+ Grafreed.wav.loop = 0;
3259	4530	}
3260	4531	} else
3261	4532	{
..	..	@@ -3276,7 +4547,6 @@
3276	4547	callee.refreshContents();
3277	4548	} else
3278	4549	{
3279		- new Exception().printStackTrace();
3280	4550	System.exit(0);
3281	4551	}
3282	4552	}
..	..	@@ -3357,7 +4627,7 @@
3357	4627	assert false;
3358	4628	}
3359	4629
3360		- void EditSelection()
	4630	+ void EditSelection(boolean newWindow)
3361	4631	{
3362	4632	}
3363	4633
..	..	@@ -3416,7 +4686,7 @@
3416	4686	//copy.material = new cMaterial(copy.GetMaterial());
3417	4687
3418	4688	current.color = (float) colorField.getFloat();
3419		- current.modulation = (float) modulationField.getFloat();
	4689	+ current.modulation = (float) saturationField.getFloat();
3420	4690	current.metalness = (float) metalnessField.getFloat();
3421	4691	current.diffuse = (float) diffuseField.getFloat();
3422	4692	current.specular = (float) specularField.getFloat();
..	..	@@ -3443,6 +4713,36 @@
3443	4713	{
3444	4714	//System.out.println("Propagate = " + propagate);
3445	4715	copy.UpdateMaterial(anchor, current, propagate);
	4716	+
	4717	+ if (copy.material != null)
	4718	+ {
	4719	+ cMaterial mat = copy.material;
	4720	+
	4721	+ colorField.SetToolTipValue((mat.color));
	4722	+ saturationField.SetToolTipValue((mat.modulation));
	4723	+ metalnessField.SetToolTipValue((mat.metalness));
	4724	+ diffuseField.SetToolTipValue((mat.diffuse));
	4725	+ specularField.SetToolTipValue((mat.specular));
	4726	+ shininessField.SetToolTipValue((mat.shininess));
	4727	+ shiftField.SetToolTipValue((mat.shift));
	4728	+ ambientField.SetToolTipValue((mat.ambient));
	4729	+ lightareaField.SetToolTipValue((mat.lightarea));
	4730	+ diffusenessField.SetToolTipValue((mat.factor));
	4731	+ velvetField.SetToolTipValue((mat.velvet));
	4732	+ sheenField.SetToolTipValue((mat.sheen));
	4733	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4734	+ backlitField.SetToolTipValue((mat.bump));
	4735	+ anisoField.SetToolTipValue((mat.aniso));
	4736	+ anisoVField.SetToolTipValue((mat.anisoV));
	4737	+ cameraField.SetToolTipValue((mat.cameralight));
	4738	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4739	+ shadowField.SetToolTipValue((mat.shadow));
	4740	+ textureField.SetToolTipValue((mat.texture));
	4741	+ opacityField.SetToolTipValue((mat.opacity));
	4742	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4743	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4744	+ }
	4745	+
3446	4746	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447	4747	{
3448	4748	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3471,9 +4771,26 @@
3471	4771	//copy.Touch();
3472	4772	}
3473	4773
	4774	+ cNumberSlider versionSlider;
	4775	+
3474	4776	public void stateChanged(ChangeEvent e)
3475	4777	{
3476	4778	// assert(false);
	4779	+ if (e.getSource() == versionSlider)
	4780	+ {
	4781	+ if (muteSlider)
	4782	+ return;
	4783	+
	4784	+ int version = versionSlider.getInteger();
	4785	+
	4786	+ if (version != -1 && copy.versionlist[version] != null)
	4787	+ {
	4788	+ copy.versionindex = version;
	4789	+ CopyChanged();
	4790	+ }
	4791	+
	4792	+ return;
	4793	+ }
3477	4794
3478	4795	if (freezematerial)
3479	4796	{
..	..	@@ -3509,6 +4826,12 @@
3509	4826	{
3510	4827	//System.out.println("stateChanged = " + this);
3511	4828	materialtouched = true;
	4829	+
	4830	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4831	+ {
	4832	+ saturationField.setFloat(1);
	4833	+ }
	4834	+
3512	4835	applySelf();
3513	4836	//System.out.println("this = " + this);
3514	4837	//System.out.println("PARENT = " + parent);
..	..	@@ -3558,7 +4881,7 @@
3558	4881	}
3559	4882
3560	4883	if (normalpushField != null)
3561		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4884	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3562	4885	}
3563	4886
3564	4887	void SnapObject()
..	..	@@ -3808,6 +5131,7 @@
3808	5131	{
3809	5132	if (GetTree() != null)
3810	5133	{
	5134	+ GetTree().revalidate();
3811	5135	GetTree().repaint();
3812	5136	}
3813	5137
..	..	@@ -3816,12 +5140,17 @@
3816	5140	ctrlPanel.validate(); // ? new
3817	5141	ctrlPanel.repaint();
3818	5142	}
	5143	+
	5144	+ if (previousVersionButton != null && copy.versionlist != null)
	5145	+ SetVersionStates();
3819	5146	}
3820	5147
3821	5148	static TweenManager tweenManager = new TweenManager();
3822	5149
3823	5150	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3824	5151	{
	5152	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5153	+ Save();
3825	5154	//Tween.set(thing, 0).target(1).start(tweenManager);
3826	5155	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3827	5156	// if (thing instanceof GenericJointDemo)
..	..	@@ -3908,6 +5237,12 @@
3908	5237	{
3909	5238	ResetModel();
3910	5239	Select(thing.GetTreePath(), true, false); // unselect... false);
	5240	+
	5241	+ if (thing.Size() == 0)
	5242	+ {
	5243	+ //EditSelection(false);
	5244	+ }
	5245	+
3911	5246	refreshContents();
3912	5247	}
3913	5248
..	..	@@ -4025,6 +5360,7 @@
4025	5360	}
4026	5361	}
4027	5362	}
	5363	+
4028	5364	LoadGFDThread loadGFDThread;
4029	5365
4030	5366	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4044,8 +5380,10 @@
4044	5380
4045	5381	try
4046	5382	{
	5383	+ // Try compressed version first.
4047	5384	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5385	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5386	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4049	5387
4050	5388	readobj = (Object3D) p.readObject();
4051	5389	istream.close();
..	..	@@ -4053,7 +5391,22 @@
4053	5391	readobj.ResetDisplayList();
4054	5392	} catch (Exception e)
4055	5393	{
4056		- e.printStackTrace();
	5394	+ if (!e.toString().contains("GZIP"))
	5395	+ e.printStackTrace();
	5396	+
	5397	+ try
	5398	+ {
	5399	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5400	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5401	+
	5402	+ readobj = (Object3D) p.readObject();
	5403	+ istream.close();
	5404	+
	5405	+ readobj.ResetDisplayList();
	5406	+ } catch (Exception e2)
	5407	+ {
	5408	+ e2.printStackTrace();
	5409	+ }
4057	5410	}
4058	5411	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4059	5412	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4099,6 +5452,12 @@
4099	5452
4100	5453	void LoadIt(Object obj)
4101	5454	{
	5455	+ if (obj == null)
	5456	+ {
	5457	+ // Invalid file
	5458	+ return;
	5459	+ }
	5460	+
4102	5461	System.out.println("Loaded " + obj);
4103	5462	//new Exception().printStackTrace();
4104	5463	Object3D readobj = (Object3D) obj;
..	..	@@ -4108,10 +5467,14 @@
4108	5467
4109	5468	if (readobj != null)
4110	5469	{
	5470	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5471	+ // Save();
4111	5472	try
4112	5473	{
4113	5474	//readobj.deepCopySelf(copy);
4114	5475	copy.clear(); // june 2014
	5476	+ copy.skyboxname = readobj.skyboxname;
	5477	+ copy.skyboxext = readobj.skyboxext;
4115	5478	for (int i = 0; i < readobj.size(); i++)
4116	5479	{
4117	5480	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4152,6 +5515,7 @@
4152	5515	}
4153	5516	} catch (ClassCastException e)
4154	5517	{
	5518	+ e.printStackTrace();
4155	5519	assert (false);
4156	5520	Composite c = (Composite) copy;
4157	5521	c.children.clear();
..	..	@@ -4162,17 +5526,31 @@
4162	5526	c.addChild(csg);
4163	5527	}
4164	5528
	5529	+ copy.versionlist = readobj.versionlist;
	5530	+ copy.versionindex = readobj.versionindex;
	5531	+
	5532	+ if (copy.versionlist == null)
	5533	+ {
	5534	+ // Backward compatibility
	5535	+ copy.versionlist = new Object3D[100];
	5536	+ copy.versionindex = -1;
	5537	+
	5538	+ Save(true);
	5539	+ }
	5540	+
	5541	+ //? SetUndoStates();
	5542	+
4165	5543	ResetModel();
4166	5544	copy.HardTouch(); // recompile?
4167	5545	refreshContents();
4168	5546	}
4169	5547	}
4170	5548
4171		- void load() // throws ClassNotFoundException
	5549	+ void Open() // throws ClassNotFoundException
4172	5550	{
4173		- if (GrafreeD.standAlone)
	5551	+ if (Grafreed.standAlone)
4174	5552	{
4175		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5553	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4176	5554	browser.show();
4177	5555	String filename = browser.getFile();
4178	5556	if (filename != null && filename.length() > 0)
..	..	@@ -4249,6 +5627,8 @@
4249	5627
4250	5628	void save()
4251	5629	{
	5630	+ Replace();
	5631	+
4252	5632	if (lastname == null)
4253	5633	{
4254	5634	return;
..	..	@@ -4257,11 +5637,13 @@
4257	5637	try
4258	5638	{
4259	5639	FileOutputStream ostream = new FileOutputStream(lastname);
4260		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5640	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5641	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4261	5642
4262	5643	p.writeObject(copy);
4263	5644	p.flush();
4264	5645
	5646	+ zstream.close();
4265	5647	ostream.close();
4266	5648
4267	5649	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4269,19 +5651,23 @@
4269	5651	//ps.print(buffer.toString());
4270	5652	} catch (IOException e)
4271	5653	{
	5654	+ e.printStackTrace();
4272	5655	}
4273	5656	}
	5657	+
4274	5658	String lastname;
4275	5659
4276	5660	void saveAs()
4277	5661	{
4278		- if (GrafreeD.standAlone)
	5662	+ if (Grafreed.standAlone)
4279	5663	{
4280	5664	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281	5665	browser.setVisible(true);
4282	5666	String filename = browser.getFile();
4283	5667	if (filename != null && filename.length() > 0)
4284	5668	{
	5669	+ if (!filename.endsWith(".gfd"))
	5670	+ filename += ".gfd";
4285	5671	lastname = browser.getDirectory() + filename;
4286	5672	save();
4287	5673	}
..	..	@@ -4380,13 +5766,13 @@
4380	5766	try
4381	5767	{
4382	5768	FileOutputStream ostream = new FileOutputStream(filename);
4383		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5769	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5770	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4385	5771
4386	5772	Object3D objectparent = obj.parent;
4387	5773	obj.parent = null;
4388	5774
4389		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5775	+ Object3D object = (Object3D) Grafreed.clone(obj);
4390	5776
4391	5777	obj.parent = objectparent;
4392	5778
..	..	@@ -4398,8 +5784,8 @@
4398	5784	p.writeObject(object);
4399	5785	p.flush();
4400	5786
	5787	+ zstream.close();
4401	5788	ostream.close();
4402		- // zstream.close();
4403	5789
4404	5790	// group.selection.get(0).parent = parent;
4405	5791	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4420,7 +5806,7 @@
4420	5806	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421	5807	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422	5808	copy.generatePOV(buffer);
4423		- if (GrafreeD.standAlone)
	5809	+ if (Grafreed.standAlone)
4424	5810	{
4425	5811	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426	5812	browser.show();
..	..	@@ -4446,19 +5832,18 @@
4446	5832	Object3D client;
4447	5833	Object3D copy;
4448	5834	MenuBar menuBar;
4449		- Menu windowMenu;
4450		- MenuItem loadItem;
	5835	+ Menu fileMenu;
	5836	+ MenuItem newItem;
	5837	+ MenuItem openItem;
4451	5838	MenuItem saveItem;
4452	5839	MenuItem saveAsItem;
4453	5840	MenuItem exportAsItem;
4454	5841	MenuItem reexportItem;
4455	5842	MenuItem povItem;
4456	5843	MenuItem closeItem;
4457		- Menu cameraMenu;
	5844	+
4458	5845	CheckboxMenuItem zBufferItem;
4459	5846	//MenuItem normalLensItem;
4460		- MenuItem editCameraItem;
4461		- MenuItem revertCameraItem;
4462	5847	MenuItem stepItem;
4463	5848	CheckboxMenuItem toggleLiveItem;
4464	5849	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4472,22 +5857,37 @@
4472	5857	CheckboxMenuItem toggleSwitchItem;
4473	5858	CheckboxMenuItem toggleRootItem;
4474	5859	CheckboxMenuItem animationItem;
	5860	+ MenuItem archiveItem;
4475	5861	CheckboxMenuItem toggleHandleItem;
4476	5862	CheckboxMenuItem togglePaintItem;
4477	5863	JSplitPane mainPanel;
4478	5864	JScrollPane scrollpane;
	5865	+
4479	5866	JPanel toolbarPanel;
	5867	+
4480	5868	cGridBag treePanel;
	5869	+
4481	5870	JPanel radioPanel;
4482	5871	ButtonGroup buttonGroup;
4483		- cGridBag ctrlPanel;
	5872	+
	5873	+ cGridBag toolboxPanel;
	5874	+ cGridBag skyboxPanel;
4484	5875	cGridBag materialPanel;
	5876	+ cGridBag ctrlPanel;
	5877	+
4485	5878	JScrollPane infoPanel;
	5879	+
4486	5880	cGridBag optionsPanel;
	5881	+
4487	5882	JTabbedPane objectPanel;
	5883	+ boolean materialFlushed;
	5884	+ Object3D latestObject;
	5885	+
4488	5886	cGridBag XYZPanel;
	5887	+
4489	5888	JSplitPane gridPanel;
4490	5889	JSplitPane bigPanel;
	5890	+
4491	5891	cGridBag bigThree;
4492	5892	cGridBag scenePanel;
4493	5893	cGridBag centralPanel;
..	..	@@ -4545,7 +5945,7 @@
4545	5945	JLabel colorLabel;
4546	5946	cNumberSlider colorField;
4547	5947	JLabel modulationLabel;
4548		- cNumberSlider modulationField;
	5948	+ cNumberSlider saturationField;
4549	5949	JLabel metalnessLabel;
4550	5950	cNumberSlider metalnessField;
4551	5951	JLabel diffuseLabel;
..	..	@@ -4576,6 +5976,7 @@
4576	5976	cNumberSlider anisoField;
4577	5977	JLabel anisoVLabel;
4578	5978	cNumberSlider anisoVField;
	5979	+
4579	5980	JLabel cameraLabel;
4580	5981	cNumberSlider cameraField;
4581	5982	JLabel selfshadowLabel;
..	..	@@ -4590,6 +5991,7 @@
4590	5991	cNumberSlider fakedepthField;
4591	5992	JLabel shadowbiasLabel;
4592	5993	cNumberSlider shadowbiasField;
	5994	+
4593	5995	JLabel bumpLabel;
4594	5996	cNumberSlider bumpField;
4595	5997	JLabel noiseLabel;
..	..	@@ -4602,8 +6004,13 @@
4602	6004	cNumberSlider fogField;
4603	6005	JLabel opacityPowerLabel;
4604	6006	cNumberSlider opacityPowerField;
4605		- JTree jTree;
	6007	+ cTree jTree;
4606	6008	//ObjectUI parent;
4607	6009
4608	6010	cNumberSlider normalpushField;
	6011	+
	6012	+ private MenuItem importGFDItem;
	6013	+ private MenuItem importVRMLX3DItem;
	6014	+ private MenuItem import3DSItem;
	6015	+ private MenuItem importOBJItem;
4609	6016	}