~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.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -28,9 +34,88 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ public cToggleButton pinButton;
31	38	boolean timeline;
32	39	boolean wasFullScreen;
33	40
	41	+ GroupEditor callee;
	42	+ JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
	53	+
	54	+ cButton GetButton(String name, boolean border)
	55	+ {
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
	64	+ }
	65	+
	66	+ cToggleButton GetToggleButton(String name, boolean border)
	67	+ {
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
	70	+ }
	71	+
	72	+ cCheckBox GetCheckBox(String name, boolean border)
	73	+ {
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
	80	+ try
	81	+ {
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
	98	+ }
	99	+ catch (Exception e)
	100	+ {
	101	+ return null;
	102	+ }
	103	+ }
	104	+
	105	+ BufferedImage GetImage(String name)
	106	+ {
	107	+ try
	108	+ {
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
	112	+ }
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
	117	+ }
	118	+
34	119	// SCRIPT
35	120
36	121	transient JFrame textpanel = null;
..	..	@@ -121,51 +206,62 @@
121	206	void keyPressed(int key, int modifiers)
122	207	{
123	208	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	209	+ Globals.theRenderer.keyPressed(key, modifiers);
125	210	}
126	211	*/
127	212
128	213	static GridBagConstraints aConstraints;
129	214	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	215	+
132	216	static int GRIDWIDTH = 100; // 4;
133	217
134	218	public void closeUI()
135	219	{
136	220	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	221	+// System.out.println("this = " + this);
	222	+// System.out.println("objEditor = " + objEditor);
139	223	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	224	+// objEditor.ctrlPanel.remove(nameField);
141	225
142		- if (!GroupEditor.allparams)
	226	+ objEditor.ctrlPanel.remove(namePanel);
	227	+
	228	+ if (!allparams)
143	229	return;
144	230
145		- objEditor.ctrlPanel.remove(liveCB);
146		- objEditor.ctrlPanel.remove(hideCB);
147		- objEditor.ctrlPanel.remove(markCB);
148		-
149		- objEditor.ctrlPanel.remove(randomCB);
150		- objEditor.ctrlPanel.remove(speedupCB);
151		- objEditor.ctrlPanel.remove(rewindCB);
152		-
153		- objEditor.ctrlPanel.remove(resetButton);
154		- objEditor.ctrlPanel.remove(stepButton);
155		-// objEditor.ctrlPanel.remove(stepAllButton);
156		-// objEditor.ctrlPanel.remove(resetAllButton);
157		- objEditor.ctrlPanel.remove(link2masterCB);
158		- //objEditor.ctrlPanel.remove(flipVCB);
159		- //objEditor.ctrlPanel.remove(texresMenu);
160		- objEditor.ctrlPanel.remove(slowerButton);
161		- objEditor.ctrlPanel.remove(fasterButton);
162		- objEditor.ctrlPanel.remove(remarkButton);
	231	+// objEditor.ctrlPanel.remove(liveCB);
	232	+// objEditor.ctrlPanel.remove(hideCB);
	233	+// objEditor.ctrlPanel.remove(markCB);
	234	+//
	235	+// objEditor.ctrlPanel.remove(randomCB);
	236	+// objEditor.ctrlPanel.remove(speedupCB);
	237	+// objEditor.ctrlPanel.remove(rewindCB);
	238	+//
	239	+// objEditor.ctrlPanel.remove(resetButton);
	240	+// objEditor.ctrlPanel.remove(stepButton);
	241	+//// objEditor.ctrlPanel.remove(stepAllButton);
	242	+//// objEditor.ctrlPanel.remove(resetAllButton);
	243	+// objEditor.ctrlPanel.remove(link2masterCB);
	244	+// //objEditor.ctrlPanel.remove(flipVCB);
	245	+// //objEditor.ctrlPanel.remove(texresMenu);
	246	+// objEditor.ctrlPanel.remove(slowerButton);
	247	+// objEditor.ctrlPanel.remove(fasterButton);
	248	+// objEditor.ctrlPanel.remove(remarkButton);
	249	+
	250	+ objEditor.ctrlPanel.remove(setupPanel);
	251	+ objEditor.ctrlPanel.remove(setupPanel2);
	252	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	253	+ objEditor.ctrlPanel.remove(pushPanel);
	254	+ //objEditor.ctrlPanel.remove(fillPanel);
	255	+
	256	+ //Remove(normalpushField);
163	257	}
164	258
165	259	public ObjEditor GetEditor()
166	260	{
167	261	return objEditor; //.GetEditor();
168	262	}
	263	+
	264	+ // Sometimes myself, sometimes my callee's.
169	265	ObjEditor objEditor;
170	266
171	267	/*
..	..	@@ -201,6 +297,14 @@
201	297	client = inClient;
202	298	copy = client;
203	299
	300	+// if (copy.versionlist == null)
	301	+// {
	302	+// copy.versionlist = new Object3D[100];
	303	+// copy.versionindex = -1;
	304	+//
	305	+// callee.Save(true);
	306	+// }
	307	+
204	308	// "this" is not called: SetupUI2(objEditor);
205	309	}
206	310
..	..	@@ -214,6 +318,14 @@
214	318	client = inClient;
215	319	copy = client;
216	320
	321	+ if (copy.versionlist == null)
	322	+ {
	323	+ copy.versionlist = new Object3D[100];
	324	+ copy.versionindex = -1;
	325	+
	326	+// Save(true);
	327	+ }
	328	+
217	329	SetupUI2(callee.GetEditor());
218	330	}
219	331
..	..	@@ -228,6 +340,7 @@
228	340	//localCopy.parent = null;
229	341
230	342	frame = new JFrame();
	343	+ frame.setUndecorated(false);
231	344	objEditor = this;
232	345	this.callee = callee;
233	346
..	..	@@ -245,6 +358,14 @@
245	358	copy = localCopy;
246	359	copy.editWindow = this;
247	360
	361	+// if (copy.versionlist == null)
	362	+// {
	363	+// copy.versionlist = new Object3D[100];
	364	+// copy.versionindex = -1;
	365	+//
	366	+// Save(true);
	367	+// }
	368	+
248	369	SetupMenu();
249	370
250	371	//SetupName(objEditor); // new
..	..	@@ -258,28 +379,49 @@
258	379	return frame.action(event, obj);
259	380	}
260	381
	382	+ // Cannot work without static
	383	+ static boolean allparams = true;
	384	+
	385	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	386	+
261	387	void SetupMenu()
262	388	{
263	389	frame.setMenuBar(menuBar = new MenuBar());
264		- menuBar.add(windowMenu = new Menu("File"));
265		- windowMenu.add(loadItem = new MenuItem("Load..."));
266		- windowMenu.add("-");
267		- windowMenu.add(saveItem = new MenuItem("Save"));
268		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	390	+ menuBar.add(fileMenu = new Menu("File"));
	391	+ fileMenu.add(newItem = new MenuItem("New"));
	392	+ fileMenu.add(openItem = new MenuItem("Open..."));
	393	+
	394	+ //oe.menuBar.add(menu = new Menu("Include"));
	395	+ Menu menu = new Menu("Import");
	396	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	397	+ importOBJItem.addActionListener(this);
	398	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	399	+ import3DSItem.addActionListener(this);
	400	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	401	+ importVRMLX3DItem.addActionListener(this);
	402	+ menu.add("-");
	403	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	404	+ importGFDItem.addActionListener(this);
	405	+ fileMenu.add(menu);
	406	+ fileMenu.add("-");
	407	+
	408	+ fileMenu.add(saveItem = new MenuItem("Save"));
	409	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
269	410	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
270		- windowMenu.add("-");
271		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
272		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
273		- windowMenu.add("-");
	411	+ fileMenu.add("-");
	412	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	413	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	414	+ fileMenu.add("-");
274	415	if (client.parent != null)
275	416	{
276		- windowMenu.add(closeItem = new MenuItem("Close"));
	417	+ fileMenu.add(closeItem = new MenuItem("Close"));
277	418	} else
278	419	{
279		- windowMenu.add(closeItem = new MenuItem("Exit"));
	420	+ fileMenu.add(closeItem = new MenuItem("Exit"));
280	421	}
281	422
282		- loadItem.addActionListener(this);
	423	+ newItem.addActionListener(this);
	424	+ openItem.addActionListener(this);
283	425	saveItem.addActionListener(this);
284	426	saveAsItem.addActionListener(this);
285	427	exportAsItem.addActionListener(this);
..	..	@@ -287,82 +429,102 @@
287	429	//povItem.addActionListener(this);
288	430	closeItem.addActionListener(this);
289	431
290		- menuBar.add(cameraMenu = new Menu("View"));
291		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
292		- //zBufferItem.addActionListener(this);
293		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
294		- //normalLensItem.addActionListener(this);
295		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
296		- revertCameraItem.addActionListener(this);
297		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
298		- toggleTimelineItem.addItemListener(this);
299		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
300		- toggleFullScreenItem.addItemListener(this);
301		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
302		- cameraMenu.add("-");
303		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
304		- toggleTextureItem.addItemListener(this);
305		- toggleTextureItem.setState(CameraPane.textureon);
306		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
307		- toggleLiveItem.addItemListener(this);
308		- toggleLiveItem.setState(CameraPane.isLIVE());
309		- cameraMenu.add(stepItem = new MenuItem("Step"));
310		- stepItem.addActionListener(this);
311		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
312		-// toggleDLItem.addItemListener(this);
313		-// toggleDLItem.setState(false);
314		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
315		- toggleRenderItem.addItemListener(this);
316		- toggleRenderItem.setState(!CameraPane.frozen);
317		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
318		- toggleDebugItem.addItemListener(this);
319		- toggleDebugItem.setState(CameraPane.DEBUG);
320		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
321		- toggleFrustumItem.addItemListener(this);
322		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
323		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
324		- toggleFootContactItem.addItemListener(this);
325		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
326		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
327		- toggleRandomItem.addItemListener(this);
328		- toggleRandomItem.setState(CameraPane.RANDOM);
329		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
330		- toggleHandleItem.addItemListener(this);
331		- toggleHandleItem.setState(CameraPane.HANDLES);
332		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
333		- togglePaintItem.addItemListener(this);
334		- togglePaintItem.setState(CameraPane.PAINTMODE);
335		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
336		-// toggleRootItem.addItemListener(this);
337		-// toggleRootItem.setState(false);
338		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
339		-// animationItem.addItemListener(this);
340		-// animationItem.setState(CameraPane.ANIMATION);
341		- cameraMenu.add("-");
342		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
343		- editCameraItem.addActionListener(this);
344		-
345	432	objectPanel = new JTabbedPane();
	433	+
	434	+ ChangeListener changeListener = new ChangeListener()
	435	+ {
	436	+ String name;
	437	+
	438	+ public void stateChanged(ChangeEvent changeEvent)
	439	+ {
	440	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	441	+// {
	442	+// if (latestObject != null)
	443	+// {
	444	+// refreshContents(true);
	445	+// SetMaterial(latestObject);
	446	+// }
	447	+//
	448	+// materialFlushed = true;
	449	+// }
	450	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	451	+// {
	452	+// if (listUI.size() == 0)
	453	+// EditSelection(false);
	454	+// }
	455	+
	456	+ if (objectPanel.getSelectedIndex() == 4)
	457	+ {
	458	+ name = copy.skyboxname;
	459	+
	460	+ if (name == null)
	461	+ {
	462	+ name = "";
	463	+ }
	464	+
	465	+ copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	466	+ copy.skyboxext = "jpg";
	467	+ }
	468	+ else
	469	+ {
	470	+ if (name != null)
	471	+ {
	472	+ if (name.equals(""))
	473	+ {
	474	+ copy.skyboxname = null;
	475	+ copy.skyboxext = null;
	476	+ }
	477	+ else
	478	+ {
	479	+ copy.skyboxname = name;
	480	+ }
	481	+ }
	482	+ }
	483	+
	484	+// refreshContents(false); // To refresh Info tab
	485	+ cameraView.repaint();
	486	+ }
	487	+ };
	488	+ objectPanel.addChangeListener(changeListener);
	489	+
346	490	toolbarPanel = new JPanel();
347	491	toolbarPanel.setName("Toolbar");
348		- treePanel = new JPanel();
	492	+
	493	+ treePanel = new cGridBag();
349	494	treePanel.setName("Tree");
350		- ctrlPanel = new JPanel(); // new GridBagLayout());
351		- ctrlPanel.setName("Edit");
352		- materialPanel = new JPanel();
353		- materialPanel.setName("Material");
	495	+
	496	+ editPanel = new cGridBag().setVertical(true);
	497	+ //editPanel.setName("Edit");
	498	+
	499	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	500	+
	501	+ editCommandsPanel = new cGridBag();
	502	+ editPanel.add(editCommandsPanel);
	503	+ editPanel.add(ctrlPanel);
	504	+
	505	+ toolboxPanel = new cGridBag().setVertical(true);
	506	+ //toolboxPanel.setName("Toolbox");
	507	+
	508	+ skyboxPanel = new cGridBag().setVertical(true);
	509	+
	510	+ materialPanel = new cGridBag().setVertical(false);
	511	+ //materialPanel.setName("Material");
	512	+
354	513	/JTextPane/
355	514	infoarea = createTextPane();
	515	+ doc = infoarea.getStyledDocument();
	516	+
356	517	infoarea.setEditable(true);
357	518	SetText();
	519	+
358	520	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
359	521	// infoarea.setOpaque(false);
360	522	// //infoarea.setForeground(textcolor);
361		- infoarea.setLineWrap(true);
362		- infoarea.setWrapStyleWord(true);
	523	+// TEXTAREA infoarea.setLineWrap(true);
	524	+// TEXTAREA infoarea.setWrapStyleWord(true);
363	525	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
364		- infoPanel.setPreferredSize(new Dimension(50, 200));
365		- infoPanel.setName("Info");
	526	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	527	+ //infoPanel.setName("Info");
366	528	//infoPanel.setLayout(new BorderLayout());
367	529	//infoPanel.add(createTextPane());
368	530
..	..	@@ -370,16 +532,23 @@
370	532	mainPanel.setName("Main");
371	533	mainPanel.setContinuousLayout(true);
372	534	mainPanel.setOneTouchExpandable(true);
373		- mainPanel.setDividerLocation(1.0);
374	535	mainPanel.setDividerSize(9);
375		- mainPanel.setResizeWeight(0);
376		-
	536	+ mainPanel.setDividerLocation(0.5); //1.0);
	537	+ mainPanel.setResizeWeight(0.5);
	538	+
	539	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	540	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	541	+ divider.setDividerSize(15);
	542	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	543	+
	544	+ mainPanel.setUI(new BasicSplitPaneUI());
	545	+
377	546	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
378	547	//mainPanel.setLayout(new GridBagLayout());
379	548	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
380		- treePanel.setLayout(new GridBagLayout());
381		- ctrlPanel.setLayout(new GridBagLayout());
382		- materialPanel.setLayout(new GridBagLayout());
	549	+// treePanel.setLayout(new GridBagLayout());
	550	+ //ctrlPanel.setLayout(new GridBagLayout());
	551	+ //materialPanel.setLayout(new GridBagLayout());
383	552
384	553	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
385	554	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -418,7 +587,7 @@
418	587	static String newline = "\n";
419	588	protected static final String buttonString = "JButton";
420	589	StyledDocument doc;
421		- JTextArea infoarea;
	590	+ JTextPane infoarea;
422	591
423	592	void ClearInfo()
424	593	{
..	..	@@ -441,10 +610,10 @@
441	610	e.printStackTrace();
442	611	}
443	612
444		- String selection = infoarea.getText();
445		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
446		- java.awt.datatransfer.Clipboard clipboard =
447		- Toolkit.getDefaultToolkit().getSystemClipboard();
	613	+// String selection = infoarea.getText();
	614	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	615	+// java.awt.datatransfer.Clipboard clipboard =
	616	+// Toolkit.getDefaultToolkit().getSystemClipboard();
448	617	//clipboard.setContents(data, data);
449	618	}
450	619
..	..	@@ -467,13 +636,13 @@
467	636	//SendInfo("Name:", "bold");
468	637	if (sel.GetTextures() != null \|\| debug)
469	638	{
470		- si.SendInfo(sel.toString(), "bold");
	639	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
471	640	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
472	641	if (sel.Size() > 0)
473	642	{
474	643	si.SendInfo("#children = " + sel.Size(), "regular");
475	644	}
476		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	645	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
477	646	if (debug)
478	647	{
479	648	try
..	..	@@ -485,7 +654,10 @@
485	654	}
486	655
487	656	if (full)
488		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	657	+ {
	658	+ si.SendInfo(" BBox min: " + minima, "regular");
	659	+ si.SendInfo(" BBox max: " + maxima, "regular");
	660	+ }
489	661
490	662	if (sel.bRep != null)
491	663	{
..	..	@@ -512,7 +684,7 @@
512	684	}
513	685	if (sel.support != null)
514	686	{
515		- si.SendInfo(" support: " + sel.support, "regular");
	687	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
516	688	}
517	689	if (sel.scriptnode != null)
518	690	{
..	..	@@ -583,6 +755,9 @@
583	755	{
584	756	CameraPane.pointflow = (PointFlow) sel;
585	757	}
	758	+
	759	+ si.SendInfo("_____________________", "regular");
	760	+ si.SendInfo("", "regular");
586	761	}
587	762	}
588	763
..	..	@@ -598,68 +773,205 @@
598	773	}
599	774	}
600	775
	776	+//static GraphicsDevice device = GraphicsEnvironment
	777	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	778	+
	779	+ Rectangle keeprect;
	780	+ cRadio radio;
	781	+
	782	+cButton keepButton;
	783	+ cButton twoButton; // Full 3D
	784	+ cButton sixButton;
	785	+ cButton threeButton;
	786	+ cButton sevenButton;
	787	+ cButton fourButton; // full panel
	788	+ cButton oneButton; // full XYZ
	789	+ //cButton currentLayout;
	790	+
	791	+ boolean maximized;
	792	+
	793	+ cButton fullscreenLayout;
	794	+ cButton expandedLayout;
	795	+
	796	+ void Minimize()
	797	+ {
	798	+ frame.setState(Frame.ICONIFIED);
	799	+ frame.validate();
	800	+ }
	801	+
	802	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	803	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	804	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	805	+ void Maximize()
	806	+ {
	807	+ if (CameraPane.FULLSCREEN)
	808	+ {
	809	+ ToggleFullScreen();
	810	+ }
	811	+
	812	+ if (maximized)
	813	+ {
	814	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	815	+ }
	816	+ else
	817	+ {
	818	+ keeprect = frame.getBounds();
	819	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	820	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	821	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	822	+// frame.setState(Frame.MAXIMIZED_BOTH);
	823	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	824	+ }
	825	+
	826	+ maximized ^= true;
	827	+
	828	+ frame.validate();
	829	+ }
	830	+
	831	+ cButton minButton;
	832	+ cButton maxButton;
	833	+ cButton fullButton;
	834	+ cButton collapseButton;
	835	+ cButton maximize3DButton;
	836	+
601	837	void ToggleFullScreen()
602	838	{
603		- if (CameraPane.FULLSCREEN)
	839	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	840	+
	841	+ cameraView.ToggleFullScreen();
	842	+
	843	+ if (!CameraPane.FULLSCREEN)
604	844	{
605		- frame.getContentPane().remove(/"Center",/bigThree);
606		- framePanel.add(bigThree);
607		- frame.getContentPane().add(/"Center",/framePanel);
	845	+ device.setFullScreenWindow(null);
	846	+ frame.dispose();
	847	+ frame.setUndecorated(false);
	848	+ frame.validate();
	849	+ frame.setVisible(true);
	850	+
	851	+ //frame.setVisible(false);
	852	+// frame.removeNotify();
	853	+// frame.setUndecorated(false);
	854	+// frame.addNotify();
	855	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	856	+
	857	+// X frame.getContentPane().remove(/"Center",/bigThree);
	858	+// X framePanel.add(bigThree);
	859	+// X frame.getContentPane().add(/"Center",/framePanel);
	860	+// framePanel.setDividerLocation(46); // icons are 24x24
	861	+
	862	+ //frame.setVisible(true);
	863	+// radio.layout = keepButton;
	864	+ //theFrame = null;
	865	+ keepButton = null;
	866	+// radio.layout.doClick();
	867	+
608	868	} else
609	869	{
610		- frame.getContentPane().remove(/"Center",/framePanel);
611		- framePanel.remove(bigThree);
612		- frame.getContentPane().add(/"Center",/bigThree);
	870	+ keepButton = radio.layout;
	871	+ //keeprect = frame.getBounds();
	872	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	873	+// frame.getToolkit().getScreenSize().height);
	874	+ //frame.setVisible(false);
	875	+
	876	+ frame.dispose();
	877	+ frame.setUndecorated(true);
	878	+ device.setFullScreenWindow(frame);
	879	+ frame.validate();
	880	+ frame.setVisible(true);
	881	+// frame.removeNotify();
	882	+// frame.setUndecorated(true);
	883	+// frame.addNotify();
	884	+// X frame.getContentPane().remove(/"Center",/framePanel);
	885	+// X framePanel.remove(bigThree);
	886	+// X frame.getContentPane().add(/"Center",/bigThree);
	887	+// framePanel.setDividerLocation(0);
	888	+
	889	+// radio.layout = fullscreenLayout;
	890	+// radio.layout.doClick();
	891	+ //frame.setVisible(true);
613	892	}
614		- cameraView.ToggleFullScreen();
	893	+ frame.validate();
	894	+
	895	+ cameraView.requestFocusInWindow();
615	896	}
616	897
617		- private JTextArea createTextPane()
	898	+ void CollapseToolbar()
	899	+ {
	900	+ framePanel.setDividerLocation(0);
	901	+ //frame.validate();
	902	+
	903	+ cameraView.requestFocusInWindow();
	904	+ }
	905	+
	906	+ private Object3D Duplicate(Object3D object)
618	907	{
619		- String[] initString =
620		- {
621		- "This is an editable JTextPane, ", //regular
622		- "another ", //italic
623		- "styled ", //bold
624		- "text ", //small
625		- "component, ", //large
626		- "which supports embedded components..." + newline,//regular
627		- " " + newline, //button
628		- "...and embedded icons..." + newline, //regular
629		- " ", //icon
630		- newline + "JTextPane is a subclass of JEditorPane that "
631		- + "uses a StyledEditorKit and StyledDocument, and provides "
632		- + "cover methods for interacting with those objects."
633		- };
	908	+ boolean temp = CameraPane.SWITCH;
	909	+ CameraPane.SWITCH = false;
	910	+
	911	+ object.ExtractBigData(versiontable);
	912	+ // if (copy == client)
	913	+
	914	+ Object3D versions[] = object.versionlist;
	915	+ object.versionlist = null;
	916	+
	917	+ //byte[] compress = Compress(copy);
	918	+ Object3D compress = (Object3D)Grafreed.clone(object);
	919	+
	920	+ object.versionlist = versions;
	921	+
	922	+ object.RestoreBigData(versiontable);
	923	+
	924	+ CameraPane.SWITCH = temp;
	925	+
	926	+ return compress;
	927	+ }
634	928
635		- String[] initStyles =
636		- {
637		- "regular", "italic", "bold", "small", "large",
638		- "regular", "button", "regular", "icon",
639		- "regular"
640		- };
	929	+ private JTextPane createTextPane()
	930	+ {
	931	+// TEXTAREA String[] initString =
	932	+// {
	933	+// "This is an editable JTextPane, ", //regular
	934	+// "another ", //italic
	935	+// "styled ", //bold
	936	+// "text ", //small
	937	+// "component, ", //large
	938	+// "which supports embedded components..." + newline,//regular
	939	+// " " + newline, //button
	940	+// "...and embedded icons..." + newline, //regular
	941	+// " ", //icon
	942	+// newline + "JTextPane is a subclass of JEditorPane that "
	943	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	944	+// + "cover methods for interacting with those objects."
	945	+// };
	946	+//
	947	+// String[] initStyles =
	948	+// {
	949	+// "regular", "italic", "bold", "small", "large",
	950	+// "regular", "button", "regular", "icon",
	951	+// "regular"
	952	+// };
	953	+//
	954	+// JTextPane textPane = new JTextPane();
	955	+// textPane.setEditable(true);
	956	+// /StyledDocument/ doc = textPane.getStyledDocument();
	957	+// addStylesToDocument(doc);
	958	+//
	959	+// try
	960	+// {
	961	+// for (int j = 0; j < 2; j++)
	962	+// {
	963	+// for (int i = 0; i < initString.length; i++)
	964	+// {
	965	+// doc.insertString(doc.getLength(), initString[i],
	966	+// doc.getStyle(initStyles[i]));
	967	+// }
	968	+// }
	969	+// } catch (BadLocationException ble)
	970	+// {
	971	+// System.err.println("Couldn't insert initial text into text pane.");
	972	+// }
641	973
642		- JTextPane textPane = new JTextPane();
643		- textPane.setEditable(true);
644		- /StyledDocument/ doc = textPane.getStyledDocument();
645		- addStylesToDocument(doc);
646		-
647		- try
648		- {
649		- for (int j = 0; j < 2; j++)
650		- {
651		- for (int i = 0; i < initString.length; i++)
652		- {
653		- doc.insertString(doc.getLength(), initString[i],
654		- doc.getStyle(initStyles[i]));
655		- }
656		- }
657		- } catch (BadLocationException ble)
658		- {
659		- System.err.println("Couldn't insert initial text into text pane.");
660		- }
661		-
662		- return new JTextArea(); // textPane;
	974	+ return new JTextPane(); // textPane;
663	975	}
664	976
665	977	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -712,7 +1024,7 @@
712	1024	protected static ImageIcon createImageIcon(String path,
713	1025	String description)
714	1026	{
715		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1027	+ java.net.URL imgURL = Grafreed.class.getResource(path);
716	1028	if (imgURL != null)
717	1029	{
718	1030	return new ImageIcon(imgURL, description);
..	..	@@ -735,6 +1047,7 @@
735	1047	{
736	1048	SetupMaterial(materialPanel);
737	1049	}
	1050	+
738	1051	//SetupName();
739	1052	//SetupViews();
740	1053	}
..	..	@@ -744,6 +1057,7 @@
744	1057	// NumberSlider vDivsField;
745	1058	// JCheckBox endcaps;
746	1059	JCheckBox liveCB;
	1060	+ JCheckBox selectableCB;
747	1061	JCheckBox hideCB;
748	1062	JCheckBox link2masterCB;
749	1063	JCheckBox markCB;
..	..	@@ -751,7 +1065,12 @@
751	1065	JCheckBox speedupCB;
752	1066	JCheckBox rewindCB;
753	1067	JCheckBox flipVCB;
	1068	+
	1069	+ cCheckBox toggleTextureCB;
	1070	+ cCheckBox toggleSwitchCB;
	1071	+
754	1072	JComboBox texresMenu;
	1073	+
755	1074	JButton resetButton;
756	1075	JButton stepButton;
757	1076	JButton stepAllButton;
..	..	@@ -759,115 +1078,87 @@
759	1078	JButton slowerButton;
760	1079	JButton fasterButton;
761	1080	JButton remarkButton;
	1081	+
	1082	+ cGridBag editPanel;
	1083	+ cGridBag editCommandsPanel;
	1084	+
	1085	+ cGridBag namePanel;
	1086	+ cGridBag setupPanel;
	1087	+ cGridBag setupPanel2;
	1088	+ cGridBag objectCommandsPanel;
	1089	+ cGridBag pushPanel;
	1090	+ cGridBag fillPanel;
762	1091
763		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1092	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
764	1093	{
765	1094	JCheckBox cb;
766	1095
767		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
768		- oe.aConstraints.gridwidth = 1; // 3;
769		-// oe.aConstraints.weightx = 1;
770		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
771		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1096	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
772	1097	cb.addItemListener(this);
773		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
774		- oe.aConstraints.gridwidth = 1;
775		- oe.aConstraints.gridx += 1;
776	1098
777	1099	return cb;
778	1100	}
779	1101
780		- cButton AddButton(ObjEditor oe, String label)
	1102	+ cButton AddButton(cGridBag panel, String label)
781	1103	{
782	1104	cButton cb;
783	1105
784		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
785		- oe.aConstraints.gridwidth = 1;
786		-// oe.aConstraints.weightx = 1;
787		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
788		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1106	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
789	1107	cb.addActionListener(this);
790		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
791		- oe.aConstraints.gridwidth = 1;
792		- oe.aConstraints.gridx += 1;
793	1108
794	1109	return cb;
795	1110	}
796	1111
797		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1112	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
798	1113	{
799	1114	JComboBox combo;
800	1115
801		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
802		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- oe.aConstraints.gridx += 1;
	1116	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
804	1117	combo.addActionListener(this);
805	1118
806	1119	return combo;
807	1120	}
808	1121
809		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1122	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
810	1123	{
811		- NumberSlider combo;
	1124	+ cGridBag control = new cGridBag();
	1125	+
	1126	+ cNumberSlider combo;
812	1127
813	1128	JLabel jlabel = new JLabel(label);
814		-
815		- aConstraints.fill = GridBagConstraints.VERTICAL;
816	1129	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
817		- aConstraints.gridwidth = 2;
818		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
819		- aConstraints.gridx += 1;
820		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
822		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.gridwidth = 1;
825		-
	1130	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1131	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826	1132	combo.setFloat(current);
827		-
828		- combo.label = jlabel;
829		-
830		- combo.addChangeListener(this);
831		-
832		- return combo;
	1133	+
	1134	+ panel.add(control);
	1135	+
	1136	+ return control;
833	1137	}
834	1138
835		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1139	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
836	1140	{
837		- NumberSlider combo;
	1141	+ cGridBag control = new cGridBag();
	1142	+
	1143	+ cNumberSlider combo;
838	1144
839	1145	JLabel jlabel = new JLabel(label);
840		-
841		- aConstraints.fill = GridBagConstraints.VERTICAL;
842	1146	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
843		- aConstraints.gridwidth = 2;
844		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
845		- aConstraints.gridx += 1;
846		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
847		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
848		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851		-
	1147	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1148	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
852	1149	combo.setInteger(current);
853	1150
854		- combo.label = jlabel;
855		-
856		- combo.addChangeListener(this);
857		-
858		- return combo;
	1151	+ panel.add(control);
	1152	+
	1153	+ return control;
859	1154	}
860	1155
861		- JTextArea AddText(JPanel ctrlPanel, String name)
	1156	+ JTextArea AddText(cGridBag ctrlPanel, String name)
862	1157	{
863	1158	JTextArea text;
864	1159
865		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
866		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
867		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1160	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
868	1161	text.addCaretListener(this);
869		- aConstraints.gridx += 1;
870		- aConstraints.gridwidth = 1;
871	1162
872	1163	return text;
873	1164	}
..	..	@@ -897,9 +1188,16 @@
897	1188	objEditor.ctrlPanel.remove(j);
898	1189	}
899	1190
	1191	+ void Remove(cNumberSlider j)
	1192	+ {
	1193	+ j.removeChangeListener(this);
	1194	+ //objEditor.ctrlPanel.remove(j.label);
	1195	+ objEditor.ctrlPanel.remove(j);
	1196	+ }
	1197	+
900	1198	/*
901	1199	*/
902		- void Return() // ObjEditor oe)
	1200	+ void Return0() // ObjEditor oe)
903	1201	{
904	1202	aConstraints.gridy += 1;
905	1203	aConstraints.gridx = 0;
..	..	@@ -954,35 +1252,93 @@
954	1252
955	1253	void SetupUI2(ObjEditor oe)
956	1254	{
957		-// oe.aConstraints.weightx = 0;
958		-// oe.aConstraints.weighty = 0;
959		-// oe.aConstraints.gridx = 0;
960		-// oe.aConstraints.gridy = 0;
961		- SetupName(oe);
	1255	+ //SetupName(oe);
962	1256
963		- if (!GroupEditor.allparams)
	1257	+ namePanel = new cGridBag();
	1258	+
	1259	+ //if (copy.pinned)
	1260	+ {
	1261	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1262	+ pinButton.setSelected(copy.pinned);
	1263	+ cGridBag t = new cGridBag();
	1264	+ t.preferredWidth = 2;
	1265	+ t.add(pinButton);
	1266	+ namePanel.add(t);
	1267	+
	1268	+ pinButton.addItemListener(this);
	1269	+ }
	1270	+
	1271	+ nameField = AddText(namePanel, copy.GetName());
	1272	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1273	+ oe.ctrlPanel.add(namePanel);
	1274	+
	1275	+ oe.ctrlPanel.Return();
	1276	+
	1277	+ if (!allparams)
964	1278	return;
965	1279
966		- liveCB = AddCheckBox(oe, "Live", copy.live);
967		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
968		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1280	+ setupPanel = new cGridBag().setVertical(false);
	1281	+
	1282	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1283	+ liveCB.setToolTipText("Animate object");
	1284	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1285	+ selectableCB.setToolTipText("Make object selectable");
969	1286	// Return();
970		- markCB = AddCheckBox(oe, "Mark", copy.marked);
971		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
972		- randomCB = AddCheckBox(oe, "Rand", copy.random);
973		- Return();
974		- resetButton = AddButton(oe, "Reset");
975		- stepButton = AddButton(oe, "Step");
	1287	+
	1288	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1289	+ hideCB.setToolTipText("Hide object");
	1290	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1291	+ markCB.setToolTipText("As animation target transform");
	1292	+
	1293	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1294	+
	1295	+ setupPanel2 = new cGridBag().setVertical(false);
	1296	+
	1297	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1298	+ rewindCB.setToolTipText("Rewind animation");
	1299	+
	1300	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1301	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1302	+
	1303	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1304	+ link2masterCB.setToolTipText("Attach to support");
	1305	+
	1306	+ if (Globals.ADVANCED)
	1307	+ {
	1308	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1309	+ speedupCB.setToolTipText("Option motion capture");
	1310	+ }
	1311	+
	1312	+ oe.ctrlPanel.add(setupPanel);
	1313	+ oe.ctrlPanel.Return();
	1314	+ oe.ctrlPanel.add(setupPanel2);
	1315	+ oe.ctrlPanel.Return();
	1316	+
	1317	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1318	+
	1319	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1320	+ resetButton.setToolTipText("Jump to frame zero");
	1321	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1322	+ stepButton.setToolTipText("Step one frame");
976	1323	// resetAllButton = AddButton(oe, "Reset All");
977	1324	// stepAllButton = AddButton(oe, "Step All");
978		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
979	1325	// Return();
980		- slowerButton = AddButton(oe, "Slow");
981		- fasterButton = AddButton(oe, "Fast");
982		- remarkButton = AddButton(oe, "Rem");
	1326	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1327	+ slowerButton.setToolTipText("Decrease animation speed");
	1328	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1329	+ fasterButton.setToolTipText("Increase animation speed");
	1330	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1331	+ remarkButton.setToolTipText("Set the current transform as the target");
983	1332
984		- Return();
	1333	+ oe.ctrlPanel.add(objectCommandsPanel);
	1334	+ oe.ctrlPanel.Return();
985	1335
	1336	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1337	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1338	+ //Return();
	1339	+
	1340	+ oe.ctrlPanel.Return();
	1341	+
986	1342	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1343	// ObjEditor.aConstraints.gridx += 1;
988	1344
..	..	@@ -1076,7 +1432,7 @@
1076	1432	oe.aConstraints.gridwidth = 1;
1077	1433	/**/
1078	1434	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1435	+ oe.ctrlPanel.Return();
1080	1436
1081	1437	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1438	//textureButton.setEnabled(false);
..	..	@@ -1178,11 +1534,25 @@
1178	1534	//JPanel worldPanel =
1179	1535	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1180	1536	//worldPanel.setName("World");
1181		- centralPanel = new JPanel(new BorderLayout());
1182		- timelinePanel = new JPanel(new BorderLayout());
1183		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1537	+ centralPanel = new cGridBag();
	1538	+ centralPanel.preferredWidth = 20;
	1539	+
	1540	+ if (Globals.ADVANCED)
	1541	+ {
	1542	+ timelinePanel = new JPanel(new BorderLayout());
	1543	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1184	1544
	1545	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1546	+ cameraPanel.setContinuousLayout(true);
	1547	+ cameraPanel.setOneTouchExpandable(true);
	1548	+// cameraPanel.setDividerLocation(0.9);
	1549	+// cameraPanel.setDividerSize(9);
	1550	+ cameraPanel.setResizeWeight(1.0);
	1551	+
	1552	+ }
	1553	+
1185	1554	centralPanel.add(cameraView);
	1555	+ centralPanel.setFocusable(true);
1186	1556	//frame.setJMenuBar(timelineMenubar);
1187	1557	//centralPanel.add(timelinePanel);
1188	1558
..	..	@@ -1201,12 +1571,14 @@
1201	1571	//frontView.object = copy;
1202	1572	//sideView.object = copy;
1203	1573
1204		- XYZPanel = new JPanel();
1205		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1574	+ XYZPanel = new cGridBag().setVertical(true);
	1575	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1206	1576
1207		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1208		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1209		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1577	+ XYZPanel.preferredWidth = 5;
	1578	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1579	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1580	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1581	+ //XYZPanel.setName("XYZ");
1210	1582
1211	1583	/*
1212	1584	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1244,12 +1616,29 @@
1244	1616	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1245	1617	//tmp.setName("Edit");
1246	1618	objectPanel.add(materialPanel);
1247		- JPanel north = new JPanel(new BorderLayout());
1248		- north.setName("Edit");
1249		- north.add(ctrlPanel, BorderLayout.NORTH);
1250		- objectPanel.add(north);
1251		- objectPanel.add(infoPanel);
	1619	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1620	+ objectPanel.setToolTipTextAt(0, "Material");
	1621	+
	1622	+ objectPanel.add(toolboxPanel);
	1623	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1624	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1252	1625
	1626	+ objectPanel.add(skyboxPanel);
	1627	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1628	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1629	+
	1630	+// JPanel north = new JPanel(new BorderLayout());
	1631	+// north.setName("Edit");
	1632	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1633	+// objectPanel.add(north);
	1634	+ objectPanel.add(editPanel);
	1635	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1636	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1637	+
	1638	+ objectPanel.add(XYZPanel);
	1639	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1640	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1641	+
1253	1642	/*
1254	1643	aConstraints.gridx = 0;
1255	1644	aConstraints.gridwidth = 1;
..	..	@@ -1257,7 +1646,7 @@
1257	1646	aConstraints.gridy += 1;
1258	1647	aConstraints.gridwidth = 1;
1259	1648	mainPanel.add(objectPanel, aConstraints);
1260		- */
	1649	+ */
1261	1650
1262	1651	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1263	1652	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1268,17 +1657,29 @@
1268	1657	scrollpane.setWheelScrollingEnabled(true);
1269	1658	scrollpane.addMouseWheelListener(this); // Default not fast enough
1270	1659
1271		- /JTabbedPane/ scenePanel = new JTabbedPane();
1272		- scenePanel.add(scrollpane);
	1660	+ /JTabbedPane/ scenePanel = new cGridBag();
	1661	+ scenePanel.preferredWidth = 5;
	1662	+
	1663	+ JTabbedPane tabbedPane = new JTabbedPane();
	1664	+ tabbedPane.add(scrollpane);
1273	1665
1274		- scenePanel.add(FSPane = new cFileSystemPane(this));
1275		-
1276		- optionsPanel = new JPanel(new GridBagLayout());
	1666	+ optionsPanel = new cGridBag().setVertical(false);
1277	1667
1278	1668	optionsPanel.setName("Options");
1279		- scenePanel.add(optionsPanel);
	1669	+
	1670	+ AddOptions(optionsPanel); //, aConstraints);
	1671	+
	1672	+ tabbedPane.add(optionsPanel);
	1673	+
	1674	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1280	1675
	1676	+ scenePanel.add(tabbedPane);
1281	1677
	1678	+ //if (Globals.ADVANCED)
	1679	+ tabbedPane.add(infoPanel);
	1680	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1681	+ tabbedPane.setToolTipTextAt(3, "Information");
	1682	+
1282	1683	/*
1283	1684	cTree jTree = new cTree(null);
1284	1685	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1311,6 +1712,7 @@
1311	1712	//bigPanel.setSize(new Dimension(10,10));
1312	1713	//bigPanel.add(ctrlPanel);
1313	1714	//bigPanel.add(gridPanel);
	1715	+ /**
1314	1716	bigThree = new JPanel();
1315	1717	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1316	1718	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1334,7 +1736,13 @@
1334	1736	// aConstraints.gridheight = 3;
1335	1737	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1336	1738	bigThree.add(XYZPanel, aWindowConstraints);
	1739	+ /**/
1337	1740
	1741	+ bigThree = new cGridBag();
	1742	+ bigThree.addComponent(scenePanel);
	1743	+ bigThree.addComponent(centralPanel);
	1744	+ //bigThree.addComponent(XYZPanel);
	1745	+
1338	1746	// // SIDE EFFECT!!!
1339	1747	// aConstraints.gridx = 0;
1340	1748	// aConstraints.gridy = 0;
..	..	@@ -1342,9 +1750,26 @@
1342	1750	// aConstraints.gridheight = 1;
1343	1751
1344	1752	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1345		- framePanel.setContinuousLayout(true);
1346		- framePanel.setOneTouchExpandable(true);
1347		- framePanel.setDividerLocation(0.8);
	1753	+
	1754	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1755	+ new java.beans.PropertyChangeListener()
	1756	+ {
	1757	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1758	+ {
	1759	+ if ((Integer)pce.getOldValue() == 1)
	1760	+ {
	1761	+ if (radio.layout != expandedLayout)
	1762	+ {
	1763	+ radio.layout = expandedLayout;
	1764	+ radio.layout.doClick();
	1765	+ }
	1766	+ }
	1767	+ }
	1768	+ });
	1769	+
	1770	+ framePanel.setContinuousLayout(false);
	1771	+ framePanel.setOneTouchExpandable(false);
	1772	+ //.setDividerLocation(0.8);
1348	1773	//framePanel.setDividerSize(15);
1349	1774	//framePanel.setResizeWeight(0.15);
1350	1775	framePanel.setName("Frame");
..	..	@@ -1355,20 +1780,25 @@
1355	1780	//worldPane.add(bigPanel);
1356	1781	//worldPane.add(worldPanel);
1357	1782	/**/
1358		- frame.getContentPane().add(/"Center",/framePanel);
	1783	+ //frame.getContentPane().add(/"Center",/framePanel);
	1784	+ frame.add(/"Center",/framePanel);
1359	1785	//frame.getContentPane().add(/"Center",/ worldPane);
1360	1786
1361	1787	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1362	1788
1363		- frame.setSize(1024, 768);
1364		- frame.show();
1365		-
	1789	+ frame.setSize(1280, 860);
	1790	+
	1791	+ cameraView.requestFocusInWindow();
	1792	+
1366	1793	gridPanel.setDividerLocation(1.0);
	1794	+
	1795	+ frame.validate();
	1796	+
	1797	+ frame.setVisible(true);
1367	1798
1368	1799	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1369	1800	frame.addWindowListener(new WindowAdapter()
1370	1801	{
1371		-
1372	1802	public void windowClosing(WindowEvent e)
1373	1803	{
1374	1804	Close();
..	..	@@ -1376,6 +1806,10 @@
1376	1806	});
1377	1807	}
1378	1808
	1809	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1810	+ {
	1811	+ }
	1812	+
1379	1813	JTree GetTree()
1380	1814	{
1381	1815	return objEditor.jTree;
..	..	@@ -1387,260 +1821,575 @@
1387	1821	ctrlPanel.removeAll();
1388	1822	}
1389	1823
1390		- void SetupMaterial(JPanel ctrlPanel)
	1824	+ void SetupMaterial(cGridBag materialpanel)
1391	1825	{
1392		- aConstraints.weighty = 0;
1393		- //aConstraints.weightx = 1;
1394		- /*
	1826	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1827	+
	1828	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1829	+ skin.setToolTipText("Skin");
	1830	+ skin.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ // Skin
	1838	+ colorField.setFloat(material.color);
	1839	+ saturationField.setFloat(material.modulation);
	1840	+ subsurfaceField.setFloat(material.subsurface);
	1841	+ selfshadowField.setFloat(material.diffuseness);
	1842	+ diffusenessField.setFloat(material.factor);
	1843	+ shininessField.setFloat(material.shininess);
	1844	+ shadowbiasField.setFloat(material.shadowbias);
	1845	+ diffuseField.setFloat(material.diffuse);
	1846	+ specularField.setFloat(material.specular);
	1847	+
	1848	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1849	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1850	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1851	+
	1852	+ materialtouched = true;
	1853	+ applySelf();
	1854	+ }
	1855	+ });
	1856	+ presetpanel.add(skin);
	1857	+
	1858	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1859	+ lambert.setToolTipText("Diffuse");
	1860	+ lambert.addMouseListener(new MouseAdapter()
	1861	+ {
	1862	+ public void mouseClicked(MouseEvent e)
	1863	+ {
	1864	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1865	+ cMaterial material = object.material;
	1866	+
	1867	+ diffusenessField.setFloat(material.factor);
	1868	+ selfshadowField.setFloat(material.diffuseness);
	1869	+
	1870	+ materialtouched = true;
	1871	+ applySelf();
	1872	+ }
	1873	+ });
	1874	+ presetpanel.add(lambert);
	1875	+
	1876	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1877	+ diffuse2.setToolTipText("Diffuse2");
	1878	+ diffuse2.addMouseListener(new MouseAdapter()
	1879	+ {
	1880	+ public void mouseClicked(MouseEvent e)
	1881	+ {
	1882	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1883	+ cMaterial material = object.material;
	1884	+
	1885	+ diffusenessField.setFloat(material.factor);
	1886	+ selfshadowField.setFloat(material.diffuseness);
	1887	+
	1888	+ materialtouched = true;
	1889	+ applySelf();
	1890	+ }
	1891	+ });
	1892	+ presetpanel.add(diffuse2);
	1893	+
	1894	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1895	+ diffusemoon.setToolTipText("Moon");
	1896	+ diffusemoon.addMouseListener(new MouseAdapter()
	1897	+ {
	1898	+ public void mouseClicked(MouseEvent e)
	1899	+ {
	1900	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1901	+ cMaterial material = object.material;
	1902	+
	1903	+ diffusenessField.setFloat(material.factor);
	1904	+ selfshadowField.setFloat(material.diffuseness);
	1905	+
	1906	+ materialtouched = true;
	1907	+ applySelf();
	1908	+ }
	1909	+ });
	1910	+ presetpanel.add(diffusemoon);
	1911	+
	1912	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1913	+ diffusemoon2.setToolTipText("Moon2");
	1914	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1915	+ {
	1916	+ public void mouseClicked(MouseEvent e)
	1917	+ {
	1918	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1919	+ cMaterial material = object.material;
	1920	+
	1921	+ diffusenessField.setFloat(material.factor);
	1922	+ selfshadowField.setFloat(material.diffuseness);
	1923	+
	1924	+ materialtouched = true;
	1925	+ applySelf();
	1926	+ }
	1927	+ });
	1928	+ presetpanel.add(diffusemoon2);
	1929	+
	1930	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1931	+ diffusemoon3.setToolTipText("Moon3");
	1932	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1933	+ {
	1934	+ public void mouseClicked(MouseEvent e)
	1935	+ {
	1936	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1937	+ cMaterial material = object.material;
	1938	+
	1939	+ diffusenessField.setFloat(material.factor);
	1940	+ selfshadowField.setFloat(material.diffuseness);
	1941	+
	1942	+ materialtouched = true;
	1943	+ applySelf();
	1944	+ }
	1945	+ });
	1946	+ presetpanel.add(diffusemoon3);
	1947	+
	1948	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1949	+ diffusesheen.setToolTipText("Sheen");
	1950	+ diffusesheen.addMouseListener(new MouseAdapter()
	1951	+ {
	1952	+ public void mouseClicked(MouseEvent e)
	1953	+ {
	1954	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1955	+ cMaterial material = object.material;
	1956	+
	1957	+ sheenField.setFloat(material.sheen);
	1958	+
	1959	+ materialtouched = true;
	1960	+ applySelf();
	1961	+ }
	1962	+ });
	1963	+ presetpanel.add(diffusesheen);
	1964	+
	1965	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1966	+ rough.setToolTipText("Rough metal");
	1967	+ rough.addMouseListener(new MouseAdapter()
	1968	+ {
	1969	+ public void mouseClicked(MouseEvent e)
	1970	+ {
	1971	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1972	+ cMaterial material = object.material;
	1973	+
	1974	+ shininessField.setFloat(material.shininess);
	1975	+ velvetField.setFloat(material.velvet);
	1976	+
	1977	+ materialtouched = true;
	1978	+ applySelf();
	1979	+ }
	1980	+ });
	1981	+ presetpanel.add(rough);
	1982	+
	1983	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1984	+ rough2.setToolTipText("Medium metal");
	1985	+ rough2.addMouseListener(new MouseAdapter()
	1986	+ {
	1987	+ public void mouseClicked(MouseEvent e)
	1988	+ {
	1989	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1990	+ cMaterial material = object.material;
	1991	+
	1992	+ shininessField.setFloat(material.shininess);
	1993	+ lightareaField.setFloat(material.lightarea);
	1994	+
	1995	+ materialtouched = true;
	1996	+ applySelf();
	1997	+ }
	1998	+ });
	1999	+ presetpanel.add(rough2);
	2000	+
	2001	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2002	+ shini0.setToolTipText("Shiny");
	2003	+ shini0.addMouseListener(new MouseAdapter()
	2004	+ {
	2005	+ public void mouseClicked(MouseEvent e)
	2006	+ {
	2007	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2008	+ cMaterial material = object.material;
	2009	+
	2010	+ shininessField.setFloat(material.shininess);
	2011	+ lightareaField.setFloat(material.lightarea);
	2012	+
	2013	+ materialtouched = true;
	2014	+ applySelf();
	2015	+ }
	2016	+ });
	2017	+ presetpanel.add(shini0);
	2018	+
	2019	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2020	+ shini1.setToolTipText("Shiny2");
	2021	+ shini1.addMouseListener(new MouseAdapter()
	2022	+ {
	2023	+ public void mouseClicked(MouseEvent e)
	2024	+ {
	2025	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2026	+ cMaterial material = object.material;
	2027	+
	2028	+ shininessField.setFloat(material.shininess);
	2029	+ lightareaField.setFloat(material.lightarea);
	2030	+
	2031	+ materialtouched = true;
	2032	+ applySelf();
	2033	+ }
	2034	+ });
	2035	+ presetpanel.add(shini1);
	2036	+
	2037	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2038	+ shini2.setToolTipText("Shiny3");
	2039	+ shini2.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ shininessField.setFloat(material.shininess);
	2047	+ lightareaField.setFloat(material.lightarea);
	2048	+
	2049	+ materialtouched = true;
	2050	+ applySelf();
	2051	+ }
	2052	+ });
	2053	+ presetpanel.add(shini2);
	2054	+
	2055	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2056	+ aniso.setToolTipText("AnisoU");
	2057	+ aniso.addMouseListener(new MouseAdapter()
	2058	+ {
	2059	+ public void mouseClicked(MouseEvent e)
	2060	+ {
	2061	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2062	+ cMaterial material = object.material;
	2063	+
	2064	+ anisoField.setFloat(material.aniso);
	2065	+ anisoVField.setFloat(material.anisoV);
	2066	+
	2067	+ materialtouched = true;
	2068	+ applySelf();
	2069	+ }
	2070	+ });
	2071	+ presetpanel.add(aniso);
	2072	+
	2073	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2074	+ aniso2.setToolTipText("AnisoV");
	2075	+ aniso2.addMouseListener(new MouseAdapter()
	2076	+ {
	2077	+ public void mouseClicked(MouseEvent e)
	2078	+ {
	2079	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2080	+ cMaterial material = object.material;
	2081	+
	2082	+ anisoField.setFloat(material.aniso);
	2083	+ anisoVField.setFloat(material.anisoV);
	2084	+
	2085	+ materialtouched = true;
	2086	+ applySelf();
	2087	+ }
	2088	+ });
	2089	+ presetpanel.add(aniso2);
	2090	+
	2091	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2092	+ aniso3.setToolTipText("AnisoUV");
	2093	+ aniso3.addMouseListener(new MouseAdapter()
	2094	+ {
	2095	+ public void mouseClicked(MouseEvent e)
	2096	+ {
	2097	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2098	+ cMaterial material = object.material;
	2099	+
	2100	+ anisoField.setFloat(material.aniso);
	2101	+ anisoVField.setFloat(material.anisoV);
	2102	+
	2103	+ materialtouched = true;
	2104	+ applySelf();
	2105	+ }
	2106	+ });
	2107	+ presetpanel.add(aniso3);
	2108	+
	2109	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2110	+ velvet0.setToolTipText("Velvet");
	2111	+ velvet0.addMouseListener(new MouseAdapter()
	2112	+ {
	2113	+ public void mouseClicked(MouseEvent e)
	2114	+ {
	2115	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2116	+ cMaterial material = object.material;
	2117	+
	2118	+ diffusenessField.setFloat(material.factor);
	2119	+ selfshadowField.setFloat(material.diffuseness);
	2120	+ sheenField.setFloat(material.sheen);
	2121	+ shininessField.setFloat(material.shininess);
	2122	+ velvetField.setFloat(material.velvet);
	2123	+ shiftField.setFloat(material.shift);
	2124	+
	2125	+ materialtouched = true;
	2126	+ applySelf();
	2127	+ }
	2128	+ });
	2129	+ presetpanel.add(velvet0);
	2130	+
	2131	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2132	+ bump0.setToolTipText("Bump texture");
	2133	+ bump0.addMouseListener(new MouseAdapter()
	2134	+ {
	2135	+ public void mouseClicked(MouseEvent e)
	2136	+ {
	2137	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2138	+ cMaterial material = object.material;
	2139	+
	2140	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2141	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2142	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2143	+
	2144	+ materialtouched = true;
	2145	+ applySelf();
	2146	+ }
	2147	+ });
	2148	+ presetpanel.add(bump0);
	2149	+
	2150	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2151	+ halo.setToolTipText("Halo");
	2152	+ halo.addMouseListener(new MouseAdapter()
	2153	+ {
	2154	+ public void mouseClicked(MouseEvent e)
	2155	+ {
	2156	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2157	+ cMaterial material = object.material;
	2158	+
	2159	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2160	+
	2161	+ materialtouched = true;
	2162	+ applySelf();
	2163	+ }
	2164	+ });
	2165	+ presetpanel.add(halo);
	2166	+
	2167	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2168	+ candle.setToolTipText("Candle");
	2169	+ candle.addMouseListener(new MouseAdapter()
	2170	+ {
	2171	+ public void mouseClicked(MouseEvent e)
	2172	+ {
	2173	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2174	+ cMaterial material = object.material;
	2175	+
	2176	+ subsurfaceField.setFloat(material.subsurface);
	2177	+ shadowbiasField.setFloat(material.shadowbias);
	2178	+ ambientField.setFloat(material.ambient);
	2179	+ specularField.setFloat(material.specular);
	2180	+ lightareaField.setFloat(material.lightarea);
	2181	+ shininessField.setFloat(material.shininess);
	2182	+
	2183	+ materialtouched = true;
	2184	+ applySelf();
	2185	+ }
	2186	+ });
	2187	+ presetpanel.add(candle);
	2188	+
	2189	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2190	+ shadowShader.setToolTipText("Shadow");
	2191	+ shadowShader.addMouseListener(new MouseAdapter()
	2192	+ {
	2193	+ public void mouseClicked(MouseEvent e)
	2194	+ {
	2195	+ diffuseField.setFloat(0.001);
	2196	+ ambientField.setFloat(0.001);
	2197	+ cameraField.setFloat(0.001);
	2198	+ specularField.setFloat(0.001);
	2199	+ fakedepthField.setFloat(0.001);
	2200	+ opacityField.setFloat(0.6);
	2201	+
	2202	+ materialtouched = true;
	2203	+ applySelf();
	2204	+ }
	2205	+ });
	2206	+ presetpanel.add(shadowShader);
	2207	+
	2208	+ cGridBag panel = new cGridBag().setVertical(true);
	2209	+
	2210	+ presetpanel.preferredWidth = 1;
	2211	+
	2212	+ materialpanel.add(presetpanel);
	2213	+ materialpanel.add(panel);
	2214	+
	2215	+ panel.preferredWidth = 8;
	2216	+
	2217	+ /*
1395	2218	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1396	2219	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1397		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1398		- aConstraints.gridx += 1;
1399		- */
	2220	+ */
1400	2221
1401		- aConstraints.gridwidth = 1;
1402		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1403		- aConstraints.gridx += 1;
1404		- aConstraints.weighty = 0;
1405		- aConstraints.gridwidth = 1;
	2222	+ cGridBag editBar = new cGridBag().setVertical(false);
	2223	+
	2224	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2225	+ createMaterialButton.setToolTipText("Create material");
1406	2226
1407	2227	/*
1408	2228	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1409		- aConstraints.gridx += 1;
1410		- aConstraints.weighty = 0;
1411		- aConstraints.gridwidth = 1;
1412	2229	*/
1413	2230
1414		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1415		- aConstraints.gridx += 1;
	2231	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2232	+ clearMaterialButton.setToolTipText("Clear material");
	2233	+
	2234	+ if (Globals.ADVANCED)
	2235	+ {
	2236	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2237	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2238	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2239	+ }
1416	2240
1417		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1418		-
1419		- aConstraints.gridx += 1;
1420		-
1421		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1422		-
1423		- aConstraints.gridx += 1;
1424		-
1425		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1426		-
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.weighty = 0;
1430		- aConstraints.gridwidth = 1;
	2241	+ editBar.preferredHeight = 15;
	2242	+
	2243	+ panel.add(editBar);
	2244	+
1431	2245	/**/
1432	2246	//aConstraints.weighty = 0;
1433	2247	////aConstraints.weightx = 1;
1434	2248	//aConstraints.weighty = 1;
1435	2249	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1436	2250	//aConstraints.gridx += 1;
1437		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1438		- aConstraints.weighty = 0;
1439		- aConstraints.gridx = 0;
1440		- aConstraints.gridy += 1;
1441		- aConstraints.gridwidth = 1;
	2251	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1442	2252
1443		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1444		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1445		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1446		- aConstraints.gridx += 1;
1447		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1448		- //aConstraints.weightx = 0;
1449		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1450		- aConstraints.gridx = 0;
1451		- aConstraints.gridy += 1;
1452		- aConstraints.gridwidth = 1;
	2253	+ cGridBag colorSection = new cGridBag().setVertical(true);
1453	2254
1454		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1455		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1456		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1457		- aConstraints.gridx += 1;
1458		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.gridwidth = 1;
	2255	+ cGridBag huepanel = new cGridBag();
	2256	+ cGridBag huelabel = new cGridBag();
	2257	+ skin = GetLabel("icons/hue.png", false);
	2258	+ skin.fit = true;
	2259	+ huelabel.add(skin);
	2260	+ huelabel.preferredWidth = 20;
	2261	+ huepanel.add(new cGridBag()); // Label
	2262	+ huepanel.add(huelabel); // Field/slider
	2263	+
	2264	+ huepanel.preferredHeight = 7;
1463	2265
1464		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1465		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1467		- aConstraints.gridx += 1;
1468		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1470		- aConstraints.gridx = 0;
1471		- aConstraints.gridy += 1;
1472		- aConstraints.gridwidth = 1;
	2266	+ colorSection.add(huepanel);
	2267	+
	2268	+ cGridBag color = new cGridBag();
	2269	+
	2270	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2271	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2272	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1473	2273
1474		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1477		- aConstraints.gridx += 1;
1478		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1480		- aConstraints.gridx = 0;
1481		- aConstraints.gridy += 1;
1482		- aConstraints.gridwidth = 1;
	2274	+ //colorField.preferredWidth = 200;
	2275	+ colorSection.add(color);
1483	2276
1484		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1485		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1486		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1487		- aConstraints.gridx += 1;
1488		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1490		- aConstraints.gridx = 0;
1491		- aConstraints.gridy += 1;
1492		- aConstraints.gridwidth = 1;
	2277	+ cGridBag modulation = new cGridBag();
	2278	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2279	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2280	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2281	+ colorSection.add(modulation);
1493	2282
1494		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1497		- aConstraints.gridx += 1;
1498		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1499		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1500		- aConstraints.gridx = 0;
1501		- aConstraints.gridy += 1;
1502		- aConstraints.gridwidth = 1;
	2283	+ cGridBag opacity = new cGridBag();
	2284	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2285	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2286	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2287	+ colorSection.add(opacity);
1503	2288
1504		- //aConstraints.weighty = 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1506		- //aConstraints.gridx += 1;
1507		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1508		- aConstraints.weighty = 0;
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	2289	+ colorSection.add(GetSeparator());
	2290	+
	2291	+ cGridBag texture = new cGridBag();
	2292	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2293	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2294	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2295	+ colorSection.add(texture);
1512	2296
1513		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1514		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	2297	+ panel.add(GetSeparator());
	2298	+
	2299	+ panel.add(colorSection);
	2300	+
	2301	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2302	+
	2303	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2304	+
	2305	+ cGridBag diffuse = new cGridBag();
	2306	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2307	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2308	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2309	+ diffuseSection.add(diffuse);
1522	2310
1523		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1524		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	2311	+ cGridBag diffuseness = new cGridBag();
	2312	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2313	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2314	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2315	+ diffuseSection.add(diffuseness);
1532	2316
1533		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1534		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	2317	+ cGridBag selfshadow = new cGridBag();
	2318	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2319	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2320	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2321	+ diffuseSection.add(selfshadow);
1542	2322
1543		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1544		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1545		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1546		- aConstraints.gridx += 1;
1547		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1548		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1549		- aConstraints.gridx = 0;
1550		- aConstraints.gridy += 1;
1551		- aConstraints.gridwidth = 1;
	2323	+ cGridBag sheen = new cGridBag();
	2324	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2325	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2326	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2327	+ diffuseSection.add(sheen);
1552	2328
1553		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1554		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1555		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1556		- aConstraints.gridx += 1;
1557		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1559		- aConstraints.gridx = 0;
1560		- aConstraints.gridy += 1;
1561		- aConstraints.gridwidth = 1;
	2329	+ cGridBag subsurface = new cGridBag();
	2330	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2331	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2332	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2333	+ diffuseSection.add(subsurface);
1562	2334
1563		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1564		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1565		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1566		- aConstraints.gridx += 1;
1567		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1568		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1569		- aConstraints.gridx = 0;
1570		- aConstraints.gridy += 1;
1571		- aConstraints.gridwidth = 1;
	2335	+ cGridBag shadow = new cGridBag();
	2336	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2337	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2338	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2339	+ diffuseSection.add(shadow);
1572	2340
1573		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1574		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1575		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1576		- aConstraints.gridx += 1;
1577		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1578		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1579		- aConstraints.gridx = 0;
1580		- aConstraints.gridy += 1;
1581		- aConstraints.gridwidth = 1;
	2341	+ cGridBag fakedepth = new cGridBag();
	2342	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2343	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2344	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2345	+ diffuseSection.add(fakedepth);
1582	2346
1583		- //aConstraints.weighty = 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1585		- //aConstraints.gridx += 1;
1586		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1587		- aConstraints.weighty = 0;
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	2347	+ cGridBag shadowbias = new cGridBag();
	2348	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2349	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2350	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2351	+ diffuseSection.add(shadowbias);
1591	2352
1592		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1593		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	2353	+ panel.add(GetSeparator());
	2354	+
	2355	+ panel.add(diffuseSection);
	2356	+
	2357	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2358	+
	2359	+ cGridBag specularSection = new cGridBag().setVertical(true);
1601	2360
1602		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1603		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	2361	+ cGridBag specular = new cGridBag();
	2362	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2363	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2364	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2365	+ specularSection.add(specular);
1611	2366
1612		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1613		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
	2367	+ cGridBag lightarea = new cGridBag();
	2368	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2369	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2370	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2371	+ specularSection.add(lightarea);
1621	2372
1622		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1623		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1625		- aConstraints.gridx += 1;
1626		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1628		- aConstraints.gridx = 0;
1629		- aConstraints.gridy += 1;
1630		- aConstraints.gridwidth = 1;
	2373	+ cGridBag shininess = new cGridBag();
	2374	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2375	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2376	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2377	+ specularSection.add(shininess);
1631	2378
1632		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1633		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1634		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1635		- aConstraints.gridx += 1;
1636		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1637		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1638		- aConstraints.gridx = 0;
1639		- aConstraints.gridy += 1;
1640		- aConstraints.gridwidth = 1;
	2379	+ cGridBag metalness = new cGridBag();
	2380	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2381	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2382	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2383	+ specularSection.add(metalness);
1641	2384
1642		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1643		- Return();
	2385	+ cGridBag velvet = new cGridBag();
	2386	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2387	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2388	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2389	+ specularSection.add(velvet);
	2390	+
	2391	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2392	+ //Return();
1644	2393	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1645	2394	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1646	2395	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1651,130 +2400,99 @@
1651	2400	// aConstraints.gridy += 1;
1652	2401	// aConstraints.gridwidth = 1;
1653	2402
1654		- //aConstraints.weighty = 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1656		- //aConstraints.gridx += 1;
1657		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1658		- aConstraints.weighty = 0;
1659		- aConstraints.gridx = 0;
1660		- aConstraints.gridy += 1;
1661		- aConstraints.gridwidth = 1;
	2403	+ cGridBag anisoU = new cGridBag();
	2404	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2405	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2406	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2407	+ specularSection.add(anisoU);
1662	2408
1663		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1664		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1666		- aConstraints.gridx += 1;
1667		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1668		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1669		- aConstraints.gridx = 0;
1670		- aConstraints.gridy += 1;
1671		- aConstraints.gridwidth = 1;
	2409	+ cGridBag anisoV = new cGridBag();
	2410	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2411	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2412	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2413	+ specularSection.add(anisoV);
1672	2414
1673		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1674		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1675		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1676		- aConstraints.gridx += 1;
1677		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1678		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1679		- aConstraints.gridx = 0;
1680		- aConstraints.gridy += 1;
1681		- aConstraints.gridwidth = 1;
1682	2415
1683		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1684		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1686		- aConstraints.gridx += 1;
1687		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1688		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1689		- aConstraints.gridx = 0;
1690		- aConstraints.gridy += 1;
1691		- aConstraints.gridwidth = 1;
	2416	+ panel.add(GetSeparator());
	2417	+
	2418	+ panel.add(specularSection);
	2419	+
	2420	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2421	+
	2422	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1692	2423
1693		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1694		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1695		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1696		- aConstraints.gridx += 1;
1697		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1699		- aConstraints.gridx = 0;
1700		- aConstraints.gridy += 1;
1701		- aConstraints.gridwidth = 1;
1702		- aConstraints.weighty = 0;
	2424	+ cGridBag camera = new cGridBag();
	2425	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2426	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2427	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2428	+ colorSection.add(camera);
1703	2429
1704		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1705		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1707		- aConstraints.gridx += 1;
1708		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1709		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1710		- aConstraints.gridx = 0;
1711		- aConstraints.gridy += 1;
1712		- aConstraints.gridwidth = 1;
	2430	+ cGridBag ambient = new cGridBag();
	2431	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2432	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2433	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2434	+ colorSection.add(ambient);
1713	2435
1714		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1715		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1717		- aConstraints.gridx += 1;
1718		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1719		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1720		- aConstraints.gridx = 0;
1721		- aConstraints.gridy += 1;
1722		- aConstraints.gridwidth = 1;
	2436	+ cGridBag backlit = new cGridBag();
	2437	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2438	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2439	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2440	+ colorSection.add(backlit);
1723	2441
1724		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1725		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1726		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1727		- aConstraints.gridx += 1;
1728		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1729		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1730		- aConstraints.gridx = 0;
1731		- aConstraints.gridy += 1;
1732		- aConstraints.gridwidth = 1;
	2442	+ //panel.add(new JSeparator());
	2443	+
	2444	+ //panel.add(globalSection);
	2445	+
	2446	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2447	+
	2448	+ cGridBag textureSection = new cGridBag().setVertical(true);
1733	2449
1734		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1735		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1737		- aConstraints.gridx += 1;
1738		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1739		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1740		- aConstraints.gridx = 0;
1741		- aConstraints.gridy += 1;
1742		- aConstraints.gridwidth = 1;
	2450	+ cGridBag bump = new cGridBag();
	2451	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2452	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2453	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2454	+ textureSection.add(bump);
1743	2455
1744		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1745		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1747		- aConstraints.gridx += 1;
1748		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1749		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1750		- aConstraints.gridx = 0;
1751		- aConstraints.gridy += 1;
1752		- aConstraints.gridwidth = 1;
	2456	+ cGridBag noise = new cGridBag();
	2457	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2458	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2459	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2460	+ textureSection.add(noise);
1753	2461
1754		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1755		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1756		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1757		- aConstraints.gridx += 1;
1758		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1759		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1760		- aConstraints.gridx = 0;
1761		- aConstraints.gridy += 1;
1762		- aConstraints.gridwidth = 1;
	2462	+ cGridBag power = new cGridBag();
	2463	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2464	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2465	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2466	+ textureSection.add(power);
1763	2467
1764		- //aConstraints.weighty = 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1766		- //aConstraints.gridx += 1;
1767		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1768		- aConstraints.weighty = 0;
	2468	+ cGridBag borderfade = new cGridBag();
	2469	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2470	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2471	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2472	+ textureSection.add(borderfade);
1769	2473
1770		- aConstraints.gridx = 0;
1771		- aConstraints.gridy = 0;
1772		- aConstraints.gridwidth = 1;
	2474	+ cGridBag fog = new cGridBag();
	2475	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2476	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2477	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2478	+ textureSection.add(fog);
	2479	+
	2480	+ cGridBag opacityPower = new cGridBag();
	2481	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2482	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2483	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2484	+ textureSection.add(opacityPower);
	2485	+
	2486	+ panel.add(GetSeparator());
	2487	+
	2488	+ panel.add(textureSection);
	2489	+
	2490	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1773	2491
1774	2492	SetMaterial(copy); // .GetMaterial());
1775	2493
1776		- colorField.addChangeListener(this);
1777		- modulationField.addChangeListener(this);
	2494	+ //colorField.addChangeListener(this);
	2495	+// modulationField.addChangeListener(this);
1778	2496	metalnessField.addChangeListener(this);
1779	2497	diffuseField.addChangeListener(this);
1780	2498	specularField.addChangeListener(this);
..	..	@@ -1804,12 +2522,15 @@
1804	2522	opacityPowerField.addChangeListener(this);
1805	2523	/**/
1806	2524
1807		- resetSlidersButton.addActionListener(this);
1808	2525	clearMaterialButton.addActionListener(this);
1809	2526	createMaterialButton.addActionListener(this);
1810		-
1811		- propagateToggle.addItemListener(this);
1812		- multiplyToggle.addItemListener(this);
	2527	+
	2528	+ if (Globals.ADVANCED)
	2529	+ {
	2530	+ resetSlidersButton.addActionListener(this);
	2531	+ propagateToggle.addItemListener(this);
	2532	+ multiplyToggle.addItemListener(this);
	2533	+ }
1813	2534	}
1814	2535
1815	2536	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1827,8 +2548,9 @@
1827	2548	// 3D models
1828	2549	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1829	2550	{
1830		- lastConverter = new com.jmex.model.converters.MaxToJme();
1831		- LoadFile(filename, lastConverter);
	2551	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2552	+ //LoadFile(filename, lastConverter);
	2553	+ LoadObjFile(filename); // New 3ds loader
1832	2554	continue;
1833	2555	}
1834	2556	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1980,7 +2702,7 @@
1980	2702
1981	2703	//? flashIt = false;
1982	2704	CameraPane pane = (CameraPane) cameraView;
1983		- pane.clickStart(location.x, location.y, 0);
	2705	+ pane.clickStart(location.x, location.y, 0, 0);
1984	2706	pane.clickEnd(location.x, location.y, 0, true);
1985	2707
1986	2708	if (group.selection.size() == 1)
..	..	@@ -2029,6 +2751,7 @@
2029	2751	e2.printStackTrace();
2030	2752	}
2031	2753	}
	2754	+
2032	2755	LoadJMEThread loadThread;
2033	2756
2034	2757	class LoadJMEThread extends Thread
..	..	@@ -2086,6 +2809,7 @@
2086	2809	//LoadFile0(filename, converter);
2087	2810	}
2088	2811	}
	2812	+
2089	2813	LoadOBJThread loadObjThread;
2090	2814
2091	2815	class LoadOBJThread extends Thread
..	..	@@ -2164,19 +2888,19 @@
2164	2888
2165	2889	void LoadObjFile(String fullname)
2166	2890	{
2167		- /*
	2891	+ System.out.println("Loading " + fullname);
	2892	+ /**/
2168	2893	//lastFilename = fullname;
2169	2894	if(loadObjThread == null)
2170	2895	{
2171		- loadObjThread = new LoadOBJThread();
2172		- loadObjThread.start();
	2896	+ loadObjThread = new LoadOBJThread();
	2897	+ loadObjThread.start();
2173	2898	}
2174	2899
2175	2900	loadObjThread.add(fullname);
2176		- */
	2901	+ /**/
2177	2902
2178		- System.out.println("Loading " + fullname);
2179		- makeSomething(new FileObject(fullname, true), true);
	2903	+ //makeSomething(new FileObject(fullname, true), true);
2180	2904	}
2181	2905
2182	2906	void LoadGFDFile(String fullname)
..	..	@@ -2437,11 +3161,11 @@
2437	3161
2438	3162	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2439	3163	{
2440		- if (GrafreeD.standAlone)
	3164	+ if (Grafreed.standAlone)
2441	3165	{
2442	3166	/**/
2443	3167	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2444		- browser.show();
	3168	+ browser.setVisible(true);
2445	3169	String filename = browser.getFile();
2446	3170	if (filename != null && filename.length() > 0)
2447	3171	{
..	..	@@ -2552,6 +3276,7 @@
2552	3276	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2553	3277	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2554	3278	}
	3279	+
2555	3280	//cJME.count++;
2556	3281	//cJME.count %= 12;
2557	3282	if (gc)
..	..	@@ -2586,6 +3311,7 @@
2586	3311	}
2587	3312	if (input == null)
2588	3313	{
	3314	+ new Exception().printStackTrace();
2589	3315	System.exit(0);
2590	3316	}
2591	3317
..	..	@@ -2734,6 +3460,7 @@
2734	3460	}
2735	3461	}
2736	3462	}
	3463	+
2737	3464	cFileSystemPane FSPane;
2738	3465
2739	3466	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2743,7 +3470,7 @@
2743	3470
2744	3471	freezematerial = true;
2745	3472	colorField.setFloat(mat.color);
2746		- modulationField.setFloat(mat.modulation);
	3473	+ saturationField.setFloat(mat.modulation);
2747	3474	metalnessField.setFloat(mat.metalness);
2748	3475	diffuseField.setFloat(mat.diffuse);
2749	3476	specularField.setFloat(mat.specular);
..	..	@@ -2787,11 +3514,14 @@
2787	3514	}
2788	3515	}
2789	3516	}
	3517	+
2790	3518	freezematerial = false;
2791	3519	}
2792	3520
2793	3521	void SetMaterial(Object3D object)
2794	3522	{
	3523	+ latestObject = object;
	3524	+
2795	3525	cMaterial mat = object.material;
2796	3526
2797	3527	if (mat == null)
..	..	@@ -2800,7 +3530,8 @@
2800	3530	return;
2801	3531	}
2802	3532
2803		- multiplyToggle.setSelected(mat.multiply);
	3533	+ if (multiplyToggle != null)
	3534	+ multiplyToggle.setSelected(mat.multiply);
2804	3535
2805	3536	assert (object.projectedVertices != null);
2806	3537
..	..	@@ -2902,12 +3633,17 @@
2902	3633	// }
2903	3634
2904	3635	/**/
2905		- if (deselect)
	3636	+ if (deselect \|\| child == null)
2906	3637	{
2907	3638	//group.deselectAll();
2908	3639	//freeze = true;
2909	3640	GetTree().clearSelection();
2910	3641	//freeze = false;
	3642	+
	3643	+ if (child == null)
	3644	+ {
	3645	+ return;
	3646	+ }
2911	3647	}
2912	3648
2913	3649	//group.addSelectee(child);
..	..	@@ -2941,6 +3677,17 @@
2941	3677	public void itemStateChanged(ItemEvent event)
2942	3678	{
2943	3679	// System.out.println("Propagate = " + propagate);
	3680	+ if (event.getSource() == pinButton)
	3681	+ {
	3682	+ copy.pinned ^= true;
	3683	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3684	+ {
	3685	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3686	+ copy.CloseUI();
	3687	+ //copy.editWindow.refreshContents();
	3688	+ }
	3689	+ }
	3690	+ else
2944	3691	if (event.getSource() == propagateToggle)
2945	3692	{
2946	3693	propagate ^= true;
..	..	@@ -2976,7 +3723,7 @@
2976	3723	cameraView.ToggleDL();
2977	3724	cameraView.repaint();
2978	3725	return;
2979		- } else if (event.getSource() == toggleTextureItem)
	3726	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2980	3727	{
2981	3728	cameraView.ToggleTexture();
2982	3729	// june 2013 copy.HardTouch();
..	..	@@ -2989,7 +3736,8 @@
2989	3736	if (timeline)
2990	3737	{
2991	3738	centralPanel.remove(cameraView);
2992		- centralPanel.add(timelinePanel);
	3739	+ cameraPanel.add(cameraView);
	3740	+ centralPanel.add(cameraPanel);
2993	3741	frame.setJMenuBar(timelineMenubar);
2994	3742	wasFullScreen = CameraPane.FULLSCREEN;
2995	3743	if (!CameraPane.FULLSCREEN)
..	..	@@ -2998,7 +3746,7 @@
2998	3746	}
2999	3747	else
3000	3748	{
3001		- centralPanel.remove(timelinePanel);
	3749	+ centralPanel.remove(cameraPanel);
3002	3750	centralPanel.add(cameraView);
3003	3751	frame.setJMenuBar(null);
3004	3752	if (!wasFullScreen)
..	..	@@ -3014,9 +3762,9 @@
3014	3762	frame.validate();
3015	3763
3016	3764	return;
3017		- } else if (event.getSource() == toggleRandomItem)
	3765	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3018	3766	{
3019		- cameraView.ToggleRandom();
	3767	+ cameraView.ToggleSwitch();
3020	3768	cameraView.repaint();
3021	3769	return;
3022	3770	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3044,12 +3792,17 @@
3044	3792	} else if (event.getSource() == liveCB)
3045	3793	{
3046	3794	copy.live ^= true;
	3795	+ objEditor.refreshContents(true); // To show item colors
	3796	+ return;
	3797	+ } else if (event.getSource() == selectableCB)
	3798	+ {
	3799	+ copy.dontselect ^= true;
3047	3800	return;
3048	3801	} else if (event.getSource() == hideCB)
3049	3802	{
3050	3803	copy.hide ^= true;
3051	3804	copy.Touch(); // display list issue
3052		- objEditor.refreshContents();
	3805	+ objEditor.refreshContents(true); // To show item colors
3053	3806	return;
3054	3807	} else if (event.getSource() == link2masterCB)
3055	3808	{
..	..	@@ -3059,6 +3812,7 @@
3059	3812	if (event.getSource() == randomCB)
3060	3813	{
3061	3814	copy.random ^= true;
	3815	+ objEditor.refreshContents();
3062	3816	return;
3063	3817	}
3064	3818	if (event.getSource() == speedupCB)
..	..	@@ -3082,8 +3836,9 @@
3082	3836
3083	3837	public void actionPerformed(ActionEvent event)
3084	3838	{
	3839	+ Object source = event.getSource();
3085	3840	// SCRIPT DIALOG
3086		- if (event.getSource() == okbutton)
	3841	+ if (source == okbutton)
3087	3842	{
3088	3843	textpanel.setVisible(false);
3089	3844	textpanel.remove(textarea);
..	..	@@ -3095,7 +3850,7 @@
3095	3850	textarea = null;
3096	3851	textpanel = null;
3097	3852	}
3098		- if (event.getSource() == cancelbutton)
	3853	+ if (source == cancelbutton)
3099	3854	{
3100	3855	textpanel.setVisible(false);
3101	3856	textpanel.remove(textarea);
..	..	@@ -3107,49 +3862,50 @@
3107	3862	//applySelf();
3108	3863	//client.refreshEditWindow();
3109	3864	//refreshContents();
3110		- if (event.getSource() == nameField)
	3865	+ if (source == nameField)
3111	3866	{
3112	3867	//System.out.println("ObjEditor " + event);
3113	3868	applySelf0(true);
3114	3869	//parent.applySelf();
3115	3870	objEditor.refreshContents();
3116		- } else if (event.getSource() == resetButton)
	3871	+ } else if (source == resetButton)
3117	3872	{
3118	3873	CameraPane.fullreset = true;
3119	3874	copy.Reset(); // ResetMeshes();
3120	3875	copy.Touch();
3121	3876	objEditor.refreshContents();
3122		- } else if (event.getSource() == stepItem)
	3877	+ } else if (source == stepItem)
3123	3878	{
3124		- cameraView.ONESTEP = true;
	3879	+ //cameraView.ONESTEP = true;
	3880	+ Globals.ONESTEP = true;
3125	3881	cameraView.repaint();
3126	3882	return;
3127		- } else if (event.getSource() == stepButton)
	3883	+ } else if (source == stepButton)
3128	3884	{
3129	3885	copy.Step();
3130	3886	copy.Touch();
3131	3887	objEditor.refreshContents();
3132		- } else if (event.getSource() == slowerButton)
	3888	+ } else if (source == slowerButton)
3133	3889	{
3134	3890	copy.Slower();
3135	3891	copy.Touch();
3136	3892	objEditor.refreshContents();
3137		- } else if (event.getSource() == fasterButton)
	3893	+ } else if (source == fasterButton)
3138	3894	{
3139	3895	copy.Faster();
3140	3896	copy.Touch();
3141	3897	objEditor.refreshContents();
3142		- } else if (event.getSource() == remarkButton)
	3898	+ } else if (source == remarkButton)
3143	3899	{
3144	3900	copy.Remark();
3145	3901	copy.Touch();
3146	3902	objEditor.refreshContents();
3147		- } else if (event.getSource() == stepAllButton)
	3903	+ } else if (source == stepAllButton)
3148	3904	{
3149	3905	copy.StepAll();
3150	3906	copy.Touch();
3151	3907	objEditor.refreshContents();
3152		- } else if (event.getSource() == resetAllButton)
	3908	+ } else if (source == resetAllButton)
3153	3909	{
3154	3910	//CameraPane.fullreset = true;
3155	3911	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3182,53 +3938,79 @@
3182	3938	// Close();
3183	3939	// }
3184	3940	// else
3185		- if (event.getSource() == resetSlidersButton)
	3941	+ if (source == resetSlidersButton)
3186	3942	{
3187	3943	ResetSliders();
3188		- } else if (event.getSource() == clearMaterialButton)
	3944	+ } else if (source == clearMaterialButton)
3189	3945	{
3190	3946	ClearMaterial();
3191		- } else if (event.getSource() == createMaterialButton)
	3947	+ } else if (source == createMaterialButton)
3192	3948	{
3193	3949	CreateMaterial();
3194		- } else if (event.getSource() == clearPanelButton)
	3950	+ } else if (source == clearPanelButton)
3195	3951	{
3196	3952	copy.ClearUI();
3197	3953	refreshContents(true);
3198		- } /*
3199		- }
3200		-
3201		- public boolean action(Event event, Object arg)
3202		- {
3203		- */ else if (event.getSource() == closeItem)
	3954	+ } else if (source == importGFDItem)
	3955	+ {
	3956	+ ImportGFD();
	3957	+ } else
	3958	+ if (source == importVRMLX3DItem)
	3959	+ {
	3960	+ ImportVRMLX3D();
	3961	+ } else
	3962	+ if (source == import3DSItem)
	3963	+ {
	3964	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3965	+ } else
	3966	+ if (source == importOBJItem)
	3967	+ {
	3968	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3969	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3970	+ browser.setVisible(true);
	3971	+ String filename = browser.getFile();
	3972	+ if (filename != null && filename.length() > 0)
	3973	+ {
	3974	+ String fullname = browser.getDirectory() + filename;
	3975	+ makeSomething(ReadOBJ(fullname), true);
	3976	+ }
	3977	+ } else
	3978	+ if (source == closeItem)
3204	3979	{
3205	3980	Close();
3206	3981	//return true;
3207		- } else if (event.getSource() == loadItem)
	3982	+ } else if (source == openItem)
3208	3983	{
3209		- load();
	3984	+ Open();
3210	3985	//return true;
3211		- } else if (event.getSource() == saveItem)
	3986	+ } else if (source == newItem)
	3987	+ {
	3988	+ New();
	3989	+ } else if (source == saveItem)
3212	3990	{
3213	3991	save();
3214	3992	//return true;
3215		- } else if (event.getSource() == saveAsItem)
	3993	+ } else if (source == saveAsItem)
3216	3994	{
3217	3995	saveAs();
3218	3996	//return true;
3219		- } else if (event.getSource() == reexportItem)
	3997	+ } else if (source == reexportItem)
3220	3998	{
3221	3999	reexport();
3222	4000	//return true;
3223		- } else if (event.getSource() == exportAsItem)
	4001	+ } else if (source == exportAsItem)
3224	4002	{
3225	4003	export();
3226	4004	//return true;
3227		- } else if (event.getSource() == povItem)
	4005	+ } else if (source == povItem)
3228	4006	{
3229	4007	generatePOV();
3230	4008	//return true;
3231		- } else if (event.getSource() == zBufferItem)
	4009	+ } else if (event.getSource() == archiveItem)
	4010	+ {
	4011	+ cTools.Archive(frame);
	4012	+ return;
	4013	+ } else if (source == zBufferItem)
3232	4014	{
3233	4015	try
3234	4016	{
..	..	@@ -3250,21 +4032,8 @@
3250	4032	cameraView.repaint();
3251	4033	//return true;
3252	4034	}
3253		- */ else if (event.getSource() == editCameraItem)
3254		- {
3255		- cameraView.ProtectCamera();
3256		- cameraView.repaint();
3257		- return;
3258		- } else if (event.getSource() == revertCameraItem)
3259		- {
3260		- cameraView.RevertCamera();
3261		- cameraView.repaint();
3262		- return;
3263		-// } else if (event.getSource() == textureButton)
3264		-// {
3265		-// return; // true;
3266		- } else // combos...
3267		- if (event.getSource() == texresMenu)
	4035	+ */ else // combos...
	4036	+ if (source == texresMenu)
3268	4037	{
3269	4038	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3270	4039	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3276,27 +4045,492 @@
3276	4045	}
3277	4046	}
3278	4047
3279		- void ToggleAnimation()
	4048	+ void New()
3280	4049	{
3281		- if (!CameraPane.ANIMATION)
	4050	+ while (copy.Size() > 1)
3282	4051	{
3283		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4052	+ copy.remove(1);
	4053	+ }
	4054	+
	4055	+ ResetModel();
	4056	+ objEditor.refreshContents();
	4057	+ }
	4058	+
	4059	+ static public byte[] Compress(Object3D o)
	4060	+ {
	4061	+ // Slower to actually compress.
	4062	+ try
	4063	+ {
	4064	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4065	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4066	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4067	+
	4068	+ Object3D parent = o.parent;
	4069	+ o.parent = null;
	4070	+
	4071	+ out.writeObject(o);
	4072	+
	4073	+ o.parent = parent;
	4074	+
	4075	+ out.flush();
	4076	+
	4077	+ baos //zstream
	4078	+ .close();
	4079	+ out.close();
	4080	+
	4081	+ byte[] bytes = baos.toByteArray();
	4082	+
	4083	+ System.out.println("save #bytes = " + bytes.length);
	4084	+ return bytes;
	4085	+ } catch (Exception e)
	4086	+ {
	4087	+ System.err.println(e);
	4088	+ return null;
	4089	+ }
	4090	+ }
	4091	+
	4092	+ static public Object Uncompress(byte[] bytes)
	4093	+ {
	4094	+ System.out.println("restore #bytes = " + bytes.length);
	4095	+ try
	4096	+ {
	4097	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4098	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4099	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4100	+ Object obj = in.readObject();
	4101	+
	4102	+ bais //istream
	4103	+ .close();
	4104	+ in.close();
	4105	+
	4106	+ return obj;
	4107	+ } catch (Exception e)
	4108	+ {
	4109	+ System.err.println(e);
	4110	+ return null;
	4111	+ }
	4112	+ }
	4113	+
	4114	+ static public Object clone(Object o)
	4115	+ {
	4116	+ try
	4117	+ {
	4118	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4119	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4120	+
	4121	+ out.writeObject(o);
	4122	+
	4123	+ out.flush();
	4124	+ out.close();
	4125	+
	4126	+ byte[] bytes = baos.toByteArray();
	4127	+
	4128	+ System.out.println("clone = " + bytes.length);
	4129	+
	4130	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4131	+ ObjectInputStream in = new ObjectInputStream(bais);
	4132	+ Object obj = in.readObject();
	4133	+ in.close();
	4134	+
	4135	+ return obj;
	4136	+ } catch (Exception e)
	4137	+ {
	4138	+ System.err.println(e);
	4139	+ return null;
	4140	+ }
	4141	+ }
	4142	+
	4143	+ cRadio GetCurrentTab()
	4144	+ {
	4145	+ cRadio ab;
	4146	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4147	+ {
	4148	+ ab = (cRadio)e.nextElement();
	4149	+ if(ab.GetObject() == copy)
	4150	+ {
	4151	+ return ab;
	4152	+ }
	4153	+ }
	4154	+
	4155	+ return null;
	4156	+ }
	4157	+
	4158	+
	4159	+ public void Save()
	4160	+ {
	4161	+ //Save(true);
	4162	+ Replace();
	4163	+ SetVersionStates();
	4164	+ }
	4165	+
	4166	+ private boolean Equal(byte[] compress, byte[] name)
	4167	+ {
	4168	+ if (compress.length != name.length)
	4169	+ {
	4170	+ return false;
	4171	+ }
	4172	+
	4173	+ for (int i=compress.length; --i>=0;)
	4174	+ {
	4175	+ if (compress[i] != name[i])
	4176	+ return false;
	4177	+ }
	4178	+
	4179	+ return true;
	4180	+ }
	4181	+
	4182	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4183	+
	4184	+ void DeleteVersion()
	4185	+ {
	4186	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4187	+ {
	4188	+ copy.versionlist[i] = copy.versionlist[i+1];
	4189	+ }
	4190	+
	4191	+ CopyChanged();
	4192	+
	4193	+ SetVersionStates();
	4194	+ }
	4195	+
	4196	+ public boolean Save(boolean user)
	4197	+ {
	4198	+ System.err.println("Save");
	4199	+ Replace();
	4200	+
	4201	+ //cRadio tab = GetCurrentTab();
	4202	+
	4203	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4204	+
	4205	+ boolean thesame = false;
	4206	+
	4207	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4208	+// {
	4209	+// thesame = true;
	4210	+// }
	4211	+
	4212	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4213	+ if (!thesame)
	4214	+ {
	4215	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4216	+ {
	4217	+ copy.versionlist[i] = copy.versionlist[i-1];
	4218	+ }
	4219	+
	4220	+ //tab.user[tab.versionindex] = user;
	4221	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4222	+
	4223	+ copy.versionlist[++copy.versionindex] = compress;
	4224	+
	4225	+ // if (increment)
	4226	+ // tab.versionindex++;
	4227	+ }
	4228	+
	4229	+ //copy.RestoreBigData(versiontable);
	4230	+
	4231	+ //assert(hashtable.isEmpty());
	4232	+
	4233	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4234	+// {
	4235	+// //tab.user[i] = false;
	4236	+// copy.versionlist[i] = null;
	4237	+// }
	4238	+
	4239	+ SetVersionStates();
	4240	+
	4241	+ // test save
	4242	+ if (false)
	4243	+ {
	4244	+ try
	4245	+ {
	4246	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4247	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4248	+
	4249	+ p.writeObject(copy);
	4250	+
	4251	+ p.flush();
	4252	+
	4253	+ ostream.close();
	4254	+ } catch (Exception e)
	4255	+ {
	4256	+ e.printStackTrace();
	4257	+ }
	4258	+ }
	4259	+
	4260	+ return !thesame;
	4261	+ }
	4262	+
	4263	+ boolean flashIt = true;
	4264	+
	4265	+ void RefreshSelection()
	4266	+ {
	4267	+ Object3D selection = new Object3D();
	4268	+
	4269	+ for (int i = 0; i < copy.selection.size(); i++)
	4270	+ {
	4271	+ Object3D elem = copy.selection.elementAt(i);
	4272	+
	4273	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4274	+
	4275	+ if (obj == null)
	4276	+ {
	4277	+ copy.selection.remove(i--);
	4278	+ }
	4279	+ else
	4280	+ {
	4281	+ selection.add(obj);
	4282	+ copy.selection.setElementAt(obj, i);
	4283	+ }
	4284	+ }
	4285	+
	4286	+ flashIt = false;
	4287	+ GetTree().clearSelection();
	4288	+ for (int i = 0; i < selection.size(); i++)
	4289	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4290	+ flashIt = true;
	4291	+
	4292	+ //refreshContents(false);
	4293	+ }
	4294	+
	4295	+ void CopyChanged()
	4296	+ {
	4297	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4298	+
	4299	+ SetVersionStates();
	4300	+
	4301	+ boolean temp = CameraPane.SWITCH;
	4302	+ CameraPane.SWITCH = false;
	4303	+
	4304	+ copy.ExtractBigData(versiontable);
	4305	+
	4306	+ copy.clear();
	4307	+
	4308	+ copy.skyboxname = obj.skyboxname;
	4309	+ copy.skyboxext = obj.skyboxext;
	4310	+
	4311	+ for (int i=0; i<obj.Size(); i++)
	4312	+ {
	4313	+ copy.add(obj.get(i));
	4314	+ }
	4315	+
	4316	+ copy.RestoreBigData(versiontable);
	4317	+
	4318	+ CameraPane.SWITCH = temp;
	4319	+
	4320	+ RefreshSelection();
	4321	+ //assert(hashtable.isEmpty());
	4322	+
	4323	+ copy.Touch();
	4324	+
	4325	+ ResetModel();
	4326	+ copy.HardTouch(); // recompile?
	4327	+
	4328	+ cRadio ab;
	4329	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4330	+ {
	4331	+ ab = (cRadio)e.nextElement();
	4332	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4333	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4334	+ if (test != null)
	4335	+ {
	4336	+ test.editWindow = ab.object.editWindow;
	4337	+ ab.object = test;
	4338	+ }
	4339	+ }
	4340	+
	4341	+ refreshContents(true);
	4342	+ }
	4343	+
	4344	+ cButton previousVersionButton;
	4345	+ cButton restoreButton;
	4346	+ cButton replaceButton;
	4347	+ cButton nextVersionButton;
	4348	+ cButton saveVersionButton;
	4349	+ cButton deleteVersionButton;
	4350	+
	4351	+ boolean muteSlider;
	4352	+
	4353	+ int VersionCount()
	4354	+ {
	4355	+ int count = 0;
	4356	+
	4357	+ for (int i = copy.versionlist.length; --i >= 0;)
	4358	+ {
	4359	+ if (copy.versionlist[i] != null)
	4360	+ count++;
	4361	+ }
	4362	+
	4363	+ return count;
	4364	+ }
	4365	+
	4366	+ void SetVersionStates()
	4367	+ {
	4368	+ //if (true)
	4369	+ // return;
	4370	+
	4371	+ //cRadio tab = GetCurrentTab();
	4372	+
	4373	+ restoreButton.setEnabled(copy.versionindex != -1);
	4374	+ replaceButton.setEnabled(copy.versionindex != -1);
	4375	+
	4376	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4377	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4378	+
	4379	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4380	+ copy.versionlist[copy.versionindex + 1] != null);
	4381	+
	4382	+ muteSlider = true;
	4383	+ versionSlider.setMinimum(0);
	4384	+ versionSlider.setMaximum(VersionCount() - 1);
	4385	+ versionSlider.setInteger(copy.versionindex);
	4386	+ versionSlider.setEnabled(copy.versionindex != -1);
	4387	+ muteSlider = false;
	4388	+ }
	4389	+
	4390	+ public boolean PreviousVersion()
	4391	+ {
	4392	+ // Option?
	4393	+ Replace();
	4394	+
	4395	+ System.err.println("Undo");
	4396	+
	4397	+ //cRadio tab = GetCurrentTab();
	4398	+
	4399	+ if (copy.versionindex == 0)
	4400	+ {
	4401	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4402	+ return false;
	4403	+ }
	4404	+
	4405	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4406	+// {
	4407	+// if (Save(false))
	4408	+// tab.versionindex -= 1;
	4409	+// else
	4410	+// {
	4411	+// if (tab.versionindex <= 0)
	4412	+// return false;
	4413	+// else
	4414	+// tab.versionindex -= 1;
	4415	+// }
	4416	+// }
	4417	+
	4418	+ copy.versionindex -= 1;
	4419	+
	4420	+ CopyChanged();
	4421	+
	4422	+ return true;
	4423	+ }
	4424	+
	4425	+ public boolean Restore()
	4426	+ {
	4427	+ System.err.println("Restore");
	4428	+
	4429	+ //cRadio tab = GetCurrentTab();
	4430	+
	4431	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4432	+ {
	4433	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4434	+ return false;
	4435	+ }
	4436	+
	4437	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4438	+ CopyChanged();
	4439	+
	4440	+ return true;
	4441	+ }
	4442	+
	4443	+ public boolean Replace()
	4444	+ {
	4445	+ System.err.println("Replace");
	4446	+
	4447	+ //cRadio tab = GetCurrentTab();
	4448	+
	4449	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4450	+ {
	4451	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4452	+ return false;
	4453	+ }
	4454	+
	4455	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4456	+
	4457	+ return true;
	4458	+ }
	4459	+
	4460	+ public void NextVersion()
	4461	+ {
	4462	+ // Option?
	4463	+ Replace();
	4464	+
	4465	+ //cRadio tab = GetCurrentTab();
	4466	+
	4467	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4468	+ {
	4469	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4470	+ return;
	4471	+ }
	4472	+
	4473	+ copy.versionindex += 1;
	4474	+
	4475	+ CopyChanged();
	4476	+
	4477	+ //if (!tab.user[tab.versionindex])
	4478	+ // tab.graphs[tab.versionindex] = null;
	4479	+ }
	4480	+
	4481	+ void ImportGFD()
	4482	+ {
	4483	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3284	4484	browser.show();
3285	4485	String filename = browser.getFile();
3286	4486	if (filename != null && filename.length() > 0)
3287	4487	{
3288		- CameraPane.filename = browser.getDirectory() + filename;
	4488	+ String fullname = browser.getDirectory() + filename;
	4489	+
	4490	+ //Object3D readobj =
	4491	+ objEditor.ReadGFD(fullname, objEditor);
	4492	+ //makeSomething(readobj);
	4493	+ }
	4494	+ }
	4495	+
	4496	+ void ImportVRMLX3D()
	4497	+ {
	4498	+ if (Grafreed.standAlone)
	4499	+ {
	4500	+ /**/
	4501	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4502	+ browser.show();
	4503	+ String filename = browser.getFile();
	4504	+ if (filename != null && filename.length() > 0)
	4505	+ {
	4506	+ String fullname = browser.getDirectory() + filename;
	4507	+ LoadVRMLX3D(fullname);
	4508	+ }
	4509	+ /**/
	4510	+ }
	4511	+ }
	4512	+
	4513	+ void ToggleAnimation()
	4514	+ {
	4515	+ if (!Globals.ANIMATION)
	4516	+ {
	4517	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4518	+ browser.setVisible(true);
	4519	+ String filename = browser.getFile();
	4520	+ if (filename != null && filename.length() > 0)
	4521	+ {
	4522	+ Globals.filename = browser.getDirectory() + filename;
3289	4523	//CameraPane.framecount = 0;
3290		- CameraPane.imagecount = 0;
	4524	+ Globals.imagecount = 0;
3291	4525
3292		- CameraPane.ANIMATION ^= true;
	4526	+ Globals.ANIMATION ^= true;
3293	4527
3294		- GrafreeD.wav.cursor = 0;
3295		- GrafreeD.wav.loop = 0;
	4528	+ Grafreed.wav.cursor = 0;
	4529	+ Grafreed.wav.loop = 0;
3296	4530	}
3297	4531	} else
3298	4532	{
3299		- CameraPane.ANIMATION ^= true;
	4533	+ Globals.ANIMATION ^= true;
3300	4534	}
3301	4535	}
3302	4536
..	..	@@ -3342,7 +4576,7 @@
3342	4576	void CreateMaterial()
3343	4577	{
3344	4578	//copy.ClearMaterial(); // PATCH
3345		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4579	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3346	4580	if (copy.selection.size() > 0)
3347	4581	//SetMaterial(copy);
3348	4582	{
..	..	@@ -3393,7 +4627,7 @@
3393	4627	assert false;
3394	4628	}
3395	4629
3396		- void EditSelection()
	4630	+ void EditSelection(boolean newWindow)
3397	4631	{
3398	4632	}
3399	4633
..	..	@@ -3401,11 +4635,11 @@
3401	4635	{
3402	4636	copy.ResetBlockLoop(); // temporary problem
3403	4637
3404		- boolean random = CameraPane.RANDOM;
3405		- CameraPane.RANDOM = false; // parse everything
	4638	+ boolean random = CameraPane.SWITCH;
	4639	+ CameraPane.SWITCH = false; // parse everything
3406	4640	copy.ResetDisplayList();
3407	4641	copy.HardTouch();
3408		- CameraPane.RANDOM = random;
	4642	+ CameraPane.SWITCH = random;
3409	4643	}
3410	4644
3411	4645	// public void applySelf()
..	..	@@ -3452,7 +4686,7 @@
3452	4686	//copy.material = new cMaterial(copy.GetMaterial());
3453	4687
3454	4688	current.color = (float) colorField.getFloat();
3455		- current.modulation = (float) modulationField.getFloat();
	4689	+ current.modulation = (float) saturationField.getFloat();
3456	4690	current.metalness = (float) metalnessField.getFloat();
3457	4691	current.diffuse = (float) diffuseField.getFloat();
3458	4692	current.specular = (float) specularField.getFloat();
..	..	@@ -3475,10 +4709,40 @@
3475	4709	current.fakedepth = (float) fakedepthField.getFloat();
3476	4710	current.shadowbias = (float) shadowbiasField.getFloat();
3477	4711
3478		- if (!NumberSlider.frozen)
	4712	+ if (!cNumberSlider.frozen)
3479	4713	{
3480	4714	//System.out.println("Propagate = " + propagate);
3481	4715	copy.UpdateMaterial(anchor, current, propagate);
	4716	+
	4717	+ if (copy.material != null)
	4718	+ {
	4719	+ cMaterial mat = copy.material;
	4720	+
	4721	+ colorField.SetToolTipValue((mat.color));
	4722	+ saturationField.SetToolTipValue((mat.modulation));
	4723	+ metalnessField.SetToolTipValue((mat.metalness));
	4724	+ diffuseField.SetToolTipValue((mat.diffuse));
	4725	+ specularField.SetToolTipValue((mat.specular));
	4726	+ shininessField.SetToolTipValue((mat.shininess));
	4727	+ shiftField.SetToolTipValue((mat.shift));
	4728	+ ambientField.SetToolTipValue((mat.ambient));
	4729	+ lightareaField.SetToolTipValue((mat.lightarea));
	4730	+ diffusenessField.SetToolTipValue((mat.factor));
	4731	+ velvetField.SetToolTipValue((mat.velvet));
	4732	+ sheenField.SetToolTipValue((mat.sheen));
	4733	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4734	+ backlitField.SetToolTipValue((mat.bump));
	4735	+ anisoField.SetToolTipValue((mat.aniso));
	4736	+ anisoVField.SetToolTipValue((mat.anisoV));
	4737	+ cameraField.SetToolTipValue((mat.cameralight));
	4738	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4739	+ shadowField.SetToolTipValue((mat.shadow));
	4740	+ textureField.SetToolTipValue((mat.texture));
	4741	+ opacityField.SetToolTipValue((mat.opacity));
	4742	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4743	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4744	+ }
	4745	+
3482	4746	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3483	4747	{
3484	4748	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3507,9 +4771,26 @@
3507	4771	//copy.Touch();
3508	4772	}
3509	4773
	4774	+ cNumberSlider versionSlider;
	4775	+
3510	4776	public void stateChanged(ChangeEvent e)
3511	4777	{
3512	4778	// assert(false);
	4779	+ if (e.getSource() == versionSlider)
	4780	+ {
	4781	+ if (muteSlider)
	4782	+ return;
	4783	+
	4784	+ int version = versionSlider.getInteger();
	4785	+
	4786	+ if (version != -1 && copy.versionlist[version] != null)
	4787	+ {
	4788	+ copy.versionindex = version;
	4789	+ CopyChanged();
	4790	+ }
	4791	+
	4792	+ return;
	4793	+ }
3513	4794
3514	4795	if (freezematerial)
3515	4796	{
..	..	@@ -3523,6 +4804,7 @@
3523	4804	\|\| e.getSource() == apertureField
3524	4805	\|\| e.getSource() == shadowblurField)
3525	4806	{
	4807	+ new Exception().printStackTrace();
3526	4808	System.exit(0);
3527	4809	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3528	4810	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3544,12 +4826,24 @@
3544	4826	{
3545	4827	//System.out.println("stateChanged = " + this);
3546	4828	materialtouched = true;
	4829	+
	4830	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4831	+ {
	4832	+ saturationField.setFloat(1);
	4833	+ }
	4834	+
3547	4835	applySelf();
3548	4836	//System.out.println("this = " + this);
3549	4837	//System.out.println("PARENT = " + parent);
3550	4838	//if (parent != null)
3551	4839	// parent.applySelf();
3552		- refreshContents();
	4840	+ if (e.getSource() == normalpushField)
	4841	+ {
	4842	+ objEditor.refreshContents();
	4843	+ //Refresh();
	4844	+ }
	4845	+ else
	4846	+ refreshContents();
3553	4847	// ??? client.refreshEditWindow();
3554	4848	}
3555	4849	//else
..	..	@@ -3561,7 +4855,7 @@
3561	4855	//group.name = nameField.getText();
3562	4856	//objEditor.applySelf();
3563	4857
3564		- assert (objEditor == this);
	4858	+ // OCT2018: assert (objEditor == this);
3565	4859	if (copy.selection == null \|\| copy.selection.size() == 0)
3566	4860	//super.applySelf()
3567	4861	; else
..	..	@@ -3585,6 +4879,9 @@
3585	4879	objEditor.copy = keep;
3586	4880	}
3587	4881	}
	4882	+
	4883	+ if (normalpushField != null)
	4884	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3588	4885	}
3589	4886
3590	4887	void SnapObject()
..	..	@@ -3834,20 +5131,26 @@
3834	5131	{
3835	5132	if (GetTree() != null)
3836	5133	{
	5134	+ GetTree().revalidate();
3837	5135	GetTree().repaint();
3838	5136	}
3839	5137
3840	5138	radioPanel.revalidate();
3841	5139	radioPanel.repaint();
3842		- ctrlPanel.revalidate(); // ? new
	5140	+ ctrlPanel.validate(); // ? new
3843	5141	ctrlPanel.repaint();
3844	5142	}
	5143	+
	5144	+ if (previousVersionButton != null && copy.versionlist != null)
	5145	+ SetVersionStates();
3845	5146	}
3846	5147
3847	5148	static TweenManager tweenManager = new TweenManager();
3848	5149
3849	5150	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3850	5151	{
	5152	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5153	+ Save();
3851	5154	//Tween.set(thing, 0).target(1).start(tweenManager);
3852	5155	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3853	5156	// if (thing instanceof GenericJointDemo)
..	..	@@ -3934,6 +5237,12 @@
3934	5237	{
3935	5238	ResetModel();
3936	5239	Select(thing.GetTreePath(), true, false); // unselect... false);
	5240	+
	5241	+ if (thing.Size() == 0)
	5242	+ {
	5243	+ //EditSelection(false);
	5244	+ }
	5245	+
3937	5246	refreshContents();
3938	5247	}
3939	5248
..	..	@@ -4051,6 +5360,7 @@
4051	5360	}
4052	5361	}
4053	5362	}
	5363	+
4054	5364	LoadGFDThread loadGFDThread;
4055	5365
4056	5366	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4070,8 +5380,10 @@
4070	5380
4071	5381	try
4072	5382	{
	5383	+ // Try compressed version first.
4073	5384	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4074		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5385	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5386	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4075	5387
4076	5388	readobj = (Object3D) p.readObject();
4077	5389	istream.close();
..	..	@@ -4079,7 +5391,22 @@
4079	5391	readobj.ResetDisplayList();
4080	5392	} catch (Exception e)
4081	5393	{
4082		- e.printStackTrace();
	5394	+ if (!e.toString().contains("GZIP"))
	5395	+ e.printStackTrace();
	5396	+
	5397	+ try
	5398	+ {
	5399	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5400	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5401	+
	5402	+ readobj = (Object3D) p.readObject();
	5403	+ istream.close();
	5404	+
	5405	+ readobj.ResetDisplayList();
	5406	+ } catch (Exception e2)
	5407	+ {
	5408	+ e2.printStackTrace();
	5409	+ }
4083	5410	}
4084	5411	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4085	5412	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4125,6 +5452,12 @@
4125	5452
4126	5453	void LoadIt(Object obj)
4127	5454	{
	5455	+ if (obj == null)
	5456	+ {
	5457	+ // Invalid file
	5458	+ return;
	5459	+ }
	5460	+
4128	5461	System.out.println("Loaded " + obj);
4129	5462	//new Exception().printStackTrace();
4130	5463	Object3D readobj = (Object3D) obj;
..	..	@@ -4134,10 +5467,14 @@
4134	5467
4135	5468	if (readobj != null)
4136	5469	{
	5470	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5471	+ // Save();
4137	5472	try
4138	5473	{
4139	5474	//readobj.deepCopySelf(copy);
4140	5475	copy.clear(); // june 2014
	5476	+ copy.skyboxname = readobj.skyboxname;
	5477	+ copy.skyboxext = readobj.skyboxext;
4141	5478	for (int i = 0; i < readobj.size(); i++)
4142	5479	{
4143	5480	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4178,6 +5515,7 @@
4178	5515	}
4179	5516	} catch (ClassCastException e)
4180	5517	{
	5518	+ e.printStackTrace();
4181	5519	assert (false);
4182	5520	Composite c = (Composite) copy;
4183	5521	c.children.clear();
..	..	@@ -4188,17 +5526,31 @@
4188	5526	c.addChild(csg);
4189	5527	}
4190	5528
	5529	+ copy.versionlist = readobj.versionlist;
	5530	+ copy.versionindex = readobj.versionindex;
	5531	+
	5532	+ if (copy.versionlist == null)
	5533	+ {
	5534	+ // Backward compatibility
	5535	+ copy.versionlist = new Object3D[100];
	5536	+ copy.versionindex = -1;
	5537	+
	5538	+ Save(true);
	5539	+ }
	5540	+
	5541	+ //? SetUndoStates();
	5542	+
4191	5543	ResetModel();
4192	5544	copy.HardTouch(); // recompile?
4193	5545	refreshContents();
4194	5546	}
4195	5547	}
4196	5548
4197		- void load() // throws ClassNotFoundException
	5549	+ void Open() // throws ClassNotFoundException
4198	5550	{
4199		- if (GrafreeD.standAlone)
	5551	+ if (Grafreed.standAlone)
4200	5552	{
4201		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5553	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4202	5554	browser.show();
4203	5555	String filename = browser.getFile();
4204	5556	if (filename != null && filename.length() > 0)
..	..	@@ -4275,6 +5627,8 @@
4275	5627
4276	5628	void save()
4277	5629	{
	5630	+ Replace();
	5631	+
4278	5632	if (lastname == null)
4279	5633	{
4280	5634	return;
..	..	@@ -4283,11 +5637,13 @@
4283	5637	try
4284	5638	{
4285	5639	FileOutputStream ostream = new FileOutputStream(lastname);
4286		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5640	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5641	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4287	5642
4288	5643	p.writeObject(copy);
4289	5644	p.flush();
4290	5645
	5646	+ zstream.close();
4291	5647	ostream.close();
4292	5648
4293	5649	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4295,19 +5651,23 @@
4295	5651	//ps.print(buffer.toString());
4296	5652	} catch (IOException e)
4297	5653	{
	5654	+ e.printStackTrace();
4298	5655	}
4299	5656	}
	5657	+
4300	5658	String lastname;
4301	5659
4302	5660	void saveAs()
4303	5661	{
4304		- if (GrafreeD.standAlone)
	5662	+ if (Grafreed.standAlone)
4305	5663	{
4306	5664	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4307	5665	browser.setVisible(true);
4308	5666	String filename = browser.getFile();
4309	5667	if (filename != null && filename.length() > 0)
4310	5668	{
	5669	+ if (!filename.endsWith(".gfd"))
	5670	+ filename += ".gfd";
4311	5671	lastname = browser.getDirectory() + filename;
4312	5672	save();
4313	5673	}
..	..	@@ -4406,13 +5766,13 @@
4406	5766	try
4407	5767	{
4408	5768	FileOutputStream ostream = new FileOutputStream(filename);
4409		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4410		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5769	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5770	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4411	5771
4412	5772	Object3D objectparent = obj.parent;
4413	5773	obj.parent = null;
4414	5774
4415		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5775	+ Object3D object = (Object3D) Grafreed.clone(obj);
4416	5776
4417	5777	obj.parent = objectparent;
4418	5778
..	..	@@ -4424,8 +5784,8 @@
4424	5784	p.writeObject(object);
4425	5785	p.flush();
4426	5786
	5787	+ zstream.close();
4427	5788	ostream.close();
4428		- // zstream.close();
4429	5789
4430	5790	// group.selection.get(0).parent = parent;
4431	5791	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4446,7 +5806,7 @@
4446	5806	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4447	5807	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4448	5808	copy.generatePOV(buffer);
4449		- if (GrafreeD.standAlone)
	5809	+ if (Grafreed.standAlone)
4450	5810	{
4451	5811	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4452	5812	browser.show();
..	..	@@ -4472,21 +5832,20 @@
4472	5832	Object3D client;
4473	5833	Object3D copy;
4474	5834	MenuBar menuBar;
4475		- Menu windowMenu;
4476		- MenuItem loadItem;
	5835	+ Menu fileMenu;
	5836	+ MenuItem newItem;
	5837	+ MenuItem openItem;
4477	5838	MenuItem saveItem;
4478	5839	MenuItem saveAsItem;
4479	5840	MenuItem exportAsItem;
4480	5841	MenuItem reexportItem;
4481	5842	MenuItem povItem;
4482	5843	MenuItem closeItem;
4483		- Menu cameraMenu;
	5844	+
4484	5845	CheckboxMenuItem zBufferItem;
4485	5846	//MenuItem normalLensItem;
4486		- MenuItem editCameraItem;
4487		- MenuItem revertCameraItem;
4488		- CheckboxMenuItem toggleLiveItem;
4489	5847	MenuItem stepItem;
	5848	+ CheckboxMenuItem toggleLiveItem;
4490	5849	CheckboxMenuItem toggleFullScreenItem;
4491	5850	CheckboxMenuItem toggleTimelineItem;
4492	5851	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4495,28 +5854,44 @@
4495	5854	CheckboxMenuItem toggleFootContactItem;
4496	5855	CheckboxMenuItem toggleDLItem;
4497	5856	CheckboxMenuItem toggleTextureItem;
4498		- CheckboxMenuItem toggleRandomItem;
	5857	+ CheckboxMenuItem toggleSwitchItem;
4499	5858	CheckboxMenuItem toggleRootItem;
4500	5859	CheckboxMenuItem animationItem;
	5860	+ MenuItem archiveItem;
4501	5861	CheckboxMenuItem toggleHandleItem;
4502	5862	CheckboxMenuItem togglePaintItem;
4503	5863	JSplitPane mainPanel;
4504	5864	JScrollPane scrollpane;
	5865	+
4505	5866	JPanel toolbarPanel;
4506		- JPanel treePanel;
	5867	+
	5868	+ cGridBag treePanel;
	5869	+
4507	5870	JPanel radioPanel;
4508	5871	ButtonGroup buttonGroup;
4509		- JPanel ctrlPanel;
4510		- JPanel materialPanel;
	5872	+
	5873	+ cGridBag toolboxPanel;
	5874	+ cGridBag skyboxPanel;
	5875	+ cGridBag materialPanel;
	5876	+ cGridBag ctrlPanel;
	5877	+
4511	5878	JScrollPane infoPanel;
4512		- JPanel optionsPanel;
	5879	+
	5880	+ cGridBag optionsPanel;
	5881	+
4513	5882	JTabbedPane objectPanel;
4514		- JPanel XYZPanel;
	5883	+ boolean materialFlushed;
	5884	+ Object3D latestObject;
	5885	+
	5886	+ cGridBag XYZPanel;
	5887	+
4515	5888	JSplitPane gridPanel;
4516	5889	JSplitPane bigPanel;
4517		- JPanel bigThree;
4518		- JTabbedPane scenePanel;
4519		- JPanel centralPanel;
	5890	+
	5891	+ cGridBag bigThree;
	5892	+ cGridBag scenePanel;
	5893	+ cGridBag centralPanel;
	5894	+ JSplitPane cameraPanel;
4520	5895	JPanel timelinePanel;
4521	5896	JMenuBar timelineMenubar;
4522	5897	JSplitPane framePanel;
..	..	@@ -4568,65 +5943,74 @@
4568	5943	// MATERIAL
4569	5944	JLabel materialLabel;
4570	5945	JLabel colorLabel;
4571		- NumberSlider colorField;
	5946	+ cNumberSlider colorField;
4572	5947	JLabel modulationLabel;
4573		- NumberSlider modulationField;
	5948	+ cNumberSlider saturationField;
4574	5949	JLabel metalnessLabel;
4575		- NumberSlider metalnessField;
	5950	+ cNumberSlider metalnessField;
4576	5951	JLabel diffuseLabel;
4577		- NumberSlider diffuseField;
	5952	+ cNumberSlider diffuseField;
4578	5953	JLabel specularLabel;
4579		- NumberSlider specularField;
	5954	+ cNumberSlider specularField;
4580	5955	JLabel shininessLabel;
4581		- NumberSlider shininessField;
	5956	+ cNumberSlider shininessField;
4582	5957	JLabel shiftLabel;
4583		- NumberSlider shiftField;
	5958	+ cNumberSlider shiftField;
4584	5959	JLabel ambientLabel;
4585		- NumberSlider ambientField;
	5960	+ cNumberSlider ambientField;
4586	5961	JLabel lightareaLabel;
4587		- NumberSlider lightareaField;
	5962	+ cNumberSlider lightareaField;
4588	5963	JLabel diffusenessLabel;
4589		- NumberSlider diffusenessField;
	5964	+ cNumberSlider diffusenessField;
4590	5965	JLabel velvetLabel;
4591		- NumberSlider velvetField;
	5966	+ cNumberSlider velvetField;
4592	5967	JLabel sheenLabel;
4593		- NumberSlider sheenField;
	5968	+ cNumberSlider sheenField;
4594	5969	JLabel subsurfaceLabel;
4595		- NumberSlider subsurfaceField;
	5970	+ cNumberSlider subsurfaceField;
4596	5971	//JLabel bumpLabel;
4597	5972	//NumberSlider bumpField;
4598	5973	JLabel backlitLabel;
4599		- NumberSlider backlitField;
	5974	+ cNumberSlider backlitField;
4600	5975	JLabel anisoLabel;
4601		- NumberSlider anisoField;
	5976	+ cNumberSlider anisoField;
4602	5977	JLabel anisoVLabel;
4603		- NumberSlider anisoVField;
	5978	+ cNumberSlider anisoVField;
	5979	+
4604	5980	JLabel cameraLabel;
4605		- NumberSlider cameraField;
	5981	+ cNumberSlider cameraField;
4606	5982	JLabel selfshadowLabel;
4607		- NumberSlider selfshadowField;
	5983	+ cNumberSlider selfshadowField;
4608	5984	JLabel shadowLabel;
4609		- NumberSlider shadowField;
	5985	+ cNumberSlider shadowField;
4610	5986	JLabel textureLabel;
4611		- NumberSlider textureField;
	5987	+ cNumberSlider textureField;
4612	5988	JLabel opacityLabel;
4613		- NumberSlider opacityField;
	5989	+ cNumberSlider opacityField;
4614	5990	JLabel fakedepthLabel;
4615		- NumberSlider fakedepthField;
	5991	+ cNumberSlider fakedepthField;
4616	5992	JLabel shadowbiasLabel;
4617		- NumberSlider shadowbiasField;
	5993	+ cNumberSlider shadowbiasField;
	5994	+
4618	5995	JLabel bumpLabel;
4619		- NumberSlider bumpField;
	5996	+ cNumberSlider bumpField;
4620	5997	JLabel noiseLabel;
4621		- NumberSlider noiseField;
	5998	+ cNumberSlider noiseField;
4622	5999	JLabel powerLabel;
4623		- NumberSlider powerField;
	6000	+ cNumberSlider powerField;
4624	6001	JLabel borderfadeLabel;
4625		- NumberSlider borderfadeField;
	6002	+ cNumberSlider borderfadeField;
4626	6003	JLabel fogLabel;
4627		- NumberSlider fogField;
	6004	+ cNumberSlider fogField;
4628	6005	JLabel opacityPowerLabel;
4629		- NumberSlider opacityPowerField;
4630		- JTree jTree;
	6006	+ cNumberSlider opacityPowerField;
	6007	+ cTree jTree;
4631	6008	//ObjectUI parent;
	6009	+
	6010	+ cNumberSlider normalpushField;
	6011	+
	6012	+ private MenuItem importGFDItem;
	6013	+ private MenuItem importVRMLX3DItem;
	6014	+ private MenuItem import3DSItem;
	6015	+ private MenuItem importOBJItem;
4632	6016	}