~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,11 +34,152 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ public cToggleButton pinButton;
31	38	boolean timeline;
32	39	boolean wasFullScreen;
33	40
34	41	GroupEditor callee;
35	42	JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
	90	+ public cGridBag GetSeparator()
	91	+ {
	92	+ cGridBag separator = new cGridBag();
	93	+ separator.add(new JSeparator());
	94	+ separator.preferredHeight = 5;
	95	+ return separator;
	96	+ }
	97	+
	98	+ cButton GetButton(String name, boolean border)
	99	+ {
	100	+ ImageIcon icon = GetIcon(name);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
	111	+ }
	112	+
	113	+ cToggleButton GetToggleButton(String name, boolean border)
	114	+ {
	115	+ ImageIcon icon = GetIcon(name);
	116	+ return new cToggleButton(icon, border);
	117	+ }
	118	+
	119	+ cCheckBox GetCheckBox(String name, boolean border)
	120	+ {
	121	+ ImageIcon icon = GetIcon(name);
	122	+ return new cCheckBox(icon, border);
	123	+ }
	124	+
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
	128	+ {
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
	135	+ try
	136	+ {
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
	145	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	146	+// {
	147	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	148	+// Graphics2D g = resized.createGraphics();
	149	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	150	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	151	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	152	+// g.dispose();
	153	+//
	154	+// image = resized;
	155	+// }
	156	+
	157	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
	161	+ return icon;
	162	+ }
	163	+ catch (Exception e)
	164	+ {
	165	+ //icons.put(name, null);
	166	+ return null;
	167	+ }
	168	+ }
	169	+
	170	+ BufferedImage GetImage(String name)
	171	+ {
	172	+ try
	173	+ {
	174	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	175	+
	176	+ return image;
	177	+ }
	178	+ catch (Exception e)
	179	+ {
	180	+ return null;
	181	+ }
	182	+ }
36	183
37	184	// SCRIPT
38	185
..	..	@@ -136,34 +283,42 @@
136	283	public void closeUI()
137	284	{
138	285	//new Exception().printStackTrace();
139		- System.out.println("this = " + this);
140		- System.out.println("objEditor = " + objEditor);
	286	+// System.out.println("this = " + this);
	287	+// System.out.println("objEditor = " + objEditor);
141	288	//nameField.removeActionListener(this);
142		- objEditor.ctrlPanel.remove(nameField);
	289	+// objEditor.ctrlPanel.remove(nameField);
143	290
144		- if (!GroupEditor.allparams)
	291	+ objEditor.ctrlPanel.remove(namePanel);
	292	+
	293	+ if (!allparams)
145	294	return;
146	295
147		- objEditor.ctrlPanel.remove(liveCB);
148		- objEditor.ctrlPanel.remove(hideCB);
149		- objEditor.ctrlPanel.remove(markCB);
150		-
151		- objEditor.ctrlPanel.remove(randomCB);
152		- objEditor.ctrlPanel.remove(speedupCB);
153		- objEditor.ctrlPanel.remove(rewindCB);
154		-
155		- objEditor.ctrlPanel.remove(resetButton);
156		- objEditor.ctrlPanel.remove(stepButton);
157		-// objEditor.ctrlPanel.remove(stepAllButton);
158		-// objEditor.ctrlPanel.remove(resetAllButton);
159		- objEditor.ctrlPanel.remove(link2masterCB);
160		- //objEditor.ctrlPanel.remove(flipVCB);
161		- //objEditor.ctrlPanel.remove(texresMenu);
162		- objEditor.ctrlPanel.remove(slowerButton);
163		- objEditor.ctrlPanel.remove(fasterButton);
164		- objEditor.ctrlPanel.remove(remarkButton);
	296	+// objEditor.ctrlPanel.remove(liveCB);
	297	+// objEditor.ctrlPanel.remove(hideCB);
	298	+// objEditor.ctrlPanel.remove(markCB);
	299	+//
	300	+// objEditor.ctrlPanel.remove(randomCB);
	301	+// objEditor.ctrlPanel.remove(speedupCB);
	302	+// objEditor.ctrlPanel.remove(rewindCB);
	303	+//
	304	+// objEditor.ctrlPanel.remove(resetButton);
	305	+// objEditor.ctrlPanel.remove(stepButton);
	306	+//// objEditor.ctrlPanel.remove(stepAllButton);
	307	+//// objEditor.ctrlPanel.remove(resetAllButton);
	308	+// objEditor.ctrlPanel.remove(link2masterCB);
	309	+// //objEditor.ctrlPanel.remove(flipVCB);
	310	+// //objEditor.ctrlPanel.remove(texresMenu);
	311	+// objEditor.ctrlPanel.remove(slowerButton);
	312	+// objEditor.ctrlPanel.remove(fasterButton);
	313	+// objEditor.ctrlPanel.remove(remarkButton);
165	314
166		- Remove(normalpushField);
	315	+ objEditor.ctrlPanel.remove(setupPanel);
	316	+ objEditor.ctrlPanel.remove(setupPanel2);
	317	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	318	+ objEditor.ctrlPanel.remove(pushPanel);
	319	+ //objEditor.ctrlPanel.remove(fillPanel);
	320	+
	321	+ //Remove(normalpushField);
167	322	}
168	323
169	324	public ObjEditor GetEditor()
..	..	@@ -207,6 +362,14 @@
207	362	client = inClient;
208	363	copy = client;
209	364
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
	372	+
210	373	// "this" is not called: SetupUI2(objEditor);
211	374	}
212	375
..	..	@@ -220,6 +383,14 @@
220	383	client = inClient;
221	384	copy = client;
222	385
	386	+ if (copy.versionlist == null)
	387	+ {
	388	+ copy.versionlist = new Object3D[100];
	389	+ copy.versionindex = -1;
	390	+
	391	+// Save(true);
	392	+ }
	393	+
223	394	SetupUI2(callee.GetEditor());
224	395	}
225	396
..	..	@@ -234,13 +405,15 @@
234	405	//localCopy.parent = null;
235	406
236	407	frame = new JFrame();
	408	+ frame.setUndecorated(false);
237	409	objEditor = this;
238	410	this.callee = callee;
239	411
240	412	//parent = p;
241	413
242	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
243		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
244	417	//gd.setFullScreenWindow(this);
245	418	//setResizable(false);
246	419	//if (!isDisplayable())
..	..	@@ -251,6 +424,14 @@
251	424	copy = localCopy;
252	425	copy.editWindow = this;
253	426
	427	+// if (copy.versionlist == null)
	428	+// {
	429	+// copy.versionlist = new Object3D[100];
	430	+// copy.versionindex = -1;
	431	+//
	432	+// Save(true);
	433	+// }
	434	+
254	435	SetupMenu();
255	436
256	437	//SetupName(objEditor); // new
..	..	@@ -264,28 +445,55 @@
264	445	return frame.action(event, obj);
265	446	}
266	447
	448	+ // Cannot work without static
	449	+ static boolean allparams = true;
	450	+
	451	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	452	+
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
267	456	void SetupMenu()
268	457	{
269	458	frame.setMenuBar(menuBar = new MenuBar());
270		- menuBar.add(windowMenu = new Menu("File"));
271		- windowMenu.add(loadItem = new MenuItem("Load..."));
272		- windowMenu.add("-");
273		- windowMenu.add(saveItem = new MenuItem("Save"));
274		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	459	+ menuBar.add(fileMenu = new Menu("File"));
	460	+ fileMenu.add(newItem = new MenuItem("New"));
	461	+ fileMenu.add(openItem = new MenuItem("Open..."));
	462	+
	463	+ //oe.menuBar.add(menu = new Menu("Include"));
	464	+ Menu menu = new Menu("Import");
	465	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	466	+ importOBJItem.addActionListener(this);
	467	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	468	+ import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
	471	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	472	+ importVRMLX3DItem.addActionListener(this);
	473	+ }
	474	+ menu.add("-");
	475	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	476	+ importGFDItem.addActionListener(this);
	477	+ fileMenu.add(menu);
	478	+ fileMenu.add("-");
	479	+
	480	+ fileMenu.add(saveItem = new MenuItem("Save"));
	481	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
275	482	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
276		- windowMenu.add("-");
277		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
278		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
279		- windowMenu.add("-");
	483	+ fileMenu.add("-");
	484	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	485	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	486	+ fileMenu.add("-");
280	487	if (client.parent != null)
281	488	{
282		- windowMenu.add(closeItem = new MenuItem("Close"));
	489	+ fileMenu.add(closeItem = new MenuItem("Close"));
283	490	} else
284	491	{
285		- windowMenu.add(closeItem = new MenuItem("Exit"));
	492	+ fileMenu.add(closeItem = new MenuItem("Exit"));
286	493	}
287	494
288		- loadItem.addActionListener(this);
	495	+ newItem.addActionListener(this);
	496	+ openItem.addActionListener(this);
289	497	saveItem.addActionListener(this);
290	498	saveAsItem.addActionListener(this);
291	499	exportAsItem.addActionListener(this);
..	..	@@ -293,82 +501,103 @@
293	501	//povItem.addActionListener(this);
294	502	closeItem.addActionListener(this);
295	503
296		- menuBar.add(cameraMenu = new Menu("View"));
297		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
298		- //zBufferItem.addActionListener(this);
299		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
300		- //normalLensItem.addActionListener(this);
301		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
302		- revertCameraItem.addActionListener(this);
303		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
304		- toggleTimelineItem.addItemListener(this);
305		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
306		- toggleFullScreenItem.addItemListener(this);
307		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
308		- cameraMenu.add("-");
309		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
310		- toggleTextureItem.addItemListener(this);
311		- toggleTextureItem.setState(CameraPane.textureon);
312		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
313		- toggleLiveItem.addItemListener(this);
314		- toggleLiveItem.setState(Globals.isLIVE());
315		- cameraMenu.add(stepItem = new MenuItem("Step"));
316		- stepItem.addActionListener(this);
317		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
318		-// toggleDLItem.addItemListener(this);
319		-// toggleDLItem.setState(false);
320		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
321		- toggleRenderItem.addItemListener(this);
322		- toggleRenderItem.setState(!CameraPane.frozen);
323		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
324		- toggleDebugItem.addItemListener(this);
325		- toggleDebugItem.setState(CameraPane.DEBUG);
326		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
327		- toggleFrustumItem.addItemListener(this);
328		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
329		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
330		- toggleFootContactItem.addItemListener(this);
331		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
332		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
333		- toggleRandomItem.addItemListener(this);
334		- toggleRandomItem.setState(CameraPane.RANDOM);
335		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
336		- toggleHandleItem.addItemListener(this);
337		- toggleHandleItem.setState(CameraPane.HANDLES);
338		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
339		- togglePaintItem.addItemListener(this);
340		- togglePaintItem.setState(CameraPane.PAINTMODE);
341		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
342		-// toggleRootItem.addItemListener(this);
343		-// toggleRootItem.setState(false);
344		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
345		-// animationItem.addItemListener(this);
346		-// animationItem.setState(CameraPane.ANIMATION);
347		- cameraMenu.add("-");
348		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
349		- editCameraItem.addActionListener(this);
350		-
351	504	objectPanel = new JTabbedPane();
	505	+
	506	+ ChangeListener changeListener = new ChangeListener()
	507	+ {
	508	+ //String name;
	509	+
	510	+ public void stateChanged(ChangeEvent changeEvent)
	511	+ {
	512	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	513	+// {
	514	+// if (latestObject != null)
	515	+// {
	516	+// refreshContents(true);
	517	+// SetMaterial(latestObject);
	518	+// }
	519	+//
	520	+// materialFlushed = true;
	521	+// }
	522	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	523	+// {
	524	+// if (listUI.size() == 0)
	525	+// EditSelection(false);
	526	+// }
	527	+
	528	+// if (objectPanel.getSelectedIndex() == 4)
	529	+// {
	530	+// name = copy.skyboxname;
	531	+//
	532	+// if (name == null)
	533	+// {
	534	+// name = "";
	535	+// }
	536	+//
	537	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	538	+// copy.skyboxext = "jpg";
	539	+// }
	540	+// else
	541	+// {
	542	+// if (name != null)
	543	+// {
	544	+// if (name.equals(""))
	545	+// {
	546	+// copy.skyboxname = null;
	547	+// copy.skyboxext = null;
	548	+// }
	549	+// else
	550	+// {
	551	+// copy.skyboxname = name;
	552	+// }
	553	+// }
	554	+// }
	555	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	556	+
	557	+// refreshContents(false); // To refresh Info tab
	558	+ cameraView.repaint();
	559	+ }
	560	+ };
	561	+ objectPanel.addChangeListener(changeListener);
	562	+
352	563	toolbarPanel = new JPanel();
353	564	toolbarPanel.setName("Toolbar");
354		- treePanel = new JPanel();
	565	+
	566	+ treePanel = new cGridBag();
355	567	treePanel.setName("Tree");
356		- ctrlPanel = new JPanel(); // new GridBagLayout());
357		- ctrlPanel.setName("Edit");
358		- materialPanel = new JPanel();
359		- materialPanel.setName("Material");
	568	+
	569	+ editPanel = new cGridBag().setVertical(true);
	570	+ //editPanel.setName("Edit");
	571	+
	572	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	573	+
	574	+ editCommandsPanel = new cGridBag();
	575	+ editPanel.add(editCommandsPanel);
	576	+ editPanel.add(ctrlPanel);
	577	+
	578	+ toolboxPanel = new cGridBag().setVertical(true);
	579	+ //toolboxPanel.setName("Toolbox");
	580	+
	581	+ skyboxPanel = new cGridBag().setVertical(true);
	582	+
	583	+ materialPanel = new cGridBag().setVertical(false);
	584	+ //materialPanel.setName("Material");
	585	+
360	586	/JTextPane/
361	587	infoarea = createTextPane();
	588	+ doc = infoarea.getStyledDocument();
	589	+
362	590	infoarea.setEditable(true);
363	591	SetText();
	592	+
364	593	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365	594	// infoarea.setOpaque(false);
366	595	// //infoarea.setForeground(textcolor);
367		- infoarea.setLineWrap(true);
368		- infoarea.setWrapStyleWord(true);
	596	+// TEXTAREA infoarea.setLineWrap(true);
	597	+// TEXTAREA infoarea.setWrapStyleWord(true);
369	598	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370		- infoPanel.setPreferredSize(new Dimension(50, 200));
371		- infoPanel.setName("Info");
	599	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	600	+ //infoPanel.setName("Info");
372	601	//infoPanel.setLayout(new BorderLayout());
373	602	//infoPanel.add(createTextPane());
374	603
..	..	@@ -376,16 +605,23 @@
376	605	mainPanel.setName("Main");
377	606	mainPanel.setContinuousLayout(true);
378	607	mainPanel.setOneTouchExpandable(true);
379		- mainPanel.setDividerLocation(1.0);
380	608	mainPanel.setDividerSize(9);
381		- mainPanel.setResizeWeight(0);
382		-
	609	+ mainPanel.setDividerLocation(0.5); //1.0);
	610	+ mainPanel.setResizeWeight(0.5);
	611	+
	612	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	613	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	614	+ divider.setDividerSize(15);
	615	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	616	+
	617	+ mainPanel.setUI(new BasicSplitPaneUI());
	618	+
383	619	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384	620	//mainPanel.setLayout(new GridBagLayout());
385	621	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386		- treePanel.setLayout(new GridBagLayout());
387		- ctrlPanel.setLayout(new GridBagLayout());
388		- materialPanel.setLayout(new GridBagLayout());
	622	+// treePanel.setLayout(new GridBagLayout());
	623	+ //ctrlPanel.setLayout(new GridBagLayout());
	624	+ //materialPanel.setLayout(new GridBagLayout());
389	625
390	626	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391	627	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -424,7 +660,7 @@
424	660	static String newline = "\n";
425	661	protected static final String buttonString = "JButton";
426	662	StyledDocument doc;
427		- JTextArea infoarea;
	663	+ JTextPane infoarea;
428	664
429	665	void ClearInfo()
430	666	{
..	..	@@ -447,10 +683,10 @@
447	683	e.printStackTrace();
448	684	}
449	685
450		- String selection = infoarea.getText();
451		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
452		- java.awt.datatransfer.Clipboard clipboard =
453		- Toolkit.getDefaultToolkit().getSystemClipboard();
	686	+// String selection = infoarea.getText();
	687	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	688	+// java.awt.datatransfer.Clipboard clipboard =
	689	+// Toolkit.getDefaultToolkit().getSystemClipboard();
454	690	//clipboard.setContents(data, data);
455	691	}
456	692
..	..	@@ -473,13 +709,13 @@
473	709	//SendInfo("Name:", "bold");
474	710	if (sel.GetTextures() != null \|\| debug)
475	711	{
476		- si.SendInfo(sel.toString(), "bold");
	712	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
477	713	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
478	714	if (sel.Size() > 0)
479	715	{
480	716	si.SendInfo("#children = " + sel.Size(), "regular");
481	717	}
482		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	718	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
483	719	if (debug)
484	720	{
485	721	try
..	..	@@ -491,7 +727,10 @@
491	727	}
492	728
493	729	if (full)
494		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	730	+ {
	731	+ si.SendInfo(" BBox min: " + minima, "regular");
	732	+ si.SendInfo(" BBox max: " + maxima, "regular");
	733	+ }
495	734
496	735	if (sel.bRep != null)
497	736	{
..	..	@@ -518,7 +757,7 @@
518	757	}
519	758	if (sel.support != null)
520	759	{
521		- si.SendInfo(" support: " + sel.support, "regular");
	760	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
522	761	}
523	762	if (sel.scriptnode != null)
524	763	{
..	..	@@ -589,6 +828,9 @@
589	828	{
590	829	CameraPane.pointflow = (PointFlow) sel;
591	830	}
	831	+
	832	+ si.SendInfo("_____________________", "regular");
	833	+ si.SendInfo("", "regular");
592	834	}
593	835	}
594	836
..	..	@@ -604,68 +846,216 @@
604	846	}
605	847	}
606	848
	849	+//static GraphicsDevice device = GraphicsEnvironment
	850	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	851	+
	852	+ Rectangle keeprect;
	853	+ cRadio radio;
	854	+
	855	+cButton keepButton;
	856	+ cButton twoButton; // Full 3D
	857	+ cButton sixButton;
	858	+ cButton threeButton;
	859	+ cButton sevenButton;
	860	+ cButton fourButton; // full panel
	861	+ cButton oneButton; // full XYZ
	862	+ //cButton currentLayout;
	863	+
	864	+ boolean maximized;
	865	+
	866	+ cButton fullscreenLayout;
	867	+ cButton expandedLayout;
	868	+
	869	+ void Minimize()
	870	+ {
	871	+ frame.setState(Frame.ICONIFIED);
	872	+ frame.validate();
	873	+ }
	874	+
	875	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	876	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	877	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	878	+ void Maximize()
	879	+ {
	880	+ if (CameraPane.FULLSCREEN)
	881	+ {
	882	+ ToggleFullScreen();
	883	+ }
	884	+
	885	+ if (maximized)
	886	+ {
	887	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	888	+ }
	889	+ else
	890	+ {
	891	+ keeprect = frame.getBounds();
	892	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	893	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	894	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	895	+// frame.setState(Frame.MAXIMIZED_BOTH);
	896	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	897	+ }
	898	+
	899	+ maximized ^= true;
	900	+
	901	+ frame.validate();
	902	+ }
	903	+
	904	+ cButton minButton;
	905	+ cButton maxButton;
	906	+ cButton fullButton;
	907	+ cButton collapseButton;
	908	+ cButton maximize3DButton;
	909	+
607	910	void ToggleFullScreen()
608	911	{
609		- if (CameraPane.FULLSCREEN)
	912	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	913	+
	914	+ cameraView.ToggleFullScreen();
	915	+
	916	+ if (!CameraPane.FULLSCREEN)
610	917	{
611		- frame.getContentPane().remove(/"Center",/bigThree);
612		- framePanel.add(bigThree);
613		- frame.getContentPane().add(/"Center",/framePanel);
	918	+ device.setFullScreenWindow(null);
	919	+ frame.dispose();
	920	+ frame.setUndecorated(false);
	921	+ frame.validate();
	922	+ frame.setVisible(true);
	923	+
	924	+ //frame.setVisible(false);
	925	+// frame.removeNotify();
	926	+// frame.setUndecorated(false);
	927	+// frame.addNotify();
	928	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	929	+
	930	+// X frame.getContentPane().remove(/"Center",/bigThree);
	931	+// X framePanel.add(bigThree);
	932	+// X frame.getContentPane().add(/"Center",/framePanel);
	933	+// framePanel.setDividerLocation(46); // icons are 24x24
	934	+
	935	+ //frame.setVisible(true);
	936	+// radio.layout = keepButton;
	937	+ //theFrame = null;
	938	+ keepButton = null;
	939	+// radio.layout.doClick();
	940	+
614	941	} else
615	942	{
616		- frame.getContentPane().remove(/"Center",/framePanel);
617		- framePanel.remove(bigThree);
618		- frame.getContentPane().add(/"Center",/bigThree);
	943	+ keepButton = radio.layout;
	944	+ //keeprect = frame.getBounds();
	945	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	946	+// frame.getToolkit().getScreenSize().height);
	947	+ //frame.setVisible(false);
	948	+
	949	+ frame.dispose();
	950	+ frame.setUndecorated(true);
	951	+ device.setFullScreenWindow(frame);
	952	+ frame.validate();
	953	+ frame.setVisible(true);
	954	+// frame.removeNotify();
	955	+// frame.setUndecorated(true);
	956	+// frame.addNotify();
	957	+// X frame.getContentPane().remove(/"Center",/framePanel);
	958	+// X framePanel.remove(bigThree);
	959	+// X frame.getContentPane().add(/"Center",/bigThree);
	960	+// framePanel.setDividerLocation(0);
	961	+
	962	+// radio.layout = fullscreenLayout;
	963	+// radio.layout.doClick();
	964	+ //frame.setVisible(true);
619	965	}
620		- cameraView.ToggleFullScreen();
	966	+ frame.validate();
	967	+
	968	+ cameraView.requestFocusInWindow();
621	969	}
622	970
623		- private JTextArea createTextPane()
	971	+ void CollapseToolbar()
	972	+ {
	973	+ framePanel.setDividerLocation(0);
	974	+ //frame.validate();
	975	+
	976	+ cameraView.requestFocusInWindow();
	977	+ }
	978	+
	979	+ private Object3D Duplicate(Object3D object)
624	980	{
625		- String[] initString =
626		- {
627		- "This is an editable JTextPane, ", //regular
628		- "another ", //italic
629		- "styled ", //bold
630		- "text ", //small
631		- "component, ", //large
632		- "which supports embedded components..." + newline,//regular
633		- " " + newline, //button
634		- "...and embedded icons..." + newline, //regular
635		- " ", //icon
636		- newline + "JTextPane is a subclass of JEditorPane that "
637		- + "uses a StyledEditorKit and StyledDocument, and provides "
638		- + "cover methods for interacting with those objects."
639		- };
	981	+ boolean temp = CameraPane.SWITCH;
	982	+ CameraPane.SWITCH = false;
	983	+
	984	+ if (Grafreed.grafreed.universe.versiontable == null)
	985	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	986	+
	987	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	988	+ // if (copy == client)
	989	+
	990	+ Object3D versions[] = object.versionlist;
	991	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	992	+ object.versionlist = null;
	993	+ object.versiontable = null;
	994	+
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
	997	+
	998	+ //byte[] compress = Compress(copy);
	999	+ Object3D compress = (Object3D)Grafreed.clone(object);
	1000	+
	1001	+ object.parent = parent;
	1002	+
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	1007	+
	1008	+ CameraPane.SWITCH = temp;
	1009	+
	1010	+ return compress;
	1011	+ }
640	1012
641		- String[] initStyles =
642		- {
643		- "regular", "italic", "bold", "small", "large",
644		- "regular", "button", "regular", "icon",
645		- "regular"
646		- };
	1013	+ private JTextPane createTextPane()
	1014	+ {
	1015	+// TEXTAREA String[] initString =
	1016	+// {
	1017	+// "This is an editable JTextPane, ", //regular
	1018	+// "another ", //italic
	1019	+// "styled ", //bold
	1020	+// "text ", //small
	1021	+// "component, ", //large
	1022	+// "which supports embedded components..." + newline,//regular
	1023	+// " " + newline, //button
	1024	+// "...and embedded icons..." + newline, //regular
	1025	+// " ", //icon
	1026	+// newline + "JTextPane is a subclass of JEditorPane that "
	1027	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	1028	+// + "cover methods for interacting with those objects."
	1029	+// };
	1030	+//
	1031	+// String[] initStyles =
	1032	+// {
	1033	+// "regular", "italic", "bold", "small", "large",
	1034	+// "regular", "button", "regular", "icon",
	1035	+// "regular"
	1036	+// };
	1037	+//
	1038	+// JTextPane textPane = new JTextPane();
	1039	+// textPane.setEditable(true);
	1040	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1041	+// addStylesToDocument(doc);
	1042	+//
	1043	+// try
	1044	+// {
	1045	+// for (int j = 0; j < 2; j++)
	1046	+// {
	1047	+// for (int i = 0; i < initString.length; i++)
	1048	+// {
	1049	+// doc.insertString(doc.getLength(), initString[i],
	1050	+// doc.getStyle(initStyles[i]));
	1051	+// }
	1052	+// }
	1053	+// } catch (BadLocationException ble)
	1054	+// {
	1055	+// System.err.println("Couldn't insert initial text into text pane.");
	1056	+// }
647	1057
648		- JTextPane textPane = new JTextPane();
649		- textPane.setEditable(true);
650		- /StyledDocument/ doc = textPane.getStyledDocument();
651		- addStylesToDocument(doc);
652		-
653		- try
654		- {
655		- for (int j = 0; j < 2; j++)
656		- {
657		- for (int i = 0; i < initString.length; i++)
658		- {
659		- doc.insertString(doc.getLength(), initString[i],
660		- doc.getStyle(initStyles[i]));
661		- }
662		- }
663		- } catch (BadLocationException ble)
664		- {
665		- System.err.println("Couldn't insert initial text into text pane.");
666		- }
667		-
668		- return new JTextArea(); // textPane;
	1058	+ return new JTextPane(); // textPane;
669	1059	}
670	1060
671	1061	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -718,7 +1108,7 @@
718	1108	protected static ImageIcon createImageIcon(String path,
719	1109	String description)
720	1110	{
721		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1111	+ java.net.URL imgURL = Grafreed.class.getResource(path);
722	1112	if (imgURL != null)
723	1113	{
724	1114	return new ImageIcon(imgURL, description);
..	..	@@ -741,6 +1131,7 @@
741	1131	{
742	1132	SetupMaterial(materialPanel);
743	1133	}
	1134	+
744	1135	//SetupName();
745	1136	//SetupViews();
746	1137	}
..	..	@@ -750,6 +1141,7 @@
750	1141	// NumberSlider vDivsField;
751	1142	// JCheckBox endcaps;
752	1143	JCheckBox liveCB;
	1144	+ JCheckBox selectableCB;
753	1145	JCheckBox hideCB;
754	1146	JCheckBox link2masterCB;
755	1147	JCheckBox markCB;
..	..	@@ -757,7 +1149,12 @@
757	1149	JCheckBox speedupCB;
758	1150	JCheckBox rewindCB;
759	1151	JCheckBox flipVCB;
	1152	+
	1153	+ cCheckBox toggleTextureCB;
	1154	+ cCheckBox toggleSwitchCB;
	1155	+
760	1156	JComboBox texresMenu;
	1157	+
761	1158	JButton resetButton;
762	1159	JButton stepButton;
763	1160	JButton stepAllButton;
..	..	@@ -765,115 +1162,87 @@
765	1162	JButton slowerButton;
766	1163	JButton fasterButton;
767	1164	JButton remarkButton;
	1165	+
	1166	+ cGridBag editPanel;
	1167	+ cGridBag editCommandsPanel;
	1168	+
	1169	+ cGridBag namePanel;
	1170	+ cGridBag setupPanel;
	1171	+ cGridBag setupPanel2;
	1172	+ cGridBag objectCommandsPanel;
	1173	+ cGridBag pushPanel;
	1174	+ cGridBag fillPanel;
768	1175
769		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1176	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
770	1177	{
771	1178	JCheckBox cb;
772	1179
773		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
774		- oe.aConstraints.gridwidth = 1; // 3;
775		-// oe.aConstraints.weightx = 1;
776		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
777		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1180	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
778	1181	cb.addItemListener(this);
779		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
780		- oe.aConstraints.gridwidth = 1;
781		- oe.aConstraints.gridx += 1;
782	1182
783	1183	return cb;
784	1184	}
785	1185
786		- cButton AddButton(ObjEditor oe, String label)
	1186	+ cButton AddButton(cGridBag panel, String label)
787	1187	{
788	1188	cButton cb;
789	1189
790		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
791		- oe.aConstraints.gridwidth = 1;
792		-// oe.aConstraints.weightx = 1;
793		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
794		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1190	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
795	1191	cb.addActionListener(this);
796		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
797		- oe.aConstraints.gridwidth = 1;
798		- oe.aConstraints.gridx += 1;
799	1192
800	1193	return cb;
801	1194	}
802	1195
803		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1196	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
804	1197	{
805	1198	JComboBox combo;
806	1199
807		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
808		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
809		- oe.aConstraints.gridx += 1;
	1200	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
810	1201	combo.addActionListener(this);
811	1202
812	1203	return combo;
813	1204	}
814	1205
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1206	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
816	1207	{
817		- NumberSlider combo;
	1208	+ cGridBag control = new cGridBag();
	1209	+
	1210	+ cNumberSlider combo;
818	1211
819	1212	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1213	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 1;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	1214	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1215	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1216	combo.setFloat(current);
833		-
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1217	+
	1218	+ panel.add(control);
	1219	+
	1220	+ return control;
839	1221	}
840	1222
841		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1223	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
842	1224	{
843		- NumberSlider combo;
	1225	+ cGridBag control = new cGridBag();
	1226	+
	1227	+ cNumberSlider combo;
844	1228
845	1229	JLabel jlabel = new JLabel(label);
846		-
847		- aConstraints.fill = GridBagConstraints.VERTICAL;
848	1230	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
849		- aConstraints.gridwidth = 2;
850		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
851		- aConstraints.gridx += 1;
852		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
853		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
854		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
855		- aConstraints.gridx += 1;
856		- aConstraints.gridwidth = 1;
857		-
	1231	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1232	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1233	combo.setInteger(current);
859	1234
860		- combo.label = jlabel;
861		-
862		- combo.addChangeListener(this);
863		-
864		- return combo;
	1235	+ panel.add(control);
	1236	+
	1237	+ return control;
865	1238	}
866	1239
867		- JTextArea AddText(JPanel ctrlPanel, String name)
	1240	+ JTextArea AddText(cGridBag ctrlPanel, String name)
868	1241	{
869	1242	JTextArea text;
870	1243
871		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
872		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1244	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874	1245	text.addCaretListener(this);
875		- aConstraints.gridx += 1;
876		- aConstraints.gridwidth = 1;
877	1246
878	1247	return text;
879	1248	}
..	..	@@ -903,9 +1272,16 @@
903	1272	objEditor.ctrlPanel.remove(j);
904	1273	}
905	1274
	1275	+ void Remove(cNumberSlider j)
	1276	+ {
	1277	+ j.removeChangeListener(this);
	1278	+ //objEditor.ctrlPanel.remove(j.label);
	1279	+ objEditor.ctrlPanel.remove(j);
	1280	+ }
	1281	+
906	1282	/*
907	1283	*/
908		- void Return() // ObjEditor oe)
	1284	+ void Return0() // ObjEditor oe)
909	1285	{
910	1286	aConstraints.gridy += 1;
911	1287	aConstraints.gridx = 0;
..	..	@@ -960,37 +1336,92 @@
960	1336
961	1337	void SetupUI2(ObjEditor oe)
962	1338	{
963		-// oe.aConstraints.weightx = 0;
964		-// oe.aConstraints.weighty = 0;
965		-// oe.aConstraints.gridx = 0;
966		-// oe.aConstraints.gridy = 0;
967		- SetupName(oe);
	1339	+ //SetupName(oe);
968	1340
969		- if (!GroupEditor.allparams)
	1341	+ namePanel = new cGridBag();
	1342	+
	1343	+ //if (copy.pinned)
	1344	+ {
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1346	+ pinButton.setSelected(copy.pinned);
	1347	+ cGridBag t = new cGridBag();
	1348	+ t.preferredWidth = 2;
	1349	+ t.add(pinButton);
	1350	+ namePanel.add(t);
	1351	+
	1352	+ pinButton.addItemListener(this);
	1353	+ }
	1354	+
	1355	+ nameField = AddText(namePanel, copy.GetName());
	1356	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1357	+ oe.ctrlPanel.add(namePanel);
	1358	+
	1359	+ oe.ctrlPanel.Return();
	1360	+
	1361	+ if (!allparams)
970	1362	return;
971	1363
972		- liveCB = AddCheckBox(oe, "Live", copy.live);
973		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1364	+ setupPanel = new cGridBag().setVertical(false);
	1365	+
	1366	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1367	+ liveCB.setToolTipText("Animate object");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
	1370	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1371	+ selectableCB.setToolTipText("Make object selectable");
975	1372	// Return();
976		- markCB = AddCheckBox(oe, "Mark", copy.marked);
977		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
978		- randomCB = AddCheckBox(oe, "Rand", copy.random);
979		- Return();
980		- resetButton = AddButton(oe, "Reset");
981		- stepButton = AddButton(oe, "Step");
	1373	+
	1374	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1375	+ hideCB.setToolTipText("Hide object");
	1376	+
	1377	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1378	+
	1379	+ setupPanel2 = new cGridBag().setVertical(false);
	1380	+
	1381	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1382	+ rewindCB.setToolTipText("Rewind animation");
	1383	+
	1384	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1385	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1386	+
	1387	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1388	+ link2masterCB.setToolTipText("Attach to support");
	1389	+
	1390	+ if (Globals.ADVANCED)
	1391	+ {
	1392	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1393	+ speedupCB.setToolTipText("Option motion capture");
	1394	+ }
	1395	+
	1396	+ oe.ctrlPanel.add(setupPanel);
	1397	+ oe.ctrlPanel.Return();
	1398	+ oe.ctrlPanel.add(setupPanel2);
	1399	+ oe.ctrlPanel.Return();
	1400	+
	1401	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1402	+
	1403	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1404	+ resetButton.setToolTipText("Jump to frame zero");
	1405	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1406	+ stepButton.setToolTipText("Step one frame");
982	1407	// resetAllButton = AddButton(oe, "Reset All");
983	1408	// stepAllButton = AddButton(oe, "Step All");
984		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
985	1409	// Return();
986		- slowerButton = AddButton(oe, "Slow");
987		- fasterButton = AddButton(oe, "Fast");
988		- remarkButton = AddButton(oe, "Rem");
	1410	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1411	+ slowerButton.setToolTipText("Decrease animation speed");
	1412	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1413	+ fasterButton.setToolTipText("Increase animation speed");
	1414	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1415	+ remarkButton.setToolTipText("Set the current transform as the target");
989	1416
990		- Return();
	1417	+ oe.ctrlPanel.add(objectCommandsPanel);
	1418	+ oe.ctrlPanel.Return();
991	1419
992		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993		- Return();
	1420	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1421	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1422	+ //Return();
	1423	+
	1424	+ oe.ctrlPanel.Return();
994	1425
995	1426	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
996	1427	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1085,7 +1516,7 @@
1085	1516	oe.aConstraints.gridwidth = 1;
1086	1517	/**/
1087	1518	nameField = AddText(oe.ctrlPanel, copy.GetName());
1088		- Return();
	1519	+ oe.ctrlPanel.Return();
1089	1520
1090	1521	//ctrlPanel.add(textureButton = new Button("Texture..."));
1091	1522	//textureButton.setEnabled(false);
..	..	@@ -1143,22 +1574,9 @@
1143	1574
1144	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1145	1576	{
1146		- System.out.println("CREATE CAMERAS");
1147		- cams = new cTemplate();
1148		- cams.name = "Cameras";
1149		- copy.insertElementAt(cams, 0);
1150		- //cams.parent = copy;
1151		-
1152		- cam = new Camera(); // LA.newVector(3, 2, 1));
1153		- cams.addChild(cam);
1154		- cam = new Camera(1);
1155		- cams.addChild(cam);
1156		- cam = new Camera(2);
1157		- cams.addChild(cam);
1158		- cam = new Camera(3);
1159		- cams.addChild(cam);
1160		- cam = new Camera(4); // Light
1161		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1162	1580	} else
1163	1581	{
1164	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1187,9 +1605,13 @@
1187	1605	//JPanel worldPanel =
1188	1606	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1189	1607	//worldPanel.setName("World");
1190		- centralPanel = new JPanel(new BorderLayout());
1191		- timelinePanel = new JPanel(new BorderLayout());
1192		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1608	+ centralPanel = new cGridBag();
	1609	+ centralPanel.preferredWidth = 20;
	1610	+
	1611	+ if (Globals.ADVANCED)
	1612	+ {
	1613	+ timelinePanel = new JPanel(new BorderLayout());
	1614	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1193	1615
1194	1616	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195	1617	cameraPanel.setContinuousLayout(true);
..	..	@@ -1198,7 +1620,10 @@
1198	1620	// cameraPanel.setDividerSize(9);
1199	1621	cameraPanel.setResizeWeight(1.0);
1200	1622
	1623	+ }
	1624	+
1201	1625	centralPanel.add(cameraView);
	1626	+ centralPanel.setFocusable(true);
1202	1627	//frame.setJMenuBar(timelineMenubar);
1203	1628	//centralPanel.add(timelinePanel);
1204	1629
..	..	@@ -1217,13 +1642,57 @@
1217	1642	//frontView.object = copy;
1218	1643	//sideView.object = copy;
1219	1644
1220		- XYZPanel = new JPanel();
1221		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1645	+ transformPanel = new cGridBag().setVertical(true);
	1646	+
	1647	+ cGridBag resetTransformPanel = new cGridBag();
	1648	+
	1649	+ resetTransformPanel.preferredHeight = 2;
	1650	+
	1651	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1652	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1653	+ resetTransform.addMouseListener(new MouseAdapter()
	1654	+ {
	1655	+ public void mouseClicked(MouseEvent e)
	1656	+ {
	1657	+ ResetTransform();
	1658	+ }
	1659	+ });
	1660	+ resetTransformPanel.add(resetTransform);
	1661	+
	1662	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1663	+ resetTransform.setToolTipText("Reset Translation only");
	1664	+ resetTransform.addMouseListener(new MouseAdapter()
	1665	+ {
	1666	+ public void mouseClicked(MouseEvent e)
	1667	+ {
	1668	+ ResetTransform(1);
	1669	+ }
	1670	+ });
	1671	+ resetTransformPanel.add(resetTransform);
	1672	+
	1673	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1674	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1675	+ resetTransform.addMouseListener(new MouseAdapter()
	1676	+ {
	1677	+ public void mouseClicked(MouseEvent e)
	1678	+ {
	1679	+ ResetTransform(2);
	1680	+ }
	1681	+ });
	1682	+ resetTransformPanel.add(resetTransform);
	1683	+
	1684	+ XYZPanel = new cGridBag().setVertical(true);
	1685	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1222	1686
1223		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1224		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1225		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1687	+ XYZPanel.preferredWidth = 5;
	1688	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1689	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1690	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1691	+ //XYZPanel.setName("XYZ");
1226	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1227	1696	/*
1228	1697	gridPanel = new JPanel(); //new BorderLayout());
1229	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1231,12 +1700,12 @@
1231	1700	gridPanel.add(cameraView);
1232	1701	gridPanel.add(XYZPanel);
1233	1702	*/
1234		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1235		- gridPanel.setContinuousLayout(true);
1236		- gridPanel.setOneTouchExpandable(true);
1237		- gridPanel.setDividerLocation(1.0);
1238		- gridPanel.setDividerSize(9);
1239		- gridPanel.setResizeWeight(0.85);
	1703	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1704	+// gridPanel.setContinuousLayout(true);
	1705	+// gridPanel.setOneTouchExpandable(true);
	1706	+// gridPanel.setDividerLocation(1.0);
	1707	+// gridPanel.setDividerSize(9);
	1708	+// gridPanel.setResizeWeight(0.85);
1240	1709
1241	1710	// aConstraints.weighty = 0;
1242	1711	//System.out.println("THIS = " + this);
..	..	@@ -1259,13 +1728,34 @@
1259	1728
1260	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1261	1730	//tmp.setName("Edit");
1262		- objectPanel.add(materialPanel);
1263		- JPanel north = new JPanel(new BorderLayout());
1264		- north.setName("Edit");
1265		- north.add(ctrlPanel, BorderLayout.NORTH);
1266		- objectPanel.add(north);
1267		- objectPanel.add(infoPanel);
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
	1735	+ objectPanel.add(toolboxPanel);
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1268	1738
	1739	+ objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
	1743	+// JPanel north = new JPanel(new BorderLayout());
	1744	+// north.setName("Edit");
	1745	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1746	+// objectPanel.add(north);
	1747	+ objectPanel.add(editPanel);
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1749	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1750	+
	1751	+ objectPanel.add(transformPanel);
	1752	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1754	+
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1269	1759	/*
1270	1760	aConstraints.gridx = 0;
1271	1761	aConstraints.gridwidth = 1;
..	..	@@ -1273,7 +1763,7 @@
1273	1763	aConstraints.gridy += 1;
1274	1764	aConstraints.gridwidth = 1;
1275	1765	mainPanel.add(objectPanel, aConstraints);
1276		- */
	1766	+ */
1277	1767
1278	1768	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1279	1769	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1284,19 +1774,120 @@
1284	1774	scrollpane.setWheelScrollingEnabled(true);
1285	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1286	1776
1287		- /JTabbedPane/ scenePanel = new JTabbedPane();
1288		- scenePanel.add(scrollpane);
	1777	+ /JTabbedPane/ scenePanel = new cGridBag();
	1778	+ scenePanel.preferredWidth = 6;
	1779	+
	1780	+ JTabbedPane tabbedPane = new JTabbedPane();
	1781	+ tabbedPane.add(scrollpane);
1289	1782
1290		- scenePanel.add(FSPane = new cFileSystemPane(this));
1291		-
1292		- optionsPanel = new JPanel(new GridBagLayout());
	1783	+ optionsPanel = new cGridBag().setVertical(false);
1293	1784
1294	1785	optionsPanel.setName("Options");
1295	1786
1296		- AddOptions(optionsPanel, aConstraints);
	1787	+ AddOptions(optionsPanel); //, aConstraints);
1297	1788
1298		- scenePanel.add(optionsPanel);
	1789	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1299	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
	1793	+ scenePanel.add(tabbedPane);
	1794	+
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
	1797	+
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ tabbedPane.add(infoPanel);
	1888	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1889	+ tabbedPane.setToolTipTextAt(4, "Information");
	1890	+ }
1300	1891
1301	1892	/*
1302	1893	cTree jTree = new cTree(null);
..	..	@@ -1318,18 +1909,19 @@
1318	1909	jtp.add(tree);
1319	1910	*/
1320	1911
1321		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1322		- bigPanel.setContinuousLayout(true);
1323		- bigPanel.setOneTouchExpandable(true);
1324		- bigPanel.setDividerLocation(0.8);
1325		- bigPanel.setDividerSize(15);
1326		- bigPanel.setResizeWeight(0.15);
1327		- bigPanel.setName("Scene");
	1912	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1913	+// bigPanel.setContinuousLayout(true);
	1914	+// bigPanel.setOneTouchExpandable(true);
	1915	+// bigPanel.setDividerLocation(0.8);
	1916	+// bigPanel.setDividerSize(15);
	1917	+// bigPanel.setResizeWeight(0.15);
	1918	+// bigPanel.setName("Scene");
1328	1919
1329	1920	//bigPanel.setLayout(new BorderLayout());
1330	1921	//bigPanel.setSize(new Dimension(10,10));
1331	1922	//bigPanel.add(ctrlPanel);
1332	1923	//bigPanel.add(gridPanel);
	1924	+ /**
1333	1925	bigThree = new JPanel();
1334	1926	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1335	1927	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1353,7 +1945,13 @@
1353	1945	// aConstraints.gridheight = 3;
1354	1946	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1355	1947	bigThree.add(XYZPanel, aWindowConstraints);
	1948	+ /**/
1356	1949
	1950	+ bigThree = new cGridBag();
	1951	+ bigThree.addComponent(scenePanel);
	1952	+ bigThree.addComponent(centralPanel);
	1953	+ //bigThree.addComponent(XYZPanel);
	1954	+
1357	1955	// // SIDE EFFECT!!!
1358	1956	// aConstraints.gridx = 0;
1359	1957	// aConstraints.gridy = 0;
..	..	@@ -1361,16 +1959,33 @@
1361	1959	// aConstraints.gridheight = 1;
1362	1960
1363	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1364		- framePanel.setContinuousLayout(true);
1365		- framePanel.setOneTouchExpandable(true);
1366		- framePanel.setDividerLocation(0.8);
	1962	+
	1963	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1964	+ new java.beans.PropertyChangeListener()
	1965	+ {
	1966	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1967	+ {
	1968	+ if ((Integer)pce.getOldValue() == 1)
	1969	+ {
	1970	+ if (radio.layout != expandedLayout)
	1971	+ {
	1972	+ radio.layout = expandedLayout;
	1973	+ radio.layout.doClick();
	1974	+ }
	1975	+ }
	1976	+ }
	1977	+ });
	1978	+
	1979	+ framePanel.setContinuousLayout(false);
	1980	+ framePanel.setOneTouchExpandable(false);
	1981	+ //.setDividerLocation(0.8);
1367	1982	//framePanel.setDividerSize(15);
1368	1983	//framePanel.setResizeWeight(0.15);
1369	1984	framePanel.setName("Frame");
1370	1985
1371	1986	frame.getContentPane().setLayout(new BorderLayout());
1372	1987	/**/
1373		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1374	1989	//worldPane.add(bigPanel);
1375	1990	//worldPane.add(worldPanel);
1376	1991	/**/
..	..	@@ -1380,15 +1995,19 @@
1380	1995
1381	1996	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1382	1997
1383		- frame.setSize(1024, 768);
1384		- frame.show();
	1998	+ frame.setSize(1280, 860);
	1999	+
	2000	+ cameraView.requestFocusInWindow();
	2001	+
	2002	+// gridPanel.setDividerLocation(1.0);
	2003	+
	2004	+ frame.validate();
1385	2005
1386		- gridPanel.setDividerLocation(1.0);
	2006	+ frame.setVisible(true);
1387	2007
1388	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1389	2009	frame.addWindowListener(new WindowAdapter()
1390	2010	{
1391		-
1392	2011	public void windowClosing(WindowEvent e)
1393	2012	{
1394	2013	Close();
..	..	@@ -1396,7 +2015,7 @@
1396	2015	});
1397	2016	}
1398	2017
1399		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	2018	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1400	2019	{
1401	2020	}
1402	2021
..	..	@@ -1411,260 +2030,651 @@
1411	2030	ctrlPanel.removeAll();
1412	2031	}
1413	2032
1414		- void SetupMaterial(JPanel ctrlPanel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1415	2034	{
1416		- aConstraints.weighty = 0;
1417		- //aConstraints.weightx = 1;
1418		- /*
	2035	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2036	+
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2038	+ skin.setToolTipText("Skin");
	2039	+ skin.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ // Skin
	2047	+ colorField.setFloat(material.color);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
	2057	+ subsurfaceField.setFloat(material.subsurface);
	2058	+ selfshadowField.setFloat(material.diffuseness);
	2059	+ diffusenessField.setFloat(material.factor);
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ shadowbiasField.setFloat(material.shadowbias);
	2062	+ diffuseField.setFloat(material.diffuse);
	2063	+ specularField.setFloat(material.specular);
	2064	+
	2065	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2066	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2067	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2068	+
	2069	+ materialtouched = true;
	2070	+ applySelf();
	2071	+ }
	2072	+ });
	2073	+ presetpanel.add(skin);
	2074	+
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2076	+ lambert.setToolTipText("Diffuse");
	2077	+ lambert.addMouseListener(new MouseAdapter()
	2078	+ {
	2079	+ public void mouseClicked(MouseEvent e)
	2080	+ {
	2081	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2082	+ cMaterial material = object.material;
	2083	+
	2084	+ diffusenessField.setFloat(material.factor);
	2085	+ selfshadowField.setFloat(material.diffuseness);
	2086	+
	2087	+ materialtouched = true;
	2088	+ applySelf();
	2089	+ }
	2090	+ });
	2091	+ presetpanel.add(lambert);
	2092	+
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2094	+ diffuse2.setToolTipText("Diffuse2");
	2095	+ diffuse2.addMouseListener(new MouseAdapter()
	2096	+ {
	2097	+ public void mouseClicked(MouseEvent e)
	2098	+ {
	2099	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2100	+ cMaterial material = object.material;
	2101	+
	2102	+ diffusenessField.setFloat(material.factor);
	2103	+ selfshadowField.setFloat(material.diffuseness);
	2104	+
	2105	+ materialtouched = true;
	2106	+ applySelf();
	2107	+ }
	2108	+ });
	2109	+ presetpanel.add(diffuse2);
	2110	+
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2112	+ diffusemoon.setToolTipText("Moon");
	2113	+ diffusemoon.addMouseListener(new MouseAdapter()
	2114	+ {
	2115	+ public void mouseClicked(MouseEvent e)
	2116	+ {
	2117	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2118	+ cMaterial material = object.material;
	2119	+
	2120	+ diffusenessField.setFloat(material.factor);
	2121	+ selfshadowField.setFloat(material.diffuseness);
	2122	+
	2123	+ materialtouched = true;
	2124	+ applySelf();
	2125	+ }
	2126	+ });
	2127	+ presetpanel.add(diffusemoon);
	2128	+
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2130	+ diffusemoon2.setToolTipText("Moon2");
	2131	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2132	+ {
	2133	+ public void mouseClicked(MouseEvent e)
	2134	+ {
	2135	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2136	+ cMaterial material = object.material;
	2137	+
	2138	+ diffusenessField.setFloat(material.factor);
	2139	+ selfshadowField.setFloat(material.diffuseness);
	2140	+
	2141	+ materialtouched = true;
	2142	+ applySelf();
	2143	+ }
	2144	+ });
	2145	+ presetpanel.add(diffusemoon2);
	2146	+
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2148	+ diffusemoon3.setToolTipText("Moon3");
	2149	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2150	+ {
	2151	+ public void mouseClicked(MouseEvent e)
	2152	+ {
	2153	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2154	+ cMaterial material = object.material;
	2155	+
	2156	+ diffusenessField.setFloat(material.factor);
	2157	+ selfshadowField.setFloat(material.diffuseness);
	2158	+
	2159	+ materialtouched = true;
	2160	+ applySelf();
	2161	+ }
	2162	+ });
	2163	+ presetpanel.add(diffusemoon3);
	2164	+
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2166	+ diffusesheen.setToolTipText("Sheen");
	2167	+ diffusesheen.addMouseListener(new MouseAdapter()
	2168	+ {
	2169	+ public void mouseClicked(MouseEvent e)
	2170	+ {
	2171	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2172	+ cMaterial material = object.material;
	2173	+
	2174	+ sheenField.setFloat(material.sheen);
	2175	+
	2176	+ materialtouched = true;
	2177	+ applySelf();
	2178	+ }
	2179	+ });
	2180	+ presetpanel.add(diffusesheen);
	2181	+
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2183	+ rough.setToolTipText("Rough metal");
	2184	+ rough.addMouseListener(new MouseAdapter()
	2185	+ {
	2186	+ public void mouseClicked(MouseEvent e)
	2187	+ {
	2188	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2189	+ cMaterial material = object.material;
	2190	+
	2191	+ shininessField.setFloat(material.shininess);
	2192	+ velvetField.setFloat(material.velvet);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(rough);
	2199	+
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2201	+ rough2.setToolTipText("Medium metal");
	2202	+ rough2.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2207	+ cMaterial material = object.material;
	2208	+
	2209	+ shininessField.setFloat(material.shininess);
	2210	+ lightareaField.setFloat(material.lightarea);
	2211	+
	2212	+ materialtouched = true;
	2213	+ applySelf();
	2214	+ }
	2215	+ });
	2216	+ presetpanel.add(rough2);
	2217	+
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2219	+ shini0.setToolTipText("Shiny");
	2220	+ shini0.addMouseListener(new MouseAdapter()
	2221	+ {
	2222	+ public void mouseClicked(MouseEvent e)
	2223	+ {
	2224	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2225	+ cMaterial material = object.material;
	2226	+
	2227	+ shininessField.setFloat(material.shininess);
	2228	+ lightareaField.setFloat(material.lightarea);
	2229	+
	2230	+ materialtouched = true;
	2231	+ applySelf();
	2232	+ }
	2233	+ });
	2234	+ presetpanel.add(shini0);
	2235	+
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2237	+ shini1.setToolTipText("Shiny2");
	2238	+ shini1.addMouseListener(new MouseAdapter()
	2239	+ {
	2240	+ public void mouseClicked(MouseEvent e)
	2241	+ {
	2242	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2243	+ cMaterial material = object.material;
	2244	+
	2245	+ shininessField.setFloat(material.shininess);
	2246	+ lightareaField.setFloat(material.lightarea);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(shini1);
	2253	+
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2255	+ shini2.setToolTipText("Shiny3");
	2256	+ shini2.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2261	+ cMaterial material = object.material;
	2262	+
	2263	+ shininessField.setFloat(material.shininess);
	2264	+ lightareaField.setFloat(material.lightarea);
	2265	+
	2266	+ materialtouched = true;
	2267	+ applySelf();
	2268	+ }
	2269	+ });
	2270	+ presetpanel.add(shini2);
	2271	+
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2273	+ aniso.setToolTipText("AnisoU");
	2274	+ aniso.addMouseListener(new MouseAdapter()
	2275	+ {
	2276	+ public void mouseClicked(MouseEvent e)
	2277	+ {
	2278	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2279	+ cMaterial material = object.material;
	2280	+
	2281	+ anisoField.setFloat(material.aniso);
	2282	+ anisoVField.setFloat(material.anisoV);
	2283	+
	2284	+ materialtouched = true;
	2285	+ applySelf();
	2286	+ }
	2287	+ });
	2288	+ presetpanel.add(aniso);
	2289	+
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2291	+ aniso2.setToolTipText("AnisoV");
	2292	+ aniso2.addMouseListener(new MouseAdapter()
	2293	+ {
	2294	+ public void mouseClicked(MouseEvent e)
	2295	+ {
	2296	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2297	+ cMaterial material = object.material;
	2298	+
	2299	+ anisoField.setFloat(material.aniso);
	2300	+ anisoVField.setFloat(material.anisoV);
	2301	+
	2302	+ materialtouched = true;
	2303	+ applySelf();
	2304	+ }
	2305	+ });
	2306	+ presetpanel.add(aniso2);
	2307	+
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2309	+ aniso3.setToolTipText("AnisoUV");
	2310	+ aniso3.addMouseListener(new MouseAdapter()
	2311	+ {
	2312	+ public void mouseClicked(MouseEvent e)
	2313	+ {
	2314	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2315	+ cMaterial material = object.material;
	2316	+
	2317	+ anisoField.setFloat(material.aniso);
	2318	+ anisoVField.setFloat(material.anisoV);
	2319	+
	2320	+ materialtouched = true;
	2321	+ applySelf();
	2322	+ }
	2323	+ });
	2324	+ presetpanel.add(aniso3);
	2325	+
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2327	+ velvet0.setToolTipText("Velvet");
	2328	+ velvet0.addMouseListener(new MouseAdapter()
	2329	+ {
	2330	+ public void mouseClicked(MouseEvent e)
	2331	+ {
	2332	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2333	+ cMaterial material = object.material;
	2334	+
	2335	+ diffusenessField.setFloat(material.factor);
	2336	+ selfshadowField.setFloat(material.diffuseness);
	2337	+ sheenField.setFloat(material.sheen);
	2338	+ shininessField.setFloat(material.shininess);
	2339	+ velvetField.setFloat(material.velvet);
	2340	+ shiftField.setFloat(material.shift);
	2341	+
	2342	+ materialtouched = true;
	2343	+ applySelf();
	2344	+ }
	2345	+ });
	2346	+ presetpanel.add(velvet0);
	2347	+
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2349	+ bump0.setToolTipText("Bump texture");
	2350	+ bump0.addMouseListener(new MouseAdapter()
	2351	+ {
	2352	+ public void mouseClicked(MouseEvent e)
	2353	+ {
	2354	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2355	+ cMaterial material = object.material;
	2356	+
	2357	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2358	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2359	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2360	+
	2361	+ materialtouched = true;
	2362	+ applySelf();
	2363	+ }
	2364	+ });
	2365	+ presetpanel.add(bump0);
	2366	+
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2368	+ borderShader.setToolTipText("Border fade");
	2369	+ borderShader.addMouseListener(new MouseAdapter()
	2370	+ {
	2371	+ public void mouseClicked(MouseEvent e)
	2372	+ {
	2373	+ borderfadeField.setFloat(0.5);
	2374	+ opacityField.setFloat(0.75);
	2375	+
	2376	+ materialtouched = true;
	2377	+ applySelf();
	2378	+ }
	2379	+ });
	2380	+ presetpanel.add(borderShader);
	2381	+
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2383	+ halo.setToolTipText("Halo");
	2384	+ halo.addMouseListener(new MouseAdapter()
	2385	+ {
	2386	+ public void mouseClicked(MouseEvent e)
	2387	+ {
	2388	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2389	+ cMaterial material = object.material;
	2390	+
	2391	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2392	+
	2393	+ materialtouched = true;
	2394	+ applySelf();
	2395	+ }
	2396	+ });
	2397	+ presetpanel.add(halo);
	2398	+
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2400	+ candle.setToolTipText("Candle");
	2401	+ candle.addMouseListener(new MouseAdapter()
	2402	+ {
	2403	+ public void mouseClicked(MouseEvent e)
	2404	+ {
	2405	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2406	+ cMaterial material = object.material;
	2407	+
	2408	+ subsurfaceField.setFloat(material.subsurface);
	2409	+ shadowbiasField.setFloat(material.shadowbias);
	2410	+ ambientField.setFloat(material.ambient);
	2411	+ specularField.setFloat(material.specular);
	2412	+ lightareaField.setFloat(material.lightarea);
	2413	+ shininessField.setFloat(material.shininess);
	2414	+
	2415	+ materialtouched = true;
	2416	+ applySelf();
	2417	+ }
	2418	+ });
	2419	+ presetpanel.add(candle);
	2420	+
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2422	+ shadowShader.setToolTipText("Shadow");
	2423	+ shadowShader.addMouseListener(new MouseAdapter()
	2424	+ {
	2425	+ public void mouseClicked(MouseEvent e)
	2426	+ {
	2427	+ diffuseField.setFloat(0.001);
	2428	+ ambientField.setFloat(0.001);
	2429	+ cameraField.setFloat(0.001);
	2430	+ specularField.setFloat(0.001);
	2431	+ fakedepthField.setFloat(0.001);
	2432	+ opacityField.setFloat(0.6);
	2433	+
	2434	+ materialtouched = true;
	2435	+ applySelf();
	2436	+ }
	2437	+ });
	2438	+ presetpanel.add(shadowShader);
	2439	+
	2440	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2441	+ para0.setToolTipText("No parallax");
	2442	+ para0.addMouseListener(new MouseAdapter()
	2443	+ {
	2444	+ public void mouseClicked(MouseEvent e)
	2445	+ {
	2446	+ parallaxField.setFloat(0.25);
	2447	+
	2448	+ materialtouched = true;
	2449	+ applySelf();
	2450	+ }
	2451	+ });
	2452	+ presetpanel.add(para0);
	2453	+
	2454	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2455	+ para1.setToolTipText("With parallax");
	2456	+ para1.addMouseListener(new MouseAdapter()
	2457	+ {
	2458	+ public void mouseClicked(MouseEvent e)
	2459	+ {
	2460	+ parallaxField.setFloat(0.255);
	2461	+
	2462	+ materialtouched = true;
	2463	+ applySelf();
	2464	+ }
	2465	+ });
	2466	+ presetpanel.add(para1);
	2467	+
	2468	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2469	+ para2.setToolTipText("Reset parallax");
	2470	+ para2.addMouseListener(new MouseAdapter()
	2471	+ {
	2472	+ public void mouseClicked(MouseEvent e)
	2473	+ {
	2474	+ parallaxField.setFloat(0.265);
	2475	+
	2476	+ materialtouched = true;
	2477	+ applySelf();
	2478	+ }
	2479	+ });
	2480	+ presetpanel.add(para2);
	2481	+
	2482	+ cGridBag panel = new cGridBag().setVertical(true);
	2483	+
	2484	+ presetpanel.preferredWidth = 1;
	2485	+
	2486	+ materialpanel.add(presetpanel);
	2487	+ materialpanel.add(panel);
	2488	+
	2489	+ panel.preferredWidth = 8;
	2490	+
	2491	+ /*
1419	2492	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1420	2493	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423		- */
	2494	+ */
1424	2495
1425		- aConstraints.gridwidth = 1;
1426		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1427		- aConstraints.gridx += 1;
1428		- aConstraints.weighty = 0;
1429		- aConstraints.gridwidth = 1;
	2496	+ cGridBag editBar = new cGridBag().setVertical(false);
	2497	+
	2498	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
	2499	+ createMaterialButton.setToolTipText("Create material");
1430	2500
1431	2501	/*
1432	2502	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1433		- aConstraints.gridx += 1;
1434		- aConstraints.weighty = 0;
1435		- aConstraints.gridwidth = 1;
1436	2503	*/
1437	2504
1438		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1439		- aConstraints.gridx += 1;
	2505	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
	2506	+ clearMaterialButton.setToolTipText("Clear material");
	2507	+
	2508	+ if (Globals.ADVANCED)
	2509	+ {
	2510	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
	2511	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2512	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2513	+ }
1440	2514
1441		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1442		-
1443		- aConstraints.gridx += 1;
1444		-
1445		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1446		-
1447		- aConstraints.gridx += 1;
1448		-
1449		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1450		-
1451		- aConstraints.gridx = 0;
1452		- aConstraints.gridy += 1;
1453		- aConstraints.weighty = 0;
1454		- aConstraints.gridwidth = 1;
	2515	+ editBar.preferredHeight = 15;
	2516	+
	2517	+ panel.add(editBar);
	2518	+
1455	2519	/**/
1456	2520	//aConstraints.weighty = 0;
1457	2521	////aConstraints.weightx = 1;
1458	2522	//aConstraints.weighty = 1;
1459	2523	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1460	2524	//aConstraints.gridx += 1;
1461		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1462		- aConstraints.weighty = 0;
1463		- aConstraints.gridx = 0;
1464		- aConstraints.gridy += 1;
1465		- aConstraints.gridwidth = 1;
	2525	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1466	2526
1467		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1468		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1469		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1470		- aConstraints.gridx += 1;
1471		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1472		- //aConstraints.weightx = 0;
1473		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1474		- aConstraints.gridx = 0;
1475		- aConstraints.gridy += 1;
1476		- aConstraints.gridwidth = 1;
	2527	+ cGridBag colorSection = new cGridBag().setVertical(true);
1477	2528
1478		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1479		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1480		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1481		- aConstraints.gridx += 1;
1482		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1483		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1484		- aConstraints.gridx = 0;
1485		- aConstraints.gridy += 1;
1486		- aConstraints.gridwidth = 1;
	2529	+ cGridBag huepanel = new cGridBag();
	2530	+ cGridBag huelabel = new cGridBag();
	2531	+ cLabel hue = GetLabel("icons/hue.png", false);
	2532	+ hue.fit = true;
	2533	+
	2534	+ hue.addMouseListener(new MouseAdapter()
	2535	+ {
	2536	+ public void mousePressed(MouseEvent e)
	2537	+ {
	2538	+ int x = e.getX();
	2539	+
	2540	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2541	+ }
	2542	+ });
	2543	+
	2544	+ huelabel.add(hue);
	2545	+ huelabel.preferredWidth = 20;
	2546	+ huepanel.add(new cGridBag()); // Label
	2547	+ huepanel.add(huelabel); // Field/slider
	2548	+
	2549	+ huepanel.preferredHeight = 7;
1487	2550
1488		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1489		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1491		- aConstraints.gridx += 1;
1492		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1493		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1494		- aConstraints.gridx = 0;
1495		- aConstraints.gridy += 1;
1496		- aConstraints.gridwidth = 1;
	2551	+ colorSection.add(huepanel);
	2552	+
	2553	+ cGridBag color = new cGridBag();
	2554	+
	2555	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2556	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2557	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1497	2558
1498		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1499		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1501		- aConstraints.gridx += 1;
1502		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1503		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1504		- aConstraints.gridx = 0;
1505		- aConstraints.gridy += 1;
1506		- aConstraints.gridwidth = 1;
	2559	+ //colorField.preferredWidth = 200;
	2560	+ colorSection.add(color);
1507	2561
1508		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1509		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1510		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1511		- aConstraints.gridx += 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1513		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1514		- aConstraints.gridx = 0;
1515		- aConstraints.gridy += 1;
1516		- aConstraints.gridwidth = 1;
	2562	+ cGridBag modulation = new cGridBag();
	2563	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2564	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2565	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2566	+ colorSection.add(modulation);
1517	2567
1518		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1519		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1520		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1521		- aConstraints.gridx += 1;
1522		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1523		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1524		- aConstraints.gridx = 0;
1525		- aConstraints.gridy += 1;
1526		- aConstraints.gridwidth = 1;
	2568	+ cGridBag opacity = new cGridBag();
	2569	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2570	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2571	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2572	+ colorSection.add(opacity);
1527	2573
1528		- //aConstraints.weighty = 1;
1529		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1530		- //aConstraints.gridx += 1;
1531		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1532		- aConstraints.weighty = 0;
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	2574	+ colorSection.add(GetSeparator());
	2575	+
	2576	+ cGridBag texture = new cGridBag();
	2577	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2578	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2579	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2580	+ colorSection.add(texture);
1536	2581
1537		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1538		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1539		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1540		- aConstraints.gridx += 1;
1541		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1542		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1543		- aConstraints.gridx = 0;
1544		- aConstraints.gridy += 1;
1545		- aConstraints.gridwidth = 1;
	2582	+ panel.add(GetSeparator());
	2583	+
	2584	+ panel.add(colorSection);
	2585	+
	2586	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2587	+
	2588	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2589	+
	2590	+ cGridBag diffuse = new cGridBag();
	2591	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2592	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2593	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2594	+ diffuseSection.add(diffuse);
1546	2595
1547		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1548		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1549		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1550		- aConstraints.gridx += 1;
1551		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1552		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1553		- aConstraints.gridx = 0;
1554		- aConstraints.gridy += 1;
1555		- aConstraints.gridwidth = 1;
	2596	+ cGridBag diffuseness = new cGridBag();
	2597	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2598	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2599	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2600	+ diffuseSection.add(diffuseness);
1556	2601
1557		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1558		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1560		- aConstraints.gridx += 1;
1561		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1562		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1563		- aConstraints.gridx = 0;
1564		- aConstraints.gridy += 1;
1565		- aConstraints.gridwidth = 1;
	2602	+ cGridBag selfshadow = new cGridBag();
	2603	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2604	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2605	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2606	+ diffuseSection.add(selfshadow);
1566	2607
1567		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1568		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1569		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1570		- aConstraints.gridx += 1;
1571		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1572		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1573		- aConstraints.gridx = 0;
1574		- aConstraints.gridy += 1;
1575		- aConstraints.gridwidth = 1;
	2608	+ cGridBag sheen = new cGridBag();
	2609	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2610	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2611	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2612	+ diffuseSection.add(sheen);
1576	2613
1577		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1578		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1580		- aConstraints.gridx += 1;
1581		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1582		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1583		- aConstraints.gridx = 0;
1584		- aConstraints.gridy += 1;
1585		- aConstraints.gridwidth = 1;
	2614	+ cGridBag subsurface = new cGridBag();
	2615	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2616	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2617	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2618	+ diffuseSection.add(subsurface);
1586	2619
1587		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1588		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1589		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1590		- aConstraints.gridx += 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1592		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1593		- aConstraints.gridx = 0;
1594		- aConstraints.gridy += 1;
1595		- aConstraints.gridwidth = 1;
	2620	+ cGridBag shadow = new cGridBag();
	2621	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2622	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2623	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2624	+ diffuseSection.add(shadow);
1596	2625
1597		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1598		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1599		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1600		- aConstraints.gridx += 1;
1601		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1602		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1603		- aConstraints.gridx = 0;
1604		- aConstraints.gridy += 1;
1605		- aConstraints.gridwidth = 1;
	2626	+ cGridBag fakedepth = new cGridBag();
	2627	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2628	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2629	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2630	+ diffuseSection.add(fakedepth);
1606	2631
1607		- //aConstraints.weighty = 1;
1608		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1609		- //aConstraints.gridx += 1;
1610		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1611		- aConstraints.weighty = 0;
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	2632	+ cGridBag shadowbias = new cGridBag();
	2633	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2634	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2635	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2636	+ diffuseSection.add(shadowbias);
1615	2637
1616		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1617		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1619		- aConstraints.gridx += 1;
1620		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1621		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1622		- aConstraints.gridx = 0;
1623		- aConstraints.gridy += 1;
1624		- aConstraints.gridwidth = 1;
	2638	+ panel.add(GetSeparator());
	2639	+
	2640	+ panel.add(diffuseSection);
	2641	+
	2642	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2643	+
	2644	+ cGridBag specularSection = new cGridBag().setVertical(true);
1625	2645
1626		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1627		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1629		- aConstraints.gridx += 1;
1630		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1631		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1632		- aConstraints.gridx = 0;
1633		- aConstraints.gridy += 1;
1634		- aConstraints.gridwidth = 1;
	2646	+ cGridBag specular = new cGridBag();
	2647	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2648	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2649	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2650	+ specularSection.add(specular);
1635	2651
1636		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1637		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1639		- aConstraints.gridx += 1;
1640		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1641		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1642		- aConstraints.gridx = 0;
1643		- aConstraints.gridy += 1;
1644		- aConstraints.gridwidth = 1;
	2652	+ cGridBag lightarea = new cGridBag();
	2653	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2654	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2655	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2656	+ specularSection.add(lightarea);
1645	2657
1646		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1647		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1648		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1649		- aConstraints.gridx += 1;
1650		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1651		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1652		- aConstraints.gridx = 0;
1653		- aConstraints.gridy += 1;
1654		- aConstraints.gridwidth = 1;
	2658	+ cGridBag shininess = new cGridBag();
	2659	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2660	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2661	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2662	+ specularSection.add(shininess);
1655	2663
1656		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1657		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1658		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1659		- aConstraints.gridx += 1;
1660		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1661		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1662		- aConstraints.gridx = 0;
1663		- aConstraints.gridy += 1;
1664		- aConstraints.gridwidth = 1;
	2664	+ cGridBag metalness = new cGridBag();
	2665	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2666	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2667	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2668	+ specularSection.add(metalness);
1665	2669
1666		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1667		- Return();
	2670	+ cGridBag velvet = new cGridBag();
	2671	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2672	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2673	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2674	+ specularSection.add(velvet);
	2675	+
	2676	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2677	+ //Return();
1668	2678	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1669	2679	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670	2680	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1675,130 +2685,105 @@
1675	2685	// aConstraints.gridy += 1;
1676	2686	// aConstraints.gridwidth = 1;
1677	2687
1678		- //aConstraints.weighty = 1;
1679		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1680		- //aConstraints.gridx += 1;
1681		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1682		- aConstraints.weighty = 0;
1683		- aConstraints.gridx = 0;
1684		- aConstraints.gridy += 1;
1685		- aConstraints.gridwidth = 1;
	2688	+ cGridBag anisoU = new cGridBag();
	2689	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2690	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2691	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2692	+ specularSection.add(anisoU);
1686	2693
1687		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1688		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1689		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1690		- aConstraints.gridx += 1;
1691		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1692		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1693		- aConstraints.gridx = 0;
1694		- aConstraints.gridy += 1;
1695		- aConstraints.gridwidth = 1;
	2694	+ cGridBag anisoV = new cGridBag();
	2695	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2696	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2697	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2698	+ specularSection.add(anisoV);
1696	2699
1697		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1698		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1700		- aConstraints.gridx += 1;
1701		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1702		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1703		- aConstraints.gridx = 0;
1704		- aConstraints.gridy += 1;
1705		- aConstraints.gridwidth = 1;
1706	2700
1707		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1708		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1710		- aConstraints.gridx += 1;
1711		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1712		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1713		- aConstraints.gridx = 0;
1714		- aConstraints.gridy += 1;
1715		- aConstraints.gridwidth = 1;
	2701	+ panel.add(GetSeparator());
	2702	+
	2703	+ panel.add(specularSection);
	2704	+
	2705	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2706	+
	2707	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1716	2708
1717		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1718		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1719		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1720		- aConstraints.gridx += 1;
1721		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1722		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1723		- aConstraints.gridx = 0;
1724		- aConstraints.gridy += 1;
1725		- aConstraints.gridwidth = 1;
1726		- aConstraints.weighty = 0;
	2709	+ cGridBag camera = new cGridBag();
	2710	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2711	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2712	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2713	+ colorSection.add(camera);
1727	2714
1728		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1729		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1730		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1731		- aConstraints.gridx += 1;
1732		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1733		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1734		- aConstraints.gridx = 0;
1735		- aConstraints.gridy += 1;
1736		- aConstraints.gridwidth = 1;
	2715	+ cGridBag ambient = new cGridBag();
	2716	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2717	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2718	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2719	+ colorSection.add(ambient);
1737	2720
1738		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1739		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1740		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1741		- aConstraints.gridx += 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1743		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1744		- aConstraints.gridx = 0;
1745		- aConstraints.gridy += 1;
1746		- aConstraints.gridwidth = 1;
	2721	+ cGridBag backlit = new cGridBag();
	2722	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2723	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2724	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2725	+ colorSection.add(backlit);
1747	2726
1748		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1749		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1750		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1751		- aConstraints.gridx += 1;
1752		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1753		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1754		- aConstraints.gridx = 0;
1755		- aConstraints.gridy += 1;
1756		- aConstraints.gridwidth = 1;
	2727	+ cGridBag parallax = new cGridBag();
	2728	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2729	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2730	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
	2731	+ colorSection.add(parallax);
	2732	+
	2733	+ //panel.add(new JSeparator());
	2734	+
	2735	+ //panel.add(globalSection);
	2736	+
	2737	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2738	+
	2739	+ cGridBag textureSection = new cGridBag().setVertical(true);
1757	2740
1758		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1759		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1761		- aConstraints.gridx += 1;
1762		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1763		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1764		- aConstraints.gridx = 0;
1765		- aConstraints.gridy += 1;
1766		- aConstraints.gridwidth = 1;
	2741	+ cGridBag bump = new cGridBag();
	2742	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2743	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2744	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2745	+ textureSection.add(bump);
1767	2746
1768		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1769		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1771		- aConstraints.gridx += 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1773		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1774		- aConstraints.gridx = 0;
1775		- aConstraints.gridy += 1;
1776		- aConstraints.gridwidth = 1;
	2747	+ cGridBag noise = new cGridBag();
	2748	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2749	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2750	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2751	+ textureSection.add(noise);
1777	2752
1778		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1779		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1780		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1781		- aConstraints.gridx += 1;
1782		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1783		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1784		- aConstraints.gridx = 0;
1785		- aConstraints.gridy += 1;
1786		- aConstraints.gridwidth = 1;
	2753	+ cGridBag power = new cGridBag();
	2754	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2755	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2756	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2757	+ textureSection.add(power);
1787	2758
1788		- //aConstraints.weighty = 1;
1789		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1790		- //aConstraints.gridx += 1;
1791		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1792		- aConstraints.weighty = 0;
	2759	+ cGridBag borderfade = new cGridBag();
	2760	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2761	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2762	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2763	+ textureSection.add(borderfade);
1793	2764
1794		- aConstraints.gridx = 0;
1795		- aConstraints.gridy = 0;
1796		- aConstraints.gridwidth = 1;
	2765	+ cGridBag fog = new cGridBag();
	2766	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2767	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2768	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2769	+ textureSection.add(fog);
	2770	+
	2771	+ cGridBag opacityPower = new cGridBag();
	2772	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2773	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2774	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2775	+ textureSection.add(opacityPower);
	2776	+
	2777	+ panel.add(GetSeparator());
	2778	+
	2779	+ panel.add(textureSection);
	2780	+
	2781	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	2782
1798	2783	SetMaterial(copy); // .GetMaterial());
1799	2784
1800		- colorField.addChangeListener(this);
1801		- modulationField.addChangeListener(this);
	2785	+ //colorField.addChangeListener(this);
	2786	+// modulationField.addChangeListener(this);
1802	2787	metalnessField.addChangeListener(this);
1803	2788	diffuseField.addChangeListener(this);
1804	2789	specularField.addChangeListener(this);
..	..	@@ -1828,12 +2813,15 @@
1828	2813	opacityPowerField.addChangeListener(this);
1829	2814	/**/
1830	2815
1831		- resetSlidersButton.addActionListener(this);
1832	2816	clearMaterialButton.addActionListener(this);
1833	2817	createMaterialButton.addActionListener(this);
1834		-
1835		- propagateToggle.addItemListener(this);
1836		- multiplyToggle.addItemListener(this);
	2818	+
	2819	+ if (Globals.ADVANCED)
	2820	+ {
	2821	+ resetSlidersButton.addActionListener(this);
	2822	+ propagateToggle.addItemListener(this);
	2823	+ multiplyToggle.addItemListener(this);
	2824	+ }
1837	2825	}
1838	2826
1839	2827	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1851,8 +2839,9 @@
1851	2839	// 3D models
1852	2840	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1853	2841	{
1854		- lastConverter = new com.jmex.model.converters.MaxToJme();
1855		- LoadFile(filename, lastConverter);
	2842	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2843	+ //LoadFile(filename, lastConverter);
	2844	+ LoadObjFile(filename); // New 3ds loader
1856	2845	continue;
1857	2846	}
1858	2847	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2004,7 +2993,7 @@
2004	2993
2005	2994	//? flashIt = false;
2006	2995	CameraPane pane = (CameraPane) cameraView;
2007		- pane.clickStart(location.x, location.y, 0);
	2996	+ pane.clickStart(location.x, location.y, 0, 0);
2008	2997	pane.clickEnd(location.x, location.y, 0, true);
2009	2998
2010	2999	if (group.selection.size() == 1)
..	..	@@ -2053,6 +3042,7 @@
2053	3042	e2.printStackTrace();
2054	3043	}
2055	3044	}
	3045	+
2056	3046	LoadJMEThread loadThread;
2057	3047
2058	3048	class LoadJMEThread extends Thread
..	..	@@ -2110,6 +3100,7 @@
2110	3100	//LoadFile0(filename, converter);
2111	3101	}
2112	3102	}
	3103	+
2113	3104	LoadOBJThread loadObjThread;
2114	3105
2115	3106	class LoadOBJThread extends Thread
..	..	@@ -2188,19 +3179,19 @@
2188	3179
2189	3180	void LoadObjFile(String fullname)
2190	3181	{
2191		- /*
	3182	+ System.out.println("Loading " + fullname);
	3183	+ /**/
2192	3184	//lastFilename = fullname;
2193	3185	if(loadObjThread == null)
2194	3186	{
2195		- loadObjThread = new LoadOBJThread();
2196		- loadObjThread.start();
	3187	+ loadObjThread = new LoadOBJThread();
	3188	+ loadObjThread.start();
2197	3189	}
2198	3190
2199	3191	loadObjThread.add(fullname);
2200		- */
	3192	+ /**/
2201	3193
2202		- System.out.println("Loading " + fullname);
2203		- makeSomething(new FileObject(fullname, true), true);
	3194	+ //makeSomething(new FileObject(fullname, true), true);
2204	3195	}
2205	3196
2206	3197	void LoadGFDFile(String fullname)
..	..	@@ -2461,11 +3452,11 @@
2461	3452
2462	3453	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2463	3454	{
2464		- if (GrafreeD.standAlone)
	3455	+ if (Grafreed.standAlone)
2465	3456	{
2466	3457	/**/
2467	3458	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2468		- browser.show();
	3459	+ browser.setVisible(true);
2469	3460	String filename = browser.getFile();
2470	3461	if (filename != null && filename.length() > 0)
2471	3462	{
..	..	@@ -2576,6 +3567,7 @@
2576	3567	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2577	3568	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2578	3569	}
	3570	+
2579	3571	//cJME.count++;
2580	3572	//cJME.count %= 12;
2581	3573	if (gc)
..	..	@@ -2610,6 +3602,7 @@
2610	3602	}
2611	3603	if (input == null)
2612	3604	{
	3605	+ new Exception().printStackTrace();
2613	3606	System.exit(0);
2614	3607	}
2615	3608
..	..	@@ -2758,6 +3751,7 @@
2758	3751	}
2759	3752	}
2760	3753	}
	3754	+
2761	3755	cFileSystemPane FSPane;
2762	3756
2763	3757	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2767,7 +3761,7 @@
2767	3761
2768	3762	freezematerial = true;
2769	3763	colorField.setFloat(mat.color);
2770		- modulationField.setFloat(mat.modulation);
	3764	+ saturationField.setFloat(mat.modulation);
2771	3765	metalnessField.setFloat(mat.metalness);
2772	3766	diffuseField.setFloat(mat.diffuse);
2773	3767	specularField.setFloat(mat.specular);
..	..	@@ -2787,6 +3781,7 @@
2787	3781	shadowField.setFloat(mat.shadow);
2788	3782	textureField.setFloat(mat.texture);
2789	3783	opacityField.setFloat(mat.opacity);
	3784	+ parallaxField.setFloat(mat.parallax + 0.25f);
2790	3785	fakedepthField.setFloat(mat.fakedepth);
2791	3786	shadowbiasField.setFloat(mat.shadowbias);
2792	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -2811,11 +3806,14 @@
2811	3806	}
2812	3807	}
2813	3808	}
	3809	+
2814	3810	freezematerial = false;
2815	3811	}
2816	3812
2817	3813	void SetMaterial(Object3D object)
2818	3814	{
	3815	+ latestObject = object;
	3816	+
2819	3817	cMaterial mat = object.material;
2820	3818
2821	3819	if (mat == null)
..	..	@@ -2824,33 +3822,10 @@
2824	3822	return;
2825	3823	}
2826	3824
2827		- multiplyToggle.setSelected(mat.multiply);
2828		-
2829		- assert (object.projectedVertices != null);
2830		-
2831		- if (object.projectedVertices.length <= 2)
2832		- {
2833		- // Side effect...
2834		- Object3D.cVector2[] keep = object.projectedVertices;
2835		- object.projectedVertices = new Object3D.cVector2[3];
2836		- for (int i = 0; i < 3; i++)
2837		- {
2838		- if (i < keep.length)
2839		- {
2840		- object.projectedVertices[i] = keep[i];
2841		- } else
2842		- {
2843		- object.projectedVertices[i] = new Object3D.cVector2();
2844		- }
2845		- /*
2846		- if(keep.length == 0)
2847		- object.projectedVertices[0] = new Object3D.cVector2();
2848		- else
2849		- object.projectedVertices[0] = keep[0];
2850		- object.projectedVertices[1] = new Object3D.cVector2();
2851		- */
2852		- }
2853		- }
	3825	+ if (multiplyToggle != null)
	3826	+ multiplyToggle.setSelected(mat.multiply);
	3827	+
	3828	+ AllocProjectedVertices(object);
2854	3829
2855	3830	SetMaterial(mat, object.projectedVertices);
2856	3831	}
..	..	@@ -2926,12 +3901,17 @@
2926	3901	// }
2927	3902
2928	3903	/**/
2929		- if (deselect)
	3904	+ if (deselect \|\| child == null)
2930	3905	{
2931	3906	//group.deselectAll();
2932	3907	//freeze = true;
2933	3908	GetTree().clearSelection();
2934	3909	//freeze = false;
	3910	+
	3911	+ if (child == null)
	3912	+ {
	3913	+ return;
	3914	+ }
2935	3915	}
2936	3916
2937	3917	//group.addSelectee(child);
..	..	@@ -2965,6 +3945,17 @@
2965	3945	public void itemStateChanged(ItemEvent event)
2966	3946	{
2967	3947	// System.out.println("Propagate = " + propagate);
	3948	+ if (event.getSource() == pinButton)
	3949	+ {
	3950	+ copy.pinned ^= true;
	3951	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3952	+ {
	3953	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3954	+ copy.CloseUI();
	3955	+ //copy.editWindow.refreshContents();
	3956	+ }
	3957	+ }
	3958	+ else
2968	3959	if (event.getSource() == propagateToggle)
2969	3960	{
2970	3961	propagate ^= true;
..	..	@@ -3000,7 +3991,7 @@
3000	3991	cameraView.ToggleDL();
3001	3992	cameraView.repaint();
3002	3993	return;
3003		- } else if (event.getSource() == toggleTextureItem)
	3994	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3004	3995	{
3005	3996	cameraView.ToggleTexture();
3006	3997	// june 2013 copy.HardTouch();
..	..	@@ -3039,9 +4030,9 @@
3039	4030	frame.validate();
3040	4031
3041	4032	return;
3042		- } else if (event.getSource() == toggleRandomItem)
	4033	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3043	4034	{
3044		- cameraView.ToggleRandom();
	4035	+ cameraView.ToggleSwitch();
3045	4036	cameraView.repaint();
3046	4037	return;
3047	4038	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3069,12 +4060,17 @@
3069	4060	} else if (event.getSource() == liveCB)
3070	4061	{
3071	4062	copy.live ^= true;
	4063	+ objEditor.refreshContents(true); // To show item colors
	4064	+ return;
	4065	+ } else if (event.getSource() == selectableCB)
	4066	+ {
	4067	+ copy.dontselect ^= true;
3072	4068	return;
3073	4069	} else if (event.getSource() == hideCB)
3074	4070	{
3075	4071	copy.hide ^= true;
3076	4072	copy.Touch(); // display list issue
3077		- objEditor.refreshContents();
	4073	+ objEditor.refreshContents(true); // To show item colors
3078	4074	return;
3079	4075	} else if (event.getSource() == link2masterCB)
3080	4076	{
..	..	@@ -3084,6 +4080,7 @@
3084	4080	if (event.getSource() == randomCB)
3085	4081	{
3086	4082	copy.random ^= true;
	4083	+ objEditor.refreshContents();
3087	4084	return;
3088	4085	}
3089	4086	if (event.getSource() == speedupCB)
..	..	@@ -3107,8 +4104,9 @@
3107	4104
3108	4105	public void actionPerformed(ActionEvent event)
3109	4106	{
	4107	+ Object source = event.getSource();
3110	4108	// SCRIPT DIALOG
3111		- if (event.getSource() == okbutton)
	4109	+ if (source == okbutton)
3112	4110	{
3113	4111	textpanel.setVisible(false);
3114	4112	textpanel.remove(textarea);
..	..	@@ -3120,7 +4118,7 @@
3120	4118	textarea = null;
3121	4119	textpanel = null;
3122	4120	}
3123		- if (event.getSource() == cancelbutton)
	4121	+ if (source == cancelbutton)
3124	4122	{
3125	4123	textpanel.setVisible(false);
3126	4124	textpanel.remove(textarea);
..	..	@@ -3132,50 +4130,50 @@
3132	4130	//applySelf();
3133	4131	//client.refreshEditWindow();
3134	4132	//refreshContents();
3135		- if (event.getSource() == nameField)
	4133	+ if (source == nameField)
3136	4134	{
3137	4135	//System.out.println("ObjEditor " + event);
3138	4136	applySelf0(true);
3139	4137	//parent.applySelf();
3140		- objEditor.refreshContents();
3141		- } else if (event.getSource() == resetButton)
	4138	+ // conflicts with requestFocus objEditor.refreshContents();
	4139	+ } else if (source == resetButton)
3142	4140	{
3143	4141	CameraPane.fullreset = true;
3144	4142	copy.Reset(); // ResetMeshes();
3145	4143	copy.Touch();
3146	4144	objEditor.refreshContents();
3147		- } else if (event.getSource() == stepItem)
	4145	+ } else if (source == stepItem)
3148	4146	{
3149	4147	//cameraView.ONESTEP = true;
3150	4148	Globals.ONESTEP = true;
3151	4149	cameraView.repaint();
3152	4150	return;
3153		- } else if (event.getSource() == stepButton)
	4151	+ } else if (source == stepButton)
3154	4152	{
3155	4153	copy.Step();
3156	4154	copy.Touch();
3157	4155	objEditor.refreshContents();
3158		- } else if (event.getSource() == slowerButton)
	4156	+ } else if (source == slowerButton)
3159	4157	{
3160	4158	copy.Slower();
3161	4159	copy.Touch();
3162	4160	objEditor.refreshContents();
3163		- } else if (event.getSource() == fasterButton)
	4161	+ } else if (source == fasterButton)
3164	4162	{
3165	4163	copy.Faster();
3166	4164	copy.Touch();
3167	4165	objEditor.refreshContents();
3168		- } else if (event.getSource() == remarkButton)
	4166	+ } else if (source == remarkButton)
3169	4167	{
3170	4168	copy.Remark();
3171	4169	copy.Touch();
3172	4170	objEditor.refreshContents();
3173		- } else if (event.getSource() == stepAllButton)
	4171	+ } else if (source == stepAllButton)
3174	4172	{
3175	4173	copy.StepAll();
3176	4174	copy.Touch();
3177	4175	objEditor.refreshContents();
3178		- } else if (event.getSource() == resetAllButton)
	4176	+ } else if (source == resetAllButton)
3179	4177	{
3180	4178	//CameraPane.fullreset = true;
3181	4179	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3208,53 +4206,79 @@
3208	4206	// Close();
3209	4207	// }
3210	4208	// else
3211		- if (event.getSource() == resetSlidersButton)
	4209	+ if (source == resetSlidersButton)
3212	4210	{
3213	4211	ResetSliders();
3214		- } else if (event.getSource() == clearMaterialButton)
	4212	+ } else if (source == clearMaterialButton)
3215	4213	{
3216	4214	ClearMaterial();
3217		- } else if (event.getSource() == createMaterialButton)
	4215	+ } else if (source == createMaterialButton)
3218	4216	{
3219	4217	CreateMaterial();
3220		- } else if (event.getSource() == clearPanelButton)
	4218	+ } else if (source == clearPanelButton)
3221	4219	{
3222	4220	copy.ClearUI();
3223	4221	refreshContents(true);
3224		- } /*
3225		- }
3226		-
3227		- public boolean action(Event event, Object arg)
3228		- {
3229		- */ else if (event.getSource() == closeItem)
	4222	+ } else if (source == importGFDItem)
	4223	+ {
	4224	+ ImportGFD();
	4225	+ } else
	4226	+ if (source == importVRMLX3DItem)
	4227	+ {
	4228	+ ImportVRMLX3D();
	4229	+ } else
	4230	+ if (source == import3DSItem)
	4231	+ {
	4232	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4233	+ } else
	4234	+ if (source == importOBJItem)
	4235	+ {
	4236	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4237	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4238	+ browser.setVisible(true);
	4239	+ String filename = browser.getFile();
	4240	+ if (filename != null && filename.length() > 0)
	4241	+ {
	4242	+ String fullname = browser.getDirectory() + filename;
	4243	+ makeSomething(ReadOBJ(fullname), true);
	4244	+ }
	4245	+ } else
	4246	+ if (source == closeItem)
3230	4247	{
3231	4248	Close();
3232	4249	//return true;
3233		- } else if (event.getSource() == loadItem)
	4250	+ } else if (source == openItem)
3234	4251	{
3235		- load();
	4252	+ Open();
3236	4253	//return true;
3237		- } else if (event.getSource() == saveItem)
	4254	+ } else if (source == newItem)
	4255	+ {
	4256	+ New();
	4257	+ } else if (source == saveItem)
3238	4258	{
3239	4259	save();
3240	4260	//return true;
3241		- } else if (event.getSource() == saveAsItem)
	4261	+ } else if (source == saveAsItem)
3242	4262	{
3243	4263	saveAs();
3244	4264	//return true;
3245		- } else if (event.getSource() == reexportItem)
	4265	+ } else if (source == reexportItem)
3246	4266	{
3247	4267	reexport();
3248	4268	//return true;
3249		- } else if (event.getSource() == exportAsItem)
	4269	+ } else if (source == exportAsItem)
3250	4270	{
3251	4271	export();
3252	4272	//return true;
3253		- } else if (event.getSource() == povItem)
	4273	+ } else if (source == povItem)
3254	4274	{
3255	4275	generatePOV();
3256	4276	//return true;
3257		- } else if (event.getSource() == zBufferItem)
	4277	+ } else if (event.getSource() == archiveItem)
	4278	+ {
	4279	+ cTools.Archive(frame);
	4280	+ return;
	4281	+ } else if (source == zBufferItem)
3258	4282	{
3259	4283	try
3260	4284	{
..	..	@@ -3276,21 +4300,8 @@
3276	4300	cameraView.repaint();
3277	4301	//return true;
3278	4302	}
3279		- */ else if (event.getSource() == editCameraItem)
3280		- {
3281		- cameraView.ProtectCamera();
3282		- cameraView.repaint();
3283		- return;
3284		- } else if (event.getSource() == revertCameraItem)
3285		- {
3286		- cameraView.RevertCamera();
3287		- cameraView.repaint();
3288		- return;
3289		-// } else if (event.getSource() == textureButton)
3290		-// {
3291		-// return; // true;
3292		- } else // combos...
3293		- if (event.getSource() == texresMenu)
	4303	+ */ else // combos...
	4304	+ if (source == texresMenu)
3294	4305	{
3295	4306	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3296	4307	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3302,12 +4313,503 @@
3302	4313	}
3303	4314	}
3304	4315
	4316	+ void New()
	4317	+ {
	4318	+ while (copy.Size() > 0)
	4319	+ {
	4320	+ copy.remove(0);
	4321	+ }
	4322	+
	4323	+ copy.selection.clear();
	4324	+
	4325	+ if (copy == Grafreed.grafreed.universe)
	4326	+ {
	4327	+ CreateCameras();
	4328	+ cameraView.SetCamera(GetCamera(copy, 0));
	4329	+ }
	4330	+ ResetModel();
	4331	+ objEditor.refreshContents();
	4332	+ }
	4333	+
	4334	+ static public byte[] Compress(Object3D o)
	4335	+ {
	4336	+ // Slower to actually compress.
	4337	+ try
	4338	+ {
	4339	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4340	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4341	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4342	+
	4343	+ Object3D parent = o.parent;
	4344	+ o.parent = null;
	4345	+
	4346	+ out.writeObject(o);
	4347	+
	4348	+ o.parent = parent;
	4349	+
	4350	+ out.flush();
	4351	+
	4352	+ baos //zstream
	4353	+ .close();
	4354	+ out.close();
	4355	+
	4356	+ byte[] bytes = baos.toByteArray();
	4357	+
	4358	+ System.out.println("save #bytes = " + bytes.length);
	4359	+ return bytes;
	4360	+ } catch (Exception e)
	4361	+ {
	4362	+ System.err.println(e);
	4363	+ return null;
	4364	+ }
	4365	+ }
	4366	+
	4367	+ static public Object Uncompress(byte[] bytes)
	4368	+ {
	4369	+ System.out.println("restore #bytes = " + bytes.length);
	4370	+ try
	4371	+ {
	4372	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4373	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4374	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4375	+ Object obj = in.readObject();
	4376	+
	4377	+ bais //istream
	4378	+ .close();
	4379	+ in.close();
	4380	+
	4381	+ return obj;
	4382	+ } catch (Exception e)
	4383	+ {
	4384	+ System.err.println(e);
	4385	+ return null;
	4386	+ }
	4387	+ }
	4388	+
	4389	+ static public Object clone(Object o)
	4390	+ {
	4391	+ try
	4392	+ {
	4393	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4394	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4395	+
	4396	+ out.writeObject(o);
	4397	+
	4398	+ out.flush();
	4399	+ out.close();
	4400	+
	4401	+ byte[] bytes = baos.toByteArray();
	4402	+
	4403	+ System.out.println("clone = " + bytes.length);
	4404	+
	4405	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4406	+ ObjectInputStream in = new ObjectInputStream(bais);
	4407	+ Object obj = in.readObject();
	4408	+ in.close();
	4409	+
	4410	+ return obj;
	4411	+ } catch (Exception e)
	4412	+ {
	4413	+ System.err.println(e);
	4414	+ return null;
	4415	+ }
	4416	+ }
	4417	+
	4418	+ cRadio GetCurrentTab()
	4419	+ {
	4420	+ cRadio ab;
	4421	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4422	+ {
	4423	+ ab = (cRadio)e.nextElement();
	4424	+ if(ab.GetObject() == copy)
	4425	+ {
	4426	+ return ab;
	4427	+ }
	4428	+ }
	4429	+
	4430	+ return null;
	4431	+ }
	4432	+
	4433	+
	4434	+ public void Save()
	4435	+ {
	4436	+ //Save(true);
	4437	+ Replace();
	4438	+ SetVersionStates();
	4439	+ }
	4440	+
	4441	+ private boolean Equal(byte[] compress, byte[] name)
	4442	+ {
	4443	+ if (compress.length != name.length)
	4444	+ {
	4445	+ return false;
	4446	+ }
	4447	+
	4448	+ for (int i=compress.length; --i>=0;)
	4449	+ {
	4450	+ if (compress[i] != name[i])
	4451	+ return false;
	4452	+ }
	4453	+
	4454	+ return true;
	4455	+ }
	4456	+
	4457	+ void DeleteVersion()
	4458	+ {
	4459	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4460	+ {
	4461	+ copy.versionlist[i] = copy.versionlist[i+1];
	4462	+ }
	4463	+
	4464	+ if (copy.versionlist[copy.versionindex] == null)
	4465	+ copy.versionindex -= 1;
	4466	+
	4467	+ if (copy.versionindex != -1)
	4468	+ CopyChanged();
	4469	+
	4470	+ SetVersionStates();
	4471	+ }
	4472	+
	4473	+ public boolean Save(boolean user)
	4474	+ {
	4475	+ System.err.println("Save");
	4476	+ Replace();
	4477	+
	4478	+ //cRadio tab = GetCurrentTab();
	4479	+
	4480	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4481	+
	4482	+ boolean thesame = false;
	4483	+
	4484	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4485	+// {
	4486	+// thesame = true;
	4487	+// }
	4488	+
	4489	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4490	+ if (!thesame)
	4491	+ {
	4492	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4493	+ {
	4494	+ copy.versionlist[i] = copy.versionlist[i-1];
	4495	+ }
	4496	+
	4497	+ //tab.user[tab.versionindex] = user;
	4498	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4499	+
	4500	+ copy.versionlist[++copy.versionindex] = compress;
	4501	+
	4502	+ // if (increment)
	4503	+ // tab.versionindex++;
	4504	+ }
	4505	+
	4506	+ //copy.RestoreBigData(versiontable);
	4507	+
	4508	+ //assert(hashtable.isEmpty());
	4509	+
	4510	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4511	+// {
	4512	+// //tab.user[i] = false;
	4513	+// copy.versionlist[i] = null;
	4514	+// }
	4515	+
	4516	+ SetVersionStates();
	4517	+
	4518	+ // test save
	4519	+ if (false)
	4520	+ {
	4521	+ try
	4522	+ {
	4523	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4524	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4525	+
	4526	+ p.writeObject(copy);
	4527	+
	4528	+ p.flush();
	4529	+
	4530	+ ostream.close();
	4531	+ } catch (Exception e)
	4532	+ {
	4533	+ e.printStackTrace();
	4534	+ }
	4535	+ }
	4536	+
	4537	+ return !thesame;
	4538	+ }
	4539	+
	4540	+ boolean flashIt = true;
	4541	+
	4542	+ void RefreshSelection()
	4543	+ {
	4544	+ Object3D selection = new Object3D();
	4545	+
	4546	+ for (int i = 0; i < copy.selection.size(); i++)
	4547	+ {
	4548	+ Object3D elem = copy.selection.elementAt(i);
	4549	+
	4550	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4551	+
	4552	+ if (obj == null)
	4553	+ {
	4554	+ copy.selection.remove(i--);
	4555	+ }
	4556	+ else
	4557	+ {
	4558	+ selection.add(obj);
	4559	+ copy.selection.setElementAt(obj, i);
	4560	+ }
	4561	+ }
	4562	+
	4563	+ flashIt = false;
	4564	+ GetTree().clearSelection();
	4565	+ for (int i = 0; i < selection.size(); i++)
	4566	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4567	+ flashIt = true;
	4568	+
	4569	+ //refreshContents(false);
	4570	+ }
	4571	+
	4572	+ void CopyChanged()
	4573	+ {
	4574	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4575	+
	4576	+ SetVersionStates();
	4577	+
	4578	+ boolean temp = CameraPane.SWITCH;
	4579	+ CameraPane.SWITCH = false;
	4580	+
	4581	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4582	+
	4583	+ copy.clear();
	4584	+
	4585	+ copy.skyboxname = obj.skyboxname;
	4586	+ copy.skyboxext = obj.skyboxext;
	4587	+
	4588	+ for (int i=0; i<obj.Size(); i++)
	4589	+ {
	4590	+ copy.add(obj.get(i));
	4591	+ }
	4592	+
	4593	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4594	+
	4595	+ CameraPane.SWITCH = temp;
	4596	+
	4597	+ RefreshSelection();
	4598	+ //assert(hashtable.isEmpty());
	4599	+
	4600	+ copy.Touch();
	4601	+
	4602	+ ResetModel();
	4603	+ copy.HardTouch(); // recompile?
	4604	+
	4605	+ cRadio ab;
	4606	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4607	+ {
	4608	+ ab = (cRadio)e.nextElement();
	4609	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4610	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4611	+ if (test != null)
	4612	+ {
	4613	+ test.editWindow = ab.object.editWindow;
	4614	+ ab.object = test;
	4615	+ }
	4616	+ }
	4617	+
	4618	+ refreshContents(true);
	4619	+ }
	4620	+
	4621	+ cButton previousVersionButton;
	4622	+ cButton restoreButton;
	4623	+ cButton replaceButton;
	4624	+ cButton nextVersionButton;
	4625	+ cButton saveVersionButton;
	4626	+ cButton deleteVersionButton;
	4627	+
	4628	+ boolean muteSlider;
	4629	+
	4630	+ int VersionCount()
	4631	+ {
	4632	+ int count = 0;
	4633	+
	4634	+ for (int i = copy.versionlist.length; --i >= 0;)
	4635	+ {
	4636	+ if (copy.versionlist[i] != null)
	4637	+ count++;
	4638	+ }
	4639	+
	4640	+ return count;
	4641	+ }
	4642	+
	4643	+ public cGridBag versionSliderPane;
	4644	+
	4645	+ void SetVersionStates()
	4646	+ {
	4647	+ //if (true)
	4648	+ // return;
	4649	+
	4650	+ //cRadio tab = GetCurrentTab();
	4651	+
	4652	+ if (copy.versionlist == null)
	4653	+ {
	4654	+ saveVersionButton.setEnabled(false);
	4655	+ restoreButton.setEnabled(false);
	4656	+ replaceButton.setEnabled(false);
	4657	+ previousVersionButton.setEnabled(false);
	4658	+ nextVersionButton.setEnabled(false);
	4659	+ deleteVersionButton.setEnabled(false);
	4660	+ versionSliderPane.setVisible(false);
	4661	+ }
	4662	+ else
	4663	+ {
	4664	+ restoreButton.setEnabled(copy.versionindex != -1);
	4665	+ replaceButton.setEnabled(copy.versionindex != -1);
	4666	+
	4667	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4668	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4669	+
	4670	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4671	+ //copy.versionlist[copy.versionindex + 1] != null);
	4672	+
	4673	+ muteSlider = true;
	4674	+ versionSlider.setMinimum(0);
	4675	+ versionSlider.setMaximum(VersionCount() - 1);
	4676	+ versionSlider.setInteger(copy.versionindex);
	4677	+ versionSlider.setEnabled(copy.versionindex != -1);
	4678	+ muteSlider = false;
	4679	+
	4680	+ versionSliderPane.setVisible(true);
	4681	+ }
	4682	+ }
	4683	+
	4684	+ public boolean PreviousVersion()
	4685	+ {
	4686	+ // Option?
	4687	+ Replace();
	4688	+
	4689	+ System.err.println("Undo");
	4690	+
	4691	+ //cRadio tab = GetCurrentTab();
	4692	+
	4693	+ if (copy.versionindex == 0)
	4694	+ {
	4695	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4696	+ return false;
	4697	+ }
	4698	+
	4699	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4700	+// {
	4701	+// if (Save(false))
	4702	+// tab.versionindex -= 1;
	4703	+// else
	4704	+// {
	4705	+// if (tab.versionindex <= 0)
	4706	+// return false;
	4707	+// else
	4708	+// tab.versionindex -= 1;
	4709	+// }
	4710	+// }
	4711	+
	4712	+ copy.versionindex -= 1;
	4713	+
	4714	+ CopyChanged();
	4715	+
	4716	+ return true;
	4717	+ }
	4718	+
	4719	+ public boolean Restore()
	4720	+ {
	4721	+ System.err.println("Restore");
	4722	+
	4723	+ //cRadio tab = GetCurrentTab();
	4724	+
	4725	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4726	+ {
	4727	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4728	+ return false;
	4729	+ }
	4730	+
	4731	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4732	+ CopyChanged();
	4733	+
	4734	+ return true;
	4735	+ }
	4736	+
	4737	+ public boolean Replace()
	4738	+ {
	4739	+ //System.err.println("Replace");
	4740	+
	4741	+ //cRadio tab = GetCurrentTab();
	4742	+
	4743	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4744	+ {
	4745	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4746	+ return false;
	4747	+ }
	4748	+
	4749	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4750	+
	4751	+ return true;
	4752	+ }
	4753	+
	4754	+ public void NextVersion()
	4755	+ {
	4756	+ // Option?
	4757	+ Replace();
	4758	+
	4759	+ //cRadio tab = GetCurrentTab();
	4760	+
	4761	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4762	+ {
	4763	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4764	+ return;
	4765	+ }
	4766	+
	4767	+ copy.versionindex += 1;
	4768	+
	4769	+ CopyChanged();
	4770	+
	4771	+ //if (!tab.user[tab.versionindex])
	4772	+ // tab.graphs[tab.versionindex] = null;
	4773	+ }
	4774	+
	4775	+ void ImportGFD()
	4776	+ {
	4777	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4778	+ browser.show();
	4779	+ String filename = browser.getFile();
	4780	+ if (filename != null && filename.length() > 0)
	4781	+ {
	4782	+ String fullname = browser.getDirectory() + filename;
	4783	+
	4784	+ //Object3D readobj =
	4785	+ objEditor.ReadGFD(fullname, objEditor);
	4786	+ //makeSomething(readobj);
	4787	+ }
	4788	+ }
	4789	+
	4790	+ void ImportVRMLX3D()
	4791	+ {
	4792	+ if (Grafreed.standAlone)
	4793	+ {
	4794	+ /**/
	4795	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4796	+ browser.show();
	4797	+ String filename = browser.getFile();
	4798	+ if (filename != null && filename.length() > 0)
	4799	+ {
	4800	+ String fullname = browser.getDirectory() + filename;
	4801	+ LoadVRMLX3D(fullname);
	4802	+ }
	4803	+ /**/
	4804	+ }
	4805	+ }
	4806	+
3305	4807	void ToggleAnimation()
3306	4808	{
3307	4809	if (!Globals.ANIMATION)
3308	4810	{
3309	4811	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3310		- browser.show();
	4812	+ browser.setVisible(true);
3311	4813	String filename = browser.getFile();
3312	4814	if (filename != null && filename.length() > 0)
3313	4815	{
..	..	@@ -3317,8 +4819,8 @@
3317	4819
3318	4820	Globals.ANIMATION ^= true;
3319	4821
3320		- GrafreeD.wav.cursor = 0;
3321		- GrafreeD.wav.loop = 0;
	4822	+ Grafreed.wav.cursor = 0;
	4823	+ Grafreed.wav.loop = 0;
3322	4824	}
3323	4825	} else
3324	4826	{
..	..	@@ -3368,7 +4870,7 @@
3368	4870	void CreateMaterial()
3369	4871	{
3370	4872	//copy.ClearMaterial(); // PATCH
3371		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4873	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3372	4874	if (copy.selection.size() > 0)
3373	4875	//SetMaterial(copy);
3374	4876	{
..	..	@@ -3419,7 +4921,7 @@
3419	4921	assert false;
3420	4922	}
3421	4923
3422		- void EditSelection()
	4924	+ void EditSelection(boolean newWindow)
3423	4925	{
3424	4926	}
3425	4927
..	..	@@ -3427,11 +4929,11 @@
3427	4929	{
3428	4930	copy.ResetBlockLoop(); // temporary problem
3429	4931
3430		- boolean random = CameraPane.RANDOM;
3431		- CameraPane.RANDOM = false; // parse everything
	4932	+ boolean random = CameraPane.SWITCH;
	4933	+ CameraPane.SWITCH = false; // parse everything
3432	4934	copy.ResetDisplayList();
3433	4935	copy.HardTouch();
3434		- CameraPane.RANDOM = random;
	4936	+ CameraPane.SWITCH = random;
3435	4937	}
3436	4938
3437	4939	// public void applySelf()
..	..	@@ -3461,6 +4963,12 @@
3461	4963	// else
3462	4964	// applySelf(true);
3463	4965	// }
	4966	+
	4967	+ boolean Equal(double a, double b)
	4968	+ {
	4969	+ return Math.abs(a - b) < 0.001;
	4970	+ }
	4971	+
3464	4972	void applySelf0(boolean name)
3465	4973	{
3466	4974	if (name)
..	..	@@ -3478,7 +4986,7 @@
3478	4986	//copy.material = new cMaterial(copy.GetMaterial());
3479	4987
3480	4988	current.color = (float) colorField.getFloat();
3481		- current.modulation = (float) modulationField.getFloat();
	4989	+ current.modulation = (float) saturationField.getFloat();
3482	4990	current.metalness = (float) metalnessField.getFloat();
3483	4991	current.diffuse = (float) diffuseField.getFloat();
3484	4992	current.specular = (float) specularField.getFloat();
..	..	@@ -3498,13 +5006,69 @@
3498	5006	current.shadow = (float) shadowField.getFloat();
3499	5007	current.texture = (float) textureField.getFloat();
3500	5008	current.opacity = (float) opacityField.getFloat();
	5009	+ current.parallax = (float) parallaxField.getFloat() - 0.25f;
3501	5010	current.fakedepth = (float) fakedepthField.getFloat();
3502	5011	current.shadowbias = (float) shadowbiasField.getFloat();
3503	5012
3504		- if (!NumberSlider.frozen)
	5013	+ if (!cNumberSlider.frozen)
3505	5014	{
3506	5015	//System.out.println("Propagate = " + propagate);
3507	5016	copy.UpdateMaterial(anchor, current, propagate);
	5017	+
	5018	+ if (copy.material != null)
	5019	+ {
	5020	+ cMaterial mat = copy.material;
	5021	+
	5022	+ if (!Equal(colorField.getFloat(), mat.color))
	5023	+ colorField.SetToolTipValue((mat.color));
	5024	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5025	+ saturationField.SetToolTipValue((mat.modulation));
	5026	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5027	+ metalnessField.SetToolTipValue((mat.metalness));
	5028	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5029	+ diffuseField.SetToolTipValue((mat.diffuse));
	5030	+ if (!Equal(specularField.getFloat(), mat.specular))
	5031	+ specularField.SetToolTipValue((mat.specular));
	5032	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5033	+ shininessField.SetToolTipValue((mat.shininess));
	5034	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5035	+ shiftField.SetToolTipValue((mat.shift));
	5036	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5037	+ ambientField.SetToolTipValue((mat.ambient));
	5038	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5039	+ lightareaField.SetToolTipValue((mat.lightarea));
	5040	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5041	+ diffusenessField.SetToolTipValue((mat.factor));
	5042	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5043	+ velvetField.SetToolTipValue((mat.velvet));
	5044	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5045	+ sheenField.SetToolTipValue((mat.sheen));
	5046	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5047	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5048	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5049	+ backlitField.SetToolTipValue((mat.bump));
	5050	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5051	+ anisoField.SetToolTipValue((mat.aniso));
	5052	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5053	+ anisoVField.SetToolTipValue((mat.anisoV));
	5054	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5055	+ cameraField.SetToolTipValue((mat.cameralight));
	5056	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5057	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5058	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5059	+ shadowField.SetToolTipValue((mat.shadow));
	5060	+ if (!Equal(textureField.getFloat(), mat.texture))
	5061	+ textureField.SetToolTipValue((mat.texture));
	5062	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5063	+ opacityField.SetToolTipValue((mat.opacity));
	5064	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5065	+ parallaxField.SetToolTipValue((mat.parallax));
	5066	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5067	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5068	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5069	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	5070	+ }
	5071	+
3508	5072	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3509	5073	{
3510	5074	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3533,9 +5097,28 @@
3533	5097	//copy.Touch();
3534	5098	}
3535	5099
	5100	+ cNumberSlider versionSlider;
	5101	+
3536	5102	public void stateChanged(ChangeEvent e)
3537	5103	{
3538		- // assert(false);
	5104	+ // assert(false);
	5105	+ if (e.getSource() == versionSlider)
	5106	+ {
	5107	+ if (muteSlider)
	5108	+ return;
	5109	+
	5110	+ Replace();
	5111	+
	5112	+ int version = versionSlider.getInteger();
	5113	+
	5114	+ if (version != -1 && copy.versionlist[version] != null)
	5115	+ {
	5116	+ copy.versionindex = version;
	5117	+ CopyChanged();
	5118	+ }
	5119	+
	5120	+ return;
	5121	+ }
3539	5122
3540	5123	if (freezematerial)
3541	5124	{
..	..	@@ -3549,6 +5132,7 @@
3549	5132	\|\| e.getSource() == apertureField
3550	5133	\|\| e.getSource() == shadowblurField)
3551	5134	{
	5135	+ new Exception().printStackTrace();
3552	5136	System.exit(0);
3553	5137	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3554	5138	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3570,6 +5154,12 @@
3570	5154	{
3571	5155	//System.out.println("stateChanged = " + this);
3572	5156	materialtouched = true;
	5157	+
	5158	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5159	+ {
	5160	+ saturationField.setFloat(1);
	5161	+ }
	5162	+
3573	5163	applySelf();
3574	5164	//System.out.println("this = " + this);
3575	5165	//System.out.println("PARENT = " + parent);
..	..	@@ -3619,7 +5209,7 @@
3619	5209	}
3620	5210
3621	5211	if (normalpushField != null)
3622		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	5212	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3623	5213	}
3624	5214
3625	5215	void SnapObject()
..	..	@@ -3869,20 +5459,28 @@
3869	5459	{
3870	5460	if (GetTree() != null)
3871	5461	{
	5462	+ GetTree().revalidate();
3872	5463	GetTree().repaint();
3873	5464	}
3874	5465
3875	5466	radioPanel.revalidate();
3876	5467	radioPanel.repaint();
3877		- ctrlPanel.revalidate(); // ? new
	5468	+ ctrlPanel.validate(); // ? new
3878	5469	ctrlPanel.repaint();
3879	5470	}
	5471	+
	5472	+ if (previousVersionButton != null && copy.versionlist != null)
	5473	+ SetVersionStates();
	5474	+
	5475	+ cameraView.requestFocusInWindow();
3880	5476	}
3881	5477
3882	5478	static TweenManager tweenManager = new TweenManager();
3883	5479
3884	5480	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3885	5481	{
	5482	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5483	+ Save();
3886	5484	//Tween.set(thing, 0).target(1).start(tweenManager);
3887	5485	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3888	5486	// if (thing instanceof GenericJointDemo)
..	..	@@ -3906,7 +5504,7 @@
3906	5504	// group = (Composite) group.get(0);
3907	5505	// }
3908	5506
3909		- System.out.println("makeSomething of " + thing);
	5507	+ //System.out.println("makeSomething of " + thing);
3910	5508
3911	5509	/*
3912	5510	if (deselect && jList != null)
..	..	@@ -3969,6 +5567,12 @@
3969	5567	{
3970	5568	ResetModel();
3971	5569	Select(thing.GetTreePath(), true, false); // unselect... false);
	5570	+
	5571	+ if (thing.Size() == 0)
	5572	+ {
	5573	+ //EditSelection(false);
	5574	+ }
	5575	+
3972	5576	refreshContents();
3973	5577	}
3974	5578
..	..	@@ -4086,6 +5690,7 @@
4086	5690	}
4087	5691	}
4088	5692	}
	5693	+
4089	5694	LoadGFDThread loadGFDThread;
4090	5695
4091	5696	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4105,8 +5710,10 @@
4105	5710
4106	5711	try
4107	5712	{
	5713	+ // Try compressed version first.
4108	5714	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4109		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5715	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5716	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4110	5717
4111	5718	readobj = (Object3D) p.readObject();
4112	5719	istream.close();
..	..	@@ -4114,7 +5721,22 @@
4114	5721	readobj.ResetDisplayList();
4115	5722	} catch (Exception e)
4116	5723	{
4117		- e.printStackTrace();
	5724	+ if (!e.toString().contains("GZIP"))
	5725	+ e.printStackTrace();
	5726	+
	5727	+ try
	5728	+ {
	5729	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5730	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5731	+
	5732	+ readobj = (Object3D) p.readObject();
	5733	+ istream.close();
	5734	+
	5735	+ readobj.ResetDisplayList();
	5736	+ } catch (Exception e2)
	5737	+ {
	5738	+ e2.printStackTrace();
	5739	+ }
4118	5740	}
4119	5741	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4120	5742	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4160,6 +5782,12 @@
4160	5782
4161	5783	void LoadIt(Object obj)
4162	5784	{
	5785	+ if (obj == null)
	5786	+ {
	5787	+ // Invalid file
	5788	+ return;
	5789	+ }
	5790	+
4163	5791	System.out.println("Loaded " + obj);
4164	5792	//new Exception().printStackTrace();
4165	5793	Object3D readobj = (Object3D) obj;
..	..	@@ -4169,10 +5797,14 @@
4169	5797
4170	5798	if (readobj != null)
4171	5799	{
	5800	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5801	+ // Save();
4172	5802	try
4173	5803	{
4174	5804	//readobj.deepCopySelf(copy);
4175	5805	copy.clear(); // june 2014
	5806	+ copy.skyboxname = readobj.skyboxname;
	5807	+ copy.skyboxext = readobj.skyboxext;
4176	5808	for (int i = 0; i < readobj.size(); i++)
4177	5809	{
4178	5810	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4213,6 +5845,7 @@
4213	5845	}
4214	5846	} catch (ClassCastException e)
4215	5847	{
	5848	+ e.printStackTrace();
4216	5849	assert (false);
4217	5850	Composite c = (Composite) copy;
4218	5851	c.children.clear();
..	..	@@ -4223,17 +5856,32 @@
4223	5856	c.addChild(csg);
4224	5857	}
4225	5858
	5859	+ copy.versionlist = readobj.versionlist;
	5860	+ copy.versionindex = readobj.versionindex;
	5861	+ copy.versiontable = readobj.versiontable;
	5862	+
	5863	+ if (copy.versionlist == null)
	5864	+ {
	5865	+ // Backward compatibility
	5866	+ copy.versionlist = new Object3D[100];
	5867	+ copy.versionindex = -1;
	5868	+
	5869	+ //Save(true);
	5870	+ }
	5871	+
	5872	+ //? SetUndoStates();
	5873	+
4226	5874	ResetModel();
4227	5875	copy.HardTouch(); // recompile?
4228	5876	refreshContents();
4229	5877	}
4230	5878	}
4231	5879
4232		- void load() // throws ClassNotFoundException
	5880	+ void Open() // throws ClassNotFoundException
4233	5881	{
4234		- if (GrafreeD.standAlone)
	5882	+ if (Grafreed.standAlone)
4235	5883	{
4236		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5884	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4237	5885	browser.show();
4238	5886	String filename = browser.getFile();
4239	5887	if (filename != null && filename.length() > 0)
..	..	@@ -4310,6 +5958,8 @@
4310	5958
4311	5959	void save()
4312	5960	{
	5961	+ Replace();
	5962	+
4313	5963	if (lastname == null)
4314	5964	{
4315	5965	return;
..	..	@@ -4318,11 +5968,13 @@
4318	5968	try
4319	5969	{
4320	5970	FileOutputStream ostream = new FileOutputStream(lastname);
4321		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5971	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5972	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4322	5973
4323	5974	p.writeObject(copy);
4324	5975	p.flush();
4325	5976
	5977	+ zstream.close();
4326	5978	ostream.close();
4327	5979
4328	5980	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4330,19 +5982,23 @@
4330	5982	//ps.print(buffer.toString());
4331	5983	} catch (IOException e)
4332	5984	{
	5985	+ e.printStackTrace();
4333	5986	}
4334	5987	}
	5988	+
4335	5989	String lastname;
4336	5990
4337	5991	void saveAs()
4338	5992	{
4339		- if (GrafreeD.standAlone)
	5993	+ if (Grafreed.standAlone)
4340	5994	{
4341	5995	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4342	5996	browser.setVisible(true);
4343	5997	String filename = browser.getFile();
4344	5998	if (filename != null && filename.length() > 0)
4345	5999	{
	6000	+ if (!filename.endsWith(".gfd"))
	6001	+ filename += ".gfd";
4346	6002	lastname = browser.getDirectory() + filename;
4347	6003	save();
4348	6004	}
..	..	@@ -4441,13 +6097,13 @@
4441	6097	try
4442	6098	{
4443	6099	FileOutputStream ostream = new FileOutputStream(filename);
4444		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4445		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	6100	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	6101	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4446	6102
4447	6103	Object3D objectparent = obj.parent;
4448	6104	obj.parent = null;
4449	6105
4450		- Object3D object = (Object3D) GrafreeD.clone(obj);
	6106	+ Object3D object = (Object3D) Grafreed.clone(obj);
4451	6107
4452	6108	obj.parent = objectparent;
4453	6109
..	..	@@ -4459,8 +6115,8 @@
4459	6115	p.writeObject(object);
4460	6116	p.flush();
4461	6117
	6118	+ zstream.close();
4462	6119	ostream.close();
4463		- // zstream.close();
4464	6120
4465	6121	// group.selection.get(0).parent = parent;
4466	6122	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4481,7 +6137,7 @@
4481	6137	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4482	6138	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4483	6139	copy.generatePOV(buffer);
4484		- if (GrafreeD.standAlone)
	6140	+ if (Grafreed.standAlone)
4485	6141	{
4486	6142	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4487	6143	browser.show();
..	..	@@ -4507,21 +6163,20 @@
4507	6163	Object3D client;
4508	6164	Object3D copy;
4509	6165	MenuBar menuBar;
4510		- Menu windowMenu;
4511		- MenuItem loadItem;
	6166	+ Menu fileMenu;
	6167	+ MenuItem newItem;
	6168	+ MenuItem openItem;
4512	6169	MenuItem saveItem;
4513	6170	MenuItem saveAsItem;
4514	6171	MenuItem exportAsItem;
4515	6172	MenuItem reexportItem;
4516	6173	MenuItem povItem;
4517	6174	MenuItem closeItem;
4518		- Menu cameraMenu;
	6175	+
4519	6176	CheckboxMenuItem zBufferItem;
4520	6177	//MenuItem normalLensItem;
4521		- MenuItem editCameraItem;
4522		- MenuItem revertCameraItem;
4523		- CheckboxMenuItem toggleLiveItem;
4524	6178	MenuItem stepItem;
	6179	+ CheckboxMenuItem toggleLiveItem;
4525	6180	CheckboxMenuItem toggleFullScreenItem;
4526	6181	CheckboxMenuItem toggleTimelineItem;
4527	6182	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4530,28 +6185,44 @@
4530	6185	CheckboxMenuItem toggleFootContactItem;
4531	6186	CheckboxMenuItem toggleDLItem;
4532	6187	CheckboxMenuItem toggleTextureItem;
4533		- CheckboxMenuItem toggleRandomItem;
	6188	+ CheckboxMenuItem toggleSwitchItem;
4534	6189	CheckboxMenuItem toggleRootItem;
4535	6190	CheckboxMenuItem animationItem;
	6191	+ MenuItem archiveItem;
4536	6192	CheckboxMenuItem toggleHandleItem;
4537	6193	CheckboxMenuItem togglePaintItem;
4538	6194	JSplitPane mainPanel;
4539	6195	JScrollPane scrollpane;
	6196	+
4540	6197	JPanel toolbarPanel;
4541		- JPanel treePanel;
	6198	+
	6199	+ cGridBag treePanel;
	6200	+
4542	6201	JPanel radioPanel;
4543	6202	ButtonGroup buttonGroup;
4544		- JPanel ctrlPanel;
4545		- JPanel materialPanel;
	6203	+
	6204	+ cGridBag toolboxPanel;
	6205	+ cGridBag skyboxPanel;
	6206	+ cGridBag materialPanel;
	6207	+ cGridBag ctrlPanel;
	6208	+
4546	6209	JScrollPane infoPanel;
4547		- JPanel optionsPanel;
	6210	+
	6211	+ cGridBag optionsPanel;
	6212	+
4548	6213	JTabbedPane objectPanel;
4549		- JPanel XYZPanel;
	6214	+ boolean materialFlushed;
	6215	+ Object3D latestObject;
	6216	+
	6217	+ cGridBag transformPanel;
	6218	+ cGridBag XYZPanel;
	6219	+
4550	6220	JSplitPane gridPanel;
4551	6221	JSplitPane bigPanel;
4552		- JPanel bigThree;
4553		- JTabbedPane scenePanel;
4554		- JPanel centralPanel;
	6222	+
	6223	+ cGridBag bigThree;
	6224	+ cGridBag scenePanel;
	6225	+ cGridBag centralPanel;
4555	6226	JSplitPane cameraPanel;
4556	6227	JPanel timelinePanel;
4557	6228	JMenuBar timelineMenubar;
..	..	@@ -4604,67 +6275,76 @@
4604	6275	// MATERIAL
4605	6276	JLabel materialLabel;
4606	6277	JLabel colorLabel;
4607		- NumberSlider colorField;
	6278	+ cNumberSlider colorField;
4608	6279	JLabel modulationLabel;
4609		- NumberSlider modulationField;
	6280	+ cNumberSlider saturationField;
4610	6281	JLabel metalnessLabel;
4611		- NumberSlider metalnessField;
	6282	+ cNumberSlider metalnessField;
4612	6283	JLabel diffuseLabel;
4613		- NumberSlider diffuseField;
	6284	+ cNumberSlider diffuseField;
4614	6285	JLabel specularLabel;
4615		- NumberSlider specularField;
	6286	+ cNumberSlider specularField;
4616	6287	JLabel shininessLabel;
4617		- NumberSlider shininessField;
	6288	+ cNumberSlider shininessField;
4618	6289	JLabel shiftLabel;
4619		- NumberSlider shiftField;
	6290	+ cNumberSlider shiftField;
4620	6291	JLabel ambientLabel;
4621		- NumberSlider ambientField;
	6292	+ cNumberSlider ambientField;
4622	6293	JLabel lightareaLabel;
4623		- NumberSlider lightareaField;
	6294	+ cNumberSlider lightareaField;
4624	6295	JLabel diffusenessLabel;
4625		- NumberSlider diffusenessField;
	6296	+ cNumberSlider diffusenessField;
4626	6297	JLabel velvetLabel;
4627		- NumberSlider velvetField;
	6298	+ cNumberSlider velvetField;
4628	6299	JLabel sheenLabel;
4629		- NumberSlider sheenField;
	6300	+ cNumberSlider sheenField;
4630	6301	JLabel subsurfaceLabel;
4631		- NumberSlider subsurfaceField;
	6302	+ cNumberSlider subsurfaceField;
4632	6303	//JLabel bumpLabel;
4633	6304	//NumberSlider bumpField;
4634	6305	JLabel backlitLabel;
4635		- NumberSlider backlitField;
	6306	+ cNumberSlider backlitField;
4636	6307	JLabel anisoLabel;
4637		- NumberSlider anisoField;
	6308	+ cNumberSlider anisoField;
4638	6309	JLabel anisoVLabel;
4639		- NumberSlider anisoVField;
	6310	+ cNumberSlider anisoVField;
	6311	+
4640	6312	JLabel cameraLabel;
4641		- NumberSlider cameraField;
	6313	+ cNumberSlider cameraField;
4642	6314	JLabel selfshadowLabel;
4643		- NumberSlider selfshadowField;
	6315	+ cNumberSlider selfshadowField;
4644	6316	JLabel shadowLabel;
4645		- NumberSlider shadowField;
	6317	+ cNumberSlider shadowField;
4646	6318	JLabel textureLabel;
4647		- NumberSlider textureField;
	6319	+ cNumberSlider textureField;
4648	6320	JLabel opacityLabel;
4649		- NumberSlider opacityField;
	6321	+ cNumberSlider opacityField;
	6322	+ JLabel parallaxLabel;
	6323	+ cNumberSlider parallaxField;
4650	6324	JLabel fakedepthLabel;
4651		- NumberSlider fakedepthField;
	6325	+ cNumberSlider fakedepthField;
4652	6326	JLabel shadowbiasLabel;
4653		- NumberSlider shadowbiasField;
	6327	+ cNumberSlider shadowbiasField;
	6328	+
4654	6329	JLabel bumpLabel;
4655		- NumberSlider bumpField;
	6330	+ cNumberSlider bumpField;
4656	6331	JLabel noiseLabel;
4657		- NumberSlider noiseField;
	6332	+ cNumberSlider noiseField;
4658	6333	JLabel powerLabel;
4659		- NumberSlider powerField;
	6334	+ cNumberSlider powerField;
4660	6335	JLabel borderfadeLabel;
4661		- NumberSlider borderfadeField;
	6336	+ cNumberSlider borderfadeField;
4662	6337	JLabel fogLabel;
4663		- NumberSlider fogField;
	6338	+ cNumberSlider fogField;
4664	6339	JLabel opacityPowerLabel;
4665		- NumberSlider opacityPowerField;
4666		- JTree jTree;
	6340	+ cNumberSlider opacityPowerField;
	6341	+ cTree jTree;
4667	6342	//ObjectUI parent;
4668	6343
4669		- NumberSlider normalpushField;
	6344	+ cNumberSlider normalpushField;
	6345	+
	6346	+ private MenuItem importGFDItem;
	6347	+ private MenuItem importVRMLX3DItem;
	6348	+ private MenuItem import3DSItem;
	6349	+ private MenuItem importOBJItem;
4670	6350	}