~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,87 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ boolean timeline;
	38	+ boolean wasFullScreen;
31	39
	40	+ GroupEditor callee;
	41	+ JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
	117	+
32	118	// SCRIPT
33	119
34	120	transient JFrame textpanel = null;
..	..	@@ -119,51 +205,62 @@
119	205	void keyPressed(int key, int modifiers)
120	206	{
121	207	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	208	+ Globals.theRenderer.keyPressed(key, modifiers);
123	209	}
124	210	*/
125	211
126	212	static GridBagConstraints aConstraints;
127	213	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	214	+
130	215	static int GRIDWIDTH = 100; // 4;
131	216
132	217	public void closeUI()
133	218	{
134	219	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	220	+// System.out.println("this = " + this);
	221	+// System.out.println("objEditor = " + objEditor);
137	222	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	223	+// objEditor.ctrlPanel.remove(nameField);
139	224
140		- if (!GroupEditor.allparams)
	225	+ objEditor.ctrlPanel.remove(namePanel);
	226	+
	227	+ if (!allparams)
141	228	return;
142	229
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);
	230	+// objEditor.ctrlPanel.remove(liveCB);
	231	+// objEditor.ctrlPanel.remove(hideCB);
	232	+// objEditor.ctrlPanel.remove(markCB);
	233	+//
	234	+// objEditor.ctrlPanel.remove(randomCB);
	235	+// objEditor.ctrlPanel.remove(speedupCB);
	236	+// objEditor.ctrlPanel.remove(rewindCB);
	237	+//
	238	+// objEditor.ctrlPanel.remove(resetButton);
	239	+// objEditor.ctrlPanel.remove(stepButton);
	240	+//// objEditor.ctrlPanel.remove(stepAllButton);
	241	+//// objEditor.ctrlPanel.remove(resetAllButton);
	242	+// objEditor.ctrlPanel.remove(link2masterCB);
	243	+// //objEditor.ctrlPanel.remove(flipVCB);
	244	+// //objEditor.ctrlPanel.remove(texresMenu);
	245	+// objEditor.ctrlPanel.remove(slowerButton);
	246	+// objEditor.ctrlPanel.remove(fasterButton);
	247	+// objEditor.ctrlPanel.remove(remarkButton);
	248	+
	249	+ objEditor.ctrlPanel.remove(setupPanel);
	250	+ objEditor.ctrlPanel.remove(setupPanel2);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	252	+ objEditor.ctrlPanel.remove(pushPanel);
	253	+ //objEditor.ctrlPanel.remove(fillPanel);
	254	+
	255	+ //Remove(normalpushField);
161	256	}
162	257
163	258	public ObjEditor GetEditor()
164	259	{
165	260	return objEditor; //.GetEditor();
166	261	}
	262	+
	263	+ // Sometimes myself, sometimes my callee's.
167	264	ObjEditor objEditor;
168	265
169	266	/*
..	..	@@ -199,6 +296,12 @@
199	296	client = inClient;
200	297	copy = client;
201	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new byte[100][];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
202	305	// "this" is not called: SetupUI2(objEditor);
203	306	}
204	307
..	..	@@ -212,6 +315,12 @@
212	315	client = inClient;
213	316	copy = client;
214	317
	318	+ if (copy.versions == null)
	319	+ {
	320	+ copy.versions = new byte[100][];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
215	324	SetupUI2(callee.GetEditor());
216	325	}
217	326
..	..	@@ -226,6 +335,7 @@
226	335	//localCopy.parent = null;
227	336
228	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
229	339	objEditor = this;
230	340	this.callee = callee;
231	341
..	..	@@ -238,11 +348,17 @@
238	348	//if (!isDisplayable())
239	349	//setUndecorated(true);
240	350
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	351	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	352	client = inClient;
243	353	copy = localCopy;
244	354	copy.editWindow = this;
245	355
	356	+ if (copy.versions == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
246	362	SetupMenu();
247	363
248	364	//SetupName(objEditor); // new
..	..	@@ -256,28 +372,49 @@
256	372	return frame.action(event, obj);
257	373	}
258	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
259	380	void SetupMenu()
260	381	{
261	382	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..."));
	383	+ menuBar.add(fileMenu = new Menu("File"));
	384	+ fileMenu.add(newItem = new MenuItem("New"));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
	386	+
	387	+ //oe.menuBar.add(menu = new Menu("Include"));
	388	+ Menu menu = new Menu("Import");
	389	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	390	+ importOBJItem.addActionListener(this);
	391	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	392	+ import3DSItem.addActionListener(this);
	393	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	394	+ importVRMLX3DItem.addActionListener(this);
	395	+ menu.add("-");
	396	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	397	+ importGFDItem.addActionListener(this);
	398	+ fileMenu.add(menu);
	399	+ fileMenu.add("-");
	400	+
	401	+ fileMenu.add(saveItem = new MenuItem("Save"));
	402	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	403	//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("-");
	404	+ fileMenu.add("-");
	405	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	406	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	407	+ fileMenu.add("-");
272	408	if (client.parent != null)
273	409	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	410	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	411	} else
276	412	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	413	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	414	}
279	415
280		- loadItem.addActionListener(this);
	416	+ newItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
281	418	saveItem.addActionListener(this);
282	419	saveAsItem.addActionListener(this);
283	420	exportAsItem.addActionListener(this);
..	..	@@ -285,80 +422,69 @@
285	422	//povItem.addActionListener(this);
286	423	closeItem.addActionListener(this);
287	424
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	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
342	452	toolbarPanel = new JPanel();
343	453	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	454	+
	455	+ treePanel = new cGridBag();
345	456	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
349		- materialPanel.setName("Material");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
	461	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
	470	+ materialPanel = new cGridBag().setVertical(true);
	471	+ //materialPanel.setName("Material");
	472	+
350	473	/JTextPane/
351	474	infoarea = createTextPane();
	475	+ doc = infoarea.getStyledDocument();
	476	+
352	477	infoarea.setEditable(true);
353	478	SetText();
	479	+
354	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	481	// infoarea.setOpaque(false);
356	482	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	483	+// TEXTAREA infoarea.setLineWrap(true);
	484	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	485	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");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
362	488	//infoPanel.setLayout(new BorderLayout());
363	489	//infoPanel.add(createTextPane());
364	490
..	..	@@ -366,16 +492,23 @@
366	492	mainPanel.setName("Main");
367	493	mainPanel.setContinuousLayout(true);
368	494	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	495	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
372		-
	496	+ mainPanel.setDividerLocation(0.5); //1.0);
	497	+ mainPanel.setResizeWeight(0.5);
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
373	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	507	//mainPanel.setLayout(new GridBagLayout());
375	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	509	+// treePanel.setLayout(new GridBagLayout());
	510	+ //ctrlPanel.setLayout(new GridBagLayout());
	511	+ //materialPanel.setLayout(new GridBagLayout());
379	512
380	513	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	514	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +547,7 @@
414	547	static String newline = "\n";
415	548	protected static final String buttonString = "JButton";
416	549	StyledDocument doc;
417		- JTextArea infoarea;
	550	+ JTextPane infoarea;
418	551
419	552	void ClearInfo()
420	553	{
..	..	@@ -437,10 +570,10 @@
437	570	e.printStackTrace();
438	571	}
439	572
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();
	573	+// String selection = infoarea.getText();
	574	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	575	+// java.awt.datatransfer.Clipboard clipboard =
	576	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	577	//clipboard.setContents(data, data);
445	578	}
446	579
..	..	@@ -463,13 +596,13 @@
463	596	//SendInfo("Name:", "bold");
464	597	if (sel.GetTextures() != null \|\| debug)
465	598	{
466		- si.SendInfo(sel.toString(), "bold");
	599	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	600	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	601	if (sel.Size() > 0)
469	602	{
470	603	si.SendInfo("#children = " + sel.Size(), "regular");
471	604	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	605	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	606	if (debug)
474	607	{
475	608	try
..	..	@@ -481,7 +614,10 @@
481	614	}
482	615
483	616	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	617	+ {
	618	+ si.SendInfo(" BBox min: " + minima, "regular");
	619	+ si.SendInfo(" BBox max: " + maxima, "regular");
	620	+ }
485	621
486	622	if (sel.bRep != null)
487	623	{
..	..	@@ -508,7 +644,7 @@
508	644	}
509	645	if (sel.support != null)
510	646	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	647	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	648	}
513	649	if (sel.scriptnode != null)
514	650	{
..	..	@@ -579,6 +715,9 @@
579	715	{
580	716	CameraPane.pointflow = (PointFlow) sel;
581	717	}
	718	+
	719	+ si.SendInfo("_____________________", "regular");
	720	+ si.SendInfo("", "regular");
582	721	}
583	722	}
584	723
..	..	@@ -594,52 +733,191 @@
594	733	}
595	734	}
596	735
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		- };
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	738
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	739	+ Rectangle keeprect;
	740	+ cRadio radio;
	741	+
	742	+cButton keepButton;
	743	+ cButton twoButton; // Full 3D
	744	+ cButton sixButton;
	745	+ cButton threeButton;
	746	+ cButton sevenButton;
	747	+ cButton fourButton; // full panel
	748	+ cButton oneButton; // full XYZ
	749	+ //cButton currentLayout;
	750	+
	751	+ boolean maximized;
	752	+
	753	+ cButton fullscreenLayout;
621	754
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	755	+ void Minimize()
628	756	{
629		- for (int j = 0; j < 2; j++)
	757	+ frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
	759	+ }
	760	+
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	764	+ void Maximize()
	765	+ {
	766	+ if (CameraPane.FULLSCREEN)
630	767	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	768	+ ToggleFullScreen();
636	769	}
637		- } catch (BadLocationException ble)
	770	+
	771	+ if (maximized)
	772	+ {
	773	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	774	+ }
	775	+ else
	776	+ {
	777	+ keeprect = frame.getBounds();
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	781	+// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	783	+ }
	784	+
	785	+ maximized ^= true;
	786	+
	787	+ frame.validate();
	788	+ }
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
	793	+
	794	+ void ToggleFullScreen()
638	795	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
	801	+ {
	802	+ device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
	808	+ //frame.setVisible(false);
	809	+// frame.removeNotify();
	810	+// frame.setUndecorated(false);
	811	+// frame.addNotify();
	812	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	813	+
	814	+// X frame.getContentPane().remove(/"Center",/bigThree);
	815	+// X framePanel.add(bigThree);
	816	+// X frame.getContentPane().add(/"Center",/framePanel);
	817	+ framePanel.setDividerLocation(46);
	818	+
	819	+ //frame.setVisible(true);
	820	+ radio.layout = keepButton;
	821	+ //theFrame = null;
	822	+ keepButton = null;
	823	+ radio.layout.doClick();
	824	+
	825	+ } else
	826	+ {
	827	+ keepButton = radio.layout;
	828	+ //keeprect = frame.getBounds();
	829	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	830	+// frame.getToolkit().getScreenSize().height);
	831	+ //frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
	835	+ device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
	838	+// frame.removeNotify();
	839	+// frame.setUndecorated(true);
	840	+// frame.addNotify();
	841	+// X frame.getContentPane().remove(/"Center",/framePanel);
	842	+// X framePanel.remove(bigThree);
	843	+// X frame.getContentPane().add(/"Center",/bigThree);
	844	+ framePanel.setDividerLocation(0);
	845	+
	846	+ radio.layout = fullscreenLayout;
	847	+ radio.layout.doClick();
	848	+ //frame.setVisible(true);
	849	+ }
	850	+ frame.validate();
640	851	}
641	852
642		- return new JTextArea(); // textPane;
	853	+ private byte[] CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ byte[] versions[] = copy.versions;
	862	+ copy.versions = null;
	863	+
	864	+ byte[] compress = Compress(copy);
	865	+
	866	+ copy.versions = versions;
	867	+
	868	+ copy.RestoreBigData(versiontable);
	869	+
	870	+ CameraPane.SWITCH = temp;
	871	+
	872	+ return compress;
	873	+ }
	874	+
	875	+ private JTextPane createTextPane()
	876	+ {
	877	+// TEXTAREA String[] initString =
	878	+// {
	879	+// "This is an editable JTextPane, ", //regular
	880	+// "another ", //italic
	881	+// "styled ", //bold
	882	+// "text ", //small
	883	+// "component, ", //large
	884	+// "which supports embedded components..." + newline,//regular
	885	+// " " + newline, //button
	886	+// "...and embedded icons..." + newline, //regular
	887	+// " ", //icon
	888	+// newline + "JTextPane is a subclass of JEditorPane that "
	889	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	890	+// + "cover methods for interacting with those objects."
	891	+// };
	892	+//
	893	+// String[] initStyles =
	894	+// {
	895	+// "regular", "italic", "bold", "small", "large",
	896	+// "regular", "button", "regular", "icon",
	897	+// "regular"
	898	+// };
	899	+//
	900	+// JTextPane textPane = new JTextPane();
	901	+// textPane.setEditable(true);
	902	+// /StyledDocument/ doc = textPane.getStyledDocument();
	903	+// addStylesToDocument(doc);
	904	+//
	905	+// try
	906	+// {
	907	+// for (int j = 0; j < 2; j++)
	908	+// {
	909	+// for (int i = 0; i < initString.length; i++)
	910	+// {
	911	+// doc.insertString(doc.getLength(), initString[i],
	912	+// doc.getStyle(initStyles[i]));
	913	+// }
	914	+// }
	915	+// } catch (BadLocationException ble)
	916	+// {
	917	+// System.err.println("Couldn't insert initial text into text pane.");
	918	+// }
	919	+
	920	+ return new JTextPane(); // textPane;
643	921	}
644	922
645	923	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +970,7 @@
692	970	protected static ImageIcon createImageIcon(String path,
693	971	String description)
694	972	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	973	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	974	if (imgURL != null)
697	975	{
698	976	return new ImageIcon(imgURL, description);
..	..	@@ -724,6 +1002,7 @@
724	1002	// NumberSlider vDivsField;
725	1003	// JCheckBox endcaps;
726	1004	JCheckBox liveCB;
	1005	+ JCheckBox selectableCB;
727	1006	JCheckBox hideCB;
728	1007	JCheckBox link2masterCB;
729	1008	JCheckBox markCB;
..	..	@@ -731,7 +1010,12 @@
731	1010	JCheckBox speedupCB;
732	1011	JCheckBox rewindCB;
733	1012	JCheckBox flipVCB;
	1013	+
	1014	+ cCheckBox toggleTextureCB;
	1015	+ cCheckBox toggleSwitchCB;
	1016	+
734	1017	JComboBox texresMenu;
	1018	+
735	1019	JButton resetButton;
736	1020	JButton stepButton;
737	1021	JButton stepAllButton;
..	..	@@ -739,115 +1023,87 @@
739	1023	JButton slowerButton;
740	1024	JButton fasterButton;
741	1025	JButton remarkButton;
	1026	+
	1027	+ cGridBag editPanel;
	1028	+ cGridBag editCommandsPanel;
	1029	+
	1030	+ cGridBag namePanel;
	1031	+ cGridBag setupPanel;
	1032	+ cGridBag setupPanel2;
	1033	+ cGridBag objectCommandsPanel;
	1034	+ cGridBag pushPanel;
	1035	+ cGridBag fillPanel;
742	1036
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1037	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	1038	{
745	1039	JCheckBox cb;
746	1040
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);
	1041	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	1042	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	1043
757	1044	return cb;
758	1045	}
759	1046
760		- cButton AddButton(ObjEditor oe, String label)
	1047	+ cButton AddButton(cGridBag panel, String label)
761	1048	{
762	1049	cButton cb;
763	1050
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);
	1051	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	1052	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	1053
774	1054	return cb;
775	1055	}
776	1056
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1057	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	1058	{
779	1059	JComboBox combo;
780	1060
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;
	1061	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	1062	combo.addActionListener(this);
785	1063
786	1064	return combo;
787	1065	}
788	1066
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1067	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	1068	{
791		- NumberSlider combo;
	1069	+ cGridBag control = new cGridBag();
	1070	+
	1071	+ cNumberSlider combo;
792	1072
793	1073	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	1074	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		-
	1075	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1076	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	1077	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	1078	+
	1079	+ panel.add(control);
	1080	+
	1081	+ return control;
813	1082	}
814	1083
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1084	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	1085	{
817		- NumberSlider combo;
	1086	+ cGridBag control = new cGridBag();
	1087	+
	1088	+ cNumberSlider combo;
818	1089
819	1090	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1091	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		-
	1092	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1093	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1094	combo.setInteger(current);
833	1095
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1096	+ panel.add(control);
	1097	+
	1098	+ return control;
839	1099	}
840	1100
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1101	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1102	{
843	1103	JTextArea text;
844	1104
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1105	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1106	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1107
852	1108	return text;
853	1109	}
..	..	@@ -877,9 +1133,16 @@
877	1133	objEditor.ctrlPanel.remove(j);
878	1134	}
879	1135
	1136	+ void Remove(cNumberSlider j)
	1137	+ {
	1138	+ j.removeChangeListener(this);
	1139	+ //objEditor.ctrlPanel.remove(j.label);
	1140	+ objEditor.ctrlPanel.remove(j);
	1141	+ }
	1142	+
880	1143	/*
881	1144	*/
882		- void Return() // ObjEditor oe)
	1145	+ void Return0() // ObjEditor oe)
883	1146	{
884	1147	aConstraints.gridy += 1;
885	1148	aConstraints.gridx = 0;
..	..	@@ -934,35 +1197,81 @@
934	1197
935	1198	void SetupUI2(ObjEditor oe)
936	1199	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1200	+ //SetupName(oe);
942	1201
943		- if (!GroupEditor.allparams)
	1202	+ namePanel = new cGridBag();
	1203	+
	1204	+ nameField = AddText(namePanel, copy.GetName());
	1205	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1206	+ oe.ctrlPanel.add(namePanel);
	1207	+
	1208	+ oe.ctrlPanel.Return();
	1209	+
	1210	+ if (!allparams)
944	1211	return;
945	1212
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1213	+ setupPanel = new cGridBag().setVertical(false);
	1214	+
	1215	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1216	+ liveCB.setToolTipText("Animate object");
	1217	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1218	+ selectableCB.setToolTipText("Make object selectable");
949	1219	// 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");
	1220	+
	1221	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1222	+ hideCB.setToolTipText("Hide object");
	1223	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1224	+ markCB.setToolTipText("As animation target transform");
	1225	+
	1226	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1227	+
	1228	+ setupPanel2 = new cGridBag().setVertical(false);
	1229	+
	1230	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1231	+ rewindCB.setToolTipText("Rewind animation");
	1232	+
	1233	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1234	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1235	+
	1236	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1237	+ link2masterCB.setToolTipText("Attach to support");
	1238	+
	1239	+ if (Globals.ADVANCED)
	1240	+ {
	1241	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1242	+ speedupCB.setToolTipText("Option motion capture");
	1243	+ }
	1244	+
	1245	+ oe.ctrlPanel.add(setupPanel);
	1246	+ oe.ctrlPanel.Return();
	1247	+ oe.ctrlPanel.add(setupPanel2);
	1248	+ oe.ctrlPanel.Return();
	1249	+
	1250	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1251	+
	1252	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1253	+ resetButton.setToolTipText("Jump to frame zero");
	1254	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1255	+ stepButton.setToolTipText("Step one frame");
956	1256	// resetAllButton = AddButton(oe, "Reset All");
957	1257	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1258	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1259	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1260	+ slowerButton.setToolTipText("Decrease animation speed");
	1261	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1262	+ fasterButton.setToolTipText("Increase animation speed");
	1263	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1264	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1265
964		- Return();
	1266	+ oe.ctrlPanel.add(objectCommandsPanel);
	1267	+ oe.ctrlPanel.Return();
965	1268
	1269	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1270	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1271	+ //Return();
	1272	+
	1273	+ oe.ctrlPanel.Return();
	1274	+
966	1275	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1276	// ObjEditor.aConstraints.gridx += 1;
968	1277
..	..	@@ -1056,7 +1365,7 @@
1056	1365	oe.aConstraints.gridwidth = 1;
1057	1366	/**/
1058	1367	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1368	+ oe.ctrlPanel.Return();
1060	1369
1061	1370	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1371	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1467,28 @@
1158	1467	//JPanel worldPanel =
1159	1468	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1469	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1470	+ centralPanel = new cGridBag();
	1471	+ centralPanel.preferredWidth = 20;
	1472	+
	1473	+ if (Globals.ADVANCED)
	1474	+ {
	1475	+ timelinePanel = new JPanel(new BorderLayout());
	1476	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1477
	1478	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1479	+ cameraPanel.setContinuousLayout(true);
	1480	+ cameraPanel.setOneTouchExpandable(true);
	1481	+// cameraPanel.setDividerLocation(0.9);
	1482	+// cameraPanel.setDividerSize(9);
	1483	+ cameraPanel.setResizeWeight(1.0);
	1484	+
	1485	+ }
	1486	+
	1487	+ centralPanel.add(cameraView);
	1488	+ centralPanel.setFocusable(true);
	1489	+ //frame.setJMenuBar(timelineMenubar);
	1490	+ //centralPanel.add(timelinePanel);
	1491	+
1165	1492	//topView.camera = ;
1166	1493	//frontView.camera = new Camera(2);
1167	1494	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1504,14 @@
1177	1504	//frontView.object = copy;
1178	1505	//sideView.object = copy;
1179	1506
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1507	+ XYZPanel = new cGridBag().setVertical(true);
	1508	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1509
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1510	+ XYZPanel.preferredWidth = 5;
	1511	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1512	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1513	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1514	+ //XYZPanel.setName("XYZ");
1186	1515
1187	1516	/*
1188	1517	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1520,7 @@
1191	1520	gridPanel.add(cameraView);
1192	1521	gridPanel.add(XYZPanel);
1193	1522	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1523	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1524	gridPanel.setContinuousLayout(true);
1196	1525	gridPanel.setOneTouchExpandable(true);
1197	1526	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,11 +1549,29 @@
1220	1549	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1550	//tmp.setName("Edit");
1222	1551	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);
	1552	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1553	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1554	+
	1555	+// JPanel north = new JPanel(new BorderLayout());
	1556	+// north.setName("Edit");
	1557	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1558	+// objectPanel.add(north);
	1559	+ objectPanel.add(editPanel);
	1560	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1561	+ objectPanel.setToolTipTextAt(1, "Edit panel");
	1562	+
	1563	+ //if (Globals.ADVANCED)
	1564	+ objectPanel.add(infoPanel);
	1565	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1566	+ objectPanel.setToolTipTextAt(2, "Info panel");
	1567	+
	1568	+ objectPanel.add(XYZPanel);
	1569	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1570	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1571	+
	1572	+ objectPanel.add(toolboxPanel);
	1573	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1574	+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1228	1575
1229	1576	/*
1230	1577	aConstraints.gridx = 0;
..	..	@@ -1233,7 +1580,7 @@
1233	1580	aConstraints.gridy += 1;
1234	1581	aConstraints.gridwidth = 1;
1235	1582	mainPanel.add(objectPanel, aConstraints);
1236		- */
	1583	+ */
1237	1584
1238	1585	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1239	1586	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1244,16 +1591,23 @@
1244	1591	scrollpane.setWheelScrollingEnabled(true);
1245	1592	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1593
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1594	+ /JTabbedPane/ scenePanel = new cGridBag();
	1595	+ scenePanel.preferredWidth = 5;
	1596	+
	1597	+ JTabbedPane tabbedPane = new JTabbedPane();
	1598	+ tabbedPane.add(scrollpane);
1249	1599
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1600	+ optionsPanel = new cGridBag().setVertical(false);
1253	1601
1254	1602	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1603	+
	1604	+ AddOptions(optionsPanel); //, aConstraints);
	1605	+
	1606	+ tabbedPane.add(optionsPanel);
	1607	+
	1608	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1609
	1610	+ scenePanel.add(tabbedPane);
1257	1611
1258	1612	/*
1259	1613	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1629,7 @@
1275	1629	jtp.add(tree);
1276	1630	*/
1277	1631
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1632	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1633	bigPanel.setContinuousLayout(true);
1280	1634	bigPanel.setOneTouchExpandable(true);
1281	1635	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1641,7 @@
1287	1641	//bigPanel.setSize(new Dimension(10,10));
1288	1642	//bigPanel.add(ctrlPanel);
1289	1643	//bigPanel.add(gridPanel);
	1644	+ /**
1290	1645	bigThree = new JPanel();
1291	1646	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1647	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1652,26 @@
1297	1652	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1653	aWindowConstraints.weightx = 0;
1299	1654	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1655	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1656	aWindowConstraints.weightx = 1;
1302	1657	aWindowConstraints.gridwidth = 3;
1303	1658	// aConstraints.gridheight = 3;
1304	1659	aWindowConstraints.gridx = 1;
1305	1660	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1661	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1662	aWindowConstraints.weightx = 0;
1308	1663	aWindowConstraints.gridx = 4;
1309	1664	aWindowConstraints.gridwidth = 1;
1310	1665	// aConstraints.gridheight = 3;
1311	1666	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1667	bigThree.add(XYZPanel, aWindowConstraints);
	1668	+ /**/
1313	1669
	1670	+ bigThree = new cGridBag();
	1671	+ bigThree.addComponent(scenePanel);
	1672	+ bigThree.addComponent(centralPanel);
	1673	+ //bigThree.addComponent(XYZPanel);
	1674	+
1314	1675	// // SIDE EFFECT!!!
1315	1676	// aConstraints.gridx = 0;
1316	1677	// aConstraints.gridy = 0;
..	..	@@ -1318,9 +1679,9 @@
1318	1679	// aConstraints.gridheight = 1;
1319	1680
1320	1681	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1321		- framePanel.setContinuousLayout(true);
1322		- framePanel.setOneTouchExpandable(true);
1323		- framePanel.setDividerLocation(0.8);
	1682	+ framePanel.setContinuousLayout(false);
	1683	+ framePanel.setOneTouchExpandable(false);
	1684	+ //.setDividerLocation(0.8);
1324	1685	//framePanel.setDividerSize(15);
1325	1686	//framePanel.setResizeWeight(0.15);
1326	1687	framePanel.setName("Frame");
..	..	@@ -1331,20 +1692,25 @@
1331	1692	//worldPane.add(bigPanel);
1332	1693	//worldPane.add(worldPanel);
1333	1694	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1695	+ //frame.getContentPane().add(/"Center",/framePanel);
	1696	+ frame.add(/"Center",/framePanel);
1335	1697	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1698
1337	1699	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1700
1339		- frame.setSize(1024, 768);
1340		- frame.show();
1341		-
	1701	+ frame.setSize(1280, 860);
	1702	+
	1703	+ cameraView.requestFocusInWindow();
	1704	+
1342	1705	gridPanel.setDividerLocation(1.0);
	1706	+
	1707	+ frame.validate();
	1708	+
	1709	+ frame.setVisible(true);
1343	1710
1344	1711	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1345	1712	frame.addWindowListener(new WindowAdapter()
1346	1713	{
1347		-
1348	1714	public void windowClosing(WindowEvent e)
1349	1715	{
1350	1716	Close();
..	..	@@ -1352,6 +1718,10 @@
1352	1718	});
1353	1719	}
1354	1720
	1721	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1722	+ {
	1723	+ }
	1724	+
1355	1725	JTree GetTree()
1356	1726	{
1357	1727	return objEditor.jTree;
..	..	@@ -1363,260 +1733,182 @@
1363	1733	ctrlPanel.removeAll();
1364	1734	}
1365	1735
1366		- void SetupMaterial(JPanel ctrlPanel)
	1736	+ void SetupMaterial(cGridBag panel)
1367	1737	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1738	+ /*
1371	1739	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1740	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1741	*/
1376	1742
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	1743	+ cGridBag editBar = new cGridBag().setVertical(false);
	1744	+
	1745	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1746	+ createMaterialButton.setToolTipText("Create material");
1382	1747
1383	1748	/*
1384	1749	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1750	*/
1389	1751
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	1752	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1753	+ clearMaterialButton.setToolTipText("Clear material");
	1754	+
	1755	+ if (Globals.ADVANCED)
	1756	+ {
	1757	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1758	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1759	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1760	+ }
1392	1761
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;
	1762	+ editBar.preferredHeight = 15;
	1763	+
	1764	+ panel.add(editBar);
	1765	+
1407	1766	/**/
1408	1767	//aConstraints.weighty = 0;
1409	1768	////aConstraints.weightx = 1;
1410	1769	//aConstraints.weighty = 1;
1411	1770	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1771	//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;
	1772	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1773
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;
	1774	+ cGridBag colorSection = new cGridBag().setVertical(true);
1429	1775
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;
	1776	+ cGridBag huepanel = new cGridBag();
	1777	+ cGridBag huelabel = new cGridBag();
	1778	+ huelabel.add(GetLabel("icons/hue.png", false));
	1779	+ huelabel.preferredWidth = 20;
	1780	+ huepanel.add(new cGridBag()); // Label
	1781	+ huepanel.add(huelabel); // Field/slider
	1782	+
	1783	+ huepanel.preferredHeight = 7;
1439	1784
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;
	1785	+ colorSection.add(huepanel);
	1786	+
	1787	+ cGridBag color = new cGridBag();
	1788	+
	1789	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1790	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1791	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1449	1792
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;
	1793	+ //colorField.preferredWidth = 200;
	1794	+ colorSection.add(color);
1459	1795
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;
	1796	+ cGridBag modulation = new cGridBag();
	1797	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1798	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1799	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1800	+ colorSection.add(modulation);
1469	1801
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;
	1802	+ cGridBag opacity = new cGridBag();
	1803	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1804	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1805	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1806	+ colorSection.add(opacity);
1479	1807
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;
	1808	+ colorSection.add(GetSeparator());
	1809	+
	1810	+ cGridBag texture = new cGridBag();
	1811	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1812	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1813	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1814	+ colorSection.add(texture);
1488	1815
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;
	1816	+ panel.add(GetSeparator());
	1817	+
	1818	+ panel.add(colorSection);
	1819	+
	1820	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1821	+
	1822	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1823	+
	1824	+ cGridBag diffuse = new cGridBag();
	1825	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1826	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1827	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1828	+ diffuseSection.add(diffuse);
1498	1829
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;
	1830	+ cGridBag diffuseness = new cGridBag();
	1831	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1832	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1833	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1834	+ diffuseSection.add(diffuseness);
1508	1835
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;
	1836	+ cGridBag selfshadow = new cGridBag();
	1837	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1838	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1839	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1840	+ diffuseSection.add(selfshadow);
1518	1841
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;
	1842	+ cGridBag sheen = new cGridBag();
	1843	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1844	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1845	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1846	+ diffuseSection.add(sheen);
1528	1847
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;
	1848	+ cGridBag subsurface = new cGridBag();
	1849	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1850	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1851	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1852	+ diffuseSection.add(subsurface);
1538	1853
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;
	1854	+ cGridBag shadow = new cGridBag();
	1855	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1856	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1857	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1858	+ diffuseSection.add(shadow);
1548	1859
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;
	1860	+ cGridBag fakedepth = new cGridBag();
	1861	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1862	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1863	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1864	+ diffuseSection.add(fakedepth);
1558	1865
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;
	1866	+ cGridBag shadowbias = new cGridBag();
	1867	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1868	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1869	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1870	+ diffuseSection.add(shadowbias);
1567	1871
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;
	1872	+ panel.add(GetSeparator());
	1873	+
	1874	+ panel.add(diffuseSection);
	1875	+
	1876	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1877	+
	1878	+ cGridBag specularSection = new cGridBag().setVertical(true);
1577	1879
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;
	1880	+ cGridBag specular = new cGridBag();
	1881	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1882	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1883	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1884	+ specularSection.add(specular);
1587	1885
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;
	1886	+ cGridBag lightarea = new cGridBag();
	1887	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1888	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1889	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1890	+ specularSection.add(lightarea);
1597	1891
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;
	1892	+ cGridBag shininess = new cGridBag();
	1893	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1894	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1895	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1896	+ specularSection.add(shininess);
1607	1897
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;
	1898	+ cGridBag metalness = new cGridBag();
	1899	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1900	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1901	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1902	+ specularSection.add(metalness);
1617	1903
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	1904	+ cGridBag velvet = new cGridBag();
	1905	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1906	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1907	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1908	+ specularSection.add(velvet);
	1909	+
	1910	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1911	+ //Return();
1620	1912	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1913	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1914	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1919,99 @@
1627	1919	// aConstraints.gridy += 1;
1628	1920	// aConstraints.gridwidth = 1;
1629	1921
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;
	1922	+ cGridBag anisoU = new cGridBag();
	1923	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1924	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1925	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1926	+ specularSection.add(anisoU);
1638	1927
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;
	1928	+ cGridBag anisoV = new cGridBag();
	1929	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1930	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1931	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1932	+ specularSection.add(anisoV);
1648	1933
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	1934
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;
	1935	+ panel.add(GetSeparator());
	1936	+
	1937	+ panel.add(specularSection);
	1938	+
	1939	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1940	+
	1941	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1668	1942
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;
	1943	+ cGridBag camera = new cGridBag();
	1944	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1945	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1946	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1947	+ colorSection.add(camera);
1679	1948
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;
	1949	+ cGridBag ambient = new cGridBag();
	1950	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1951	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1952	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1953	+ colorSection.add(ambient);
1689	1954
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;
	1955	+ cGridBag backlit = new cGridBag();
	1956	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1957	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1958	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1959	+ colorSection.add(backlit);
1699	1960
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;
	1961	+ //panel.add(new JSeparator());
	1962	+
	1963	+ //panel.add(globalSection);
	1964	+
	1965	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1966	+
	1967	+ cGridBag textureSection = new cGridBag().setVertical(true);
1709	1968
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;
	1969	+ cGridBag bump = new cGridBag();
	1970	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1971	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1972	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1973	+ textureSection.add(bump);
1719	1974
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;
	1975	+ cGridBag noise = new cGridBag();
	1976	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1977	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1978	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1979	+ textureSection.add(noise);
1729	1980
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;
	1981	+ cGridBag power = new cGridBag();
	1982	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1983	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1984	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1985	+ textureSection.add(power);
1739	1986
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	1987	+ cGridBag borderfade = new cGridBag();
	1988	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1989	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1990	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1991	+ textureSection.add(borderfade);
1745	1992
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	1993	+ cGridBag fog = new cGridBag();
	1994	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1995	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1996	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1997	+ textureSection.add(fog);
	1998	+
	1999	+ cGridBag opacityPower = new cGridBag();
	2000	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2001	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2002	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2003	+ textureSection.add(opacityPower);
	2004	+
	2005	+ panel.add(GetSeparator());
	2006	+
	2007	+ panel.add(textureSection);
	2008	+
	2009	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	2010
1750	2011	SetMaterial(copy); // .GetMaterial());
1751	2012
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	2013	+ //colorField.addChangeListener(this);
	2014	+// modulationField.addChangeListener(this);
1754	2015	metalnessField.addChangeListener(this);
1755	2016	diffuseField.addChangeListener(this);
1756	2017	specularField.addChangeListener(this);
..	..	@@ -1780,12 +2041,15 @@
1780	2041	opacityPowerField.addChangeListener(this);
1781	2042	/**/
1782	2043
1783		- resetSlidersButton.addActionListener(this);
1784	2044	clearMaterialButton.addActionListener(this);
1785	2045	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	2046	+
	2047	+ if (Globals.ADVANCED)
	2048	+ {
	2049	+ resetSlidersButton.addActionListener(this);
	2050	+ propagateToggle.addItemListener(this);
	2051	+ multiplyToggle.addItemListener(this);
	2052	+ }
1789	2053	}
1790	2054
1791	2055	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1803,8 +2067,9 @@
1803	2067	// 3D models
1804	2068	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1805	2069	{
1806		- lastConverter = new com.jmex.model.converters.MaxToJme();
1807		- LoadFile(filename, lastConverter);
	2070	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2071	+ //LoadFile(filename, lastConverter);
	2072	+ LoadObjFile(filename); // New 3ds loader
1808	2073	continue;
1809	2074	}
1810	2075	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1956,7 +2221,7 @@
1956	2221
1957	2222	//? flashIt = false;
1958	2223	CameraPane pane = (CameraPane) cameraView;
1959		- pane.clickStart(location.x, location.y, 0);
	2224	+ pane.clickStart(location.x, location.y, 0, 0);
1960	2225	pane.clickEnd(location.x, location.y, 0, true);
1961	2226
1962	2227	if (group.selection.size() == 1)
..	..	@@ -2005,6 +2270,7 @@
2005	2270	e2.printStackTrace();
2006	2271	}
2007	2272	}
	2273	+
2008	2274	LoadJMEThread loadThread;
2009	2275
2010	2276	class LoadJMEThread extends Thread
..	..	@@ -2062,6 +2328,7 @@
2062	2328	//LoadFile0(filename, converter);
2063	2329	}
2064	2330	}
	2331	+
2065	2332	LoadOBJThread loadObjThread;
2066	2333
2067	2334	class LoadOBJThread extends Thread
..	..	@@ -2140,19 +2407,19 @@
2140	2407
2141	2408	void LoadObjFile(String fullname)
2142	2409	{
2143		- /*
	2410	+ System.out.println("Loading " + fullname);
	2411	+ /**/
2144	2412	//lastFilename = fullname;
2145	2413	if(loadObjThread == null)
2146	2414	{
2147		- loadObjThread = new LoadOBJThread();
2148		- loadObjThread.start();
	2415	+ loadObjThread = new LoadOBJThread();
	2416	+ loadObjThread.start();
2149	2417	}
2150	2418
2151	2419	loadObjThread.add(fullname);
2152		- */
	2420	+ /**/
2153	2421
2154		- System.out.println("Loading " + fullname);
2155		- makeSomething(new FileObject(fullname, true), true);
	2422	+ //makeSomething(new FileObject(fullname, true), true);
2156	2423	}
2157	2424
2158	2425	void LoadGFDFile(String fullname)
..	..	@@ -2194,6 +2461,8 @@
2194	2461	{
2195	2462	Mocap sel = (Mocap) copy.selection.get(0);
2196	2463
	2464	+ sel.SetCurrentBones(sel.frame);
	2465	+
2197	2466	sel.fullname = fullname;
2198	2467
2199	2468	if (changename)
..	..	@@ -2245,6 +2514,8 @@
2245	2514	{
2246	2515	Mocap sel = (Mocap) select;
2247	2516
	2517	+ sel.SetCurrentBones(sel.frame);
	2518	+
2248	2519	File file = new File(fullname);
2249	2520
2250	2521	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2409,11 +2680,11 @@
2409	2680
2410	2681	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2411	2682	{
2412		- if (GrafreeD.standAlone)
	2683	+ if (Grafreed.standAlone)
2413	2684	{
2414	2685	/**/
2415	2686	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2416		- browser.show();
	2687	+ browser.setVisible(true);
2417	2688	String filename = browser.getFile();
2418	2689	if (filename != null && filename.length() > 0)
2419	2690	{
..	..	@@ -2524,6 +2795,7 @@
2524	2795	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2525	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2526	2797	}
	2798	+
2527	2799	//cJME.count++;
2528	2800	//cJME.count %= 12;
2529	2801	if (gc)
..	..	@@ -2558,6 +2830,7 @@
2558	2830	}
2559	2831	if (input == null)
2560	2832	{
	2833	+ new Exception().printStackTrace();
2561	2834	System.exit(0);
2562	2835	}
2563	2836
..	..	@@ -2706,6 +2979,7 @@
2706	2979	}
2707	2980	}
2708	2981	}
	2982	+
2709	2983	cFileSystemPane FSPane;
2710	2984
2711	2985	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2759,11 +3033,14 @@
2759	3033	}
2760	3034	}
2761	3035	}
	3036	+
2762	3037	freezematerial = false;
2763	3038	}
2764	3039
2765	3040	void SetMaterial(Object3D object)
2766	3041	{
	3042	+ latestObject = object;
	3043	+
2767	3044	cMaterial mat = object.material;
2768	3045
2769	3046	if (mat == null)
..	..	@@ -2772,7 +3049,8 @@
2772	3049	return;
2773	3050	}
2774	3051
2775		- multiplyToggle.setSelected(mat.multiply);
	3052	+ if (multiplyToggle != null)
	3053	+ multiplyToggle.setSelected(mat.multiply);
2776	3054
2777	3055	assert (object.projectedVertices != null);
2778	3056
..	..	@@ -2874,12 +3152,17 @@
2874	3152	// }
2875	3153
2876	3154	/**/
2877		- if (deselect)
	3155	+ if (deselect \|\| child == null)
2878	3156	{
2879	3157	//group.deselectAll();
2880	3158	//freeze = true;
2881	3159	GetTree().clearSelection();
2882	3160	//freeze = false;
	3161	+
	3162	+ if (child == null)
	3163	+ {
	3164	+ return;
	3165	+ }
2883	3166	}
2884	3167
2885	3168	//group.addSelectee(child);
..	..	@@ -2948,31 +3231,48 @@
2948	3231	cameraView.ToggleDL();
2949	3232	cameraView.repaint();
2950	3233	return;
2951		- } else if (event.getSource() == toggleTextureItem)
	3234	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2952	3235	{
2953	3236	cameraView.ToggleTexture();
2954	3237	// june 2013 copy.HardTouch();
2955	3238	cameraView.repaint();
2956	3239	return;
2957		- } else if (event.getSource() == toggleFullItem)
	3240	+ } else if (event.getSource() == toggleTimelineItem)
2958	3241	{
2959		- if (CameraPane.FULLSCREEN)
	3242	+ timeline ^= true;
	3243	+
	3244	+ if (timeline)
2960	3245	{
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);
	3246	+ centralPanel.remove(cameraView);
	3247	+ cameraPanel.add(cameraView);
	3248	+ centralPanel.add(cameraPanel);
	3249	+ frame.setJMenuBar(timelineMenubar);
	3250	+ wasFullScreen = CameraPane.FULLSCREEN;
	3251	+ if (!CameraPane.FULLSCREEN)
	3252	+ ToggleFullScreen();
	3253	+ toggleFullScreenItem.setEnabled(false);
2968	3254	}
	3255	+ else
	3256	+ {
	3257	+ centralPanel.remove(cameraPanel);
	3258	+ centralPanel.add(cameraView);
	3259	+ frame.setJMenuBar(null);
	3260	+ if (!wasFullScreen)
	3261	+ ToggleFullScreen();
	3262	+ toggleFullScreenItem.setEnabled(true);
	3263	+ }
	3264	+
2969	3265	frame.validate();
2970		- cameraView.ToggleFullScreen();
	3266	+ return;
	3267	+ } else if (event.getSource() == toggleFullScreenItem)
	3268	+ {
	3269	+ ToggleFullScreen();
	3270	+ frame.validate();
2971	3271
2972	3272	return;
2973		- } else if (event.getSource() == toggleRandomItem)
	3273	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2974	3274	{
2975		- cameraView.ToggleRandom();
	3275	+ cameraView.ToggleSwitch();
2976	3276	cameraView.repaint();
2977	3277	return;
2978	3278	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3001,6 +3301,10 @@
3001	3301	{
3002	3302	copy.live ^= true;
3003	3303	return;
	3304	+ } else if (event.getSource() == selectableCB)
	3305	+ {
	3306	+ copy.dontselect ^= true;
	3307	+ return;
3004	3308	} else if (event.getSource() == hideCB)
3005	3309	{
3006	3310	copy.hide ^= true;
..	..	@@ -3015,6 +3319,7 @@
3015	3319	if (event.getSource() == randomCB)
3016	3320	{
3017	3321	copy.random ^= true;
	3322	+ objEditor.refreshContents();
3018	3323	return;
3019	3324	}
3020	3325	if (event.getSource() == speedupCB)
..	..	@@ -3038,8 +3343,9 @@
3038	3343
3039	3344	public void actionPerformed(ActionEvent event)
3040	3345	{
	3346	+ Object source = event.getSource();
3041	3347	// SCRIPT DIALOG
3042		- if (event.getSource() == okbutton)
	3348	+ if (source == okbutton)
3043	3349	{
3044	3350	textpanel.setVisible(false);
3045	3351	textpanel.remove(textarea);
..	..	@@ -3051,7 +3357,7 @@
3051	3357	textarea = null;
3052	3358	textpanel = null;
3053	3359	}
3054		- if (event.getSource() == cancelbutton)
	3360	+ if (source == cancelbutton)
3055	3361	{
3056	3362	textpanel.setVisible(false);
3057	3363	textpanel.remove(textarea);
..	..	@@ -3063,49 +3369,50 @@
3063	3369	//applySelf();
3064	3370	//client.refreshEditWindow();
3065	3371	//refreshContents();
3066		- if (event.getSource() == nameField)
	3372	+ if (source == nameField)
3067	3373	{
3068	3374	//System.out.println("ObjEditor " + event);
3069	3375	applySelf0(true);
3070	3376	//parent.applySelf();
3071	3377	objEditor.refreshContents();
3072		- } else if (event.getSource() == resetButton)
	3378	+ } else if (source == resetButton)
3073	3379	{
3074	3380	CameraPane.fullreset = true;
3075	3381	copy.Reset(); // ResetMeshes();
3076	3382	copy.Touch();
3077	3383	objEditor.refreshContents();
3078		- } else if (event.getSource() == stepItem)
	3384	+ } else if (source == stepItem)
3079	3385	{
3080		- cameraView.ONESTEP = true;
	3386	+ //cameraView.ONESTEP = true;
	3387	+ Globals.ONESTEP = true;
3081	3388	cameraView.repaint();
3082	3389	return;
3083		- } else if (event.getSource() == stepButton)
	3390	+ } else if (source == stepButton)
3084	3391	{
3085	3392	copy.Step();
3086	3393	copy.Touch();
3087	3394	objEditor.refreshContents();
3088		- } else if (event.getSource() == slowerButton)
	3395	+ } else if (source == slowerButton)
3089	3396	{
3090	3397	copy.Slower();
3091	3398	copy.Touch();
3092	3399	objEditor.refreshContents();
3093		- } else if (event.getSource() == fasterButton)
	3400	+ } else if (source == fasterButton)
3094	3401	{
3095	3402	copy.Faster();
3096	3403	copy.Touch();
3097	3404	objEditor.refreshContents();
3098		- } else if (event.getSource() == remarkButton)
	3405	+ } else if (source == remarkButton)
3099	3406	{
3100	3407	copy.Remark();
3101	3408	copy.Touch();
3102	3409	objEditor.refreshContents();
3103		- } else if (event.getSource() == stepAllButton)
	3410	+ } else if (source == stepAllButton)
3104	3411	{
3105	3412	copy.StepAll();
3106	3413	copy.Touch();
3107	3414	objEditor.refreshContents();
3108		- } else if (event.getSource() == resetAllButton)
	3415	+ } else if (source == resetAllButton)
3109	3416	{
3110	3417	//CameraPane.fullreset = true;
3111	3418	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3138,53 +3445,79 @@
3138	3445	// Close();
3139	3446	// }
3140	3447	// else
3141		- if (event.getSource() == resetSlidersButton)
	3448	+ if (source == resetSlidersButton)
3142	3449	{
3143	3450	ResetSliders();
3144		- } else if (event.getSource() == clearMaterialButton)
	3451	+ } else if (source == clearMaterialButton)
3145	3452	{
3146	3453	ClearMaterial();
3147		- } else if (event.getSource() == createMaterialButton)
	3454	+ } else if (source == createMaterialButton)
3148	3455	{
3149	3456	CreateMaterial();
3150		- } else if (event.getSource() == clearPanelButton)
	3457	+ } else if (source == clearPanelButton)
3151	3458	{
3152	3459	copy.ClearUI();
3153	3460	refreshContents(true);
3154		- } /*
3155		- }
3156		-
3157		- public boolean action(Event event, Object arg)
3158		- {
3159		- */ else if (event.getSource() == closeItem)
	3461	+ } else if (source == importGFDItem)
	3462	+ {
	3463	+ ImportGFD();
	3464	+ } else
	3465	+ if (source == importVRMLX3DItem)
	3466	+ {
	3467	+ ImportVRMLX3D();
	3468	+ } else
	3469	+ if (source == import3DSItem)
	3470	+ {
	3471	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3472	+ } else
	3473	+ if (source == importOBJItem)
	3474	+ {
	3475	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3476	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3477	+ browser.setVisible(true);
	3478	+ String filename = browser.getFile();
	3479	+ if (filename != null && filename.length() > 0)
	3480	+ {
	3481	+ String fullname = browser.getDirectory() + filename;
	3482	+ makeSomething(ReadOBJ(fullname), true);
	3483	+ }
	3484	+ } else
	3485	+ if (source == closeItem)
3160	3486	{
3161	3487	Close();
3162	3488	//return true;
3163		- } else if (event.getSource() == loadItem)
	3489	+ } else if (source == openItem)
3164	3490	{
3165		- load();
	3491	+ Open();
3166	3492	//return true;
3167		- } else if (event.getSource() == saveItem)
	3493	+ } else if (source == newItem)
	3494	+ {
	3495	+ New();
	3496	+ } else if (source == saveItem)
3168	3497	{
3169	3498	save();
3170	3499	//return true;
3171		- } else if (event.getSource() == saveAsItem)
	3500	+ } else if (source == saveAsItem)
3172	3501	{
3173	3502	saveAs();
3174	3503	//return true;
3175		- } else if (event.getSource() == reexportItem)
	3504	+ } else if (source == reexportItem)
3176	3505	{
3177	3506	reexport();
3178	3507	//return true;
3179		- } else if (event.getSource() == exportAsItem)
	3508	+ } else if (source == exportAsItem)
3180	3509	{
3181	3510	export();
3182	3511	//return true;
3183		- } else if (event.getSource() == povItem)
	3512	+ } else if (source == povItem)
3184	3513	{
3185	3514	generatePOV();
3186	3515	//return true;
3187		- } else if (event.getSource() == zBufferItem)
	3516	+ } else if (event.getSource() == archiveItem)
	3517	+ {
	3518	+ cTools.Archive(frame);
	3519	+ return;
	3520	+ } else if (source == zBufferItem)
3188	3521	{
3189	3522	try
3190	3523	{
..	..	@@ -3206,21 +3539,8 @@
3206	3539	cameraView.repaint();
3207	3540	//return true;
3208	3541	}
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)
	3542	+ */ else // combos...
	3543	+ if (source == texresMenu)
3224	3544	{
3225	3545	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3226	3546	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3232,27 +3552,427 @@
3232	3552	}
3233	3553	}
3234	3554
3235		- void ToggleAnimation()
	3555	+ void New()
3236	3556	{
3237		- if (!CameraPane.ANIMATION)
	3557	+ while (copy.Size() > 1)
3238	3558	{
3239		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3559	+ copy.remove(1);
	3560	+ }
	3561	+
	3562	+ ResetModel();
	3563	+ objEditor.refreshContents();
	3564	+ }
	3565	+
	3566	+ static public byte[] Compress(Object3D o)
	3567	+ {
	3568	+ try
	3569	+ {
	3570	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3571	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3572	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3573	+
	3574	+ Object3D parent = o.parent;
	3575	+ o.parent = null;
	3576	+
	3577	+ out.writeObject(o);
	3578	+
	3579	+ o.parent = parent;
	3580	+
	3581	+ out.flush();
	3582	+
	3583	+ baos //zstream
	3584	+ .close();
	3585	+ out.close();
	3586	+
	3587	+ byte[] bytes = baos.toByteArray();
	3588	+
	3589	+ System.out.println("save #bytes = " + bytes.length);
	3590	+ return bytes;
	3591	+ } catch (Exception e)
	3592	+ {
	3593	+ System.err.println(e);
	3594	+ return null;
	3595	+ }
	3596	+ }
	3597	+
	3598	+ static public Object Uncompress(byte[] bytes)
	3599	+ {
	3600	+ System.out.println("restore #bytes = " + bytes.length);
	3601	+ try
	3602	+ {
	3603	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3604	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3605	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3606	+ Object obj = in.readObject();
	3607	+
	3608	+ bais //istream
	3609	+ .close();
	3610	+ in.close();
	3611	+
	3612	+ return obj;
	3613	+ } catch (Exception e)
	3614	+ {
	3615	+ System.err.println(e);
	3616	+ return null;
	3617	+ }
	3618	+ }
	3619	+
	3620	+ static public Object clone(Object o)
	3621	+ {
	3622	+ try
	3623	+ {
	3624	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3625	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3626	+
	3627	+ out.writeObject(o);
	3628	+
	3629	+ out.flush();
	3630	+ out.close();
	3631	+
	3632	+ byte[] bytes = baos.toByteArray();
	3633	+
	3634	+ System.out.println("clone = " + bytes.length);
	3635	+
	3636	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3637	+ ObjectInputStream in = new ObjectInputStream(bais);
	3638	+ Object obj = in.readObject();
	3639	+ in.close();
	3640	+
	3641	+ return obj;
	3642	+ } catch (Exception e)
	3643	+ {
	3644	+ System.err.println(e);
	3645	+ return null;
	3646	+ }
	3647	+ }
	3648	+
	3649	+ cRadio GetCurrentTab()
	3650	+ {
	3651	+ cRadio ab;
	3652	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3653	+ {
	3654	+ ab = (cRadio)e.nextElement();
	3655	+ if(ab.GetObject() == copy)
	3656	+ {
	3657	+ return ab;
	3658	+ }
	3659	+ }
	3660	+
	3661	+ return null;
	3662	+ }
	3663	+
	3664	+
	3665	+ public void Save()
	3666	+ {
	3667	+ //Save(true);
	3668	+ Replace();
	3669	+ }
	3670	+
	3671	+ private boolean Equal(byte[] compress, byte[] name)
	3672	+ {
	3673	+ if (compress.length != name.length)
	3674	+ {
	3675	+ return false;
	3676	+ }
	3677	+
	3678	+ for (int i=compress.length; --i>=0;)
	3679	+ {
	3680	+ if (compress[i] != name[i])
	3681	+ return false;
	3682	+ }
	3683	+
	3684	+ return true;
	3685	+ }
	3686	+
	3687	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3688	+
	3689	+ public boolean Save(boolean user)
	3690	+ {
	3691	+ System.err.println("Save");
	3692	+
	3693	+ cRadio tab = GetCurrentTab();
	3694	+
	3695	+ byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
	3696	+
	3697	+ boolean thesame = false;
	3698	+
	3699	+ // Quick heuristic using length. Works only when stream is compressed.
	3700	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3701	+ {
	3702	+ thesame = true;
	3703	+ }
	3704	+
	3705	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3706	+ if (!thesame)
	3707	+ {
	3708	+ //tab.user[tab.versionindex] = user;
	3709	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3710	+
	3711	+ copy.versions[++copy.versionindex] = compress;
	3712	+
	3713	+ // if (increment)
	3714	+ // tab.versionindex++;
	3715	+ }
	3716	+
	3717	+ //copy.RestoreBigData(versiontable);
	3718	+
	3719	+ //assert(hashtable.isEmpty());
	3720	+
	3721	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3722	+ {
	3723	+ //tab.user[i] = false;
	3724	+ copy.versions[i] = null;
	3725	+ }
	3726	+
	3727	+ SetUndoStates();
	3728	+
	3729	+ // test save
	3730	+ if (false)
	3731	+ {
	3732	+ try
	3733	+ {
	3734	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3735	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3736	+
	3737	+ p.writeObject(copy);
	3738	+
	3739	+ p.flush();
	3740	+
	3741	+ ostream.close();
	3742	+ } catch (Exception e)
	3743	+ {
	3744	+ e.printStackTrace();
	3745	+ }
	3746	+ }
	3747	+
	3748	+ return !thesame;
	3749	+ }
	3750	+
	3751	+ void CopyChanged(Object3D obj)
	3752	+ {
	3753	+ SetUndoStates();
	3754	+
	3755	+ boolean temp = CameraPane.SWITCH;
	3756	+ CameraPane.SWITCH = false;
	3757	+
	3758	+ copy.ExtractBigData(versiontable);
	3759	+
	3760	+ copy.clear();
	3761	+
	3762	+ copy.skyboxname = obj.skyboxname;
	3763	+ copy.skyboxext = obj.skyboxext;
	3764	+
	3765	+ for (int i=0; i<obj.Size(); i++)
	3766	+ {
	3767	+ copy.add(obj.get(i));
	3768	+ }
	3769	+
	3770	+ copy.RestoreBigData(versiontable);
	3771	+
	3772	+ CameraPane.SWITCH = temp;
	3773	+
	3774	+ //assert(hashtable.isEmpty());
	3775	+
	3776	+ copy.Touch();
	3777	+
	3778	+ ResetModel();
	3779	+ copy.HardTouch(); // recompile?
	3780	+
	3781	+ cRadio ab;
	3782	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3783	+ {
	3784	+ ab = (cRadio)e.nextElement();
	3785	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3786	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3787	+ if (test != null)
	3788	+ {
	3789	+ test.editWindow = ab.object.editWindow;
	3790	+ ab.object = test;
	3791	+ }
	3792	+ }
	3793	+
	3794	+ refreshContents();
	3795	+ }
	3796	+
	3797	+ cButton undoButton;
	3798	+ cButton restoreButton;
	3799	+ cButton replaceButton;
	3800	+ cButton redoButton;
	3801	+
	3802	+ boolean muteSlider;
	3803	+
	3804	+ int VersionCount()
	3805	+ {
	3806	+ int count = 0;
	3807	+
	3808	+ for (int i = copy.versions.length; --i >= 0;)
	3809	+ {
	3810	+ if (copy.versions[i] != null)
	3811	+ count++;
	3812	+ }
	3813	+
	3814	+ return count;
	3815	+ }
	3816	+
	3817	+ void SetUndoStates()
	3818	+ {
	3819	+ cRadio tab = GetCurrentTab();
	3820	+
	3821	+ restoreButton.setEnabled(copy.versionindex != -1);
	3822	+ replaceButton.setEnabled(copy.versionindex != -1);
	3823	+
	3824	+ undoButton.setEnabled(copy.versionindex > 0);
	3825	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3826	+
	3827	+ muteSlider = true;
	3828	+ versionSlider.setMaximum(VersionCount() - 1);
	3829	+ versionSlider.setInteger(copy.versionindex);
	3830	+ muteSlider = false;
	3831	+ }
	3832	+
	3833	+ public boolean Undo()
	3834	+ {
	3835	+ // Option?
	3836	+ Replace();
	3837	+
	3838	+ System.err.println("Undo");
	3839	+
	3840	+ cRadio tab = GetCurrentTab();
	3841	+
	3842	+ if (copy.versionindex == 0)
	3843	+ {
	3844	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3845	+ return false;
	3846	+ }
	3847	+
	3848	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3849	+// {
	3850	+// if (Save(false))
	3851	+// tab.versionindex -= 1;
	3852	+// else
	3853	+// {
	3854	+// if (tab.versionindex <= 0)
	3855	+// return false;
	3856	+// else
	3857	+// tab.versionindex -= 1;
	3858	+// }
	3859	+// }
	3860	+
	3861	+ copy.versionindex -= 1;
	3862	+
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3864	+
	3865	+ return true;
	3866	+ }
	3867	+
	3868	+ public boolean Restore()
	3869	+ {
	3870	+ System.err.println("Restore");
	3871	+
	3872	+ cRadio tab = GetCurrentTab();
	3873	+
	3874	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3875	+ {
	3876	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3877	+ return false;
	3878	+ }
	3879	+
	3880	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3881	+
	3882	+ return true;
	3883	+ }
	3884	+
	3885	+ public boolean Replace()
	3886	+ {
	3887	+ System.err.println("Replace");
	3888	+
	3889	+ cRadio tab = GetCurrentTab();
	3890	+
	3891	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3892	+ {
	3893	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3894	+ return false;
	3895	+ }
	3896	+
	3897	+ copy.versions[copy.versionindex] = CompressCopy();
	3898	+
	3899	+ return true;
	3900	+ }
	3901	+
	3902	+ public void Redo()
	3903	+ {
	3904	+ // Option?
	3905	+ Replace();
	3906	+
	3907	+ cRadio tab = GetCurrentTab();
	3908	+
	3909	+ if (copy.versions[copy.versionindex + 1] == null)
	3910	+ {
	3911	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3912	+ return;
	3913	+ }
	3914	+
	3915	+ copy.versionindex += 1;
	3916	+
	3917	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3918	+
	3919	+ //if (!tab.user[tab.versionindex])
	3920	+ // tab.graphs[tab.versionindex] = null;
	3921	+ }
	3922	+
	3923	+ void ImportGFD()
	3924	+ {
	3925	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3240	3926	browser.show();
3241	3927	String filename = browser.getFile();
3242	3928	if (filename != null && filename.length() > 0)
3243	3929	{
3244		- CameraPane.filename = browser.getDirectory() + filename;
	3930	+ String fullname = browser.getDirectory() + filename;
	3931	+
	3932	+ //Object3D readobj =
	3933	+ objEditor.ReadGFD(fullname, objEditor);
	3934	+ //makeSomething(readobj);
	3935	+ }
	3936	+ }
	3937	+
	3938	+ void ImportVRMLX3D()
	3939	+ {
	3940	+ if (Grafreed.standAlone)
	3941	+ {
	3942	+ /**/
	3943	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3944	+ browser.show();
	3945	+ String filename = browser.getFile();
	3946	+ if (filename != null && filename.length() > 0)
	3947	+ {
	3948	+ String fullname = browser.getDirectory() + filename;
	3949	+ LoadVRMLX3D(fullname);
	3950	+ }
	3951	+ /**/
	3952	+ }
	3953	+ }
	3954	+
	3955	+ void ToggleAnimation()
	3956	+ {
	3957	+ if (!Globals.ANIMATION)
	3958	+ {
	3959	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3960	+ browser.setVisible(true);
	3961	+ String filename = browser.getFile();
	3962	+ if (filename != null && filename.length() > 0)
	3963	+ {
	3964	+ Globals.filename = browser.getDirectory() + filename;
3245	3965	//CameraPane.framecount = 0;
3246		- CameraPane.imagecount = 0;
	3966	+ Globals.imagecount = 0;
3247	3967
3248		- CameraPane.ANIMATION ^= true;
	3968	+ Globals.ANIMATION ^= true;
3249	3969
3250		- GrafreeD.wav.cursor = 0;
3251		- GrafreeD.wav.loop = 0;
	3970	+ Grafreed.wav.cursor = 0;
	3971	+ Grafreed.wav.loop = 0;
3252	3972	}
3253	3973	} else
3254	3974	{
3255		- CameraPane.ANIMATION ^= true;
	3975	+ Globals.ANIMATION ^= true;
3256	3976	}
3257	3977	}
3258	3978
..	..	@@ -3298,7 +4018,7 @@
3298	4018	void CreateMaterial()
3299	4019	{
3300	4020	//copy.ClearMaterial(); // PATCH
3301		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4021	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3302	4022	if (copy.selection.size() > 0)
3303	4023	//SetMaterial(copy);
3304	4024	{
..	..	@@ -3349,7 +4069,7 @@
3349	4069	assert false;
3350	4070	}
3351	4071
3352		- void EditSelection()
	4072	+ void EditSelection(boolean newWindow)
3353	4073	{
3354	4074	}
3355	4075
..	..	@@ -3357,11 +4077,11 @@
3357	4077	{
3358	4078	copy.ResetBlockLoop(); // temporary problem
3359	4079
3360		- boolean random = CameraPane.RANDOM;
3361		- CameraPane.RANDOM = false; // parse everything
	4080	+ boolean random = CameraPane.SWITCH;
	4081	+ CameraPane.SWITCH = false; // parse everything
3362	4082	copy.ResetDisplayList();
3363	4083	copy.HardTouch();
3364		- CameraPane.RANDOM = random;
	4084	+ CameraPane.SWITCH = random;
3365	4085	}
3366	4086
3367	4087	// public void applySelf()
..	..	@@ -3431,10 +4151,40 @@
3431	4151	current.fakedepth = (float) fakedepthField.getFloat();
3432	4152	current.shadowbias = (float) shadowbiasField.getFloat();
3433	4153
3434		- if (!NumberSlider.frozen)
	4154	+ if (!cNumberSlider.frozen)
3435	4155	{
3436	4156	//System.out.println("Propagate = " + propagate);
3437	4157	copy.UpdateMaterial(anchor, current, propagate);
	4158	+
	4159	+ if (copy.material != null)
	4160	+ {
	4161	+ cMaterial mat = copy.material;
	4162	+
	4163	+ colorField.SetToolTipValue((mat.color));
	4164	+ modulationField.SetToolTipValue((mat.modulation));
	4165	+ metalnessField.SetToolTipValue((mat.metalness));
	4166	+ diffuseField.SetToolTipValue((mat.diffuse));
	4167	+ specularField.SetToolTipValue((mat.specular));
	4168	+ shininessField.SetToolTipValue((mat.shininess));
	4169	+ shiftField.SetToolTipValue((mat.shift));
	4170	+ ambientField.SetToolTipValue((mat.ambient));
	4171	+ lightareaField.SetToolTipValue((mat.lightarea));
	4172	+ diffusenessField.SetToolTipValue((mat.factor));
	4173	+ velvetField.SetToolTipValue((mat.velvet));
	4174	+ sheenField.SetToolTipValue((mat.sheen));
	4175	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4176	+ backlitField.SetToolTipValue((mat.bump));
	4177	+ anisoField.SetToolTipValue((mat.aniso));
	4178	+ anisoVField.SetToolTipValue((mat.anisoV));
	4179	+ cameraField.SetToolTipValue((mat.cameralight));
	4180	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4181	+ shadowField.SetToolTipValue((mat.shadow));
	4182	+ textureField.SetToolTipValue((mat.texture));
	4183	+ opacityField.SetToolTipValue((mat.opacity));
	4184	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4185	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4186	+ }
	4187	+
3438	4188	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3439	4189	{
3440	4190	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3463,9 +4213,25 @@
3463	4213	//copy.Touch();
3464	4214	}
3465	4215
	4216	+ cNumberSlider versionSlider;
	4217	+
3466	4218	public void stateChanged(ChangeEvent e)
3467	4219	{
3468	4220	// assert(false);
	4221	+ if (e.getSource() == versionSlider)
	4222	+ {
	4223	+ if (muteSlider)
	4224	+ return;
	4225	+
	4226	+ int version = versionSlider.getInteger();
	4227	+
	4228	+ if (copy.versions[version] != null)
	4229	+ {
	4230	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4231	+ }
	4232	+
	4233	+ return;
	4234	+ }
3469	4235
3470	4236	if (freezematerial)
3471	4237	{
..	..	@@ -3479,6 +4245,7 @@
3479	4245	\|\| e.getSource() == apertureField
3480	4246	\|\| e.getSource() == shadowblurField)
3481	4247	{
	4248	+ new Exception().printStackTrace();
3482	4249	System.exit(0);
3483	4250	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3484	4251	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3505,7 +4272,13 @@
3505	4272	//System.out.println("PARENT = " + parent);
3506	4273	//if (parent != null)
3507	4274	// parent.applySelf();
3508		- refreshContents();
	4275	+ if (e.getSource() == normalpushField)
	4276	+ {
	4277	+ objEditor.refreshContents();
	4278	+ //Refresh();
	4279	+ }
	4280	+ else
	4281	+ refreshContents();
3509	4282	// ??? client.refreshEditWindow();
3510	4283	}
3511	4284	//else
..	..	@@ -3517,7 +4290,7 @@
3517	4290	//group.name = nameField.getText();
3518	4291	//objEditor.applySelf();
3519	4292
3520		- assert (objEditor == this);
	4293	+ // OCT2018: assert (objEditor == this);
3521	4294	if (copy.selection == null \|\| copy.selection.size() == 0)
3522	4295	//super.applySelf()
3523	4296	; else
..	..	@@ -3541,12 +4314,18 @@
3541	4314	objEditor.copy = keep;
3542	4315	}
3543	4316	}
	4317	+
	4318	+ if (normalpushField != null)
	4319	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3544	4320	}
3545	4321
3546	4322	void SnapObject()
3547	4323	{
3548		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3549		- SnapObject(obj);
	4324	+ if (copy.selection.size() > 0)
	4325	+ {
	4326	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4327	+ SnapObject(obj);
	4328	+ }
3550	4329	}
3551	4330
3552	4331	void SnapObject(Object3D obj)
..	..	@@ -3660,7 +4439,7 @@
3660	4439
3661	4440	if (obj.parent != null)
3662	4441	{
3663		- obj.parent.TransformToWorld(interest);
	4442	+// obj.parent.TransformToWorld(interest);
3664	4443	}
3665	4444
3666	4445	if (!CameraPane.TRACK)
..	..	@@ -3792,7 +4571,7 @@
3792	4571
3793	4572	radioPanel.revalidate();
3794	4573	radioPanel.repaint();
3795		- ctrlPanel.revalidate(); // ? new
	4574	+ ctrlPanel.validate(); // ? new
3796	4575	ctrlPanel.repaint();
3797	4576	}
3798	4577	}
..	..	@@ -3801,6 +4580,8 @@
3801	4580
3802	4581	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3803	4582	{
	4583	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4584	+ Save();
3804	4585	//Tween.set(thing, 0).target(1).start(tweenManager);
3805	4586	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3806	4587	// if (thing instanceof GenericJointDemo)
..	..	@@ -3887,6 +4668,12 @@
3887	4668	{
3888	4669	ResetModel();
3889	4670	Select(thing.GetTreePath(), true, false); // unselect... false);
	4671	+
	4672	+ if (thing.Size() == 0)
	4673	+ {
	4674	+ //EditSelection(false);
	4675	+ }
	4676	+
3890	4677	refreshContents();
3891	4678	}
3892	4679
..	..	@@ -4004,6 +4791,7 @@
4004	4791	}
4005	4792	}
4006	4793	}
	4794	+
4007	4795	LoadGFDThread loadGFDThread;
4008	4796
4009	4797	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4023,8 +4811,10 @@
4023	4811
4024	4812	try
4025	4813	{
	4814	+ // Try compressed version first.
4026	4815	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4027		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4816	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4817	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4028	4818
4029	4819	readobj = (Object3D) p.readObject();
4030	4820	istream.close();
..	..	@@ -4032,7 +4822,22 @@
4032	4822	readobj.ResetDisplayList();
4033	4823	} catch (Exception e)
4034	4824	{
4035		- e.printStackTrace();
	4825	+ if (!e.toString().contains("GZIP"))
	4826	+ e.printStackTrace();
	4827	+
	4828	+ try
	4829	+ {
	4830	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4831	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4832	+
	4833	+ readobj = (Object3D) p.readObject();
	4834	+ istream.close();
	4835	+
	4836	+ readobj.ResetDisplayList();
	4837	+ } catch (Exception e2)
	4838	+ {
	4839	+ e2.printStackTrace();
	4840	+ }
4036	4841	}
4037	4842	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4038	4843	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4078,6 +4883,12 @@
4078	4883
4079	4884	void LoadIt(Object obj)
4080	4885	{
	4886	+ if (obj == null)
	4887	+ {
	4888	+ // Invalid file
	4889	+ return;
	4890	+ }
	4891	+
4081	4892	System.out.println("Loaded " + obj);
4082	4893	//new Exception().printStackTrace();
4083	4894	Object3D readobj = (Object3D) obj;
..	..	@@ -4087,10 +4898,14 @@
4087	4898
4088	4899	if (readobj != null)
4089	4900	{
	4901	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4902	+ // Save();
4090	4903	try
4091	4904	{
4092	4905	//readobj.deepCopySelf(copy);
4093	4906	copy.clear(); // june 2014
	4907	+ copy.skyboxname = readobj.skyboxname;
	4908	+ copy.skyboxext = readobj.skyboxext;
4094	4909	for (int i = 0; i < readobj.size(); i++)
4095	4910	{
4096	4911	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4131,6 +4946,7 @@
4131	4946	}
4132	4947	} catch (ClassCastException e)
4133	4948	{
	4949	+ e.printStackTrace();
4134	4950	assert (false);
4135	4951	Composite c = (Composite) copy;
4136	4952	c.children.clear();
..	..	@@ -4141,15 +4957,26 @@
4141	4957	c.addChild(csg);
4142	4958	}
4143	4959
	4960	+ copy.versions = readobj.versions;
	4961	+ copy.versionindex = readobj.versionindex;
	4962	+
	4963	+ if (copy.versions == null)
	4964	+ {
	4965	+ copy.versions = new byte[100][];
	4966	+ copy.versionindex = -1;
	4967	+ }
	4968	+
	4969	+ //? SetUndoStates();
	4970	+
4144	4971	ResetModel();
4145	4972	copy.HardTouch(); // recompile?
4146	4973	refreshContents();
4147	4974	}
4148	4975	}
4149	4976
4150		- void load() // throws ClassNotFoundException
	4977	+ void Open() // throws ClassNotFoundException
4151	4978	{
4152		- if (GrafreeD.standAlone)
	4979	+ if (Grafreed.standAlone)
4153	4980	{
4154	4981	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4155	4982	browser.show();
..	..	@@ -4236,11 +5063,13 @@
4236	5063	try
4237	5064	{
4238	5065	FileOutputStream ostream = new FileOutputStream(lastname);
4239		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5066	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5067	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4240	5068
4241	5069	p.writeObject(copy);
4242	5070	p.flush();
4243	5071
	5072	+ zstream.close();
4244	5073	ostream.close();
4245	5074
4246	5075	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4248,19 +5077,23 @@
4248	5077	//ps.print(buffer.toString());
4249	5078	} catch (IOException e)
4250	5079	{
	5080	+ e.printStackTrace();
4251	5081	}
4252	5082	}
	5083	+
4253	5084	String lastname;
4254	5085
4255	5086	void saveAs()
4256	5087	{
4257		- if (GrafreeD.standAlone)
	5088	+ if (Grafreed.standAlone)
4258	5089	{
4259	5090	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4260	5091	browser.setVisible(true);
4261	5092	String filename = browser.getFile();
4262	5093	if (filename != null && filename.length() > 0)
4263	5094	{
	5095	+ if (!filename.endsWith(".gfd"))
	5096	+ filename += ".gfd";
4264	5097	lastname = browser.getDirectory() + filename;
4265	5098	save();
4266	5099	}
..	..	@@ -4359,13 +5192,13 @@
4359	5192	try
4360	5193	{
4361	5194	FileOutputStream ostream = new FileOutputStream(filename);
4362		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4363		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5195	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5196	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4364	5197
4365	5198	Object3D objectparent = obj.parent;
4366	5199	obj.parent = null;
4367	5200
4368		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5201	+ Object3D object = (Object3D) Grafreed.clone(obj);
4369	5202
4370	5203	obj.parent = objectparent;
4371	5204
..	..	@@ -4377,8 +5210,8 @@
4377	5210	p.writeObject(object);
4378	5211	p.flush();
4379	5212
	5213	+ zstream.close();
4380	5214	ostream.close();
4381		- // zstream.close();
4382	5215
4383	5216	// group.selection.get(0).parent = parent;
4384	5217	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4399,7 +5232,7 @@
4399	5232	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4400	5233	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4401	5234	copy.generatePOV(buffer);
4402		- if (GrafreeD.standAlone)
	5235	+ if (Grafreed.standAlone)
4403	5236	{
4404	5237	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4405	5238	browser.show();
..	..	@@ -4425,53 +5258,70 @@
4425	5258	Object3D client;
4426	5259	Object3D copy;
4427	5260	MenuBar menuBar;
4428		- Menu windowMenu;
4429		- MenuItem loadItem;
	5261	+ Menu fileMenu;
	5262	+ MenuItem newItem;
	5263	+ MenuItem openItem;
4430	5264	MenuItem saveItem;
4431	5265	MenuItem saveAsItem;
4432	5266	MenuItem exportAsItem;
4433	5267	MenuItem reexportItem;
4434	5268	MenuItem povItem;
4435	5269	MenuItem closeItem;
4436		- Menu cameraMenu;
	5270	+
4437	5271	CheckboxMenuItem zBufferItem;
4438	5272	//MenuItem normalLensItem;
4439		- MenuItem editCameraItem;
4440		- MenuItem revertCameraItem;
4441		- CheckboxMenuItem toggleLiveItem;
4442	5273	MenuItem stepItem;
4443		- CheckboxMenuItem toggleFullItem;
	5274	+ CheckboxMenuItem toggleLiveItem;
	5275	+ CheckboxMenuItem toggleFullScreenItem;
	5276	+ CheckboxMenuItem toggleTimelineItem;
4444	5277	CheckboxMenuItem toggleRenderItem;
4445	5278	CheckboxMenuItem toggleDebugItem;
4446	5279	CheckboxMenuItem toggleFrustumItem;
4447	5280	CheckboxMenuItem toggleFootContactItem;
4448	5281	CheckboxMenuItem toggleDLItem;
4449	5282	CheckboxMenuItem toggleTextureItem;
4450		- CheckboxMenuItem toggleRandomItem;
	5283	+ CheckboxMenuItem toggleSwitchItem;
4451	5284	CheckboxMenuItem toggleRootItem;
4452	5285	CheckboxMenuItem animationItem;
	5286	+ MenuItem archiveItem;
4453	5287	CheckboxMenuItem toggleHandleItem;
4454	5288	CheckboxMenuItem togglePaintItem;
4455	5289	JSplitPane mainPanel;
4456	5290	JScrollPane scrollpane;
	5291	+
4457	5292	JPanel toolbarPanel;
4458		- JPanel treePanel;
	5293	+
	5294	+ cGridBag treePanel;
	5295	+
4459	5296	JPanel radioPanel;
4460	5297	ButtonGroup buttonGroup;
4461		- JPanel ctrlPanel;
4462		- JPanel materialPanel;
	5298	+
	5299	+ cGridBag toolboxPanel;
	5300	+ cGridBag materialPanel;
	5301	+ cGridBag ctrlPanel;
	5302	+
4463	5303	JScrollPane infoPanel;
4464		- JPanel optionsPanel;
	5304	+
	5305	+ cGridBag optionsPanel;
	5306	+
4465	5307	JTabbedPane objectPanel;
4466		- JPanel XYZPanel;
	5308	+ boolean materialFlushed;
	5309	+ Object3D latestObject;
	5310	+
	5311	+ cGridBag XYZPanel;
	5312	+
4467	5313	JSplitPane gridPanel;
4468	5314	JSplitPane bigPanel;
4469		- JPanel bigThree;
4470		- JTabbedPane jtp;
4471		- JPanel cameraPanel;
	5315	+
	5316	+ cGridBag bigThree;
	5317	+ cGridBag scenePanel;
	5318	+ cGridBag centralPanel;
	5319	+ JSplitPane cameraPanel;
	5320	+ JPanel timelinePanel;
	5321	+ JMenuBar timelineMenubar;
4472	5322	JSplitPane framePanel;
4473	5323	JTextArea/Field/ nameField;
4474		- cButton textureButton;
	5324	+ //cButton textureButton;
4475	5325	cButton okButton;
4476	5326	cButton applyButton;
4477	5327	cButton cancelButton;
..	..	@@ -4518,65 +5368,72 @@
4518	5368	// MATERIAL
4519	5369	JLabel materialLabel;
4520	5370	JLabel colorLabel;
4521		- NumberSlider colorField;
	5371	+ cNumberSlider colorField;
4522	5372	JLabel modulationLabel;
4523		- NumberSlider modulationField;
	5373	+ cNumberSlider modulationField;
4524	5374	JLabel metalnessLabel;
4525		- NumberSlider metalnessField;
	5375	+ cNumberSlider metalnessField;
4526	5376	JLabel diffuseLabel;
4527		- NumberSlider diffuseField;
	5377	+ cNumberSlider diffuseField;
4528	5378	JLabel specularLabel;
4529		- NumberSlider specularField;
	5379	+ cNumberSlider specularField;
4530	5380	JLabel shininessLabel;
4531		- NumberSlider shininessField;
	5381	+ cNumberSlider shininessField;
4532	5382	JLabel shiftLabel;
4533		- NumberSlider shiftField;
	5383	+ cNumberSlider shiftField;
4534	5384	JLabel ambientLabel;
4535		- NumberSlider ambientField;
	5385	+ cNumberSlider ambientField;
4536	5386	JLabel lightareaLabel;
4537		- NumberSlider lightareaField;
	5387	+ cNumberSlider lightareaField;
4538	5388	JLabel diffusenessLabel;
4539		- NumberSlider diffusenessField;
	5389	+ cNumberSlider diffusenessField;
4540	5390	JLabel velvetLabel;
4541		- NumberSlider velvetField;
	5391	+ cNumberSlider velvetField;
4542	5392	JLabel sheenLabel;
4543		- NumberSlider sheenField;
	5393	+ cNumberSlider sheenField;
4544	5394	JLabel subsurfaceLabel;
4545		- NumberSlider subsurfaceField;
	5395	+ cNumberSlider subsurfaceField;
4546	5396	//JLabel bumpLabel;
4547	5397	//NumberSlider bumpField;
4548	5398	JLabel backlitLabel;
4549		- NumberSlider backlitField;
	5399	+ cNumberSlider backlitField;
4550	5400	JLabel anisoLabel;
4551		- NumberSlider anisoField;
	5401	+ cNumberSlider anisoField;
4552	5402	JLabel anisoVLabel;
4553		- NumberSlider anisoVField;
	5403	+ cNumberSlider anisoVField;
4554	5404	JLabel cameraLabel;
4555		- NumberSlider cameraField;
	5405	+ cNumberSlider cameraField;
4556	5406	JLabel selfshadowLabel;
4557		- NumberSlider selfshadowField;
	5407	+ cNumberSlider selfshadowField;
4558	5408	JLabel shadowLabel;
4559		- NumberSlider shadowField;
	5409	+ cNumberSlider shadowField;
4560	5410	JLabel textureLabel;
4561		- NumberSlider textureField;
	5411	+ cNumberSlider textureField;
4562	5412	JLabel opacityLabel;
4563		- NumberSlider opacityField;
	5413	+ cNumberSlider opacityField;
4564	5414	JLabel fakedepthLabel;
4565		- NumberSlider fakedepthField;
	5415	+ cNumberSlider fakedepthField;
4566	5416	JLabel shadowbiasLabel;
4567		- NumberSlider shadowbiasField;
	5417	+ cNumberSlider shadowbiasField;
4568	5418	JLabel bumpLabel;
4569		- NumberSlider bumpField;
	5419	+ cNumberSlider bumpField;
4570	5420	JLabel noiseLabel;
4571		- NumberSlider noiseField;
	5421	+ cNumberSlider noiseField;
4572	5422	JLabel powerLabel;
4573		- NumberSlider powerField;
	5423	+ cNumberSlider powerField;
4574	5424	JLabel borderfadeLabel;
4575		- NumberSlider borderfadeField;
	5425	+ cNumberSlider borderfadeField;
4576	5426	JLabel fogLabel;
4577		- NumberSlider fogField;
	5427	+ cNumberSlider fogField;
4578	5428	JLabel opacityPowerLabel;
4579		- NumberSlider opacityPowerField;
4580		- JTree jTree;
	5429	+ cNumberSlider opacityPowerField;
	5430	+ cTree jTree;
4581	5431	//ObjectUI parent;
	5432	+
	5433	+ cNumberSlider normalpushField;
	5434	+
	5435	+ private MenuItem importGFDItem;
	5436	+ private MenuItem importVRMLX3DItem;
	5437	+ private MenuItem import3DSItem;
	5438	+ private MenuItem importOBJItem;
4582	5439	}