~nbriere/GrafreeD.git - Noware Git Repository

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