~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -28,9 +34,129 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ public cToggleButton pinButton;
31	38	boolean timeline;
32	39	boolean wasFullScreen;
33	40
	41	+ GroupEditor callee;
	42	+ JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
	82	+
	83	+ cButton GetButton(String name, boolean border)
	84	+ {
	85	+ ImageIcon icon = GetIcon(name);
	86	+ return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
	93	+ }
	94	+
	95	+ cToggleButton GetToggleButton(String name, boolean border)
	96	+ {
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
	99	+ }
	100	+
	101	+ cCheckBox GetCheckBox(String name, boolean border)
	102	+ {
	103	+ ImageIcon icon = GetIcon(name);
	104	+ return new cCheckBox(icon, border);
	105	+ }
	106	+
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
	109	+ ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
	117	+ try
	118	+ {
	119	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	120	+
	121	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	122	+// {
	123	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	124	+// Graphics2D g = resized.createGraphics();
	125	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	126	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	127	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	128	+// g.dispose();
	129	+//
	130	+// image = resized;
	131	+// }
	132	+
	133	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
	137	+ return icon;
	138	+ }
	139	+ catch (Exception e)
	140	+ {
	141	+ //icons.put(name, null);
	142	+ return null;
	143	+ }
	144	+ }
	145	+
	146	+ BufferedImage GetImage(String name)
	147	+ {
	148	+ try
	149	+ {
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
	153	+ }
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
	158	+ }
	159	+
34	160	// SCRIPT
35	161
36	162	transient JFrame textpanel = null;
..	..	@@ -121,51 +247,62 @@
121	247	void keyPressed(int key, int modifiers)
122	248	{
123	249	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	250	+ Globals.theRenderer.keyPressed(key, modifiers);
125	251	}
126	252	*/
127	253
128	254	static GridBagConstraints aConstraints;
129	255	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	256	+
132	257	static int GRIDWIDTH = 100; // 4;
133	258
134	259	public void closeUI()
135	260	{
136	261	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	262	+// System.out.println("this = " + this);
	263	+// System.out.println("objEditor = " + objEditor);
139	264	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	265	+// objEditor.ctrlPanel.remove(nameField);
141	266
142		- if (!GroupEditor.allparams)
	267	+ objEditor.ctrlPanel.remove(namePanel);
	268	+
	269	+ if (!allparams)
143	270	return;
144	271
145		- objEditor.ctrlPanel.remove(liveCB);
146		- objEditor.ctrlPanel.remove(hideCB);
147		- objEditor.ctrlPanel.remove(markCB);
148		-
149		- objEditor.ctrlPanel.remove(randomCB);
150		- objEditor.ctrlPanel.remove(speedupCB);
151		- objEditor.ctrlPanel.remove(rewindCB);
152		-
153		- objEditor.ctrlPanel.remove(resetButton);
154		- objEditor.ctrlPanel.remove(stepButton);
155		-// objEditor.ctrlPanel.remove(stepAllButton);
156		-// objEditor.ctrlPanel.remove(resetAllButton);
157		- objEditor.ctrlPanel.remove(link2masterCB);
158		- //objEditor.ctrlPanel.remove(flipVCB);
159		- //objEditor.ctrlPanel.remove(texresMenu);
160		- objEditor.ctrlPanel.remove(slowerButton);
161		- objEditor.ctrlPanel.remove(fasterButton);
162		- objEditor.ctrlPanel.remove(remarkButton);
	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);
163	298	}
164	299
165	300	public ObjEditor GetEditor()
166	301	{
167	302	return objEditor; //.GetEditor();
168	303	}
	304	+
	305	+ // Sometimes myself, sometimes my callee's.
169	306	ObjEditor objEditor;
170	307
171	308	/*
..	..	@@ -201,6 +338,14 @@
201	338	client = inClient;
202	339	copy = client;
203	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
204	349	// "this" is not called: SetupUI2(objEditor);
205	350	}
206	351
..	..	@@ -214,6 +359,14 @@
214	359	client = inClient;
215	360	copy = client;
216	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
217	370	SetupUI2(callee.GetEditor());
218	371	}
219	372
..	..	@@ -228,13 +381,15 @@
228	381	//localCopy.parent = null;
229	382
230	383	frame = new JFrame();
	384	+ frame.setUndecorated(false);
231	385	objEditor = this;
232	386	this.callee = callee;
233	387
234	388	//parent = p;
235	389
236	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
237		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
238	393	//gd.setFullScreenWindow(this);
239	394	//setResizable(false);
240	395	//if (!isDisplayable())
..	..	@@ -245,6 +400,14 @@
245	400	copy = localCopy;
246	401	copy.editWindow = this;
247	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
248	411	SetupMenu();
249	412
250	413	//SetupName(objEditor); // new
..	..	@@ -258,28 +421,49 @@
258	421	return frame.action(event, obj);
259	422	}
260	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	+
261	429	void SetupMenu()
262	430	{
263	431	frame.setMenuBar(menuBar = new MenuBar());
264		- menuBar.add(windowMenu = new Menu("File"));
265		- windowMenu.add(loadItem = new MenuItem("Load..."));
266		- windowMenu.add("-");
267		- windowMenu.add(saveItem = new MenuItem("Save"));
268		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	432	+ menuBar.add(fileMenu = new Menu("File"));
	433	+ fileMenu.add(newItem = new MenuItem("New"));
	434	+ fileMenu.add(openItem = new MenuItem("Open..."));
	435	+
	436	+ //oe.menuBar.add(menu = new Menu("Include"));
	437	+ Menu menu = new Menu("Import");
	438	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	439	+ importOBJItem.addActionListener(this);
	440	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	441	+ import3DSItem.addActionListener(this);
	442	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	443	+ importVRMLX3DItem.addActionListener(this);
	444	+ menu.add("-");
	445	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	446	+ importGFDItem.addActionListener(this);
	447	+ fileMenu.add(menu);
	448	+ fileMenu.add("-");
	449	+
	450	+ fileMenu.add(saveItem = new MenuItem("Save"));
	451	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
269	452	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
270		- windowMenu.add("-");
271		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
272		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
273		- windowMenu.add("-");
	453	+ fileMenu.add("-");
	454	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	455	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	456	+ fileMenu.add("-");
274	457	if (client.parent != null)
275	458	{
276		- windowMenu.add(closeItem = new MenuItem("Close"));
	459	+ fileMenu.add(closeItem = new MenuItem("Close"));
277	460	} else
278	461	{
279		- windowMenu.add(closeItem = new MenuItem("Exit"));
	462	+ fileMenu.add(closeItem = new MenuItem("Exit"));
280	463	}
281	464
282		- loadItem.addActionListener(this);
	465	+ newItem.addActionListener(this);
	466	+ openItem.addActionListener(this);
283	467	saveItem.addActionListener(this);
284	468	saveAsItem.addActionListener(this);
285	469	exportAsItem.addActionListener(this);
..	..	@@ -287,82 +471,103 @@
287	471	//povItem.addActionListener(this);
288	472	closeItem.addActionListener(this);
289	473
290		- menuBar.add(cameraMenu = new Menu("View"));
291		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
292		- //zBufferItem.addActionListener(this);
293		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
294		- //normalLensItem.addActionListener(this);
295		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
296		- revertCameraItem.addActionListener(this);
297		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
298		- toggleTimelineItem.addItemListener(this);
299		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
300		- toggleFullScreenItem.addItemListener(this);
301		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
302		- cameraMenu.add("-");
303		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
304		- toggleTextureItem.addItemListener(this);
305		- toggleTextureItem.setState(CameraPane.textureon);
306		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
307		- toggleLiveItem.addItemListener(this);
308		- toggleLiveItem.setState(CameraPane.isLIVE());
309		- cameraMenu.add(stepItem = new MenuItem("Step"));
310		- stepItem.addActionListener(this);
311		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
312		-// toggleDLItem.addItemListener(this);
313		-// toggleDLItem.setState(false);
314		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
315		- toggleRenderItem.addItemListener(this);
316		- toggleRenderItem.setState(!CameraPane.frozen);
317		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
318		- toggleDebugItem.addItemListener(this);
319		- toggleDebugItem.setState(CameraPane.DEBUG);
320		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
321		- toggleFrustumItem.addItemListener(this);
322		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
323		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
324		- toggleFootContactItem.addItemListener(this);
325		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
326		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
327		- toggleRandomItem.addItemListener(this);
328		- toggleRandomItem.setState(CameraPane.RANDOM);
329		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
330		- toggleHandleItem.addItemListener(this);
331		- toggleHandleItem.setState(CameraPane.HANDLES);
332		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
333		- togglePaintItem.addItemListener(this);
334		- togglePaintItem.setState(CameraPane.PAINTMODE);
335		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
336		-// toggleRootItem.addItemListener(this);
337		-// toggleRootItem.setState(false);
338		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
339		-// animationItem.addItemListener(this);
340		-// animationItem.setState(CameraPane.ANIMATION);
341		- cameraMenu.add("-");
342		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
343		- editCameraItem.addActionListener(this);
344		-
345	474	objectPanel = new JTabbedPane();
	475	+
	476	+ ChangeListener changeListener = new ChangeListener()
	477	+ {
	478	+ //String name;
	479	+
	480	+ public void stateChanged(ChangeEvent changeEvent)
	481	+ {
	482	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	483	+// {
	484	+// if (latestObject != null)
	485	+// {
	486	+// refreshContents(true);
	487	+// SetMaterial(latestObject);
	488	+// }
	489	+//
	490	+// materialFlushed = true;
	491	+// }
	492	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	493	+// {
	494	+// if (listUI.size() == 0)
	495	+// EditSelection(false);
	496	+// }
	497	+
	498	+// if (objectPanel.getSelectedIndex() == 4)
	499	+// {
	500	+// name = copy.skyboxname;
	501	+//
	502	+// if (name == null)
	503	+// {
	504	+// name = "";
	505	+// }
	506	+//
	507	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	508	+// copy.skyboxext = "jpg";
	509	+// }
	510	+// else
	511	+// {
	512	+// if (name != null)
	513	+// {
	514	+// if (name.equals(""))
	515	+// {
	516	+// copy.skyboxname = null;
	517	+// copy.skyboxext = null;
	518	+// }
	519	+// else
	520	+// {
	521	+// copy.skyboxname = name;
	522	+// }
	523	+// }
	524	+// }
	525	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	526	+
	527	+// refreshContents(false); // To refresh Info tab
	528	+ cameraView.repaint();
	529	+ }
	530	+ };
	531	+ objectPanel.addChangeListener(changeListener);
	532	+
346	533	toolbarPanel = new JPanel();
347	534	toolbarPanel.setName("Toolbar");
348		- treePanel = new JPanel();
	535	+
	536	+ treePanel = new cGridBag();
349	537	treePanel.setName("Tree");
350		- ctrlPanel = new JPanel(); // new GridBagLayout());
351		- ctrlPanel.setName("Edit");
352		- materialPanel = new JPanel();
353		- materialPanel.setName("Material");
	538	+
	539	+ editPanel = new cGridBag().setVertical(true);
	540	+ //editPanel.setName("Edit");
	541	+
	542	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	543	+
	544	+ editCommandsPanel = new cGridBag();
	545	+ editPanel.add(editCommandsPanel);
	546	+ editPanel.add(ctrlPanel);
	547	+
	548	+ toolboxPanel = new cGridBag().setVertical(true);
	549	+ //toolboxPanel.setName("Toolbox");
	550	+
	551	+ skyboxPanel = new cGridBag().setVertical(true);
	552	+
	553	+ materialPanel = new cGridBag().setVertical(false);
	554	+ //materialPanel.setName("Material");
	555	+
354	556	/JTextPane/
355	557	infoarea = createTextPane();
	558	+ doc = infoarea.getStyledDocument();
	559	+
356	560	infoarea.setEditable(true);
357	561	SetText();
	562	+
358	563	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
359	564	// infoarea.setOpaque(false);
360	565	// //infoarea.setForeground(textcolor);
361		- infoarea.setLineWrap(true);
362		- infoarea.setWrapStyleWord(true);
	566	+// TEXTAREA infoarea.setLineWrap(true);
	567	+// TEXTAREA infoarea.setWrapStyleWord(true);
363	568	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
364		- infoPanel.setPreferredSize(new Dimension(50, 200));
365		- infoPanel.setName("Info");
	569	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	570	+ //infoPanel.setName("Info");
366	571	//infoPanel.setLayout(new BorderLayout());
367	572	//infoPanel.add(createTextPane());
368	573
..	..	@@ -370,16 +575,23 @@
370	575	mainPanel.setName("Main");
371	576	mainPanel.setContinuousLayout(true);
372	577	mainPanel.setOneTouchExpandable(true);
373		- mainPanel.setDividerLocation(1.0);
374	578	mainPanel.setDividerSize(9);
375		- mainPanel.setResizeWeight(0);
376		-
	579	+ mainPanel.setDividerLocation(0.5); //1.0);
	580	+ mainPanel.setResizeWeight(0.5);
	581	+
	582	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	583	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	584	+ divider.setDividerSize(15);
	585	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	586	+
	587	+ mainPanel.setUI(new BasicSplitPaneUI());
	588	+
377	589	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
378	590	//mainPanel.setLayout(new GridBagLayout());
379	591	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
380		- treePanel.setLayout(new GridBagLayout());
381		- ctrlPanel.setLayout(new GridBagLayout());
382		- materialPanel.setLayout(new GridBagLayout());
	592	+// treePanel.setLayout(new GridBagLayout());
	593	+ //ctrlPanel.setLayout(new GridBagLayout());
	594	+ //materialPanel.setLayout(new GridBagLayout());
383	595
384	596	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
385	597	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -418,7 +630,7 @@
418	630	static String newline = "\n";
419	631	protected static final String buttonString = "JButton";
420	632	StyledDocument doc;
421		- JTextArea infoarea;
	633	+ JTextPane infoarea;
422	634
423	635	void ClearInfo()
424	636	{
..	..	@@ -441,10 +653,10 @@
441	653	e.printStackTrace();
442	654	}
443	655
444		- String selection = infoarea.getText();
445		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
446		- java.awt.datatransfer.Clipboard clipboard =
447		- Toolkit.getDefaultToolkit().getSystemClipboard();
	656	+// String selection = infoarea.getText();
	657	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	658	+// java.awt.datatransfer.Clipboard clipboard =
	659	+// Toolkit.getDefaultToolkit().getSystemClipboard();
448	660	//clipboard.setContents(data, data);
449	661	}
450	662
..	..	@@ -467,13 +679,13 @@
467	679	//SendInfo("Name:", "bold");
468	680	if (sel.GetTextures() != null \|\| debug)
469	681	{
470		- si.SendInfo(sel.toString(), "bold");
	682	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
471	683	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
472	684	if (sel.Size() > 0)
473	685	{
474	686	si.SendInfo("#children = " + sel.Size(), "regular");
475	687	}
476		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	688	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
477	689	if (debug)
478	690	{
479	691	try
..	..	@@ -485,7 +697,10 @@
485	697	}
486	698
487	699	if (full)
488		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	700	+ {
	701	+ si.SendInfo(" BBox min: " + minima, "regular");
	702	+ si.SendInfo(" BBox max: " + maxima, "regular");
	703	+ }
489	704
490	705	if (sel.bRep != null)
491	706	{
..	..	@@ -512,7 +727,7 @@
512	727	}
513	728	if (sel.support != null)
514	729	{
515		- si.SendInfo(" support: " + sel.support, "regular");
	730	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
516	731	}
517	732	if (sel.scriptnode != null)
518	733	{
..	..	@@ -583,6 +798,9 @@
583	798	{
584	799	CameraPane.pointflow = (PointFlow) sel;
585	800	}
	801	+
	802	+ si.SendInfo("_____________________", "regular");
	803	+ si.SendInfo("", "regular");
586	804	}
587	805	}
588	806
..	..	@@ -598,68 +816,211 @@
598	816	}
599	817	}
600	818
	819	+//static GraphicsDevice device = GraphicsEnvironment
	820	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	821	+
	822	+ Rectangle keeprect;
	823	+ cRadio radio;
	824	+
	825	+cButton keepButton;
	826	+ cButton twoButton; // Full 3D
	827	+ cButton sixButton;
	828	+ cButton threeButton;
	829	+ cButton sevenButton;
	830	+ cButton fourButton; // full panel
	831	+ cButton oneButton; // full XYZ
	832	+ //cButton currentLayout;
	833	+
	834	+ boolean maximized;
	835	+
	836	+ cButton fullscreenLayout;
	837	+ cButton expandedLayout;
	838	+
	839	+ void Minimize()
	840	+ {
	841	+ frame.setState(Frame.ICONIFIED);
	842	+ frame.validate();
	843	+ }
	844	+
	845	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	846	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	847	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	848	+ void Maximize()
	849	+ {
	850	+ if (CameraPane.FULLSCREEN)
	851	+ {
	852	+ ToggleFullScreen();
	853	+ }
	854	+
	855	+ if (maximized)
	856	+ {
	857	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	858	+ }
	859	+ else
	860	+ {
	861	+ keeprect = frame.getBounds();
	862	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	863	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	864	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	865	+// frame.setState(Frame.MAXIMIZED_BOTH);
	866	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	867	+ }
	868	+
	869	+ maximized ^= true;
	870	+
	871	+ frame.validate();
	872	+ }
	873	+
	874	+ cButton minButton;
	875	+ cButton maxButton;
	876	+ cButton fullButton;
	877	+ cButton collapseButton;
	878	+ cButton maximize3DButton;
	879	+
601	880	void ToggleFullScreen()
602	881	{
603		- if (CameraPane.FULLSCREEN)
	882	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	883	+
	884	+ cameraView.ToggleFullScreen();
	885	+
	886	+ if (!CameraPane.FULLSCREEN)
604	887	{
605		- frame.getContentPane().remove(/"Center",/bigThree);
606		- framePanel.add(bigThree);
607		- frame.getContentPane().add(/"Center",/framePanel);
	888	+ device.setFullScreenWindow(null);
	889	+ frame.dispose();
	890	+ frame.setUndecorated(false);
	891	+ frame.validate();
	892	+ frame.setVisible(true);
	893	+
	894	+ //frame.setVisible(false);
	895	+// frame.removeNotify();
	896	+// frame.setUndecorated(false);
	897	+// frame.addNotify();
	898	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	899	+
	900	+// X frame.getContentPane().remove(/"Center",/bigThree);
	901	+// X framePanel.add(bigThree);
	902	+// X frame.getContentPane().add(/"Center",/framePanel);
	903	+// framePanel.setDividerLocation(46); // icons are 24x24
	904	+
	905	+ //frame.setVisible(true);
	906	+// radio.layout = keepButton;
	907	+ //theFrame = null;
	908	+ keepButton = null;
	909	+// radio.layout.doClick();
	910	+
608	911	} else
609	912	{
610		- frame.getContentPane().remove(/"Center",/framePanel);
611		- framePanel.remove(bigThree);
612		- frame.getContentPane().add(/"Center",/bigThree);
	913	+ keepButton = radio.layout;
	914	+ //keeprect = frame.getBounds();
	915	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	916	+// frame.getToolkit().getScreenSize().height);
	917	+ //frame.setVisible(false);
	918	+
	919	+ frame.dispose();
	920	+ frame.setUndecorated(true);
	921	+ device.setFullScreenWindow(frame);
	922	+ frame.validate();
	923	+ frame.setVisible(true);
	924	+// frame.removeNotify();
	925	+// frame.setUndecorated(true);
	926	+// frame.addNotify();
	927	+// X frame.getContentPane().remove(/"Center",/framePanel);
	928	+// X framePanel.remove(bigThree);
	929	+// X frame.getContentPane().add(/"Center",/bigThree);
	930	+// framePanel.setDividerLocation(0);
	931	+
	932	+// radio.layout = fullscreenLayout;
	933	+// radio.layout.doClick();
	934	+ //frame.setVisible(true);
613	935	}
614		- cameraView.ToggleFullScreen();
	936	+ frame.validate();
	937	+
	938	+ cameraView.requestFocusInWindow();
615	939	}
616	940
617		- private JTextArea createTextPane()
	941	+ void CollapseToolbar()
	942	+ {
	943	+ framePanel.setDividerLocation(0);
	944	+ //frame.validate();
	945	+
	946	+ cameraView.requestFocusInWindow();
	947	+ }
	948	+
	949	+ private Object3D Duplicate(Object3D object)
618	950	{
619		- String[] initString =
620		- {
621		- "This is an editable JTextPane, ", //regular
622		- "another ", //italic
623		- "styled ", //bold
624		- "text ", //small
625		- "component, ", //large
626		- "which supports embedded components..." + newline,//regular
627		- " " + newline, //button
628		- "...and embedded icons..." + newline, //regular
629		- " ", //icon
630		- newline + "JTextPane is a subclass of JEditorPane that "
631		- + "uses a StyledEditorKit and StyledDocument, and provides "
632		- + "cover methods for interacting with those objects."
633		- };
	951	+ boolean temp = CameraPane.SWITCH;
	952	+ CameraPane.SWITCH = false;
	953	+
	954	+ if (Grafreed.grafreed.universe.versiontable == null)
	955	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	956	+
	957	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	958	+ // if (copy == client)
	959	+
	960	+ Object3D versions[] = object.versionlist;
	961	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	962	+ object.versionlist = null;
	963	+ object.versiontable = null;
	964	+
	965	+ //byte[] compress = Compress(copy);
	966	+ Object3D compress = (Object3D)Grafreed.clone(object);
	967	+
	968	+ object.versionlist = versions;
	969	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	970	+
	971	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	972	+
	973	+ CameraPane.SWITCH = temp;
	974	+
	975	+ return compress;
	976	+ }
634	977
635		- String[] initStyles =
636		- {
637		- "regular", "italic", "bold", "small", "large",
638		- "regular", "button", "regular", "icon",
639		- "regular"
640		- };
	978	+ private JTextPane createTextPane()
	979	+ {
	980	+// TEXTAREA String[] initString =
	981	+// {
	982	+// "This is an editable JTextPane, ", //regular
	983	+// "another ", //italic
	984	+// "styled ", //bold
	985	+// "text ", //small
	986	+// "component, ", //large
	987	+// "which supports embedded components..." + newline,//regular
	988	+// " " + newline, //button
	989	+// "...and embedded icons..." + newline, //regular
	990	+// " ", //icon
	991	+// newline + "JTextPane is a subclass of JEditorPane that "
	992	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	993	+// + "cover methods for interacting with those objects."
	994	+// };
	995	+//
	996	+// String[] initStyles =
	997	+// {
	998	+// "regular", "italic", "bold", "small", "large",
	999	+// "regular", "button", "regular", "icon",
	1000	+// "regular"
	1001	+// };
	1002	+//
	1003	+// JTextPane textPane = new JTextPane();
	1004	+// textPane.setEditable(true);
	1005	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1006	+// addStylesToDocument(doc);
	1007	+//
	1008	+// try
	1009	+// {
	1010	+// for (int j = 0; j < 2; j++)
	1011	+// {
	1012	+// for (int i = 0; i < initString.length; i++)
	1013	+// {
	1014	+// doc.insertString(doc.getLength(), initString[i],
	1015	+// doc.getStyle(initStyles[i]));
	1016	+// }
	1017	+// }
	1018	+// } catch (BadLocationException ble)
	1019	+// {
	1020	+// System.err.println("Couldn't insert initial text into text pane.");
	1021	+// }
641	1022
642		- JTextPane textPane = new JTextPane();
643		- textPane.setEditable(true);
644		- /StyledDocument/ doc = textPane.getStyledDocument();
645		- addStylesToDocument(doc);
646		-
647		- try
648		- {
649		- for (int j = 0; j < 2; j++)
650		- {
651		- for (int i = 0; i < initString.length; i++)
652		- {
653		- doc.insertString(doc.getLength(), initString[i],
654		- doc.getStyle(initStyles[i]));
655		- }
656		- }
657		- } catch (BadLocationException ble)
658		- {
659		- System.err.println("Couldn't insert initial text into text pane.");
660		- }
661		-
662		- return new JTextArea(); // textPane;
	1023	+ return new JTextPane(); // textPane;
663	1024	}
664	1025
665	1026	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -712,7 +1073,7 @@
712	1073	protected static ImageIcon createImageIcon(String path,
713	1074	String description)
714	1075	{
715		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1076	+ java.net.URL imgURL = Grafreed.class.getResource(path);
716	1077	if (imgURL != null)
717	1078	{
718	1079	return new ImageIcon(imgURL, description);
..	..	@@ -735,6 +1096,7 @@
735	1096	{
736	1097	SetupMaterial(materialPanel);
737	1098	}
	1099	+
738	1100	//SetupName();
739	1101	//SetupViews();
740	1102	}
..	..	@@ -744,6 +1106,7 @@
744	1106	// NumberSlider vDivsField;
745	1107	// JCheckBox endcaps;
746	1108	JCheckBox liveCB;
	1109	+ JCheckBox selectableCB;
747	1110	JCheckBox hideCB;
748	1111	JCheckBox link2masterCB;
749	1112	JCheckBox markCB;
..	..	@@ -751,7 +1114,12 @@
751	1114	JCheckBox speedupCB;
752	1115	JCheckBox rewindCB;
753	1116	JCheckBox flipVCB;
	1117	+
	1118	+ cCheckBox toggleTextureCB;
	1119	+ cCheckBox toggleSwitchCB;
	1120	+
754	1121	JComboBox texresMenu;
	1122	+
755	1123	JButton resetButton;
756	1124	JButton stepButton;
757	1125	JButton stepAllButton;
..	..	@@ -759,115 +1127,87 @@
759	1127	JButton slowerButton;
760	1128	JButton fasterButton;
761	1129	JButton remarkButton;
	1130	+
	1131	+ cGridBag editPanel;
	1132	+ cGridBag editCommandsPanel;
	1133	+
	1134	+ cGridBag namePanel;
	1135	+ cGridBag setupPanel;
	1136	+ cGridBag setupPanel2;
	1137	+ cGridBag objectCommandsPanel;
	1138	+ cGridBag pushPanel;
	1139	+ cGridBag fillPanel;
762	1140
763		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1141	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
764	1142	{
765	1143	JCheckBox cb;
766	1144
767		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
768		- oe.aConstraints.gridwidth = 1; // 3;
769		-// oe.aConstraints.weightx = 1;
770		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
771		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1145	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
772	1146	cb.addItemListener(this);
773		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
774		- oe.aConstraints.gridwidth = 1;
775		- oe.aConstraints.gridx += 1;
776	1147
777	1148	return cb;
778	1149	}
779	1150
780		- cButton AddButton(ObjEditor oe, String label)
	1151	+ cButton AddButton(cGridBag panel, String label)
781	1152	{
782	1153	cButton cb;
783	1154
784		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
785		- oe.aConstraints.gridwidth = 1;
786		-// oe.aConstraints.weightx = 1;
787		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
788		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1155	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
789	1156	cb.addActionListener(this);
790		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
791		- oe.aConstraints.gridwidth = 1;
792		- oe.aConstraints.gridx += 1;
793	1157
794	1158	return cb;
795	1159	}
796	1160
797		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1161	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
798	1162	{
799	1163	JComboBox combo;
800	1164
801		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
802		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- oe.aConstraints.gridx += 1;
	1165	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
804	1166	combo.addActionListener(this);
805	1167
806	1168	return combo;
807	1169	}
808	1170
809		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1171	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
810	1172	{
811		- NumberSlider combo;
	1173	+ cGridBag control = new cGridBag();
	1174	+
	1175	+ cNumberSlider combo;
812	1176
813	1177	JLabel jlabel = new JLabel(label);
814		-
815		- aConstraints.fill = GridBagConstraints.VERTICAL;
816	1178	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
817		- aConstraints.gridwidth = 2;
818		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
819		- aConstraints.gridx += 1;
820		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
822		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.gridwidth = 1;
825		-
	1179	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1180	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826	1181	combo.setFloat(current);
827		-
828		- combo.label = jlabel;
829		-
830		- combo.addChangeListener(this);
831		-
832		- return combo;
	1182	+
	1183	+ panel.add(control);
	1184	+
	1185	+ return control;
833	1186	}
834	1187
835		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1188	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
836	1189	{
837		- NumberSlider combo;
	1190	+ cGridBag control = new cGridBag();
	1191	+
	1192	+ cNumberSlider combo;
838	1193
839	1194	JLabel jlabel = new JLabel(label);
840		-
841		- aConstraints.fill = GridBagConstraints.VERTICAL;
842	1195	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
843		- aConstraints.gridwidth = 2;
844		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
845		- aConstraints.gridx += 1;
846		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
847		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
848		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851		-
	1196	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1197	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
852	1198	combo.setInteger(current);
853	1199
854		- combo.label = jlabel;
855		-
856		- combo.addChangeListener(this);
857		-
858		- return combo;
	1200	+ panel.add(control);
	1201	+
	1202	+ return control;
859	1203	}
860	1204
861		- JTextArea AddText(JPanel ctrlPanel, String name)
	1205	+ JTextArea AddText(cGridBag ctrlPanel, String name)
862	1206	{
863	1207	JTextArea text;
864	1208
865		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
866		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
867		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1209	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
868	1210	text.addCaretListener(this);
869		- aConstraints.gridx += 1;
870		- aConstraints.gridwidth = 1;
871	1211
872	1212	return text;
873	1213	}
..	..	@@ -897,9 +1237,16 @@
897	1237	objEditor.ctrlPanel.remove(j);
898	1238	}
899	1239
	1240	+ void Remove(cNumberSlider j)
	1241	+ {
	1242	+ j.removeChangeListener(this);
	1243	+ //objEditor.ctrlPanel.remove(j.label);
	1244	+ objEditor.ctrlPanel.remove(j);
	1245	+ }
	1246	+
900	1247	/*
901	1248	*/
902		- void Return() // ObjEditor oe)
	1249	+ void Return0() // ObjEditor oe)
903	1250	{
904	1251	aConstraints.gridy += 1;
905	1252	aConstraints.gridx = 0;
..	..	@@ -954,35 +1301,93 @@
954	1301
955	1302	void SetupUI2(ObjEditor oe)
956	1303	{
957		-// oe.aConstraints.weightx = 0;
958		-// oe.aConstraints.weighty = 0;
959		-// oe.aConstraints.gridx = 0;
960		-// oe.aConstraints.gridy = 0;
961		- SetupName(oe);
	1304	+ //SetupName(oe);
962	1305
963		- if (!GroupEditor.allparams)
	1306	+ namePanel = new cGridBag();
	1307	+
	1308	+ //if (copy.pinned)
	1309	+ {
	1310	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1311	+ pinButton.setSelected(copy.pinned);
	1312	+ cGridBag t = new cGridBag();
	1313	+ t.preferredWidth = 2;
	1314	+ t.add(pinButton);
	1315	+ namePanel.add(t);
	1316	+
	1317	+ pinButton.addItemListener(this);
	1318	+ }
	1319	+
	1320	+ nameField = AddText(namePanel, copy.GetName());
	1321	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1322	+ oe.ctrlPanel.add(namePanel);
	1323	+
	1324	+ oe.ctrlPanel.Return();
	1325	+
	1326	+ if (!allparams)
964	1327	return;
965	1328
966		- liveCB = AddCheckBox(oe, "Live", copy.live);
967		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
968		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1329	+ setupPanel = new cGridBag().setVertical(false);
	1330	+
	1331	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1332	+ liveCB.setToolTipText("Animate object");
	1333	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1334	+ markCB.setToolTipText("Set target transform");
	1335	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1336	+ selectableCB.setToolTipText("Make object selectable");
969	1337	// Return();
970		- markCB = AddCheckBox(oe, "Mark", copy.marked);
971		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
972		- randomCB = AddCheckBox(oe, "Rand", copy.random);
973		- Return();
974		- resetButton = AddButton(oe, "Reset");
975		- stepButton = AddButton(oe, "Step");
	1338	+
	1339	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1340	+ hideCB.setToolTipText("Hide object");
	1341	+
	1342	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1343	+
	1344	+ setupPanel2 = new cGridBag().setVertical(false);
	1345	+
	1346	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1347	+ rewindCB.setToolTipText("Rewind animation");
	1348	+
	1349	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1350	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1351	+
	1352	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1353	+ link2masterCB.setToolTipText("Attach to support");
	1354	+
	1355	+ if (Globals.ADVANCED)
	1356	+ {
	1357	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1358	+ speedupCB.setToolTipText("Option motion capture");
	1359	+ }
	1360	+
	1361	+ oe.ctrlPanel.add(setupPanel);
	1362	+ oe.ctrlPanel.Return();
	1363	+ oe.ctrlPanel.add(setupPanel2);
	1364	+ oe.ctrlPanel.Return();
	1365	+
	1366	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1367	+
	1368	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1369	+ resetButton.setToolTipText("Jump to frame zero");
	1370	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1371	+ stepButton.setToolTipText("Step one frame");
976	1372	// resetAllButton = AddButton(oe, "Reset All");
977	1373	// stepAllButton = AddButton(oe, "Step All");
978		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
979	1374	// Return();
980		- slowerButton = AddButton(oe, "Slow");
981		- fasterButton = AddButton(oe, "Fast");
982		- remarkButton = AddButton(oe, "Rem");
	1375	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1376	+ slowerButton.setToolTipText("Decrease animation speed");
	1377	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1378	+ fasterButton.setToolTipText("Increase animation speed");
	1379	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1380	+ remarkButton.setToolTipText("Set the current transform as the target");
983	1381
984		- Return();
	1382	+ oe.ctrlPanel.add(objectCommandsPanel);
	1383	+ oe.ctrlPanel.Return();
985	1384
	1385	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1386	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1387	+ //Return();
	1388	+
	1389	+ oe.ctrlPanel.Return();
	1390	+
986	1391	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1392	// ObjEditor.aConstraints.gridx += 1;
988	1393
..	..	@@ -1076,7 +1481,7 @@
1076	1481	oe.aConstraints.gridwidth = 1;
1077	1482	/**/
1078	1483	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1484	+ oe.ctrlPanel.Return();
1080	1485
1081	1486	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1487	//textureButton.setEnabled(false);
..	..	@@ -1134,6 +1539,7 @@
1134	1539
1135	1540	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1136	1541	{
	1542	+ if (Globals.DEBUG)
1137	1543	System.out.println("CREATE CAMERAS");
1138	1544	cams = new cTemplate();
1139	1545	cams.name = "Cameras";
..	..	@@ -1178,11 +1584,25 @@
1178	1584	//JPanel worldPanel =
1179	1585	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1180	1586	//worldPanel.setName("World");
1181		- centralPanel = new JPanel(new BorderLayout());
1182		- timelinePanel = new JPanel(new BorderLayout());
1183		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1587	+ centralPanel = new cGridBag();
	1588	+ centralPanel.preferredWidth = 20;
	1589	+
	1590	+ if (Globals.ADVANCED)
	1591	+ {
	1592	+ timelinePanel = new JPanel(new BorderLayout());
	1593	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1184	1594
	1595	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1596	+ cameraPanel.setContinuousLayout(true);
	1597	+ cameraPanel.setOneTouchExpandable(true);
	1598	+// cameraPanel.setDividerLocation(0.9);
	1599	+// cameraPanel.setDividerSize(9);
	1600	+ cameraPanel.setResizeWeight(1.0);
	1601	+
	1602	+ }
	1603	+
1185	1604	centralPanel.add(cameraView);
	1605	+ centralPanel.setFocusable(true);
1186	1606	//frame.setJMenuBar(timelineMenubar);
1187	1607	//centralPanel.add(timelinePanel);
1188	1608
..	..	@@ -1201,12 +1621,14 @@
1201	1621	//frontView.object = copy;
1202	1622	//sideView.object = copy;
1203	1623
1204		- XYZPanel = new JPanel();
1205		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1624	+ XYZPanel = new cGridBag().setVertical(true);
	1625	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1206	1626
1207		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1208		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1209		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1627	+ XYZPanel.preferredWidth = 5;
	1628	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1629	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1630	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1631	+ //XYZPanel.setName("XYZ");
1210	1632
1211	1633	/*
1212	1634	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1243,13 +1665,30 @@
1243	1665
1244	1666	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1245	1667	//tmp.setName("Edit");
1246		- objectPanel.add(materialPanel);
1247		- JPanel north = new JPanel(new BorderLayout());
1248		- north.setName("Edit");
1249		- north.add(ctrlPanel, BorderLayout.NORTH);
1250		- objectPanel.add(north);
1251		- objectPanel.add(infoPanel);
	1668	+ objectPanel.add(toolboxPanel);
	1669	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1670	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1252	1671
	1672	+ objectPanel.add(materialPanel);
	1673	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1674	+ objectPanel.setToolTipTextAt(1, "Material");
	1675	+
	1676	+ objectPanel.add(skyboxPanel);
	1677	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1678	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1679	+
	1680	+// JPanel north = new JPanel(new BorderLayout());
	1681	+// north.setName("Edit");
	1682	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1683	+// objectPanel.add(north);
	1684	+ objectPanel.add(editPanel);
	1685	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1686	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1687	+
	1688	+ objectPanel.add(XYZPanel);
	1689	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1690	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1691	+
1253	1692	/*
1254	1693	aConstraints.gridx = 0;
1255	1694	aConstraints.gridwidth = 1;
..	..	@@ -1257,7 +1696,7 @@
1257	1696	aConstraints.gridy += 1;
1258	1697	aConstraints.gridwidth = 1;
1259	1698	mainPanel.add(objectPanel, aConstraints);
1260		- */
	1699	+ */
1261	1700
1262	1701	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1263	1702	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1268,17 +1707,29 @@
1268	1707	scrollpane.setWheelScrollingEnabled(true);
1269	1708	scrollpane.addMouseWheelListener(this); // Default not fast enough
1270	1709
1271		- /JTabbedPane/ scenePanel = new JTabbedPane();
1272		- scenePanel.add(scrollpane);
	1710	+ /JTabbedPane/ scenePanel = new cGridBag();
	1711	+ scenePanel.preferredWidth = 5;
	1712	+
	1713	+ JTabbedPane tabbedPane = new JTabbedPane();
	1714	+ tabbedPane.add(scrollpane);
1273	1715
1274		- scenePanel.add(FSPane = new cFileSystemPane(this));
1275		-
1276		- optionsPanel = new JPanel(new GridBagLayout());
	1716	+ optionsPanel = new cGridBag().setVertical(false);
1277	1717
1278	1718	optionsPanel.setName("Options");
1279		- scenePanel.add(optionsPanel);
	1719	+
	1720	+ AddOptions(optionsPanel); //, aConstraints);
	1721	+
	1722	+ tabbedPane.add(optionsPanel);
	1723	+
	1724	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1280	1725
	1726	+ scenePanel.add(tabbedPane);
1281	1727
	1728	+ //if (Globals.ADVANCED)
	1729	+// tabbedPane.add(infoPanel);
	1730	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1731	+// tabbedPane.setToolTipTextAt(3, "Information");
	1732	+
1282	1733	/*
1283	1734	cTree jTree = new cTree(null);
1284	1735	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1311,6 +1762,7 @@
1311	1762	//bigPanel.setSize(new Dimension(10,10));
1312	1763	//bigPanel.add(ctrlPanel);
1313	1764	//bigPanel.add(gridPanel);
	1765	+ /**
1314	1766	bigThree = new JPanel();
1315	1767	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1316	1768	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1334,7 +1786,13 @@
1334	1786	// aConstraints.gridheight = 3;
1335	1787	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1336	1788	bigThree.add(XYZPanel, aWindowConstraints);
	1789	+ /**/
1337	1790
	1791	+ bigThree = new cGridBag();
	1792	+ bigThree.addComponent(scenePanel);
	1793	+ bigThree.addComponent(centralPanel);
	1794	+ //bigThree.addComponent(XYZPanel);
	1795	+
1338	1796	// // SIDE EFFECT!!!
1339	1797	// aConstraints.gridx = 0;
1340	1798	// aConstraints.gridy = 0;
..	..	@@ -1342,33 +1800,55 @@
1342	1800	// aConstraints.gridheight = 1;
1343	1801
1344	1802	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1345		- framePanel.setContinuousLayout(true);
1346		- framePanel.setOneTouchExpandable(true);
1347		- framePanel.setDividerLocation(0.8);
	1803	+
	1804	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1805	+ new java.beans.PropertyChangeListener()
	1806	+ {
	1807	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1808	+ {
	1809	+ if ((Integer)pce.getOldValue() == 1)
	1810	+ {
	1811	+ if (radio.layout != expandedLayout)
	1812	+ {
	1813	+ radio.layout = expandedLayout;
	1814	+ radio.layout.doClick();
	1815	+ }
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ framePanel.setContinuousLayout(false);
	1821	+ framePanel.setOneTouchExpandable(false);
	1822	+ //.setDividerLocation(0.8);
1348	1823	//framePanel.setDividerSize(15);
1349	1824	//framePanel.setResizeWeight(0.15);
1350	1825	framePanel.setName("Frame");
1351	1826
1352	1827	frame.getContentPane().setLayout(new BorderLayout());
1353	1828	/**/
1354		- JTabbedPane worldPane = new JTabbedPane();
	1829	+ //JTabbedPane worldPane = new JTabbedPane();
1355	1830	//worldPane.add(bigPanel);
1356	1831	//worldPane.add(worldPanel);
1357	1832	/**/
1358		- frame.getContentPane().add(/"Center",/framePanel);
	1833	+ //frame.getContentPane().add(/"Center",/framePanel);
	1834	+ frame.add(/"Center",/framePanel);
1359	1835	//frame.getContentPane().add(/"Center",/ worldPane);
1360	1836
1361	1837	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1362	1838
1363		- frame.setSize(1024, 768);
1364		- frame.show();
1365		-
	1839	+ frame.setSize(1280, 860);
	1840	+
	1841	+ cameraView.requestFocusInWindow();
	1842	+
1366	1843	gridPanel.setDividerLocation(1.0);
	1844	+
	1845	+ frame.validate();
	1846	+
	1847	+ frame.setVisible(true);
1367	1848
1368	1849	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1369	1850	frame.addWindowListener(new WindowAdapter()
1370	1851	{
1371		-
1372	1852	public void windowClosing(WindowEvent e)
1373	1853	{
1374	1854	Close();
..	..	@@ -1376,6 +1856,10 @@
1376	1856	});
1377	1857	}
1378	1858
	1859	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1860	+ {
	1861	+ }
	1862	+
1379	1863	JTree GetTree()
1380	1864	{
1381	1865	return objEditor.jTree;
..	..	@@ -1387,260 +1871,601 @@
1387	1871	ctrlPanel.removeAll();
1388	1872	}
1389	1873
1390		- void SetupMaterial(JPanel ctrlPanel)
	1874	+ void SetupMaterial(cGridBag materialpanel)
1391	1875	{
1392		- aConstraints.weighty = 0;
1393		- //aConstraints.weightx = 1;
1394		- /*
	1876	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1877	+
	1878	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1879	+ skin.setToolTipText("Skin");
	1880	+ skin.addMouseListener(new MouseAdapter()
	1881	+ {
	1882	+ public void mouseClicked(MouseEvent e)
	1883	+ {
	1884	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1885	+ cMaterial material = object.material;
	1886	+
	1887	+ // Skin
	1888	+ colorField.setFloat(material.color);
	1889	+ saturationField.setFloat(material.modulation);
	1890	+ subsurfaceField.setFloat(material.subsurface);
	1891	+ selfshadowField.setFloat(material.diffuseness);
	1892	+ diffusenessField.setFloat(material.factor);
	1893	+ shininessField.setFloat(material.shininess);
	1894	+ shadowbiasField.setFloat(material.shadowbias);
	1895	+ diffuseField.setFloat(material.diffuse);
	1896	+ specularField.setFloat(material.specular);
	1897	+
	1898	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1899	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1900	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1901	+
	1902	+ materialtouched = true;
	1903	+ applySelf();
	1904	+ }
	1905	+ });
	1906	+ presetpanel.add(skin);
	1907	+
	1908	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1909	+ lambert.setToolTipText("Diffuse");
	1910	+ lambert.addMouseListener(new MouseAdapter()
	1911	+ {
	1912	+ public void mouseClicked(MouseEvent e)
	1913	+ {
	1914	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1915	+ cMaterial material = object.material;
	1916	+
	1917	+ diffusenessField.setFloat(material.factor);
	1918	+ selfshadowField.setFloat(material.diffuseness);
	1919	+
	1920	+ materialtouched = true;
	1921	+ applySelf();
	1922	+ }
	1923	+ });
	1924	+ presetpanel.add(lambert);
	1925	+
	1926	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1927	+ diffuse2.setToolTipText("Diffuse2");
	1928	+ diffuse2.addMouseListener(new MouseAdapter()
	1929	+ {
	1930	+ public void mouseClicked(MouseEvent e)
	1931	+ {
	1932	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1933	+ cMaterial material = object.material;
	1934	+
	1935	+ diffusenessField.setFloat(material.factor);
	1936	+ selfshadowField.setFloat(material.diffuseness);
	1937	+
	1938	+ materialtouched = true;
	1939	+ applySelf();
	1940	+ }
	1941	+ });
	1942	+ presetpanel.add(diffuse2);
	1943	+
	1944	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1945	+ diffusemoon.setToolTipText("Moon");
	1946	+ diffusemoon.addMouseListener(new MouseAdapter()
	1947	+ {
	1948	+ public void mouseClicked(MouseEvent e)
	1949	+ {
	1950	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1951	+ cMaterial material = object.material;
	1952	+
	1953	+ diffusenessField.setFloat(material.factor);
	1954	+ selfshadowField.setFloat(material.diffuseness);
	1955	+
	1956	+ materialtouched = true;
	1957	+ applySelf();
	1958	+ }
	1959	+ });
	1960	+ presetpanel.add(diffusemoon);
	1961	+
	1962	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1963	+ diffusemoon2.setToolTipText("Moon2");
	1964	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1965	+ {
	1966	+ public void mouseClicked(MouseEvent e)
	1967	+ {
	1968	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1969	+ cMaterial material = object.material;
	1970	+
	1971	+ diffusenessField.setFloat(material.factor);
	1972	+ selfshadowField.setFloat(material.diffuseness);
	1973	+
	1974	+ materialtouched = true;
	1975	+ applySelf();
	1976	+ }
	1977	+ });
	1978	+ presetpanel.add(diffusemoon2);
	1979	+
	1980	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1981	+ diffusemoon3.setToolTipText("Moon3");
	1982	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1983	+ {
	1984	+ public void mouseClicked(MouseEvent e)
	1985	+ {
	1986	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1987	+ cMaterial material = object.material;
	1988	+
	1989	+ diffusenessField.setFloat(material.factor);
	1990	+ selfshadowField.setFloat(material.diffuseness);
	1991	+
	1992	+ materialtouched = true;
	1993	+ applySelf();
	1994	+ }
	1995	+ });
	1996	+ presetpanel.add(diffusemoon3);
	1997	+
	1998	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1999	+ diffusesheen.setToolTipText("Sheen");
	2000	+ diffusesheen.addMouseListener(new MouseAdapter()
	2001	+ {
	2002	+ public void mouseClicked(MouseEvent e)
	2003	+ {
	2004	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2005	+ cMaterial material = object.material;
	2006	+
	2007	+ sheenField.setFloat(material.sheen);
	2008	+
	2009	+ materialtouched = true;
	2010	+ applySelf();
	2011	+ }
	2012	+ });
	2013	+ presetpanel.add(diffusesheen);
	2014	+
	2015	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2016	+ rough.setToolTipText("Rough metal");
	2017	+ rough.addMouseListener(new MouseAdapter()
	2018	+ {
	2019	+ public void mouseClicked(MouseEvent e)
	2020	+ {
	2021	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2022	+ cMaterial material = object.material;
	2023	+
	2024	+ shininessField.setFloat(material.shininess);
	2025	+ velvetField.setFloat(material.velvet);
	2026	+
	2027	+ materialtouched = true;
	2028	+ applySelf();
	2029	+ }
	2030	+ });
	2031	+ presetpanel.add(rough);
	2032	+
	2033	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2034	+ rough2.setToolTipText("Medium metal");
	2035	+ rough2.addMouseListener(new MouseAdapter()
	2036	+ {
	2037	+ public void mouseClicked(MouseEvent e)
	2038	+ {
	2039	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2040	+ cMaterial material = object.material;
	2041	+
	2042	+ shininessField.setFloat(material.shininess);
	2043	+ lightareaField.setFloat(material.lightarea);
	2044	+
	2045	+ materialtouched = true;
	2046	+ applySelf();
	2047	+ }
	2048	+ });
	2049	+ presetpanel.add(rough2);
	2050	+
	2051	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2052	+ shini0.setToolTipText("Shiny");
	2053	+ shini0.addMouseListener(new MouseAdapter()
	2054	+ {
	2055	+ public void mouseClicked(MouseEvent e)
	2056	+ {
	2057	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2058	+ cMaterial material = object.material;
	2059	+
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ lightareaField.setFloat(material.lightarea);
	2062	+
	2063	+ materialtouched = true;
	2064	+ applySelf();
	2065	+ }
	2066	+ });
	2067	+ presetpanel.add(shini0);
	2068	+
	2069	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2070	+ shini1.setToolTipText("Shiny2");
	2071	+ shini1.addMouseListener(new MouseAdapter()
	2072	+ {
	2073	+ public void mouseClicked(MouseEvent e)
	2074	+ {
	2075	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2076	+ cMaterial material = object.material;
	2077	+
	2078	+ shininessField.setFloat(material.shininess);
	2079	+ lightareaField.setFloat(material.lightarea);
	2080	+
	2081	+ materialtouched = true;
	2082	+ applySelf();
	2083	+ }
	2084	+ });
	2085	+ presetpanel.add(shini1);
	2086	+
	2087	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2088	+ shini2.setToolTipText("Shiny3");
	2089	+ shini2.addMouseListener(new MouseAdapter()
	2090	+ {
	2091	+ public void mouseClicked(MouseEvent e)
	2092	+ {
	2093	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2094	+ cMaterial material = object.material;
	2095	+
	2096	+ shininessField.setFloat(material.shininess);
	2097	+ lightareaField.setFloat(material.lightarea);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(shini2);
	2104	+
	2105	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2106	+ aniso.setToolTipText("AnisoU");
	2107	+ aniso.addMouseListener(new MouseAdapter()
	2108	+ {
	2109	+ public void mouseClicked(MouseEvent e)
	2110	+ {
	2111	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2112	+ cMaterial material = object.material;
	2113	+
	2114	+ anisoField.setFloat(material.aniso);
	2115	+ anisoVField.setFloat(material.anisoV);
	2116	+
	2117	+ materialtouched = true;
	2118	+ applySelf();
	2119	+ }
	2120	+ });
	2121	+ presetpanel.add(aniso);
	2122	+
	2123	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2124	+ aniso2.setToolTipText("AnisoV");
	2125	+ aniso2.addMouseListener(new MouseAdapter()
	2126	+ {
	2127	+ public void mouseClicked(MouseEvent e)
	2128	+ {
	2129	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2130	+ cMaterial material = object.material;
	2131	+
	2132	+ anisoField.setFloat(material.aniso);
	2133	+ anisoVField.setFloat(material.anisoV);
	2134	+
	2135	+ materialtouched = true;
	2136	+ applySelf();
	2137	+ }
	2138	+ });
	2139	+ presetpanel.add(aniso2);
	2140	+
	2141	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2142	+ aniso3.setToolTipText("AnisoUV");
	2143	+ aniso3.addMouseListener(new MouseAdapter()
	2144	+ {
	2145	+ public void mouseClicked(MouseEvent e)
	2146	+ {
	2147	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2148	+ cMaterial material = object.material;
	2149	+
	2150	+ anisoField.setFloat(material.aniso);
	2151	+ anisoVField.setFloat(material.anisoV);
	2152	+
	2153	+ materialtouched = true;
	2154	+ applySelf();
	2155	+ }
	2156	+ });
	2157	+ presetpanel.add(aniso3);
	2158	+
	2159	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2160	+ velvet0.setToolTipText("Velvet");
	2161	+ velvet0.addMouseListener(new MouseAdapter()
	2162	+ {
	2163	+ public void mouseClicked(MouseEvent e)
	2164	+ {
	2165	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2166	+ cMaterial material = object.material;
	2167	+
	2168	+ diffusenessField.setFloat(material.factor);
	2169	+ selfshadowField.setFloat(material.diffuseness);
	2170	+ sheenField.setFloat(material.sheen);
	2171	+ shininessField.setFloat(material.shininess);
	2172	+ velvetField.setFloat(material.velvet);
	2173	+ shiftField.setFloat(material.shift);
	2174	+
	2175	+ materialtouched = true;
	2176	+ applySelf();
	2177	+ }
	2178	+ });
	2179	+ presetpanel.add(velvet0);
	2180	+
	2181	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2182	+ bump0.setToolTipText("Bump texture");
	2183	+ bump0.addMouseListener(new MouseAdapter()
	2184	+ {
	2185	+ public void mouseClicked(MouseEvent e)
	2186	+ {
	2187	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2188	+ cMaterial material = object.material;
	2189	+
	2190	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2191	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2192	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(bump0);
	2199	+
	2200	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2201	+ borderShader.setToolTipText("Border fade");
	2202	+ borderShader.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ borderfadeField.setFloat(0.5);
	2207	+ opacityField.setFloat(0.75);
	2208	+
	2209	+ materialtouched = true;
	2210	+ applySelf();
	2211	+ }
	2212	+ });
	2213	+ presetpanel.add(borderShader);
	2214	+
	2215	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2216	+ halo.setToolTipText("Halo");
	2217	+ halo.addMouseListener(new MouseAdapter()
	2218	+ {
	2219	+ public void mouseClicked(MouseEvent e)
	2220	+ {
	2221	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2222	+ cMaterial material = object.material;
	2223	+
	2224	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2225	+
	2226	+ materialtouched = true;
	2227	+ applySelf();
	2228	+ }
	2229	+ });
	2230	+ presetpanel.add(halo);
	2231	+
	2232	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2233	+ candle.setToolTipText("Candle");
	2234	+ candle.addMouseListener(new MouseAdapter()
	2235	+ {
	2236	+ public void mouseClicked(MouseEvent e)
	2237	+ {
	2238	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2239	+ cMaterial material = object.material;
	2240	+
	2241	+ subsurfaceField.setFloat(material.subsurface);
	2242	+ shadowbiasField.setFloat(material.shadowbias);
	2243	+ ambientField.setFloat(material.ambient);
	2244	+ specularField.setFloat(material.specular);
	2245	+ lightareaField.setFloat(material.lightarea);
	2246	+ shininessField.setFloat(material.shininess);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(candle);
	2253	+
	2254	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2255	+ shadowShader.setToolTipText("Shadow");
	2256	+ shadowShader.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ diffuseField.setFloat(0.001);
	2261	+ ambientField.setFloat(0.001);
	2262	+ cameraField.setFloat(0.001);
	2263	+ specularField.setFloat(0.001);
	2264	+ fakedepthField.setFloat(0.001);
	2265	+ opacityField.setFloat(0.6);
	2266	+
	2267	+ materialtouched = true;
	2268	+ applySelf();
	2269	+ }
	2270	+ });
	2271	+ presetpanel.add(shadowShader);
	2272	+
	2273	+ cGridBag panel = new cGridBag().setVertical(true);
	2274	+
	2275	+ presetpanel.preferredWidth = 1;
	2276	+
	2277	+ materialpanel.add(presetpanel);
	2278	+ materialpanel.add(panel);
	2279	+
	2280	+ panel.preferredWidth = 8;
	2281	+
	2282	+ /*
1395	2283	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1396	2284	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1397		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1398		- aConstraints.gridx += 1;
1399		- */
	2285	+ */
1400	2286
1401		- aConstraints.gridwidth = 1;
1402		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1403		- aConstraints.gridx += 1;
1404		- aConstraints.weighty = 0;
1405		- aConstraints.gridwidth = 1;
	2287	+ cGridBag editBar = new cGridBag().setVertical(false);
	2288	+
	2289	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2290	+ createMaterialButton.setToolTipText("Create material");
1406	2291
1407	2292	/*
1408	2293	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1409		- aConstraints.gridx += 1;
1410		- aConstraints.weighty = 0;
1411		- aConstraints.gridwidth = 1;
1412	2294	*/
1413	2295
1414		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1415		- aConstraints.gridx += 1;
	2296	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2297	+ clearMaterialButton.setToolTipText("Clear material");
	2298	+
	2299	+ if (Globals.ADVANCED)
	2300	+ {
	2301	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2302	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2303	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2304	+ }
1416	2305
1417		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1418		-
1419		- aConstraints.gridx += 1;
1420		-
1421		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1422		-
1423		- aConstraints.gridx += 1;
1424		-
1425		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1426		-
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.weighty = 0;
1430		- aConstraints.gridwidth = 1;
	2306	+ editBar.preferredHeight = 15;
	2307	+
	2308	+ panel.add(editBar);
	2309	+
1431	2310	/**/
1432	2311	//aConstraints.weighty = 0;
1433	2312	////aConstraints.weightx = 1;
1434	2313	//aConstraints.weighty = 1;
1435	2314	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1436	2315	//aConstraints.gridx += 1;
1437		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1438		- aConstraints.weighty = 0;
1439		- aConstraints.gridx = 0;
1440		- aConstraints.gridy += 1;
1441		- aConstraints.gridwidth = 1;
	2316	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1442	2317
1443		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1444		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1445		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1446		- aConstraints.gridx += 1;
1447		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1448		- //aConstraints.weightx = 0;
1449		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1450		- aConstraints.gridx = 0;
1451		- aConstraints.gridy += 1;
1452		- aConstraints.gridwidth = 1;
	2318	+ cGridBag colorSection = new cGridBag().setVertical(true);
1453	2319
1454		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1455		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1456		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1457		- aConstraints.gridx += 1;
1458		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.gridwidth = 1;
	2320	+ cGridBag huepanel = new cGridBag();
	2321	+ cGridBag huelabel = new cGridBag();
	2322	+ cLabel hue = GetLabel("icons/hue.png", false);
	2323	+ hue.fit = true;
	2324	+
	2325	+ hue.addMouseListener(new MouseAdapter()
	2326	+ {
	2327	+ public void mousePressed(MouseEvent e)
	2328	+ {
	2329	+ int x = e.getX();
	2330	+
	2331	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2332	+ }
	2333	+ });
	2334	+
	2335	+ huelabel.add(hue);
	2336	+ huelabel.preferredWidth = 20;
	2337	+ huepanel.add(new cGridBag()); // Label
	2338	+ huepanel.add(huelabel); // Field/slider
	2339	+
	2340	+ huepanel.preferredHeight = 7;
1463	2341
1464		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1465		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1467		- aConstraints.gridx += 1;
1468		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1470		- aConstraints.gridx = 0;
1471		- aConstraints.gridy += 1;
1472		- aConstraints.gridwidth = 1;
	2342	+ colorSection.add(huepanel);
	2343	+
	2344	+ cGridBag color = new cGridBag();
	2345	+
	2346	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2347	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2348	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1473	2349
1474		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1477		- aConstraints.gridx += 1;
1478		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1480		- aConstraints.gridx = 0;
1481		- aConstraints.gridy += 1;
1482		- aConstraints.gridwidth = 1;
	2350	+ //colorField.preferredWidth = 200;
	2351	+ colorSection.add(color);
1483	2352
1484		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1485		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1486		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1487		- aConstraints.gridx += 1;
1488		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1490		- aConstraints.gridx = 0;
1491		- aConstraints.gridy += 1;
1492		- aConstraints.gridwidth = 1;
	2353	+ cGridBag modulation = new cGridBag();
	2354	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2355	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2356	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2357	+ colorSection.add(modulation);
1493	2358
1494		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1497		- aConstraints.gridx += 1;
1498		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1499		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1500		- aConstraints.gridx = 0;
1501		- aConstraints.gridy += 1;
1502		- aConstraints.gridwidth = 1;
	2359	+ cGridBag opacity = new cGridBag();
	2360	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2361	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2362	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2363	+ colorSection.add(opacity);
1503	2364
1504		- //aConstraints.weighty = 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1506		- //aConstraints.gridx += 1;
1507		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1508		- aConstraints.weighty = 0;
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	2365	+ colorSection.add(GetSeparator());
	2366	+
	2367	+ cGridBag texture = new cGridBag();
	2368	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2369	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2370	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2371	+ colorSection.add(texture);
1512	2372
1513		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1514		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	2373	+ panel.add(GetSeparator());
	2374	+
	2375	+ panel.add(colorSection);
	2376	+
	2377	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2378	+
	2379	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2380	+
	2381	+ cGridBag diffuse = new cGridBag();
	2382	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2383	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2384	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2385	+ diffuseSection.add(diffuse);
1522	2386
1523		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1524		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	2387	+ cGridBag diffuseness = new cGridBag();
	2388	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2389	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2390	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2391	+ diffuseSection.add(diffuseness);
1532	2392
1533		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1534		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	2393	+ cGridBag selfshadow = new cGridBag();
	2394	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2395	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2396	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2397	+ diffuseSection.add(selfshadow);
1542	2398
1543		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1544		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1545		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1546		- aConstraints.gridx += 1;
1547		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1548		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1549		- aConstraints.gridx = 0;
1550		- aConstraints.gridy += 1;
1551		- aConstraints.gridwidth = 1;
	2399	+ cGridBag sheen = new cGridBag();
	2400	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2401	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2402	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2403	+ diffuseSection.add(sheen);
1552	2404
1553		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1554		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1555		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1556		- aConstraints.gridx += 1;
1557		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1559		- aConstraints.gridx = 0;
1560		- aConstraints.gridy += 1;
1561		- aConstraints.gridwidth = 1;
	2405	+ cGridBag subsurface = new cGridBag();
	2406	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2407	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2408	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2409	+ diffuseSection.add(subsurface);
1562	2410
1563		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1564		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1565		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1566		- aConstraints.gridx += 1;
1567		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1568		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1569		- aConstraints.gridx = 0;
1570		- aConstraints.gridy += 1;
1571		- aConstraints.gridwidth = 1;
	2411	+ cGridBag shadow = new cGridBag();
	2412	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2413	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2414	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2415	+ diffuseSection.add(shadow);
1572	2416
1573		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1574		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1575		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1576		- aConstraints.gridx += 1;
1577		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1578		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1579		- aConstraints.gridx = 0;
1580		- aConstraints.gridy += 1;
1581		- aConstraints.gridwidth = 1;
	2417	+ cGridBag fakedepth = new cGridBag();
	2418	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2419	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2420	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2421	+ diffuseSection.add(fakedepth);
1582	2422
1583		- //aConstraints.weighty = 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1585		- //aConstraints.gridx += 1;
1586		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1587		- aConstraints.weighty = 0;
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	2423	+ cGridBag shadowbias = new cGridBag();
	2424	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2425	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2426	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2427	+ diffuseSection.add(shadowbias);
1591	2428
1592		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1593		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	2429	+ panel.add(GetSeparator());
	2430	+
	2431	+ panel.add(diffuseSection);
	2432	+
	2433	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2434	+
	2435	+ cGridBag specularSection = new cGridBag().setVertical(true);
1601	2436
1602		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1603		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	2437	+ cGridBag specular = new cGridBag();
	2438	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2439	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2440	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2441	+ specularSection.add(specular);
1611	2442
1612		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1613		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
	2443	+ cGridBag lightarea = new cGridBag();
	2444	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2445	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2446	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2447	+ specularSection.add(lightarea);
1621	2448
1622		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1623		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1625		- aConstraints.gridx += 1;
1626		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1628		- aConstraints.gridx = 0;
1629		- aConstraints.gridy += 1;
1630		- aConstraints.gridwidth = 1;
	2449	+ cGridBag shininess = new cGridBag();
	2450	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2451	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2452	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2453	+ specularSection.add(shininess);
1631	2454
1632		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1633		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1634		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1635		- aConstraints.gridx += 1;
1636		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1637		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1638		- aConstraints.gridx = 0;
1639		- aConstraints.gridy += 1;
1640		- aConstraints.gridwidth = 1;
	2455	+ cGridBag metalness = new cGridBag();
	2456	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2457	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2458	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2459	+ specularSection.add(metalness);
1641	2460
1642		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1643		- Return();
	2461	+ cGridBag velvet = new cGridBag();
	2462	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2463	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2464	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2465	+ specularSection.add(velvet);
	2466	+
	2467	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2468	+ //Return();
1644	2469	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1645	2470	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1646	2471	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1651,130 +2476,99 @@
1651	2476	// aConstraints.gridy += 1;
1652	2477	// aConstraints.gridwidth = 1;
1653	2478
1654		- //aConstraints.weighty = 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1656		- //aConstraints.gridx += 1;
1657		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1658		- aConstraints.weighty = 0;
1659		- aConstraints.gridx = 0;
1660		- aConstraints.gridy += 1;
1661		- aConstraints.gridwidth = 1;
	2479	+ cGridBag anisoU = new cGridBag();
	2480	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2481	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2482	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2483	+ specularSection.add(anisoU);
1662	2484
1663		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1664		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1666		- aConstraints.gridx += 1;
1667		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1668		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1669		- aConstraints.gridx = 0;
1670		- aConstraints.gridy += 1;
1671		- aConstraints.gridwidth = 1;
	2485	+ cGridBag anisoV = new cGridBag();
	2486	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2487	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2488	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2489	+ specularSection.add(anisoV);
1672	2490
1673		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1674		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1675		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1676		- aConstraints.gridx += 1;
1677		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1678		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1679		- aConstraints.gridx = 0;
1680		- aConstraints.gridy += 1;
1681		- aConstraints.gridwidth = 1;
1682	2491
1683		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1684		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1686		- aConstraints.gridx += 1;
1687		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1688		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1689		- aConstraints.gridx = 0;
1690		- aConstraints.gridy += 1;
1691		- aConstraints.gridwidth = 1;
	2492	+ panel.add(GetSeparator());
	2493	+
	2494	+ panel.add(specularSection);
	2495	+
	2496	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2497	+
	2498	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1692	2499
1693		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1694		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1695		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1696		- aConstraints.gridx += 1;
1697		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1699		- aConstraints.gridx = 0;
1700		- aConstraints.gridy += 1;
1701		- aConstraints.gridwidth = 1;
1702		- aConstraints.weighty = 0;
	2500	+ cGridBag camera = new cGridBag();
	2501	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2502	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2503	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2504	+ colorSection.add(camera);
1703	2505
1704		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1705		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1707		- aConstraints.gridx += 1;
1708		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1709		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1710		- aConstraints.gridx = 0;
1711		- aConstraints.gridy += 1;
1712		- aConstraints.gridwidth = 1;
	2506	+ cGridBag ambient = new cGridBag();
	2507	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2508	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2509	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2510	+ colorSection.add(ambient);
1713	2511
1714		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1715		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1717		- aConstraints.gridx += 1;
1718		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1719		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1720		- aConstraints.gridx = 0;
1721		- aConstraints.gridy += 1;
1722		- aConstraints.gridwidth = 1;
	2512	+ cGridBag backlit = new cGridBag();
	2513	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2514	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2515	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2516	+ colorSection.add(backlit);
1723	2517
1724		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1725		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1726		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1727		- aConstraints.gridx += 1;
1728		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1729		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1730		- aConstraints.gridx = 0;
1731		- aConstraints.gridy += 1;
1732		- aConstraints.gridwidth = 1;
	2518	+ //panel.add(new JSeparator());
	2519	+
	2520	+ //panel.add(globalSection);
	2521	+
	2522	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2523	+
	2524	+ cGridBag textureSection = new cGridBag().setVertical(true);
1733	2525
1734		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1735		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1737		- aConstraints.gridx += 1;
1738		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1739		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1740		- aConstraints.gridx = 0;
1741		- aConstraints.gridy += 1;
1742		- aConstraints.gridwidth = 1;
	2526	+ cGridBag bump = new cGridBag();
	2527	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2528	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2529	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2530	+ textureSection.add(bump);
1743	2531
1744		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1745		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1747		- aConstraints.gridx += 1;
1748		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1749		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1750		- aConstraints.gridx = 0;
1751		- aConstraints.gridy += 1;
1752		- aConstraints.gridwidth = 1;
	2532	+ cGridBag noise = new cGridBag();
	2533	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2534	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2535	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2536	+ textureSection.add(noise);
1753	2537
1754		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1755		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1756		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1757		- aConstraints.gridx += 1;
1758		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1759		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1760		- aConstraints.gridx = 0;
1761		- aConstraints.gridy += 1;
1762		- aConstraints.gridwidth = 1;
	2538	+ cGridBag power = new cGridBag();
	2539	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2540	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2541	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2542	+ textureSection.add(power);
1763	2543
1764		- //aConstraints.weighty = 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1766		- //aConstraints.gridx += 1;
1767		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1768		- aConstraints.weighty = 0;
	2544	+ cGridBag borderfade = new cGridBag();
	2545	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2546	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2547	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2548	+ textureSection.add(borderfade);
1769	2549
1770		- aConstraints.gridx = 0;
1771		- aConstraints.gridy = 0;
1772		- aConstraints.gridwidth = 1;
	2550	+ cGridBag fog = new cGridBag();
	2551	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2552	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2553	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2554	+ textureSection.add(fog);
	2555	+
	2556	+ cGridBag opacityPower = new cGridBag();
	2557	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2558	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2559	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2560	+ textureSection.add(opacityPower);
	2561	+
	2562	+ panel.add(GetSeparator());
	2563	+
	2564	+ panel.add(textureSection);
	2565	+
	2566	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1773	2567
1774	2568	SetMaterial(copy); // .GetMaterial());
1775	2569
1776		- colorField.addChangeListener(this);
1777		- modulationField.addChangeListener(this);
	2570	+ //colorField.addChangeListener(this);
	2571	+// modulationField.addChangeListener(this);
1778	2572	metalnessField.addChangeListener(this);
1779	2573	diffuseField.addChangeListener(this);
1780	2574	specularField.addChangeListener(this);
..	..	@@ -1804,12 +2598,15 @@
1804	2598	opacityPowerField.addChangeListener(this);
1805	2599	/**/
1806	2600
1807		- resetSlidersButton.addActionListener(this);
1808	2601	clearMaterialButton.addActionListener(this);
1809	2602	createMaterialButton.addActionListener(this);
1810		-
1811		- propagateToggle.addItemListener(this);
1812		- multiplyToggle.addItemListener(this);
	2603	+
	2604	+ if (Globals.ADVANCED)
	2605	+ {
	2606	+ resetSlidersButton.addActionListener(this);
	2607	+ propagateToggle.addItemListener(this);
	2608	+ multiplyToggle.addItemListener(this);
	2609	+ }
1813	2610	}
1814	2611
1815	2612	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1827,8 +2624,9 @@
1827	2624	// 3D models
1828	2625	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1829	2626	{
1830		- lastConverter = new com.jmex.model.converters.MaxToJme();
1831		- LoadFile(filename, lastConverter);
	2627	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2628	+ //LoadFile(filename, lastConverter);
	2629	+ LoadObjFile(filename); // New 3ds loader
1832	2630	continue;
1833	2631	}
1834	2632	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1980,7 +2778,7 @@
1980	2778
1981	2779	//? flashIt = false;
1982	2780	CameraPane pane = (CameraPane) cameraView;
1983		- pane.clickStart(location.x, location.y, 0);
	2781	+ pane.clickStart(location.x, location.y, 0, 0);
1984	2782	pane.clickEnd(location.x, location.y, 0, true);
1985	2783
1986	2784	if (group.selection.size() == 1)
..	..	@@ -2029,6 +2827,7 @@
2029	2827	e2.printStackTrace();
2030	2828	}
2031	2829	}
	2830	+
2032	2831	LoadJMEThread loadThread;
2033	2832
2034	2833	class LoadJMEThread extends Thread
..	..	@@ -2086,6 +2885,7 @@
2086	2885	//LoadFile0(filename, converter);
2087	2886	}
2088	2887	}
	2888	+
2089	2889	LoadOBJThread loadObjThread;
2090	2890
2091	2891	class LoadOBJThread extends Thread
..	..	@@ -2164,19 +2964,19 @@
2164	2964
2165	2965	void LoadObjFile(String fullname)
2166	2966	{
2167		- /*
	2967	+ System.out.println("Loading " + fullname);
	2968	+ /**/
2168	2969	//lastFilename = fullname;
2169	2970	if(loadObjThread == null)
2170	2971	{
2171		- loadObjThread = new LoadOBJThread();
2172		- loadObjThread.start();
	2972	+ loadObjThread = new LoadOBJThread();
	2973	+ loadObjThread.start();
2173	2974	}
2174	2975
2175	2976	loadObjThread.add(fullname);
2176		- */
	2977	+ /**/
2177	2978
2178		- System.out.println("Loading " + fullname);
2179		- makeSomething(new FileObject(fullname, true), true);
	2979	+ //makeSomething(new FileObject(fullname, true), true);
2180	2980	}
2181	2981
2182	2982	void LoadGFDFile(String fullname)
..	..	@@ -2437,11 +3237,11 @@
2437	3237
2438	3238	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2439	3239	{
2440		- if (GrafreeD.standAlone)
	3240	+ if (Grafreed.standAlone)
2441	3241	{
2442	3242	/**/
2443	3243	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2444		- browser.show();
	3244	+ browser.setVisible(true);
2445	3245	String filename = browser.getFile();
2446	3246	if (filename != null && filename.length() > 0)
2447	3247	{
..	..	@@ -2552,6 +3352,7 @@
2552	3352	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2553	3353	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2554	3354	}
	3355	+
2555	3356	//cJME.count++;
2556	3357	//cJME.count %= 12;
2557	3358	if (gc)
..	..	@@ -2586,6 +3387,7 @@
2586	3387	}
2587	3388	if (input == null)
2588	3389	{
	3390	+ new Exception().printStackTrace();
2589	3391	System.exit(0);
2590	3392	}
2591	3393
..	..	@@ -2734,6 +3536,7 @@
2734	3536	}
2735	3537	}
2736	3538	}
	3539	+
2737	3540	cFileSystemPane FSPane;
2738	3541
2739	3542	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2743,7 +3546,7 @@
2743	3546
2744	3547	freezematerial = true;
2745	3548	colorField.setFloat(mat.color);
2746		- modulationField.setFloat(mat.modulation);
	3549	+ saturationField.setFloat(mat.modulation);
2747	3550	metalnessField.setFloat(mat.metalness);
2748	3551	diffuseField.setFloat(mat.diffuse);
2749	3552	specularField.setFloat(mat.specular);
..	..	@@ -2787,11 +3590,14 @@
2787	3590	}
2788	3591	}
2789	3592	}
	3593	+
2790	3594	freezematerial = false;
2791	3595	}
2792	3596
2793	3597	void SetMaterial(Object3D object)
2794	3598	{
	3599	+ latestObject = object;
	3600	+
2795	3601	cMaterial mat = object.material;
2796	3602
2797	3603	if (mat == null)
..	..	@@ -2800,33 +3606,10 @@
2800	3606	return;
2801	3607	}
2802	3608
2803		- multiplyToggle.setSelected(mat.multiply);
2804		-
2805		- assert (object.projectedVertices != null);
2806		-
2807		- if (object.projectedVertices.length <= 2)
2808		- {
2809		- // Side effect...
2810		- Object3D.cVector2[] keep = object.projectedVertices;
2811		- object.projectedVertices = new Object3D.cVector2[3];
2812		- for (int i = 0; i < 3; i++)
2813		- {
2814		- if (i < keep.length)
2815		- {
2816		- object.projectedVertices[i] = keep[i];
2817		- } else
2818		- {
2819		- object.projectedVertices[i] = new Object3D.cVector2();
2820		- }
2821		- /*
2822		- if(keep.length == 0)
2823		- object.projectedVertices[0] = new Object3D.cVector2();
2824		- else
2825		- object.projectedVertices[0] = keep[0];
2826		- object.projectedVertices[1] = new Object3D.cVector2();
2827		- */
2828		- }
2829		- }
	3609	+ if (multiplyToggle != null)
	3610	+ multiplyToggle.setSelected(mat.multiply);
	3611	+
	3612	+ AllocProjectedVertices(object);
2830	3613
2831	3614	SetMaterial(mat, object.projectedVertices);
2832	3615	}
..	..	@@ -2902,12 +3685,17 @@
2902	3685	// }
2903	3686
2904	3687	/**/
2905		- if (deselect)
	3688	+ if (deselect \|\| child == null)
2906	3689	{
2907	3690	//group.deselectAll();
2908	3691	//freeze = true;
2909	3692	GetTree().clearSelection();
2910	3693	//freeze = false;
	3694	+
	3695	+ if (child == null)
	3696	+ {
	3697	+ return;
	3698	+ }
2911	3699	}
2912	3700
2913	3701	//group.addSelectee(child);
..	..	@@ -2941,6 +3729,17 @@
2941	3729	public void itemStateChanged(ItemEvent event)
2942	3730	{
2943	3731	// System.out.println("Propagate = " + propagate);
	3732	+ if (event.getSource() == pinButton)
	3733	+ {
	3734	+ copy.pinned ^= true;
	3735	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3736	+ {
	3737	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3738	+ copy.CloseUI();
	3739	+ //copy.editWindow.refreshContents();
	3740	+ }
	3741	+ }
	3742	+ else
2944	3743	if (event.getSource() == propagateToggle)
2945	3744	{
2946	3745	propagate ^= true;
..	..	@@ -2976,7 +3775,7 @@
2976	3775	cameraView.ToggleDL();
2977	3776	cameraView.repaint();
2978	3777	return;
2979		- } else if (event.getSource() == toggleTextureItem)
	3778	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2980	3779	{
2981	3780	cameraView.ToggleTexture();
2982	3781	// june 2013 copy.HardTouch();
..	..	@@ -2989,7 +3788,8 @@
2989	3788	if (timeline)
2990	3789	{
2991	3790	centralPanel.remove(cameraView);
2992		- centralPanel.add(timelinePanel);
	3791	+ cameraPanel.add(cameraView);
	3792	+ centralPanel.add(cameraPanel);
2993	3793	frame.setJMenuBar(timelineMenubar);
2994	3794	wasFullScreen = CameraPane.FULLSCREEN;
2995	3795	if (!CameraPane.FULLSCREEN)
..	..	@@ -2998,7 +3798,7 @@
2998	3798	}
2999	3799	else
3000	3800	{
3001		- centralPanel.remove(timelinePanel);
	3801	+ centralPanel.remove(cameraPanel);
3002	3802	centralPanel.add(cameraView);
3003	3803	frame.setJMenuBar(null);
3004	3804	if (!wasFullScreen)
..	..	@@ -3014,9 +3814,9 @@
3014	3814	frame.validate();
3015	3815
3016	3816	return;
3017		- } else if (event.getSource() == toggleRandomItem)
	3817	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3018	3818	{
3019		- cameraView.ToggleRandom();
	3819	+ cameraView.ToggleSwitch();
3020	3820	cameraView.repaint();
3021	3821	return;
3022	3822	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3044,12 +3844,17 @@
3044	3844	} else if (event.getSource() == liveCB)
3045	3845	{
3046	3846	copy.live ^= true;
	3847	+ objEditor.refreshContents(true); // To show item colors
	3848	+ return;
	3849	+ } else if (event.getSource() == selectableCB)
	3850	+ {
	3851	+ copy.dontselect ^= true;
3047	3852	return;
3048	3853	} else if (event.getSource() == hideCB)
3049	3854	{
3050	3855	copy.hide ^= true;
3051	3856	copy.Touch(); // display list issue
3052		- objEditor.refreshContents();
	3857	+ objEditor.refreshContents(true); // To show item colors
3053	3858	return;
3054	3859	} else if (event.getSource() == link2masterCB)
3055	3860	{
..	..	@@ -3059,6 +3864,7 @@
3059	3864	if (event.getSource() == randomCB)
3060	3865	{
3061	3866	copy.random ^= true;
	3867	+ objEditor.refreshContents();
3062	3868	return;
3063	3869	}
3064	3870	if (event.getSource() == speedupCB)
..	..	@@ -3082,8 +3888,9 @@
3082	3888
3083	3889	public void actionPerformed(ActionEvent event)
3084	3890	{
	3891	+ Object source = event.getSource();
3085	3892	// SCRIPT DIALOG
3086		- if (event.getSource() == okbutton)
	3893	+ if (source == okbutton)
3087	3894	{
3088	3895	textpanel.setVisible(false);
3089	3896	textpanel.remove(textarea);
..	..	@@ -3095,7 +3902,7 @@
3095	3902	textarea = null;
3096	3903	textpanel = null;
3097	3904	}
3098		- if (event.getSource() == cancelbutton)
	3905	+ if (source == cancelbutton)
3099	3906	{
3100	3907	textpanel.setVisible(false);
3101	3908	textpanel.remove(textarea);
..	..	@@ -3107,49 +3914,50 @@
3107	3914	//applySelf();
3108	3915	//client.refreshEditWindow();
3109	3916	//refreshContents();
3110		- if (event.getSource() == nameField)
	3917	+ if (source == nameField)
3111	3918	{
3112	3919	//System.out.println("ObjEditor " + event);
3113	3920	applySelf0(true);
3114	3921	//parent.applySelf();
3115		- objEditor.refreshContents();
3116		- } else if (event.getSource() == resetButton)
	3922	+ // conflicts with requestFocus objEditor.refreshContents();
	3923	+ } else if (source == resetButton)
3117	3924	{
3118	3925	CameraPane.fullreset = true;
3119	3926	copy.Reset(); // ResetMeshes();
3120	3927	copy.Touch();
3121	3928	objEditor.refreshContents();
3122		- } else if (event.getSource() == stepItem)
	3929	+ } else if (source == stepItem)
3123	3930	{
3124		- cameraView.ONESTEP = true;
	3931	+ //cameraView.ONESTEP = true;
	3932	+ Globals.ONESTEP = true;
3125	3933	cameraView.repaint();
3126	3934	return;
3127		- } else if (event.getSource() == stepButton)
	3935	+ } else if (source == stepButton)
3128	3936	{
3129	3937	copy.Step();
3130	3938	copy.Touch();
3131	3939	objEditor.refreshContents();
3132		- } else if (event.getSource() == slowerButton)
	3940	+ } else if (source == slowerButton)
3133	3941	{
3134	3942	copy.Slower();
3135	3943	copy.Touch();
3136	3944	objEditor.refreshContents();
3137		- } else if (event.getSource() == fasterButton)
	3945	+ } else if (source == fasterButton)
3138	3946	{
3139	3947	copy.Faster();
3140	3948	copy.Touch();
3141	3949	objEditor.refreshContents();
3142		- } else if (event.getSource() == remarkButton)
	3950	+ } else if (source == remarkButton)
3143	3951	{
3144	3952	copy.Remark();
3145	3953	copy.Touch();
3146	3954	objEditor.refreshContents();
3147		- } else if (event.getSource() == stepAllButton)
	3955	+ } else if (source == stepAllButton)
3148	3956	{
3149	3957	copy.StepAll();
3150	3958	copy.Touch();
3151	3959	objEditor.refreshContents();
3152		- } else if (event.getSource() == resetAllButton)
	3960	+ } else if (source == resetAllButton)
3153	3961	{
3154	3962	//CameraPane.fullreset = true;
3155	3963	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3182,53 +3990,79 @@
3182	3990	// Close();
3183	3991	// }
3184	3992	// else
3185		- if (event.getSource() == resetSlidersButton)
	3993	+ if (source == resetSlidersButton)
3186	3994	{
3187	3995	ResetSliders();
3188		- } else if (event.getSource() == clearMaterialButton)
	3996	+ } else if (source == clearMaterialButton)
3189	3997	{
3190	3998	ClearMaterial();
3191		- } else if (event.getSource() == createMaterialButton)
	3999	+ } else if (source == createMaterialButton)
3192	4000	{
3193	4001	CreateMaterial();
3194		- } else if (event.getSource() == clearPanelButton)
	4002	+ } else if (source == clearPanelButton)
3195	4003	{
3196	4004	copy.ClearUI();
3197	4005	refreshContents(true);
3198		- } /*
3199		- }
3200		-
3201		- public boolean action(Event event, Object arg)
3202		- {
3203		- */ else if (event.getSource() == closeItem)
	4006	+ } else if (source == importGFDItem)
	4007	+ {
	4008	+ ImportGFD();
	4009	+ } else
	4010	+ if (source == importVRMLX3DItem)
	4011	+ {
	4012	+ ImportVRMLX3D();
	4013	+ } else
	4014	+ if (source == import3DSItem)
	4015	+ {
	4016	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4017	+ } else
	4018	+ if (source == importOBJItem)
	4019	+ {
	4020	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4021	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4022	+ browser.setVisible(true);
	4023	+ String filename = browser.getFile();
	4024	+ if (filename != null && filename.length() > 0)
	4025	+ {
	4026	+ String fullname = browser.getDirectory() + filename;
	4027	+ makeSomething(ReadOBJ(fullname), true);
	4028	+ }
	4029	+ } else
	4030	+ if (source == closeItem)
3204	4031	{
3205	4032	Close();
3206	4033	//return true;
3207		- } else if (event.getSource() == loadItem)
	4034	+ } else if (source == openItem)
3208	4035	{
3209		- load();
	4036	+ Open();
3210	4037	//return true;
3211		- } else if (event.getSource() == saveItem)
	4038	+ } else if (source == newItem)
	4039	+ {
	4040	+ New();
	4041	+ } else if (source == saveItem)
3212	4042	{
3213	4043	save();
3214	4044	//return true;
3215		- } else if (event.getSource() == saveAsItem)
	4045	+ } else if (source == saveAsItem)
3216	4046	{
3217	4047	saveAs();
3218	4048	//return true;
3219		- } else if (event.getSource() == reexportItem)
	4049	+ } else if (source == reexportItem)
3220	4050	{
3221	4051	reexport();
3222	4052	//return true;
3223		- } else if (event.getSource() == exportAsItem)
	4053	+ } else if (source == exportAsItem)
3224	4054	{
3225	4055	export();
3226	4056	//return true;
3227		- } else if (event.getSource() == povItem)
	4057	+ } else if (source == povItem)
3228	4058	{
3229	4059	generatePOV();
3230	4060	//return true;
3231		- } else if (event.getSource() == zBufferItem)
	4061	+ } else if (event.getSource() == archiveItem)
	4062	+ {
	4063	+ cTools.Archive(frame);
	4064	+ return;
	4065	+ } else if (source == zBufferItem)
3232	4066	{
3233	4067	try
3234	4068	{
..	..	@@ -3250,21 +4084,8 @@
3250	4084	cameraView.repaint();
3251	4085	//return true;
3252	4086	}
3253		- */ else if (event.getSource() == editCameraItem)
3254		- {
3255		- cameraView.ProtectCamera();
3256		- cameraView.repaint();
3257		- return;
3258		- } else if (event.getSource() == revertCameraItem)
3259		- {
3260		- cameraView.RevertCamera();
3261		- cameraView.repaint();
3262		- return;
3263		-// } else if (event.getSource() == textureButton)
3264		-// {
3265		-// return; // true;
3266		- } else // combos...
3267		- if (event.getSource() == texresMenu)
	4087	+ */ else // combos...
	4088	+ if (source == texresMenu)
3268	4089	{
3269	4090	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3270	4091	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3276,27 +4097,494 @@
3276	4097	}
3277	4098	}
3278	4099
3279		- void ToggleAnimation()
	4100	+ void New()
3280	4101	{
3281		- if (!CameraPane.ANIMATION)
	4102	+ while (copy.Size() > 1)
3282	4103	{
3283		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4104	+ copy.remove(1);
	4105	+ }
	4106	+
	4107	+ ResetModel();
	4108	+ objEditor.refreshContents();
	4109	+ }
	4110	+
	4111	+ static public byte[] Compress(Object3D o)
	4112	+ {
	4113	+ // Slower to actually compress.
	4114	+ try
	4115	+ {
	4116	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4117	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4118	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4119	+
	4120	+ Object3D parent = o.parent;
	4121	+ o.parent = null;
	4122	+
	4123	+ out.writeObject(o);
	4124	+
	4125	+ o.parent = parent;
	4126	+
	4127	+ out.flush();
	4128	+
	4129	+ baos //zstream
	4130	+ .close();
	4131	+ out.close();
	4132	+
	4133	+ byte[] bytes = baos.toByteArray();
	4134	+
	4135	+ System.out.println("save #bytes = " + bytes.length);
	4136	+ return bytes;
	4137	+ } catch (Exception e)
	4138	+ {
	4139	+ System.err.println(e);
	4140	+ return null;
	4141	+ }
	4142	+ }
	4143	+
	4144	+ static public Object Uncompress(byte[] bytes)
	4145	+ {
	4146	+ System.out.println("restore #bytes = " + bytes.length);
	4147	+ try
	4148	+ {
	4149	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4150	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4151	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4152	+ Object obj = in.readObject();
	4153	+
	4154	+ bais //istream
	4155	+ .close();
	4156	+ in.close();
	4157	+
	4158	+ return obj;
	4159	+ } catch (Exception e)
	4160	+ {
	4161	+ System.err.println(e);
	4162	+ return null;
	4163	+ }
	4164	+ }
	4165	+
	4166	+ static public Object clone(Object o)
	4167	+ {
	4168	+ try
	4169	+ {
	4170	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4171	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4172	+
	4173	+ out.writeObject(o);
	4174	+
	4175	+ out.flush();
	4176	+ out.close();
	4177	+
	4178	+ byte[] bytes = baos.toByteArray();
	4179	+
	4180	+ System.out.println("clone = " + bytes.length);
	4181	+
	4182	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4183	+ ObjectInputStream in = new ObjectInputStream(bais);
	4184	+ Object obj = in.readObject();
	4185	+ in.close();
	4186	+
	4187	+ return obj;
	4188	+ } catch (Exception e)
	4189	+ {
	4190	+ System.err.println(e);
	4191	+ return null;
	4192	+ }
	4193	+ }
	4194	+
	4195	+ cRadio GetCurrentTab()
	4196	+ {
	4197	+ cRadio ab;
	4198	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4199	+ {
	4200	+ ab = (cRadio)e.nextElement();
	4201	+ if(ab.GetObject() == copy)
	4202	+ {
	4203	+ return ab;
	4204	+ }
	4205	+ }
	4206	+
	4207	+ return null;
	4208	+ }
	4209	+
	4210	+
	4211	+ public void Save()
	4212	+ {
	4213	+ //Save(true);
	4214	+ Replace();
	4215	+ SetVersionStates();
	4216	+ }
	4217	+
	4218	+ private boolean Equal(byte[] compress, byte[] name)
	4219	+ {
	4220	+ if (compress.length != name.length)
	4221	+ {
	4222	+ return false;
	4223	+ }
	4224	+
	4225	+ for (int i=compress.length; --i>=0;)
	4226	+ {
	4227	+ if (compress[i] != name[i])
	4228	+ return false;
	4229	+ }
	4230	+
	4231	+ return true;
	4232	+ }
	4233	+
	4234	+ void DeleteVersion()
	4235	+ {
	4236	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4237	+ {
	4238	+ copy.versionlist[i] = copy.versionlist[i+1];
	4239	+ }
	4240	+
	4241	+ if (copy.versionlist[copy.versionindex] == null)
	4242	+ copy.versionindex -= 1;
	4243	+
	4244	+ if (copy.versionindex != -1)
	4245	+ CopyChanged();
	4246	+
	4247	+ SetVersionStates();
	4248	+ }
	4249	+
	4250	+ public boolean Save(boolean user)
	4251	+ {
	4252	+ System.err.println("Save");
	4253	+ Replace();
	4254	+
	4255	+ //cRadio tab = GetCurrentTab();
	4256	+
	4257	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4258	+
	4259	+ boolean thesame = false;
	4260	+
	4261	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4262	+// {
	4263	+// thesame = true;
	4264	+// }
	4265	+
	4266	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4267	+ if (!thesame)
	4268	+ {
	4269	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4270	+ {
	4271	+ copy.versionlist[i] = copy.versionlist[i-1];
	4272	+ }
	4273	+
	4274	+ //tab.user[tab.versionindex] = user;
	4275	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4276	+
	4277	+ copy.versionlist[++copy.versionindex] = compress;
	4278	+
	4279	+ // if (increment)
	4280	+ // tab.versionindex++;
	4281	+ }
	4282	+
	4283	+ //copy.RestoreBigData(versiontable);
	4284	+
	4285	+ //assert(hashtable.isEmpty());
	4286	+
	4287	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4288	+// {
	4289	+// //tab.user[i] = false;
	4290	+// copy.versionlist[i] = null;
	4291	+// }
	4292	+
	4293	+ SetVersionStates();
	4294	+
	4295	+ // test save
	4296	+ if (false)
	4297	+ {
	4298	+ try
	4299	+ {
	4300	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4301	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4302	+
	4303	+ p.writeObject(copy);
	4304	+
	4305	+ p.flush();
	4306	+
	4307	+ ostream.close();
	4308	+ } catch (Exception e)
	4309	+ {
	4310	+ e.printStackTrace();
	4311	+ }
	4312	+ }
	4313	+
	4314	+ return !thesame;
	4315	+ }
	4316	+
	4317	+ boolean flashIt = true;
	4318	+
	4319	+ void RefreshSelection()
	4320	+ {
	4321	+ Object3D selection = new Object3D();
	4322	+
	4323	+ for (int i = 0; i < copy.selection.size(); i++)
	4324	+ {
	4325	+ Object3D elem = copy.selection.elementAt(i);
	4326	+
	4327	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4328	+
	4329	+ if (obj == null)
	4330	+ {
	4331	+ copy.selection.remove(i--);
	4332	+ }
	4333	+ else
	4334	+ {
	4335	+ selection.add(obj);
	4336	+ copy.selection.setElementAt(obj, i);
	4337	+ }
	4338	+ }
	4339	+
	4340	+ flashIt = false;
	4341	+ GetTree().clearSelection();
	4342	+ for (int i = 0; i < selection.size(); i++)
	4343	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4344	+ flashIt = true;
	4345	+
	4346	+ //refreshContents(false);
	4347	+ }
	4348	+
	4349	+ void CopyChanged()
	4350	+ {
	4351	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4352	+
	4353	+ SetVersionStates();
	4354	+
	4355	+ boolean temp = CameraPane.SWITCH;
	4356	+ CameraPane.SWITCH = false;
	4357	+
	4358	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4359	+
	4360	+ copy.clear();
	4361	+
	4362	+ copy.skyboxname = obj.skyboxname;
	4363	+ copy.skyboxext = obj.skyboxext;
	4364	+
	4365	+ for (int i=0; i<obj.Size(); i++)
	4366	+ {
	4367	+ copy.add(obj.get(i));
	4368	+ }
	4369	+
	4370	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4371	+
	4372	+ CameraPane.SWITCH = temp;
	4373	+
	4374	+ RefreshSelection();
	4375	+ //assert(hashtable.isEmpty());
	4376	+
	4377	+ copy.Touch();
	4378	+
	4379	+ ResetModel();
	4380	+ copy.HardTouch(); // recompile?
	4381	+
	4382	+ cRadio ab;
	4383	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4384	+ {
	4385	+ ab = (cRadio)e.nextElement();
	4386	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4387	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4388	+ if (test != null)
	4389	+ {
	4390	+ test.editWindow = ab.object.editWindow;
	4391	+ ab.object = test;
	4392	+ }
	4393	+ }
	4394	+
	4395	+ refreshContents(true);
	4396	+ }
	4397	+
	4398	+ cButton previousVersionButton;
	4399	+ cButton restoreButton;
	4400	+ cButton replaceButton;
	4401	+ cButton nextVersionButton;
	4402	+ cButton saveVersionButton;
	4403	+ cButton deleteVersionButton;
	4404	+
	4405	+ boolean muteSlider;
	4406	+
	4407	+ int VersionCount()
	4408	+ {
	4409	+ int count = 0;
	4410	+
	4411	+ for (int i = copy.versionlist.length; --i >= 0;)
	4412	+ {
	4413	+ if (copy.versionlist[i] != null)
	4414	+ count++;
	4415	+ }
	4416	+
	4417	+ return count;
	4418	+ }
	4419	+
	4420	+ void SetVersionStates()
	4421	+ {
	4422	+ //if (true)
	4423	+ // return;
	4424	+
	4425	+ //cRadio tab = GetCurrentTab();
	4426	+
	4427	+ restoreButton.setEnabled(copy.versionindex != -1);
	4428	+ replaceButton.setEnabled(copy.versionindex != -1);
	4429	+
	4430	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4431	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4432	+
	4433	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4434	+ //copy.versionlist[copy.versionindex + 1] != null);
	4435	+
	4436	+ muteSlider = true;
	4437	+ versionSlider.setMinimum(0);
	4438	+ versionSlider.setMaximum(VersionCount() - 1);
	4439	+ versionSlider.setInteger(copy.versionindex);
	4440	+ versionSlider.setEnabled(copy.versionindex != -1);
	4441	+ muteSlider = false;
	4442	+ }
	4443	+
	4444	+ public boolean PreviousVersion()
	4445	+ {
	4446	+ // Option?
	4447	+ Replace();
	4448	+
	4449	+ System.err.println("Undo");
	4450	+
	4451	+ //cRadio tab = GetCurrentTab();
	4452	+
	4453	+ if (copy.versionindex == 0)
	4454	+ {
	4455	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4456	+ return false;
	4457	+ }
	4458	+
	4459	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4460	+// {
	4461	+// if (Save(false))
	4462	+// tab.versionindex -= 1;
	4463	+// else
	4464	+// {
	4465	+// if (tab.versionindex <= 0)
	4466	+// return false;
	4467	+// else
	4468	+// tab.versionindex -= 1;
	4469	+// }
	4470	+// }
	4471	+
	4472	+ copy.versionindex -= 1;
	4473	+
	4474	+ CopyChanged();
	4475	+
	4476	+ return true;
	4477	+ }
	4478	+
	4479	+ public boolean Restore()
	4480	+ {
	4481	+ System.err.println("Restore");
	4482	+
	4483	+ //cRadio tab = GetCurrentTab();
	4484	+
	4485	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4486	+ {
	4487	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4488	+ return false;
	4489	+ }
	4490	+
	4491	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4492	+ CopyChanged();
	4493	+
	4494	+ return true;
	4495	+ }
	4496	+
	4497	+ public boolean Replace()
	4498	+ {
	4499	+ //System.err.println("Replace");
	4500	+
	4501	+ //cRadio tab = GetCurrentTab();
	4502	+
	4503	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4504	+ {
	4505	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4506	+ return false;
	4507	+ }
	4508	+
	4509	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4510	+
	4511	+ return true;
	4512	+ }
	4513	+
	4514	+ public void NextVersion()
	4515	+ {
	4516	+ // Option?
	4517	+ Replace();
	4518	+
	4519	+ //cRadio tab = GetCurrentTab();
	4520	+
	4521	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4522	+ {
	4523	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4524	+ return;
	4525	+ }
	4526	+
	4527	+ copy.versionindex += 1;
	4528	+
	4529	+ CopyChanged();
	4530	+
	4531	+ //if (!tab.user[tab.versionindex])
	4532	+ // tab.graphs[tab.versionindex] = null;
	4533	+ }
	4534	+
	4535	+ void ImportGFD()
	4536	+ {
	4537	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3284	4538	browser.show();
3285	4539	String filename = browser.getFile();
3286	4540	if (filename != null && filename.length() > 0)
3287	4541	{
3288		- CameraPane.filename = browser.getDirectory() + filename;
	4542	+ String fullname = browser.getDirectory() + filename;
	4543	+
	4544	+ //Object3D readobj =
	4545	+ objEditor.ReadGFD(fullname, objEditor);
	4546	+ //makeSomething(readobj);
	4547	+ }
	4548	+ }
	4549	+
	4550	+ void ImportVRMLX3D()
	4551	+ {
	4552	+ if (Grafreed.standAlone)
	4553	+ {
	4554	+ /**/
	4555	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4556	+ browser.show();
	4557	+ String filename = browser.getFile();
	4558	+ if (filename != null && filename.length() > 0)
	4559	+ {
	4560	+ String fullname = browser.getDirectory() + filename;
	4561	+ LoadVRMLX3D(fullname);
	4562	+ }
	4563	+ /**/
	4564	+ }
	4565	+ }
	4566	+
	4567	+ void ToggleAnimation()
	4568	+ {
	4569	+ if (!Globals.ANIMATION)
	4570	+ {
	4571	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4572	+ browser.setVisible(true);
	4573	+ String filename = browser.getFile();
	4574	+ if (filename != null && filename.length() > 0)
	4575	+ {
	4576	+ Globals.filename = browser.getDirectory() + filename;
3289	4577	//CameraPane.framecount = 0;
3290		- CameraPane.imagecount = 0;
	4578	+ Globals.imagecount = 0;
3291	4579
3292		- CameraPane.ANIMATION ^= true;
	4580	+ Globals.ANIMATION ^= true;
3293	4581
3294		- GrafreeD.wav.cursor = 0;
3295		- GrafreeD.wav.loop = 0;
	4582	+ Grafreed.wav.cursor = 0;
	4583	+ Grafreed.wav.loop = 0;
3296	4584	}
3297	4585	} else
3298	4586	{
3299		- CameraPane.ANIMATION ^= true;
	4587	+ Globals.ANIMATION ^= true;
3300	4588	}
3301	4589	}
3302	4590
..	..	@@ -3342,7 +4630,7 @@
3342	4630	void CreateMaterial()
3343	4631	{
3344	4632	//copy.ClearMaterial(); // PATCH
3345		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4633	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3346	4634	if (copy.selection.size() > 0)
3347	4635	//SetMaterial(copy);
3348	4636	{
..	..	@@ -3393,7 +4681,7 @@
3393	4681	assert false;
3394	4682	}
3395	4683
3396		- void EditSelection()
	4684	+ void EditSelection(boolean newWindow)
3397	4685	{
3398	4686	}
3399	4687
..	..	@@ -3401,11 +4689,11 @@
3401	4689	{
3402	4690	copy.ResetBlockLoop(); // temporary problem
3403	4691
3404		- boolean random = CameraPane.RANDOM;
3405		- CameraPane.RANDOM = false; // parse everything
	4692	+ boolean random = CameraPane.SWITCH;
	4693	+ CameraPane.SWITCH = false; // parse everything
3406	4694	copy.ResetDisplayList();
3407	4695	copy.HardTouch();
3408		- CameraPane.RANDOM = random;
	4696	+ CameraPane.SWITCH = random;
3409	4697	}
3410	4698
3411	4699	// public void applySelf()
..	..	@@ -3452,7 +4740,7 @@
3452	4740	//copy.material = new cMaterial(copy.GetMaterial());
3453	4741
3454	4742	current.color = (float) colorField.getFloat();
3455		- current.modulation = (float) modulationField.getFloat();
	4743	+ current.modulation = (float) saturationField.getFloat();
3456	4744	current.metalness = (float) metalnessField.getFloat();
3457	4745	current.diffuse = (float) diffuseField.getFloat();
3458	4746	current.specular = (float) specularField.getFloat();
..	..	@@ -3475,10 +4763,40 @@
3475	4763	current.fakedepth = (float) fakedepthField.getFloat();
3476	4764	current.shadowbias = (float) shadowbiasField.getFloat();
3477	4765
3478		- if (!NumberSlider.frozen)
	4766	+ if (!cNumberSlider.frozen)
3479	4767	{
3480	4768	//System.out.println("Propagate = " + propagate);
3481	4769	copy.UpdateMaterial(anchor, current, propagate);
	4770	+
	4771	+ if (copy.material != null)
	4772	+ {
	4773	+ cMaterial mat = copy.material;
	4774	+
	4775	+ colorField.SetToolTipValue((mat.color));
	4776	+ saturationField.SetToolTipValue((mat.modulation));
	4777	+ metalnessField.SetToolTipValue((mat.metalness));
	4778	+ diffuseField.SetToolTipValue((mat.diffuse));
	4779	+ specularField.SetToolTipValue((mat.specular));
	4780	+ shininessField.SetToolTipValue((mat.shininess));
	4781	+ shiftField.SetToolTipValue((mat.shift));
	4782	+ ambientField.SetToolTipValue((mat.ambient));
	4783	+ lightareaField.SetToolTipValue((mat.lightarea));
	4784	+ diffusenessField.SetToolTipValue((mat.factor));
	4785	+ velvetField.SetToolTipValue((mat.velvet));
	4786	+ sheenField.SetToolTipValue((mat.sheen));
	4787	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4788	+ backlitField.SetToolTipValue((mat.bump));
	4789	+ anisoField.SetToolTipValue((mat.aniso));
	4790	+ anisoVField.SetToolTipValue((mat.anisoV));
	4791	+ cameraField.SetToolTipValue((mat.cameralight));
	4792	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4793	+ shadowField.SetToolTipValue((mat.shadow));
	4794	+ textureField.SetToolTipValue((mat.texture));
	4795	+ opacityField.SetToolTipValue((mat.opacity));
	4796	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4797	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4798	+ }
	4799	+
3482	4800	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3483	4801	{
3484	4802	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3507,9 +4825,28 @@
3507	4825	//copy.Touch();
3508	4826	}
3509	4827
	4828	+ cNumberSlider versionSlider;
	4829	+
3510	4830	public void stateChanged(ChangeEvent e)
3511	4831	{
3512	4832	// assert(false);
	4833	+ if (e.getSource() == versionSlider)
	4834	+ {
	4835	+ if (muteSlider)
	4836	+ return;
	4837	+
	4838	+ Replace();
	4839	+
	4840	+ int version = versionSlider.getInteger();
	4841	+
	4842	+ if (version != -1 && copy.versionlist[version] != null)
	4843	+ {
	4844	+ copy.versionindex = version;
	4845	+ CopyChanged();
	4846	+ }
	4847	+
	4848	+ return;
	4849	+ }
3513	4850
3514	4851	if (freezematerial)
3515	4852	{
..	..	@@ -3523,6 +4860,7 @@
3523	4860	\|\| e.getSource() == apertureField
3524	4861	\|\| e.getSource() == shadowblurField)
3525	4862	{
	4863	+ new Exception().printStackTrace();
3526	4864	System.exit(0);
3527	4865	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3528	4866	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3544,12 +4882,24 @@
3544	4882	{
3545	4883	//System.out.println("stateChanged = " + this);
3546	4884	materialtouched = true;
	4885	+
	4886	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4887	+ {
	4888	+ saturationField.setFloat(1);
	4889	+ }
	4890	+
3547	4891	applySelf();
3548	4892	//System.out.println("this = " + this);
3549	4893	//System.out.println("PARENT = " + parent);
3550	4894	//if (parent != null)
3551	4895	// parent.applySelf();
3552		- refreshContents();
	4896	+ if (e.getSource() == normalpushField)
	4897	+ {
	4898	+ objEditor.refreshContents();
	4899	+ //Refresh();
	4900	+ }
	4901	+ else
	4902	+ refreshContents();
3553	4903	// ??? client.refreshEditWindow();
3554	4904	}
3555	4905	//else
..	..	@@ -3561,7 +4911,7 @@
3561	4911	//group.name = nameField.getText();
3562	4912	//objEditor.applySelf();
3563	4913
3564		- assert (objEditor == this);
	4914	+ // OCT2018: assert (objEditor == this);
3565	4915	if (copy.selection == null \|\| copy.selection.size() == 0)
3566	4916	//super.applySelf()
3567	4917	; else
..	..	@@ -3585,6 +4935,9 @@
3585	4935	objEditor.copy = keep;
3586	4936	}
3587	4937	}
	4938	+
	4939	+ if (normalpushField != null)
	4940	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3588	4941	}
3589	4942
3590	4943	void SnapObject()
..	..	@@ -3834,20 +5187,28 @@
3834	5187	{
3835	5188	if (GetTree() != null)
3836	5189	{
	5190	+ GetTree().revalidate();
3837	5191	GetTree().repaint();
3838	5192	}
3839	5193
3840	5194	radioPanel.revalidate();
3841	5195	radioPanel.repaint();
3842		- ctrlPanel.revalidate(); // ? new
	5196	+ ctrlPanel.validate(); // ? new
3843	5197	ctrlPanel.repaint();
3844	5198	}
	5199	+
	5200	+ if (previousVersionButton != null && copy.versionlist != null)
	5201	+ SetVersionStates();
	5202	+
	5203	+ cameraView.requestFocusInWindow();
3845	5204	}
3846	5205
3847	5206	static TweenManager tweenManager = new TweenManager();
3848	5207
3849	5208	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3850	5209	{
	5210	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5211	+ Save();
3851	5212	//Tween.set(thing, 0).target(1).start(tweenManager);
3852	5213	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3853	5214	// if (thing instanceof GenericJointDemo)
..	..	@@ -3871,7 +5232,7 @@
3871	5232	// group = (Composite) group.get(0);
3872	5233	// }
3873	5234
3874		- System.out.println("makeSomething of " + thing);
	5235	+ //System.out.println("makeSomething of " + thing);
3875	5236
3876	5237	/*
3877	5238	if (deselect && jList != null)
..	..	@@ -3934,6 +5295,12 @@
3934	5295	{
3935	5296	ResetModel();
3936	5297	Select(thing.GetTreePath(), true, false); // unselect... false);
	5298	+
	5299	+ if (thing.Size() == 0)
	5300	+ {
	5301	+ //EditSelection(false);
	5302	+ }
	5303	+
3937	5304	refreshContents();
3938	5305	}
3939	5306
..	..	@@ -4051,6 +5418,7 @@
4051	5418	}
4052	5419	}
4053	5420	}
	5421	+
4054	5422	LoadGFDThread loadGFDThread;
4055	5423
4056	5424	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4070,8 +5438,10 @@
4070	5438
4071	5439	try
4072	5440	{
	5441	+ // Try compressed version first.
4073	5442	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4074		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5443	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5444	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4075	5445
4076	5446	readobj = (Object3D) p.readObject();
4077	5447	istream.close();
..	..	@@ -4079,7 +5449,22 @@
4079	5449	readobj.ResetDisplayList();
4080	5450	} catch (Exception e)
4081	5451	{
4082		- e.printStackTrace();
	5452	+ if (!e.toString().contains("GZIP"))
	5453	+ e.printStackTrace();
	5454	+
	5455	+ try
	5456	+ {
	5457	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5458	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5459	+
	5460	+ readobj = (Object3D) p.readObject();
	5461	+ istream.close();
	5462	+
	5463	+ readobj.ResetDisplayList();
	5464	+ } catch (Exception e2)
	5465	+ {
	5466	+ e2.printStackTrace();
	5467	+ }
4083	5468	}
4084	5469	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4085	5470	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4125,6 +5510,12 @@
4125	5510
4126	5511	void LoadIt(Object obj)
4127	5512	{
	5513	+ if (obj == null)
	5514	+ {
	5515	+ // Invalid file
	5516	+ return;
	5517	+ }
	5518	+
4128	5519	System.out.println("Loaded " + obj);
4129	5520	//new Exception().printStackTrace();
4130	5521	Object3D readobj = (Object3D) obj;
..	..	@@ -4134,10 +5525,14 @@
4134	5525
4135	5526	if (readobj != null)
4136	5527	{
	5528	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5529	+ // Save();
4137	5530	try
4138	5531	{
4139	5532	//readobj.deepCopySelf(copy);
4140	5533	copy.clear(); // june 2014
	5534	+ copy.skyboxname = readobj.skyboxname;
	5535	+ copy.skyboxext = readobj.skyboxext;
4141	5536	for (int i = 0; i < readobj.size(); i++)
4142	5537	{
4143	5538	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4178,6 +5573,7 @@
4178	5573	}
4179	5574	} catch (ClassCastException e)
4180	5575	{
	5576	+ e.printStackTrace();
4181	5577	assert (false);
4182	5578	Composite c = (Composite) copy;
4183	5579	c.children.clear();
..	..	@@ -4188,17 +5584,32 @@
4188	5584	c.addChild(csg);
4189	5585	}
4190	5586
	5587	+ copy.versionlist = readobj.versionlist;
	5588	+ copy.versionindex = readobj.versionindex;
	5589	+ copy.versiontable = readobj.versiontable;
	5590	+
	5591	+ if (copy.versionlist == null)
	5592	+ {
	5593	+ // Backward compatibility
	5594	+ copy.versionlist = new Object3D[100];
	5595	+ copy.versionindex = -1;
	5596	+
	5597	+ //Save(true);
	5598	+ }
	5599	+
	5600	+ //? SetUndoStates();
	5601	+
4191	5602	ResetModel();
4192	5603	copy.HardTouch(); // recompile?
4193	5604	refreshContents();
4194	5605	}
4195	5606	}
4196	5607
4197		- void load() // throws ClassNotFoundException
	5608	+ void Open() // throws ClassNotFoundException
4198	5609	{
4199		- if (GrafreeD.standAlone)
	5610	+ if (Grafreed.standAlone)
4200	5611	{
4201		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5612	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4202	5613	browser.show();
4203	5614	String filename = browser.getFile();
4204	5615	if (filename != null && filename.length() > 0)
..	..	@@ -4275,6 +5686,8 @@
4275	5686
4276	5687	void save()
4277	5688	{
	5689	+ Replace();
	5690	+
4278	5691	if (lastname == null)
4279	5692	{
4280	5693	return;
..	..	@@ -4283,11 +5696,13 @@
4283	5696	try
4284	5697	{
4285	5698	FileOutputStream ostream = new FileOutputStream(lastname);
4286		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5699	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5700	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4287	5701
4288	5702	p.writeObject(copy);
4289	5703	p.flush();
4290	5704
	5705	+ zstream.close();
4291	5706	ostream.close();
4292	5707
4293	5708	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4295,19 +5710,23 @@
4295	5710	//ps.print(buffer.toString());
4296	5711	} catch (IOException e)
4297	5712	{
	5713	+ e.printStackTrace();
4298	5714	}
4299	5715	}
	5716	+
4300	5717	String lastname;
4301	5718
4302	5719	void saveAs()
4303	5720	{
4304		- if (GrafreeD.standAlone)
	5721	+ if (Grafreed.standAlone)
4305	5722	{
4306	5723	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4307	5724	browser.setVisible(true);
4308	5725	String filename = browser.getFile();
4309	5726	if (filename != null && filename.length() > 0)
4310	5727	{
	5728	+ if (!filename.endsWith(".gfd"))
	5729	+ filename += ".gfd";
4311	5730	lastname = browser.getDirectory() + filename;
4312	5731	save();
4313	5732	}
..	..	@@ -4406,13 +5825,13 @@
4406	5825	try
4407	5826	{
4408	5827	FileOutputStream ostream = new FileOutputStream(filename);
4409		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4410		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5828	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5829	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4411	5830
4412	5831	Object3D objectparent = obj.parent;
4413	5832	obj.parent = null;
4414	5833
4415		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5834	+ Object3D object = (Object3D) Grafreed.clone(obj);
4416	5835
4417	5836	obj.parent = objectparent;
4418	5837
..	..	@@ -4424,8 +5843,8 @@
4424	5843	p.writeObject(object);
4425	5844	p.flush();
4426	5845
	5846	+ zstream.close();
4427	5847	ostream.close();
4428		- // zstream.close();
4429	5848
4430	5849	// group.selection.get(0).parent = parent;
4431	5850	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4446,7 +5865,7 @@
4446	5865	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4447	5866	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4448	5867	copy.generatePOV(buffer);
4449		- if (GrafreeD.standAlone)
	5868	+ if (Grafreed.standAlone)
4450	5869	{
4451	5870	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4452	5871	browser.show();
..	..	@@ -4472,21 +5891,20 @@
4472	5891	Object3D client;
4473	5892	Object3D copy;
4474	5893	MenuBar menuBar;
4475		- Menu windowMenu;
4476		- MenuItem loadItem;
	5894	+ Menu fileMenu;
	5895	+ MenuItem newItem;
	5896	+ MenuItem openItem;
4477	5897	MenuItem saveItem;
4478	5898	MenuItem saveAsItem;
4479	5899	MenuItem exportAsItem;
4480	5900	MenuItem reexportItem;
4481	5901	MenuItem povItem;
4482	5902	MenuItem closeItem;
4483		- Menu cameraMenu;
	5903	+
4484	5904	CheckboxMenuItem zBufferItem;
4485	5905	//MenuItem normalLensItem;
4486		- MenuItem editCameraItem;
4487		- MenuItem revertCameraItem;
4488		- CheckboxMenuItem toggleLiveItem;
4489	5906	MenuItem stepItem;
	5907	+ CheckboxMenuItem toggleLiveItem;
4490	5908	CheckboxMenuItem toggleFullScreenItem;
4491	5909	CheckboxMenuItem toggleTimelineItem;
4492	5910	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4495,28 +5913,44 @@
4495	5913	CheckboxMenuItem toggleFootContactItem;
4496	5914	CheckboxMenuItem toggleDLItem;
4497	5915	CheckboxMenuItem toggleTextureItem;
4498		- CheckboxMenuItem toggleRandomItem;
	5916	+ CheckboxMenuItem toggleSwitchItem;
4499	5917	CheckboxMenuItem toggleRootItem;
4500	5918	CheckboxMenuItem animationItem;
	5919	+ MenuItem archiveItem;
4501	5920	CheckboxMenuItem toggleHandleItem;
4502	5921	CheckboxMenuItem togglePaintItem;
4503	5922	JSplitPane mainPanel;
4504	5923	JScrollPane scrollpane;
	5924	+
4505	5925	JPanel toolbarPanel;
4506		- JPanel treePanel;
	5926	+
	5927	+ cGridBag treePanel;
	5928	+
4507	5929	JPanel radioPanel;
4508	5930	ButtonGroup buttonGroup;
4509		- JPanel ctrlPanel;
4510		- JPanel materialPanel;
	5931	+
	5932	+ cGridBag toolboxPanel;
	5933	+ cGridBag skyboxPanel;
	5934	+ cGridBag materialPanel;
	5935	+ cGridBag ctrlPanel;
	5936	+
4511	5937	JScrollPane infoPanel;
4512		- JPanel optionsPanel;
	5938	+
	5939	+ cGridBag optionsPanel;
	5940	+
4513	5941	JTabbedPane objectPanel;
4514		- JPanel XYZPanel;
	5942	+ boolean materialFlushed;
	5943	+ Object3D latestObject;
	5944	+
	5945	+ cGridBag XYZPanel;
	5946	+
4515	5947	JSplitPane gridPanel;
4516	5948	JSplitPane bigPanel;
4517		- JPanel bigThree;
4518		- JTabbedPane scenePanel;
4519		- JPanel centralPanel;
	5949	+
	5950	+ cGridBag bigThree;
	5951	+ cGridBag scenePanel;
	5952	+ cGridBag centralPanel;
	5953	+ JSplitPane cameraPanel;
4520	5954	JPanel timelinePanel;
4521	5955	JMenuBar timelineMenubar;
4522	5956	JSplitPane framePanel;
..	..	@@ -4568,65 +6002,74 @@
4568	6002	// MATERIAL
4569	6003	JLabel materialLabel;
4570	6004	JLabel colorLabel;
4571		- NumberSlider colorField;
	6005	+ cNumberSlider colorField;
4572	6006	JLabel modulationLabel;
4573		- NumberSlider modulationField;
	6007	+ cNumberSlider saturationField;
4574	6008	JLabel metalnessLabel;
4575		- NumberSlider metalnessField;
	6009	+ cNumberSlider metalnessField;
4576	6010	JLabel diffuseLabel;
4577		- NumberSlider diffuseField;
	6011	+ cNumberSlider diffuseField;
4578	6012	JLabel specularLabel;
4579		- NumberSlider specularField;
	6013	+ cNumberSlider specularField;
4580	6014	JLabel shininessLabel;
4581		- NumberSlider shininessField;
	6015	+ cNumberSlider shininessField;
4582	6016	JLabel shiftLabel;
4583		- NumberSlider shiftField;
	6017	+ cNumberSlider shiftField;
4584	6018	JLabel ambientLabel;
4585		- NumberSlider ambientField;
	6019	+ cNumberSlider ambientField;
4586	6020	JLabel lightareaLabel;
4587		- NumberSlider lightareaField;
	6021	+ cNumberSlider lightareaField;
4588	6022	JLabel diffusenessLabel;
4589		- NumberSlider diffusenessField;
	6023	+ cNumberSlider diffusenessField;
4590	6024	JLabel velvetLabel;
4591		- NumberSlider velvetField;
	6025	+ cNumberSlider velvetField;
4592	6026	JLabel sheenLabel;
4593		- NumberSlider sheenField;
	6027	+ cNumberSlider sheenField;
4594	6028	JLabel subsurfaceLabel;
4595		- NumberSlider subsurfaceField;
	6029	+ cNumberSlider subsurfaceField;
4596	6030	//JLabel bumpLabel;
4597	6031	//NumberSlider bumpField;
4598	6032	JLabel backlitLabel;
4599		- NumberSlider backlitField;
	6033	+ cNumberSlider backlitField;
4600	6034	JLabel anisoLabel;
4601		- NumberSlider anisoField;
	6035	+ cNumberSlider anisoField;
4602	6036	JLabel anisoVLabel;
4603		- NumberSlider anisoVField;
	6037	+ cNumberSlider anisoVField;
	6038	+
4604	6039	JLabel cameraLabel;
4605		- NumberSlider cameraField;
	6040	+ cNumberSlider cameraField;
4606	6041	JLabel selfshadowLabel;
4607		- NumberSlider selfshadowField;
	6042	+ cNumberSlider selfshadowField;
4608	6043	JLabel shadowLabel;
4609		- NumberSlider shadowField;
	6044	+ cNumberSlider shadowField;
4610	6045	JLabel textureLabel;
4611		- NumberSlider textureField;
	6046	+ cNumberSlider textureField;
4612	6047	JLabel opacityLabel;
4613		- NumberSlider opacityField;
	6048	+ cNumberSlider opacityField;
4614	6049	JLabel fakedepthLabel;
4615		- NumberSlider fakedepthField;
	6050	+ cNumberSlider fakedepthField;
4616	6051	JLabel shadowbiasLabel;
4617		- NumberSlider shadowbiasField;
	6052	+ cNumberSlider shadowbiasField;
	6053	+
4618	6054	JLabel bumpLabel;
4619		- NumberSlider bumpField;
	6055	+ cNumberSlider bumpField;
4620	6056	JLabel noiseLabel;
4621		- NumberSlider noiseField;
	6057	+ cNumberSlider noiseField;
4622	6058	JLabel powerLabel;
4623		- NumberSlider powerField;
	6059	+ cNumberSlider powerField;
4624	6060	JLabel borderfadeLabel;
4625		- NumberSlider borderfadeField;
	6061	+ cNumberSlider borderfadeField;
4626	6062	JLabel fogLabel;
4627		- NumberSlider fogField;
	6063	+ cNumberSlider fogField;
4628	6064	JLabel opacityPowerLabel;
4629		- NumberSlider opacityPowerField;
4630		- JTree jTree;
	6065	+ cNumberSlider opacityPowerField;
	6066	+ cTree jTree;
4631	6067	//ObjectUI parent;
	6068	+
	6069	+ cNumberSlider normalpushField;
	6070	+
	6071	+ private MenuItem importGFDItem;
	6072	+ private MenuItem importVRMLX3DItem;
	6073	+ private MenuItem import3DSItem;
	6074	+ private MenuItem importOBJItem;
4632	6075	}