~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,7 +34,129 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ public cToggleButton pinButton;
	38	+ boolean timeline;
	39	+ boolean wasFullScreen;
31	40
	41	+ GroupEditor callee;
	42	+ JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
	82	+
	83	+ cButton GetButton(String name, boolean border)
	84	+ {
	85	+ ImageIcon icon = GetIcon(name);
	86	+ return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
	93	+ }
	94	+
	95	+ cToggleButton GetToggleButton(String name, boolean border)
	96	+ {
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
	99	+ }
	100	+
	101	+ cCheckBox GetCheckBox(String name, boolean border)
	102	+ {
	103	+ ImageIcon icon = GetIcon(name);
	104	+ return new cCheckBox(icon, border);
	105	+ }
	106	+
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
	109	+ static ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
	117	+ try
	118	+ {
	119	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	120	+
	121	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	122	+// {
	123	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	124	+// Graphics2D g = resized.createGraphics();
	125	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	126	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	127	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	128	+// g.dispose();
	129	+//
	130	+// image = resized;
	131	+// }
	132	+
	133	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
	137	+ return icon;
	138	+ }
	139	+ catch (Exception e)
	140	+ {
	141	+ //icons.put(name, null);
	142	+ return null;
	143	+ }
	144	+ }
	145	+
	146	+ BufferedImage GetImage(String name)
	147	+ {
	148	+ try
	149	+ {
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
	153	+ }
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
	158	+ }
	159	+
32	160	// SCRIPT
33	161
34	162	transient JFrame textpanel = null;
..	..	@@ -119,51 +247,62 @@
119	247	void keyPressed(int key, int modifiers)
120	248	{
121	249	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	250	+ Globals.theRenderer.keyPressed(key, modifiers);
123	251	}
124	252	*/
125	253
126	254	static GridBagConstraints aConstraints;
127	255	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	256	+
130	257	static int GRIDWIDTH = 100; // 4;
131	258
132	259	public void closeUI()
133	260	{
134	261	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	262	+// System.out.println("this = " + this);
	263	+// System.out.println("objEditor = " + objEditor);
137	264	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	265	+// objEditor.ctrlPanel.remove(nameField);
139	266
140		- if (!GroupEditor.allparams)
	267	+ objEditor.ctrlPanel.remove(namePanel);
	268	+
	269	+ if (!allparams)
141	270	return;
142	271
143		- objEditor.ctrlPanel.remove(liveCB);
144		- objEditor.ctrlPanel.remove(hideCB);
145		- objEditor.ctrlPanel.remove(markCB);
146		-
147		- objEditor.ctrlPanel.remove(randomCB);
148		- objEditor.ctrlPanel.remove(speedupCB);
149		- objEditor.ctrlPanel.remove(rewindCB);
150		-
151		- objEditor.ctrlPanel.remove(resetButton);
152		- objEditor.ctrlPanel.remove(stepButton);
153		-// objEditor.ctrlPanel.remove(stepAllButton);
154		-// objEditor.ctrlPanel.remove(resetAllButton);
155		- objEditor.ctrlPanel.remove(link2masterCB);
156		- //objEditor.ctrlPanel.remove(flipVCB);
157		- //objEditor.ctrlPanel.remove(texresMenu);
158		- objEditor.ctrlPanel.remove(slowerButton);
159		- objEditor.ctrlPanel.remove(fasterButton);
160		- objEditor.ctrlPanel.remove(remarkButton);
	272	+// objEditor.ctrlPanel.remove(liveCB);
	273	+// objEditor.ctrlPanel.remove(hideCB);
	274	+// objEditor.ctrlPanel.remove(markCB);
	275	+//
	276	+// objEditor.ctrlPanel.remove(randomCB);
	277	+// objEditor.ctrlPanel.remove(speedupCB);
	278	+// objEditor.ctrlPanel.remove(rewindCB);
	279	+//
	280	+// objEditor.ctrlPanel.remove(resetButton);
	281	+// objEditor.ctrlPanel.remove(stepButton);
	282	+//// objEditor.ctrlPanel.remove(stepAllButton);
	283	+//// objEditor.ctrlPanel.remove(resetAllButton);
	284	+// objEditor.ctrlPanel.remove(link2masterCB);
	285	+// //objEditor.ctrlPanel.remove(flipVCB);
	286	+// //objEditor.ctrlPanel.remove(texresMenu);
	287	+// objEditor.ctrlPanel.remove(slowerButton);
	288	+// objEditor.ctrlPanel.remove(fasterButton);
	289	+// objEditor.ctrlPanel.remove(remarkButton);
	290	+
	291	+ objEditor.ctrlPanel.remove(setupPanel);
	292	+ objEditor.ctrlPanel.remove(setupPanel2);
	293	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	294	+ objEditor.ctrlPanel.remove(pushPanel);
	295	+ //objEditor.ctrlPanel.remove(fillPanel);
	296	+
	297	+ //Remove(normalpushField);
161	298	}
162	299
163	300	public ObjEditor GetEditor()
164	301	{
165	302	return objEditor; //.GetEditor();
166	303	}
	304	+
	305	+ // Sometimes myself, sometimes my callee's.
167	306	ObjEditor objEditor;
168	307
169	308	/*
..	..	@@ -199,6 +338,14 @@
199	338	client = inClient;
200	339	copy = client;
201	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
202	349	// "this" is not called: SetupUI2(objEditor);
203	350	}
204	351
..	..	@@ -212,6 +359,14 @@
212	359	client = inClient;
213	360	copy = client;
214	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
215	370	SetupUI2(callee.GetEditor());
216	371	}
217	372
..	..	@@ -226,23 +381,33 @@
226	381	//localCopy.parent = null;
227	382
228	383	frame = new JFrame();
	384	+ frame.setUndecorated(false);
229	385	objEditor = this;
230	386	this.callee = callee;
231	387
232	388	//parent = p;
233	389
234	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
235		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
236	393	//gd.setFullScreenWindow(this);
237	394	//setResizable(false);
238	395	//if (!isDisplayable())
239	396	//setUndecorated(true);
240	397
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	398	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	399	client = inClient;
243	400	copy = localCopy;
244	401	copy.editWindow = this;
245	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
246	411	SetupMenu();
247	412
248	413	//SetupName(objEditor); // new
..	..	@@ -256,28 +421,52 @@
256	421	return frame.action(event, obj);
257	422	}
258	423
	424	+ // Cannot work without static
	425	+ static boolean allparams = true;
	426	+
	427	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	428	+
	429	+ // This is to refresh the UI of the material panel.
	430	+ boolean patchMaterial;
	431	+
259	432	void SetupMenu()
260	433	{
261	434	frame.setMenuBar(menuBar = new MenuBar());
262		- menuBar.add(windowMenu = new Menu("File"));
263		- windowMenu.add(loadItem = new MenuItem("Load..."));
264		- windowMenu.add("-");
265		- windowMenu.add(saveItem = new MenuItem("Save"));
266		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	435	+ menuBar.add(fileMenu = new Menu("File"));
	436	+ fileMenu.add(newItem = new MenuItem("New"));
	437	+ fileMenu.add(openItem = new MenuItem("Open..."));
	438	+
	439	+ //oe.menuBar.add(menu = new Menu("Include"));
	440	+ Menu menu = new Menu("Import");
	441	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	442	+ importOBJItem.addActionListener(this);
	443	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	444	+ import3DSItem.addActionListener(this);
	445	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	446	+ importVRMLX3DItem.addActionListener(this);
	447	+ menu.add("-");
	448	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	449	+ importGFDItem.addActionListener(this);
	450	+ fileMenu.add(menu);
	451	+ fileMenu.add("-");
	452	+
	453	+ fileMenu.add(saveItem = new MenuItem("Save"));
	454	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	455	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
268		- windowMenu.add("-");
269		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
270		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
271		- windowMenu.add("-");
	456	+ fileMenu.add("-");
	457	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	458	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	459	+ fileMenu.add("-");
272	460	if (client.parent != null)
273	461	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	462	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	463	} else
276	464	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	465	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	466	}
279	467
280		- loadItem.addActionListener(this);
	468	+ newItem.addActionListener(this);
	469	+ openItem.addActionListener(this);
281	470	saveItem.addActionListener(this);
282	471	saveAsItem.addActionListener(this);
283	472	exportAsItem.addActionListener(this);
..	..	@@ -285,82 +474,103 @@
285	474	//povItem.addActionListener(this);
286	475	closeItem.addActionListener(this);
287	476
288		- menuBar.add(cameraMenu = new Menu("View"));
289		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
290		- //zBufferItem.addActionListener(this);
291		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
292		- //normalLensItem.addActionListener(this);
293		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294		- revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullScreenItem.addItemListener(this);
297		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
299		- toggleTimelineItem.addItemListener(this);
300		- cameraMenu.add("-");
301		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
302		- toggleTextureItem.addItemListener(this);
303		- toggleTextureItem.setState(CameraPane.textureon);
304		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
305		- toggleLiveItem.addItemListener(this);
306		- toggleLiveItem.setState(CameraPane.isLIVE());
307		- cameraMenu.add(stepItem = new MenuItem("Step"));
308		- stepItem.addActionListener(this);
309		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
310		-// toggleDLItem.addItemListener(this);
311		-// toggleDLItem.setState(false);
312		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
313		- toggleRenderItem.addItemListener(this);
314		- toggleRenderItem.setState(!CameraPane.frozen);
315		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
316		- toggleDebugItem.addItemListener(this);
317		- toggleDebugItem.setState(CameraPane.DEBUG);
318		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
319		- toggleFrustumItem.addItemListener(this);
320		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
321		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
322		- toggleFootContactItem.addItemListener(this);
323		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
324		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
325		- toggleRandomItem.addItemListener(this);
326		- toggleRandomItem.setState(CameraPane.RANDOM);
327		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
328		- toggleHandleItem.addItemListener(this);
329		- toggleHandleItem.setState(CameraPane.HANDLES);
330		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331		- togglePaintItem.addItemListener(this);
332		- togglePaintItem.setState(CameraPane.PAINTMODE);
333		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
334		-// toggleRootItem.addItemListener(this);
335		-// toggleRootItem.setState(false);
336		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
337		-// animationItem.addItemListener(this);
338		-// animationItem.setState(CameraPane.ANIMATION);
339		- cameraMenu.add("-");
340		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
341		- editCameraItem.addActionListener(this);
342		-
343	477	objectPanel = new JTabbedPane();
	478	+
	479	+ ChangeListener changeListener = new ChangeListener()
	480	+ {
	481	+ //String name;
	482	+
	483	+ public void stateChanged(ChangeEvent changeEvent)
	484	+ {
	485	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	486	+// {
	487	+// if (latestObject != null)
	488	+// {
	489	+// refreshContents(true);
	490	+// SetMaterial(latestObject);
	491	+// }
	492	+//
	493	+// materialFlushed = true;
	494	+// }
	495	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	496	+// {
	497	+// if (listUI.size() == 0)
	498	+// EditSelection(false);
	499	+// }
	500	+
	501	+// if (objectPanel.getSelectedIndex() == 4)
	502	+// {
	503	+// name = copy.skyboxname;
	504	+//
	505	+// if (name == null)
	506	+// {
	507	+// name = "";
	508	+// }
	509	+//
	510	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	511	+// copy.skyboxext = "jpg";
	512	+// }
	513	+// else
	514	+// {
	515	+// if (name != null)
	516	+// {
	517	+// if (name.equals(""))
	518	+// {
	519	+// copy.skyboxname = null;
	520	+// copy.skyboxext = null;
	521	+// }
	522	+// else
	523	+// {
	524	+// copy.skyboxname = name;
	525	+// }
	526	+// }
	527	+// }
	528	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	529	+
	530	+// refreshContents(false); // To refresh Info tab
	531	+ cameraView.repaint();
	532	+ }
	533	+ };
	534	+ objectPanel.addChangeListener(changeListener);
	535	+
344	536	toolbarPanel = new JPanel();
345	537	toolbarPanel.setName("Toolbar");
346		- treePanel = new JPanel();
	538	+
	539	+ treePanel = new cGridBag();
347	540	treePanel.setName("Tree");
348		- ctrlPanel = new JPanel(); // new GridBagLayout());
349		- ctrlPanel.setName("Edit");
350		- materialPanel = new JPanel();
351		- materialPanel.setName("Material");
	541	+
	542	+ editPanel = new cGridBag().setVertical(true);
	543	+ //editPanel.setName("Edit");
	544	+
	545	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	546	+
	547	+ editCommandsPanel = new cGridBag();
	548	+ editPanel.add(editCommandsPanel);
	549	+ editPanel.add(ctrlPanel);
	550	+
	551	+ toolboxPanel = new cGridBag().setVertical(true);
	552	+ //toolboxPanel.setName("Toolbox");
	553	+
	554	+ skyboxPanel = new cGridBag().setVertical(true);
	555	+
	556	+ materialPanel = new cGridBag().setVertical(false);
	557	+ //materialPanel.setName("Material");
	558	+
352	559	/JTextPane/
353	560	infoarea = createTextPane();
	561	+ doc = infoarea.getStyledDocument();
	562	+
354	563	infoarea.setEditable(true);
355	564	SetText();
	565	+
356	566	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
357	567	// infoarea.setOpaque(false);
358	568	// //infoarea.setForeground(textcolor);
359		- infoarea.setLineWrap(true);
360		- infoarea.setWrapStyleWord(true);
	569	+// TEXTAREA infoarea.setLineWrap(true);
	570	+// TEXTAREA infoarea.setWrapStyleWord(true);
361	571	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
362		- infoPanel.setPreferredSize(new Dimension(50, 200));
363		- infoPanel.setName("Info");
	572	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	573	+ //infoPanel.setName("Info");
364	574	//infoPanel.setLayout(new BorderLayout());
365	575	//infoPanel.add(createTextPane());
366	576
..	..	@@ -368,16 +578,23 @@
368	578	mainPanel.setName("Main");
369	579	mainPanel.setContinuousLayout(true);
370	580	mainPanel.setOneTouchExpandable(true);
371		- mainPanel.setDividerLocation(1.0);
372	581	mainPanel.setDividerSize(9);
373		- mainPanel.setResizeWeight(0);
374		-
	582	+ mainPanel.setDividerLocation(0.5); //1.0);
	583	+ mainPanel.setResizeWeight(0.5);
	584	+
	585	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	586	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	587	+ divider.setDividerSize(15);
	588	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	589	+
	590	+ mainPanel.setUI(new BasicSplitPaneUI());
	591	+
375	592	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
376	593	//mainPanel.setLayout(new GridBagLayout());
377	594	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
378		- treePanel.setLayout(new GridBagLayout());
379		- ctrlPanel.setLayout(new GridBagLayout());
380		- materialPanel.setLayout(new GridBagLayout());
	595	+// treePanel.setLayout(new GridBagLayout());
	596	+ //ctrlPanel.setLayout(new GridBagLayout());
	597	+ //materialPanel.setLayout(new GridBagLayout());
381	598
382	599	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
383	600	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -416,7 +633,7 @@
416	633	static String newline = "\n";
417	634	protected static final String buttonString = "JButton";
418	635	StyledDocument doc;
419		- JTextArea infoarea;
	636	+ JTextPane infoarea;
420	637
421	638	void ClearInfo()
422	639	{
..	..	@@ -439,10 +656,10 @@
439	656	e.printStackTrace();
440	657	}
441	658
442		- String selection = infoarea.getText();
443		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
444		- java.awt.datatransfer.Clipboard clipboard =
445		- Toolkit.getDefaultToolkit().getSystemClipboard();
	659	+// String selection = infoarea.getText();
	660	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	661	+// java.awt.datatransfer.Clipboard clipboard =
	662	+// Toolkit.getDefaultToolkit().getSystemClipboard();
446	663	//clipboard.setContents(data, data);
447	664	}
448	665
..	..	@@ -465,13 +682,13 @@
465	682	//SendInfo("Name:", "bold");
466	683	if (sel.GetTextures() != null \|\| debug)
467	684	{
468		- si.SendInfo(sel.toString(), "bold");
	685	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
469	686	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
470	687	if (sel.Size() > 0)
471	688	{
472	689	si.SendInfo("#children = " + sel.Size(), "regular");
473	690	}
474		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	691	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
475	692	if (debug)
476	693	{
477	694	try
..	..	@@ -483,7 +700,10 @@
483	700	}
484	701
485	702	if (full)
486		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	703	+ {
	704	+ si.SendInfo(" BBox min: " + minima, "regular");
	705	+ si.SendInfo(" BBox max: " + maxima, "regular");
	706	+ }
487	707
488	708	if (sel.bRep != null)
489	709	{
..	..	@@ -510,7 +730,7 @@
510	730	}
511	731	if (sel.support != null)
512	732	{
513		- si.SendInfo(" support: " + sel.support, "regular");
	733	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
514	734	}
515	735	if (sel.scriptnode != null)
516	736	{
..	..	@@ -581,6 +801,9 @@
581	801	{
582	802	CameraPane.pointflow = (PointFlow) sel;
583	803	}
	804	+
	805	+ si.SendInfo("_____________________", "regular");
	806	+ si.SendInfo("", "regular");
584	807	}
585	808	}
586	809
..	..	@@ -596,52 +819,211 @@
596	819	}
597	820	}
598	821
599		- private JTextArea createTextPane()
600		- {
601		- String[] initString =
602		- {
603		- "This is an editable JTextPane, ", //regular
604		- "another ", //italic
605		- "styled ", //bold
606		- "text ", //small
607		- "component, ", //large
608		- "which supports embedded components..." + newline,//regular
609		- " " + newline, //button
610		- "...and embedded icons..." + newline, //regular
611		- " ", //icon
612		- newline + "JTextPane is a subclass of JEditorPane that "
613		- + "uses a StyledEditorKit and StyledDocument, and provides "
614		- + "cover methods for interacting with those objects."
615		- };
	822	+//static GraphicsDevice device = GraphicsEnvironment
	823	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
616	824
617		- String[] initStyles =
618		- {
619		- "regular", "italic", "bold", "small", "large",
620		- "regular", "button", "regular", "icon",
621		- "regular"
622		- };
	825	+ Rectangle keeprect;
	826	+ cRadio radio;
	827	+
	828	+cButton keepButton;
	829	+ cButton twoButton; // Full 3D
	830	+ cButton sixButton;
	831	+ cButton threeButton;
	832	+ cButton sevenButton;
	833	+ cButton fourButton; // full panel
	834	+ cButton oneButton; // full XYZ
	835	+ //cButton currentLayout;
	836	+
	837	+ boolean maximized;
	838	+
	839	+ cButton fullscreenLayout;
	840	+ cButton expandedLayout;
623	841
624		- JTextPane textPane = new JTextPane();
625		- textPane.setEditable(true);
626		- /StyledDocument/ doc = textPane.getStyledDocument();
627		- addStylesToDocument(doc);
628		-
629		- try
	842	+ void Minimize()
630	843	{
631		- for (int j = 0; j < 2; j++)
	844	+ frame.setState(Frame.ICONIFIED);
	845	+ frame.validate();
	846	+ }
	847	+
	848	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	849	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	850	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	851	+ void Maximize()
	852	+ {
	853	+ if (CameraPane.FULLSCREEN)
632	854	{
633		- for (int i = 0; i < initString.length; i++)
634		- {
635		- doc.insertString(doc.getLength(), initString[i],
636		- doc.getStyle(initStyles[i]));
637		- }
	855	+ ToggleFullScreen();
638	856	}
639		- } catch (BadLocationException ble)
	857	+
	858	+ if (maximized)
	859	+ {
	860	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	861	+ }
	862	+ else
	863	+ {
	864	+ keeprect = frame.getBounds();
	865	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	866	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	867	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	868	+// frame.setState(Frame.MAXIMIZED_BOTH);
	869	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	870	+ }
	871	+
	872	+ maximized ^= true;
	873	+
	874	+ frame.validate();
	875	+ }
	876	+
	877	+ cButton minButton;
	878	+ cButton maxButton;
	879	+ cButton fullButton;
	880	+ cButton collapseButton;
	881	+ cButton maximize3DButton;
	882	+
	883	+ void ToggleFullScreen()
640	884	{
641		- System.err.println("Couldn't insert initial text into text pane.");
	885	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	886	+
	887	+ cameraView.ToggleFullScreen();
	888	+
	889	+ if (!CameraPane.FULLSCREEN)
	890	+ {
	891	+ device.setFullScreenWindow(null);
	892	+ frame.dispose();
	893	+ frame.setUndecorated(false);
	894	+ frame.validate();
	895	+ frame.setVisible(true);
	896	+
	897	+ //frame.setVisible(false);
	898	+// frame.removeNotify();
	899	+// frame.setUndecorated(false);
	900	+// frame.addNotify();
	901	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	902	+
	903	+// X frame.getContentPane().remove(/"Center",/bigThree);
	904	+// X framePanel.add(bigThree);
	905	+// X frame.getContentPane().add(/"Center",/framePanel);
	906	+// framePanel.setDividerLocation(46); // icons are 24x24
	907	+
	908	+ //frame.setVisible(true);
	909	+// radio.layout = keepButton;
	910	+ //theFrame = null;
	911	+ keepButton = null;
	912	+// radio.layout.doClick();
	913	+
	914	+ } else
	915	+ {
	916	+ keepButton = radio.layout;
	917	+ //keeprect = frame.getBounds();
	918	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	919	+// frame.getToolkit().getScreenSize().height);
	920	+ //frame.setVisible(false);
	921	+
	922	+ frame.dispose();
	923	+ frame.setUndecorated(true);
	924	+ device.setFullScreenWindow(frame);
	925	+ frame.validate();
	926	+ frame.setVisible(true);
	927	+// frame.removeNotify();
	928	+// frame.setUndecorated(true);
	929	+// frame.addNotify();
	930	+// X frame.getContentPane().remove(/"Center",/framePanel);
	931	+// X framePanel.remove(bigThree);
	932	+// X frame.getContentPane().add(/"Center",/bigThree);
	933	+// framePanel.setDividerLocation(0);
	934	+
	935	+// radio.layout = fullscreenLayout;
	936	+// radio.layout.doClick();
	937	+ //frame.setVisible(true);
	938	+ }
	939	+ frame.validate();
	940	+
	941	+ cameraView.requestFocusInWindow();
642	942	}
643	943
644		- return new JTextArea(); // textPane;
	944	+ void CollapseToolbar()
	945	+ {
	946	+ framePanel.setDividerLocation(0);
	947	+ //frame.validate();
	948	+
	949	+ cameraView.requestFocusInWindow();
	950	+ }
	951	+
	952	+ private Object3D Duplicate(Object3D object)
	953	+ {
	954	+ boolean temp = CameraPane.SWITCH;
	955	+ CameraPane.SWITCH = false;
	956	+
	957	+ if (Grafreed.grafreed.universe.versiontable == null)
	958	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	959	+
	960	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	961	+ // if (copy == client)
	962	+
	963	+ Object3D versions[] = object.versionlist;
	964	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	965	+ object.versionlist = null;
	966	+ object.versiontable = null;
	967	+
	968	+ //byte[] compress = Compress(copy);
	969	+ Object3D compress = (Object3D)Grafreed.clone(object);
	970	+
	971	+ object.versionlist = versions;
	972	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	973	+
	974	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	975	+
	976	+ CameraPane.SWITCH = temp;
	977	+
	978	+ return compress;
	979	+ }
	980	+
	981	+ private JTextPane createTextPane()
	982	+ {
	983	+// TEXTAREA String[] initString =
	984	+// {
	985	+// "This is an editable JTextPane, ", //regular
	986	+// "another ", //italic
	987	+// "styled ", //bold
	988	+// "text ", //small
	989	+// "component, ", //large
	990	+// "which supports embedded components..." + newline,//regular
	991	+// " " + newline, //button
	992	+// "...and embedded icons..." + newline, //regular
	993	+// " ", //icon
	994	+// newline + "JTextPane is a subclass of JEditorPane that "
	995	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	996	+// + "cover methods for interacting with those objects."
	997	+// };
	998	+//
	999	+// String[] initStyles =
	1000	+// {
	1001	+// "regular", "italic", "bold", "small", "large",
	1002	+// "regular", "button", "regular", "icon",
	1003	+// "regular"
	1004	+// };
	1005	+//
	1006	+// JTextPane textPane = new JTextPane();
	1007	+// textPane.setEditable(true);
	1008	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1009	+// addStylesToDocument(doc);
	1010	+//
	1011	+// try
	1012	+// {
	1013	+// for (int j = 0; j < 2; j++)
	1014	+// {
	1015	+// for (int i = 0; i < initString.length; i++)
	1016	+// {
	1017	+// doc.insertString(doc.getLength(), initString[i],
	1018	+// doc.getStyle(initStyles[i]));
	1019	+// }
	1020	+// }
	1021	+// } catch (BadLocationException ble)
	1022	+// {
	1023	+// System.err.println("Couldn't insert initial text into text pane.");
	1024	+// }
	1025	+
	1026	+ return new JTextPane(); // textPane;
645	1027	}
646	1028
647	1029	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -694,7 +1076,7 @@
694	1076	protected static ImageIcon createImageIcon(String path,
695	1077	String description)
696	1078	{
697		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1079	+ java.net.URL imgURL = Grafreed.class.getResource(path);
698	1080	if (imgURL != null)
699	1081	{
700	1082	return new ImageIcon(imgURL, description);
..	..	@@ -717,6 +1099,7 @@
717	1099	{
718	1100	SetupMaterial(materialPanel);
719	1101	}
	1102	+
720	1103	//SetupName();
721	1104	//SetupViews();
722	1105	}
..	..	@@ -726,6 +1109,7 @@
726	1109	// NumberSlider vDivsField;
727	1110	// JCheckBox endcaps;
728	1111	JCheckBox liveCB;
	1112	+ JCheckBox selectableCB;
729	1113	JCheckBox hideCB;
730	1114	JCheckBox link2masterCB;
731	1115	JCheckBox markCB;
..	..	@@ -733,7 +1117,12 @@
733	1117	JCheckBox speedupCB;
734	1118	JCheckBox rewindCB;
735	1119	JCheckBox flipVCB;
	1120	+
	1121	+ cCheckBox toggleTextureCB;
	1122	+ cCheckBox toggleSwitchCB;
	1123	+
736	1124	JComboBox texresMenu;
	1125	+
737	1126	JButton resetButton;
738	1127	JButton stepButton;
739	1128	JButton stepAllButton;
..	..	@@ -741,115 +1130,87 @@
741	1130	JButton slowerButton;
742	1131	JButton fasterButton;
743	1132	JButton remarkButton;
	1133	+
	1134	+ cGridBag editPanel;
	1135	+ cGridBag editCommandsPanel;
	1136	+
	1137	+ cGridBag namePanel;
	1138	+ cGridBag setupPanel;
	1139	+ cGridBag setupPanel2;
	1140	+ cGridBag objectCommandsPanel;
	1141	+ cGridBag pushPanel;
	1142	+ cGridBag fillPanel;
744	1143
745		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1144	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
746	1145	{
747	1146	JCheckBox cb;
748	1147
749		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
750		- oe.aConstraints.gridwidth = 1; // 3;
751		-// oe.aConstraints.weightx = 1;
752		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
753		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1148	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
754	1149	cb.addItemListener(this);
755		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
756		- oe.aConstraints.gridwidth = 1;
757		- oe.aConstraints.gridx += 1;
758	1150
759	1151	return cb;
760	1152	}
761	1153
762		- cButton AddButton(ObjEditor oe, String label)
	1154	+ cButton AddButton(cGridBag panel, String label)
763	1155	{
764	1156	cButton cb;
765	1157
766		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
767		- oe.aConstraints.gridwidth = 1;
768		-// oe.aConstraints.weightx = 1;
769		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
770		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1158	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
771	1159	cb.addActionListener(this);
772		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
773		- oe.aConstraints.gridwidth = 1;
774		- oe.aConstraints.gridx += 1;
775	1160
776	1161	return cb;
777	1162	}
778	1163
779		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1164	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
780	1165	{
781	1166	JComboBox combo;
782	1167
783		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
784		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
785		- oe.aConstraints.gridx += 1;
	1168	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
786	1169	combo.addActionListener(this);
787	1170
788	1171	return combo;
789	1172	}
790	1173
791		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1174	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
792	1175	{
793		- NumberSlider combo;
	1176	+ cGridBag control = new cGridBag();
	1177	+
	1178	+ cNumberSlider combo;
794	1179
795	1180	JLabel jlabel = new JLabel(label);
796		-
797		- aConstraints.fill = GridBagConstraints.VERTICAL;
798	1181	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
799		- aConstraints.gridwidth = 2;
800		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
801		- aConstraints.gridx += 1;
802		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
803		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
804		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
805		- aConstraints.gridx += 1;
806		- aConstraints.gridwidth = 1;
807		-
	1182	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1183	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	1184	combo.setFloat(current);
809		-
810		- combo.label = jlabel;
811		-
812		- combo.addChangeListener(this);
813		-
814		- return combo;
	1185	+
	1186	+ panel.add(control);
	1187	+
	1188	+ return control;
815	1189	}
816	1190
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1191	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
818	1192	{
819		- NumberSlider combo;
	1193	+ cGridBag control = new cGridBag();
	1194	+
	1195	+ cNumberSlider combo;
820	1196
821	1197	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	1198	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 2;
826		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
829		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	1199	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1200	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	1201	combo.setInteger(current);
835	1202
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	1203	+ panel.add(control);
	1204	+
	1205	+ return control;
841	1206	}
842	1207
843		- JTextArea AddText(JPanel ctrlPanel, String name)
	1208	+ JTextArea AddText(cGridBag ctrlPanel, String name)
844	1209	{
845	1210	JTextArea text;
846	1211
847		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
848		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
849		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1212	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
850	1213	text.addCaretListener(this);
851		- aConstraints.gridx += 1;
852		- aConstraints.gridwidth = 1;
853	1214
854	1215	return text;
855	1216	}
..	..	@@ -879,9 +1240,16 @@
879	1240	objEditor.ctrlPanel.remove(j);
880	1241	}
881	1242
	1243	+ void Remove(cNumberSlider j)
	1244	+ {
	1245	+ j.removeChangeListener(this);
	1246	+ //objEditor.ctrlPanel.remove(j.label);
	1247	+ objEditor.ctrlPanel.remove(j);
	1248	+ }
	1249	+
882	1250	/*
883	1251	*/
884		- void Return() // ObjEditor oe)
	1252	+ void Return0() // ObjEditor oe)
885	1253	{
886	1254	aConstraints.gridy += 1;
887	1255	aConstraints.gridx = 0;
..	..	@@ -936,35 +1304,93 @@
936	1304
937	1305	void SetupUI2(ObjEditor oe)
938	1306	{
939		-// oe.aConstraints.weightx = 0;
940		-// oe.aConstraints.weighty = 0;
941		-// oe.aConstraints.gridx = 0;
942		-// oe.aConstraints.gridy = 0;
943		- SetupName(oe);
	1307	+ //SetupName(oe);
944	1308
945		- if (!GroupEditor.allparams)
	1309	+ namePanel = new cGridBag();
	1310	+
	1311	+ //if (copy.pinned)
	1312	+ {
	1313	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1314	+ pinButton.setSelected(copy.pinned);
	1315	+ cGridBag t = new cGridBag();
	1316	+ t.preferredWidth = 2;
	1317	+ t.add(pinButton);
	1318	+ namePanel.add(t);
	1319	+
	1320	+ pinButton.addItemListener(this);
	1321	+ }
	1322	+
	1323	+ nameField = AddText(namePanel, copy.GetName());
	1324	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1325	+ oe.ctrlPanel.add(namePanel);
	1326	+
	1327	+ oe.ctrlPanel.Return();
	1328	+
	1329	+ if (!allparams)
946	1330	return;
947	1331
948		- liveCB = AddCheckBox(oe, "Live", copy.live);
949		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
950		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1332	+ setupPanel = new cGridBag().setVertical(false);
	1333	+
	1334	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1335	+ liveCB.setToolTipText("Animate object");
	1336	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1337	+ markCB.setToolTipText("Set target transform");
	1338	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1339	+ selectableCB.setToolTipText("Make object selectable");
951	1340	// Return();
952		- markCB = AddCheckBox(oe, "Mark", copy.marked);
953		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
954		- randomCB = AddCheckBox(oe, "Rand", copy.random);
955		- Return();
956		- resetButton = AddButton(oe, "Reset");
957		- stepButton = AddButton(oe, "Step");
	1341	+
	1342	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1343	+ hideCB.setToolTipText("Hide object");
	1344	+
	1345	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1346	+
	1347	+ setupPanel2 = new cGridBag().setVertical(false);
	1348	+
	1349	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1350	+ rewindCB.setToolTipText("Rewind animation");
	1351	+
	1352	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1353	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1354	+
	1355	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1356	+ link2masterCB.setToolTipText("Attach to support");
	1357	+
	1358	+ if (Globals.ADVANCED)
	1359	+ {
	1360	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1361	+ speedupCB.setToolTipText("Option motion capture");
	1362	+ }
	1363	+
	1364	+ oe.ctrlPanel.add(setupPanel);
	1365	+ oe.ctrlPanel.Return();
	1366	+ oe.ctrlPanel.add(setupPanel2);
	1367	+ oe.ctrlPanel.Return();
	1368	+
	1369	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1370	+
	1371	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1372	+ resetButton.setToolTipText("Jump to frame zero");
	1373	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1374	+ stepButton.setToolTipText("Step one frame");
958	1375	// resetAllButton = AddButton(oe, "Reset All");
959	1376	// stepAllButton = AddButton(oe, "Step All");
960		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
961	1377	// Return();
962		- slowerButton = AddButton(oe, "Slow");
963		- fasterButton = AddButton(oe, "Fast");
964		- remarkButton = AddButton(oe, "Rem");
	1378	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1379	+ slowerButton.setToolTipText("Decrease animation speed");
	1380	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1381	+ fasterButton.setToolTipText("Increase animation speed");
	1382	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1383	+ remarkButton.setToolTipText("Set the current transform as the target");
965	1384
966		- Return();
	1385	+ oe.ctrlPanel.add(objectCommandsPanel);
	1386	+ oe.ctrlPanel.Return();
967	1387
	1388	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1389	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1390	+ //Return();
	1391	+
	1392	+ oe.ctrlPanel.Return();
	1393	+
968	1394	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
969	1395	// ObjEditor.aConstraints.gridx += 1;
970	1396
..	..	@@ -1058,7 +1484,7 @@
1058	1484	oe.aConstraints.gridwidth = 1;
1059	1485	/**/
1060	1486	nameField = AddText(oe.ctrlPanel, copy.GetName());
1061		- Return();
	1487	+ oe.ctrlPanel.Return();
1062	1488
1063	1489	//ctrlPanel.add(textureButton = new Button("Texture..."));
1064	1490	//textureButton.setEnabled(false);
..	..	@@ -1116,6 +1542,7 @@
1116	1542
1117	1543	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1118	1544	{
	1545	+ if (Globals.DEBUG)
1119	1546	System.out.println("CREATE CAMERAS");
1120	1547	cams = new cTemplate();
1121	1548	cams.name = "Cameras";
..	..	@@ -1160,11 +1587,25 @@
1160	1587	//JPanel worldPanel =
1161	1588	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1162	1589	//worldPanel.setName("World");
1163		- centralPanel = new JPanel(new BorderLayout());
1164		- timelinePanel = new JPanel(new BorderLayout());
1165		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1590	+ centralPanel = new cGridBag();
	1591	+ centralPanel.preferredWidth = 20;
	1592	+
	1593	+ if (Globals.ADVANCED)
	1594	+ {
	1595	+ timelinePanel = new JPanel(new BorderLayout());
	1596	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1166	1597
	1598	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1599	+ cameraPanel.setContinuousLayout(true);
	1600	+ cameraPanel.setOneTouchExpandable(true);
	1601	+// cameraPanel.setDividerLocation(0.9);
	1602	+// cameraPanel.setDividerSize(9);
	1603	+ cameraPanel.setResizeWeight(1.0);
	1604	+
	1605	+ }
	1606	+
1167	1607	centralPanel.add(cameraView);
	1608	+ centralPanel.setFocusable(true);
1168	1609	//frame.setJMenuBar(timelineMenubar);
1169	1610	//centralPanel.add(timelinePanel);
1170	1611
..	..	@@ -1183,12 +1624,14 @@
1183	1624	//frontView.object = copy;
1184	1625	//sideView.object = copy;
1185	1626
1186		- XYZPanel = new JPanel();
1187		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1627	+ XYZPanel = new cGridBag().setVertical(true);
	1628	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1188	1629
1189		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1190		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1191		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1630	+ XYZPanel.preferredWidth = 5;
	1631	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1632	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1633	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1634	+ //XYZPanel.setName("XYZ");
1192	1635
1193	1636	/*
1194	1637	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1225,13 +1668,34 @@
1225	1668
1226	1669	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1227	1670	//tmp.setName("Edit");
1228		- objectPanel.add(materialPanel);
1229		- JPanel north = new JPanel(new BorderLayout());
1230		- north.setName("Edit");
1231		- north.add(ctrlPanel, BorderLayout.NORTH);
1232		- objectPanel.add(north);
1233		- objectPanel.add(infoPanel);
	1671	+ objectPanel.add(toolboxPanel);
	1672	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1673	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1234	1674
	1675	+ objectPanel.add(materialPanel);
	1676	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1677	+ objectPanel.setToolTipTextAt(1, "Material");
	1678	+
	1679	+ objectPanel.add(skyboxPanel);
	1680	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1681	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1682	+
	1683	+// JPanel north = new JPanel(new BorderLayout());
	1684	+// north.setName("Edit");
	1685	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1686	+// objectPanel.add(north);
	1687	+ objectPanel.add(editPanel);
	1688	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1689	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1690	+
	1691	+ objectPanel.add(XYZPanel);
	1692	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1693	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1694	+
	1695	+ patchMaterial = true;
	1696	+ cameraView.patchMaterial = this;
	1697	+ objectPanel.setSelectedIndex(1);
	1698	+
1235	1699	/*
1236	1700	aConstraints.gridx = 0;
1237	1701	aConstraints.gridwidth = 1;
..	..	@@ -1239,7 +1703,7 @@
1239	1703	aConstraints.gridy += 1;
1240	1704	aConstraints.gridwidth = 1;
1241	1705	mainPanel.add(objectPanel, aConstraints);
1242		- */
	1706	+ */
1243	1707
1244	1708	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1245	1709	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1250,17 +1714,29 @@
1250	1714	scrollpane.setWheelScrollingEnabled(true);
1251	1715	scrollpane.addMouseWheelListener(this); // Default not fast enough
1252	1716
1253		- /JTabbedPane/ scenePanel = new JTabbedPane();
1254		- scenePanel.add(scrollpane);
	1717	+ /JTabbedPane/ scenePanel = new cGridBag();
	1718	+ scenePanel.preferredWidth = 6;
	1719	+
	1720	+ JTabbedPane tabbedPane = new JTabbedPane();
	1721	+ tabbedPane.add(scrollpane);
1255	1722
1256		- scenePanel.add(FSPane = new cFileSystemPane(this));
1257		-
1258		- optionsPanel = new JPanel(new GridBagLayout());
	1723	+ optionsPanel = new cGridBag().setVertical(false);
1259	1724
1260	1725	optionsPanel.setName("Options");
1261		- scenePanel.add(optionsPanel);
	1726	+
	1727	+ AddOptions(optionsPanel); //, aConstraints);
	1728	+
	1729	+ tabbedPane.add(optionsPanel);
	1730	+
	1731	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1262	1732
	1733	+ scenePanel.add(tabbedPane);
1263	1734
	1735	+ //if (Globals.ADVANCED)
	1736	+// tabbedPane.add(infoPanel);
	1737	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1738	+// tabbedPane.setToolTipTextAt(3, "Information");
	1739	+
1264	1740	/*
1265	1741	cTree jTree = new cTree(null);
1266	1742	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1293,6 +1769,7 @@
1293	1769	//bigPanel.setSize(new Dimension(10,10));
1294	1770	//bigPanel.add(ctrlPanel);
1295	1771	//bigPanel.add(gridPanel);
	1772	+ /**
1296	1773	bigThree = new JPanel();
1297	1774	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1298	1775	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1316,7 +1793,13 @@
1316	1793	// aConstraints.gridheight = 3;
1317	1794	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1318	1795	bigThree.add(XYZPanel, aWindowConstraints);
	1796	+ /**/
1319	1797
	1798	+ bigThree = new cGridBag();
	1799	+ bigThree.addComponent(scenePanel);
	1800	+ bigThree.addComponent(centralPanel);
	1801	+ //bigThree.addComponent(XYZPanel);
	1802	+
1320	1803	// // SIDE EFFECT!!!
1321	1804	// aConstraints.gridx = 0;
1322	1805	// aConstraints.gridy = 0;
..	..	@@ -1324,33 +1807,55 @@
1324	1807	// aConstraints.gridheight = 1;
1325	1808
1326	1809	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1327		- framePanel.setContinuousLayout(true);
1328		- framePanel.setOneTouchExpandable(true);
1329		- framePanel.setDividerLocation(0.8);
	1810	+
	1811	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1812	+ new java.beans.PropertyChangeListener()
	1813	+ {
	1814	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1815	+ {
	1816	+ if ((Integer)pce.getOldValue() == 1)
	1817	+ {
	1818	+ if (radio.layout != expandedLayout)
	1819	+ {
	1820	+ radio.layout = expandedLayout;
	1821	+ radio.layout.doClick();
	1822	+ }
	1823	+ }
	1824	+ }
	1825	+ });
	1826	+
	1827	+ framePanel.setContinuousLayout(false);
	1828	+ framePanel.setOneTouchExpandable(false);
	1829	+ //.setDividerLocation(0.8);
1330	1830	//framePanel.setDividerSize(15);
1331	1831	//framePanel.setResizeWeight(0.15);
1332	1832	framePanel.setName("Frame");
1333	1833
1334	1834	frame.getContentPane().setLayout(new BorderLayout());
1335	1835	/**/
1336		- JTabbedPane worldPane = new JTabbedPane();
	1836	+ //JTabbedPane worldPane = new JTabbedPane();
1337	1837	//worldPane.add(bigPanel);
1338	1838	//worldPane.add(worldPanel);
1339	1839	/**/
1340		- frame.getContentPane().add(/"Center",/framePanel);
	1840	+ //frame.getContentPane().add(/"Center",/framePanel);
	1841	+ frame.add(/"Center",/framePanel);
1341	1842	//frame.getContentPane().add(/"Center",/ worldPane);
1342	1843
1343	1844	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1344	1845
1345		- frame.setSize(1024, 768);
1346		- frame.show();
1347		-
	1846	+ frame.setSize(1280, 860);
	1847	+
	1848	+ cameraView.requestFocusInWindow();
	1849	+
1348	1850	gridPanel.setDividerLocation(1.0);
	1851	+
	1852	+ frame.validate();
	1853	+
	1854	+ frame.setVisible(true);
1349	1855
1350	1856	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1351	1857	frame.addWindowListener(new WindowAdapter()
1352	1858	{
1353		-
1354	1859	public void windowClosing(WindowEvent e)
1355	1860	{
1356	1861	Close();
..	..	@@ -1358,6 +1863,10 @@
1358	1863	});
1359	1864	}
1360	1865
	1866	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1867	+ {
	1868	+ }
	1869	+
1361	1870	JTree GetTree()
1362	1871	{
1363	1872	return objEditor.jTree;
..	..	@@ -1369,260 +1878,609 @@
1369	1878	ctrlPanel.removeAll();
1370	1879	}
1371	1880
1372		- void SetupMaterial(JPanel ctrlPanel)
	1881	+ void SetupMaterial(cGridBag materialpanel)
1373	1882	{
1374		- aConstraints.weighty = 0;
1375		- //aConstraints.weightx = 1;
1376		- /*
	1883	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1884	+
	1885	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1886	+ skin.setToolTipText("Skin");
	1887	+ skin.addMouseListener(new MouseAdapter()
	1888	+ {
	1889	+ public void mouseClicked(MouseEvent e)
	1890	+ {
	1891	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1892	+ cMaterial material = object.material;
	1893	+
	1894	+ // Skin
	1895	+ colorField.setFloat(material.color);
	1896	+ float saturation = material.modulation;
	1897	+
	1898	+ if (!cameraView.Skinshader)
	1899	+ {
	1900	+ saturation /= 1.5;
	1901	+ }
	1902	+
	1903	+ saturationField.setFloat(saturation);
	1904	+
	1905	+ subsurfaceField.setFloat(material.subsurface);
	1906	+ selfshadowField.setFloat(material.diffuseness);
	1907	+ diffusenessField.setFloat(material.factor);
	1908	+ shininessField.setFloat(material.shininess);
	1909	+ shadowbiasField.setFloat(material.shadowbias);
	1910	+ diffuseField.setFloat(material.diffuse);
	1911	+ specularField.setFloat(material.specular);
	1912	+
	1913	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1914	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1915	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1916	+
	1917	+ materialtouched = true;
	1918	+ applySelf();
	1919	+ }
	1920	+ });
	1921	+ presetpanel.add(skin);
	1922	+
	1923	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1924	+ lambert.setToolTipText("Diffuse");
	1925	+ lambert.addMouseListener(new MouseAdapter()
	1926	+ {
	1927	+ public void mouseClicked(MouseEvent e)
	1928	+ {
	1929	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1930	+ cMaterial material = object.material;
	1931	+
	1932	+ diffusenessField.setFloat(material.factor);
	1933	+ selfshadowField.setFloat(material.diffuseness);
	1934	+
	1935	+ materialtouched = true;
	1936	+ applySelf();
	1937	+ }
	1938	+ });
	1939	+ presetpanel.add(lambert);
	1940	+
	1941	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1942	+ diffuse2.setToolTipText("Diffuse2");
	1943	+ diffuse2.addMouseListener(new MouseAdapter()
	1944	+ {
	1945	+ public void mouseClicked(MouseEvent e)
	1946	+ {
	1947	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1948	+ cMaterial material = object.material;
	1949	+
	1950	+ diffusenessField.setFloat(material.factor);
	1951	+ selfshadowField.setFloat(material.diffuseness);
	1952	+
	1953	+ materialtouched = true;
	1954	+ applySelf();
	1955	+ }
	1956	+ });
	1957	+ presetpanel.add(diffuse2);
	1958	+
	1959	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1960	+ diffusemoon.setToolTipText("Moon");
	1961	+ diffusemoon.addMouseListener(new MouseAdapter()
	1962	+ {
	1963	+ public void mouseClicked(MouseEvent e)
	1964	+ {
	1965	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1966	+ cMaterial material = object.material;
	1967	+
	1968	+ diffusenessField.setFloat(material.factor);
	1969	+ selfshadowField.setFloat(material.diffuseness);
	1970	+
	1971	+ materialtouched = true;
	1972	+ applySelf();
	1973	+ }
	1974	+ });
	1975	+ presetpanel.add(diffusemoon);
	1976	+
	1977	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1978	+ diffusemoon2.setToolTipText("Moon2");
	1979	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1980	+ {
	1981	+ public void mouseClicked(MouseEvent e)
	1982	+ {
	1983	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1984	+ cMaterial material = object.material;
	1985	+
	1986	+ diffusenessField.setFloat(material.factor);
	1987	+ selfshadowField.setFloat(material.diffuseness);
	1988	+
	1989	+ materialtouched = true;
	1990	+ applySelf();
	1991	+ }
	1992	+ });
	1993	+ presetpanel.add(diffusemoon2);
	1994	+
	1995	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1996	+ diffusemoon3.setToolTipText("Moon3");
	1997	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1998	+ {
	1999	+ public void mouseClicked(MouseEvent e)
	2000	+ {
	2001	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2002	+ cMaterial material = object.material;
	2003	+
	2004	+ diffusenessField.setFloat(material.factor);
	2005	+ selfshadowField.setFloat(material.diffuseness);
	2006	+
	2007	+ materialtouched = true;
	2008	+ applySelf();
	2009	+ }
	2010	+ });
	2011	+ presetpanel.add(diffusemoon3);
	2012	+
	2013	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2014	+ diffusesheen.setToolTipText("Sheen");
	2015	+ diffusesheen.addMouseListener(new MouseAdapter()
	2016	+ {
	2017	+ public void mouseClicked(MouseEvent e)
	2018	+ {
	2019	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2020	+ cMaterial material = object.material;
	2021	+
	2022	+ sheenField.setFloat(material.sheen);
	2023	+
	2024	+ materialtouched = true;
	2025	+ applySelf();
	2026	+ }
	2027	+ });
	2028	+ presetpanel.add(diffusesheen);
	2029	+
	2030	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2031	+ rough.setToolTipText("Rough metal");
	2032	+ rough.addMouseListener(new MouseAdapter()
	2033	+ {
	2034	+ public void mouseClicked(MouseEvent e)
	2035	+ {
	2036	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2037	+ cMaterial material = object.material;
	2038	+
	2039	+ shininessField.setFloat(material.shininess);
	2040	+ velvetField.setFloat(material.velvet);
	2041	+
	2042	+ materialtouched = true;
	2043	+ applySelf();
	2044	+ }
	2045	+ });
	2046	+ presetpanel.add(rough);
	2047	+
	2048	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2049	+ rough2.setToolTipText("Medium metal");
	2050	+ rough2.addMouseListener(new MouseAdapter()
	2051	+ {
	2052	+ public void mouseClicked(MouseEvent e)
	2053	+ {
	2054	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2055	+ cMaterial material = object.material;
	2056	+
	2057	+ shininessField.setFloat(material.shininess);
	2058	+ lightareaField.setFloat(material.lightarea);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(rough2);
	2065	+
	2066	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2067	+ shini0.setToolTipText("Shiny");
	2068	+ shini0.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ shininessField.setFloat(material.shininess);
	2076	+ lightareaField.setFloat(material.lightarea);
	2077	+
	2078	+ materialtouched = true;
	2079	+ applySelf();
	2080	+ }
	2081	+ });
	2082	+ presetpanel.add(shini0);
	2083	+
	2084	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2085	+ shini1.setToolTipText("Shiny2");
	2086	+ shini1.addMouseListener(new MouseAdapter()
	2087	+ {
	2088	+ public void mouseClicked(MouseEvent e)
	2089	+ {
	2090	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2091	+ cMaterial material = object.material;
	2092	+
	2093	+ shininessField.setFloat(material.shininess);
	2094	+ lightareaField.setFloat(material.lightarea);
	2095	+
	2096	+ materialtouched = true;
	2097	+ applySelf();
	2098	+ }
	2099	+ });
	2100	+ presetpanel.add(shini1);
	2101	+
	2102	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2103	+ shini2.setToolTipText("Shiny3");
	2104	+ shini2.addMouseListener(new MouseAdapter()
	2105	+ {
	2106	+ public void mouseClicked(MouseEvent e)
	2107	+ {
	2108	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2109	+ cMaterial material = object.material;
	2110	+
	2111	+ shininessField.setFloat(material.shininess);
	2112	+ lightareaField.setFloat(material.lightarea);
	2113	+
	2114	+ materialtouched = true;
	2115	+ applySelf();
	2116	+ }
	2117	+ });
	2118	+ presetpanel.add(shini2);
	2119	+
	2120	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2121	+ aniso.setToolTipText("AnisoU");
	2122	+ aniso.addMouseListener(new MouseAdapter()
	2123	+ {
	2124	+ public void mouseClicked(MouseEvent e)
	2125	+ {
	2126	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2127	+ cMaterial material = object.material;
	2128	+
	2129	+ anisoField.setFloat(material.aniso);
	2130	+ anisoVField.setFloat(material.anisoV);
	2131	+
	2132	+ materialtouched = true;
	2133	+ applySelf();
	2134	+ }
	2135	+ });
	2136	+ presetpanel.add(aniso);
	2137	+
	2138	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2139	+ aniso2.setToolTipText("AnisoV");
	2140	+ aniso2.addMouseListener(new MouseAdapter()
	2141	+ {
	2142	+ public void mouseClicked(MouseEvent e)
	2143	+ {
	2144	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2145	+ cMaterial material = object.material;
	2146	+
	2147	+ anisoField.setFloat(material.aniso);
	2148	+ anisoVField.setFloat(material.anisoV);
	2149	+
	2150	+ materialtouched = true;
	2151	+ applySelf();
	2152	+ }
	2153	+ });
	2154	+ presetpanel.add(aniso2);
	2155	+
	2156	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2157	+ aniso3.setToolTipText("AnisoUV");
	2158	+ aniso3.addMouseListener(new MouseAdapter()
	2159	+ {
	2160	+ public void mouseClicked(MouseEvent e)
	2161	+ {
	2162	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2163	+ cMaterial material = object.material;
	2164	+
	2165	+ anisoField.setFloat(material.aniso);
	2166	+ anisoVField.setFloat(material.anisoV);
	2167	+
	2168	+ materialtouched = true;
	2169	+ applySelf();
	2170	+ }
	2171	+ });
	2172	+ presetpanel.add(aniso3);
	2173	+
	2174	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2175	+ velvet0.setToolTipText("Velvet");
	2176	+ velvet0.addMouseListener(new MouseAdapter()
	2177	+ {
	2178	+ public void mouseClicked(MouseEvent e)
	2179	+ {
	2180	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2181	+ cMaterial material = object.material;
	2182	+
	2183	+ diffusenessField.setFloat(material.factor);
	2184	+ selfshadowField.setFloat(material.diffuseness);
	2185	+ sheenField.setFloat(material.sheen);
	2186	+ shininessField.setFloat(material.shininess);
	2187	+ velvetField.setFloat(material.velvet);
	2188	+ shiftField.setFloat(material.shift);
	2189	+
	2190	+ materialtouched = true;
	2191	+ applySelf();
	2192	+ }
	2193	+ });
	2194	+ presetpanel.add(velvet0);
	2195	+
	2196	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2197	+ bump0.setToolTipText("Bump texture");
	2198	+ bump0.addMouseListener(new MouseAdapter()
	2199	+ {
	2200	+ public void mouseClicked(MouseEvent e)
	2201	+ {
	2202	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2203	+ cMaterial material = object.material;
	2204	+
	2205	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2206	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2207	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2208	+
	2209	+ materialtouched = true;
	2210	+ applySelf();
	2211	+ }
	2212	+ });
	2213	+ presetpanel.add(bump0);
	2214	+
	2215	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2216	+ borderShader.setToolTipText("Border fade");
	2217	+ borderShader.addMouseListener(new MouseAdapter()
	2218	+ {
	2219	+ public void mouseClicked(MouseEvent e)
	2220	+ {
	2221	+ borderfadeField.setFloat(0.5);
	2222	+ opacityField.setFloat(0.75);
	2223	+
	2224	+ materialtouched = true;
	2225	+ applySelf();
	2226	+ }
	2227	+ });
	2228	+ presetpanel.add(borderShader);
	2229	+
	2230	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2231	+ halo.setToolTipText("Halo");
	2232	+ halo.addMouseListener(new MouseAdapter()
	2233	+ {
	2234	+ public void mouseClicked(MouseEvent e)
	2235	+ {
	2236	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2237	+ cMaterial material = object.material;
	2238	+
	2239	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2240	+
	2241	+ materialtouched = true;
	2242	+ applySelf();
	2243	+ }
	2244	+ });
	2245	+ presetpanel.add(halo);
	2246	+
	2247	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2248	+ candle.setToolTipText("Candle");
	2249	+ candle.addMouseListener(new MouseAdapter()
	2250	+ {
	2251	+ public void mouseClicked(MouseEvent e)
	2252	+ {
	2253	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2254	+ cMaterial material = object.material;
	2255	+
	2256	+ subsurfaceField.setFloat(material.subsurface);
	2257	+ shadowbiasField.setFloat(material.shadowbias);
	2258	+ ambientField.setFloat(material.ambient);
	2259	+ specularField.setFloat(material.specular);
	2260	+ lightareaField.setFloat(material.lightarea);
	2261	+ shininessField.setFloat(material.shininess);
	2262	+
	2263	+ materialtouched = true;
	2264	+ applySelf();
	2265	+ }
	2266	+ });
	2267	+ presetpanel.add(candle);
	2268	+
	2269	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2270	+ shadowShader.setToolTipText("Shadow");
	2271	+ shadowShader.addMouseListener(new MouseAdapter()
	2272	+ {
	2273	+ public void mouseClicked(MouseEvent e)
	2274	+ {
	2275	+ diffuseField.setFloat(0.001);
	2276	+ ambientField.setFloat(0.001);
	2277	+ cameraField.setFloat(0.001);
	2278	+ specularField.setFloat(0.001);
	2279	+ fakedepthField.setFloat(0.001);
	2280	+ opacityField.setFloat(0.6);
	2281	+
	2282	+ materialtouched = true;
	2283	+ applySelf();
	2284	+ }
	2285	+ });
	2286	+ presetpanel.add(shadowShader);
	2287	+
	2288	+ cGridBag panel = new cGridBag().setVertical(true);
	2289	+
	2290	+ presetpanel.preferredWidth = 1;
	2291	+
	2292	+ materialpanel.add(presetpanel);
	2293	+ materialpanel.add(panel);
	2294	+
	2295	+ panel.preferredWidth = 8;
	2296	+
	2297	+ /*
1377	2298	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1378	2299	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1379		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1380		- aConstraints.gridx += 1;
1381		- */
	2300	+ */
1382	2301
1383		- aConstraints.gridwidth = 1;
1384		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
	2302	+ cGridBag editBar = new cGridBag().setVertical(false);
	2303	+
	2304	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2305	+ createMaterialButton.setToolTipText("Create material");
1388	2306
1389	2307	/*
1390	2308	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1391		- aConstraints.gridx += 1;
1392		- aConstraints.weighty = 0;
1393		- aConstraints.gridwidth = 1;
1394	2309	*/
1395	2310
1396		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1397		- aConstraints.gridx += 1;
	2311	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2312	+ clearMaterialButton.setToolTipText("Clear material");
	2313	+
	2314	+ if (Globals.ADVANCED)
	2315	+ {
	2316	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2317	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2318	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2319	+ }
1398	2320
1399		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1400		-
1401		- aConstraints.gridx += 1;
1402		-
1403		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1404		-
1405		- aConstraints.gridx += 1;
1406		-
1407		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1408		-
1409		- aConstraints.gridx = 0;
1410		- aConstraints.gridy += 1;
1411		- aConstraints.weighty = 0;
1412		- aConstraints.gridwidth = 1;
	2321	+ editBar.preferredHeight = 15;
	2322	+
	2323	+ panel.add(editBar);
	2324	+
1413	2325	/**/
1414	2326	//aConstraints.weighty = 0;
1415	2327	////aConstraints.weightx = 1;
1416	2328	//aConstraints.weighty = 1;
1417	2329	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1418	2330	//aConstraints.gridx += 1;
1419		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1420		- aConstraints.weighty = 0;
1421		- aConstraints.gridx = 0;
1422		- aConstraints.gridy += 1;
1423		- aConstraints.gridwidth = 1;
	2331	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1424	2332
1425		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1426		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1427		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1428		- aConstraints.gridx += 1;
1429		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1430		- //aConstraints.weightx = 0;
1431		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1432		- aConstraints.gridx = 0;
1433		- aConstraints.gridy += 1;
1434		- aConstraints.gridwidth = 1;
	2333	+ cGridBag colorSection = new cGridBag().setVertical(true);
1435	2334
1436		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1437		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1438		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1439		- aConstraints.gridx += 1;
1440		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1441		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1442		- aConstraints.gridx = 0;
1443		- aConstraints.gridy += 1;
1444		- aConstraints.gridwidth = 1;
	2335	+ cGridBag huepanel = new cGridBag();
	2336	+ cGridBag huelabel = new cGridBag();
	2337	+ cLabel hue = GetLabel("icons/hue.png", false);
	2338	+ hue.fit = true;
	2339	+
	2340	+ hue.addMouseListener(new MouseAdapter()
	2341	+ {
	2342	+ public void mousePressed(MouseEvent e)
	2343	+ {
	2344	+ int x = e.getX();
	2345	+
	2346	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2347	+ }
	2348	+ });
	2349	+
	2350	+ huelabel.add(hue);
	2351	+ huelabel.preferredWidth = 20;
	2352	+ huepanel.add(new cGridBag()); // Label
	2353	+ huepanel.add(huelabel); // Field/slider
	2354	+
	2355	+ huepanel.preferredHeight = 7;
1445	2356
1446		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1447		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1448		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1449		- aConstraints.gridx += 1;
1450		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1451		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1452		- aConstraints.gridx = 0;
1453		- aConstraints.gridy += 1;
1454		- aConstraints.gridwidth = 1;
	2357	+ colorSection.add(huepanel);
	2358	+
	2359	+ cGridBag color = new cGridBag();
	2360	+
	2361	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2362	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2363	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1455	2364
1456		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1457		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1459		- aConstraints.gridx += 1;
1460		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1461		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1462		- aConstraints.gridx = 0;
1463		- aConstraints.gridy += 1;
1464		- aConstraints.gridwidth = 1;
	2365	+ //colorField.preferredWidth = 200;
	2366	+ colorSection.add(color);
1465	2367
1466		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1467		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1468		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1469		- aConstraints.gridx += 1;
1470		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1471		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1472		- aConstraints.gridx = 0;
1473		- aConstraints.gridy += 1;
1474		- aConstraints.gridwidth = 1;
	2368	+ cGridBag modulation = new cGridBag();
	2369	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2370	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2371	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2372	+ colorSection.add(modulation);
1475	2373
1476		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1477		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1479		- aConstraints.gridx += 1;
1480		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1481		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1482		- aConstraints.gridx = 0;
1483		- aConstraints.gridy += 1;
1484		- aConstraints.gridwidth = 1;
	2374	+ cGridBag opacity = new cGridBag();
	2375	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2376	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2377	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2378	+ colorSection.add(opacity);
1485	2379
1486		- //aConstraints.weighty = 1;
1487		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1488		- //aConstraints.gridx += 1;
1489		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1490		- aConstraints.weighty = 0;
1491		- aConstraints.gridx = 0;
1492		- aConstraints.gridy += 1;
1493		- aConstraints.gridwidth = 1;
	2380	+ colorSection.add(GetSeparator());
	2381	+
	2382	+ cGridBag texture = new cGridBag();
	2383	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2384	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2385	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2386	+ colorSection.add(texture);
1494	2387
1495		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1496		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1498		- aConstraints.gridx += 1;
1499		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1500		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1501		- aConstraints.gridx = 0;
1502		- aConstraints.gridy += 1;
1503		- aConstraints.gridwidth = 1;
	2388	+ panel.add(GetSeparator());
	2389	+
	2390	+ panel.add(colorSection);
	2391	+
	2392	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2393	+
	2394	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2395	+
	2396	+ cGridBag diffuse = new cGridBag();
	2397	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2398	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2399	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2400	+ diffuseSection.add(diffuse);
1504	2401
1505		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1506		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1507		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1508		- aConstraints.gridx += 1;
1509		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1510		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1511		- aConstraints.gridx = 0;
1512		- aConstraints.gridy += 1;
1513		- aConstraints.gridwidth = 1;
	2402	+ cGridBag diffuseness = new cGridBag();
	2403	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2404	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2405	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2406	+ diffuseSection.add(diffuseness);
1514	2407
1515		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1516		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1517		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1518		- aConstraints.gridx += 1;
1519		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1520		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1521		- aConstraints.gridx = 0;
1522		- aConstraints.gridy += 1;
1523		- aConstraints.gridwidth = 1;
	2408	+ cGridBag selfshadow = new cGridBag();
	2409	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2410	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2411	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2412	+ diffuseSection.add(selfshadow);
1524	2413
1525		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1526		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1527		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1528		- aConstraints.gridx += 1;
1529		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1530		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1531		- aConstraints.gridx = 0;
1532		- aConstraints.gridy += 1;
1533		- aConstraints.gridwidth = 1;
	2414	+ cGridBag sheen = new cGridBag();
	2415	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2416	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2417	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2418	+ diffuseSection.add(sheen);
1534	2419
1535		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1536		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1537		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1538		- aConstraints.gridx += 1;
1539		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1540		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1541		- aConstraints.gridx = 0;
1542		- aConstraints.gridy += 1;
1543		- aConstraints.gridwidth = 1;
	2420	+ cGridBag subsurface = new cGridBag();
	2421	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2422	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2423	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2424	+ diffuseSection.add(subsurface);
1544	2425
1545		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1546		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1548		- aConstraints.gridx += 1;
1549		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1550		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1551		- aConstraints.gridx = 0;
1552		- aConstraints.gridy += 1;
1553		- aConstraints.gridwidth = 1;
	2426	+ cGridBag shadow = new cGridBag();
	2427	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2428	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2429	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2430	+ diffuseSection.add(shadow);
1554	2431
1555		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1556		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1557		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1558		- aConstraints.gridx += 1;
1559		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1560		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1561		- aConstraints.gridx = 0;
1562		- aConstraints.gridy += 1;
1563		- aConstraints.gridwidth = 1;
	2432	+ cGridBag fakedepth = new cGridBag();
	2433	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2434	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2435	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2436	+ diffuseSection.add(fakedepth);
1564	2437
1565		- //aConstraints.weighty = 1;
1566		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1567		- //aConstraints.gridx += 1;
1568		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1569		- aConstraints.weighty = 0;
1570		- aConstraints.gridx = 0;
1571		- aConstraints.gridy += 1;
1572		- aConstraints.gridwidth = 1;
	2438	+ cGridBag shadowbias = new cGridBag();
	2439	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2440	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2441	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2442	+ diffuseSection.add(shadowbias);
1573	2443
1574		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1575		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1576		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1577		- aConstraints.gridx += 1;
1578		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1579		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1580		- aConstraints.gridx = 0;
1581		- aConstraints.gridy += 1;
1582		- aConstraints.gridwidth = 1;
	2444	+ panel.add(GetSeparator());
	2445	+
	2446	+ panel.add(diffuseSection);
	2447	+
	2448	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2449	+
	2450	+ cGridBag specularSection = new cGridBag().setVertical(true);
1583	2451
1584		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1585		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1586		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1587		- aConstraints.gridx += 1;
1588		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1589		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1590		- aConstraints.gridx = 0;
1591		- aConstraints.gridy += 1;
1592		- aConstraints.gridwidth = 1;
	2452	+ cGridBag specular = new cGridBag();
	2453	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2454	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2455	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2456	+ specularSection.add(specular);
1593	2457
1594		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1595		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1596		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1597		- aConstraints.gridx += 1;
1598		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1599		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1600		- aConstraints.gridx = 0;
1601		- aConstraints.gridy += 1;
1602		- aConstraints.gridwidth = 1;
	2458	+ cGridBag lightarea = new cGridBag();
	2459	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2460	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2461	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2462	+ specularSection.add(lightarea);
1603	2463
1604		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1605		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1607		- aConstraints.gridx += 1;
1608		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1609		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1610		- aConstraints.gridx = 0;
1611		- aConstraints.gridy += 1;
1612		- aConstraints.gridwidth = 1;
	2464	+ cGridBag shininess = new cGridBag();
	2465	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2466	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2467	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2468	+ specularSection.add(shininess);
1613	2469
1614		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1615		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1616		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1617		- aConstraints.gridx += 1;
1618		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1619		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1620		- aConstraints.gridx = 0;
1621		- aConstraints.gridy += 1;
1622		- aConstraints.gridwidth = 1;
	2470	+ cGridBag metalness = new cGridBag();
	2471	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2472	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2473	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2474	+ specularSection.add(metalness);
1623	2475
1624		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1625		- Return();
	2476	+ cGridBag velvet = new cGridBag();
	2477	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2478	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2479	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2480	+ specularSection.add(velvet);
	2481	+
	2482	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2483	+ //Return();
1626	2484	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1627	2485	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628	2486	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1633,130 +2491,99 @@
1633	2491	// aConstraints.gridy += 1;
1634	2492	// aConstraints.gridwidth = 1;
1635	2493
1636		- //aConstraints.weighty = 1;
1637		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1638		- //aConstraints.gridx += 1;
1639		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1640		- aConstraints.weighty = 0;
1641		- aConstraints.gridx = 0;
1642		- aConstraints.gridy += 1;
1643		- aConstraints.gridwidth = 1;
	2494	+ cGridBag anisoU = new cGridBag();
	2495	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2496	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2497	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2498	+ specularSection.add(anisoU);
1644	2499
1645		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1646		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1648		- aConstraints.gridx += 1;
1649		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1650		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1651		- aConstraints.gridx = 0;
1652		- aConstraints.gridy += 1;
1653		- aConstraints.gridwidth = 1;
	2500	+ cGridBag anisoV = new cGridBag();
	2501	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2502	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2503	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2504	+ specularSection.add(anisoV);
1654	2505
1655		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1656		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1658		- aConstraints.gridx += 1;
1659		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1660		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1661		- aConstraints.gridx = 0;
1662		- aConstraints.gridy += 1;
1663		- aConstraints.gridwidth = 1;
1664	2506
1665		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1666		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1667		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1668		- aConstraints.gridx += 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1670		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1671		- aConstraints.gridx = 0;
1672		- aConstraints.gridy += 1;
1673		- aConstraints.gridwidth = 1;
	2507	+ panel.add(GetSeparator());
	2508	+
	2509	+ panel.add(specularSection);
	2510	+
	2511	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2512	+
	2513	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1674	2514
1675		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1676		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1678		- aConstraints.gridx += 1;
1679		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1680		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1681		- aConstraints.gridx = 0;
1682		- aConstraints.gridy += 1;
1683		- aConstraints.gridwidth = 1;
1684		- aConstraints.weighty = 0;
	2515	+ cGridBag camera = new cGridBag();
	2516	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2517	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2518	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2519	+ colorSection.add(camera);
1685	2520
1686		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1687		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1689		- aConstraints.gridx += 1;
1690		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1691		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1692		- aConstraints.gridx = 0;
1693		- aConstraints.gridy += 1;
1694		- aConstraints.gridwidth = 1;
	2521	+ cGridBag ambient = new cGridBag();
	2522	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2523	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2524	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2525	+ colorSection.add(ambient);
1695	2526
1696		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1697		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1699		- aConstraints.gridx += 1;
1700		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1701		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1702		- aConstraints.gridx = 0;
1703		- aConstraints.gridy += 1;
1704		- aConstraints.gridwidth = 1;
	2527	+ cGridBag backlit = new cGridBag();
	2528	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2529	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2530	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2531	+ colorSection.add(backlit);
1705	2532
1706		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1707		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1709		- aConstraints.gridx += 1;
1710		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1711		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1712		- aConstraints.gridx = 0;
1713		- aConstraints.gridy += 1;
1714		- aConstraints.gridwidth = 1;
	2533	+ //panel.add(new JSeparator());
	2534	+
	2535	+ //panel.add(globalSection);
	2536	+
	2537	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2538	+
	2539	+ cGridBag textureSection = new cGridBag().setVertical(true);
1715	2540
1716		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1717		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1718		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1719		- aConstraints.gridx += 1;
1720		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1721		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1722		- aConstraints.gridx = 0;
1723		- aConstraints.gridy += 1;
1724		- aConstraints.gridwidth = 1;
	2541	+ cGridBag bump = new cGridBag();
	2542	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2543	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2544	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2545	+ textureSection.add(bump);
1725	2546
1726		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1727		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1728		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1729		- aConstraints.gridx += 1;
1730		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1731		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1732		- aConstraints.gridx = 0;
1733		- aConstraints.gridy += 1;
1734		- aConstraints.gridwidth = 1;
	2547	+ cGridBag noise = new cGridBag();
	2548	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2549	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2550	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2551	+ textureSection.add(noise);
1735	2552
1736		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1737		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1738		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1739		- aConstraints.gridx += 1;
1740		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1741		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1742		- aConstraints.gridx = 0;
1743		- aConstraints.gridy += 1;
1744		- aConstraints.gridwidth = 1;
	2553	+ cGridBag power = new cGridBag();
	2554	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2555	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2556	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2557	+ textureSection.add(power);
1745	2558
1746		- //aConstraints.weighty = 1;
1747		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1748		- //aConstraints.gridx += 1;
1749		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1750		- aConstraints.weighty = 0;
	2559	+ cGridBag borderfade = new cGridBag();
	2560	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2561	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2562	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2563	+ textureSection.add(borderfade);
1751	2564
1752		- aConstraints.gridx = 0;
1753		- aConstraints.gridy = 0;
1754		- aConstraints.gridwidth = 1;
	2565	+ cGridBag fog = new cGridBag();
	2566	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2567	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2568	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2569	+ textureSection.add(fog);
	2570	+
	2571	+ cGridBag opacityPower = new cGridBag();
	2572	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2573	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2574	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2575	+ textureSection.add(opacityPower);
	2576	+
	2577	+ panel.add(GetSeparator());
	2578	+
	2579	+ panel.add(textureSection);
	2580	+
	2581	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1755	2582
1756	2583	SetMaterial(copy); // .GetMaterial());
1757	2584
1758		- colorField.addChangeListener(this);
1759		- modulationField.addChangeListener(this);
	2585	+ //colorField.addChangeListener(this);
	2586	+// modulationField.addChangeListener(this);
1760	2587	metalnessField.addChangeListener(this);
1761	2588	diffuseField.addChangeListener(this);
1762	2589	specularField.addChangeListener(this);
..	..	@@ -1786,12 +2613,15 @@
1786	2613	opacityPowerField.addChangeListener(this);
1787	2614	/**/
1788	2615
1789		- resetSlidersButton.addActionListener(this);
1790	2616	clearMaterialButton.addActionListener(this);
1791	2617	createMaterialButton.addActionListener(this);
1792		-
1793		- propagateToggle.addItemListener(this);
1794		- multiplyToggle.addItemListener(this);
	2618	+
	2619	+ if (Globals.ADVANCED)
	2620	+ {
	2621	+ resetSlidersButton.addActionListener(this);
	2622	+ propagateToggle.addItemListener(this);
	2623	+ multiplyToggle.addItemListener(this);
	2624	+ }
1795	2625	}
1796	2626
1797	2627	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1809,8 +2639,9 @@
1809	2639	// 3D models
1810	2640	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1811	2641	{
1812		- lastConverter = new com.jmex.model.converters.MaxToJme();
1813		- LoadFile(filename, lastConverter);
	2642	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2643	+ //LoadFile(filename, lastConverter);
	2644	+ LoadObjFile(filename); // New 3ds loader
1814	2645	continue;
1815	2646	}
1816	2647	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1962,7 +2793,7 @@
1962	2793
1963	2794	//? flashIt = false;
1964	2795	CameraPane pane = (CameraPane) cameraView;
1965		- pane.clickStart(location.x, location.y, 0);
	2796	+ pane.clickStart(location.x, location.y, 0, 0);
1966	2797	pane.clickEnd(location.x, location.y, 0, true);
1967	2798
1968	2799	if (group.selection.size() == 1)
..	..	@@ -2011,6 +2842,7 @@
2011	2842	e2.printStackTrace();
2012	2843	}
2013	2844	}
	2845	+
2014	2846	LoadJMEThread loadThread;
2015	2847
2016	2848	class LoadJMEThread extends Thread
..	..	@@ -2068,6 +2900,7 @@
2068	2900	//LoadFile0(filename, converter);
2069	2901	}
2070	2902	}
	2903	+
2071	2904	LoadOBJThread loadObjThread;
2072	2905
2073	2906	class LoadOBJThread extends Thread
..	..	@@ -2146,19 +2979,19 @@
2146	2979
2147	2980	void LoadObjFile(String fullname)
2148	2981	{
2149		- /*
	2982	+ System.out.println("Loading " + fullname);
	2983	+ /**/
2150	2984	//lastFilename = fullname;
2151	2985	if(loadObjThread == null)
2152	2986	{
2153		- loadObjThread = new LoadOBJThread();
2154		- loadObjThread.start();
	2987	+ loadObjThread = new LoadOBJThread();
	2988	+ loadObjThread.start();
2155	2989	}
2156	2990
2157	2991	loadObjThread.add(fullname);
2158		- */
	2992	+ /**/
2159	2993
2160		- System.out.println("Loading " + fullname);
2161		- makeSomething(new FileObject(fullname, true), true);
	2994	+ //makeSomething(new FileObject(fullname, true), true);
2162	2995	}
2163	2996
2164	2997	void LoadGFDFile(String fullname)
..	..	@@ -2419,11 +3252,11 @@
2419	3252
2420	3253	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2421	3254	{
2422		- if (GrafreeD.standAlone)
	3255	+ if (Grafreed.standAlone)
2423	3256	{
2424	3257	/**/
2425	3258	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2426		- browser.show();
	3259	+ browser.setVisible(true);
2427	3260	String filename = browser.getFile();
2428	3261	if (filename != null && filename.length() > 0)
2429	3262	{
..	..	@@ -2534,6 +3367,7 @@
2534	3367	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2535	3368	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2536	3369	}
	3370	+
2537	3371	//cJME.count++;
2538	3372	//cJME.count %= 12;
2539	3373	if (gc)
..	..	@@ -2568,6 +3402,7 @@
2568	3402	}
2569	3403	if (input == null)
2570	3404	{
	3405	+ new Exception().printStackTrace();
2571	3406	System.exit(0);
2572	3407	}
2573	3408
..	..	@@ -2716,6 +3551,7 @@
2716	3551	}
2717	3552	}
2718	3553	}
	3554	+
2719	3555	cFileSystemPane FSPane;
2720	3556
2721	3557	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2725,7 +3561,7 @@
2725	3561
2726	3562	freezematerial = true;
2727	3563	colorField.setFloat(mat.color);
2728		- modulationField.setFloat(mat.modulation);
	3564	+ saturationField.setFloat(mat.modulation);
2729	3565	metalnessField.setFloat(mat.metalness);
2730	3566	diffuseField.setFloat(mat.diffuse);
2731	3567	specularField.setFloat(mat.specular);
..	..	@@ -2769,11 +3605,14 @@
2769	3605	}
2770	3606	}
2771	3607	}
	3608	+
2772	3609	freezematerial = false;
2773	3610	}
2774	3611
2775	3612	void SetMaterial(Object3D object)
2776	3613	{
	3614	+ latestObject = object;
	3615	+
2777	3616	cMaterial mat = object.material;
2778	3617
2779	3618	if (mat == null)
..	..	@@ -2782,33 +3621,10 @@
2782	3621	return;
2783	3622	}
2784	3623
2785		- multiplyToggle.setSelected(mat.multiply);
2786		-
2787		- assert (object.projectedVertices != null);
2788		-
2789		- if (object.projectedVertices.length <= 2)
2790		- {
2791		- // Side effect...
2792		- Object3D.cVector2[] keep = object.projectedVertices;
2793		- object.projectedVertices = new Object3D.cVector2[3];
2794		- for (int i = 0; i < 3; i++)
2795		- {
2796		- if (i < keep.length)
2797		- {
2798		- object.projectedVertices[i] = keep[i];
2799		- } else
2800		- {
2801		- object.projectedVertices[i] = new Object3D.cVector2();
2802		- }
2803		- /*
2804		- if(keep.length == 0)
2805		- object.projectedVertices[0] = new Object3D.cVector2();
2806		- else
2807		- object.projectedVertices[0] = keep[0];
2808		- object.projectedVertices[1] = new Object3D.cVector2();
2809		- */
2810		- }
2811		- }
	3624	+ if (multiplyToggle != null)
	3625	+ multiplyToggle.setSelected(mat.multiply);
	3626	+
	3627	+ AllocProjectedVertices(object);
2812	3628
2813	3629	SetMaterial(mat, object.projectedVertices);
2814	3630	}
..	..	@@ -2884,12 +3700,17 @@
2884	3700	// }
2885	3701
2886	3702	/**/
2887		- if (deselect)
	3703	+ if (deselect \|\| child == null)
2888	3704	{
2889	3705	//group.deselectAll();
2890	3706	//freeze = true;
2891	3707	GetTree().clearSelection();
2892	3708	//freeze = false;
	3709	+
	3710	+ if (child == null)
	3711	+ {
	3712	+ return;
	3713	+ }
2893	3714	}
2894	3715
2895	3716	//group.addSelectee(child);
..	..	@@ -2923,6 +3744,17 @@
2923	3744	public void itemStateChanged(ItemEvent event)
2924	3745	{
2925	3746	// System.out.println("Propagate = " + propagate);
	3747	+ if (event.getSource() == pinButton)
	3748	+ {
	3749	+ copy.pinned ^= true;
	3750	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3751	+ {
	3752	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3753	+ copy.CloseUI();
	3754	+ //copy.editWindow.refreshContents();
	3755	+ }
	3756	+ }
	3757	+ else
2926	3758	if (event.getSource() == propagateToggle)
2927	3759	{
2928	3760	propagate ^= true;
..	..	@@ -2958,7 +3790,7 @@
2958	3790	cameraView.ToggleDL();
2959	3791	cameraView.repaint();
2960	3792	return;
2961		- } else if (event.getSource() == toggleTextureItem)
	3793	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2962	3794	{
2963	3795	cameraView.ToggleTexture();
2964	3796	// june 2013 copy.HardTouch();
..	..	@@ -2966,42 +3798,40 @@
2966	3798	return;
2967	3799	} else if (event.getSource() == toggleTimelineItem)
2968	3800	{
2969		- copy.timeline ^= true;
	3801	+ timeline ^= true;
2970	3802
2971		- if (copy.timeline)
	3803	+ if (timeline)
2972	3804	{
2973	3805	centralPanel.remove(cameraView);
2974		- centralPanel.add(timelinePanel);
	3806	+ cameraPanel.add(cameraView);
	3807	+ centralPanel.add(cameraPanel);
2975	3808	frame.setJMenuBar(timelineMenubar);
	3809	+ wasFullScreen = CameraPane.FULLSCREEN;
	3810	+ if (!CameraPane.FULLSCREEN)
	3811	+ ToggleFullScreen();
	3812	+ toggleFullScreenItem.setEnabled(false);
2976	3813	}
2977	3814	else
2978	3815	{
2979		- centralPanel.remove(timelinePanel);
	3816	+ centralPanel.remove(cameraPanel);
2980	3817	centralPanel.add(cameraView);
2981	3818	frame.setJMenuBar(null);
	3819	+ if (!wasFullScreen)
	3820	+ ToggleFullScreen();
	3821	+ toggleFullScreenItem.setEnabled(true);
2982	3822	}
2983	3823
2984	3824	frame.validate();
2985	3825	return;
2986	3826	} else if (event.getSource() == toggleFullScreenItem)
2987	3827	{
2988		- if (CameraPane.FULLSCREEN)
2989		- {
2990		- frame.getContentPane().remove(/"Center",/bigThree);
2991		- framePanel.add(bigThree);
2992		- frame.getContentPane().add(/"Center",/framePanel);
2993		- } else
2994		- {
2995		- frame.getContentPane().remove(/"Center",/framePanel);
2996		- frame.getContentPane().add(/"Center",/bigThree);
2997		- }
	3828	+ ToggleFullScreen();
2998	3829	frame.validate();
2999		- cameraView.ToggleFullScreen();
3000	3830
3001	3831	return;
3002		- } else if (event.getSource() == toggleRandomItem)
	3832	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3003	3833	{
3004		- cameraView.ToggleRandom();
	3834	+ cameraView.ToggleSwitch();
3005	3835	cameraView.repaint();
3006	3836	return;
3007	3837	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3029,12 +3859,17 @@
3029	3859	} else if (event.getSource() == liveCB)
3030	3860	{
3031	3861	copy.live ^= true;
	3862	+ objEditor.refreshContents(true); // To show item colors
	3863	+ return;
	3864	+ } else if (event.getSource() == selectableCB)
	3865	+ {
	3866	+ copy.dontselect ^= true;
3032	3867	return;
3033	3868	} else if (event.getSource() == hideCB)
3034	3869	{
3035	3870	copy.hide ^= true;
3036	3871	copy.Touch(); // display list issue
3037		- objEditor.refreshContents();
	3872	+ objEditor.refreshContents(true); // To show item colors
3038	3873	return;
3039	3874	} else if (event.getSource() == link2masterCB)
3040	3875	{
..	..	@@ -3044,6 +3879,7 @@
3044	3879	if (event.getSource() == randomCB)
3045	3880	{
3046	3881	copy.random ^= true;
	3882	+ objEditor.refreshContents();
3047	3883	return;
3048	3884	}
3049	3885	if (event.getSource() == speedupCB)
..	..	@@ -3067,8 +3903,9 @@
3067	3903
3068	3904	public void actionPerformed(ActionEvent event)
3069	3905	{
	3906	+ Object source = event.getSource();
3070	3907	// SCRIPT DIALOG
3071		- if (event.getSource() == okbutton)
	3908	+ if (source == okbutton)
3072	3909	{
3073	3910	textpanel.setVisible(false);
3074	3911	textpanel.remove(textarea);
..	..	@@ -3080,7 +3917,7 @@
3080	3917	textarea = null;
3081	3918	textpanel = null;
3082	3919	}
3083		- if (event.getSource() == cancelbutton)
	3920	+ if (source == cancelbutton)
3084	3921	{
3085	3922	textpanel.setVisible(false);
3086	3923	textpanel.remove(textarea);
..	..	@@ -3092,49 +3929,50 @@
3092	3929	//applySelf();
3093	3930	//client.refreshEditWindow();
3094	3931	//refreshContents();
3095		- if (event.getSource() == nameField)
	3932	+ if (source == nameField)
3096	3933	{
3097	3934	//System.out.println("ObjEditor " + event);
3098	3935	applySelf0(true);
3099	3936	//parent.applySelf();
3100		- objEditor.refreshContents();
3101		- } else if (event.getSource() == resetButton)
	3937	+ // conflicts with requestFocus objEditor.refreshContents();
	3938	+ } else if (source == resetButton)
3102	3939	{
3103	3940	CameraPane.fullreset = true;
3104	3941	copy.Reset(); // ResetMeshes();
3105	3942	copy.Touch();
3106	3943	objEditor.refreshContents();
3107		- } else if (event.getSource() == stepItem)
	3944	+ } else if (source == stepItem)
3108	3945	{
3109		- cameraView.ONESTEP = true;
	3946	+ //cameraView.ONESTEP = true;
	3947	+ Globals.ONESTEP = true;
3110	3948	cameraView.repaint();
3111	3949	return;
3112		- } else if (event.getSource() == stepButton)
	3950	+ } else if (source == stepButton)
3113	3951	{
3114	3952	copy.Step();
3115	3953	copy.Touch();
3116	3954	objEditor.refreshContents();
3117		- } else if (event.getSource() == slowerButton)
	3955	+ } else if (source == slowerButton)
3118	3956	{
3119	3957	copy.Slower();
3120	3958	copy.Touch();
3121	3959	objEditor.refreshContents();
3122		- } else if (event.getSource() == fasterButton)
	3960	+ } else if (source == fasterButton)
3123	3961	{
3124	3962	copy.Faster();
3125	3963	copy.Touch();
3126	3964	objEditor.refreshContents();
3127		- } else if (event.getSource() == remarkButton)
	3965	+ } else if (source == remarkButton)
3128	3966	{
3129	3967	copy.Remark();
3130	3968	copy.Touch();
3131	3969	objEditor.refreshContents();
3132		- } else if (event.getSource() == stepAllButton)
	3970	+ } else if (source == stepAllButton)
3133	3971	{
3134	3972	copy.StepAll();
3135	3973	copy.Touch();
3136	3974	objEditor.refreshContents();
3137		- } else if (event.getSource() == resetAllButton)
	3975	+ } else if (source == resetAllButton)
3138	3976	{
3139	3977	//CameraPane.fullreset = true;
3140	3978	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3167,53 +4005,79 @@
3167	4005	// Close();
3168	4006	// }
3169	4007	// else
3170		- if (event.getSource() == resetSlidersButton)
	4008	+ if (source == resetSlidersButton)
3171	4009	{
3172	4010	ResetSliders();
3173		- } else if (event.getSource() == clearMaterialButton)
	4011	+ } else if (source == clearMaterialButton)
3174	4012	{
3175	4013	ClearMaterial();
3176		- } else if (event.getSource() == createMaterialButton)
	4014	+ } else if (source == createMaterialButton)
3177	4015	{
3178	4016	CreateMaterial();
3179		- } else if (event.getSource() == clearPanelButton)
	4017	+ } else if (source == clearPanelButton)
3180	4018	{
3181	4019	copy.ClearUI();
3182	4020	refreshContents(true);
3183		- } /*
3184		- }
3185		-
3186		- public boolean action(Event event, Object arg)
3187		- {
3188		- */ else if (event.getSource() == closeItem)
	4021	+ } else if (source == importGFDItem)
	4022	+ {
	4023	+ ImportGFD();
	4024	+ } else
	4025	+ if (source == importVRMLX3DItem)
	4026	+ {
	4027	+ ImportVRMLX3D();
	4028	+ } else
	4029	+ if (source == import3DSItem)
	4030	+ {
	4031	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4032	+ } else
	4033	+ if (source == importOBJItem)
	4034	+ {
	4035	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4036	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4037	+ browser.setVisible(true);
	4038	+ String filename = browser.getFile();
	4039	+ if (filename != null && filename.length() > 0)
	4040	+ {
	4041	+ String fullname = browser.getDirectory() + filename;
	4042	+ makeSomething(ReadOBJ(fullname), true);
	4043	+ }
	4044	+ } else
	4045	+ if (source == closeItem)
3189	4046	{
3190	4047	Close();
3191	4048	//return true;
3192		- } else if (event.getSource() == loadItem)
	4049	+ } else if (source == openItem)
3193	4050	{
3194		- load();
	4051	+ Open();
3195	4052	//return true;
3196		- } else if (event.getSource() == saveItem)
	4053	+ } else if (source == newItem)
	4054	+ {
	4055	+ New();
	4056	+ } else if (source == saveItem)
3197	4057	{
3198	4058	save();
3199	4059	//return true;
3200		- } else if (event.getSource() == saveAsItem)
	4060	+ } else if (source == saveAsItem)
3201	4061	{
3202	4062	saveAs();
3203	4063	//return true;
3204		- } else if (event.getSource() == reexportItem)
	4064	+ } else if (source == reexportItem)
3205	4065	{
3206	4066	reexport();
3207	4067	//return true;
3208		- } else if (event.getSource() == exportAsItem)
	4068	+ } else if (source == exportAsItem)
3209	4069	{
3210	4070	export();
3211	4071	//return true;
3212		- } else if (event.getSource() == povItem)
	4072	+ } else if (source == povItem)
3213	4073	{
3214	4074	generatePOV();
3215	4075	//return true;
3216		- } else if (event.getSource() == zBufferItem)
	4076	+ } else if (event.getSource() == archiveItem)
	4077	+ {
	4078	+ cTools.Archive(frame);
	4079	+ return;
	4080	+ } else if (source == zBufferItem)
3217	4081	{
3218	4082	try
3219	4083	{
..	..	@@ -3235,21 +4099,8 @@
3235	4099	cameraView.repaint();
3236	4100	//return true;
3237	4101	}
3238		- */ else if (event.getSource() == editCameraItem)
3239		- {
3240		- cameraView.ProtectCamera();
3241		- cameraView.repaint();
3242		- return;
3243		- } else if (event.getSource() == revertCameraItem)
3244		- {
3245		- cameraView.RevertCamera();
3246		- cameraView.repaint();
3247		- return;
3248		-// } else if (event.getSource() == textureButton)
3249		-// {
3250		-// return; // true;
3251		- } else // combos...
3252		- if (event.getSource() == texresMenu)
	4102	+ */ else // combos...
	4103	+ if (source == texresMenu)
3253	4104	{
3254	4105	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3255	4106	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3261,27 +4112,494 @@
3261	4112	}
3262	4113	}
3263	4114
3264		- void ToggleAnimation()
	4115	+ void New()
3265	4116	{
3266		- if (!CameraPane.ANIMATION)
	4117	+ while (copy.Size() > 1)
3267	4118	{
3268		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4119	+ copy.remove(1);
	4120	+ }
	4121	+
	4122	+ ResetModel();
	4123	+ objEditor.refreshContents();
	4124	+ }
	4125	+
	4126	+ static public byte[] Compress(Object3D o)
	4127	+ {
	4128	+ // Slower to actually compress.
	4129	+ try
	4130	+ {
	4131	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4132	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4133	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4134	+
	4135	+ Object3D parent = o.parent;
	4136	+ o.parent = null;
	4137	+
	4138	+ out.writeObject(o);
	4139	+
	4140	+ o.parent = parent;
	4141	+
	4142	+ out.flush();
	4143	+
	4144	+ baos //zstream
	4145	+ .close();
	4146	+ out.close();
	4147	+
	4148	+ byte[] bytes = baos.toByteArray();
	4149	+
	4150	+ System.out.println("save #bytes = " + bytes.length);
	4151	+ return bytes;
	4152	+ } catch (Exception e)
	4153	+ {
	4154	+ System.err.println(e);
	4155	+ return null;
	4156	+ }
	4157	+ }
	4158	+
	4159	+ static public Object Uncompress(byte[] bytes)
	4160	+ {
	4161	+ System.out.println("restore #bytes = " + bytes.length);
	4162	+ try
	4163	+ {
	4164	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4165	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4166	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4167	+ Object obj = in.readObject();
	4168	+
	4169	+ bais //istream
	4170	+ .close();
	4171	+ in.close();
	4172	+
	4173	+ return obj;
	4174	+ } catch (Exception e)
	4175	+ {
	4176	+ System.err.println(e);
	4177	+ return null;
	4178	+ }
	4179	+ }
	4180	+
	4181	+ static public Object clone(Object o)
	4182	+ {
	4183	+ try
	4184	+ {
	4185	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4186	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4187	+
	4188	+ out.writeObject(o);
	4189	+
	4190	+ out.flush();
	4191	+ out.close();
	4192	+
	4193	+ byte[] bytes = baos.toByteArray();
	4194	+
	4195	+ System.out.println("clone = " + bytes.length);
	4196	+
	4197	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4198	+ ObjectInputStream in = new ObjectInputStream(bais);
	4199	+ Object obj = in.readObject();
	4200	+ in.close();
	4201	+
	4202	+ return obj;
	4203	+ } catch (Exception e)
	4204	+ {
	4205	+ System.err.println(e);
	4206	+ return null;
	4207	+ }
	4208	+ }
	4209	+
	4210	+ cRadio GetCurrentTab()
	4211	+ {
	4212	+ cRadio ab;
	4213	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4214	+ {
	4215	+ ab = (cRadio)e.nextElement();
	4216	+ if(ab.GetObject() == copy)
	4217	+ {
	4218	+ return ab;
	4219	+ }
	4220	+ }
	4221	+
	4222	+ return null;
	4223	+ }
	4224	+
	4225	+
	4226	+ public void Save()
	4227	+ {
	4228	+ //Save(true);
	4229	+ Replace();
	4230	+ SetVersionStates();
	4231	+ }
	4232	+
	4233	+ private boolean Equal(byte[] compress, byte[] name)
	4234	+ {
	4235	+ if (compress.length != name.length)
	4236	+ {
	4237	+ return false;
	4238	+ }
	4239	+
	4240	+ for (int i=compress.length; --i>=0;)
	4241	+ {
	4242	+ if (compress[i] != name[i])
	4243	+ return false;
	4244	+ }
	4245	+
	4246	+ return true;
	4247	+ }
	4248	+
	4249	+ void DeleteVersion()
	4250	+ {
	4251	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4252	+ {
	4253	+ copy.versionlist[i] = copy.versionlist[i+1];
	4254	+ }
	4255	+
	4256	+ if (copy.versionlist[copy.versionindex] == null)
	4257	+ copy.versionindex -= 1;
	4258	+
	4259	+ if (copy.versionindex != -1)
	4260	+ CopyChanged();
	4261	+
	4262	+ SetVersionStates();
	4263	+ }
	4264	+
	4265	+ public boolean Save(boolean user)
	4266	+ {
	4267	+ System.err.println("Save");
	4268	+ Replace();
	4269	+
	4270	+ //cRadio tab = GetCurrentTab();
	4271	+
	4272	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4273	+
	4274	+ boolean thesame = false;
	4275	+
	4276	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4277	+// {
	4278	+// thesame = true;
	4279	+// }
	4280	+
	4281	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4282	+ if (!thesame)
	4283	+ {
	4284	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4285	+ {
	4286	+ copy.versionlist[i] = copy.versionlist[i-1];
	4287	+ }
	4288	+
	4289	+ //tab.user[tab.versionindex] = user;
	4290	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4291	+
	4292	+ copy.versionlist[++copy.versionindex] = compress;
	4293	+
	4294	+ // if (increment)
	4295	+ // tab.versionindex++;
	4296	+ }
	4297	+
	4298	+ //copy.RestoreBigData(versiontable);
	4299	+
	4300	+ //assert(hashtable.isEmpty());
	4301	+
	4302	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4303	+// {
	4304	+// //tab.user[i] = false;
	4305	+// copy.versionlist[i] = null;
	4306	+// }
	4307	+
	4308	+ SetVersionStates();
	4309	+
	4310	+ // test save
	4311	+ if (false)
	4312	+ {
	4313	+ try
	4314	+ {
	4315	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4316	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4317	+
	4318	+ p.writeObject(copy);
	4319	+
	4320	+ p.flush();
	4321	+
	4322	+ ostream.close();
	4323	+ } catch (Exception e)
	4324	+ {
	4325	+ e.printStackTrace();
	4326	+ }
	4327	+ }
	4328	+
	4329	+ return !thesame;
	4330	+ }
	4331	+
	4332	+ boolean flashIt = true;
	4333	+
	4334	+ void RefreshSelection()
	4335	+ {
	4336	+ Object3D selection = new Object3D();
	4337	+
	4338	+ for (int i = 0; i < copy.selection.size(); i++)
	4339	+ {
	4340	+ Object3D elem = copy.selection.elementAt(i);
	4341	+
	4342	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4343	+
	4344	+ if (obj == null)
	4345	+ {
	4346	+ copy.selection.remove(i--);
	4347	+ }
	4348	+ else
	4349	+ {
	4350	+ selection.add(obj);
	4351	+ copy.selection.setElementAt(obj, i);
	4352	+ }
	4353	+ }
	4354	+
	4355	+ flashIt = false;
	4356	+ GetTree().clearSelection();
	4357	+ for (int i = 0; i < selection.size(); i++)
	4358	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4359	+ flashIt = true;
	4360	+
	4361	+ //refreshContents(false);
	4362	+ }
	4363	+
	4364	+ void CopyChanged()
	4365	+ {
	4366	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4367	+
	4368	+ SetVersionStates();
	4369	+
	4370	+ boolean temp = CameraPane.SWITCH;
	4371	+ CameraPane.SWITCH = false;
	4372	+
	4373	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4374	+
	4375	+ copy.clear();
	4376	+
	4377	+ copy.skyboxname = obj.skyboxname;
	4378	+ copy.skyboxext = obj.skyboxext;
	4379	+
	4380	+ for (int i=0; i<obj.Size(); i++)
	4381	+ {
	4382	+ copy.add(obj.get(i));
	4383	+ }
	4384	+
	4385	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4386	+
	4387	+ CameraPane.SWITCH = temp;
	4388	+
	4389	+ RefreshSelection();
	4390	+ //assert(hashtable.isEmpty());
	4391	+
	4392	+ copy.Touch();
	4393	+
	4394	+ ResetModel();
	4395	+ copy.HardTouch(); // recompile?
	4396	+
	4397	+ cRadio ab;
	4398	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4399	+ {
	4400	+ ab = (cRadio)e.nextElement();
	4401	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4402	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4403	+ if (test != null)
	4404	+ {
	4405	+ test.editWindow = ab.object.editWindow;
	4406	+ ab.object = test;
	4407	+ }
	4408	+ }
	4409	+
	4410	+ refreshContents(true);
	4411	+ }
	4412	+
	4413	+ cButton previousVersionButton;
	4414	+ cButton restoreButton;
	4415	+ cButton replaceButton;
	4416	+ cButton nextVersionButton;
	4417	+ cButton saveVersionButton;
	4418	+ cButton deleteVersionButton;
	4419	+
	4420	+ boolean muteSlider;
	4421	+
	4422	+ int VersionCount()
	4423	+ {
	4424	+ int count = 0;
	4425	+
	4426	+ for (int i = copy.versionlist.length; --i >= 0;)
	4427	+ {
	4428	+ if (copy.versionlist[i] != null)
	4429	+ count++;
	4430	+ }
	4431	+
	4432	+ return count;
	4433	+ }
	4434	+
	4435	+ void SetVersionStates()
	4436	+ {
	4437	+ //if (true)
	4438	+ // return;
	4439	+
	4440	+ //cRadio tab = GetCurrentTab();
	4441	+
	4442	+ restoreButton.setEnabled(copy.versionindex != -1);
	4443	+ replaceButton.setEnabled(copy.versionindex != -1);
	4444	+
	4445	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4446	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4447	+
	4448	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4449	+ //copy.versionlist[copy.versionindex + 1] != null);
	4450	+
	4451	+ muteSlider = true;
	4452	+ versionSlider.setMinimum(0);
	4453	+ versionSlider.setMaximum(VersionCount() - 1);
	4454	+ versionSlider.setInteger(copy.versionindex);
	4455	+ versionSlider.setEnabled(copy.versionindex != -1);
	4456	+ muteSlider = false;
	4457	+ }
	4458	+
	4459	+ public boolean PreviousVersion()
	4460	+ {
	4461	+ // Option?
	4462	+ Replace();
	4463	+
	4464	+ System.err.println("Undo");
	4465	+
	4466	+ //cRadio tab = GetCurrentTab();
	4467	+
	4468	+ if (copy.versionindex == 0)
	4469	+ {
	4470	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4471	+ return false;
	4472	+ }
	4473	+
	4474	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4475	+// {
	4476	+// if (Save(false))
	4477	+// tab.versionindex -= 1;
	4478	+// else
	4479	+// {
	4480	+// if (tab.versionindex <= 0)
	4481	+// return false;
	4482	+// else
	4483	+// tab.versionindex -= 1;
	4484	+// }
	4485	+// }
	4486	+
	4487	+ copy.versionindex -= 1;
	4488	+
	4489	+ CopyChanged();
	4490	+
	4491	+ return true;
	4492	+ }
	4493	+
	4494	+ public boolean Restore()
	4495	+ {
	4496	+ System.err.println("Restore");
	4497	+
	4498	+ //cRadio tab = GetCurrentTab();
	4499	+
	4500	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4501	+ {
	4502	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4503	+ return false;
	4504	+ }
	4505	+
	4506	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4507	+ CopyChanged();
	4508	+
	4509	+ return true;
	4510	+ }
	4511	+
	4512	+ public boolean Replace()
	4513	+ {
	4514	+ //System.err.println("Replace");
	4515	+
	4516	+ //cRadio tab = GetCurrentTab();
	4517	+
	4518	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4519	+ {
	4520	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4521	+ return false;
	4522	+ }
	4523	+
	4524	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4525	+
	4526	+ return true;
	4527	+ }
	4528	+
	4529	+ public void NextVersion()
	4530	+ {
	4531	+ // Option?
	4532	+ Replace();
	4533	+
	4534	+ //cRadio tab = GetCurrentTab();
	4535	+
	4536	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4537	+ {
	4538	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4539	+ return;
	4540	+ }
	4541	+
	4542	+ copy.versionindex += 1;
	4543	+
	4544	+ CopyChanged();
	4545	+
	4546	+ //if (!tab.user[tab.versionindex])
	4547	+ // tab.graphs[tab.versionindex] = null;
	4548	+ }
	4549	+
	4550	+ void ImportGFD()
	4551	+ {
	4552	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3269	4553	browser.show();
3270	4554	String filename = browser.getFile();
3271	4555	if (filename != null && filename.length() > 0)
3272	4556	{
3273		- CameraPane.filename = browser.getDirectory() + filename;
	4557	+ String fullname = browser.getDirectory() + filename;
	4558	+
	4559	+ //Object3D readobj =
	4560	+ objEditor.ReadGFD(fullname, objEditor);
	4561	+ //makeSomething(readobj);
	4562	+ }
	4563	+ }
	4564	+
	4565	+ void ImportVRMLX3D()
	4566	+ {
	4567	+ if (Grafreed.standAlone)
	4568	+ {
	4569	+ /**/
	4570	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4571	+ browser.show();
	4572	+ String filename = browser.getFile();
	4573	+ if (filename != null && filename.length() > 0)
	4574	+ {
	4575	+ String fullname = browser.getDirectory() + filename;
	4576	+ LoadVRMLX3D(fullname);
	4577	+ }
	4578	+ /**/
	4579	+ }
	4580	+ }
	4581	+
	4582	+ void ToggleAnimation()
	4583	+ {
	4584	+ if (!Globals.ANIMATION)
	4585	+ {
	4586	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4587	+ browser.setVisible(true);
	4588	+ String filename = browser.getFile();
	4589	+ if (filename != null && filename.length() > 0)
	4590	+ {
	4591	+ Globals.filename = browser.getDirectory() + filename;
3274	4592	//CameraPane.framecount = 0;
3275		- CameraPane.imagecount = 0;
	4593	+ Globals.imagecount = 0;
3276	4594
3277		- CameraPane.ANIMATION ^= true;
	4595	+ Globals.ANIMATION ^= true;
3278	4596
3279		- GrafreeD.wav.cursor = 0;
3280		- GrafreeD.wav.loop = 0;
	4597	+ Grafreed.wav.cursor = 0;
	4598	+ Grafreed.wav.loop = 0;
3281	4599	}
3282	4600	} else
3283	4601	{
3284		- CameraPane.ANIMATION ^= true;
	4602	+ Globals.ANIMATION ^= true;
3285	4603	}
3286	4604	}
3287	4605
..	..	@@ -3327,7 +4645,7 @@
3327	4645	void CreateMaterial()
3328	4646	{
3329	4647	//copy.ClearMaterial(); // PATCH
3330		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4648	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3331	4649	if (copy.selection.size() > 0)
3332	4650	//SetMaterial(copy);
3333	4651	{
..	..	@@ -3378,7 +4696,7 @@
3378	4696	assert false;
3379	4697	}
3380	4698
3381		- void EditSelection()
	4699	+ void EditSelection(boolean newWindow)
3382	4700	{
3383	4701	}
3384	4702
..	..	@@ -3386,11 +4704,11 @@
3386	4704	{
3387	4705	copy.ResetBlockLoop(); // temporary problem
3388	4706
3389		- boolean random = CameraPane.RANDOM;
3390		- CameraPane.RANDOM = false; // parse everything
	4707	+ boolean random = CameraPane.SWITCH;
	4708	+ CameraPane.SWITCH = false; // parse everything
3391	4709	copy.ResetDisplayList();
3392	4710	copy.HardTouch();
3393		- CameraPane.RANDOM = random;
	4711	+ CameraPane.SWITCH = random;
3394	4712	}
3395	4713
3396	4714	// public void applySelf()
..	..	@@ -3420,6 +4738,12 @@
3420	4738	// else
3421	4739	// applySelf(true);
3422	4740	// }
	4741	+
	4742	+ boolean Equal(double a, double b)
	4743	+ {
	4744	+ return Math.abs(a - b) < 0.001;
	4745	+ }
	4746	+
3423	4747	void applySelf0(boolean name)
3424	4748	{
3425	4749	if (name)
..	..	@@ -3437,7 +4761,7 @@
3437	4761	//copy.material = new cMaterial(copy.GetMaterial());
3438	4762
3439	4763	current.color = (float) colorField.getFloat();
3440		- current.modulation = (float) modulationField.getFloat();
	4764	+ current.modulation = (float) saturationField.getFloat();
3441	4765	current.metalness = (float) metalnessField.getFloat();
3442	4766	current.diffuse = (float) diffuseField.getFloat();
3443	4767	current.specular = (float) specularField.getFloat();
..	..	@@ -3460,10 +4784,63 @@
3460	4784	current.fakedepth = (float) fakedepthField.getFloat();
3461	4785	current.shadowbias = (float) shadowbiasField.getFloat();
3462	4786
3463		- if (!NumberSlider.frozen)
	4787	+ if (!cNumberSlider.frozen)
3464	4788	{
3465	4789	//System.out.println("Propagate = " + propagate);
3466	4790	copy.UpdateMaterial(anchor, current, propagate);
	4791	+
	4792	+ if (copy.material != null)
	4793	+ {
	4794	+ cMaterial mat = copy.material;
	4795	+
	4796	+ if (!Equal(colorField.getFloat(), mat.color))
	4797	+ colorField.SetToolTipValue((mat.color));
	4798	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4799	+ saturationField.SetToolTipValue((mat.modulation));
	4800	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4801	+ metalnessField.SetToolTipValue((mat.metalness));
	4802	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4803	+ diffuseField.SetToolTipValue((mat.diffuse));
	4804	+ if (!Equal(specularField.getFloat(), mat.specular))
	4805	+ specularField.SetToolTipValue((mat.specular));
	4806	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4807	+ shininessField.SetToolTipValue((mat.shininess));
	4808	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4809	+ shiftField.SetToolTipValue((mat.shift));
	4810	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4811	+ ambientField.SetToolTipValue((mat.ambient));
	4812	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4813	+ lightareaField.SetToolTipValue((mat.lightarea));
	4814	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4815	+ diffusenessField.SetToolTipValue((mat.factor));
	4816	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4817	+ velvetField.SetToolTipValue((mat.velvet));
	4818	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4819	+ sheenField.SetToolTipValue((mat.sheen));
	4820	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4821	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4822	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4823	+ backlitField.SetToolTipValue((mat.bump));
	4824	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4825	+ anisoField.SetToolTipValue((mat.aniso));
	4826	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4827	+ anisoVField.SetToolTipValue((mat.anisoV));
	4828	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4829	+ cameraField.SetToolTipValue((mat.cameralight));
	4830	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4831	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4832	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4833	+ shadowField.SetToolTipValue((mat.shadow));
	4834	+ if (!Equal(textureField.getFloat(), mat.texture))
	4835	+ textureField.SetToolTipValue((mat.texture));
	4836	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4837	+ opacityField.SetToolTipValue((mat.opacity));
	4838	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4839	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4840	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4841	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4842	+ }
	4843	+
3467	4844	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3468	4845	{
3469	4846	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3492,9 +4869,28 @@
3492	4869	//copy.Touch();
3493	4870	}
3494	4871
	4872	+ cNumberSlider versionSlider;
	4873	+
3495	4874	public void stateChanged(ChangeEvent e)
3496	4875	{
3497	4876	// assert(false);
	4877	+ if (e.getSource() == versionSlider)
	4878	+ {
	4879	+ if (muteSlider)
	4880	+ return;
	4881	+
	4882	+ Replace();
	4883	+
	4884	+ int version = versionSlider.getInteger();
	4885	+
	4886	+ if (version != -1 && copy.versionlist[version] != null)
	4887	+ {
	4888	+ copy.versionindex = version;
	4889	+ CopyChanged();
	4890	+ }
	4891	+
	4892	+ return;
	4893	+ }
3498	4894
3499	4895	if (freezematerial)
3500	4896	{
..	..	@@ -3508,6 +4904,7 @@
3508	4904	\|\| e.getSource() == apertureField
3509	4905	\|\| e.getSource() == shadowblurField)
3510	4906	{
	4907	+ new Exception().printStackTrace();
3511	4908	System.exit(0);
3512	4909	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3513	4910	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3529,12 +4926,24 @@
3529	4926	{
3530	4927	//System.out.println("stateChanged = " + this);
3531	4928	materialtouched = true;
	4929	+
	4930	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4931	+ {
	4932	+ saturationField.setFloat(1);
	4933	+ }
	4934	+
3532	4935	applySelf();
3533	4936	//System.out.println("this = " + this);
3534	4937	//System.out.println("PARENT = " + parent);
3535	4938	//if (parent != null)
3536	4939	// parent.applySelf();
3537		- refreshContents();
	4940	+ if (e.getSource() == normalpushField)
	4941	+ {
	4942	+ objEditor.refreshContents();
	4943	+ //Refresh();
	4944	+ }
	4945	+ else
	4946	+ refreshContents();
3538	4947	// ??? client.refreshEditWindow();
3539	4948	}
3540	4949	//else
..	..	@@ -3546,7 +4955,7 @@
3546	4955	//group.name = nameField.getText();
3547	4956	//objEditor.applySelf();
3548	4957
3549		- assert (objEditor == this);
	4958	+ // OCT2018: assert (objEditor == this);
3550	4959	if (copy.selection == null \|\| copy.selection.size() == 0)
3551	4960	//super.applySelf()
3552	4961	; else
..	..	@@ -3570,12 +4979,18 @@
3570	4979	objEditor.copy = keep;
3571	4980	}
3572	4981	}
	4982	+
	4983	+ if (normalpushField != null)
	4984	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3573	4985	}
3574	4986
3575	4987	void SnapObject()
3576	4988	{
3577		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3578		- SnapObject(obj);
	4989	+ if (copy.selection.size() > 0)
	4990	+ {
	4991	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4992	+ SnapObject(obj);
	4993	+ }
3579	4994	}
3580	4995
3581	4996	void SnapObject(Object3D obj)
..	..	@@ -3816,20 +5231,28 @@
3816	5231	{
3817	5232	if (GetTree() != null)
3818	5233	{
	5234	+ GetTree().revalidate();
3819	5235	GetTree().repaint();
3820	5236	}
3821	5237
3822	5238	radioPanel.revalidate();
3823	5239	radioPanel.repaint();
3824		- ctrlPanel.revalidate(); // ? new
	5240	+ ctrlPanel.validate(); // ? new
3825	5241	ctrlPanel.repaint();
3826	5242	}
	5243	+
	5244	+ if (previousVersionButton != null && copy.versionlist != null)
	5245	+ SetVersionStates();
	5246	+
	5247	+ cameraView.requestFocusInWindow();
3827	5248	}
3828	5249
3829	5250	static TweenManager tweenManager = new TweenManager();
3830	5251
3831	5252	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3832	5253	{
	5254	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5255	+ Save();
3833	5256	//Tween.set(thing, 0).target(1).start(tweenManager);
3834	5257	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3835	5258	// if (thing instanceof GenericJointDemo)
..	..	@@ -3853,7 +5276,7 @@
3853	5276	// group = (Composite) group.get(0);
3854	5277	// }
3855	5278
3856		- System.out.println("makeSomething of " + thing);
	5279	+ //System.out.println("makeSomething of " + thing);
3857	5280
3858	5281	/*
3859	5282	if (deselect && jList != null)
..	..	@@ -3916,6 +5339,12 @@
3916	5339	{
3917	5340	ResetModel();
3918	5341	Select(thing.GetTreePath(), true, false); // unselect... false);
	5342	+
	5343	+ if (thing.Size() == 0)
	5344	+ {
	5345	+ //EditSelection(false);
	5346	+ }
	5347	+
3919	5348	refreshContents();
3920	5349	}
3921	5350
..	..	@@ -4033,6 +5462,7 @@
4033	5462	}
4034	5463	}
4035	5464	}
	5465	+
4036	5466	LoadGFDThread loadGFDThread;
4037	5467
4038	5468	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4052,8 +5482,10 @@
4052	5482
4053	5483	try
4054	5484	{
	5485	+ // Try compressed version first.
4055	5486	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4056		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5487	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5488	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4057	5489
4058	5490	readobj = (Object3D) p.readObject();
4059	5491	istream.close();
..	..	@@ -4061,7 +5493,22 @@
4061	5493	readobj.ResetDisplayList();
4062	5494	} catch (Exception e)
4063	5495	{
4064		- e.printStackTrace();
	5496	+ if (!e.toString().contains("GZIP"))
	5497	+ e.printStackTrace();
	5498	+
	5499	+ try
	5500	+ {
	5501	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5502	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5503	+
	5504	+ readobj = (Object3D) p.readObject();
	5505	+ istream.close();
	5506	+
	5507	+ readobj.ResetDisplayList();
	5508	+ } catch (Exception e2)
	5509	+ {
	5510	+ e2.printStackTrace();
	5511	+ }
4065	5512	}
4066	5513	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4067	5514	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4107,6 +5554,12 @@
4107	5554
4108	5555	void LoadIt(Object obj)
4109	5556	{
	5557	+ if (obj == null)
	5558	+ {
	5559	+ // Invalid file
	5560	+ return;
	5561	+ }
	5562	+
4110	5563	System.out.println("Loaded " + obj);
4111	5564	//new Exception().printStackTrace();
4112	5565	Object3D readobj = (Object3D) obj;
..	..	@@ -4116,10 +5569,14 @@
4116	5569
4117	5570	if (readobj != null)
4118	5571	{
	5572	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5573	+ // Save();
4119	5574	try
4120	5575	{
4121	5576	//readobj.deepCopySelf(copy);
4122	5577	copy.clear(); // june 2014
	5578	+ copy.skyboxname = readobj.skyboxname;
	5579	+ copy.skyboxext = readobj.skyboxext;
4123	5580	for (int i = 0; i < readobj.size(); i++)
4124	5581	{
4125	5582	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4160,6 +5617,7 @@
4160	5617	}
4161	5618	} catch (ClassCastException e)
4162	5619	{
	5620	+ e.printStackTrace();
4163	5621	assert (false);
4164	5622	Composite c = (Composite) copy;
4165	5623	c.children.clear();
..	..	@@ -4170,17 +5628,32 @@
4170	5628	c.addChild(csg);
4171	5629	}
4172	5630
	5631	+ copy.versionlist = readobj.versionlist;
	5632	+ copy.versionindex = readobj.versionindex;
	5633	+ copy.versiontable = readobj.versiontable;
	5634	+
	5635	+ if (copy.versionlist == null)
	5636	+ {
	5637	+ // Backward compatibility
	5638	+ copy.versionlist = new Object3D[100];
	5639	+ copy.versionindex = -1;
	5640	+
	5641	+ //Save(true);
	5642	+ }
	5643	+
	5644	+ //? SetUndoStates();
	5645	+
4173	5646	ResetModel();
4174	5647	copy.HardTouch(); // recompile?
4175	5648	refreshContents();
4176	5649	}
4177	5650	}
4178	5651
4179		- void load() // throws ClassNotFoundException
	5652	+ void Open() // throws ClassNotFoundException
4180	5653	{
4181		- if (GrafreeD.standAlone)
	5654	+ if (Grafreed.standAlone)
4182	5655	{
4183		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5656	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4184	5657	browser.show();
4185	5658	String filename = browser.getFile();
4186	5659	if (filename != null && filename.length() > 0)
..	..	@@ -4257,6 +5730,8 @@
4257	5730
4258	5731	void save()
4259	5732	{
	5733	+ Replace();
	5734	+
4260	5735	if (lastname == null)
4261	5736	{
4262	5737	return;
..	..	@@ -4265,11 +5740,13 @@
4265	5740	try
4266	5741	{
4267	5742	FileOutputStream ostream = new FileOutputStream(lastname);
4268		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5743	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5744	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4269	5745
4270	5746	p.writeObject(copy);
4271	5747	p.flush();
4272	5748
	5749	+ zstream.close();
4273	5750	ostream.close();
4274	5751
4275	5752	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4277,19 +5754,23 @@
4277	5754	//ps.print(buffer.toString());
4278	5755	} catch (IOException e)
4279	5756	{
	5757	+ e.printStackTrace();
4280	5758	}
4281	5759	}
	5760	+
4282	5761	String lastname;
4283	5762
4284	5763	void saveAs()
4285	5764	{
4286		- if (GrafreeD.standAlone)
	5765	+ if (Grafreed.standAlone)
4287	5766	{
4288	5767	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4289	5768	browser.setVisible(true);
4290	5769	String filename = browser.getFile();
4291	5770	if (filename != null && filename.length() > 0)
4292	5771	{
	5772	+ if (!filename.endsWith(".gfd"))
	5773	+ filename += ".gfd";
4293	5774	lastname = browser.getDirectory() + filename;
4294	5775	save();
4295	5776	}
..	..	@@ -4388,13 +5869,13 @@
4388	5869	try
4389	5870	{
4390	5871	FileOutputStream ostream = new FileOutputStream(filename);
4391		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4392		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5872	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5873	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4393	5874
4394	5875	Object3D objectparent = obj.parent;
4395	5876	obj.parent = null;
4396	5877
4397		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5878	+ Object3D object = (Object3D) Grafreed.clone(obj);
4398	5879
4399	5880	obj.parent = objectparent;
4400	5881
..	..	@@ -4406,8 +5887,8 @@
4406	5887	p.writeObject(object);
4407	5888	p.flush();
4408	5889
	5890	+ zstream.close();
4409	5891	ostream.close();
4410		- // zstream.close();
4411	5892
4412	5893	// group.selection.get(0).parent = parent;
4413	5894	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4428,7 +5909,7 @@
4428	5909	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4429	5910	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4430	5911	copy.generatePOV(buffer);
4431		- if (GrafreeD.standAlone)
	5912	+ if (Grafreed.standAlone)
4432	5913	{
4433	5914	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4434	5915	browser.show();
..	..	@@ -4454,21 +5935,20 @@
4454	5935	Object3D client;
4455	5936	Object3D copy;
4456	5937	MenuBar menuBar;
4457		- Menu windowMenu;
4458		- MenuItem loadItem;
	5938	+ Menu fileMenu;
	5939	+ MenuItem newItem;
	5940	+ MenuItem openItem;
4459	5941	MenuItem saveItem;
4460	5942	MenuItem saveAsItem;
4461	5943	MenuItem exportAsItem;
4462	5944	MenuItem reexportItem;
4463	5945	MenuItem povItem;
4464	5946	MenuItem closeItem;
4465		- Menu cameraMenu;
	5947	+
4466	5948	CheckboxMenuItem zBufferItem;
4467	5949	//MenuItem normalLensItem;
4468		- MenuItem editCameraItem;
4469		- MenuItem revertCameraItem;
4470		- CheckboxMenuItem toggleLiveItem;
4471	5950	MenuItem stepItem;
	5951	+ CheckboxMenuItem toggleLiveItem;
4472	5952	CheckboxMenuItem toggleFullScreenItem;
4473	5953	CheckboxMenuItem toggleTimelineItem;
4474	5954	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4477,28 +5957,44 @@
4477	5957	CheckboxMenuItem toggleFootContactItem;
4478	5958	CheckboxMenuItem toggleDLItem;
4479	5959	CheckboxMenuItem toggleTextureItem;
4480		- CheckboxMenuItem toggleRandomItem;
	5960	+ CheckboxMenuItem toggleSwitchItem;
4481	5961	CheckboxMenuItem toggleRootItem;
4482	5962	CheckboxMenuItem animationItem;
	5963	+ MenuItem archiveItem;
4483	5964	CheckboxMenuItem toggleHandleItem;
4484	5965	CheckboxMenuItem togglePaintItem;
4485	5966	JSplitPane mainPanel;
4486	5967	JScrollPane scrollpane;
	5968	+
4487	5969	JPanel toolbarPanel;
4488		- JPanel treePanel;
	5970	+
	5971	+ cGridBag treePanel;
	5972	+
4489	5973	JPanel radioPanel;
4490	5974	ButtonGroup buttonGroup;
4491		- JPanel ctrlPanel;
4492		- JPanel materialPanel;
	5975	+
	5976	+ cGridBag toolboxPanel;
	5977	+ cGridBag skyboxPanel;
	5978	+ cGridBag materialPanel;
	5979	+ cGridBag ctrlPanel;
	5980	+
4493	5981	JScrollPane infoPanel;
4494		- JPanel optionsPanel;
	5982	+
	5983	+ cGridBag optionsPanel;
	5984	+
4495	5985	JTabbedPane objectPanel;
4496		- JPanel XYZPanel;
	5986	+ boolean materialFlushed;
	5987	+ Object3D latestObject;
	5988	+
	5989	+ cGridBag XYZPanel;
	5990	+
4497	5991	JSplitPane gridPanel;
4498	5992	JSplitPane bigPanel;
4499		- JPanel bigThree;
4500		- JTabbedPane scenePanel;
4501		- JPanel centralPanel;
	5993	+
	5994	+ cGridBag bigThree;
	5995	+ cGridBag scenePanel;
	5996	+ cGridBag centralPanel;
	5997	+ JSplitPane cameraPanel;
4502	5998	JPanel timelinePanel;
4503	5999	JMenuBar timelineMenubar;
4504	6000	JSplitPane framePanel;
..	..	@@ -4550,65 +6046,74 @@
4550	6046	// MATERIAL
4551	6047	JLabel materialLabel;
4552	6048	JLabel colorLabel;
4553		- NumberSlider colorField;
	6049	+ cNumberSlider colorField;
4554	6050	JLabel modulationLabel;
4555		- NumberSlider modulationField;
	6051	+ cNumberSlider saturationField;
4556	6052	JLabel metalnessLabel;
4557		- NumberSlider metalnessField;
	6053	+ cNumberSlider metalnessField;
4558	6054	JLabel diffuseLabel;
4559		- NumberSlider diffuseField;
	6055	+ cNumberSlider diffuseField;
4560	6056	JLabel specularLabel;
4561		- NumberSlider specularField;
	6057	+ cNumberSlider specularField;
4562	6058	JLabel shininessLabel;
4563		- NumberSlider shininessField;
	6059	+ cNumberSlider shininessField;
4564	6060	JLabel shiftLabel;
4565		- NumberSlider shiftField;
	6061	+ cNumberSlider shiftField;
4566	6062	JLabel ambientLabel;
4567		- NumberSlider ambientField;
	6063	+ cNumberSlider ambientField;
4568	6064	JLabel lightareaLabel;
4569		- NumberSlider lightareaField;
	6065	+ cNumberSlider lightareaField;
4570	6066	JLabel diffusenessLabel;
4571		- NumberSlider diffusenessField;
	6067	+ cNumberSlider diffusenessField;
4572	6068	JLabel velvetLabel;
4573		- NumberSlider velvetField;
	6069	+ cNumberSlider velvetField;
4574	6070	JLabel sheenLabel;
4575		- NumberSlider sheenField;
	6071	+ cNumberSlider sheenField;
4576	6072	JLabel subsurfaceLabel;
4577		- NumberSlider subsurfaceField;
	6073	+ cNumberSlider subsurfaceField;
4578	6074	//JLabel bumpLabel;
4579	6075	//NumberSlider bumpField;
4580	6076	JLabel backlitLabel;
4581		- NumberSlider backlitField;
	6077	+ cNumberSlider backlitField;
4582	6078	JLabel anisoLabel;
4583		- NumberSlider anisoField;
	6079	+ cNumberSlider anisoField;
4584	6080	JLabel anisoVLabel;
4585		- NumberSlider anisoVField;
	6081	+ cNumberSlider anisoVField;
	6082	+
4586	6083	JLabel cameraLabel;
4587		- NumberSlider cameraField;
	6084	+ cNumberSlider cameraField;
4588	6085	JLabel selfshadowLabel;
4589		- NumberSlider selfshadowField;
	6086	+ cNumberSlider selfshadowField;
4590	6087	JLabel shadowLabel;
4591		- NumberSlider shadowField;
	6088	+ cNumberSlider shadowField;
4592	6089	JLabel textureLabel;
4593		- NumberSlider textureField;
	6090	+ cNumberSlider textureField;
4594	6091	JLabel opacityLabel;
4595		- NumberSlider opacityField;
	6092	+ cNumberSlider opacityField;
4596	6093	JLabel fakedepthLabel;
4597		- NumberSlider fakedepthField;
	6094	+ cNumberSlider fakedepthField;
4598	6095	JLabel shadowbiasLabel;
4599		- NumberSlider shadowbiasField;
	6096	+ cNumberSlider shadowbiasField;
	6097	+
4600	6098	JLabel bumpLabel;
4601		- NumberSlider bumpField;
	6099	+ cNumberSlider bumpField;
4602	6100	JLabel noiseLabel;
4603		- NumberSlider noiseField;
	6101	+ cNumberSlider noiseField;
4604	6102	JLabel powerLabel;
4605		- NumberSlider powerField;
	6103	+ cNumberSlider powerField;
4606	6104	JLabel borderfadeLabel;
4607		- NumberSlider borderfadeField;
	6105	+ cNumberSlider borderfadeField;
4608	6106	JLabel fogLabel;
4609		- NumberSlider fogField;
	6107	+ cNumberSlider fogField;
4610	6108	JLabel opacityPowerLabel;
4611		- NumberSlider opacityPowerField;
4612		- JTree jTree;
	6109	+ cNumberSlider opacityPowerField;
	6110	+ cTree jTree;
4613	6111	//ObjectUI parent;
	6112	+
	6113	+ cNumberSlider normalpushField;
	6114	+
	6115	+ private MenuItem importGFDItem;
	6116	+ private MenuItem importVRMLX3DItem;
	6117	+ private MenuItem import3DSItem;
	6118	+ private MenuItem importOBJItem;
4614	6119	}