~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,47 +247,54 @@
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);
163	290
164		- Remove(normalpushField);
	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);
165	298	}
166	299
167	300	public ObjEditor GetEditor()
..	..	@@ -205,6 +338,14 @@
205	338	client = inClient;
206	339	copy = client;
207	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
208	349	// "this" is not called: SetupUI2(objEditor);
209	350	}
210	351
..	..	@@ -218,6 +359,14 @@
218	359	client = inClient;
219	360	copy = client;
220	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
221	370	SetupUI2(callee.GetEditor());
222	371	}
223	372
..	..	@@ -232,13 +381,15 @@
232	381	//localCopy.parent = null;
233	382
234	383	frame = new JFrame();
	384	+ frame.setUndecorated(false);
235	385	objEditor = this;
236	386	this.callee = callee;
237	387
238	388	//parent = p;
239	389
240	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	393	//gd.setFullScreenWindow(this);
243	394	//setResizable(false);
244	395	//if (!isDisplayable())
..	..	@@ -249,6 +400,14 @@
249	400	copy = localCopy;
250	401	copy.editWindow = this;
251	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
252	411	SetupMenu();
253	412
254	413	//SetupName(objEditor); // new
..	..	@@ -262,28 +421,49 @@
262	421	return frame.action(event, obj);
263	422	}
264	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	+
265	429	void SetupMenu()
266	430	{
267	431	frame.setMenuBar(menuBar = new MenuBar());
268		- menuBar.add(windowMenu = new Menu("File"));
269		- windowMenu.add(loadItem = new MenuItem("Load..."));
270		- windowMenu.add("-");
271		- windowMenu.add(saveItem = new MenuItem("Save"));
272		- 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..."));
273	452	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
274		- windowMenu.add("-");
275		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
276		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
277		- windowMenu.add("-");
	453	+ fileMenu.add("-");
	454	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	455	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	456	+ fileMenu.add("-");
278	457	if (client.parent != null)
279	458	{
280		- windowMenu.add(closeItem = new MenuItem("Close"));
	459	+ fileMenu.add(closeItem = new MenuItem("Close"));
281	460	} else
282	461	{
283		- windowMenu.add(closeItem = new MenuItem("Exit"));
	462	+ fileMenu.add(closeItem = new MenuItem("Exit"));
284	463	}
285	464
286		- loadItem.addActionListener(this);
	465	+ newItem.addActionListener(this);
	466	+ openItem.addActionListener(this);
287	467	saveItem.addActionListener(this);
288	468	saveAsItem.addActionListener(this);
289	469	exportAsItem.addActionListener(this);
..	..	@@ -291,82 +471,103 @@
291	471	//povItem.addActionListener(this);
292	472	closeItem.addActionListener(this);
293	473
294		- menuBar.add(cameraMenu = new Menu("View"));
295		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
296		- //zBufferItem.addActionListener(this);
297		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
298		- //normalLensItem.addActionListener(this);
299		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
300		- revertCameraItem.addActionListener(this);
301		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
302		- toggleTimelineItem.addItemListener(this);
303		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
304		- toggleFullScreenItem.addItemListener(this);
305		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
306		- cameraMenu.add("-");
307		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
308		- toggleTextureItem.addItemListener(this);
309		- toggleTextureItem.setState(CameraPane.textureon);
310		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311		- toggleLiveItem.addItemListener(this);
312		- toggleLiveItem.setState(CameraPane.isLIVE());
313		- cameraMenu.add(stepItem = new MenuItem("Step"));
314		- stepItem.addActionListener(this);
315		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
316		-// toggleDLItem.addItemListener(this);
317		-// toggleDLItem.setState(false);
318		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
319		- toggleRenderItem.addItemListener(this);
320		- toggleRenderItem.setState(!CameraPane.frozen);
321		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
322		- toggleDebugItem.addItemListener(this);
323		- toggleDebugItem.setState(CameraPane.DEBUG);
324		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
325		- toggleFrustumItem.addItemListener(this);
326		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
327		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
328		- toggleFootContactItem.addItemListener(this);
329		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
330		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
331		- toggleRandomItem.addItemListener(this);
332		- toggleRandomItem.setState(CameraPane.RANDOM);
333		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
334		- toggleHandleItem.addItemListener(this);
335		- toggleHandleItem.setState(CameraPane.HANDLES);
336		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
337		- togglePaintItem.addItemListener(this);
338		- togglePaintItem.setState(CameraPane.PAINTMODE);
339		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
340		-// toggleRootItem.addItemListener(this);
341		-// toggleRootItem.setState(false);
342		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
343		-// animationItem.addItemListener(this);
344		-// animationItem.setState(CameraPane.ANIMATION);
345		- cameraMenu.add("-");
346		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
347		- editCameraItem.addActionListener(this);
348		-
349	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	+
350	533	toolbarPanel = new JPanel();
351	534	toolbarPanel.setName("Toolbar");
352		- treePanel = new JPanel();
	535	+
	536	+ treePanel = new cGridBag();
353	537	treePanel.setName("Tree");
354		- ctrlPanel = new JPanel(); // new GridBagLayout());
355		- ctrlPanel.setName("Edit");
356		- materialPanel = new JPanel();
357		- 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	+
358	556	/JTextPane/
359	557	infoarea = createTextPane();
	558	+ doc = infoarea.getStyledDocument();
	559	+
360	560	infoarea.setEditable(true);
361	561	SetText();
	562	+
362	563	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
363	564	// infoarea.setOpaque(false);
364	565	// //infoarea.setForeground(textcolor);
365		- infoarea.setLineWrap(true);
366		- infoarea.setWrapStyleWord(true);
	566	+// TEXTAREA infoarea.setLineWrap(true);
	567	+// TEXTAREA infoarea.setWrapStyleWord(true);
367	568	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
368		- infoPanel.setPreferredSize(new Dimension(50, 200));
369		- infoPanel.setName("Info");
	569	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	570	+ //infoPanel.setName("Info");
370	571	//infoPanel.setLayout(new BorderLayout());
371	572	//infoPanel.add(createTextPane());
372	573
..	..	@@ -374,16 +575,23 @@
374	575	mainPanel.setName("Main");
375	576	mainPanel.setContinuousLayout(true);
376	577	mainPanel.setOneTouchExpandable(true);
377		- mainPanel.setDividerLocation(1.0);
378	578	mainPanel.setDividerSize(9);
379		- mainPanel.setResizeWeight(0);
380		-
	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	+
381	589	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
382	590	//mainPanel.setLayout(new GridBagLayout());
383	591	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384		- treePanel.setLayout(new GridBagLayout());
385		- ctrlPanel.setLayout(new GridBagLayout());
386		- materialPanel.setLayout(new GridBagLayout());
	592	+// treePanel.setLayout(new GridBagLayout());
	593	+ //ctrlPanel.setLayout(new GridBagLayout());
	594	+ //materialPanel.setLayout(new GridBagLayout());
387	595
388	596	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389	597	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -422,7 +630,7 @@
422	630	static String newline = "\n";
423	631	protected static final String buttonString = "JButton";
424	632	StyledDocument doc;
425		- JTextArea infoarea;
	633	+ JTextPane infoarea;
426	634
427	635	void ClearInfo()
428	636	{
..	..	@@ -445,10 +653,10 @@
445	653	e.printStackTrace();
446	654	}
447	655
448		- String selection = infoarea.getText();
449		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
450		- java.awt.datatransfer.Clipboard clipboard =
451		- 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();
452	660	//clipboard.setContents(data, data);
453	661	}
454	662
..	..	@@ -471,13 +679,13 @@
471	679	//SendInfo("Name:", "bold");
472	680	if (sel.GetTextures() != null \|\| debug)
473	681	{
474		- si.SendInfo(sel.toString(), "bold");
	682	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
475	683	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
476	684	if (sel.Size() > 0)
477	685	{
478	686	si.SendInfo("#children = " + sel.Size(), "regular");
479	687	}
480		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	688	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
481	689	if (debug)
482	690	{
483	691	try
..	..	@@ -489,7 +697,10 @@
489	697	}
490	698
491	699	if (full)
492		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	700	+ {
	701	+ si.SendInfo(" BBox min: " + minima, "regular");
	702	+ si.SendInfo(" BBox max: " + maxima, "regular");
	703	+ }
493	704
494	705	if (sel.bRep != null)
495	706	{
..	..	@@ -516,7 +727,7 @@
516	727	}
517	728	if (sel.support != null)
518	729	{
519		- si.SendInfo(" support: " + sel.support, "regular");
	730	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
520	731	}
521	732	if (sel.scriptnode != null)
522	733	{
..	..	@@ -587,6 +798,9 @@
587	798	{
588	799	CameraPane.pointflow = (PointFlow) sel;
589	800	}
	801	+
	802	+ si.SendInfo("_____________________", "regular");
	803	+ si.SendInfo("", "regular");
590	804	}
591	805	}
592	806
..	..	@@ -602,68 +816,205 @@
602	816	}
603	817	}
604	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	+
605	880	void ToggleFullScreen()
606	881	{
607		- if (CameraPane.FULLSCREEN)
	882	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	883	+
	884	+ cameraView.ToggleFullScreen();
	885	+
	886	+ if (!CameraPane.FULLSCREEN)
608	887	{
609		- frame.getContentPane().remove(/"Center",/bigThree);
610		- framePanel.add(bigThree);
611		- 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	+
612	911	} else
613	912	{
614		- frame.getContentPane().remove(/"Center",/framePanel);
615		- framePanel.remove(bigThree);
616		- 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);
617	935	}
618		- cameraView.ToggleFullScreen();
	936	+ frame.validate();
	937	+
	938	+ cameraView.requestFocusInWindow();
619	939	}
620	940
621		- 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)
622	950	{
623		- String[] initString =
624		- {
625		- "This is an editable JTextPane, ", //regular
626		- "another ", //italic
627		- "styled ", //bold
628		- "text ", //small
629		- "component, ", //large
630		- "which supports embedded components..." + newline,//regular
631		- " " + newline, //button
632		- "...and embedded icons..." + newline, //regular
633		- " ", //icon
634		- newline + "JTextPane is a subclass of JEditorPane that "
635		- + "uses a StyledEditorKit and StyledDocument, and provides "
636		- + "cover methods for interacting with those objects."
637		- };
	951	+ boolean temp = CameraPane.SWITCH;
	952	+ CameraPane.SWITCH = false;
	953	+
	954	+ object.ExtractBigData(versiontable);
	955	+ // if (copy == client)
	956	+
	957	+ Object3D versions[] = object.versionlist;
	958	+ object.versionlist = null;
	959	+
	960	+ //byte[] compress = Compress(copy);
	961	+ Object3D compress = (Object3D)Grafreed.clone(object);
	962	+
	963	+ object.versionlist = versions;
	964	+
	965	+ object.RestoreBigData(versiontable);
	966	+
	967	+ CameraPane.SWITCH = temp;
	968	+
	969	+ return compress;
	970	+ }
638	971
639		- String[] initStyles =
640		- {
641		- "regular", "italic", "bold", "small", "large",
642		- "regular", "button", "regular", "icon",
643		- "regular"
644		- };
	972	+ private JTextPane createTextPane()
	973	+ {
	974	+// TEXTAREA String[] initString =
	975	+// {
	976	+// "This is an editable JTextPane, ", //regular
	977	+// "another ", //italic
	978	+// "styled ", //bold
	979	+// "text ", //small
	980	+// "component, ", //large
	981	+// "which supports embedded components..." + newline,//regular
	982	+// " " + newline, //button
	983	+// "...and embedded icons..." + newline, //regular
	984	+// " ", //icon
	985	+// newline + "JTextPane is a subclass of JEditorPane that "
	986	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	987	+// + "cover methods for interacting with those objects."
	988	+// };
	989	+//
	990	+// String[] initStyles =
	991	+// {
	992	+// "regular", "italic", "bold", "small", "large",
	993	+// "regular", "button", "regular", "icon",
	994	+// "regular"
	995	+// };
	996	+//
	997	+// JTextPane textPane = new JTextPane();
	998	+// textPane.setEditable(true);
	999	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1000	+// addStylesToDocument(doc);
	1001	+//
	1002	+// try
	1003	+// {
	1004	+// for (int j = 0; j < 2; j++)
	1005	+// {
	1006	+// for (int i = 0; i < initString.length; i++)
	1007	+// {
	1008	+// doc.insertString(doc.getLength(), initString[i],
	1009	+// doc.getStyle(initStyles[i]));
	1010	+// }
	1011	+// }
	1012	+// } catch (BadLocationException ble)
	1013	+// {
	1014	+// System.err.println("Couldn't insert initial text into text pane.");
	1015	+// }
645	1016
646		- JTextPane textPane = new JTextPane();
647		- textPane.setEditable(true);
648		- /StyledDocument/ doc = textPane.getStyledDocument();
649		- addStylesToDocument(doc);
650		-
651		- try
652		- {
653		- for (int j = 0; j < 2; j++)
654		- {
655		- for (int i = 0; i < initString.length; i++)
656		- {
657		- doc.insertString(doc.getLength(), initString[i],
658		- doc.getStyle(initStyles[i]));
659		- }
660		- }
661		- } catch (BadLocationException ble)
662		- {
663		- System.err.println("Couldn't insert initial text into text pane.");
664		- }
665		-
666		- return new JTextArea(); // textPane;
	1017	+ return new JTextPane(); // textPane;
667	1018	}
668	1019
669	1020	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -716,7 +1067,7 @@
716	1067	protected static ImageIcon createImageIcon(String path,
717	1068	String description)
718	1069	{
719		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1070	+ java.net.URL imgURL = Grafreed.class.getResource(path);
720	1071	if (imgURL != null)
721	1072	{
722	1073	return new ImageIcon(imgURL, description);
..	..	@@ -739,6 +1090,7 @@
739	1090	{
740	1091	SetupMaterial(materialPanel);
741	1092	}
	1093	+
742	1094	//SetupName();
743	1095	//SetupViews();
744	1096	}
..	..	@@ -748,6 +1100,7 @@
748	1100	// NumberSlider vDivsField;
749	1101	// JCheckBox endcaps;
750	1102	JCheckBox liveCB;
	1103	+ JCheckBox selectableCB;
751	1104	JCheckBox hideCB;
752	1105	JCheckBox link2masterCB;
753	1106	JCheckBox markCB;
..	..	@@ -755,7 +1108,12 @@
755	1108	JCheckBox speedupCB;
756	1109	JCheckBox rewindCB;
757	1110	JCheckBox flipVCB;
	1111	+
	1112	+ cCheckBox toggleTextureCB;
	1113	+ cCheckBox toggleSwitchCB;
	1114	+
758	1115	JComboBox texresMenu;
	1116	+
759	1117	JButton resetButton;
760	1118	JButton stepButton;
761	1119	JButton stepAllButton;
..	..	@@ -763,115 +1121,87 @@
763	1121	JButton slowerButton;
764	1122	JButton fasterButton;
765	1123	JButton remarkButton;
	1124	+
	1125	+ cGridBag editPanel;
	1126	+ cGridBag editCommandsPanel;
	1127	+
	1128	+ cGridBag namePanel;
	1129	+ cGridBag setupPanel;
	1130	+ cGridBag setupPanel2;
	1131	+ cGridBag objectCommandsPanel;
	1132	+ cGridBag pushPanel;
	1133	+ cGridBag fillPanel;
766	1134
767		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1135	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
768	1136	{
769	1137	JCheckBox cb;
770	1138
771		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
772		- oe.aConstraints.gridwidth = 1; // 3;
773		-// oe.aConstraints.weightx = 1;
774		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
775		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1139	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
776	1140	cb.addItemListener(this);
777		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
778		- oe.aConstraints.gridwidth = 1;
779		- oe.aConstraints.gridx += 1;
780	1141
781	1142	return cb;
782	1143	}
783	1144
784		- cButton AddButton(ObjEditor oe, String label)
	1145	+ cButton AddButton(cGridBag panel, String label)
785	1146	{
786	1147	cButton cb;
787	1148
788		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
789		- oe.aConstraints.gridwidth = 1;
790		-// oe.aConstraints.weightx = 1;
791		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
792		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1149	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
793	1150	cb.addActionListener(this);
794		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
795		- oe.aConstraints.gridwidth = 1;
796		- oe.aConstraints.gridx += 1;
797	1151
798	1152	return cb;
799	1153	}
800	1154
801		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1155	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
802	1156	{
803	1157	JComboBox combo;
804	1158
805		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
806		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
807		- oe.aConstraints.gridx += 1;
	1159	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	1160	combo.addActionListener(this);
809	1161
810	1162	return combo;
811	1163	}
812	1164
813		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1165	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
814	1166	{
815		- NumberSlider combo;
	1167	+ cGridBag control = new cGridBag();
	1168	+
	1169	+ cNumberSlider combo;
816	1170
817	1171	JLabel jlabel = new JLabel(label);
818		-
819		- aConstraints.fill = GridBagConstraints.VERTICAL;
820	1172	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
821		- aConstraints.gridwidth = 1;
822		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
825		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
826		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.gridwidth = 1;
829		-
	1173	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1174	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830	1175	combo.setFloat(current);
831		-
832		- combo.label = jlabel;
833		-
834		- combo.addChangeListener(this);
835		-
836		- return combo;
	1176	+
	1177	+ panel.add(control);
	1178	+
	1179	+ return control;
837	1180	}
838	1181
839		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1182	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
840	1183	{
841		- NumberSlider combo;
	1184	+ cGridBag control = new cGridBag();
	1185	+
	1186	+ cNumberSlider combo;
842	1187
843	1188	JLabel jlabel = new JLabel(label);
844		-
845		- aConstraints.fill = GridBagConstraints.VERTICAL;
846	1189	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
847		- aConstraints.gridwidth = 2;
848		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
851		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
852		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.gridwidth = 1;
855		-
	1190	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1191	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856	1192	combo.setInteger(current);
857	1193
858		- combo.label = jlabel;
859		-
860		- combo.addChangeListener(this);
861		-
862		- return combo;
	1194	+ panel.add(control);
	1195	+
	1196	+ return control;
863	1197	}
864	1198
865		- JTextArea AddText(JPanel ctrlPanel, String name)
	1199	+ JTextArea AddText(cGridBag ctrlPanel, String name)
866	1200	{
867	1201	JTextArea text;
868	1202
869		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
870		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1203	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872	1204	text.addCaretListener(this);
873		- aConstraints.gridx += 1;
874		- aConstraints.gridwidth = 1;
875	1205
876	1206	return text;
877	1207	}
..	..	@@ -901,9 +1231,16 @@
901	1231	objEditor.ctrlPanel.remove(j);
902	1232	}
903	1233
	1234	+ void Remove(cNumberSlider j)
	1235	+ {
	1236	+ j.removeChangeListener(this);
	1237	+ //objEditor.ctrlPanel.remove(j.label);
	1238	+ objEditor.ctrlPanel.remove(j);
	1239	+ }
	1240	+
904	1241	/*
905	1242	*/
906		- void Return() // ObjEditor oe)
	1243	+ void Return0() // ObjEditor oe)
907	1244	{
908	1245	aConstraints.gridy += 1;
909	1246	aConstraints.gridx = 0;
..	..	@@ -958,37 +1295,92 @@
958	1295
959	1296	void SetupUI2(ObjEditor oe)
960	1297	{
961		-// oe.aConstraints.weightx = 0;
962		-// oe.aConstraints.weighty = 0;
963		-// oe.aConstraints.gridx = 0;
964		-// oe.aConstraints.gridy = 0;
965		- SetupName(oe);
	1298	+ //SetupName(oe);
966	1299
967		- if (!GroupEditor.allparams)
	1300	+ namePanel = new cGridBag();
	1301	+
	1302	+ //if (copy.pinned)
	1303	+ {
	1304	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1305	+ pinButton.setSelected(copy.pinned);
	1306	+ cGridBag t = new cGridBag();
	1307	+ t.preferredWidth = 2;
	1308	+ t.add(pinButton);
	1309	+ namePanel.add(t);
	1310	+
	1311	+ pinButton.addItemListener(this);
	1312	+ }
	1313	+
	1314	+ nameField = AddText(namePanel, copy.GetName());
	1315	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1316	+ oe.ctrlPanel.add(namePanel);
	1317	+
	1318	+ oe.ctrlPanel.Return();
	1319	+
	1320	+ if (!allparams)
968	1321	return;
969	1322
970		- liveCB = AddCheckBox(oe, "Live", copy.live);
971		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1323	+ setupPanel = new cGridBag().setVertical(false);
	1324	+
	1325	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1326	+ liveCB.setToolTipText("Animate object");
	1327	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1328	+ markCB.setToolTipText("Set target transform");
	1329	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1330	+ selectableCB.setToolTipText("Make object selectable");
973	1331	// Return();
974		- markCB = AddCheckBox(oe, "Mark", copy.marked);
975		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
976		- randomCB = AddCheckBox(oe, "Rand", copy.random);
977		- Return();
978		- resetButton = AddButton(oe, "Reset");
979		- stepButton = AddButton(oe, "Step");
	1332	+
	1333	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1334	+ hideCB.setToolTipText("Hide object");
	1335	+
	1336	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1337	+
	1338	+ setupPanel2 = new cGridBag().setVertical(false);
	1339	+
	1340	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1341	+ rewindCB.setToolTipText("Rewind animation");
	1342	+
	1343	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1344	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1345	+
	1346	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1347	+ link2masterCB.setToolTipText("Attach to support");
	1348	+
	1349	+ if (Globals.ADVANCED)
	1350	+ {
	1351	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1352	+ speedupCB.setToolTipText("Option motion capture");
	1353	+ }
	1354	+
	1355	+ oe.ctrlPanel.add(setupPanel);
	1356	+ oe.ctrlPanel.Return();
	1357	+ oe.ctrlPanel.add(setupPanel2);
	1358	+ oe.ctrlPanel.Return();
	1359	+
	1360	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1361	+
	1362	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1363	+ resetButton.setToolTipText("Jump to frame zero");
	1364	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1365	+ stepButton.setToolTipText("Step one frame");
980	1366	// resetAllButton = AddButton(oe, "Reset All");
981	1367	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
983	1368	// Return();
984		- slowerButton = AddButton(oe, "Slow");
985		- fasterButton = AddButton(oe, "Fast");
986		- remarkButton = AddButton(oe, "Rem");
	1369	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1370	+ slowerButton.setToolTipText("Decrease animation speed");
	1371	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1372	+ fasterButton.setToolTipText("Increase animation speed");
	1373	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1374	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1375
988		- Return();
	1376	+ oe.ctrlPanel.add(objectCommandsPanel);
	1377	+ oe.ctrlPanel.Return();
989	1378
990		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991		- Return();
	1379	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1380	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1381	+ //Return();
	1382	+
	1383	+ oe.ctrlPanel.Return();
992	1384
993	1385	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
994	1386	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1083,7 +1475,7 @@
1083	1475	oe.aConstraints.gridwidth = 1;
1084	1476	/**/
1085	1477	nameField = AddText(oe.ctrlPanel, copy.GetName());
1086		- Return();
	1478	+ oe.ctrlPanel.Return();
1087	1479
1088	1480	//ctrlPanel.add(textureButton = new Button("Texture..."));
1089	1481	//textureButton.setEnabled(false);
..	..	@@ -1141,6 +1533,7 @@
1141	1533
1142	1534	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1143	1535	{
	1536	+ if (Globals.DEBUG)
1144	1537	System.out.println("CREATE CAMERAS");
1145	1538	cams = new cTemplate();
1146	1539	cams.name = "Cameras";
..	..	@@ -1185,9 +1578,13 @@
1185	1578	//JPanel worldPanel =
1186	1579	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187	1580	//worldPanel.setName("World");
1188		- centralPanel = new JPanel(new BorderLayout());
1189		- timelinePanel = new JPanel(new BorderLayout());
1190		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1581	+ centralPanel = new cGridBag();
	1582	+ centralPanel.preferredWidth = 20;
	1583	+
	1584	+ if (Globals.ADVANCED)
	1585	+ {
	1586	+ timelinePanel = new JPanel(new BorderLayout());
	1587	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191	1588
1192	1589	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1193	1590	cameraPanel.setContinuousLayout(true);
..	..	@@ -1196,7 +1593,10 @@
1196	1593	// cameraPanel.setDividerSize(9);
1197	1594	cameraPanel.setResizeWeight(1.0);
1198	1595
	1596	+ }
	1597	+
1199	1598	centralPanel.add(cameraView);
	1599	+ centralPanel.setFocusable(true);
1200	1600	//frame.setJMenuBar(timelineMenubar);
1201	1601	//centralPanel.add(timelinePanel);
1202	1602
..	..	@@ -1215,12 +1615,14 @@
1215	1615	//frontView.object = copy;
1216	1616	//sideView.object = copy;
1217	1617
1218		- XYZPanel = new JPanel();
1219		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1618	+ XYZPanel = new cGridBag().setVertical(true);
	1619	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1220	1620
1221		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1222		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1223		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1621	+ XYZPanel.preferredWidth = 5;
	1622	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1623	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1624	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1625	+ //XYZPanel.setName("XYZ");
1224	1626
1225	1627	/*
1226	1628	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1258,12 +1660,29 @@
1258	1660	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1259	1661	//tmp.setName("Edit");
1260	1662	objectPanel.add(materialPanel);
1261		- JPanel north = new JPanel(new BorderLayout());
1262		- north.setName("Edit");
1263		- north.add(ctrlPanel, BorderLayout.NORTH);
1264		- objectPanel.add(north);
1265		- objectPanel.add(infoPanel);
	1663	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1664	+ objectPanel.setToolTipTextAt(0, "Material");
	1665	+
	1666	+ objectPanel.add(toolboxPanel);
	1667	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1668	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1266	1669
	1670	+ objectPanel.add(skyboxPanel);
	1671	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1672	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1673	+
	1674	+// JPanel north = new JPanel(new BorderLayout());
	1675	+// north.setName("Edit");
	1676	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1677	+// objectPanel.add(north);
	1678	+ objectPanel.add(editPanel);
	1679	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1680	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1681	+
	1682	+ objectPanel.add(XYZPanel);
	1683	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1684	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1685	+
1267	1686	/*
1268	1687	aConstraints.gridx = 0;
1269	1688	aConstraints.gridwidth = 1;
..	..	@@ -1271,7 +1690,7 @@
1271	1690	aConstraints.gridy += 1;
1272	1691	aConstraints.gridwidth = 1;
1273	1692	mainPanel.add(objectPanel, aConstraints);
1274		- */
	1693	+ */
1275	1694
1276	1695	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1277	1696	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1282,17 +1701,29 @@
1282	1701	scrollpane.setWheelScrollingEnabled(true);
1283	1702	scrollpane.addMouseWheelListener(this); // Default not fast enough
1284	1703
1285		- /JTabbedPane/ scenePanel = new JTabbedPane();
1286		- scenePanel.add(scrollpane);
	1704	+ /JTabbedPane/ scenePanel = new cGridBag();
	1705	+ scenePanel.preferredWidth = 5;
	1706	+
	1707	+ JTabbedPane tabbedPane = new JTabbedPane();
	1708	+ tabbedPane.add(scrollpane);
1287	1709
1288		- scenePanel.add(FSPane = new cFileSystemPane(this));
1289		-
1290		- optionsPanel = new JPanel(new GridBagLayout());
	1710	+ optionsPanel = new cGridBag().setVertical(false);
1291	1711
1292	1712	optionsPanel.setName("Options");
1293		- scenePanel.add(optionsPanel);
	1713	+
	1714	+ AddOptions(optionsPanel); //, aConstraints);
	1715	+
	1716	+ tabbedPane.add(optionsPanel);
	1717	+
	1718	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1294	1719
	1720	+ scenePanel.add(tabbedPane);
1295	1721
	1722	+ //if (Globals.ADVANCED)
	1723	+// tabbedPane.add(infoPanel);
	1724	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1725	+// tabbedPane.setToolTipTextAt(3, "Information");
	1726	+
1296	1727	/*
1297	1728	cTree jTree = new cTree(null);
1298	1729	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1325,6 +1756,7 @@
1325	1756	//bigPanel.setSize(new Dimension(10,10));
1326	1757	//bigPanel.add(ctrlPanel);
1327	1758	//bigPanel.add(gridPanel);
	1759	+ /**
1328	1760	bigThree = new JPanel();
1329	1761	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1330	1762	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1348,7 +1780,13 @@
1348	1780	// aConstraints.gridheight = 3;
1349	1781	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1350	1782	bigThree.add(XYZPanel, aWindowConstraints);
	1783	+ /**/
1351	1784
	1785	+ bigThree = new cGridBag();
	1786	+ bigThree.addComponent(scenePanel);
	1787	+ bigThree.addComponent(centralPanel);
	1788	+ //bigThree.addComponent(XYZPanel);
	1789	+
1352	1790	// // SIDE EFFECT!!!
1353	1791	// aConstraints.gridx = 0;
1354	1792	// aConstraints.gridy = 0;
..	..	@@ -1356,33 +1794,55 @@
1356	1794	// aConstraints.gridheight = 1;
1357	1795
1358	1796	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1359		- framePanel.setContinuousLayout(true);
1360		- framePanel.setOneTouchExpandable(true);
1361		- framePanel.setDividerLocation(0.8);
	1797	+
	1798	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1799	+ new java.beans.PropertyChangeListener()
	1800	+ {
	1801	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1802	+ {
	1803	+ if ((Integer)pce.getOldValue() == 1)
	1804	+ {
	1805	+ if (radio.layout != expandedLayout)
	1806	+ {
	1807	+ radio.layout = expandedLayout;
	1808	+ radio.layout.doClick();
	1809	+ }
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
	1814	+ framePanel.setContinuousLayout(false);
	1815	+ framePanel.setOneTouchExpandable(false);
	1816	+ //.setDividerLocation(0.8);
1362	1817	//framePanel.setDividerSize(15);
1363	1818	//framePanel.setResizeWeight(0.15);
1364	1819	framePanel.setName("Frame");
1365	1820
1366	1821	frame.getContentPane().setLayout(new BorderLayout());
1367	1822	/**/
1368		- JTabbedPane worldPane = new JTabbedPane();
	1823	+ //JTabbedPane worldPane = new JTabbedPane();
1369	1824	//worldPane.add(bigPanel);
1370	1825	//worldPane.add(worldPanel);
1371	1826	/**/
1372		- frame.getContentPane().add(/"Center",/framePanel);
	1827	+ //frame.getContentPane().add(/"Center",/framePanel);
	1828	+ frame.add(/"Center",/framePanel);
1373	1829	//frame.getContentPane().add(/"Center",/ worldPane);
1374	1830
1375	1831	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1376	1832
1377		- frame.setSize(1024, 768);
1378		- frame.show();
1379		-
	1833	+ frame.setSize(1280, 860);
	1834	+
	1835	+ cameraView.requestFocusInWindow();
	1836	+
1380	1837	gridPanel.setDividerLocation(1.0);
	1838	+
	1839	+ frame.validate();
	1840	+
	1841	+ frame.setVisible(true);
1381	1842
1382	1843	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1383	1844	frame.addWindowListener(new WindowAdapter()
1384	1845	{
1385		-
1386	1846	public void windowClosing(WindowEvent e)
1387	1847	{
1388	1848	Close();
..	..	@@ -1390,6 +1850,10 @@
1390	1850	});
1391	1851	}
1392	1852
	1853	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1854	+ {
	1855	+ }
	1856	+
1393	1857	JTree GetTree()
1394	1858	{
1395	1859	return objEditor.jTree;
..	..	@@ -1401,260 +1865,601 @@
1401	1865	ctrlPanel.removeAll();
1402	1866	}
1403	1867
1404		- void SetupMaterial(JPanel ctrlPanel)
	1868	+ void SetupMaterial(cGridBag materialpanel)
1405	1869	{
1406		- aConstraints.weighty = 0;
1407		- //aConstraints.weightx = 1;
1408		- /*
	1870	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1871	+
	1872	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1873	+ skin.setToolTipText("Skin");
	1874	+ skin.addMouseListener(new MouseAdapter()
	1875	+ {
	1876	+ public void mouseClicked(MouseEvent e)
	1877	+ {
	1878	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1879	+ cMaterial material = object.material;
	1880	+
	1881	+ // Skin
	1882	+ colorField.setFloat(material.color);
	1883	+ saturationField.setFloat(material.modulation);
	1884	+ subsurfaceField.setFloat(material.subsurface);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+ diffusenessField.setFloat(material.factor);
	1887	+ shininessField.setFloat(material.shininess);
	1888	+ shadowbiasField.setFloat(material.shadowbias);
	1889	+ diffuseField.setFloat(material.diffuse);
	1890	+ specularField.setFloat(material.specular);
	1891	+
	1892	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1893	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1894	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1895	+
	1896	+ materialtouched = true;
	1897	+ applySelf();
	1898	+ }
	1899	+ });
	1900	+ presetpanel.add(skin);
	1901	+
	1902	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1903	+ lambert.setToolTipText("Diffuse");
	1904	+ lambert.addMouseListener(new MouseAdapter()
	1905	+ {
	1906	+ public void mouseClicked(MouseEvent e)
	1907	+ {
	1908	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1909	+ cMaterial material = object.material;
	1910	+
	1911	+ diffusenessField.setFloat(material.factor);
	1912	+ selfshadowField.setFloat(material.diffuseness);
	1913	+
	1914	+ materialtouched = true;
	1915	+ applySelf();
	1916	+ }
	1917	+ });
	1918	+ presetpanel.add(lambert);
	1919	+
	1920	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1921	+ diffuse2.setToolTipText("Diffuse2");
	1922	+ diffuse2.addMouseListener(new MouseAdapter()
	1923	+ {
	1924	+ public void mouseClicked(MouseEvent e)
	1925	+ {
	1926	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1927	+ cMaterial material = object.material;
	1928	+
	1929	+ diffusenessField.setFloat(material.factor);
	1930	+ selfshadowField.setFloat(material.diffuseness);
	1931	+
	1932	+ materialtouched = true;
	1933	+ applySelf();
	1934	+ }
	1935	+ });
	1936	+ presetpanel.add(diffuse2);
	1937	+
	1938	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1939	+ diffusemoon.setToolTipText("Moon");
	1940	+ diffusemoon.addMouseListener(new MouseAdapter()
	1941	+ {
	1942	+ public void mouseClicked(MouseEvent e)
	1943	+ {
	1944	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1945	+ cMaterial material = object.material;
	1946	+
	1947	+ diffusenessField.setFloat(material.factor);
	1948	+ selfshadowField.setFloat(material.diffuseness);
	1949	+
	1950	+ materialtouched = true;
	1951	+ applySelf();
	1952	+ }
	1953	+ });
	1954	+ presetpanel.add(diffusemoon);
	1955	+
	1956	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1957	+ diffusemoon2.setToolTipText("Moon2");
	1958	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1959	+ {
	1960	+ public void mouseClicked(MouseEvent e)
	1961	+ {
	1962	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1963	+ cMaterial material = object.material;
	1964	+
	1965	+ diffusenessField.setFloat(material.factor);
	1966	+ selfshadowField.setFloat(material.diffuseness);
	1967	+
	1968	+ materialtouched = true;
	1969	+ applySelf();
	1970	+ }
	1971	+ });
	1972	+ presetpanel.add(diffusemoon2);
	1973	+
	1974	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1975	+ diffusemoon3.setToolTipText("Moon3");
	1976	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1977	+ {
	1978	+ public void mouseClicked(MouseEvent e)
	1979	+ {
	1980	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1981	+ cMaterial material = object.material;
	1982	+
	1983	+ diffusenessField.setFloat(material.factor);
	1984	+ selfshadowField.setFloat(material.diffuseness);
	1985	+
	1986	+ materialtouched = true;
	1987	+ applySelf();
	1988	+ }
	1989	+ });
	1990	+ presetpanel.add(diffusemoon3);
	1991	+
	1992	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1993	+ diffusesheen.setToolTipText("Sheen");
	1994	+ diffusesheen.addMouseListener(new MouseAdapter()
	1995	+ {
	1996	+ public void mouseClicked(MouseEvent e)
	1997	+ {
	1998	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1999	+ cMaterial material = object.material;
	2000	+
	2001	+ sheenField.setFloat(material.sheen);
	2002	+
	2003	+ materialtouched = true;
	2004	+ applySelf();
	2005	+ }
	2006	+ });
	2007	+ presetpanel.add(diffusesheen);
	2008	+
	2009	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2010	+ rough.setToolTipText("Rough metal");
	2011	+ rough.addMouseListener(new MouseAdapter()
	2012	+ {
	2013	+ public void mouseClicked(MouseEvent e)
	2014	+ {
	2015	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2016	+ cMaterial material = object.material;
	2017	+
	2018	+ shininessField.setFloat(material.shininess);
	2019	+ velvetField.setFloat(material.velvet);
	2020	+
	2021	+ materialtouched = true;
	2022	+ applySelf();
	2023	+ }
	2024	+ });
	2025	+ presetpanel.add(rough);
	2026	+
	2027	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2028	+ rough2.setToolTipText("Medium metal");
	2029	+ rough2.addMouseListener(new MouseAdapter()
	2030	+ {
	2031	+ public void mouseClicked(MouseEvent e)
	2032	+ {
	2033	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2034	+ cMaterial material = object.material;
	2035	+
	2036	+ shininessField.setFloat(material.shininess);
	2037	+ lightareaField.setFloat(material.lightarea);
	2038	+
	2039	+ materialtouched = true;
	2040	+ applySelf();
	2041	+ }
	2042	+ });
	2043	+ presetpanel.add(rough2);
	2044	+
	2045	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2046	+ shini0.setToolTipText("Shiny");
	2047	+ shini0.addMouseListener(new MouseAdapter()
	2048	+ {
	2049	+ public void mouseClicked(MouseEvent e)
	2050	+ {
	2051	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2052	+ cMaterial material = object.material;
	2053	+
	2054	+ shininessField.setFloat(material.shininess);
	2055	+ lightareaField.setFloat(material.lightarea);
	2056	+
	2057	+ materialtouched = true;
	2058	+ applySelf();
	2059	+ }
	2060	+ });
	2061	+ presetpanel.add(shini0);
	2062	+
	2063	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2064	+ shini1.setToolTipText("Shiny2");
	2065	+ shini1.addMouseListener(new MouseAdapter()
	2066	+ {
	2067	+ public void mouseClicked(MouseEvent e)
	2068	+ {
	2069	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2070	+ cMaterial material = object.material;
	2071	+
	2072	+ shininessField.setFloat(material.shininess);
	2073	+ lightareaField.setFloat(material.lightarea);
	2074	+
	2075	+ materialtouched = true;
	2076	+ applySelf();
	2077	+ }
	2078	+ });
	2079	+ presetpanel.add(shini1);
	2080	+
	2081	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2082	+ shini2.setToolTipText("Shiny3");
	2083	+ shini2.addMouseListener(new MouseAdapter()
	2084	+ {
	2085	+ public void mouseClicked(MouseEvent e)
	2086	+ {
	2087	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2088	+ cMaterial material = object.material;
	2089	+
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ lightareaField.setFloat(material.lightarea);
	2092	+
	2093	+ materialtouched = true;
	2094	+ applySelf();
	2095	+ }
	2096	+ });
	2097	+ presetpanel.add(shini2);
	2098	+
	2099	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2100	+ aniso.setToolTipText("AnisoU");
	2101	+ aniso.addMouseListener(new MouseAdapter()
	2102	+ {
	2103	+ public void mouseClicked(MouseEvent e)
	2104	+ {
	2105	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2106	+ cMaterial material = object.material;
	2107	+
	2108	+ anisoField.setFloat(material.aniso);
	2109	+ anisoVField.setFloat(material.anisoV);
	2110	+
	2111	+ materialtouched = true;
	2112	+ applySelf();
	2113	+ }
	2114	+ });
	2115	+ presetpanel.add(aniso);
	2116	+
	2117	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2118	+ aniso2.setToolTipText("AnisoV");
	2119	+ aniso2.addMouseListener(new MouseAdapter()
	2120	+ {
	2121	+ public void mouseClicked(MouseEvent e)
	2122	+ {
	2123	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2124	+ cMaterial material = object.material;
	2125	+
	2126	+ anisoField.setFloat(material.aniso);
	2127	+ anisoVField.setFloat(material.anisoV);
	2128	+
	2129	+ materialtouched = true;
	2130	+ applySelf();
	2131	+ }
	2132	+ });
	2133	+ presetpanel.add(aniso2);
	2134	+
	2135	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2136	+ aniso3.setToolTipText("AnisoUV");
	2137	+ aniso3.addMouseListener(new MouseAdapter()
	2138	+ {
	2139	+ public void mouseClicked(MouseEvent e)
	2140	+ {
	2141	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2142	+ cMaterial material = object.material;
	2143	+
	2144	+ anisoField.setFloat(material.aniso);
	2145	+ anisoVField.setFloat(material.anisoV);
	2146	+
	2147	+ materialtouched = true;
	2148	+ applySelf();
	2149	+ }
	2150	+ });
	2151	+ presetpanel.add(aniso3);
	2152	+
	2153	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2154	+ velvet0.setToolTipText("Velvet");
	2155	+ velvet0.addMouseListener(new MouseAdapter()
	2156	+ {
	2157	+ public void mouseClicked(MouseEvent e)
	2158	+ {
	2159	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2160	+ cMaterial material = object.material;
	2161	+
	2162	+ diffusenessField.setFloat(material.factor);
	2163	+ selfshadowField.setFloat(material.diffuseness);
	2164	+ sheenField.setFloat(material.sheen);
	2165	+ shininessField.setFloat(material.shininess);
	2166	+ velvetField.setFloat(material.velvet);
	2167	+ shiftField.setFloat(material.shift);
	2168	+
	2169	+ materialtouched = true;
	2170	+ applySelf();
	2171	+ }
	2172	+ });
	2173	+ presetpanel.add(velvet0);
	2174	+
	2175	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2176	+ bump0.setToolTipText("Bump texture");
	2177	+ bump0.addMouseListener(new MouseAdapter()
	2178	+ {
	2179	+ public void mouseClicked(MouseEvent e)
	2180	+ {
	2181	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2182	+ cMaterial material = object.material;
	2183	+
	2184	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2185	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2186	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2187	+
	2188	+ materialtouched = true;
	2189	+ applySelf();
	2190	+ }
	2191	+ });
	2192	+ presetpanel.add(bump0);
	2193	+
	2194	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2195	+ borderShader.setToolTipText("Border fade");
	2196	+ borderShader.addMouseListener(new MouseAdapter()
	2197	+ {
	2198	+ public void mouseClicked(MouseEvent e)
	2199	+ {
	2200	+ borderfadeField.setFloat(0.5);
	2201	+ opacityField.setFloat(0.75);
	2202	+
	2203	+ materialtouched = true;
	2204	+ applySelf();
	2205	+ }
	2206	+ });
	2207	+ presetpanel.add(borderShader);
	2208	+
	2209	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2210	+ halo.setToolTipText("Halo");
	2211	+ halo.addMouseListener(new MouseAdapter()
	2212	+ {
	2213	+ public void mouseClicked(MouseEvent e)
	2214	+ {
	2215	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2216	+ cMaterial material = object.material;
	2217	+
	2218	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2219	+
	2220	+ materialtouched = true;
	2221	+ applySelf();
	2222	+ }
	2223	+ });
	2224	+ presetpanel.add(halo);
	2225	+
	2226	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2227	+ candle.setToolTipText("Candle");
	2228	+ candle.addMouseListener(new MouseAdapter()
	2229	+ {
	2230	+ public void mouseClicked(MouseEvent e)
	2231	+ {
	2232	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2233	+ cMaterial material = object.material;
	2234	+
	2235	+ subsurfaceField.setFloat(material.subsurface);
	2236	+ shadowbiasField.setFloat(material.shadowbias);
	2237	+ ambientField.setFloat(material.ambient);
	2238	+ specularField.setFloat(material.specular);
	2239	+ lightareaField.setFloat(material.lightarea);
	2240	+ shininessField.setFloat(material.shininess);
	2241	+
	2242	+ materialtouched = true;
	2243	+ applySelf();
	2244	+ }
	2245	+ });
	2246	+ presetpanel.add(candle);
	2247	+
	2248	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2249	+ shadowShader.setToolTipText("Shadow");
	2250	+ shadowShader.addMouseListener(new MouseAdapter()
	2251	+ {
	2252	+ public void mouseClicked(MouseEvent e)
	2253	+ {
	2254	+ diffuseField.setFloat(0.001);
	2255	+ ambientField.setFloat(0.001);
	2256	+ cameraField.setFloat(0.001);
	2257	+ specularField.setFloat(0.001);
	2258	+ fakedepthField.setFloat(0.001);
	2259	+ opacityField.setFloat(0.6);
	2260	+
	2261	+ materialtouched = true;
	2262	+ applySelf();
	2263	+ }
	2264	+ });
	2265	+ presetpanel.add(shadowShader);
	2266	+
	2267	+ cGridBag panel = new cGridBag().setVertical(true);
	2268	+
	2269	+ presetpanel.preferredWidth = 1;
	2270	+
	2271	+ materialpanel.add(presetpanel);
	2272	+ materialpanel.add(panel);
	2273	+
	2274	+ panel.preferredWidth = 8;
	2275	+
	2276	+ /*
1409	2277	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1410	2278	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1411		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1412		- aConstraints.gridx += 1;
1413		- */
	2279	+ */
1414	2280
1415		- aConstraints.gridwidth = 1;
1416		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1417		- aConstraints.gridx += 1;
1418		- aConstraints.weighty = 0;
1419		- aConstraints.gridwidth = 1;
	2281	+ cGridBag editBar = new cGridBag().setVertical(false);
	2282	+
	2283	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2284	+ createMaterialButton.setToolTipText("Create material");
1420	2285
1421	2286	/*
1422	2287	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1423		- aConstraints.gridx += 1;
1424		- aConstraints.weighty = 0;
1425		- aConstraints.gridwidth = 1;
1426	2288	*/
1427	2289
1428		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1429		- aConstraints.gridx += 1;
	2290	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2291	+ clearMaterialButton.setToolTipText("Clear material");
	2292	+
	2293	+ if (Globals.ADVANCED)
	2294	+ {
	2295	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2296	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2297	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2298	+ }
1430	2299
1431		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1432		-
1433		- aConstraints.gridx += 1;
1434		-
1435		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1436		-
1437		- aConstraints.gridx += 1;
1438		-
1439		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1440		-
1441		- aConstraints.gridx = 0;
1442		- aConstraints.gridy += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
	2300	+ editBar.preferredHeight = 15;
	2301	+
	2302	+ panel.add(editBar);
	2303	+
1445	2304	/**/
1446	2305	//aConstraints.weighty = 0;
1447	2306	////aConstraints.weightx = 1;
1448	2307	//aConstraints.weighty = 1;
1449	2308	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1450	2309	//aConstraints.gridx += 1;
1451		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1452		- aConstraints.weighty = 0;
1453		- aConstraints.gridx = 0;
1454		- aConstraints.gridy += 1;
1455		- aConstraints.gridwidth = 1;
	2310	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1456	2311
1457		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1458		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1459		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1460		- aConstraints.gridx += 1;
1461		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1462		- //aConstraints.weightx = 0;
1463		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1464		- aConstraints.gridx = 0;
1465		- aConstraints.gridy += 1;
1466		- aConstraints.gridwidth = 1;
	2312	+ cGridBag colorSection = new cGridBag().setVertical(true);
1467	2313
1468		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1469		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1470		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1471		- aConstraints.gridx += 1;
1472		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1473		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1474		- aConstraints.gridx = 0;
1475		- aConstraints.gridy += 1;
1476		- aConstraints.gridwidth = 1;
	2314	+ cGridBag huepanel = new cGridBag();
	2315	+ cGridBag huelabel = new cGridBag();
	2316	+ cLabel hue = GetLabel("icons/hue.png", false);
	2317	+ hue.fit = true;
	2318	+
	2319	+ hue.addMouseListener(new MouseAdapter()
	2320	+ {
	2321	+ public void mousePressed(MouseEvent e)
	2322	+ {
	2323	+ int x = e.getX();
	2324	+
	2325	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2326	+ }
	2327	+ });
	2328	+
	2329	+ huelabel.add(hue);
	2330	+ huelabel.preferredWidth = 20;
	2331	+ huepanel.add(new cGridBag()); // Label
	2332	+ huepanel.add(huelabel); // Field/slider
	2333	+
	2334	+ huepanel.preferredHeight = 7;
1477	2335
1478		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1479		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1480		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1481		- aConstraints.gridx += 1;
1482		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1483		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1484		- aConstraints.gridx = 0;
1485		- aConstraints.gridy += 1;
1486		- aConstraints.gridwidth = 1;
	2336	+ colorSection.add(huepanel);
	2337	+
	2338	+ cGridBag color = new cGridBag();
	2339	+
	2340	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2341	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2342	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1487	2343
1488		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1489		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1491		- aConstraints.gridx += 1;
1492		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1493		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1494		- aConstraints.gridx = 0;
1495		- aConstraints.gridy += 1;
1496		- aConstraints.gridwidth = 1;
	2344	+ //colorField.preferredWidth = 200;
	2345	+ colorSection.add(color);
1497	2346
1498		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1499		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1501		- aConstraints.gridx += 1;
1502		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1503		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1504		- aConstraints.gridx = 0;
1505		- aConstraints.gridy += 1;
1506		- aConstraints.gridwidth = 1;
	2347	+ cGridBag modulation = new cGridBag();
	2348	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2349	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2350	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2351	+ colorSection.add(modulation);
1507	2352
1508		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1509		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1510		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1511		- aConstraints.gridx += 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1513		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1514		- aConstraints.gridx = 0;
1515		- aConstraints.gridy += 1;
1516		- aConstraints.gridwidth = 1;
	2353	+ cGridBag opacity = new cGridBag();
	2354	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2355	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2356	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2357	+ colorSection.add(opacity);
1517	2358
1518		- //aConstraints.weighty = 1;
1519		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1520		- //aConstraints.gridx += 1;
1521		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1522		- aConstraints.weighty = 0;
1523		- aConstraints.gridx = 0;
1524		- aConstraints.gridy += 1;
1525		- aConstraints.gridwidth = 1;
	2359	+ colorSection.add(GetSeparator());
	2360	+
	2361	+ cGridBag texture = new cGridBag();
	2362	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2363	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2364	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2365	+ colorSection.add(texture);
1526	2366
1527		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1528		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1530		- aConstraints.gridx += 1;
1531		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1532		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	2367	+ panel.add(GetSeparator());
	2368	+
	2369	+ panel.add(colorSection);
	2370	+
	2371	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2372	+
	2373	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2374	+
	2375	+ cGridBag diffuse = new cGridBag();
	2376	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2377	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2378	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2379	+ diffuseSection.add(diffuse);
1536	2380
1537		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1538		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1539		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1540		- aConstraints.gridx += 1;
1541		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1542		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1543		- aConstraints.gridx = 0;
1544		- aConstraints.gridy += 1;
1545		- aConstraints.gridwidth = 1;
	2381	+ cGridBag diffuseness = new cGridBag();
	2382	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2383	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2384	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2385	+ diffuseSection.add(diffuseness);
1546	2386
1547		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1548		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1549		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1550		- aConstraints.gridx += 1;
1551		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1552		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1553		- aConstraints.gridx = 0;
1554		- aConstraints.gridy += 1;
1555		- aConstraints.gridwidth = 1;
	2387	+ cGridBag selfshadow = new cGridBag();
	2388	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2389	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2390	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2391	+ diffuseSection.add(selfshadow);
1556	2392
1557		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1558		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1560		- aConstraints.gridx += 1;
1561		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1562		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1563		- aConstraints.gridx = 0;
1564		- aConstraints.gridy += 1;
1565		- aConstraints.gridwidth = 1;
	2393	+ cGridBag sheen = new cGridBag();
	2394	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2395	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2396	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2397	+ diffuseSection.add(sheen);
1566	2398
1567		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1568		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1569		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1570		- aConstraints.gridx += 1;
1571		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1572		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1573		- aConstraints.gridx = 0;
1574		- aConstraints.gridy += 1;
1575		- aConstraints.gridwidth = 1;
	2399	+ cGridBag subsurface = new cGridBag();
	2400	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2401	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2402	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2403	+ diffuseSection.add(subsurface);
1576	2404
1577		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1578		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1580		- aConstraints.gridx += 1;
1581		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1582		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1583		- aConstraints.gridx = 0;
1584		- aConstraints.gridy += 1;
1585		- aConstraints.gridwidth = 1;
	2405	+ cGridBag shadow = new cGridBag();
	2406	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2407	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2408	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2409	+ diffuseSection.add(shadow);
1586	2410
1587		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1588		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1589		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1590		- aConstraints.gridx += 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1592		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1593		- aConstraints.gridx = 0;
1594		- aConstraints.gridy += 1;
1595		- aConstraints.gridwidth = 1;
	2411	+ cGridBag fakedepth = new cGridBag();
	2412	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2413	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2414	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2415	+ diffuseSection.add(fakedepth);
1596	2416
1597		- //aConstraints.weighty = 1;
1598		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1599		- //aConstraints.gridx += 1;
1600		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1601		- aConstraints.weighty = 0;
1602		- aConstraints.gridx = 0;
1603		- aConstraints.gridy += 1;
1604		- aConstraints.gridwidth = 1;
	2417	+ cGridBag shadowbias = new cGridBag();
	2418	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2419	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2420	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2421	+ diffuseSection.add(shadowbias);
1605	2422
1606		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1607		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1608		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1609		- aConstraints.gridx += 1;
1610		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1611		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	2423	+ panel.add(GetSeparator());
	2424	+
	2425	+ panel.add(diffuseSection);
	2426	+
	2427	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2428	+
	2429	+ cGridBag specularSection = new cGridBag().setVertical(true);
1615	2430
1616		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1617		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1619		- aConstraints.gridx += 1;
1620		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1621		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1622		- aConstraints.gridx = 0;
1623		- aConstraints.gridy += 1;
1624		- aConstraints.gridwidth = 1;
	2431	+ cGridBag specular = new cGridBag();
	2432	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2433	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2434	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2435	+ specularSection.add(specular);
1625	2436
1626		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1627		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1629		- aConstraints.gridx += 1;
1630		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1631		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1632		- aConstraints.gridx = 0;
1633		- aConstraints.gridy += 1;
1634		- aConstraints.gridwidth = 1;
	2437	+ cGridBag lightarea = new cGridBag();
	2438	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2439	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2440	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2441	+ specularSection.add(lightarea);
1635	2442
1636		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1637		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1639		- aConstraints.gridx += 1;
1640		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1641		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1642		- aConstraints.gridx = 0;
1643		- aConstraints.gridy += 1;
1644		- aConstraints.gridwidth = 1;
	2443	+ cGridBag shininess = new cGridBag();
	2444	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2445	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2446	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2447	+ specularSection.add(shininess);
1645	2448
1646		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1647		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1648		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1649		- aConstraints.gridx += 1;
1650		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1651		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1652		- aConstraints.gridx = 0;
1653		- aConstraints.gridy += 1;
1654		- aConstraints.gridwidth = 1;
	2449	+ cGridBag metalness = new cGridBag();
	2450	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2451	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2452	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2453	+ specularSection.add(metalness);
1655	2454
1656		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1657		- Return();
	2455	+ cGridBag velvet = new cGridBag();
	2456	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2457	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2458	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2459	+ specularSection.add(velvet);
	2460	+
	2461	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2462	+ //Return();
1658	2463	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1659	2464	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1660	2465	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1665,130 +2470,99 @@
1665	2470	// aConstraints.gridy += 1;
1666	2471	// aConstraints.gridwidth = 1;
1667	2472
1668		- //aConstraints.weighty = 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1670		- //aConstraints.gridx += 1;
1671		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1672		- aConstraints.weighty = 0;
1673		- aConstraints.gridx = 0;
1674		- aConstraints.gridy += 1;
1675		- aConstraints.gridwidth = 1;
	2473	+ cGridBag anisoU = new cGridBag();
	2474	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2475	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2476	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2477	+ specularSection.add(anisoU);
1676	2478
1677		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1678		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1680		- aConstraints.gridx += 1;
1681		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1682		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1683		- aConstraints.gridx = 0;
1684		- aConstraints.gridy += 1;
1685		- aConstraints.gridwidth = 1;
	2479	+ cGridBag anisoV = new cGridBag();
	2480	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2481	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2482	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2483	+ specularSection.add(anisoV);
1686	2484
1687		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1688		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1689		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1690		- aConstraints.gridx += 1;
1691		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1692		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1693		- aConstraints.gridx = 0;
1694		- aConstraints.gridy += 1;
1695		- aConstraints.gridwidth = 1;
1696	2485
1697		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1698		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1700		- aConstraints.gridx += 1;
1701		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1702		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1703		- aConstraints.gridx = 0;
1704		- aConstraints.gridy += 1;
1705		- aConstraints.gridwidth = 1;
	2486	+ panel.add(GetSeparator());
	2487	+
	2488	+ panel.add(specularSection);
	2489	+
	2490	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2491	+
	2492	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1706	2493
1707		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1708		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1710		- aConstraints.gridx += 1;
1711		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1712		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1713		- aConstraints.gridx = 0;
1714		- aConstraints.gridy += 1;
1715		- aConstraints.gridwidth = 1;
1716		- aConstraints.weighty = 0;
	2494	+ cGridBag camera = new cGridBag();
	2495	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2496	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2497	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2498	+ colorSection.add(camera);
1717	2499
1718		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1719		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1720		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1721		- aConstraints.gridx += 1;
1722		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1723		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1724		- aConstraints.gridx = 0;
1725		- aConstraints.gridy += 1;
1726		- aConstraints.gridwidth = 1;
	2500	+ cGridBag ambient = new cGridBag();
	2501	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2502	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2503	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2504	+ colorSection.add(ambient);
1727	2505
1728		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1729		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1730		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1731		- aConstraints.gridx += 1;
1732		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1733		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1734		- aConstraints.gridx = 0;
1735		- aConstraints.gridy += 1;
1736		- aConstraints.gridwidth = 1;
	2506	+ cGridBag backlit = new cGridBag();
	2507	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2508	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2509	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2510	+ colorSection.add(backlit);
1737	2511
1738		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1739		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1740		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1741		- aConstraints.gridx += 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1743		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1744		- aConstraints.gridx = 0;
1745		- aConstraints.gridy += 1;
1746		- aConstraints.gridwidth = 1;
	2512	+ //panel.add(new JSeparator());
	2513	+
	2514	+ //panel.add(globalSection);
	2515	+
	2516	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2517	+
	2518	+ cGridBag textureSection = new cGridBag().setVertical(true);
1747	2519
1748		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1749		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1750		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1751		- aConstraints.gridx += 1;
1752		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1753		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1754		- aConstraints.gridx = 0;
1755		- aConstraints.gridy += 1;
1756		- aConstraints.gridwidth = 1;
	2520	+ cGridBag bump = new cGridBag();
	2521	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2522	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2523	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2524	+ textureSection.add(bump);
1757	2525
1758		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1759		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1761		- aConstraints.gridx += 1;
1762		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1763		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1764		- aConstraints.gridx = 0;
1765		- aConstraints.gridy += 1;
1766		- aConstraints.gridwidth = 1;
	2526	+ cGridBag noise = new cGridBag();
	2527	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2528	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2529	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2530	+ textureSection.add(noise);
1767	2531
1768		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1769		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1771		- aConstraints.gridx += 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1773		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1774		- aConstraints.gridx = 0;
1775		- aConstraints.gridy += 1;
1776		- aConstraints.gridwidth = 1;
	2532	+ cGridBag power = new cGridBag();
	2533	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2534	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2535	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2536	+ textureSection.add(power);
1777	2537
1778		- //aConstraints.weighty = 1;
1779		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1780		- //aConstraints.gridx += 1;
1781		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1782		- aConstraints.weighty = 0;
	2538	+ cGridBag borderfade = new cGridBag();
	2539	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2540	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2541	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2542	+ textureSection.add(borderfade);
1783	2543
1784		- aConstraints.gridx = 0;
1785		- aConstraints.gridy = 0;
1786		- aConstraints.gridwidth = 1;
	2544	+ cGridBag fog = new cGridBag();
	2545	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2546	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2547	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2548	+ textureSection.add(fog);
	2549	+
	2550	+ cGridBag opacityPower = new cGridBag();
	2551	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2552	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2553	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2554	+ textureSection.add(opacityPower);
	2555	+
	2556	+ panel.add(GetSeparator());
	2557	+
	2558	+ panel.add(textureSection);
	2559	+
	2560	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1787	2561
1788	2562	SetMaterial(copy); // .GetMaterial());
1789	2563
1790		- colorField.addChangeListener(this);
1791		- modulationField.addChangeListener(this);
	2564	+ //colorField.addChangeListener(this);
	2565	+// modulationField.addChangeListener(this);
1792	2566	metalnessField.addChangeListener(this);
1793	2567	diffuseField.addChangeListener(this);
1794	2568	specularField.addChangeListener(this);
..	..	@@ -1818,12 +2592,15 @@
1818	2592	opacityPowerField.addChangeListener(this);
1819	2593	/**/
1820	2594
1821		- resetSlidersButton.addActionListener(this);
1822	2595	clearMaterialButton.addActionListener(this);
1823	2596	createMaterialButton.addActionListener(this);
1824		-
1825		- propagateToggle.addItemListener(this);
1826		- multiplyToggle.addItemListener(this);
	2597	+
	2598	+ if (Globals.ADVANCED)
	2599	+ {
	2600	+ resetSlidersButton.addActionListener(this);
	2601	+ propagateToggle.addItemListener(this);
	2602	+ multiplyToggle.addItemListener(this);
	2603	+ }
1827	2604	}
1828	2605
1829	2606	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1841,8 +2618,9 @@
1841	2618	// 3D models
1842	2619	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1843	2620	{
1844		- lastConverter = new com.jmex.model.converters.MaxToJme();
1845		- LoadFile(filename, lastConverter);
	2621	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2622	+ //LoadFile(filename, lastConverter);
	2623	+ LoadObjFile(filename); // New 3ds loader
1846	2624	continue;
1847	2625	}
1848	2626	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1994,7 +2772,7 @@
1994	2772
1995	2773	//? flashIt = false;
1996	2774	CameraPane pane = (CameraPane) cameraView;
1997		- pane.clickStart(location.x, location.y, 0);
	2775	+ pane.clickStart(location.x, location.y, 0, 0);
1998	2776	pane.clickEnd(location.x, location.y, 0, true);
1999	2777
2000	2778	if (group.selection.size() == 1)
..	..	@@ -2043,6 +2821,7 @@
2043	2821	e2.printStackTrace();
2044	2822	}
2045	2823	}
	2824	+
2046	2825	LoadJMEThread loadThread;
2047	2826
2048	2827	class LoadJMEThread extends Thread
..	..	@@ -2100,6 +2879,7 @@
2100	2879	//LoadFile0(filename, converter);
2101	2880	}
2102	2881	}
	2882	+
2103	2883	LoadOBJThread loadObjThread;
2104	2884
2105	2885	class LoadOBJThread extends Thread
..	..	@@ -2178,19 +2958,19 @@
2178	2958
2179	2959	void LoadObjFile(String fullname)
2180	2960	{
2181		- /*
	2961	+ System.out.println("Loading " + fullname);
	2962	+ /**/
2182	2963	//lastFilename = fullname;
2183	2964	if(loadObjThread == null)
2184	2965	{
2185		- loadObjThread = new LoadOBJThread();
2186		- loadObjThread.start();
	2966	+ loadObjThread = new LoadOBJThread();
	2967	+ loadObjThread.start();
2187	2968	}
2188	2969
2189	2970	loadObjThread.add(fullname);
2190		- */
	2971	+ /**/
2191	2972
2192		- System.out.println("Loading " + fullname);
2193		- makeSomething(new FileObject(fullname, true), true);
	2973	+ //makeSomething(new FileObject(fullname, true), true);
2194	2974	}
2195	2975
2196	2976	void LoadGFDFile(String fullname)
..	..	@@ -2451,11 +3231,11 @@
2451	3231
2452	3232	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2453	3233	{
2454		- if (GrafreeD.standAlone)
	3234	+ if (Grafreed.standAlone)
2455	3235	{
2456	3236	/**/
2457	3237	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2458		- browser.show();
	3238	+ browser.setVisible(true);
2459	3239	String filename = browser.getFile();
2460	3240	if (filename != null && filename.length() > 0)
2461	3241	{
..	..	@@ -2566,6 +3346,7 @@
2566	3346	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2567	3347	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2568	3348	}
	3349	+
2569	3350	//cJME.count++;
2570	3351	//cJME.count %= 12;
2571	3352	if (gc)
..	..	@@ -2600,6 +3381,7 @@
2600	3381	}
2601	3382	if (input == null)
2602	3383	{
	3384	+ new Exception().printStackTrace();
2603	3385	System.exit(0);
2604	3386	}
2605	3387
..	..	@@ -2748,6 +3530,7 @@
2748	3530	}
2749	3531	}
2750	3532	}
	3533	+
2751	3534	cFileSystemPane FSPane;
2752	3535
2753	3536	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2757,7 +3540,7 @@
2757	3540
2758	3541	freezematerial = true;
2759	3542	colorField.setFloat(mat.color);
2760		- modulationField.setFloat(mat.modulation);
	3543	+ saturationField.setFloat(mat.modulation);
2761	3544	metalnessField.setFloat(mat.metalness);
2762	3545	diffuseField.setFloat(mat.diffuse);
2763	3546	specularField.setFloat(mat.specular);
..	..	@@ -2801,11 +3584,14 @@
2801	3584	}
2802	3585	}
2803	3586	}
	3587	+
2804	3588	freezematerial = false;
2805	3589	}
2806	3590
2807	3591	void SetMaterial(Object3D object)
2808	3592	{
	3593	+ latestObject = object;
	3594	+
2809	3595	cMaterial mat = object.material;
2810	3596
2811	3597	if (mat == null)
..	..	@@ -2814,33 +3600,10 @@
2814	3600	return;
2815	3601	}
2816	3602
2817		- multiplyToggle.setSelected(mat.multiply);
2818		-
2819		- assert (object.projectedVertices != null);
2820		-
2821		- if (object.projectedVertices.length <= 2)
2822		- {
2823		- // Side effect...
2824		- Object3D.cVector2[] keep = object.projectedVertices;
2825		- object.projectedVertices = new Object3D.cVector2[3];
2826		- for (int i = 0; i < 3; i++)
2827		- {
2828		- if (i < keep.length)
2829		- {
2830		- object.projectedVertices[i] = keep[i];
2831		- } else
2832		- {
2833		- object.projectedVertices[i] = new Object3D.cVector2();
2834		- }
2835		- /*
2836		- if(keep.length == 0)
2837		- object.projectedVertices[0] = new Object3D.cVector2();
2838		- else
2839		- object.projectedVertices[0] = keep[0];
2840		- object.projectedVertices[1] = new Object3D.cVector2();
2841		- */
2842		- }
2843		- }
	3603	+ if (multiplyToggle != null)
	3604	+ multiplyToggle.setSelected(mat.multiply);
	3605	+
	3606	+ AllocProjectedVertices(object);
2844	3607
2845	3608	SetMaterial(mat, object.projectedVertices);
2846	3609	}
..	..	@@ -2916,12 +3679,17 @@
2916	3679	// }
2917	3680
2918	3681	/**/
2919		- if (deselect)
	3682	+ if (deselect \|\| child == null)
2920	3683	{
2921	3684	//group.deselectAll();
2922	3685	//freeze = true;
2923	3686	GetTree().clearSelection();
2924	3687	//freeze = false;
	3688	+
	3689	+ if (child == null)
	3690	+ {
	3691	+ return;
	3692	+ }
2925	3693	}
2926	3694
2927	3695	//group.addSelectee(child);
..	..	@@ -2955,6 +3723,17 @@
2955	3723	public void itemStateChanged(ItemEvent event)
2956	3724	{
2957	3725	// System.out.println("Propagate = " + propagate);
	3726	+ if (event.getSource() == pinButton)
	3727	+ {
	3728	+ copy.pinned ^= true;
	3729	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3730	+ {
	3731	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3732	+ copy.CloseUI();
	3733	+ //copy.editWindow.refreshContents();
	3734	+ }
	3735	+ }
	3736	+ else
2958	3737	if (event.getSource() == propagateToggle)
2959	3738	{
2960	3739	propagate ^= true;
..	..	@@ -2990,7 +3769,7 @@
2990	3769	cameraView.ToggleDL();
2991	3770	cameraView.repaint();
2992	3771	return;
2993		- } else if (event.getSource() == toggleTextureItem)
	3772	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2994	3773	{
2995	3774	cameraView.ToggleTexture();
2996	3775	// june 2013 copy.HardTouch();
..	..	@@ -3029,9 +3808,9 @@
3029	3808	frame.validate();
3030	3809
3031	3810	return;
3032		- } else if (event.getSource() == toggleRandomItem)
	3811	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3033	3812	{
3034		- cameraView.ToggleRandom();
	3813	+ cameraView.ToggleSwitch();
3035	3814	cameraView.repaint();
3036	3815	return;
3037	3816	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3059,12 +3838,17 @@
3059	3838	} else if (event.getSource() == liveCB)
3060	3839	{
3061	3840	copy.live ^= true;
	3841	+ objEditor.refreshContents(true); // To show item colors
	3842	+ return;
	3843	+ } else if (event.getSource() == selectableCB)
	3844	+ {
	3845	+ copy.dontselect ^= true;
3062	3846	return;
3063	3847	} else if (event.getSource() == hideCB)
3064	3848	{
3065	3849	copy.hide ^= true;
3066	3850	copy.Touch(); // display list issue
3067		- objEditor.refreshContents();
	3851	+ objEditor.refreshContents(true); // To show item colors
3068	3852	return;
3069	3853	} else if (event.getSource() == link2masterCB)
3070	3854	{
..	..	@@ -3074,6 +3858,7 @@
3074	3858	if (event.getSource() == randomCB)
3075	3859	{
3076	3860	copy.random ^= true;
	3861	+ objEditor.refreshContents();
3077	3862	return;
3078	3863	}
3079	3864	if (event.getSource() == speedupCB)
..	..	@@ -3097,8 +3882,9 @@
3097	3882
3098	3883	public void actionPerformed(ActionEvent event)
3099	3884	{
	3885	+ Object source = event.getSource();
3100	3886	// SCRIPT DIALOG
3101		- if (event.getSource() == okbutton)
	3887	+ if (source == okbutton)
3102	3888	{
3103	3889	textpanel.setVisible(false);
3104	3890	textpanel.remove(textarea);
..	..	@@ -3110,7 +3896,7 @@
3110	3896	textarea = null;
3111	3897	textpanel = null;
3112	3898	}
3113		- if (event.getSource() == cancelbutton)
	3899	+ if (source == cancelbutton)
3114	3900	{
3115	3901	textpanel.setVisible(false);
3116	3902	textpanel.remove(textarea);
..	..	@@ -3122,49 +3908,50 @@
3122	3908	//applySelf();
3123	3909	//client.refreshEditWindow();
3124	3910	//refreshContents();
3125		- if (event.getSource() == nameField)
	3911	+ if (source == nameField)
3126	3912	{
3127	3913	//System.out.println("ObjEditor " + event);
3128	3914	applySelf0(true);
3129	3915	//parent.applySelf();
3130	3916	objEditor.refreshContents();
3131		- } else if (event.getSource() == resetButton)
	3917	+ } else if (source == resetButton)
3132	3918	{
3133	3919	CameraPane.fullreset = true;
3134	3920	copy.Reset(); // ResetMeshes();
3135	3921	copy.Touch();
3136	3922	objEditor.refreshContents();
3137		- } else if (event.getSource() == stepItem)
	3923	+ } else if (source == stepItem)
3138	3924	{
3139		- cameraView.ONESTEP = true;
	3925	+ //cameraView.ONESTEP = true;
	3926	+ Globals.ONESTEP = true;
3140	3927	cameraView.repaint();
3141	3928	return;
3142		- } else if (event.getSource() == stepButton)
	3929	+ } else if (source == stepButton)
3143	3930	{
3144	3931	copy.Step();
3145	3932	copy.Touch();
3146	3933	objEditor.refreshContents();
3147		- } else if (event.getSource() == slowerButton)
	3934	+ } else if (source == slowerButton)
3148	3935	{
3149	3936	copy.Slower();
3150	3937	copy.Touch();
3151	3938	objEditor.refreshContents();
3152		- } else if (event.getSource() == fasterButton)
	3939	+ } else if (source == fasterButton)
3153	3940	{
3154	3941	copy.Faster();
3155	3942	copy.Touch();
3156	3943	objEditor.refreshContents();
3157		- } else if (event.getSource() == remarkButton)
	3944	+ } else if (source == remarkButton)
3158	3945	{
3159	3946	copy.Remark();
3160	3947	copy.Touch();
3161	3948	objEditor.refreshContents();
3162		- } else if (event.getSource() == stepAllButton)
	3949	+ } else if (source == stepAllButton)
3163	3950	{
3164	3951	copy.StepAll();
3165	3952	copy.Touch();
3166	3953	objEditor.refreshContents();
3167		- } else if (event.getSource() == resetAllButton)
	3954	+ } else if (source == resetAllButton)
3168	3955	{
3169	3956	//CameraPane.fullreset = true;
3170	3957	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3197,53 +3984,79 @@
3197	3984	// Close();
3198	3985	// }
3199	3986	// else
3200		- if (event.getSource() == resetSlidersButton)
	3987	+ if (source == resetSlidersButton)
3201	3988	{
3202	3989	ResetSliders();
3203		- } else if (event.getSource() == clearMaterialButton)
	3990	+ } else if (source == clearMaterialButton)
3204	3991	{
3205	3992	ClearMaterial();
3206		- } else if (event.getSource() == createMaterialButton)
	3993	+ } else if (source == createMaterialButton)
3207	3994	{
3208	3995	CreateMaterial();
3209		- } else if (event.getSource() == clearPanelButton)
	3996	+ } else if (source == clearPanelButton)
3210	3997	{
3211	3998	copy.ClearUI();
3212	3999	refreshContents(true);
3213		- } /*
3214		- }
3215		-
3216		- public boolean action(Event event, Object arg)
3217		- {
3218		- */ else if (event.getSource() == closeItem)
	4000	+ } else if (source == importGFDItem)
	4001	+ {
	4002	+ ImportGFD();
	4003	+ } else
	4004	+ if (source == importVRMLX3DItem)
	4005	+ {
	4006	+ ImportVRMLX3D();
	4007	+ } else
	4008	+ if (source == import3DSItem)
	4009	+ {
	4010	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4011	+ } else
	4012	+ if (source == importOBJItem)
	4013	+ {
	4014	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4015	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4016	+ browser.setVisible(true);
	4017	+ String filename = browser.getFile();
	4018	+ if (filename != null && filename.length() > 0)
	4019	+ {
	4020	+ String fullname = browser.getDirectory() + filename;
	4021	+ makeSomething(ReadOBJ(fullname), true);
	4022	+ }
	4023	+ } else
	4024	+ if (source == closeItem)
3219	4025	{
3220	4026	Close();
3221	4027	//return true;
3222		- } else if (event.getSource() == loadItem)
	4028	+ } else if (source == openItem)
3223	4029	{
3224		- load();
	4030	+ Open();
3225	4031	//return true;
3226		- } else if (event.getSource() == saveItem)
	4032	+ } else if (source == newItem)
	4033	+ {
	4034	+ New();
	4035	+ } else if (source == saveItem)
3227	4036	{
3228	4037	save();
3229	4038	//return true;
3230		- } else if (event.getSource() == saveAsItem)
	4039	+ } else if (source == saveAsItem)
3231	4040	{
3232	4041	saveAs();
3233	4042	//return true;
3234		- } else if (event.getSource() == reexportItem)
	4043	+ } else if (source == reexportItem)
3235	4044	{
3236	4045	reexport();
3237	4046	//return true;
3238		- } else if (event.getSource() == exportAsItem)
	4047	+ } else if (source == exportAsItem)
3239	4048	{
3240	4049	export();
3241	4050	//return true;
3242		- } else if (event.getSource() == povItem)
	4051	+ } else if (source == povItem)
3243	4052	{
3244	4053	generatePOV();
3245	4054	//return true;
3246		- } else if (event.getSource() == zBufferItem)
	4055	+ } else if (event.getSource() == archiveItem)
	4056	+ {
	4057	+ cTools.Archive(frame);
	4058	+ return;
	4059	+ } else if (source == zBufferItem)
3247	4060	{
3248	4061	try
3249	4062	{
..	..	@@ -3265,21 +4078,8 @@
3265	4078	cameraView.repaint();
3266	4079	//return true;
3267	4080	}
3268		- */ else if (event.getSource() == editCameraItem)
3269		- {
3270		- cameraView.ProtectCamera();
3271		- cameraView.repaint();
3272		- return;
3273		- } else if (event.getSource() == revertCameraItem)
3274		- {
3275		- cameraView.RevertCamera();
3276		- cameraView.repaint();
3277		- return;
3278		-// } else if (event.getSource() == textureButton)
3279		-// {
3280		-// return; // true;
3281		- } else // combos...
3282		- if (event.getSource() == texresMenu)
	4081	+ */ else // combos...
	4082	+ if (source == texresMenu)
3283	4083	{
3284	4084	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3285	4085	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3291,27 +4091,492 @@
3291	4091	}
3292	4092	}
3293	4093
3294		- void ToggleAnimation()
	4094	+ void New()
3295	4095	{
3296		- if (!CameraPane.ANIMATION)
	4096	+ while (copy.Size() > 1)
3297	4097	{
3298		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4098	+ copy.remove(1);
	4099	+ }
	4100	+
	4101	+ ResetModel();
	4102	+ objEditor.refreshContents();
	4103	+ }
	4104	+
	4105	+ static public byte[] Compress(Object3D o)
	4106	+ {
	4107	+ // Slower to actually compress.
	4108	+ try
	4109	+ {
	4110	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4111	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4112	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4113	+
	4114	+ Object3D parent = o.parent;
	4115	+ o.parent = null;
	4116	+
	4117	+ out.writeObject(o);
	4118	+
	4119	+ o.parent = parent;
	4120	+
	4121	+ out.flush();
	4122	+
	4123	+ baos //zstream
	4124	+ .close();
	4125	+ out.close();
	4126	+
	4127	+ byte[] bytes = baos.toByteArray();
	4128	+
	4129	+ System.out.println("save #bytes = " + bytes.length);
	4130	+ return bytes;
	4131	+ } catch (Exception e)
	4132	+ {
	4133	+ System.err.println(e);
	4134	+ return null;
	4135	+ }
	4136	+ }
	4137	+
	4138	+ static public Object Uncompress(byte[] bytes)
	4139	+ {
	4140	+ System.out.println("restore #bytes = " + bytes.length);
	4141	+ try
	4142	+ {
	4143	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4144	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4145	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4146	+ Object obj = in.readObject();
	4147	+
	4148	+ bais //istream
	4149	+ .close();
	4150	+ in.close();
	4151	+
	4152	+ return obj;
	4153	+ } catch (Exception e)
	4154	+ {
	4155	+ System.err.println(e);
	4156	+ return null;
	4157	+ }
	4158	+ }
	4159	+
	4160	+ static public Object clone(Object o)
	4161	+ {
	4162	+ try
	4163	+ {
	4164	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4165	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4166	+
	4167	+ out.writeObject(o);
	4168	+
	4169	+ out.flush();
	4170	+ out.close();
	4171	+
	4172	+ byte[] bytes = baos.toByteArray();
	4173	+
	4174	+ System.out.println("clone = " + bytes.length);
	4175	+
	4176	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4177	+ ObjectInputStream in = new ObjectInputStream(bais);
	4178	+ Object obj = in.readObject();
	4179	+ in.close();
	4180	+
	4181	+ return obj;
	4182	+ } catch (Exception e)
	4183	+ {
	4184	+ System.err.println(e);
	4185	+ return null;
	4186	+ }
	4187	+ }
	4188	+
	4189	+ cRadio GetCurrentTab()
	4190	+ {
	4191	+ cRadio ab;
	4192	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4193	+ {
	4194	+ ab = (cRadio)e.nextElement();
	4195	+ if(ab.GetObject() == copy)
	4196	+ {
	4197	+ return ab;
	4198	+ }
	4199	+ }
	4200	+
	4201	+ return null;
	4202	+ }
	4203	+
	4204	+
	4205	+ public void Save()
	4206	+ {
	4207	+ //Save(true);
	4208	+ Replace();
	4209	+ SetVersionStates();
	4210	+ }
	4211	+
	4212	+ private boolean Equal(byte[] compress, byte[] name)
	4213	+ {
	4214	+ if (compress.length != name.length)
	4215	+ {
	4216	+ return false;
	4217	+ }
	4218	+
	4219	+ for (int i=compress.length; --i>=0;)
	4220	+ {
	4221	+ if (compress[i] != name[i])
	4222	+ return false;
	4223	+ }
	4224	+
	4225	+ return true;
	4226	+ }
	4227	+
	4228	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4229	+
	4230	+ void DeleteVersion()
	4231	+ {
	4232	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4233	+ {
	4234	+ copy.versionlist[i] = copy.versionlist[i+1];
	4235	+ }
	4236	+
	4237	+ CopyChanged();
	4238	+
	4239	+ SetVersionStates();
	4240	+ }
	4241	+
	4242	+ public boolean Save(boolean user)
	4243	+ {
	4244	+ System.err.println("Save");
	4245	+ Replace();
	4246	+
	4247	+ //cRadio tab = GetCurrentTab();
	4248	+
	4249	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4250	+
	4251	+ boolean thesame = false;
	4252	+
	4253	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4254	+// {
	4255	+// thesame = true;
	4256	+// }
	4257	+
	4258	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4259	+ if (!thesame)
	4260	+ {
	4261	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4262	+ {
	4263	+ copy.versionlist[i] = copy.versionlist[i-1];
	4264	+ }
	4265	+
	4266	+ //tab.user[tab.versionindex] = user;
	4267	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4268	+
	4269	+ copy.versionlist[++copy.versionindex] = compress;
	4270	+
	4271	+ // if (increment)
	4272	+ // tab.versionindex++;
	4273	+ }
	4274	+
	4275	+ //copy.RestoreBigData(versiontable);
	4276	+
	4277	+ //assert(hashtable.isEmpty());
	4278	+
	4279	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4280	+// {
	4281	+// //tab.user[i] = false;
	4282	+// copy.versionlist[i] = null;
	4283	+// }
	4284	+
	4285	+ SetVersionStates();
	4286	+
	4287	+ // test save
	4288	+ if (false)
	4289	+ {
	4290	+ try
	4291	+ {
	4292	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4293	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4294	+
	4295	+ p.writeObject(copy);
	4296	+
	4297	+ p.flush();
	4298	+
	4299	+ ostream.close();
	4300	+ } catch (Exception e)
	4301	+ {
	4302	+ e.printStackTrace();
	4303	+ }
	4304	+ }
	4305	+
	4306	+ return !thesame;
	4307	+ }
	4308	+
	4309	+ boolean flashIt = true;
	4310	+
	4311	+ void RefreshSelection()
	4312	+ {
	4313	+ Object3D selection = new Object3D();
	4314	+
	4315	+ for (int i = 0; i < copy.selection.size(); i++)
	4316	+ {
	4317	+ Object3D elem = copy.selection.elementAt(i);
	4318	+
	4319	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4320	+
	4321	+ if (obj == null)
	4322	+ {
	4323	+ copy.selection.remove(i--);
	4324	+ }
	4325	+ else
	4326	+ {
	4327	+ selection.add(obj);
	4328	+ copy.selection.setElementAt(obj, i);
	4329	+ }
	4330	+ }
	4331	+
	4332	+ flashIt = false;
	4333	+ GetTree().clearSelection();
	4334	+ for (int i = 0; i < selection.size(); i++)
	4335	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4336	+ flashIt = true;
	4337	+
	4338	+ //refreshContents(false);
	4339	+ }
	4340	+
	4341	+ void CopyChanged()
	4342	+ {
	4343	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4344	+
	4345	+ SetVersionStates();
	4346	+
	4347	+ boolean temp = CameraPane.SWITCH;
	4348	+ CameraPane.SWITCH = false;
	4349	+
	4350	+ copy.ExtractBigData(versiontable);
	4351	+
	4352	+ copy.clear();
	4353	+
	4354	+ copy.skyboxname = obj.skyboxname;
	4355	+ copy.skyboxext = obj.skyboxext;
	4356	+
	4357	+ for (int i=0; i<obj.Size(); i++)
	4358	+ {
	4359	+ copy.add(obj.get(i));
	4360	+ }
	4361	+
	4362	+ copy.RestoreBigData(versiontable);
	4363	+
	4364	+ CameraPane.SWITCH = temp;
	4365	+
	4366	+ RefreshSelection();
	4367	+ //assert(hashtable.isEmpty());
	4368	+
	4369	+ copy.Touch();
	4370	+
	4371	+ ResetModel();
	4372	+ copy.HardTouch(); // recompile?
	4373	+
	4374	+ cRadio ab;
	4375	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4376	+ {
	4377	+ ab = (cRadio)e.nextElement();
	4378	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4379	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4380	+ if (test != null)
	4381	+ {
	4382	+ test.editWindow = ab.object.editWindow;
	4383	+ ab.object = test;
	4384	+ }
	4385	+ }
	4386	+
	4387	+ refreshContents(true);
	4388	+ }
	4389	+
	4390	+ cButton previousVersionButton;
	4391	+ cButton restoreButton;
	4392	+ cButton replaceButton;
	4393	+ cButton nextVersionButton;
	4394	+ cButton saveVersionButton;
	4395	+ cButton deleteVersionButton;
	4396	+
	4397	+ boolean muteSlider;
	4398	+
	4399	+ int VersionCount()
	4400	+ {
	4401	+ int count = 0;
	4402	+
	4403	+ for (int i = copy.versionlist.length; --i >= 0;)
	4404	+ {
	4405	+ if (copy.versionlist[i] != null)
	4406	+ count++;
	4407	+ }
	4408	+
	4409	+ return count;
	4410	+ }
	4411	+
	4412	+ void SetVersionStates()
	4413	+ {
	4414	+ //if (true)
	4415	+ // return;
	4416	+
	4417	+ //cRadio tab = GetCurrentTab();
	4418	+
	4419	+ restoreButton.setEnabled(copy.versionindex != -1);
	4420	+ replaceButton.setEnabled(copy.versionindex != -1);
	4421	+
	4422	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4423	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4424	+
	4425	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4426	+ copy.versionlist[copy.versionindex + 1] != null);
	4427	+
	4428	+ muteSlider = true;
	4429	+ versionSlider.setMinimum(0);
	4430	+ versionSlider.setMaximum(VersionCount() - 1);
	4431	+ versionSlider.setInteger(copy.versionindex);
	4432	+ versionSlider.setEnabled(copy.versionindex != -1);
	4433	+ muteSlider = false;
	4434	+ }
	4435	+
	4436	+ public boolean PreviousVersion()
	4437	+ {
	4438	+ // Option?
	4439	+ Replace();
	4440	+
	4441	+ System.err.println("Undo");
	4442	+
	4443	+ //cRadio tab = GetCurrentTab();
	4444	+
	4445	+ if (copy.versionindex == 0)
	4446	+ {
	4447	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4448	+ return false;
	4449	+ }
	4450	+
	4451	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4452	+// {
	4453	+// if (Save(false))
	4454	+// tab.versionindex -= 1;
	4455	+// else
	4456	+// {
	4457	+// if (tab.versionindex <= 0)
	4458	+// return false;
	4459	+// else
	4460	+// tab.versionindex -= 1;
	4461	+// }
	4462	+// }
	4463	+
	4464	+ copy.versionindex -= 1;
	4465	+
	4466	+ CopyChanged();
	4467	+
	4468	+ return true;
	4469	+ }
	4470	+
	4471	+ public boolean Restore()
	4472	+ {
	4473	+ System.err.println("Restore");
	4474	+
	4475	+ //cRadio tab = GetCurrentTab();
	4476	+
	4477	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4478	+ {
	4479	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4480	+ return false;
	4481	+ }
	4482	+
	4483	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4484	+ CopyChanged();
	4485	+
	4486	+ return true;
	4487	+ }
	4488	+
	4489	+ public boolean Replace()
	4490	+ {
	4491	+ System.err.println("Replace");
	4492	+
	4493	+ //cRadio tab = GetCurrentTab();
	4494	+
	4495	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4496	+ {
	4497	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4498	+ return false;
	4499	+ }
	4500	+
	4501	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4502	+
	4503	+ return true;
	4504	+ }
	4505	+
	4506	+ public void NextVersion()
	4507	+ {
	4508	+ // Option?
	4509	+ Replace();
	4510	+
	4511	+ //cRadio tab = GetCurrentTab();
	4512	+
	4513	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4514	+ {
	4515	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4516	+ return;
	4517	+ }
	4518	+
	4519	+ copy.versionindex += 1;
	4520	+
	4521	+ CopyChanged();
	4522	+
	4523	+ //if (!tab.user[tab.versionindex])
	4524	+ // tab.graphs[tab.versionindex] = null;
	4525	+ }
	4526	+
	4527	+ void ImportGFD()
	4528	+ {
	4529	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3299	4530	browser.show();
3300	4531	String filename = browser.getFile();
3301	4532	if (filename != null && filename.length() > 0)
3302	4533	{
3303		- CameraPane.filename = browser.getDirectory() + filename;
	4534	+ String fullname = browser.getDirectory() + filename;
	4535	+
	4536	+ //Object3D readobj =
	4537	+ objEditor.ReadGFD(fullname, objEditor);
	4538	+ //makeSomething(readobj);
	4539	+ }
	4540	+ }
	4541	+
	4542	+ void ImportVRMLX3D()
	4543	+ {
	4544	+ if (Grafreed.standAlone)
	4545	+ {
	4546	+ /**/
	4547	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4548	+ browser.show();
	4549	+ String filename = browser.getFile();
	4550	+ if (filename != null && filename.length() > 0)
	4551	+ {
	4552	+ String fullname = browser.getDirectory() + filename;
	4553	+ LoadVRMLX3D(fullname);
	4554	+ }
	4555	+ /**/
	4556	+ }
	4557	+ }
	4558	+
	4559	+ void ToggleAnimation()
	4560	+ {
	4561	+ if (!Globals.ANIMATION)
	4562	+ {
	4563	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4564	+ browser.setVisible(true);
	4565	+ String filename = browser.getFile();
	4566	+ if (filename != null && filename.length() > 0)
	4567	+ {
	4568	+ Globals.filename = browser.getDirectory() + filename;
3304	4569	//CameraPane.framecount = 0;
3305		- CameraPane.imagecount = 0;
	4570	+ Globals.imagecount = 0;
3306	4571
3307		- CameraPane.ANIMATION ^= true;
	4572	+ Globals.ANIMATION ^= true;
3308	4573
3309		- GrafreeD.wav.cursor = 0;
3310		- GrafreeD.wav.loop = 0;
	4574	+ Grafreed.wav.cursor = 0;
	4575	+ Grafreed.wav.loop = 0;
3311	4576	}
3312	4577	} else
3313	4578	{
3314		- CameraPane.ANIMATION ^= true;
	4579	+ Globals.ANIMATION ^= true;
3315	4580	}
3316	4581	}
3317	4582
..	..	@@ -3357,7 +4622,7 @@
3357	4622	void CreateMaterial()
3358	4623	{
3359	4624	//copy.ClearMaterial(); // PATCH
3360		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4625	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3361	4626	if (copy.selection.size() > 0)
3362	4627	//SetMaterial(copy);
3363	4628	{
..	..	@@ -3408,7 +4673,7 @@
3408	4673	assert false;
3409	4674	}
3410	4675
3411		- void EditSelection()
	4676	+ void EditSelection(boolean newWindow)
3412	4677	{
3413	4678	}
3414	4679
..	..	@@ -3416,11 +4681,11 @@
3416	4681	{
3417	4682	copy.ResetBlockLoop(); // temporary problem
3418	4683
3419		- boolean random = CameraPane.RANDOM;
3420		- CameraPane.RANDOM = false; // parse everything
	4684	+ boolean random = CameraPane.SWITCH;
	4685	+ CameraPane.SWITCH = false; // parse everything
3421	4686	copy.ResetDisplayList();
3422	4687	copy.HardTouch();
3423		- CameraPane.RANDOM = random;
	4688	+ CameraPane.SWITCH = random;
3424	4689	}
3425	4690
3426	4691	// public void applySelf()
..	..	@@ -3467,7 +4732,7 @@
3467	4732	//copy.material = new cMaterial(copy.GetMaterial());
3468	4733
3469	4734	current.color = (float) colorField.getFloat();
3470		- current.modulation = (float) modulationField.getFloat();
	4735	+ current.modulation = (float) saturationField.getFloat();
3471	4736	current.metalness = (float) metalnessField.getFloat();
3472	4737	current.diffuse = (float) diffuseField.getFloat();
3473	4738	current.specular = (float) specularField.getFloat();
..	..	@@ -3490,10 +4755,40 @@
3490	4755	current.fakedepth = (float) fakedepthField.getFloat();
3491	4756	current.shadowbias = (float) shadowbiasField.getFloat();
3492	4757
3493		- if (!NumberSlider.frozen)
	4758	+ if (!cNumberSlider.frozen)
3494	4759	{
3495	4760	//System.out.println("Propagate = " + propagate);
3496	4761	copy.UpdateMaterial(anchor, current, propagate);
	4762	+
	4763	+ if (copy.material != null)
	4764	+ {
	4765	+ cMaterial mat = copy.material;
	4766	+
	4767	+ colorField.SetToolTipValue((mat.color));
	4768	+ saturationField.SetToolTipValue((mat.modulation));
	4769	+ metalnessField.SetToolTipValue((mat.metalness));
	4770	+ diffuseField.SetToolTipValue((mat.diffuse));
	4771	+ specularField.SetToolTipValue((mat.specular));
	4772	+ shininessField.SetToolTipValue((mat.shininess));
	4773	+ shiftField.SetToolTipValue((mat.shift));
	4774	+ ambientField.SetToolTipValue((mat.ambient));
	4775	+ lightareaField.SetToolTipValue((mat.lightarea));
	4776	+ diffusenessField.SetToolTipValue((mat.factor));
	4777	+ velvetField.SetToolTipValue((mat.velvet));
	4778	+ sheenField.SetToolTipValue((mat.sheen));
	4779	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4780	+ backlitField.SetToolTipValue((mat.bump));
	4781	+ anisoField.SetToolTipValue((mat.aniso));
	4782	+ anisoVField.SetToolTipValue((mat.anisoV));
	4783	+ cameraField.SetToolTipValue((mat.cameralight));
	4784	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4785	+ shadowField.SetToolTipValue((mat.shadow));
	4786	+ textureField.SetToolTipValue((mat.texture));
	4787	+ opacityField.SetToolTipValue((mat.opacity));
	4788	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4789	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4790	+ }
	4791	+
3497	4792	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3498	4793	{
3499	4794	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3522,9 +4817,28 @@
3522	4817	//copy.Touch();
3523	4818	}
3524	4819
	4820	+ cNumberSlider versionSlider;
	4821	+
3525	4822	public void stateChanged(ChangeEvent e)
3526	4823	{
3527	4824	// assert(false);
	4825	+ if (e.getSource() == versionSlider)
	4826	+ {
	4827	+ if (muteSlider)
	4828	+ return;
	4829	+
	4830	+ Replace();
	4831	+
	4832	+ int version = versionSlider.getInteger();
	4833	+
	4834	+ if (version != -1 && copy.versionlist[version] != null)
	4835	+ {
	4836	+ copy.versionindex = version;
	4837	+ CopyChanged();
	4838	+ }
	4839	+
	4840	+ return;
	4841	+ }
3528	4842
3529	4843	if (freezematerial)
3530	4844	{
..	..	@@ -3538,6 +4852,7 @@
3538	4852	\|\| e.getSource() == apertureField
3539	4853	\|\| e.getSource() == shadowblurField)
3540	4854	{
	4855	+ new Exception().printStackTrace();
3541	4856	System.exit(0);
3542	4857	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3543	4858	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3559,6 +4874,12 @@
3559	4874	{
3560	4875	//System.out.println("stateChanged = " + this);
3561	4876	materialtouched = true;
	4877	+
	4878	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4879	+ {
	4880	+ saturationField.setFloat(1);
	4881	+ }
	4882	+
3562	4883	applySelf();
3563	4884	//System.out.println("this = " + this);
3564	4885	//System.out.println("PARENT = " + parent);
..	..	@@ -3608,7 +4929,7 @@
3608	4929	}
3609	4930
3610	4931	if (normalpushField != null)
3611		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4932	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3612	4933	}
3613	4934
3614	4935	void SnapObject()
..	..	@@ -3858,20 +5179,28 @@
3858	5179	{
3859	5180	if (GetTree() != null)
3860	5181	{
	5182	+ GetTree().revalidate();
3861	5183	GetTree().repaint();
3862	5184	}
3863	5185
3864	5186	radioPanel.revalidate();
3865	5187	radioPanel.repaint();
3866		- ctrlPanel.revalidate(); // ? new
	5188	+ ctrlPanel.validate(); // ? new
3867	5189	ctrlPanel.repaint();
3868	5190	}
	5191	+
	5192	+ if (previousVersionButton != null && copy.versionlist != null)
	5193	+ SetVersionStates();
	5194	+
	5195	+ cameraView.requestFocusInWindow();
3869	5196	}
3870	5197
3871	5198	static TweenManager tweenManager = new TweenManager();
3872	5199
3873	5200	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3874	5201	{
	5202	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5203	+ Save();
3875	5204	//Tween.set(thing, 0).target(1).start(tweenManager);
3876	5205	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3877	5206	// if (thing instanceof GenericJointDemo)
..	..	@@ -3895,7 +5224,7 @@
3895	5224	// group = (Composite) group.get(0);
3896	5225	// }
3897	5226
3898		- System.out.println("makeSomething of " + thing);
	5227	+ //System.out.println("makeSomething of " + thing);
3899	5228
3900	5229	/*
3901	5230	if (deselect && jList != null)
..	..	@@ -3958,6 +5287,12 @@
3958	5287	{
3959	5288	ResetModel();
3960	5289	Select(thing.GetTreePath(), true, false); // unselect... false);
	5290	+
	5291	+ if (thing.Size() == 0)
	5292	+ {
	5293	+ //EditSelection(false);
	5294	+ }
	5295	+
3961	5296	refreshContents();
3962	5297	}
3963	5298
..	..	@@ -4075,6 +5410,7 @@
4075	5410	}
4076	5411	}
4077	5412	}
	5413	+
4078	5414	LoadGFDThread loadGFDThread;
4079	5415
4080	5416	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4094,8 +5430,10 @@
4094	5430
4095	5431	try
4096	5432	{
	5433	+ // Try compressed version first.
4097	5434	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4098		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5435	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5436	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4099	5437
4100	5438	readobj = (Object3D) p.readObject();
4101	5439	istream.close();
..	..	@@ -4103,7 +5441,22 @@
4103	5441	readobj.ResetDisplayList();
4104	5442	} catch (Exception e)
4105	5443	{
4106		- e.printStackTrace();
	5444	+ if (!e.toString().contains("GZIP"))
	5445	+ e.printStackTrace();
	5446	+
	5447	+ try
	5448	+ {
	5449	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5450	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5451	+
	5452	+ readobj = (Object3D) p.readObject();
	5453	+ istream.close();
	5454	+
	5455	+ readobj.ResetDisplayList();
	5456	+ } catch (Exception e2)
	5457	+ {
	5458	+ e2.printStackTrace();
	5459	+ }
4107	5460	}
4108	5461	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4109	5462	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4149,6 +5502,12 @@
4149	5502
4150	5503	void LoadIt(Object obj)
4151	5504	{
	5505	+ if (obj == null)
	5506	+ {
	5507	+ // Invalid file
	5508	+ return;
	5509	+ }
	5510	+
4152	5511	System.out.println("Loaded " + obj);
4153	5512	//new Exception().printStackTrace();
4154	5513	Object3D readobj = (Object3D) obj;
..	..	@@ -4158,10 +5517,14 @@
4158	5517
4159	5518	if (readobj != null)
4160	5519	{
	5520	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5521	+ // Save();
4161	5522	try
4162	5523	{
4163	5524	//readobj.deepCopySelf(copy);
4164	5525	copy.clear(); // june 2014
	5526	+ copy.skyboxname = readobj.skyboxname;
	5527	+ copy.skyboxext = readobj.skyboxext;
4165	5528	for (int i = 0; i < readobj.size(); i++)
4166	5529	{
4167	5530	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4202,6 +5565,7 @@
4202	5565	}
4203	5566	} catch (ClassCastException e)
4204	5567	{
	5568	+ e.printStackTrace();
4205	5569	assert (false);
4206	5570	Composite c = (Composite) copy;
4207	5571	c.children.clear();
..	..	@@ -4212,17 +5576,31 @@
4212	5576	c.addChild(csg);
4213	5577	}
4214	5578
	5579	+ copy.versionlist = readobj.versionlist;
	5580	+ copy.versionindex = readobj.versionindex;
	5581	+
	5582	+ if (copy.versionlist == null)
	5583	+ {
	5584	+ // Backward compatibility
	5585	+ copy.versionlist = new Object3D[100];
	5586	+ copy.versionindex = -1;
	5587	+
	5588	+ //Save(true);
	5589	+ }
	5590	+
	5591	+ //? SetUndoStates();
	5592	+
4215	5593	ResetModel();
4216	5594	copy.HardTouch(); // recompile?
4217	5595	refreshContents();
4218	5596	}
4219	5597	}
4220	5598
4221		- void load() // throws ClassNotFoundException
	5599	+ void Open() // throws ClassNotFoundException
4222	5600	{
4223		- if (GrafreeD.standAlone)
	5601	+ if (Grafreed.standAlone)
4224	5602	{
4225		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5603	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4226	5604	browser.show();
4227	5605	String filename = browser.getFile();
4228	5606	if (filename != null && filename.length() > 0)
..	..	@@ -4299,6 +5677,8 @@
4299	5677
4300	5678	void save()
4301	5679	{
	5680	+ Replace();
	5681	+
4302	5682	if (lastname == null)
4303	5683	{
4304	5684	return;
..	..	@@ -4307,11 +5687,13 @@
4307	5687	try
4308	5688	{
4309	5689	FileOutputStream ostream = new FileOutputStream(lastname);
4310		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5690	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5691	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4311	5692
4312	5693	p.writeObject(copy);
4313	5694	p.flush();
4314	5695
	5696	+ zstream.close();
4315	5697	ostream.close();
4316	5698
4317	5699	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4319,19 +5701,23 @@
4319	5701	//ps.print(buffer.toString());
4320	5702	} catch (IOException e)
4321	5703	{
	5704	+ e.printStackTrace();
4322	5705	}
4323	5706	}
	5707	+
4324	5708	String lastname;
4325	5709
4326	5710	void saveAs()
4327	5711	{
4328		- if (GrafreeD.standAlone)
	5712	+ if (Grafreed.standAlone)
4329	5713	{
4330	5714	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4331	5715	browser.setVisible(true);
4332	5716	String filename = browser.getFile();
4333	5717	if (filename != null && filename.length() > 0)
4334	5718	{
	5719	+ if (!filename.endsWith(".gfd"))
	5720	+ filename += ".gfd";
4335	5721	lastname = browser.getDirectory() + filename;
4336	5722	save();
4337	5723	}
..	..	@@ -4430,13 +5816,13 @@
4430	5816	try
4431	5817	{
4432	5818	FileOutputStream ostream = new FileOutputStream(filename);
4433		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4434		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5819	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5820	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4435	5821
4436	5822	Object3D objectparent = obj.parent;
4437	5823	obj.parent = null;
4438	5824
4439		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5825	+ Object3D object = (Object3D) Grafreed.clone(obj);
4440	5826
4441	5827	obj.parent = objectparent;
4442	5828
..	..	@@ -4448,8 +5834,8 @@
4448	5834	p.writeObject(object);
4449	5835	p.flush();
4450	5836
	5837	+ zstream.close();
4451	5838	ostream.close();
4452		- // zstream.close();
4453	5839
4454	5840	// group.selection.get(0).parent = parent;
4455	5841	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4470,7 +5856,7 @@
4470	5856	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4471	5857	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4472	5858	copy.generatePOV(buffer);
4473		- if (GrafreeD.standAlone)
	5859	+ if (Grafreed.standAlone)
4474	5860	{
4475	5861	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4476	5862	browser.show();
..	..	@@ -4496,21 +5882,20 @@
4496	5882	Object3D client;
4497	5883	Object3D copy;
4498	5884	MenuBar menuBar;
4499		- Menu windowMenu;
4500		- MenuItem loadItem;
	5885	+ Menu fileMenu;
	5886	+ MenuItem newItem;
	5887	+ MenuItem openItem;
4501	5888	MenuItem saveItem;
4502	5889	MenuItem saveAsItem;
4503	5890	MenuItem exportAsItem;
4504	5891	MenuItem reexportItem;
4505	5892	MenuItem povItem;
4506	5893	MenuItem closeItem;
4507		- Menu cameraMenu;
	5894	+
4508	5895	CheckboxMenuItem zBufferItem;
4509	5896	//MenuItem normalLensItem;
4510		- MenuItem editCameraItem;
4511		- MenuItem revertCameraItem;
4512		- CheckboxMenuItem toggleLiveItem;
4513	5897	MenuItem stepItem;
	5898	+ CheckboxMenuItem toggleLiveItem;
4514	5899	CheckboxMenuItem toggleFullScreenItem;
4515	5900	CheckboxMenuItem toggleTimelineItem;
4516	5901	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4519,28 +5904,43 @@
4519	5904	CheckboxMenuItem toggleFootContactItem;
4520	5905	CheckboxMenuItem toggleDLItem;
4521	5906	CheckboxMenuItem toggleTextureItem;
4522		- CheckboxMenuItem toggleRandomItem;
	5907	+ CheckboxMenuItem toggleSwitchItem;
4523	5908	CheckboxMenuItem toggleRootItem;
4524	5909	CheckboxMenuItem animationItem;
	5910	+ MenuItem archiveItem;
4525	5911	CheckboxMenuItem toggleHandleItem;
4526	5912	CheckboxMenuItem togglePaintItem;
4527	5913	JSplitPane mainPanel;
4528	5914	JScrollPane scrollpane;
	5915	+
4529	5916	JPanel toolbarPanel;
4530		- JPanel treePanel;
	5917	+
	5918	+ cGridBag treePanel;
	5919	+
4531	5920	JPanel radioPanel;
4532	5921	ButtonGroup buttonGroup;
4533		- JPanel ctrlPanel;
4534		- JPanel materialPanel;
	5922	+
	5923	+ cGridBag toolboxPanel;
	5924	+ cGridBag skyboxPanel;
	5925	+ cGridBag materialPanel;
	5926	+ cGridBag ctrlPanel;
	5927	+
4535	5928	JScrollPane infoPanel;
4536		- JPanel optionsPanel;
	5929	+
	5930	+ cGridBag optionsPanel;
	5931	+
4537	5932	JTabbedPane objectPanel;
4538		- JPanel XYZPanel;
	5933	+ boolean materialFlushed;
	5934	+ Object3D latestObject;
	5935	+
	5936	+ cGridBag XYZPanel;
	5937	+
4539	5938	JSplitPane gridPanel;
4540	5939	JSplitPane bigPanel;
4541		- JPanel bigThree;
4542		- JTabbedPane scenePanel;
4543		- JPanel centralPanel;
	5940	+
	5941	+ cGridBag bigThree;
	5942	+ cGridBag scenePanel;
	5943	+ cGridBag centralPanel;
4544	5944	JSplitPane cameraPanel;
4545	5945	JPanel timelinePanel;
4546	5946	JMenuBar timelineMenubar;
..	..	@@ -4593,67 +5993,74 @@
4593	5993	// MATERIAL
4594	5994	JLabel materialLabel;
4595	5995	JLabel colorLabel;
4596		- NumberSlider colorField;
	5996	+ cNumberSlider colorField;
4597	5997	JLabel modulationLabel;
4598		- NumberSlider modulationField;
	5998	+ cNumberSlider saturationField;
4599	5999	JLabel metalnessLabel;
4600		- NumberSlider metalnessField;
	6000	+ cNumberSlider metalnessField;
4601	6001	JLabel diffuseLabel;
4602		- NumberSlider diffuseField;
	6002	+ cNumberSlider diffuseField;
4603	6003	JLabel specularLabel;
4604		- NumberSlider specularField;
	6004	+ cNumberSlider specularField;
4605	6005	JLabel shininessLabel;
4606		- NumberSlider shininessField;
	6006	+ cNumberSlider shininessField;
4607	6007	JLabel shiftLabel;
4608		- NumberSlider shiftField;
	6008	+ cNumberSlider shiftField;
4609	6009	JLabel ambientLabel;
4610		- NumberSlider ambientField;
	6010	+ cNumberSlider ambientField;
4611	6011	JLabel lightareaLabel;
4612		- NumberSlider lightareaField;
	6012	+ cNumberSlider lightareaField;
4613	6013	JLabel diffusenessLabel;
4614		- NumberSlider diffusenessField;
	6014	+ cNumberSlider diffusenessField;
4615	6015	JLabel velvetLabel;
4616		- NumberSlider velvetField;
	6016	+ cNumberSlider velvetField;
4617	6017	JLabel sheenLabel;
4618		- NumberSlider sheenField;
	6018	+ cNumberSlider sheenField;
4619	6019	JLabel subsurfaceLabel;
4620		- NumberSlider subsurfaceField;
	6020	+ cNumberSlider subsurfaceField;
4621	6021	//JLabel bumpLabel;
4622	6022	//NumberSlider bumpField;
4623	6023	JLabel backlitLabel;
4624		- NumberSlider backlitField;
	6024	+ cNumberSlider backlitField;
4625	6025	JLabel anisoLabel;
4626		- NumberSlider anisoField;
	6026	+ cNumberSlider anisoField;
4627	6027	JLabel anisoVLabel;
4628		- NumberSlider anisoVField;
	6028	+ cNumberSlider anisoVField;
	6029	+
4629	6030	JLabel cameraLabel;
4630		- NumberSlider cameraField;
	6031	+ cNumberSlider cameraField;
4631	6032	JLabel selfshadowLabel;
4632		- NumberSlider selfshadowField;
	6033	+ cNumberSlider selfshadowField;
4633	6034	JLabel shadowLabel;
4634		- NumberSlider shadowField;
	6035	+ cNumberSlider shadowField;
4635	6036	JLabel textureLabel;
4636		- NumberSlider textureField;
	6037	+ cNumberSlider textureField;
4637	6038	JLabel opacityLabel;
4638		- NumberSlider opacityField;
	6039	+ cNumberSlider opacityField;
4639	6040	JLabel fakedepthLabel;
4640		- NumberSlider fakedepthField;
	6041	+ cNumberSlider fakedepthField;
4641	6042	JLabel shadowbiasLabel;
4642		- NumberSlider shadowbiasField;
	6043	+ cNumberSlider shadowbiasField;
	6044	+
4643	6045	JLabel bumpLabel;
4644		- NumberSlider bumpField;
	6046	+ cNumberSlider bumpField;
4645	6047	JLabel noiseLabel;
4646		- NumberSlider noiseField;
	6048	+ cNumberSlider noiseField;
4647	6049	JLabel powerLabel;
4648		- NumberSlider powerField;
	6050	+ cNumberSlider powerField;
4649	6051	JLabel borderfadeLabel;
4650		- NumberSlider borderfadeField;
	6052	+ cNumberSlider borderfadeField;
4651	6053	JLabel fogLabel;
4652		- NumberSlider fogField;
	6054	+ cNumberSlider fogField;
4653	6055	JLabel opacityPowerLabel;
4654		- NumberSlider opacityPowerField;
4655		- JTree jTree;
	6056	+ cNumberSlider opacityPowerField;
	6057	+ cTree jTree;
4656	6058	//ObjectUI parent;
4657	6059
4658		- NumberSlider normalpushField;
	6060	+ cNumberSlider normalpushField;
	6061	+
	6062	+ private MenuItem importGFDItem;
	6063	+ private MenuItem importVRMLX3DItem;
	6064	+ private MenuItem import3DSItem;
	6065	+ private MenuItem importOBJItem;
4659	6066	}