~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -30,11 +34,128 @@
30	34	iSendInfo
31	35	//KeyListener
32	36	{
	37	+ public cToggleButton pinButton;
33	38	boolean timeline;
34	39	boolean wasFullScreen;
35	40
36	41	GroupEditor callee;
37	42	JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
	82	+
	83	+ cButton GetButton(String name, boolean border)
	84	+ {
	85	+ ImageIcon icon = GetIcon(name);
	86	+ return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
	93	+ }
	94	+
	95	+ cToggleButton GetToggleButton(String name, boolean border)
	96	+ {
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
	99	+ }
	100	+
	101	+ cCheckBox GetCheckBox(String name, boolean border)
	102	+ {
	103	+ ImageIcon icon = GetIcon(name);
	104	+ return new cCheckBox(icon, border);
	105	+ }
	106	+
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
	109	+ ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
	117	+ try
	118	+ {
	119	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	120	+
	121	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	122	+// {
	123	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	124	+// Graphics2D g = resized.createGraphics();
	125	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	126	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	127	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	128	+// g.dispose();
	129	+//
	130	+// image = resized;
	131	+// }
	132	+
	133	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
	137	+ return icon;
	138	+ }
	139	+ catch (Exception e)
	140	+ {
	141	+ //icons.put(name, null);
	142	+ return null;
	143	+ }
	144	+ }
	145	+
	146	+ BufferedImage GetImage(String name)
	147	+ {
	148	+ try
	149	+ {
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
	153	+ }
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
	158	+ }
38	159
39	160	// SCRIPT
40	161
..	..	@@ -145,7 +266,7 @@
145	266
146	267	objEditor.ctrlPanel.remove(namePanel);
147	268
148		- if (!GroupEditor.allparams)
	269	+ if (!allparams)
149	270	return;
150	271
151	272	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +289,8 @@
168	289	// objEditor.ctrlPanel.remove(remarkButton);
169	290
170	291	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	292	+ objEditor.ctrlPanel.remove(setupPanel2);
	293	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	294	objEditor.ctrlPanel.remove(pushPanel);
173	295	//objEditor.ctrlPanel.remove(fillPanel);
174	296
..	..	@@ -216,6 +338,14 @@
216	338	client = inClient;
217	339	copy = client;
218	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
219	349	// "this" is not called: SetupUI2(objEditor);
220	350	}
221	351
..	..	@@ -229,6 +359,14 @@
229	359	client = inClient;
230	360	copy = client;
231	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
232	370	SetupUI2(callee.GetEditor());
233	371	}
234	372
..	..	@@ -243,13 +381,15 @@
243	381	//localCopy.parent = null;
244	382
245	383	frame = new JFrame();
	384	+ frame.setUndecorated(false);
246	385	objEditor = this;
247	386	this.callee = callee;
248	387
249	388	//parent = p;
250	389
251	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
252		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
253	393	//gd.setFullScreenWindow(this);
254	394	//setResizable(false);
255	395	//if (!isDisplayable())
..	..	@@ -260,6 +400,14 @@
260	400	copy = localCopy;
261	401	copy.editWindow = this;
262	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
263	411	SetupMenu();
264	412
265	413	//SetupName(objEditor); // new
..	..	@@ -273,28 +421,49 @@
273	421	return frame.action(event, obj);
274	422	}
275	423
	424	+ // Cannot work without static
	425	+ static boolean allparams = true;
	426	+
	427	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	428	+
276	429	void SetupMenu()
277	430	{
278	431	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..."));
	432	+ menuBar.add(fileMenu = new Menu("File"));
	433	+ fileMenu.add(newItem = new MenuItem("New"));
	434	+ fileMenu.add(openItem = new MenuItem("Open..."));
	435	+
	436	+ //oe.menuBar.add(menu = new Menu("Include"));
	437	+ Menu menu = new Menu("Import");
	438	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	439	+ importOBJItem.addActionListener(this);
	440	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	441	+ import3DSItem.addActionListener(this);
	442	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	443	+ importVRMLX3DItem.addActionListener(this);
	444	+ menu.add("-");
	445	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	446	+ importGFDItem.addActionListener(this);
	447	+ fileMenu.add(menu);
	448	+ fileMenu.add("-");
	449	+
	450	+ fileMenu.add(saveItem = new MenuItem("Save"));
	451	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	452	//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("-");
	453	+ fileMenu.add("-");
	454	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	455	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	456	+ fileMenu.add("-");
289	457	if (client.parent != null)
290	458	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	459	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	460	} else
293	461	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	462	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	463	}
296	464
297		- loadItem.addActionListener(this);
	465	+ newItem.addActionListener(this);
	466	+ openItem.addActionListener(this);
298	467	saveItem.addActionListener(this);
299	468	saveAsItem.addActionListener(this);
300	469	exportAsItem.addActionListener(this);
..	..	@@ -302,101 +471,103 @@
302	471	//povItem.addActionListener(this);
303	472	closeItem.addActionListener(this);
304	473
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		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323		- toggleSwitchItem.addItemListener(this);
324		- toggleSwitchItem.setState(CameraPane.SWITCH);
325		-
326		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327		- toggleHandleItem.addItemListener(this);
328		- toggleHandleItem.setState(CameraPane.HANDLES);
329		-
330		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331		- togglePaintItem.addItemListener(this);
332		- togglePaintItem.setState(CameraPane.PAINTMODE);
333		-
334		- if (Globals.ADVANCED)
335		- {
336		- cameraMenu.add("-");
337		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338		- toggleLiveItem.addItemListener(this);
339		- toggleLiveItem.setState(Globals.isLIVE());
340		-
341		- cameraMenu.add(stepItem = new MenuItem("Step"));
342		- stepItem.addActionListener(this);
343		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344		- // toggleDLItem.addItemListener(this);
345		- // toggleDLItem.setState(false);
346		-
347		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348		- toggleRenderItem.addItemListener(this);
349		- toggleRenderItem.setState(!CameraPane.frozen);
350		-
351		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352		- toggleDebugItem.addItemListener(this);
353		- toggleDebugItem.setState(CameraPane.DEBUG);
354		-
355		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356		- toggleFrustumItem.addItemListener(this);
357		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
358		-
359		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360		- toggleFootContactItem.addItemListener(this);
361		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362		-
363		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364		- toggleTimelineItem.addItemListener(this);
365		- }
366		-
367		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
368		-// toggleRootItem.addItemListener(this);
369		-// toggleRootItem.setState(false);
370		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
371		-// animationItem.addItemListener(this);
372		-// animationItem.setState(CameraPane.ANIMATION);
373		- cameraMenu.add("-");
374		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
375		- editCameraItem.addActionListener(this);
376		-
377	474	objectPanel = new JTabbedPane();
	475	+
	476	+ ChangeListener changeListener = new ChangeListener()
	477	+ {
	478	+ //String name;
	479	+
	480	+ public void stateChanged(ChangeEvent changeEvent)
	481	+ {
	482	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	483	+// {
	484	+// if (latestObject != null)
	485	+// {
	486	+// refreshContents(true);
	487	+// SetMaterial(latestObject);
	488	+// }
	489	+//
	490	+// materialFlushed = true;
	491	+// }
	492	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	493	+// {
	494	+// if (listUI.size() == 0)
	495	+// EditSelection(false);
	496	+// }
	497	+
	498	+// if (objectPanel.getSelectedIndex() == 4)
	499	+// {
	500	+// name = copy.skyboxname;
	501	+//
	502	+// if (name == null)
	503	+// {
	504	+// name = "";
	505	+// }
	506	+//
	507	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	508	+// copy.skyboxext = "jpg";
	509	+// }
	510	+// else
	511	+// {
	512	+// if (name != null)
	513	+// {
	514	+// if (name.equals(""))
	515	+// {
	516	+// copy.skyboxname = null;
	517	+// copy.skyboxext = null;
	518	+// }
	519	+// else
	520	+// {
	521	+// copy.skyboxname = name;
	522	+// }
	523	+// }
	524	+// }
	525	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	526	+
	527	+// refreshContents(false); // To refresh Info tab
	528	+ cameraView.repaint();
	529	+ }
	530	+ };
	531	+ objectPanel.addChangeListener(changeListener);
	532	+
378	533	toolbarPanel = new JPanel();
379	534	toolbarPanel.setName("Toolbar");
	535	+
380	536	treePanel = new cGridBag();
381	537	treePanel.setName("Tree");
	538	+
	539	+ editPanel = new cGridBag().setVertical(true);
	540	+ //editPanel.setName("Edit");
	541	+
382	542	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383		- ctrlPanel.setName("Edit");
384		- materialPanel = new cGridBag().setVertical(true);
385		- materialPanel.setName("Material");
	543	+
	544	+ editCommandsPanel = new cGridBag();
	545	+ editPanel.add(editCommandsPanel);
	546	+ editPanel.add(ctrlPanel);
	547	+
	548	+ toolboxPanel = new cGridBag().setVertical(true);
	549	+ //toolboxPanel.setName("Toolbox");
	550	+
	551	+ skyboxPanel = new cGridBag().setVertical(true);
	552	+
	553	+ materialPanel = new cGridBag().setVertical(false);
	554	+ //materialPanel.setName("Material");
	555	+
386	556	/JTextPane/
387	557	infoarea = createTextPane();
388	558	doc = infoarea.getStyledDocument();
389	559
390	560	infoarea.setEditable(true);
391	561	SetText();
	562	+
392	563	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
393	564	// infoarea.setOpaque(false);
394	565	// //infoarea.setForeground(textcolor);
395	566	// TEXTAREA infoarea.setLineWrap(true);
396	567	// TEXTAREA infoarea.setWrapStyleWord(true);
397	568	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
398		- infoPanel.setPreferredSize(new Dimension(50, 200));
399		- infoPanel.setName("Info");
	569	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	570	+ //infoPanel.setName("Info");
400	571	//infoPanel.setLayout(new BorderLayout());
401	572	//infoPanel.add(createTextPane());
402	573
..	..	@@ -407,7 +578,14 @@
407	578	mainPanel.setDividerSize(9);
408	579	mainPanel.setDividerLocation(0.5); //1.0);
409	580	mainPanel.setResizeWeight(0.5);
410		-
	581	+
	582	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	583	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	584	+ divider.setDividerSize(15);
	585	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	586	+
	587	+ mainPanel.setUI(new BasicSplitPaneUI());
	588	+
411	589	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
412	590	//mainPanel.setLayout(new GridBagLayout());
413	591	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -475,10 +653,10 @@
475	653	e.printStackTrace();
476	654	}
477	655
478		- String selection = infoarea.getText();
479		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
480		- java.awt.datatransfer.Clipboard clipboard =
481		- Toolkit.getDefaultToolkit().getSystemClipboard();
	656	+// String selection = infoarea.getText();
	657	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	658	+// java.awt.datatransfer.Clipboard clipboard =
	659	+// Toolkit.getDefaultToolkit().getSystemClipboard();
482	660	//clipboard.setContents(data, data);
483	661	}
484	662
..	..	@@ -638,21 +816,164 @@
638	816	}
639	817	}
640	818
	819	+//static GraphicsDevice device = GraphicsEnvironment
	820	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	821	+
	822	+ Rectangle keeprect;
	823	+ cRadio radio;
	824	+
	825	+cButton keepButton;
	826	+ cButton twoButton; // Full 3D
	827	+ cButton sixButton;
	828	+ cButton threeButton;
	829	+ cButton sevenButton;
	830	+ cButton fourButton; // full panel
	831	+ cButton oneButton; // full XYZ
	832	+ //cButton currentLayout;
	833	+
	834	+ boolean maximized;
	835	+
	836	+ cButton fullscreenLayout;
	837	+ cButton expandedLayout;
	838	+
	839	+ void Minimize()
	840	+ {
	841	+ frame.setState(Frame.ICONIFIED);
	842	+ frame.validate();
	843	+ }
	844	+
	845	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	846	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	847	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	848	+ void Maximize()
	849	+ {
	850	+ if (CameraPane.FULLSCREEN)
	851	+ {
	852	+ ToggleFullScreen();
	853	+ }
	854	+
	855	+ if (maximized)
	856	+ {
	857	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	858	+ }
	859	+ else
	860	+ {
	861	+ keeprect = frame.getBounds();
	862	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	863	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	864	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	865	+// frame.setState(Frame.MAXIMIZED_BOTH);
	866	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	867	+ }
	868	+
	869	+ maximized ^= true;
	870	+
	871	+ frame.validate();
	872	+ }
	873	+
	874	+ cButton minButton;
	875	+ cButton maxButton;
	876	+ cButton fullButton;
	877	+ cButton collapseButton;
	878	+ cButton maximize3DButton;
	879	+
641	880	void ToggleFullScreen()
642	881	{
643		- if (CameraPane.FULLSCREEN)
	882	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	883	+
	884	+ cameraView.ToggleFullScreen();
	885	+
	886	+ if (!CameraPane.FULLSCREEN)
644	887	{
645		- frame.getContentPane().remove(/"Center",/bigThree);
646		- framePanel.add(bigThree);
647		- frame.getContentPane().add(/"Center",/framePanel);
	888	+ device.setFullScreenWindow(null);
	889	+ frame.dispose();
	890	+ frame.setUndecorated(false);
	891	+ frame.validate();
	892	+ frame.setVisible(true);
	893	+
	894	+ //frame.setVisible(false);
	895	+// frame.removeNotify();
	896	+// frame.setUndecorated(false);
	897	+// frame.addNotify();
	898	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	899	+
	900	+// X frame.getContentPane().remove(/"Center",/bigThree);
	901	+// X framePanel.add(bigThree);
	902	+// X frame.getContentPane().add(/"Center",/framePanel);
	903	+// framePanel.setDividerLocation(46); // icons are 24x24
	904	+
	905	+ //frame.setVisible(true);
	906	+// radio.layout = keepButton;
	907	+ //theFrame = null;
	908	+ keepButton = null;
	909	+// radio.layout.doClick();
	910	+
648	911	} else
649	912	{
650		- frame.getContentPane().remove(/"Center",/framePanel);
651		- framePanel.remove(bigThree);
652		- frame.getContentPane().add(/"Center",/bigThree);
	913	+ keepButton = radio.layout;
	914	+ //keeprect = frame.getBounds();
	915	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	916	+// frame.getToolkit().getScreenSize().height);
	917	+ //frame.setVisible(false);
	918	+
	919	+ frame.dispose();
	920	+ frame.setUndecorated(true);
	921	+ device.setFullScreenWindow(frame);
	922	+ frame.validate();
	923	+ frame.setVisible(true);
	924	+// frame.removeNotify();
	925	+// frame.setUndecorated(true);
	926	+// frame.addNotify();
	927	+// X frame.getContentPane().remove(/"Center",/framePanel);
	928	+// X framePanel.remove(bigThree);
	929	+// X frame.getContentPane().add(/"Center",/bigThree);
	930	+// framePanel.setDividerLocation(0);
	931	+
	932	+// radio.layout = fullscreenLayout;
	933	+// radio.layout.doClick();
	934	+ //frame.setVisible(true);
653	935	}
654		- cameraView.ToggleFullScreen();
	936	+ frame.validate();
	937	+
	938	+ cameraView.requestFocusInWindow();
655	939	}
	940	+
	941	+ void CollapseToolbar()
	942	+ {
	943	+ framePanel.setDividerLocation(0);
	944	+ //frame.validate();
	945	+
	946	+ cameraView.requestFocusInWindow();
	947	+ }
	948	+
	949	+ private Object3D Duplicate(Object3D object)
	950	+ {
	951	+ boolean temp = CameraPane.SWITCH;
	952	+ CameraPane.SWITCH = false;
	953	+
	954	+ if (Grafreed.grafreed.universe.versiontable == null)
	955	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	956	+
	957	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	958	+ // if (copy == client)
	959	+
	960	+ Object3D versions[] = object.versionlist;
	961	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	962	+ object.versionlist = null;
	963	+ object.versiontable = null;
	964	+
	965	+ //byte[] compress = Compress(copy);
	966	+ Object3D compress = (Object3D)Grafreed.clone(object);
	967	+
	968	+ object.versionlist = versions;
	969	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	970	+
	971	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	972	+
	973	+ CameraPane.SWITCH = temp;
	974	+
	975	+ return compress;
	976	+ }
656	977
657	978	private JTextPane createTextPane()
658	979	{
..	..	@@ -775,6 +1096,7 @@
775	1096	{
776	1097	SetupMaterial(materialPanel);
777	1098	}
	1099	+
778	1100	//SetupName();
779	1101	//SetupViews();
780	1102	}
..	..	@@ -784,7 +1106,7 @@
784	1106	// NumberSlider vDivsField;
785	1107	// JCheckBox endcaps;
786	1108	JCheckBox liveCB;
787		- JCheckBox selectCB;
	1109	+ JCheckBox selectableCB;
788	1110	JCheckBox hideCB;
789	1111	JCheckBox link2masterCB;
790	1112	JCheckBox markCB;
..	..	@@ -792,7 +1114,12 @@
792	1114	JCheckBox speedupCB;
793	1115	JCheckBox rewindCB;
794	1116	JCheckBox flipVCB;
	1117	+
	1118	+ cCheckBox toggleTextureCB;
	1119	+ cCheckBox toggleSwitchCB;
	1120	+
795	1121	JComboBox texresMenu;
	1122	+
796	1123	JButton resetButton;
797	1124	JButton stepButton;
798	1125	JButton stepAllButton;
..	..	@@ -801,9 +1128,13 @@
801	1128	JButton fasterButton;
802	1129	JButton remarkButton;
803	1130
	1131	+ cGridBag editPanel;
	1132	+ cGridBag editCommandsPanel;
	1133	+
804	1134	cGridBag namePanel;
805	1135	cGridBag setupPanel;
806		- cGridBag commandsPanel;
	1136	+ cGridBag setupPanel2;
	1137	+ cGridBag objectCommandsPanel;
807	1138	cGridBag pushPanel;
808	1139	cGridBag fillPanel;
809	1140
..	..	@@ -974,61 +1305,81 @@
974	1305
975	1306	namePanel = new cGridBag();
976	1307
	1308	+ //if (copy.pinned)
	1309	+ {
	1310	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1311	+ pinButton.setSelected(copy.pinned);
	1312	+ cGridBag t = new cGridBag();
	1313	+ t.preferredWidth = 2;
	1314	+ t.add(pinButton);
	1315	+ namePanel.add(t);
	1316	+
	1317	+ pinButton.addItemListener(this);
	1318	+ }
	1319	+
977	1320	nameField = AddText(namePanel, copy.GetName());
978		- namePanel.add(nameField);
	1321	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
979	1322	oe.ctrlPanel.add(namePanel);
980	1323
981	1324	oe.ctrlPanel.Return();
982	1325
983		- if (!GroupEditor.allparams)
	1326	+ if (!allparams)
984	1327	return;
985	1328
986	1329	setupPanel = new cGridBag().setVertical(false);
987	1330
988	1331	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
989	1332	liveCB.setToolTipText("Animate object");
990		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
991		- selectCB.setToolTipText("Make object selectable");
	1333	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1334	+ markCB.setToolTipText("Set target transform");
	1335	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1336	+ selectableCB.setToolTipText("Make object selectable");
992	1337	// Return();
	1338	+
993	1339	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
994	1340	hideCB.setToolTipText("Hide object");
995		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
996		- markCB.setToolTipText("Set the animation target transform");
997	1341
998		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1342	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1343	+
	1344	+ setupPanel2 = new cGridBag().setVertical(false);
	1345	+
	1346	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
999	1347	rewindCB.setToolTipText("Rewind animation");
1000	1348
1001		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
1002		- randomCB.setToolTipText("Option for switch node");
	1349	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1350	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1003	1351
	1352	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1353	+ link2masterCB.setToolTipText("Attach to support");
	1354	+
1004	1355	if (Globals.ADVANCED)
1005	1356	{
1006		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1007		- link2masterCB.setToolTipText("Attach to support");
1008		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1357	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1009	1358	speedupCB.setToolTipText("Option motion capture");
1010	1359	}
1011	1360
1012	1361	oe.ctrlPanel.add(setupPanel);
1013	1362	oe.ctrlPanel.Return();
	1363	+ oe.ctrlPanel.add(setupPanel2);
	1364	+ oe.ctrlPanel.Return();
1014	1365
1015		- commandsPanel = new cGridBag().setVertical(false);
	1366	+ objectCommandsPanel = new cGridBag().setVertical(false);
1016	1367
1017		- resetButton = AddButton(commandsPanel, "Reset");
	1368	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1018	1369	resetButton.setToolTipText("Jump to frame zero");
1019		- stepButton = AddButton(commandsPanel, "Step");
	1370	+ stepButton = AddButton(objectCommandsPanel, "Step");
1020	1371	stepButton.setToolTipText("Step one frame");
1021	1372	// resetAllButton = AddButton(oe, "Reset All");
1022	1373	// stepAllButton = AddButton(oe, "Step All");
1023	1374	// Return();
1024		- slowerButton = AddButton(commandsPanel, "Slow");
	1375	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1025	1376	slowerButton.setToolTipText("Decrease animation speed");
1026		- fasterButton = AddButton(commandsPanel, "Fast");
	1377	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1027	1378	fasterButton.setToolTipText("Increase animation speed");
1028		- remarkButton = AddButton(commandsPanel, "Remark");
	1379	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1029	1380	remarkButton.setToolTipText("Set the current transform as the target");
1030	1381
1031		- oe.ctrlPanel.add(commandsPanel);
	1382	+ oe.ctrlPanel.add(objectCommandsPanel);
1032	1383	oe.ctrlPanel.Return();
1033	1384
1034	1385	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1188,6 +1539,7 @@
1188	1539
1189	1540	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1190	1541	{
	1542	+ if (Globals.DEBUG)
1191	1543	System.out.println("CREATE CAMERAS");
1192	1544	cams = new cTemplate();
1193	1545	cams.name = "Cameras";
..	..	@@ -1234,8 +1586,11 @@
1234	1586	//worldPanel.setName("World");
1235	1587	centralPanel = new cGridBag();
1236	1588	centralPanel.preferredWidth = 20;
1237		- timelinePanel = new JPanel(new BorderLayout());
1238		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1589	+
	1590	+ if (Globals.ADVANCED)
	1591	+ {
	1592	+ timelinePanel = new JPanel(new BorderLayout());
	1593	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1239	1594
1240	1595	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1241	1596	cameraPanel.setContinuousLayout(true);
..	..	@@ -1244,7 +1599,10 @@
1244	1599	// cameraPanel.setDividerSize(9);
1245	1600	cameraPanel.setResizeWeight(1.0);
1246	1601
	1602	+ }
	1603	+
1247	1604	centralPanel.add(cameraView);
	1605	+ centralPanel.setFocusable(true);
1248	1606	//frame.setJMenuBar(timelineMenubar);
1249	1607	//centralPanel.add(timelinePanel);
1250	1608
..	..	@@ -1270,6 +1628,7 @@
1270	1628	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1271	1629	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1272	1630	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1631	+ //XYZPanel.setName("XYZ");
1273	1632
1274	1633	/*
1275	1634	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1306,14 +1665,30 @@
1306	1665
1307	1666	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1308	1667	//tmp.setName("Edit");
	1668	+ objectPanel.add(toolboxPanel);
	1669	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1670	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1671	+
1309	1672	objectPanel.add(materialPanel);
	1673	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1674	+ objectPanel.setToolTipTextAt(1, "Material");
	1675	+
	1676	+ objectPanel.add(skyboxPanel);
	1677	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1678	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1679	+
1310	1680	// JPanel north = new JPanel(new BorderLayout());
1311	1681	// north.setName("Edit");
1312	1682	// north.add(ctrlPanel, BorderLayout.NORTH);
1313	1683	// objectPanel.add(north);
1314		- objectPanel.add(ctrlPanel);
1315		- objectPanel.add(infoPanel);
1316		-
	1684	+ objectPanel.add(editPanel);
	1685	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1686	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1687	+
	1688	+ objectPanel.add(XYZPanel);
	1689	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1690	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1691	+
1317	1692	/*
1318	1693	aConstraints.gridx = 0;
1319	1694	aConstraints.gridwidth = 1;
..	..	@@ -1321,7 +1696,7 @@
1321	1696	aConstraints.gridy += 1;
1322	1697	aConstraints.gridwidth = 1;
1323	1698	mainPanel.add(objectPanel, aConstraints);
1324		- */
	1699	+ */
1325	1700
1326	1701	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1327	1702	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1333,14 +1708,12 @@
1333	1708	scrollpane.addMouseWheelListener(this); // Default not fast enough
1334	1709
1335	1710	/JTabbedPane/ scenePanel = new cGridBag();
1336		- scenePanel.preferredWidth = 6;
	1711	+ scenePanel.preferredWidth = 5;
1337	1712
1338	1713	JTabbedPane tabbedPane = new JTabbedPane();
1339	1714	tabbedPane.add(scrollpane);
1340	1715
1341		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1342		-
1343		- optionsPanel = new cGridBag().setVertical(true);
	1716	+ optionsPanel = new cGridBag().setVertical(false);
1344	1717
1345	1718	optionsPanel.setName("Options");
1346	1719
..	..	@@ -1348,8 +1721,15 @@
1348	1721
1349	1722	tabbedPane.add(optionsPanel);
1350	1723
	1724	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1725	+
1351	1726	scenePanel.add(tabbedPane);
1352	1727
	1728	+ //if (Globals.ADVANCED)
	1729	+// tabbedPane.add(infoPanel);
	1730	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1731	+// tabbedPane.setToolTipTextAt(3, "Information");
	1732	+
1353	1733	/*
1354	1734	cTree jTree = new cTree(null);
1355	1735	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1411,7 +1791,7 @@
1411	1791	bigThree = new cGridBag();
1412	1792	bigThree.addComponent(scenePanel);
1413	1793	bigThree.addComponent(centralPanel);
1414		- bigThree.addComponent(XYZPanel);
	1794	+ //bigThree.addComponent(XYZPanel);
1415	1795
1416	1796	// // SIDE EFFECT!!!
1417	1797	// aConstraints.gridx = 0;
..	..	@@ -1420,16 +1800,33 @@
1420	1800	// aConstraints.gridheight = 1;
1421	1801
1422	1802	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1423		- framePanel.setContinuousLayout(true);
1424		- framePanel.setOneTouchExpandable(true);
1425		- framePanel.setDividerLocation(0.8);
	1803	+
	1804	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1805	+ new java.beans.PropertyChangeListener()
	1806	+ {
	1807	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1808	+ {
	1809	+ if ((Integer)pce.getOldValue() == 1)
	1810	+ {
	1811	+ if (radio.layout != expandedLayout)
	1812	+ {
	1813	+ radio.layout = expandedLayout;
	1814	+ radio.layout.doClick();
	1815	+ }
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ framePanel.setContinuousLayout(false);
	1821	+ framePanel.setOneTouchExpandable(false);
	1822	+ //.setDividerLocation(0.8);
1426	1823	//framePanel.setDividerSize(15);
1427	1824	//framePanel.setResizeWeight(0.15);
1428	1825	framePanel.setName("Frame");
1429	1826
1430	1827	frame.getContentPane().setLayout(new BorderLayout());
1431	1828	/**/
1432		- JTabbedPane worldPane = new JTabbedPane();
	1829	+ //JTabbedPane worldPane = new JTabbedPane();
1433	1830	//worldPane.add(bigPanel);
1434	1831	//worldPane.add(worldPanel);
1435	1832	/**/
..	..	@@ -1440,14 +1837,18 @@
1440	1837	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1441	1838
1442	1839	frame.setSize(1280, 860);
1443		- frame.setVisible(true);
1444		-
	1840	+
	1841	+ cameraView.requestFocusInWindow();
	1842	+
1445	1843	gridPanel.setDividerLocation(1.0);
	1844	+
	1845	+ frame.validate();
	1846	+
	1847	+ frame.setVisible(true);
1446	1848
1447	1849	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1448	1850	frame.addWindowListener(new WindowAdapter()
1449	1851	{
1450		-
1451	1852	public void windowClosing(WindowEvent e)
1452	1853	{
1453	1854	Close();
..	..	@@ -1470,12 +1871,418 @@
1470	1871	ctrlPanel.removeAll();
1471	1872	}
1472	1873
1473		- void SetupMaterial(cGridBag panel)
	1874	+ void SetupMaterial(cGridBag materialpanel)
1474	1875	{
1475		- /*
	1876	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1877	+
	1878	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1879	+ skin.setToolTipText("Skin");
	1880	+ skin.addMouseListener(new MouseAdapter()
	1881	+ {
	1882	+ public void mouseClicked(MouseEvent e)
	1883	+ {
	1884	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1885	+ cMaterial material = object.material;
	1886	+
	1887	+ // Skin
	1888	+ colorField.setFloat(material.color);
	1889	+ saturationField.setFloat(material.modulation);
	1890	+ subsurfaceField.setFloat(material.subsurface);
	1891	+ selfshadowField.setFloat(material.diffuseness);
	1892	+ diffusenessField.setFloat(material.factor);
	1893	+ shininessField.setFloat(material.shininess);
	1894	+ shadowbiasField.setFloat(material.shadowbias);
	1895	+ diffuseField.setFloat(material.diffuse);
	1896	+ specularField.setFloat(material.specular);
	1897	+
	1898	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1899	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1900	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1901	+
	1902	+ materialtouched = true;
	1903	+ applySelf();
	1904	+ }
	1905	+ });
	1906	+ presetpanel.add(skin);
	1907	+
	1908	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1909	+ lambert.setToolTipText("Diffuse");
	1910	+ lambert.addMouseListener(new MouseAdapter()
	1911	+ {
	1912	+ public void mouseClicked(MouseEvent e)
	1913	+ {
	1914	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1915	+ cMaterial material = object.material;
	1916	+
	1917	+ diffusenessField.setFloat(material.factor);
	1918	+ selfshadowField.setFloat(material.diffuseness);
	1919	+
	1920	+ materialtouched = true;
	1921	+ applySelf();
	1922	+ }
	1923	+ });
	1924	+ presetpanel.add(lambert);
	1925	+
	1926	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1927	+ diffuse2.setToolTipText("Diffuse2");
	1928	+ diffuse2.addMouseListener(new MouseAdapter()
	1929	+ {
	1930	+ public void mouseClicked(MouseEvent e)
	1931	+ {
	1932	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1933	+ cMaterial material = object.material;
	1934	+
	1935	+ diffusenessField.setFloat(material.factor);
	1936	+ selfshadowField.setFloat(material.diffuseness);
	1937	+
	1938	+ materialtouched = true;
	1939	+ applySelf();
	1940	+ }
	1941	+ });
	1942	+ presetpanel.add(diffuse2);
	1943	+
	1944	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1945	+ diffusemoon.setToolTipText("Moon");
	1946	+ diffusemoon.addMouseListener(new MouseAdapter()
	1947	+ {
	1948	+ public void mouseClicked(MouseEvent e)
	1949	+ {
	1950	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1951	+ cMaterial material = object.material;
	1952	+
	1953	+ diffusenessField.setFloat(material.factor);
	1954	+ selfshadowField.setFloat(material.diffuseness);
	1955	+
	1956	+ materialtouched = true;
	1957	+ applySelf();
	1958	+ }
	1959	+ });
	1960	+ presetpanel.add(diffusemoon);
	1961	+
	1962	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1963	+ diffusemoon2.setToolTipText("Moon2");
	1964	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1965	+ {
	1966	+ public void mouseClicked(MouseEvent e)
	1967	+ {
	1968	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1969	+ cMaterial material = object.material;
	1970	+
	1971	+ diffusenessField.setFloat(material.factor);
	1972	+ selfshadowField.setFloat(material.diffuseness);
	1973	+
	1974	+ materialtouched = true;
	1975	+ applySelf();
	1976	+ }
	1977	+ });
	1978	+ presetpanel.add(diffusemoon2);
	1979	+
	1980	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1981	+ diffusemoon3.setToolTipText("Moon3");
	1982	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1983	+ {
	1984	+ public void mouseClicked(MouseEvent e)
	1985	+ {
	1986	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1987	+ cMaterial material = object.material;
	1988	+
	1989	+ diffusenessField.setFloat(material.factor);
	1990	+ selfshadowField.setFloat(material.diffuseness);
	1991	+
	1992	+ materialtouched = true;
	1993	+ applySelf();
	1994	+ }
	1995	+ });
	1996	+ presetpanel.add(diffusemoon3);
	1997	+
	1998	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1999	+ diffusesheen.setToolTipText("Sheen");
	2000	+ diffusesheen.addMouseListener(new MouseAdapter()
	2001	+ {
	2002	+ public void mouseClicked(MouseEvent e)
	2003	+ {
	2004	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2005	+ cMaterial material = object.material;
	2006	+
	2007	+ sheenField.setFloat(material.sheen);
	2008	+
	2009	+ materialtouched = true;
	2010	+ applySelf();
	2011	+ }
	2012	+ });
	2013	+ presetpanel.add(diffusesheen);
	2014	+
	2015	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2016	+ rough.setToolTipText("Rough metal");
	2017	+ rough.addMouseListener(new MouseAdapter()
	2018	+ {
	2019	+ public void mouseClicked(MouseEvent e)
	2020	+ {
	2021	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2022	+ cMaterial material = object.material;
	2023	+
	2024	+ shininessField.setFloat(material.shininess);
	2025	+ velvetField.setFloat(material.velvet);
	2026	+
	2027	+ materialtouched = true;
	2028	+ applySelf();
	2029	+ }
	2030	+ });
	2031	+ presetpanel.add(rough);
	2032	+
	2033	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2034	+ rough2.setToolTipText("Medium metal");
	2035	+ rough2.addMouseListener(new MouseAdapter()
	2036	+ {
	2037	+ public void mouseClicked(MouseEvent e)
	2038	+ {
	2039	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2040	+ cMaterial material = object.material;
	2041	+
	2042	+ shininessField.setFloat(material.shininess);
	2043	+ lightareaField.setFloat(material.lightarea);
	2044	+
	2045	+ materialtouched = true;
	2046	+ applySelf();
	2047	+ }
	2048	+ });
	2049	+ presetpanel.add(rough2);
	2050	+
	2051	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2052	+ shini0.setToolTipText("Shiny");
	2053	+ shini0.addMouseListener(new MouseAdapter()
	2054	+ {
	2055	+ public void mouseClicked(MouseEvent e)
	2056	+ {
	2057	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2058	+ cMaterial material = object.material;
	2059	+
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ lightareaField.setFloat(material.lightarea);
	2062	+
	2063	+ materialtouched = true;
	2064	+ applySelf();
	2065	+ }
	2066	+ });
	2067	+ presetpanel.add(shini0);
	2068	+
	2069	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2070	+ shini1.setToolTipText("Shiny2");
	2071	+ shini1.addMouseListener(new MouseAdapter()
	2072	+ {
	2073	+ public void mouseClicked(MouseEvent e)
	2074	+ {
	2075	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2076	+ cMaterial material = object.material;
	2077	+
	2078	+ shininessField.setFloat(material.shininess);
	2079	+ lightareaField.setFloat(material.lightarea);
	2080	+
	2081	+ materialtouched = true;
	2082	+ applySelf();
	2083	+ }
	2084	+ });
	2085	+ presetpanel.add(shini1);
	2086	+
	2087	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2088	+ shini2.setToolTipText("Shiny3");
	2089	+ shini2.addMouseListener(new MouseAdapter()
	2090	+ {
	2091	+ public void mouseClicked(MouseEvent e)
	2092	+ {
	2093	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2094	+ cMaterial material = object.material;
	2095	+
	2096	+ shininessField.setFloat(material.shininess);
	2097	+ lightareaField.setFloat(material.lightarea);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(shini2);
	2104	+
	2105	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2106	+ aniso.setToolTipText("AnisoU");
	2107	+ aniso.addMouseListener(new MouseAdapter()
	2108	+ {
	2109	+ public void mouseClicked(MouseEvent e)
	2110	+ {
	2111	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2112	+ cMaterial material = object.material;
	2113	+
	2114	+ anisoField.setFloat(material.aniso);
	2115	+ anisoVField.setFloat(material.anisoV);
	2116	+
	2117	+ materialtouched = true;
	2118	+ applySelf();
	2119	+ }
	2120	+ });
	2121	+ presetpanel.add(aniso);
	2122	+
	2123	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2124	+ aniso2.setToolTipText("AnisoV");
	2125	+ aniso2.addMouseListener(new MouseAdapter()
	2126	+ {
	2127	+ public void mouseClicked(MouseEvent e)
	2128	+ {
	2129	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2130	+ cMaterial material = object.material;
	2131	+
	2132	+ anisoField.setFloat(material.aniso);
	2133	+ anisoVField.setFloat(material.anisoV);
	2134	+
	2135	+ materialtouched = true;
	2136	+ applySelf();
	2137	+ }
	2138	+ });
	2139	+ presetpanel.add(aniso2);
	2140	+
	2141	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2142	+ aniso3.setToolTipText("AnisoUV");
	2143	+ aniso3.addMouseListener(new MouseAdapter()
	2144	+ {
	2145	+ public void mouseClicked(MouseEvent e)
	2146	+ {
	2147	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2148	+ cMaterial material = object.material;
	2149	+
	2150	+ anisoField.setFloat(material.aniso);
	2151	+ anisoVField.setFloat(material.anisoV);
	2152	+
	2153	+ materialtouched = true;
	2154	+ applySelf();
	2155	+ }
	2156	+ });
	2157	+ presetpanel.add(aniso3);
	2158	+
	2159	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2160	+ velvet0.setToolTipText("Velvet");
	2161	+ velvet0.addMouseListener(new MouseAdapter()
	2162	+ {
	2163	+ public void mouseClicked(MouseEvent e)
	2164	+ {
	2165	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2166	+ cMaterial material = object.material;
	2167	+
	2168	+ diffusenessField.setFloat(material.factor);
	2169	+ selfshadowField.setFloat(material.diffuseness);
	2170	+ sheenField.setFloat(material.sheen);
	2171	+ shininessField.setFloat(material.shininess);
	2172	+ velvetField.setFloat(material.velvet);
	2173	+ shiftField.setFloat(material.shift);
	2174	+
	2175	+ materialtouched = true;
	2176	+ applySelf();
	2177	+ }
	2178	+ });
	2179	+ presetpanel.add(velvet0);
	2180	+
	2181	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2182	+ bump0.setToolTipText("Bump texture");
	2183	+ bump0.addMouseListener(new MouseAdapter()
	2184	+ {
	2185	+ public void mouseClicked(MouseEvent e)
	2186	+ {
	2187	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2188	+ cMaterial material = object.material;
	2189	+
	2190	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2191	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2192	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(bump0);
	2199	+
	2200	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2201	+ borderShader.setToolTipText("Border fade");
	2202	+ borderShader.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ borderfadeField.setFloat(0.5);
	2207	+ opacityField.setFloat(0.75);
	2208	+
	2209	+ materialtouched = true;
	2210	+ applySelf();
	2211	+ }
	2212	+ });
	2213	+ presetpanel.add(borderShader);
	2214	+
	2215	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2216	+ halo.setToolTipText("Halo");
	2217	+ halo.addMouseListener(new MouseAdapter()
	2218	+ {
	2219	+ public void mouseClicked(MouseEvent e)
	2220	+ {
	2221	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2222	+ cMaterial material = object.material;
	2223	+
	2224	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2225	+
	2226	+ materialtouched = true;
	2227	+ applySelf();
	2228	+ }
	2229	+ });
	2230	+ presetpanel.add(halo);
	2231	+
	2232	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2233	+ candle.setToolTipText("Candle");
	2234	+ candle.addMouseListener(new MouseAdapter()
	2235	+ {
	2236	+ public void mouseClicked(MouseEvent e)
	2237	+ {
	2238	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2239	+ cMaterial material = object.material;
	2240	+
	2241	+ subsurfaceField.setFloat(material.subsurface);
	2242	+ shadowbiasField.setFloat(material.shadowbias);
	2243	+ ambientField.setFloat(material.ambient);
	2244	+ specularField.setFloat(material.specular);
	2245	+ lightareaField.setFloat(material.lightarea);
	2246	+ shininessField.setFloat(material.shininess);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(candle);
	2253	+
	2254	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2255	+ shadowShader.setToolTipText("Shadow");
	2256	+ shadowShader.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ diffuseField.setFloat(0.001);
	2261	+ ambientField.setFloat(0.001);
	2262	+ cameraField.setFloat(0.001);
	2263	+ specularField.setFloat(0.001);
	2264	+ fakedepthField.setFloat(0.001);
	2265	+ opacityField.setFloat(0.6);
	2266	+
	2267	+ materialtouched = true;
	2268	+ applySelf();
	2269	+ }
	2270	+ });
	2271	+ presetpanel.add(shadowShader);
	2272	+
	2273	+ cGridBag panel = new cGridBag().setVertical(true);
	2274	+
	2275	+ presetpanel.preferredWidth = 1;
	2276	+
	2277	+ materialpanel.add(presetpanel);
	2278	+ materialpanel.add(panel);
	2279	+
	2280	+ panel.preferredWidth = 8;
	2281	+
	2282	+ /*
1476	2283	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1477	2284	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- */
	2285	+ */
1479	2286
1480	2287	cGridBag editBar = new cGridBag().setVertical(false);
1481	2288
..	..	@@ -1509,45 +2316,61 @@
1509	2316	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1510	2317
1511	2318	cGridBag colorSection = new cGridBag().setVertical(true);
	2319	+
	2320	+ cGridBag huepanel = new cGridBag();
	2321	+ cGridBag huelabel = new cGridBag();
	2322	+ cLabel hue = GetLabel("icons/hue.png", false);
	2323	+ hue.fit = true;
	2324	+
	2325	+ hue.addMouseListener(new MouseAdapter()
	2326	+ {
	2327	+ public void mousePressed(MouseEvent e)
	2328	+ {
	2329	+ int x = e.getX();
	2330	+
	2331	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2332	+ }
	2333	+ });
	2334	+
	2335	+ huelabel.add(hue);
	2336	+ huelabel.preferredWidth = 20;
	2337	+ huepanel.add(new cGridBag()); // Label
	2338	+ huepanel.add(huelabel); // Field/slider
	2339	+
	2340	+ huepanel.preferredHeight = 7;
	2341	+
	2342	+ colorSection.add(huepanel);
1512	2343
1513	2344	cGridBag color = new cGridBag();
1514		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1515		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1516		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2345	+
	2346	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2347	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2348	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2349	+
1517	2350	//colorField.preferredWidth = 200;
1518	2351	colorSection.add(color);
1519	2352
1520	2353	cGridBag modulation = new cGridBag();
1521	2354	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1522	2355	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1523		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2356	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1524	2357	colorSection.add(modulation);
1525	2358
	2359	+ cGridBag opacity = new cGridBag();
	2360	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2361	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2362	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2363	+ colorSection.add(opacity);
	2364	+
	2365	+ colorSection.add(GetSeparator());
	2366	+
1526	2367	cGridBag texture = new cGridBag();
1527	2368	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1528	2369	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529	2370	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1530	2371	colorSection.add(texture);
1531	2372
1532		- cGridBag anisoU = new cGridBag();
1533		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1534		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1536		- colorSection.add(anisoU);
1537		-
1538		- cGridBag anisoV = new cGridBag();
1539		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1540		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1542		- colorSection.add(anisoV);
1543		-
1544		- cGridBag shadowbias = new cGridBag();
1545		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1546		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548		- colorSection.add(shadowbias);
1549		-
1550		- panel.add(new JSeparator());
	2373	+ panel.add(GetSeparator());
1551	2374
1552	2375	panel.add(colorSection);
1553	2376
..	..	@@ -1597,7 +2420,13 @@
1597	2420	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1598	2421	diffuseSection.add(fakedepth);
1599	2422
1600		- panel.add(new JSeparator());
	2423	+ cGridBag shadowbias = new cGridBag();
	2424	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2425	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2426	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2427	+ diffuseSection.add(shadowbias);
	2428	+
	2429	+ panel.add(GetSeparator());
1601	2430
1602	2431	panel.add(diffuseSection);
1603	2432
..	..	@@ -1647,42 +2476,48 @@
1647	2476	// aConstraints.gridy += 1;
1648	2477	// aConstraints.gridwidth = 1;
1649	2478
	2479	+ cGridBag anisoU = new cGridBag();
	2480	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2481	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2482	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2483	+ specularSection.add(anisoU);
1650	2484
1651		- panel.add(new JSeparator());
	2485	+ cGridBag anisoV = new cGridBag();
	2486	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2487	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2488	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2489	+ specularSection.add(anisoV);
	2490	+
	2491	+
	2492	+ panel.add(GetSeparator());
1652	2493
1653	2494	panel.add(specularSection);
1654	2495
1655	2496	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1656	2497
1657		- cGridBag globalSection = new cGridBag().setVertical(true);
	2498	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1658	2499
1659	2500	cGridBag camera = new cGridBag();
1660	2501	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1661	2502	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662	2503	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1663		- globalSection.add(camera);
	2504	+ colorSection.add(camera);
1664	2505
1665	2506	cGridBag ambient = new cGridBag();
1666	2507	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1667	2508	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668	2509	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1669		- globalSection.add(ambient);
	2510	+ colorSection.add(ambient);
1670	2511
1671	2512	cGridBag backlit = new cGridBag();
1672	2513	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1673	2514	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1674	2515	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1675		- globalSection.add(backlit);
	2516	+ colorSection.add(backlit);
1676	2517
1677		- cGridBag opacity = new cGridBag();
1678		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1679		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1681		- globalSection.add(opacity);
1682		-
1683		- panel.add(new JSeparator());
	2518	+ //panel.add(new JSeparator());
1684	2519
1685		- panel.add(globalSection);
	2520	+ //panel.add(globalSection);
1686	2521
1687	2522	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1688	2523
..	..	@@ -1724,7 +2559,7 @@
1724	2559	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1725	2560	textureSection.add(opacityPower);
1726	2561
1727		- panel.add(new JSeparator());
	2562	+ panel.add(GetSeparator());
1728	2563
1729	2564	panel.add(textureSection);
1730	2565
..	..	@@ -1789,8 +2624,9 @@
1789	2624	// 3D models
1790	2625	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1791	2626	{
1792		- lastConverter = new com.jmex.model.converters.MaxToJme();
1793		- LoadFile(filename, lastConverter);
	2627	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2628	+ //LoadFile(filename, lastConverter);
	2629	+ LoadObjFile(filename); // New 3ds loader
1794	2630	continue;
1795	2631	}
1796	2632	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1991,6 +2827,7 @@
1991	2827	e2.printStackTrace();
1992	2828	}
1993	2829	}
	2830	+
1994	2831	LoadJMEThread loadThread;
1995	2832
1996	2833	class LoadJMEThread extends Thread
..	..	@@ -2048,6 +2885,7 @@
2048	2885	//LoadFile0(filename, converter);
2049	2886	}
2050	2887	}
	2888	+
2051	2889	LoadOBJThread loadObjThread;
2052	2890
2053	2891	class LoadOBJThread extends Thread
..	..	@@ -2126,19 +2964,19 @@
2126	2964
2127	2965	void LoadObjFile(String fullname)
2128	2966	{
2129		- /*
	2967	+ System.out.println("Loading " + fullname);
	2968	+ /**/
2130	2969	//lastFilename = fullname;
2131	2970	if(loadObjThread == null)
2132	2971	{
2133		- loadObjThread = new LoadOBJThread();
2134		- loadObjThread.start();
	2972	+ loadObjThread = new LoadOBJThread();
	2973	+ loadObjThread.start();
2135	2974	}
2136	2975
2137	2976	loadObjThread.add(fullname);
2138		- */
	2977	+ /**/
2139	2978
2140		- System.out.println("Loading " + fullname);
2141		- makeSomething(new FileObject(fullname, true), true);
	2979	+ //makeSomething(new FileObject(fullname, true), true);
2142	2980	}
2143	2981
2144	2982	void LoadGFDFile(String fullname)
..	..	@@ -2514,6 +3352,7 @@
2514	3352	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2515	3353	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2516	3354	}
	3355	+
2517	3356	//cJME.count++;
2518	3357	//cJME.count %= 12;
2519	3358	if (gc)
..	..	@@ -2697,6 +3536,7 @@
2697	3536	}
2698	3537	}
2699	3538	}
	3539	+
2700	3540	cFileSystemPane FSPane;
2701	3541
2702	3542	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2706,7 +3546,7 @@
2706	3546
2707	3547	freezematerial = true;
2708	3548	colorField.setFloat(mat.color);
2709		- modulationField.setFloat(mat.modulation);
	3549	+ saturationField.setFloat(mat.modulation);
2710	3550	metalnessField.setFloat(mat.metalness);
2711	3551	diffuseField.setFloat(mat.diffuse);
2712	3552	specularField.setFloat(mat.specular);
..	..	@@ -2750,11 +3590,14 @@
2750	3590	}
2751	3591	}
2752	3592	}
	3593	+
2753	3594	freezematerial = false;
2754	3595	}
2755	3596
2756	3597	void SetMaterial(Object3D object)
2757	3598	{
	3599	+ latestObject = object;
	3600	+
2758	3601	cMaterial mat = object.material;
2759	3602
2760	3603	if (mat == null)
..	..	@@ -2765,32 +3608,8 @@
2765	3608
2766	3609	if (multiplyToggle != null)
2767	3610	multiplyToggle.setSelected(mat.multiply);
2768		-
2769		- assert (object.projectedVertices != null);
2770		-
2771		- if (object.projectedVertices.length <= 2)
2772		- {
2773		- // Side effect...
2774		- Object3D.cVector2[] keep = object.projectedVertices;
2775		- object.projectedVertices = new Object3D.cVector2[3];
2776		- for (int i = 0; i < 3; i++)
2777		- {
2778		- if (i < keep.length)
2779		- {
2780		- object.projectedVertices[i] = keep[i];
2781		- } else
2782		- {
2783		- object.projectedVertices[i] = new Object3D.cVector2();
2784		- }
2785		- /*
2786		- if(keep.length == 0)
2787		- object.projectedVertices[0] = new Object3D.cVector2();
2788		- else
2789		- object.projectedVertices[0] = keep[0];
2790		- object.projectedVertices[1] = new Object3D.cVector2();
2791		- */
2792		- }
2793		- }
	3611	+
	3612	+ AllocProjectedVertices(object);
2794	3613
2795	3614	SetMaterial(mat, object.projectedVertices);
2796	3615	}
..	..	@@ -2866,12 +3685,17 @@
2866	3685	// }
2867	3686
2868	3687	/**/
2869		- if (deselect)
	3688	+ if (deselect \|\| child == null)
2870	3689	{
2871	3690	//group.deselectAll();
2872	3691	//freeze = true;
2873	3692	GetTree().clearSelection();
2874	3693	//freeze = false;
	3694	+
	3695	+ if (child == null)
	3696	+ {
	3697	+ return;
	3698	+ }
2875	3699	}
2876	3700
2877	3701	//group.addSelectee(child);
..	..	@@ -2905,6 +3729,17 @@
2905	3729	public void itemStateChanged(ItemEvent event)
2906	3730	{
2907	3731	// System.out.println("Propagate = " + propagate);
	3732	+ if (event.getSource() == pinButton)
	3733	+ {
	3734	+ copy.pinned ^= true;
	3735	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3736	+ {
	3737	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3738	+ copy.CloseUI();
	3739	+ //copy.editWindow.refreshContents();
	3740	+ }
	3741	+ }
	3742	+ else
2908	3743	if (event.getSource() == propagateToggle)
2909	3744	{
2910	3745	propagate ^= true;
..	..	@@ -2940,7 +3775,7 @@
2940	3775	cameraView.ToggleDL();
2941	3776	cameraView.repaint();
2942	3777	return;
2943		- } else if (event.getSource() == toggleTextureItem)
	3778	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2944	3779	{
2945	3780	cameraView.ToggleTexture();
2946	3781	// june 2013 copy.HardTouch();
..	..	@@ -2979,9 +3814,9 @@
2979	3814	frame.validate();
2980	3815
2981	3816	return;
2982		- } else if (event.getSource() == toggleSwitchItem)
	3817	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2983	3818	{
2984		- cameraView.ToggleRandom();
	3819	+ cameraView.ToggleSwitch();
2985	3820	cameraView.repaint();
2986	3821	return;
2987	3822	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3009,8 +3844,9 @@
3009	3844	} else if (event.getSource() == liveCB)
3010	3845	{
3011	3846	copy.live ^= true;
	3847	+ objEditor.refreshContents(true); // To show item colors
3012	3848	return;
3013		- } else if (event.getSource() == selectCB)
	3849	+ } else if (event.getSource() == selectableCB)
3014	3850	{
3015	3851	copy.dontselect ^= true;
3016	3852	return;
..	..	@@ -3018,7 +3854,7 @@
3018	3854	{
3019	3855	copy.hide ^= true;
3020	3856	copy.Touch(); // display list issue
3021		- objEditor.refreshContents();
	3857	+ objEditor.refreshContents(true); // To show item colors
3022	3858	return;
3023	3859	} else if (event.getSource() == link2masterCB)
3024	3860	{
..	..	@@ -3052,8 +3888,9 @@
3052	3888
3053	3889	public void actionPerformed(ActionEvent event)
3054	3890	{
	3891	+ Object source = event.getSource();
3055	3892	// SCRIPT DIALOG
3056		- if (event.getSource() == okbutton)
	3893	+ if (source == okbutton)
3057	3894	{
3058	3895	textpanel.setVisible(false);
3059	3896	textpanel.remove(textarea);
..	..	@@ -3065,7 +3902,7 @@
3065	3902	textarea = null;
3066	3903	textpanel = null;
3067	3904	}
3068		- if (event.getSource() == cancelbutton)
	3905	+ if (source == cancelbutton)
3069	3906	{
3070	3907	textpanel.setVisible(false);
3071	3908	textpanel.remove(textarea);
..	..	@@ -3077,50 +3914,50 @@
3077	3914	//applySelf();
3078	3915	//client.refreshEditWindow();
3079	3916	//refreshContents();
3080		- if (event.getSource() == nameField)
	3917	+ if (source == nameField)
3081	3918	{
3082	3919	//System.out.println("ObjEditor " + event);
3083	3920	applySelf0(true);
3084	3921	//parent.applySelf();
3085		- objEditor.refreshContents();
3086		- } else if (event.getSource() == resetButton)
	3922	+ // conflicts with requestFocus objEditor.refreshContents();
	3923	+ } else if (source == resetButton)
3087	3924	{
3088	3925	CameraPane.fullreset = true;
3089	3926	copy.Reset(); // ResetMeshes();
3090	3927	copy.Touch();
3091	3928	objEditor.refreshContents();
3092		- } else if (event.getSource() == stepItem)
	3929	+ } else if (source == stepItem)
3093	3930	{
3094	3931	//cameraView.ONESTEP = true;
3095	3932	Globals.ONESTEP = true;
3096	3933	cameraView.repaint();
3097	3934	return;
3098		- } else if (event.getSource() == stepButton)
	3935	+ } else if (source == stepButton)
3099	3936	{
3100	3937	copy.Step();
3101	3938	copy.Touch();
3102	3939	objEditor.refreshContents();
3103		- } else if (event.getSource() == slowerButton)
	3940	+ } else if (source == slowerButton)
3104	3941	{
3105	3942	copy.Slower();
3106	3943	copy.Touch();
3107	3944	objEditor.refreshContents();
3108		- } else if (event.getSource() == fasterButton)
	3945	+ } else if (source == fasterButton)
3109	3946	{
3110	3947	copy.Faster();
3111	3948	copy.Touch();
3112	3949	objEditor.refreshContents();
3113		- } else if (event.getSource() == remarkButton)
	3950	+ } else if (source == remarkButton)
3114	3951	{
3115	3952	copy.Remark();
3116	3953	copy.Touch();
3117	3954	objEditor.refreshContents();
3118		- } else if (event.getSource() == stepAllButton)
	3955	+ } else if (source == stepAllButton)
3119	3956	{
3120	3957	copy.StepAll();
3121	3958	copy.Touch();
3122	3959	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetAllButton)
	3960	+ } else if (source == resetAllButton)
3124	3961	{
3125	3962	//CameraPane.fullreset = true;
3126	3963	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3153,53 +3990,79 @@
3153	3990	// Close();
3154	3991	// }
3155	3992	// else
3156		- if (event.getSource() == resetSlidersButton)
	3993	+ if (source == resetSlidersButton)
3157	3994	{
3158	3995	ResetSliders();
3159		- } else if (event.getSource() == clearMaterialButton)
	3996	+ } else if (source == clearMaterialButton)
3160	3997	{
3161	3998	ClearMaterial();
3162		- } else if (event.getSource() == createMaterialButton)
	3999	+ } else if (source == createMaterialButton)
3163	4000	{
3164	4001	CreateMaterial();
3165		- } else if (event.getSource() == clearPanelButton)
	4002	+ } else if (source == clearPanelButton)
3166	4003	{
3167	4004	copy.ClearUI();
3168	4005	refreshContents(true);
3169		- } /*
3170		- }
3171		-
3172		- public boolean action(Event event, Object arg)
3173		- {
3174		- */ else if (event.getSource() == closeItem)
	4006	+ } else if (source == importGFDItem)
	4007	+ {
	4008	+ ImportGFD();
	4009	+ } else
	4010	+ if (source == importVRMLX3DItem)
	4011	+ {
	4012	+ ImportVRMLX3D();
	4013	+ } else
	4014	+ if (source == import3DSItem)
	4015	+ {
	4016	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4017	+ } else
	4018	+ if (source == importOBJItem)
	4019	+ {
	4020	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4021	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4022	+ browser.setVisible(true);
	4023	+ String filename = browser.getFile();
	4024	+ if (filename != null && filename.length() > 0)
	4025	+ {
	4026	+ String fullname = browser.getDirectory() + filename;
	4027	+ makeSomething(ReadOBJ(fullname), true);
	4028	+ }
	4029	+ } else
	4030	+ if (source == closeItem)
3175	4031	{
3176	4032	Close();
3177	4033	//return true;
3178		- } else if (event.getSource() == loadItem)
	4034	+ } else if (source == openItem)
3179	4035	{
3180		- load();
	4036	+ Open();
3181	4037	//return true;
3182		- } else if (event.getSource() == saveItem)
	4038	+ } else if (source == newItem)
	4039	+ {
	4040	+ New();
	4041	+ } else if (source == saveItem)
3183	4042	{
3184	4043	save();
3185	4044	//return true;
3186		- } else if (event.getSource() == saveAsItem)
	4045	+ } else if (source == saveAsItem)
3187	4046	{
3188	4047	saveAs();
3189	4048	//return true;
3190		- } else if (event.getSource() == reexportItem)
	4049	+ } else if (source == reexportItem)
3191	4050	{
3192	4051	reexport();
3193	4052	//return true;
3194		- } else if (event.getSource() == exportAsItem)
	4053	+ } else if (source == exportAsItem)
3195	4054	{
3196	4055	export();
3197	4056	//return true;
3198		- } else if (event.getSource() == povItem)
	4057	+ } else if (source == povItem)
3199	4058	{
3200	4059	generatePOV();
3201	4060	//return true;
3202		- } else if (event.getSource() == zBufferItem)
	4061	+ } else if (event.getSource() == archiveItem)
	4062	+ {
	4063	+ cTools.Archive(frame);
	4064	+ return;
	4065	+ } else if (source == zBufferItem)
3203	4066	{
3204	4067	try
3205	4068	{
..	..	@@ -3221,21 +4084,8 @@
3221	4084	cameraView.repaint();
3222	4085	//return true;
3223	4086	}
3224		- */ else if (event.getSource() == editCameraItem)
3225		- {
3226		- cameraView.ProtectCamera();
3227		- cameraView.repaint();
3228		- return;
3229		- } else if (event.getSource() == revertCameraItem)
3230		- {
3231		- cameraView.RevertCamera();
3232		- cameraView.repaint();
3233		- return;
3234		-// } else if (event.getSource() == textureButton)
3235		-// {
3236		-// return; // true;
3237		- } else // combos...
3238		- if (event.getSource() == texresMenu)
	4087	+ */ else // combos...
	4088	+ if (source == texresMenu)
3239	4089	{
3240	4090	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3241	4091	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3247,6 +4097,473 @@
3247	4097	}
3248	4098	}
3249	4099
	4100	+ void New()
	4101	+ {
	4102	+ while (copy.Size() > 1)
	4103	+ {
	4104	+ copy.remove(1);
	4105	+ }
	4106	+
	4107	+ ResetModel();
	4108	+ objEditor.refreshContents();
	4109	+ }
	4110	+
	4111	+ static public byte[] Compress(Object3D o)
	4112	+ {
	4113	+ // Slower to actually compress.
	4114	+ try
	4115	+ {
	4116	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4117	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4118	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4119	+
	4120	+ Object3D parent = o.parent;
	4121	+ o.parent = null;
	4122	+
	4123	+ out.writeObject(o);
	4124	+
	4125	+ o.parent = parent;
	4126	+
	4127	+ out.flush();
	4128	+
	4129	+ baos //zstream
	4130	+ .close();
	4131	+ out.close();
	4132	+
	4133	+ byte[] bytes = baos.toByteArray();
	4134	+
	4135	+ System.out.println("save #bytes = " + bytes.length);
	4136	+ return bytes;
	4137	+ } catch (Exception e)
	4138	+ {
	4139	+ System.err.println(e);
	4140	+ return null;
	4141	+ }
	4142	+ }
	4143	+
	4144	+ static public Object Uncompress(byte[] bytes)
	4145	+ {
	4146	+ System.out.println("restore #bytes = " + bytes.length);
	4147	+ try
	4148	+ {
	4149	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4150	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4151	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4152	+ Object obj = in.readObject();
	4153	+
	4154	+ bais //istream
	4155	+ .close();
	4156	+ in.close();
	4157	+
	4158	+ return obj;
	4159	+ } catch (Exception e)
	4160	+ {
	4161	+ System.err.println(e);
	4162	+ return null;
	4163	+ }
	4164	+ }
	4165	+
	4166	+ static public Object clone(Object o)
	4167	+ {
	4168	+ try
	4169	+ {
	4170	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4171	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4172	+
	4173	+ out.writeObject(o);
	4174	+
	4175	+ out.flush();
	4176	+ out.close();
	4177	+
	4178	+ byte[] bytes = baos.toByteArray();
	4179	+
	4180	+ System.out.println("clone = " + bytes.length);
	4181	+
	4182	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4183	+ ObjectInputStream in = new ObjectInputStream(bais);
	4184	+ Object obj = in.readObject();
	4185	+ in.close();
	4186	+
	4187	+ return obj;
	4188	+ } catch (Exception e)
	4189	+ {
	4190	+ System.err.println(e);
	4191	+ return null;
	4192	+ }
	4193	+ }
	4194	+
	4195	+ cRadio GetCurrentTab()
	4196	+ {
	4197	+ cRadio ab;
	4198	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4199	+ {
	4200	+ ab = (cRadio)e.nextElement();
	4201	+ if(ab.GetObject() == copy)
	4202	+ {
	4203	+ return ab;
	4204	+ }
	4205	+ }
	4206	+
	4207	+ return null;
	4208	+ }
	4209	+
	4210	+
	4211	+ public void Save()
	4212	+ {
	4213	+ //Save(true);
	4214	+ Replace();
	4215	+ SetVersionStates();
	4216	+ }
	4217	+
	4218	+ private boolean Equal(byte[] compress, byte[] name)
	4219	+ {
	4220	+ if (compress.length != name.length)
	4221	+ {
	4222	+ return false;
	4223	+ }
	4224	+
	4225	+ for (int i=compress.length; --i>=0;)
	4226	+ {
	4227	+ if (compress[i] != name[i])
	4228	+ return false;
	4229	+ }
	4230	+
	4231	+ return true;
	4232	+ }
	4233	+
	4234	+ void DeleteVersion()
	4235	+ {
	4236	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4237	+ {
	4238	+ copy.versionlist[i] = copy.versionlist[i+1];
	4239	+ }
	4240	+
	4241	+ if (copy.versionlist[copy.versionindex] == null)
	4242	+ copy.versionindex -= 1;
	4243	+
	4244	+ if (copy.versionindex != -1)
	4245	+ CopyChanged();
	4246	+
	4247	+ SetVersionStates();
	4248	+ }
	4249	+
	4250	+ public boolean Save(boolean user)
	4251	+ {
	4252	+ System.err.println("Save");
	4253	+ Replace();
	4254	+
	4255	+ //cRadio tab = GetCurrentTab();
	4256	+
	4257	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4258	+
	4259	+ boolean thesame = false;
	4260	+
	4261	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4262	+// {
	4263	+// thesame = true;
	4264	+// }
	4265	+
	4266	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4267	+ if (!thesame)
	4268	+ {
	4269	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4270	+ {
	4271	+ copy.versionlist[i] = copy.versionlist[i-1];
	4272	+ }
	4273	+
	4274	+ //tab.user[tab.versionindex] = user;
	4275	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4276	+
	4277	+ copy.versionlist[++copy.versionindex] = compress;
	4278	+
	4279	+ // if (increment)
	4280	+ // tab.versionindex++;
	4281	+ }
	4282	+
	4283	+ //copy.RestoreBigData(versiontable);
	4284	+
	4285	+ //assert(hashtable.isEmpty());
	4286	+
	4287	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4288	+// {
	4289	+// //tab.user[i] = false;
	4290	+// copy.versionlist[i] = null;
	4291	+// }
	4292	+
	4293	+ SetVersionStates();
	4294	+
	4295	+ // test save
	4296	+ if (false)
	4297	+ {
	4298	+ try
	4299	+ {
	4300	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4301	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4302	+
	4303	+ p.writeObject(copy);
	4304	+
	4305	+ p.flush();
	4306	+
	4307	+ ostream.close();
	4308	+ } catch (Exception e)
	4309	+ {
	4310	+ e.printStackTrace();
	4311	+ }
	4312	+ }
	4313	+
	4314	+ return !thesame;
	4315	+ }
	4316	+
	4317	+ boolean flashIt = true;
	4318	+
	4319	+ void RefreshSelection()
	4320	+ {
	4321	+ Object3D selection = new Object3D();
	4322	+
	4323	+ for (int i = 0; i < copy.selection.size(); i++)
	4324	+ {
	4325	+ Object3D elem = copy.selection.elementAt(i);
	4326	+
	4327	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4328	+
	4329	+ if (obj == null)
	4330	+ {
	4331	+ copy.selection.remove(i--);
	4332	+ }
	4333	+ else
	4334	+ {
	4335	+ selection.add(obj);
	4336	+ copy.selection.setElementAt(obj, i);
	4337	+ }
	4338	+ }
	4339	+
	4340	+ flashIt = false;
	4341	+ GetTree().clearSelection();
	4342	+ for (int i = 0; i < selection.size(); i++)
	4343	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4344	+ flashIt = true;
	4345	+
	4346	+ //refreshContents(false);
	4347	+ }
	4348	+
	4349	+ void CopyChanged()
	4350	+ {
	4351	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4352	+
	4353	+ SetVersionStates();
	4354	+
	4355	+ boolean temp = CameraPane.SWITCH;
	4356	+ CameraPane.SWITCH = false;
	4357	+
	4358	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4359	+
	4360	+ copy.clear();
	4361	+
	4362	+ copy.skyboxname = obj.skyboxname;
	4363	+ copy.skyboxext = obj.skyboxext;
	4364	+
	4365	+ for (int i=0; i<obj.Size(); i++)
	4366	+ {
	4367	+ copy.add(obj.get(i));
	4368	+ }
	4369	+
	4370	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4371	+
	4372	+ CameraPane.SWITCH = temp;
	4373	+
	4374	+ RefreshSelection();
	4375	+ //assert(hashtable.isEmpty());
	4376	+
	4377	+ copy.Touch();
	4378	+
	4379	+ ResetModel();
	4380	+ copy.HardTouch(); // recompile?
	4381	+
	4382	+ cRadio ab;
	4383	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4384	+ {
	4385	+ ab = (cRadio)e.nextElement();
	4386	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4387	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4388	+ if (test != null)
	4389	+ {
	4390	+ test.editWindow = ab.object.editWindow;
	4391	+ ab.object = test;
	4392	+ }
	4393	+ }
	4394	+
	4395	+ refreshContents(true);
	4396	+ }
	4397	+
	4398	+ cButton previousVersionButton;
	4399	+ cButton restoreButton;
	4400	+ cButton replaceButton;
	4401	+ cButton nextVersionButton;
	4402	+ cButton saveVersionButton;
	4403	+ cButton deleteVersionButton;
	4404	+
	4405	+ boolean muteSlider;
	4406	+
	4407	+ int VersionCount()
	4408	+ {
	4409	+ int count = 0;
	4410	+
	4411	+ for (int i = copy.versionlist.length; --i >= 0;)
	4412	+ {
	4413	+ if (copy.versionlist[i] != null)
	4414	+ count++;
	4415	+ }
	4416	+
	4417	+ return count;
	4418	+ }
	4419	+
	4420	+ void SetVersionStates()
	4421	+ {
	4422	+ //if (true)
	4423	+ // return;
	4424	+
	4425	+ //cRadio tab = GetCurrentTab();
	4426	+
	4427	+ restoreButton.setEnabled(copy.versionindex != -1);
	4428	+ replaceButton.setEnabled(copy.versionindex != -1);
	4429	+
	4430	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4431	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4432	+
	4433	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4434	+ //copy.versionlist[copy.versionindex + 1] != null);
	4435	+
	4436	+ muteSlider = true;
	4437	+ versionSlider.setMinimum(0);
	4438	+ versionSlider.setMaximum(VersionCount() - 1);
	4439	+ versionSlider.setInteger(copy.versionindex);
	4440	+ versionSlider.setEnabled(copy.versionindex != -1);
	4441	+ muteSlider = false;
	4442	+ }
	4443	+
	4444	+ public boolean PreviousVersion()
	4445	+ {
	4446	+ // Option?
	4447	+ Replace();
	4448	+
	4449	+ System.err.println("Undo");
	4450	+
	4451	+ //cRadio tab = GetCurrentTab();
	4452	+
	4453	+ if (copy.versionindex == 0)
	4454	+ {
	4455	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4456	+ return false;
	4457	+ }
	4458	+
	4459	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4460	+// {
	4461	+// if (Save(false))
	4462	+// tab.versionindex -= 1;
	4463	+// else
	4464	+// {
	4465	+// if (tab.versionindex <= 0)
	4466	+// return false;
	4467	+// else
	4468	+// tab.versionindex -= 1;
	4469	+// }
	4470	+// }
	4471	+
	4472	+ copy.versionindex -= 1;
	4473	+
	4474	+ CopyChanged();
	4475	+
	4476	+ return true;
	4477	+ }
	4478	+
	4479	+ public boolean Restore()
	4480	+ {
	4481	+ System.err.println("Restore");
	4482	+
	4483	+ //cRadio tab = GetCurrentTab();
	4484	+
	4485	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4486	+ {
	4487	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4488	+ return false;
	4489	+ }
	4490	+
	4491	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4492	+ CopyChanged();
	4493	+
	4494	+ return true;
	4495	+ }
	4496	+
	4497	+ public boolean Replace()
	4498	+ {
	4499	+ //System.err.println("Replace");
	4500	+
	4501	+ //cRadio tab = GetCurrentTab();
	4502	+
	4503	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4504	+ {
	4505	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4506	+ return false;
	4507	+ }
	4508	+
	4509	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4510	+
	4511	+ return true;
	4512	+ }
	4513	+
	4514	+ public void NextVersion()
	4515	+ {
	4516	+ // Option?
	4517	+ Replace();
	4518	+
	4519	+ //cRadio tab = GetCurrentTab();
	4520	+
	4521	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4522	+ {
	4523	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4524	+ return;
	4525	+ }
	4526	+
	4527	+ copy.versionindex += 1;
	4528	+
	4529	+ CopyChanged();
	4530	+
	4531	+ //if (!tab.user[tab.versionindex])
	4532	+ // tab.graphs[tab.versionindex] = null;
	4533	+ }
	4534	+
	4535	+ void ImportGFD()
	4536	+ {
	4537	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4538	+ browser.show();
	4539	+ String filename = browser.getFile();
	4540	+ if (filename != null && filename.length() > 0)
	4541	+ {
	4542	+ String fullname = browser.getDirectory() + filename;
	4543	+
	4544	+ //Object3D readobj =
	4545	+ objEditor.ReadGFD(fullname, objEditor);
	4546	+ //makeSomething(readobj);
	4547	+ }
	4548	+ }
	4549	+
	4550	+ void ImportVRMLX3D()
	4551	+ {
	4552	+ if (Grafreed.standAlone)
	4553	+ {
	4554	+ /**/
	4555	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4556	+ browser.show();
	4557	+ String filename = browser.getFile();
	4558	+ if (filename != null && filename.length() > 0)
	4559	+ {
	4560	+ String fullname = browser.getDirectory() + filename;
	4561	+ LoadVRMLX3D(fullname);
	4562	+ }
	4563	+ /**/
	4564	+ }
	4565	+ }
	4566	+
3250	4567	void ToggleAnimation()
3251	4568	{
3252	4569	if (!Globals.ANIMATION)
..	..	@@ -3364,7 +4681,7 @@
3364	4681	assert false;
3365	4682	}
3366	4683
3367		- void EditSelection()
	4684	+ void EditSelection(boolean newWindow)
3368	4685	{
3369	4686	}
3370	4687
..	..	@@ -3423,7 +4740,7 @@
3423	4740	//copy.material = new cMaterial(copy.GetMaterial());
3424	4741
3425	4742	current.color = (float) colorField.getFloat();
3426		- current.modulation = (float) modulationField.getFloat();
	4743	+ current.modulation = (float) saturationField.getFloat();
3427	4744	current.metalness = (float) metalnessField.getFloat();
3428	4745	current.diffuse = (float) diffuseField.getFloat();
3429	4746	current.specular = (float) specularField.getFloat();
..	..	@@ -3456,7 +4773,7 @@
3456	4773	cMaterial mat = copy.material;
3457	4774
3458	4775	colorField.SetToolTipValue((mat.color));
3459		- modulationField.SetToolTipValue((mat.modulation));
	4776	+ saturationField.SetToolTipValue((mat.modulation));
3460	4777	metalnessField.SetToolTipValue((mat.metalness));
3461	4778	diffuseField.SetToolTipValue((mat.diffuse));
3462	4779	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3508,9 +4825,28 @@
3508	4825	//copy.Touch();
3509	4826	}
3510	4827
	4828	+ cNumberSlider versionSlider;
	4829	+
3511	4830	public void stateChanged(ChangeEvent e)
3512	4831	{
3513	4832	// assert(false);
	4833	+ if (e.getSource() == versionSlider)
	4834	+ {
	4835	+ if (muteSlider)
	4836	+ return;
	4837	+
	4838	+ Replace();
	4839	+
	4840	+ int version = versionSlider.getInteger();
	4841	+
	4842	+ if (version != -1 && copy.versionlist[version] != null)
	4843	+ {
	4844	+ copy.versionindex = version;
	4845	+ CopyChanged();
	4846	+ }
	4847	+
	4848	+ return;
	4849	+ }
3514	4850
3515	4851	if (freezematerial)
3516	4852	{
..	..	@@ -3546,6 +4882,12 @@
3546	4882	{
3547	4883	//System.out.println("stateChanged = " + this);
3548	4884	materialtouched = true;
	4885	+
	4886	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4887	+ {
	4888	+ saturationField.setFloat(1);
	4889	+ }
	4890	+
3549	4891	applySelf();
3550	4892	//System.out.println("this = " + this);
3551	4893	//System.out.println("PARENT = " + parent);
..	..	@@ -3845,6 +5187,7 @@
3845	5187	{
3846	5188	if (GetTree() != null)
3847	5189	{
	5190	+ GetTree().revalidate();
3848	5191	GetTree().repaint();
3849	5192	}
3850	5193
..	..	@@ -3853,12 +5196,19 @@
3853	5196	ctrlPanel.validate(); // ? new
3854	5197	ctrlPanel.repaint();
3855	5198	}
	5199	+
	5200	+ if (previousVersionButton != null && copy.versionlist != null)
	5201	+ SetVersionStates();
	5202	+
	5203	+ cameraView.requestFocusInWindow();
3856	5204	}
3857	5205
3858	5206	static TweenManager tweenManager = new TweenManager();
3859	5207
3860	5208	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3861	5209	{
	5210	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5211	+ Save();
3862	5212	//Tween.set(thing, 0).target(1).start(tweenManager);
3863	5213	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3864	5214	// if (thing instanceof GenericJointDemo)
..	..	@@ -3882,7 +5232,7 @@
3882	5232	// group = (Composite) group.get(0);
3883	5233	// }
3884	5234
3885		- System.out.println("makeSomething of " + thing);
	5235	+ //System.out.println("makeSomething of " + thing);
3886	5236
3887	5237	/*
3888	5238	if (deselect && jList != null)
..	..	@@ -3945,6 +5295,12 @@
3945	5295	{
3946	5296	ResetModel();
3947	5297	Select(thing.GetTreePath(), true, false); // unselect... false);
	5298	+
	5299	+ if (thing.Size() == 0)
	5300	+ {
	5301	+ //EditSelection(false);
	5302	+ }
	5303	+
3948	5304	refreshContents();
3949	5305	}
3950	5306
..	..	@@ -4062,6 +5418,7 @@
4062	5418	}
4063	5419	}
4064	5420	}
	5421	+
4065	5422	LoadGFDThread loadGFDThread;
4066	5423
4067	5424	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4081,8 +5438,10 @@
4081	5438
4082	5439	try
4083	5440	{
	5441	+ // Try compressed version first.
4084	5442	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4085		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5443	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5444	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4086	5445
4087	5446	readobj = (Object3D) p.readObject();
4088	5447	istream.close();
..	..	@@ -4090,7 +5449,22 @@
4090	5449	readobj.ResetDisplayList();
4091	5450	} catch (Exception e)
4092	5451	{
4093		- e.printStackTrace();
	5452	+ if (!e.toString().contains("GZIP"))
	5453	+ e.printStackTrace();
	5454	+
	5455	+ try
	5456	+ {
	5457	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5458	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5459	+
	5460	+ readobj = (Object3D) p.readObject();
	5461	+ istream.close();
	5462	+
	5463	+ readobj.ResetDisplayList();
	5464	+ } catch (Exception e2)
	5465	+ {
	5466	+ e2.printStackTrace();
	5467	+ }
4094	5468	}
4095	5469	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4096	5470	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4136,6 +5510,12 @@
4136	5510
4137	5511	void LoadIt(Object obj)
4138	5512	{
	5513	+ if (obj == null)
	5514	+ {
	5515	+ // Invalid file
	5516	+ return;
	5517	+ }
	5518	+
4139	5519	System.out.println("Loaded " + obj);
4140	5520	//new Exception().printStackTrace();
4141	5521	Object3D readobj = (Object3D) obj;
..	..	@@ -4145,10 +5525,14 @@
4145	5525
4146	5526	if (readobj != null)
4147	5527	{
	5528	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5529	+ // Save();
4148	5530	try
4149	5531	{
4150	5532	//readobj.deepCopySelf(copy);
4151	5533	copy.clear(); // june 2014
	5534	+ copy.skyboxname = readobj.skyboxname;
	5535	+ copy.skyboxext = readobj.skyboxext;
4152	5536	for (int i = 0; i < readobj.size(); i++)
4153	5537	{
4154	5538	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4189,6 +5573,7 @@
4189	5573	}
4190	5574	} catch (ClassCastException e)
4191	5575	{
	5576	+ e.printStackTrace();
4192	5577	assert (false);
4193	5578	Composite c = (Composite) copy;
4194	5579	c.children.clear();
..	..	@@ -4199,17 +5584,32 @@
4199	5584	c.addChild(csg);
4200	5585	}
4201	5586
	5587	+ copy.versionlist = readobj.versionlist;
	5588	+ copy.versionindex = readobj.versionindex;
	5589	+ copy.versiontable = readobj.versiontable;
	5590	+
	5591	+ if (copy.versionlist == null)
	5592	+ {
	5593	+ // Backward compatibility
	5594	+ copy.versionlist = new Object3D[100];
	5595	+ copy.versionindex = -1;
	5596	+
	5597	+ //Save(true);
	5598	+ }
	5599	+
	5600	+ //? SetUndoStates();
	5601	+
4202	5602	ResetModel();
4203	5603	copy.HardTouch(); // recompile?
4204	5604	refreshContents();
4205	5605	}
4206	5606	}
4207	5607
4208		- void load() // throws ClassNotFoundException
	5608	+ void Open() // throws ClassNotFoundException
4209	5609	{
4210	5610	if (Grafreed.standAlone)
4211	5611	{
4212		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5612	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4213	5613	browser.show();
4214	5614	String filename = browser.getFile();
4215	5615	if (filename != null && filename.length() > 0)
..	..	@@ -4286,6 +5686,8 @@
4286	5686
4287	5687	void save()
4288	5688	{
	5689	+ Replace();
	5690	+
4289	5691	if (lastname == null)
4290	5692	{
4291	5693	return;
..	..	@@ -4294,11 +5696,13 @@
4294	5696	try
4295	5697	{
4296	5698	FileOutputStream ostream = new FileOutputStream(lastname);
4297		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5699	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5700	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4298	5701
4299	5702	p.writeObject(copy);
4300	5703	p.flush();
4301	5704
	5705	+ zstream.close();
4302	5706	ostream.close();
4303	5707
4304	5708	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4306,8 +5710,10 @@
4306	5710	//ps.print(buffer.toString());
4307	5711	} catch (IOException e)
4308	5712	{
	5713	+ e.printStackTrace();
4309	5714	}
4310	5715	}
	5716	+
4311	5717	String lastname;
4312	5718
4313	5719	void saveAs()
..	..	@@ -4319,6 +5725,8 @@
4319	5725	String filename = browser.getFile();
4320	5726	if (filename != null && filename.length() > 0)
4321	5727	{
	5728	+ if (!filename.endsWith(".gfd"))
	5729	+ filename += ".gfd";
4322	5730	lastname = browser.getDirectory() + filename;
4323	5731	save();
4324	5732	}
..	..	@@ -4417,8 +5825,8 @@
4417	5825	try
4418	5826	{
4419	5827	FileOutputStream ostream = new FileOutputStream(filename);
4420		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4421		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5828	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5829	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4422	5830
4423	5831	Object3D objectparent = obj.parent;
4424	5832	obj.parent = null;
..	..	@@ -4435,8 +5843,8 @@
4435	5843	p.writeObject(object);
4436	5844	p.flush();
4437	5845
	5846	+ zstream.close();
4438	5847	ostream.close();
4439		- // zstream.close();
4440	5848
4441	5849	// group.selection.get(0).parent = parent;
4442	5850	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4483,19 +5891,18 @@
4483	5891	Object3D client;
4484	5892	Object3D copy;
4485	5893	MenuBar menuBar;
4486		- Menu windowMenu;
4487		- MenuItem loadItem;
	5894	+ Menu fileMenu;
	5895	+ MenuItem newItem;
	5896	+ MenuItem openItem;
4488	5897	MenuItem saveItem;
4489	5898	MenuItem saveAsItem;
4490	5899	MenuItem exportAsItem;
4491	5900	MenuItem reexportItem;
4492	5901	MenuItem povItem;
4493	5902	MenuItem closeItem;
4494		- Menu cameraMenu;
	5903	+
4495	5904	CheckboxMenuItem zBufferItem;
4496	5905	//MenuItem normalLensItem;
4497		- MenuItem editCameraItem;
4498		- MenuItem revertCameraItem;
4499	5906	MenuItem stepItem;
4500	5907	CheckboxMenuItem toggleLiveItem;
4501	5908	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4509,22 +5916,37 @@
4509	5916	CheckboxMenuItem toggleSwitchItem;
4510	5917	CheckboxMenuItem toggleRootItem;
4511	5918	CheckboxMenuItem animationItem;
	5919	+ MenuItem archiveItem;
4512	5920	CheckboxMenuItem toggleHandleItem;
4513	5921	CheckboxMenuItem togglePaintItem;
4514	5922	JSplitPane mainPanel;
4515	5923	JScrollPane scrollpane;
	5924	+
4516	5925	JPanel toolbarPanel;
	5926	+
4517	5927	cGridBag treePanel;
	5928	+
4518	5929	JPanel radioPanel;
4519	5930	ButtonGroup buttonGroup;
4520		- cGridBag ctrlPanel;
	5931	+
	5932	+ cGridBag toolboxPanel;
	5933	+ cGridBag skyboxPanel;
4521	5934	cGridBag materialPanel;
	5935	+ cGridBag ctrlPanel;
	5936	+
4522	5937	JScrollPane infoPanel;
	5938	+
4523	5939	cGridBag optionsPanel;
	5940	+
4524	5941	JTabbedPane objectPanel;
	5942	+ boolean materialFlushed;
	5943	+ Object3D latestObject;
	5944	+
4525	5945	cGridBag XYZPanel;
	5946	+
4526	5947	JSplitPane gridPanel;
4527	5948	JSplitPane bigPanel;
	5949	+
4528	5950	cGridBag bigThree;
4529	5951	cGridBag scenePanel;
4530	5952	cGridBag centralPanel;
..	..	@@ -4582,7 +6004,7 @@
4582	6004	JLabel colorLabel;
4583	6005	cNumberSlider colorField;
4584	6006	JLabel modulationLabel;
4585		- cNumberSlider modulationField;
	6007	+ cNumberSlider saturationField;
4586	6008	JLabel metalnessLabel;
4587	6009	cNumberSlider metalnessField;
4588	6010	JLabel diffuseLabel;
..	..	@@ -4613,6 +6035,7 @@
4613	6035	cNumberSlider anisoField;
4614	6036	JLabel anisoVLabel;
4615	6037	cNumberSlider anisoVField;
	6038	+
4616	6039	JLabel cameraLabel;
4617	6040	cNumberSlider cameraField;
4618	6041	JLabel selfshadowLabel;
..	..	@@ -4627,6 +6050,7 @@
4627	6050	cNumberSlider fakedepthField;
4628	6051	JLabel shadowbiasLabel;
4629	6052	cNumberSlider shadowbiasField;
	6053	+
4630	6054	JLabel bumpLabel;
4631	6055	cNumberSlider bumpField;
4632	6056	JLabel noiseLabel;
..	..	@@ -4639,8 +6063,13 @@
4639	6063	cNumberSlider fogField;
4640	6064	JLabel opacityPowerLabel;
4641	6065	cNumberSlider opacityPowerField;
4642		- JTree jTree;
	6066	+ cTree jTree;
4643	6067	//ObjectUI parent;
4644	6068
4645	6069	cNumberSlider normalpushField;
	6070	+
	6071	+ private MenuItem importGFDItem;
	6072	+ private MenuItem importVRMLX3DItem;
	6073	+ private MenuItem import3DSItem;
	6074	+ private MenuItem importOBJItem;
4646	6075	}