~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.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[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.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[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.versionlist == 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(false);
	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,192 @@
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 Object3D CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versionlist;
	862	+ copy.versionlist = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versionlist = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
	875	+
	876	+ private JTextPane createTextPane()
	877	+ {
	878	+// TEXTAREA String[] initString =
	879	+// {
	880	+// "This is an editable JTextPane, ", //regular
	881	+// "another ", //italic
	882	+// "styled ", //bold
	883	+// "text ", //small
	884	+// "component, ", //large
	885	+// "which supports embedded components..." + newline,//regular
	886	+// " " + newline, //button
	887	+// "...and embedded icons..." + newline, //regular
	888	+// " ", //icon
	889	+// newline + "JTextPane is a subclass of JEditorPane that "
	890	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	891	+// + "cover methods for interacting with those objects."
	892	+// };
	893	+//
	894	+// String[] initStyles =
	895	+// {
	896	+// "regular", "italic", "bold", "small", "large",
	897	+// "regular", "button", "regular", "icon",
	898	+// "regular"
	899	+// };
	900	+//
	901	+// JTextPane textPane = new JTextPane();
	902	+// textPane.setEditable(true);
	903	+// /StyledDocument/ doc = textPane.getStyledDocument();
	904	+// addStylesToDocument(doc);
	905	+//
	906	+// try
	907	+// {
	908	+// for (int j = 0; j < 2; j++)
	909	+// {
	910	+// for (int i = 0; i < initString.length; i++)
	911	+// {
	912	+// doc.insertString(doc.getLength(), initString[i],
	913	+// doc.getStyle(initStyles[i]));
	914	+// }
	915	+// }
	916	+// } catch (BadLocationException ble)
	917	+// {
	918	+// System.err.println("Couldn't insert initial text into text pane.");
	919	+// }
	920	+
	921	+ return new JTextPane(); // textPane;
643	922	}
644	923
645	924	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +971,7 @@
692	971	protected static ImageIcon createImageIcon(String path,
693	972	String description)
694	973	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	974	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	975	if (imgURL != null)
697	976	{
698	977	return new ImageIcon(imgURL, description);
..	..	@@ -715,6 +994,7 @@
715	994	{
716	995	SetupMaterial(materialPanel);
717	996	}
	997	+
718	998	//SetupName();
719	999	//SetupViews();
720	1000	}
..	..	@@ -724,6 +1004,7 @@
724	1004	// NumberSlider vDivsField;
725	1005	// JCheckBox endcaps;
726	1006	JCheckBox liveCB;
	1007	+ JCheckBox selectableCB;
727	1008	JCheckBox hideCB;
728	1009	JCheckBox link2masterCB;
729	1010	JCheckBox markCB;
..	..	@@ -731,7 +1012,12 @@
731	1012	JCheckBox speedupCB;
732	1013	JCheckBox rewindCB;
733	1014	JCheckBox flipVCB;
	1015	+
	1016	+ cCheckBox toggleTextureCB;
	1017	+ cCheckBox toggleSwitchCB;
	1018	+
734	1019	JComboBox texresMenu;
	1020	+
735	1021	JButton resetButton;
736	1022	JButton stepButton;
737	1023	JButton stepAllButton;
..	..	@@ -739,115 +1025,87 @@
739	1025	JButton slowerButton;
740	1026	JButton fasterButton;
741	1027	JButton remarkButton;
	1028	+
	1029	+ cGridBag editPanel;
	1030	+ cGridBag editCommandsPanel;
	1031	+
	1032	+ cGridBag namePanel;
	1033	+ cGridBag setupPanel;
	1034	+ cGridBag setupPanel2;
	1035	+ cGridBag objectCommandsPanel;
	1036	+ cGridBag pushPanel;
	1037	+ cGridBag fillPanel;
742	1038
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1039	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	1040	{
745	1041	JCheckBox cb;
746	1042
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);
	1043	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	1044	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	1045
757	1046	return cb;
758	1047	}
759	1048
760		- cButton AddButton(ObjEditor oe, String label)
	1049	+ cButton AddButton(cGridBag panel, String label)
761	1050	{
762	1051	cButton cb;
763	1052
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);
	1053	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	1054	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	1055
774	1056	return cb;
775	1057	}
776	1058
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1059	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	1060	{
779	1061	JComboBox combo;
780	1062
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;
	1063	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	1064	combo.addActionListener(this);
785	1065
786	1066	return combo;
787	1067	}
788	1068
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1069	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	1070	{
791		- NumberSlider combo;
	1071	+ cGridBag control = new cGridBag();
	1072	+
	1073	+ cNumberSlider combo;
792	1074
793	1075	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	1076	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		-
	1077	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1078	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	1079	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	1080	+
	1081	+ panel.add(control);
	1082	+
	1083	+ return control;
813	1084	}
814	1085
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1086	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	1087	{
817		- NumberSlider combo;
	1088	+ cGridBag control = new cGridBag();
	1089	+
	1090	+ cNumberSlider combo;
818	1091
819	1092	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1093	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		-
	1094	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1095	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1096	combo.setInteger(current);
833	1097
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1098	+ panel.add(control);
	1099	+
	1100	+ return control;
839	1101	}
840	1102
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1103	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1104	{
843	1105	JTextArea text;
844	1106
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1107	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1108	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1109
852	1110	return text;
853	1111	}
..	..	@@ -877,9 +1135,16 @@
877	1135	objEditor.ctrlPanel.remove(j);
878	1136	}
879	1137
	1138	+ void Remove(cNumberSlider j)
	1139	+ {
	1140	+ j.removeChangeListener(this);
	1141	+ //objEditor.ctrlPanel.remove(j.label);
	1142	+ objEditor.ctrlPanel.remove(j);
	1143	+ }
	1144	+
880	1145	/*
881	1146	*/
882		- void Return() // ObjEditor oe)
	1147	+ void Return0() // ObjEditor oe)
883	1148	{
884	1149	aConstraints.gridy += 1;
885	1150	aConstraints.gridx = 0;
..	..	@@ -934,35 +1199,81 @@
934	1199
935	1200	void SetupUI2(ObjEditor oe)
936	1201	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1202	+ //SetupName(oe);
942	1203
943		- if (!GroupEditor.allparams)
	1204	+ namePanel = new cGridBag();
	1205	+
	1206	+ nameField = AddText(namePanel, copy.GetName());
	1207	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1208	+ oe.ctrlPanel.add(namePanel);
	1209	+
	1210	+ oe.ctrlPanel.Return();
	1211	+
	1212	+ if (!allparams)
944	1213	return;
945	1214
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1215	+ setupPanel = new cGridBag().setVertical(false);
	1216	+
	1217	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1218	+ liveCB.setToolTipText("Animate object");
	1219	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1220	+ selectableCB.setToolTipText("Make object selectable");
949	1221	// 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");
	1222	+
	1223	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1224	+ hideCB.setToolTipText("Hide object");
	1225	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1226	+ markCB.setToolTipText("As animation target transform");
	1227	+
	1228	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1229	+
	1230	+ setupPanel2 = new cGridBag().setVertical(false);
	1231	+
	1232	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1233	+ rewindCB.setToolTipText("Rewind animation");
	1234	+
	1235	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1236	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1237	+
	1238	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1239	+ link2masterCB.setToolTipText("Attach to support");
	1240	+
	1241	+ if (Globals.ADVANCED)
	1242	+ {
	1243	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1244	+ speedupCB.setToolTipText("Option motion capture");
	1245	+ }
	1246	+
	1247	+ oe.ctrlPanel.add(setupPanel);
	1248	+ oe.ctrlPanel.Return();
	1249	+ oe.ctrlPanel.add(setupPanel2);
	1250	+ oe.ctrlPanel.Return();
	1251	+
	1252	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1253	+
	1254	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1255	+ resetButton.setToolTipText("Jump to frame zero");
	1256	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1257	+ stepButton.setToolTipText("Step one frame");
956	1258	// resetAllButton = AddButton(oe, "Reset All");
957	1259	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1260	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1261	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1262	+ slowerButton.setToolTipText("Decrease animation speed");
	1263	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1264	+ fasterButton.setToolTipText("Increase animation speed");
	1265	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1266	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1267
964		- Return();
	1268	+ oe.ctrlPanel.add(objectCommandsPanel);
	1269	+ oe.ctrlPanel.Return();
965	1270
	1271	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1272	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1273	+ //Return();
	1274	+
	1275	+ oe.ctrlPanel.Return();
	1276	+
966	1277	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1278	// ObjEditor.aConstraints.gridx += 1;
968	1279
..	..	@@ -1056,7 +1367,7 @@
1056	1367	oe.aConstraints.gridwidth = 1;
1057	1368	/**/
1058	1369	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1370	+ oe.ctrlPanel.Return();
1060	1371
1061	1372	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1373	//textureButton.setEnabled(false);
..	..	@@ -1158,11 +1469,28 @@
1158	1469	//JPanel worldPanel =
1159	1470	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1471	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
1164		- //new timeflow.app.TimeflowApp().TimeFlowWindow(cameraPanel, frame);
	1472	+ centralPanel = new cGridBag();
	1473	+ centralPanel.preferredWidth = 20;
	1474	+
	1475	+ if (Globals.ADVANCED)
	1476	+ {
	1477	+ timelinePanel = new JPanel(new BorderLayout());
	1478	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1165	1479
	1480	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1481	+ cameraPanel.setContinuousLayout(true);
	1482	+ cameraPanel.setOneTouchExpandable(true);
	1483	+// cameraPanel.setDividerLocation(0.9);
	1484	+// cameraPanel.setDividerSize(9);
	1485	+ cameraPanel.setResizeWeight(1.0);
	1486	+
	1487	+ }
	1488	+
	1489	+ centralPanel.add(cameraView);
	1490	+ centralPanel.setFocusable(true);
	1491	+ //frame.setJMenuBar(timelineMenubar);
	1492	+ //centralPanel.add(timelinePanel);
	1493	+
1166	1494	//topView.camera = ;
1167	1495	//frontView.camera = new Camera(2);
1168	1496	//sideView.camera = new Camera(3);
..	..	@@ -1178,12 +1506,14 @@
1178	1506	//frontView.object = copy;
1179	1507	//sideView.object = copy;
1180	1508
1181		- XYZPanel = new JPanel();
1182		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1509	+ XYZPanel = new cGridBag().setVertical(true);
	1510	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1183	1511
1184		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1186		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1512	+ XYZPanel.preferredWidth = 5;
	1513	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1514	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1515	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1516	+ //XYZPanel.setName("XYZ");
1187	1517
1188	1518	/*
1189	1519	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1192,7 +1522,7 @@
1192	1522	gridPanel.add(cameraView);
1193	1523	gridPanel.add(XYZPanel);
1194	1524	*/
1195		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1525	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1196	1526	gridPanel.setContinuousLayout(true);
1197	1527	gridPanel.setOneTouchExpandable(true);
1198	1528	gridPanel.setDividerLocation(1.0);
..	..	@@ -1221,11 +1551,29 @@
1221	1551	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1222	1552	//tmp.setName("Edit");
1223	1553	objectPanel.add(materialPanel);
1224		- JPanel north = new JPanel(new BorderLayout());
1225		- north.setName("Edit");
1226		- north.add(ctrlPanel, BorderLayout.NORTH);
1227		- objectPanel.add(north);
1228		- objectPanel.add(infoPanel);
	1554	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1555	+ objectPanel.setToolTipTextAt(0, "Material");
	1556	+
	1557	+// JPanel north = new JPanel(new BorderLayout());
	1558	+// north.setName("Edit");
	1559	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1560	+// objectPanel.add(north);
	1561	+ objectPanel.add(editPanel);
	1562	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1563	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1564	+
	1565	+ //if (Globals.ADVANCED)
	1566	+ objectPanel.add(infoPanel);
	1567	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1568	+ objectPanel.setToolTipTextAt(2, "Information");
	1569	+
	1570	+ objectPanel.add(XYZPanel);
	1571	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1572	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
	1573	+
	1574	+ objectPanel.add(toolboxPanel);
	1575	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1576	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1229	1577
1230	1578	/*
1231	1579	aConstraints.gridx = 0;
..	..	@@ -1234,7 +1582,7 @@
1234	1582	aConstraints.gridy += 1;
1235	1583	aConstraints.gridwidth = 1;
1236	1584	mainPanel.add(objectPanel, aConstraints);
1237		- */
	1585	+ */
1238	1586
1239	1587	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1240	1588	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1245,16 +1593,23 @@
1245	1593	scrollpane.setWheelScrollingEnabled(true);
1246	1594	scrollpane.addMouseWheelListener(this); // Default not fast enough
1247	1595
1248		- /JTabbedPane/ scenePanel = new JTabbedPane();
1249		- scenePanel.add(scrollpane);
	1596	+ /JTabbedPane/ scenePanel = new cGridBag();
	1597	+ scenePanel.preferredWidth = 5;
	1598	+
	1599	+ JTabbedPane tabbedPane = new JTabbedPane();
	1600	+ tabbedPane.add(scrollpane);
1250	1601
1251		- scenePanel.add(FSPane = new cFileSystemPane(this));
1252		-
1253		- optionsPanel = new JPanel(new GridBagLayout());
	1602	+ optionsPanel = new cGridBag().setVertical(false);
1254	1603
1255	1604	optionsPanel.setName("Options");
1256		- scenePanel.add(optionsPanel);
	1605	+
	1606	+ AddOptions(optionsPanel); //, aConstraints);
	1607	+
	1608	+ tabbedPane.add(optionsPanel);
	1609	+
	1610	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1257	1611
	1612	+ scenePanel.add(tabbedPane);
1258	1613
1259	1614	/*
1260	1615	cTree jTree = new cTree(null);
..	..	@@ -1288,6 +1643,7 @@
1288	1643	//bigPanel.setSize(new Dimension(10,10));
1289	1644	//bigPanel.add(ctrlPanel);
1290	1645	//bigPanel.add(gridPanel);
	1646	+ /**
1291	1647	bigThree = new JPanel();
1292	1648	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1293	1649	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1304,14 +1660,20 @@
1304	1660	// aConstraints.gridheight = 3;
1305	1661	aWindowConstraints.gridx = 1;
1306	1662	aWindowConstraints.fill = GridBagConstraints.BOTH;
1307		- bigThree.add(cameraPanel, aWindowConstraints);
	1663	+ bigThree.add(centralPanel, aWindowConstraints);
1308	1664	aWindowConstraints.weightx = 0;
1309	1665	aWindowConstraints.gridx = 4;
1310	1666	aWindowConstraints.gridwidth = 1;
1311	1667	// aConstraints.gridheight = 3;
1312	1668	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1313	1669	bigThree.add(XYZPanel, aWindowConstraints);
	1670	+ /**/
1314	1671
	1672	+ bigThree = new cGridBag();
	1673	+ bigThree.addComponent(scenePanel);
	1674	+ bigThree.addComponent(centralPanel);
	1675	+ //bigThree.addComponent(XYZPanel);
	1676	+
1315	1677	// // SIDE EFFECT!!!
1316	1678	// aConstraints.gridx = 0;
1317	1679	// aConstraints.gridy = 0;
..	..	@@ -1319,9 +1681,9 @@
1319	1681	// aConstraints.gridheight = 1;
1320	1682
1321	1683	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1322		- framePanel.setContinuousLayout(true);
1323		- framePanel.setOneTouchExpandable(true);
1324		- framePanel.setDividerLocation(0.8);
	1684	+ framePanel.setContinuousLayout(false);
	1685	+ framePanel.setOneTouchExpandable(false);
	1686	+ //.setDividerLocation(0.8);
1325	1687	//framePanel.setDividerSize(15);
1326	1688	//framePanel.setResizeWeight(0.15);
1327	1689	framePanel.setName("Frame");
..	..	@@ -1332,20 +1694,25 @@
1332	1694	//worldPane.add(bigPanel);
1333	1695	//worldPane.add(worldPanel);
1334	1696	/**/
1335		- frame.getContentPane().add(/"Center",/framePanel);
	1697	+ //frame.getContentPane().add(/"Center",/framePanel);
	1698	+ frame.add(/"Center",/framePanel);
1336	1699	//frame.getContentPane().add(/"Center",/ worldPane);
1337	1700
1338	1701	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1339	1702
1340		- frame.setSize(1024, 768);
1341		- frame.show();
1342		-
	1703	+ frame.setSize(1280, 860);
	1704	+
	1705	+ cameraView.requestFocusInWindow();
	1706	+
1343	1707	gridPanel.setDividerLocation(1.0);
	1708	+
	1709	+ frame.validate();
	1710	+
	1711	+ frame.setVisible(true);
1344	1712
1345	1713	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1346	1714	frame.addWindowListener(new WindowAdapter()
1347	1715	{
1348		-
1349	1716	public void windowClosing(WindowEvent e)
1350	1717	{
1351	1718	Close();
..	..	@@ -1353,6 +1720,10 @@
1353	1720	});
1354	1721	}
1355	1722
	1723	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1724	+ {
	1725	+ }
	1726	+
1356	1727	JTree GetTree()
1357	1728	{
1358	1729	return objEditor.jTree;
..	..	@@ -1364,260 +1735,228 @@
1364	1735	ctrlPanel.removeAll();
1365	1736	}
1366	1737
1367		- void SetupMaterial(JPanel ctrlPanel)
	1738	+ void SetupMaterial(cGridBag materialpanel)
1368	1739	{
1369		- aConstraints.weighty = 0;
1370		- //aConstraints.weightx = 1;
1371		- /*
	1740	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1741	+ cLabel label = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1742	+ label.addMouseListener(new MouseAdapter()
	1743	+ {
	1744	+ public void mouseClicked(MouseEvent e)
	1745	+ {
	1746	+ colorField.setFloat(0);
	1747	+ saturationField.setFloat(1);
	1748	+ materialtouched = true;
	1749	+ applySelf();
	1750	+ }
	1751	+ });
	1752	+ presetpanel.add(label);
	1753	+
	1754	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF));
	1755	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1756	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1757	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1758	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1759	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1760	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1761	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1762	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1763	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1764	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1765	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1766	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1767	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1768	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1769	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1770	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1771	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF));
	1772	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00019.png", !Grafreed.NIMBUSLAF));
	1773	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00020.png", !Grafreed.NIMBUSLAF));
	1774	+
	1775	+ cGridBag panel = new cGridBag().setVertical(true);
	1776	+
	1777	+ presetpanel.preferredWidth = 1;
	1778	+
	1779	+ materialpanel.add(panel);
	1780	+ materialpanel.add(presetpanel);
	1781	+
	1782	+ panel.preferredWidth = 8;
	1783	+
	1784	+ /*
1372	1785	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1373	1786	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1374		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1375		- aConstraints.gridx += 1;
1376		- */
	1787	+ */
1377	1788
1378		- aConstraints.gridwidth = 1;
1379		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1380		- aConstraints.gridx += 1;
1381		- aConstraints.weighty = 0;
1382		- aConstraints.gridwidth = 1;
	1789	+ cGridBag editBar = new cGridBag().setVertical(false);
	1790	+
	1791	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1792	+ createMaterialButton.setToolTipText("Create material");
1383	1793
1384	1794	/*
1385	1795	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1386		- aConstraints.gridx += 1;
1387		- aConstraints.weighty = 0;
1388		- aConstraints.gridwidth = 1;
1389	1796	*/
1390	1797
1391		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1392		- aConstraints.gridx += 1;
	1798	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1799	+ clearMaterialButton.setToolTipText("Clear material");
	1800	+
	1801	+ if (Globals.ADVANCED)
	1802	+ {
	1803	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1804	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1805	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1806	+ }
1393	1807
1394		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1395		-
1396		- aConstraints.gridx += 1;
1397		-
1398		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1399		-
1400		- aConstraints.gridx += 1;
1401		-
1402		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1403		-
1404		- aConstraints.gridx = 0;
1405		- aConstraints.gridy += 1;
1406		- aConstraints.weighty = 0;
1407		- aConstraints.gridwidth = 1;
	1808	+ editBar.preferredHeight = 15;
	1809	+
	1810	+ panel.add(editBar);
	1811	+
1408	1812	/**/
1409	1813	//aConstraints.weighty = 0;
1410	1814	////aConstraints.weightx = 1;
1411	1815	//aConstraints.weighty = 1;
1412	1816	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1413	1817	//aConstraints.gridx += 1;
1414		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1415		- aConstraints.weighty = 0;
1416		- aConstraints.gridx = 0;
1417		- aConstraints.gridy += 1;
1418		- aConstraints.gridwidth = 1;
	1818	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1419	1819
1420		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1421		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1422		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1423		- aConstraints.gridx += 1;
1424		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1425		- //aConstraints.weightx = 0;
1426		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.gridwidth = 1;
	1820	+ cGridBag colorSection = new cGridBag().setVertical(true);
1430	1821
1431		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1432		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1433		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1434		- aConstraints.gridx += 1;
1435		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1436		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1437		- aConstraints.gridx = 0;
1438		- aConstraints.gridy += 1;
1439		- aConstraints.gridwidth = 1;
	1822	+ cGridBag huepanel = new cGridBag();
	1823	+ cGridBag huelabel = new cGridBag();
	1824	+ label = GetLabel("icons/hue.png", false);
	1825	+ label.fit = true;
	1826	+ huelabel.add(label);
	1827	+ huelabel.preferredWidth = 20;
	1828	+ huepanel.add(new cGridBag()); // Label
	1829	+ huepanel.add(huelabel); // Field/slider
	1830	+
	1831	+ huepanel.preferredHeight = 7;
1440	1832
1441		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1442		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1443		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1444		- aConstraints.gridx += 1;
1445		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1446		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1447		- aConstraints.gridx = 0;
1448		- aConstraints.gridy += 1;
1449		- aConstraints.gridwidth = 1;
	1833	+ colorSection.add(huepanel);
	1834	+
	1835	+ cGridBag color = new cGridBag();
	1836	+
	1837	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1838	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1839	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1450	1840
1451		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1452		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1453		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1454		- aConstraints.gridx += 1;
1455		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1456		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1457		- aConstraints.gridx = 0;
1458		- aConstraints.gridy += 1;
1459		- aConstraints.gridwidth = 1;
	1841	+ //colorField.preferredWidth = 200;
	1842	+ colorSection.add(color);
1460	1843
1461		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1462		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1463		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1464		- aConstraints.gridx += 1;
1465		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- aConstraints.gridwidth = 1;
	1844	+ cGridBag modulation = new cGridBag();
	1845	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1846	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1847	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1848	+ colorSection.add(modulation);
1470	1849
1471		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1472		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- aConstraints.gridwidth = 1;
	1850	+ cGridBag opacity = new cGridBag();
	1851	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1852	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1853	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1854	+ colorSection.add(opacity);
1480	1855
1481		- //aConstraints.weighty = 1;
1482		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1483		- //aConstraints.gridx += 1;
1484		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1485		- aConstraints.weighty = 0;
1486		- aConstraints.gridx = 0;
1487		- aConstraints.gridy += 1;
1488		- aConstraints.gridwidth = 1;
	1856	+ colorSection.add(GetSeparator());
	1857	+
	1858	+ cGridBag texture = new cGridBag();
	1859	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1860	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1861	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1862	+ colorSection.add(texture);
1489	1863
1490		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1491		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1492		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1493		- aConstraints.gridx += 1;
1494		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1495		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1496		- aConstraints.gridx = 0;
1497		- aConstraints.gridy += 1;
1498		- aConstraints.gridwidth = 1;
	1864	+ panel.add(GetSeparator());
	1865	+
	1866	+ panel.add(colorSection);
	1867	+
	1868	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1869	+
	1870	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1871	+
	1872	+ cGridBag diffuse = new cGridBag();
	1873	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1874	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1875	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1876	+ diffuseSection.add(diffuse);
1499	1877
1500		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1501		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1502		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1503		- aConstraints.gridx += 1;
1504		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1505		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1506		- aConstraints.gridx = 0;
1507		- aConstraints.gridy += 1;
1508		- aConstraints.gridwidth = 1;
	1878	+ cGridBag diffuseness = new cGridBag();
	1879	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1880	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1881	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1882	+ diffuseSection.add(diffuseness);
1509	1883
1510		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1511		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1512		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1513		- aConstraints.gridx += 1;
1514		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1515		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1516		- aConstraints.gridx = 0;
1517		- aConstraints.gridy += 1;
1518		- aConstraints.gridwidth = 1;
	1884	+ cGridBag selfshadow = new cGridBag();
	1885	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1886	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1887	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1888	+ diffuseSection.add(selfshadow);
1519	1889
1520		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1521		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1523		- aConstraints.gridx += 1;
1524		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1525		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- aConstraints.gridwidth = 1;
	1890	+ cGridBag sheen = new cGridBag();
	1891	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1892	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1893	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1894	+ diffuseSection.add(sheen);
1529	1895
1530		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1531		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- aConstraints.gridwidth = 1;
	1896	+ cGridBag subsurface = new cGridBag();
	1897	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1898	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1899	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1900	+ diffuseSection.add(subsurface);
1539	1901
1540		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1541		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- aConstraints.gridwidth = 1;
	1902	+ cGridBag shadow = new cGridBag();
	1903	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1904	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1905	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1906	+ diffuseSection.add(shadow);
1549	1907
1550		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1551		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- aConstraints.gridwidth = 1;
	1908	+ cGridBag fakedepth = new cGridBag();
	1909	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1910	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1911	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1912	+ diffuseSection.add(fakedepth);
1559	1913
1560		- //aConstraints.weighty = 1;
1561		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1562		- //aConstraints.gridx += 1;
1563		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1564		- aConstraints.weighty = 0;
1565		- aConstraints.gridx = 0;
1566		- aConstraints.gridy += 1;
1567		- aConstraints.gridwidth = 1;
	1914	+ cGridBag shadowbias = new cGridBag();
	1915	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1916	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1917	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1918	+ diffuseSection.add(shadowbias);
1568	1919
1569		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1570		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1571		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1572		- aConstraints.gridx += 1;
1573		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1574		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1575		- aConstraints.gridx = 0;
1576		- aConstraints.gridy += 1;
1577		- aConstraints.gridwidth = 1;
	1920	+ panel.add(GetSeparator());
	1921	+
	1922	+ panel.add(diffuseSection);
	1923	+
	1924	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1925	+
	1926	+ cGridBag specularSection = new cGridBag().setVertical(true);
1578	1927
1579		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1580		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1581		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1582		- aConstraints.gridx += 1;
1583		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1584		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1585		- aConstraints.gridx = 0;
1586		- aConstraints.gridy += 1;
1587		- aConstraints.gridwidth = 1;
	1928	+ cGridBag specular = new cGridBag();
	1929	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1930	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1931	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1932	+ specularSection.add(specular);
1588	1933
1589		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1590		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1591		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1592		- aConstraints.gridx += 1;
1593		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1594		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1595		- aConstraints.gridx = 0;
1596		- aConstraints.gridy += 1;
1597		- aConstraints.gridwidth = 1;
	1934	+ cGridBag lightarea = new cGridBag();
	1935	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1936	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1937	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1938	+ specularSection.add(lightarea);
1598	1939
1599		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1600		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1601		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1602		- aConstraints.gridx += 1;
1603		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- aConstraints.gridwidth = 1;
	1940	+ cGridBag shininess = new cGridBag();
	1941	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1942	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1943	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1944	+ specularSection.add(shininess);
1608	1945
1609		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1610		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- aConstraints.gridwidth = 1;
	1946	+ cGridBag metalness = new cGridBag();
	1947	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1948	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1949	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1950	+ specularSection.add(metalness);
1618	1951
1619		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1620		- Return();
	1952	+ cGridBag velvet = new cGridBag();
	1953	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1954	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1955	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1956	+ specularSection.add(velvet);
	1957	+
	1958	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1959	+ //Return();
1621	1960	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1622	1961	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	1962	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1628,130 +1967,99 @@
1628	1967	// aConstraints.gridy += 1;
1629	1968	// aConstraints.gridwidth = 1;
1630	1969
1631		- //aConstraints.weighty = 1;
1632		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1633		- //aConstraints.gridx += 1;
1634		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1635		- aConstraints.weighty = 0;
1636		- aConstraints.gridx = 0;
1637		- aConstraints.gridy += 1;
1638		- aConstraints.gridwidth = 1;
	1970	+ cGridBag anisoU = new cGridBag();
	1971	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1972	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1973	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1974	+ specularSection.add(anisoU);
1639	1975
1640		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1641		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1642		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1643		- aConstraints.gridx += 1;
1644		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1645		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1646		- aConstraints.gridx = 0;
1647		- aConstraints.gridy += 1;
1648		- aConstraints.gridwidth = 1;
	1976	+ cGridBag anisoV = new cGridBag();
	1977	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1978	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1979	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1980	+ specularSection.add(anisoV);
1649	1981
1650		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1651		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1652		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1653		- aConstraints.gridx += 1;
1654		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1655		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1656		- aConstraints.gridx = 0;
1657		- aConstraints.gridy += 1;
1658		- aConstraints.gridwidth = 1;
1659	1982
1660		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1661		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1663		- aConstraints.gridx += 1;
1664		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1665		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1666		- aConstraints.gridx = 0;
1667		- aConstraints.gridy += 1;
1668		- aConstraints.gridwidth = 1;
	1983	+ panel.add(GetSeparator());
	1984	+
	1985	+ panel.add(specularSection);
	1986	+
	1987	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1988	+
	1989	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1669	1990
1670		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1671		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1673		- aConstraints.gridx += 1;
1674		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- aConstraints.gridwidth = 1;
1679		- aConstraints.weighty = 0;
	1991	+ cGridBag camera = new cGridBag();
	1992	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1993	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1994	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1995	+ colorSection.add(camera);
1680	1996
1681		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1682		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1683		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1684		- aConstraints.gridx += 1;
1685		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1686		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1687		- aConstraints.gridx = 0;
1688		- aConstraints.gridy += 1;
1689		- aConstraints.gridwidth = 1;
	1997	+ cGridBag ambient = new cGridBag();
	1998	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1999	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2000	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2001	+ colorSection.add(ambient);
1690	2002
1691		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1692		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1694		- aConstraints.gridx += 1;
1695		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1696		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1697		- aConstraints.gridx = 0;
1698		- aConstraints.gridy += 1;
1699		- aConstraints.gridwidth = 1;
	2003	+ cGridBag backlit = new cGridBag();
	2004	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2005	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2006	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2007	+ colorSection.add(backlit);
1700	2008
1701		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1702		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1704		- aConstraints.gridx += 1;
1705		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1706		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1707		- aConstraints.gridx = 0;
1708		- aConstraints.gridy += 1;
1709		- aConstraints.gridwidth = 1;
	2009	+ //panel.add(new JSeparator());
	2010	+
	2011	+ //panel.add(globalSection);
	2012	+
	2013	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2014	+
	2015	+ cGridBag textureSection = new cGridBag().setVertical(true);
1710	2016
1711		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1712		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1714		- aConstraints.gridx += 1;
1715		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1716		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1717		- aConstraints.gridx = 0;
1718		- aConstraints.gridy += 1;
1719		- aConstraints.gridwidth = 1;
	2017	+ cGridBag bump = new cGridBag();
	2018	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2019	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2020	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2021	+ textureSection.add(bump);
1720	2022
1721		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1722		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- aConstraints.gridwidth = 1;
	2023	+ cGridBag noise = new cGridBag();
	2024	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2025	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2026	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2027	+ textureSection.add(noise);
1730	2028
1731		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1732		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- aConstraints.gridwidth = 1;
	2029	+ cGridBag power = new cGridBag();
	2030	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2031	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2032	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2033	+ textureSection.add(power);
1740	2034
1741		- //aConstraints.weighty = 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1743		- //aConstraints.gridx += 1;
1744		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1745		- aConstraints.weighty = 0;
	2035	+ cGridBag borderfade = new cGridBag();
	2036	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2037	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2038	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2039	+ textureSection.add(borderfade);
1746	2040
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy = 0;
1749		- aConstraints.gridwidth = 1;
	2041	+ cGridBag fog = new cGridBag();
	2042	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2043	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2044	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2045	+ textureSection.add(fog);
	2046	+
	2047	+ cGridBag opacityPower = new cGridBag();
	2048	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2049	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2050	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2051	+ textureSection.add(opacityPower);
	2052	+
	2053	+ panel.add(GetSeparator());
	2054	+
	2055	+ panel.add(textureSection);
	2056	+
	2057	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1750	2058
1751	2059	SetMaterial(copy); // .GetMaterial());
1752	2060
1753		- colorField.addChangeListener(this);
1754		- modulationField.addChangeListener(this);
	2061	+ //colorField.addChangeListener(this);
	2062	+// modulationField.addChangeListener(this);
1755	2063	metalnessField.addChangeListener(this);
1756	2064	diffuseField.addChangeListener(this);
1757	2065	specularField.addChangeListener(this);
..	..	@@ -1781,12 +2089,15 @@
1781	2089	opacityPowerField.addChangeListener(this);
1782	2090	/**/
1783	2091
1784		- resetSlidersButton.addActionListener(this);
1785	2092	clearMaterialButton.addActionListener(this);
1786	2093	createMaterialButton.addActionListener(this);
1787		-
1788		- propagateToggle.addItemListener(this);
1789		- multiplyToggle.addItemListener(this);
	2094	+
	2095	+ if (Globals.ADVANCED)
	2096	+ {
	2097	+ resetSlidersButton.addActionListener(this);
	2098	+ propagateToggle.addItemListener(this);
	2099	+ multiplyToggle.addItemListener(this);
	2100	+ }
1790	2101	}
1791	2102
1792	2103	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1804,8 +2115,9 @@
1804	2115	// 3D models
1805	2116	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1806	2117	{
1807		- lastConverter = new com.jmex.model.converters.MaxToJme();
1808		- LoadFile(filename, lastConverter);
	2118	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2119	+ //LoadFile(filename, lastConverter);
	2120	+ LoadObjFile(filename); // New 3ds loader
1809	2121	continue;
1810	2122	}
1811	2123	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1957,7 +2269,7 @@
1957	2269
1958	2270	//? flashIt = false;
1959	2271	CameraPane pane = (CameraPane) cameraView;
1960		- pane.clickStart(location.x, location.y, 0);
	2272	+ pane.clickStart(location.x, location.y, 0, 0);
1961	2273	pane.clickEnd(location.x, location.y, 0, true);
1962	2274
1963	2275	if (group.selection.size() == 1)
..	..	@@ -2006,6 +2318,7 @@
2006	2318	e2.printStackTrace();
2007	2319	}
2008	2320	}
	2321	+
2009	2322	LoadJMEThread loadThread;
2010	2323
2011	2324	class LoadJMEThread extends Thread
..	..	@@ -2063,6 +2376,7 @@
2063	2376	//LoadFile0(filename, converter);
2064	2377	}
2065	2378	}
	2379	+
2066	2380	LoadOBJThread loadObjThread;
2067	2381
2068	2382	class LoadOBJThread extends Thread
..	..	@@ -2141,19 +2455,19 @@
2141	2455
2142	2456	void LoadObjFile(String fullname)
2143	2457	{
2144		- /*
	2458	+ System.out.println("Loading " + fullname);
	2459	+ /**/
2145	2460	//lastFilename = fullname;
2146	2461	if(loadObjThread == null)
2147	2462	{
2148		- loadObjThread = new LoadOBJThread();
2149		- loadObjThread.start();
	2463	+ loadObjThread = new LoadOBJThread();
	2464	+ loadObjThread.start();
2150	2465	}
2151	2466
2152	2467	loadObjThread.add(fullname);
2153		- */
	2468	+ /**/
2154	2469
2155		- System.out.println("Loading " + fullname);
2156		- makeSomething(new FileObject(fullname, true), true);
	2470	+ //makeSomething(new FileObject(fullname, true), true);
2157	2471	}
2158	2472
2159	2473	void LoadGFDFile(String fullname)
..	..	@@ -2414,11 +2728,11 @@
2414	2728
2415	2729	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2416	2730	{
2417		- if (GrafreeD.standAlone)
	2731	+ if (Grafreed.standAlone)
2418	2732	{
2419	2733	/**/
2420	2734	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2421		- browser.show();
	2735	+ browser.setVisible(true);
2422	2736	String filename = browser.getFile();
2423	2737	if (filename != null && filename.length() > 0)
2424	2738	{
..	..	@@ -2529,6 +2843,7 @@
2529	2843	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2530	2844	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2531	2845	}
	2846	+
2532	2847	//cJME.count++;
2533	2848	//cJME.count %= 12;
2534	2849	if (gc)
..	..	@@ -2563,6 +2878,7 @@
2563	2878	}
2564	2879	if (input == null)
2565	2880	{
	2881	+ new Exception().printStackTrace();
2566	2882	System.exit(0);
2567	2883	}
2568	2884
..	..	@@ -2711,6 +3027,7 @@
2711	3027	}
2712	3028	}
2713	3029	}
	3030	+
2714	3031	cFileSystemPane FSPane;
2715	3032
2716	3033	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2720,7 +3037,7 @@
2720	3037
2721	3038	freezematerial = true;
2722	3039	colorField.setFloat(mat.color);
2723		- modulationField.setFloat(mat.modulation);
	3040	+ saturationField.setFloat(mat.modulation);
2724	3041	metalnessField.setFloat(mat.metalness);
2725	3042	diffuseField.setFloat(mat.diffuse);
2726	3043	specularField.setFloat(mat.specular);
..	..	@@ -2764,11 +3081,14 @@
2764	3081	}
2765	3082	}
2766	3083	}
	3084	+
2767	3085	freezematerial = false;
2768	3086	}
2769	3087
2770	3088	void SetMaterial(Object3D object)
2771	3089	{
	3090	+ latestObject = object;
	3091	+
2772	3092	cMaterial mat = object.material;
2773	3093
2774	3094	if (mat == null)
..	..	@@ -2777,7 +3097,8 @@
2777	3097	return;
2778	3098	}
2779	3099
2780		- multiplyToggle.setSelected(mat.multiply);
	3100	+ if (multiplyToggle != null)
	3101	+ multiplyToggle.setSelected(mat.multiply);
2781	3102
2782	3103	assert (object.projectedVertices != null);
2783	3104
..	..	@@ -2879,12 +3200,17 @@
2879	3200	// }
2880	3201
2881	3202	/**/
2882		- if (deselect)
	3203	+ if (deselect \|\| child == null)
2883	3204	{
2884	3205	//group.deselectAll();
2885	3206	//freeze = true;
2886	3207	GetTree().clearSelection();
2887	3208	//freeze = false;
	3209	+
	3210	+ if (child == null)
	3211	+ {
	3212	+ return;
	3213	+ }
2888	3214	}
2889	3215
2890	3216	//group.addSelectee(child);
..	..	@@ -2953,31 +3279,48 @@
2953	3279	cameraView.ToggleDL();
2954	3280	cameraView.repaint();
2955	3281	return;
2956		- } else if (event.getSource() == toggleTextureItem)
	3282	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2957	3283	{
2958	3284	cameraView.ToggleTexture();
2959	3285	// june 2013 copy.HardTouch();
2960	3286	cameraView.repaint();
2961	3287	return;
2962		- } else if (event.getSource() == toggleFullItem)
	3288	+ } else if (event.getSource() == toggleTimelineItem)
2963	3289	{
2964		- if (CameraPane.FULLSCREEN)
	3290	+ timeline ^= true;
	3291	+
	3292	+ if (timeline)
2965	3293	{
2966		- frame.getContentPane().remove(/"Center",/bigThree);
2967		- framePanel.add(bigThree);
2968		- frame.getContentPane().add(/"Center",/framePanel);
2969		- } else
2970		- {
2971		- frame.getContentPane().remove(/"Center",/framePanel);
2972		- frame.getContentPane().add(/"Center",/bigThree);
	3294	+ centralPanel.remove(cameraView);
	3295	+ cameraPanel.add(cameraView);
	3296	+ centralPanel.add(cameraPanel);
	3297	+ frame.setJMenuBar(timelineMenubar);
	3298	+ wasFullScreen = CameraPane.FULLSCREEN;
	3299	+ if (!CameraPane.FULLSCREEN)
	3300	+ ToggleFullScreen();
	3301	+ toggleFullScreenItem.setEnabled(false);
2973	3302	}
	3303	+ else
	3304	+ {
	3305	+ centralPanel.remove(cameraPanel);
	3306	+ centralPanel.add(cameraView);
	3307	+ frame.setJMenuBar(null);
	3308	+ if (!wasFullScreen)
	3309	+ ToggleFullScreen();
	3310	+ toggleFullScreenItem.setEnabled(true);
	3311	+ }
	3312	+
2974	3313	frame.validate();
2975		- cameraView.ToggleFullScreen();
	3314	+ return;
	3315	+ } else if (event.getSource() == toggleFullScreenItem)
	3316	+ {
	3317	+ ToggleFullScreen();
	3318	+ frame.validate();
2976	3319
2977	3320	return;
2978		- } else if (event.getSource() == toggleRandomItem)
	3321	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2979	3322	{
2980		- cameraView.ToggleRandom();
	3323	+ cameraView.ToggleSwitch();
2981	3324	cameraView.repaint();
2982	3325	return;
2983	3326	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3005,12 +3348,17 @@
3005	3348	} else if (event.getSource() == liveCB)
3006	3349	{
3007	3350	copy.live ^= true;
	3351	+ objEditor.refreshContents(true); // To show item colors
	3352	+ return;
	3353	+ } else if (event.getSource() == selectableCB)
	3354	+ {
	3355	+ copy.dontselect ^= true;
3008	3356	return;
3009	3357	} else if (event.getSource() == hideCB)
3010	3358	{
3011	3359	copy.hide ^= true;
3012	3360	copy.Touch(); // display list issue
3013		- objEditor.refreshContents();
	3361	+ objEditor.refreshContents(true); // To show item colors
3014	3362	return;
3015	3363	} else if (event.getSource() == link2masterCB)
3016	3364	{
..	..	@@ -3020,6 +3368,7 @@
3020	3368	if (event.getSource() == randomCB)
3021	3369	{
3022	3370	copy.random ^= true;
	3371	+ objEditor.refreshContents();
3023	3372	return;
3024	3373	}
3025	3374	if (event.getSource() == speedupCB)
..	..	@@ -3043,8 +3392,9 @@
3043	3392
3044	3393	public void actionPerformed(ActionEvent event)
3045	3394	{
	3395	+ Object source = event.getSource();
3046	3396	// SCRIPT DIALOG
3047		- if (event.getSource() == okbutton)
	3397	+ if (source == okbutton)
3048	3398	{
3049	3399	textpanel.setVisible(false);
3050	3400	textpanel.remove(textarea);
..	..	@@ -3056,7 +3406,7 @@
3056	3406	textarea = null;
3057	3407	textpanel = null;
3058	3408	}
3059		- if (event.getSource() == cancelbutton)
	3409	+ if (source == cancelbutton)
3060	3410	{
3061	3411	textpanel.setVisible(false);
3062	3412	textpanel.remove(textarea);
..	..	@@ -3068,49 +3418,50 @@
3068	3418	//applySelf();
3069	3419	//client.refreshEditWindow();
3070	3420	//refreshContents();
3071		- if (event.getSource() == nameField)
	3421	+ if (source == nameField)
3072	3422	{
3073	3423	//System.out.println("ObjEditor " + event);
3074	3424	applySelf0(true);
3075	3425	//parent.applySelf();
3076	3426	objEditor.refreshContents();
3077		- } else if (event.getSource() == resetButton)
	3427	+ } else if (source == resetButton)
3078	3428	{
3079	3429	CameraPane.fullreset = true;
3080	3430	copy.Reset(); // ResetMeshes();
3081	3431	copy.Touch();
3082	3432	objEditor.refreshContents();
3083		- } else if (event.getSource() == stepItem)
	3433	+ } else if (source == stepItem)
3084	3434	{
3085		- cameraView.ONESTEP = true;
	3435	+ //cameraView.ONESTEP = true;
	3436	+ Globals.ONESTEP = true;
3086	3437	cameraView.repaint();
3087	3438	return;
3088		- } else if (event.getSource() == stepButton)
	3439	+ } else if (source == stepButton)
3089	3440	{
3090	3441	copy.Step();
3091	3442	copy.Touch();
3092	3443	objEditor.refreshContents();
3093		- } else if (event.getSource() == slowerButton)
	3444	+ } else if (source == slowerButton)
3094	3445	{
3095	3446	copy.Slower();
3096	3447	copy.Touch();
3097	3448	objEditor.refreshContents();
3098		- } else if (event.getSource() == fasterButton)
	3449	+ } else if (source == fasterButton)
3099	3450	{
3100	3451	copy.Faster();
3101	3452	copy.Touch();
3102	3453	objEditor.refreshContents();
3103		- } else if (event.getSource() == remarkButton)
	3454	+ } else if (source == remarkButton)
3104	3455	{
3105	3456	copy.Remark();
3106	3457	copy.Touch();
3107	3458	objEditor.refreshContents();
3108		- } else if (event.getSource() == stepAllButton)
	3459	+ } else if (source == stepAllButton)
3109	3460	{
3110	3461	copy.StepAll();
3111	3462	copy.Touch();
3112	3463	objEditor.refreshContents();
3113		- } else if (event.getSource() == resetAllButton)
	3464	+ } else if (source == resetAllButton)
3114	3465	{
3115	3466	//CameraPane.fullreset = true;
3116	3467	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3143,53 +3494,79 @@
3143	3494	// Close();
3144	3495	// }
3145	3496	// else
3146		- if (event.getSource() == resetSlidersButton)
	3497	+ if (source == resetSlidersButton)
3147	3498	{
3148	3499	ResetSliders();
3149		- } else if (event.getSource() == clearMaterialButton)
	3500	+ } else if (source == clearMaterialButton)
3150	3501	{
3151	3502	ClearMaterial();
3152		- } else if (event.getSource() == createMaterialButton)
	3503	+ } else if (source == createMaterialButton)
3153	3504	{
3154	3505	CreateMaterial();
3155		- } else if (event.getSource() == clearPanelButton)
	3506	+ } else if (source == clearPanelButton)
3156	3507	{
3157	3508	copy.ClearUI();
3158	3509	refreshContents(true);
3159		- } /*
3160		- }
3161		-
3162		- public boolean action(Event event, Object arg)
3163		- {
3164		- */ else if (event.getSource() == closeItem)
	3510	+ } else if (source == importGFDItem)
	3511	+ {
	3512	+ ImportGFD();
	3513	+ } else
	3514	+ if (source == importVRMLX3DItem)
	3515	+ {
	3516	+ ImportVRMLX3D();
	3517	+ } else
	3518	+ if (source == import3DSItem)
	3519	+ {
	3520	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3521	+ } else
	3522	+ if (source == importOBJItem)
	3523	+ {
	3524	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3525	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3526	+ browser.setVisible(true);
	3527	+ String filename = browser.getFile();
	3528	+ if (filename != null && filename.length() > 0)
	3529	+ {
	3530	+ String fullname = browser.getDirectory() + filename;
	3531	+ makeSomething(ReadOBJ(fullname), true);
	3532	+ }
	3533	+ } else
	3534	+ if (source == closeItem)
3165	3535	{
3166	3536	Close();
3167	3537	//return true;
3168		- } else if (event.getSource() == loadItem)
	3538	+ } else if (source == openItem)
3169	3539	{
3170		- load();
	3540	+ Open();
3171	3541	//return true;
3172		- } else if (event.getSource() == saveItem)
	3542	+ } else if (source == newItem)
	3543	+ {
	3544	+ New();
	3545	+ } else if (source == saveItem)
3173	3546	{
3174	3547	save();
3175	3548	//return true;
3176		- } else if (event.getSource() == saveAsItem)
	3549	+ } else if (source == saveAsItem)
3177	3550	{
3178	3551	saveAs();
3179	3552	//return true;
3180		- } else if (event.getSource() == reexportItem)
	3553	+ } else if (source == reexportItem)
3181	3554	{
3182	3555	reexport();
3183	3556	//return true;
3184		- } else if (event.getSource() == exportAsItem)
	3557	+ } else if (source == exportAsItem)
3185	3558	{
3186	3559	export();
3187	3560	//return true;
3188		- } else if (event.getSource() == povItem)
	3561	+ } else if (source == povItem)
3189	3562	{
3190	3563	generatePOV();
3191	3564	//return true;
3192		- } else if (event.getSource() == zBufferItem)
	3565	+ } else if (event.getSource() == archiveItem)
	3566	+ {
	3567	+ cTools.Archive(frame);
	3568	+ return;
	3569	+ } else if (source == zBufferItem)
3193	3570	{
3194	3571	try
3195	3572	{
..	..	@@ -3211,21 +3588,8 @@
3211	3588	cameraView.repaint();
3212	3589	//return true;
3213	3590	}
3214		- */ else if (event.getSource() == editCameraItem)
3215		- {
3216		- cameraView.ProtectCamera();
3217		- cameraView.repaint();
3218		- return;
3219		- } else if (event.getSource() == revertCameraItem)
3220		- {
3221		- cameraView.RevertCamera();
3222		- cameraView.repaint();
3223		- return;
3224		- } else if (event.getSource() == textureButton)
3225		- {
3226		- return; // true;
3227		- } else // combos...
3228		- if (event.getSource() == texresMenu)
	3591	+ */ else // combos...
	3592	+ if (source == texresMenu)
3229	3593	{
3230	3594	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3231	3595	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3237,27 +3601,463 @@
3237	3601	}
3238	3602	}
3239	3603
3240		- void ToggleAnimation()
	3604	+ void New()
3241	3605	{
3242		- if (!CameraPane.ANIMATION)
	3606	+ while (copy.Size() > 1)
3243	3607	{
3244		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3608	+ copy.remove(1);
	3609	+ }
	3610	+
	3611	+ ResetModel();
	3612	+ objEditor.refreshContents();
	3613	+ }
	3614	+
	3615	+ static public byte[] Compress(Object3D o)
	3616	+ {
	3617	+ // Slower to actually compress.
	3618	+ try
	3619	+ {
	3620	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3621	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3622	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3623	+
	3624	+ Object3D parent = o.parent;
	3625	+ o.parent = null;
	3626	+
	3627	+ out.writeObject(o);
	3628	+
	3629	+ o.parent = parent;
	3630	+
	3631	+ out.flush();
	3632	+
	3633	+ baos //zstream
	3634	+ .close();
	3635	+ out.close();
	3636	+
	3637	+ byte[] bytes = baos.toByteArray();
	3638	+
	3639	+ System.out.println("save #bytes = " + bytes.length);
	3640	+ return bytes;
	3641	+ } catch (Exception e)
	3642	+ {
	3643	+ System.err.println(e);
	3644	+ return null;
	3645	+ }
	3646	+ }
	3647	+
	3648	+ static public Object Uncompress(byte[] bytes)
	3649	+ {
	3650	+ System.out.println("restore #bytes = " + bytes.length);
	3651	+ try
	3652	+ {
	3653	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3654	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3655	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3656	+ Object obj = in.readObject();
	3657	+
	3658	+ bais //istream
	3659	+ .close();
	3660	+ in.close();
	3661	+
	3662	+ return obj;
	3663	+ } catch (Exception e)
	3664	+ {
	3665	+ System.err.println(e);
	3666	+ return null;
	3667	+ }
	3668	+ }
	3669	+
	3670	+ static public Object clone(Object o)
	3671	+ {
	3672	+ try
	3673	+ {
	3674	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3675	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3676	+
	3677	+ out.writeObject(o);
	3678	+
	3679	+ out.flush();
	3680	+ out.close();
	3681	+
	3682	+ byte[] bytes = baos.toByteArray();
	3683	+
	3684	+ System.out.println("clone = " + bytes.length);
	3685	+
	3686	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3687	+ ObjectInputStream in = new ObjectInputStream(bais);
	3688	+ Object obj = in.readObject();
	3689	+ in.close();
	3690	+
	3691	+ return obj;
	3692	+ } catch (Exception e)
	3693	+ {
	3694	+ System.err.println(e);
	3695	+ return null;
	3696	+ }
	3697	+ }
	3698	+
	3699	+ cRadio GetCurrentTab()
	3700	+ {
	3701	+ cRadio ab;
	3702	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3703	+ {
	3704	+ ab = (cRadio)e.nextElement();
	3705	+ if(ab.GetObject() == copy)
	3706	+ {
	3707	+ return ab;
	3708	+ }
	3709	+ }
	3710	+
	3711	+ return null;
	3712	+ }
	3713	+
	3714	+
	3715	+ public void Save()
	3716	+ {
	3717	+ //Save(true);
	3718	+ Replace();
	3719	+ SetUndoStates();
	3720	+ }
	3721	+
	3722	+ private boolean Equal(byte[] compress, byte[] name)
	3723	+ {
	3724	+ if (compress.length != name.length)
	3725	+ {
	3726	+ return false;
	3727	+ }
	3728	+
	3729	+ for (int i=compress.length; --i>=0;)
	3730	+ {
	3731	+ if (compress[i] != name[i])
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ return true;
	3736	+ }
	3737	+
	3738	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3739	+
	3740	+ public boolean Save(boolean user)
	3741	+ {
	3742	+ System.err.println("Save");
	3743	+ Replace();
	3744	+
	3745	+ cRadio tab = GetCurrentTab();
	3746	+
	3747	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
	3748	+
	3749	+ boolean thesame = false;
	3750	+
	3751	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3752	+// {
	3753	+// thesame = true;
	3754	+// }
	3755	+
	3756	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3757	+ if (!thesame)
	3758	+ {
	3759	+ //tab.user[tab.versionindex] = user;
	3760	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3761	+
	3762	+ copy.versionlist[++copy.versionindex] = compress;
	3763	+
	3764	+ // if (increment)
	3765	+ // tab.versionindex++;
	3766	+ }
	3767	+
	3768	+ //copy.RestoreBigData(versiontable);
	3769	+
	3770	+ //assert(hashtable.isEmpty());
	3771	+
	3772	+ for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3773	+ {
	3774	+ //tab.user[i] = false;
	3775	+ copy.versionlist[i] = null;
	3776	+ }
	3777	+
	3778	+ SetUndoStates();
	3779	+
	3780	+ // test save
	3781	+ if (false)
	3782	+ {
	3783	+ try
	3784	+ {
	3785	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3786	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3787	+
	3788	+ p.writeObject(copy);
	3789	+
	3790	+ p.flush();
	3791	+
	3792	+ ostream.close();
	3793	+ } catch (Exception e)
	3794	+ {
	3795	+ e.printStackTrace();
	3796	+ }
	3797	+ }
	3798	+
	3799	+ return !thesame;
	3800	+ }
	3801	+
	3802	+ boolean flashIt = true;
	3803	+
	3804	+ void RefreshSelection()
	3805	+ {
	3806	+ Object3D selection = new Object3D();
	3807	+
	3808	+ for (int i = 0; i < copy.selection.size(); i++)
	3809	+ {
	3810	+ Object3D elem = copy.selection.elementAt(i);
	3811	+
	3812	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3813	+
	3814	+ if (obj == null)
	3815	+ {
	3816	+ copy.selection.remove(i--);
	3817	+ }
	3818	+ else
	3819	+ {
	3820	+ selection.add(obj);
	3821	+ copy.selection.setElementAt(obj, i);
	3822	+ }
	3823	+ }
	3824	+
	3825	+ flashIt = false;
	3826	+ GetTree().clearSelection();
	3827	+ for (int i = 0; i < selection.size(); i++)
	3828	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3829	+ flashIt = true;
	3830	+
	3831	+ refreshContents(false);
	3832	+ }
	3833	+
	3834	+ void CopyChanged(Object3D obj)
	3835	+ {
	3836	+ SetUndoStates();
	3837	+
	3838	+ boolean temp = CameraPane.SWITCH;
	3839	+ CameraPane.SWITCH = false;
	3840	+
	3841	+ copy.ExtractBigData(versiontable);
	3842	+
	3843	+ copy.clear();
	3844	+
	3845	+ copy.skyboxname = obj.skyboxname;
	3846	+ copy.skyboxext = obj.skyboxext;
	3847	+
	3848	+ for (int i=0; i<obj.Size(); i++)
	3849	+ {
	3850	+ copy.add(obj.get(i));
	3851	+ }
	3852	+
	3853	+ copy.RestoreBigData(versiontable);
	3854	+
	3855	+ CameraPane.SWITCH = temp;
	3856	+
	3857	+ RefreshSelection();
	3858	+ //assert(hashtable.isEmpty());
	3859	+
	3860	+ copy.Touch();
	3861	+
	3862	+ ResetModel();
	3863	+ copy.HardTouch(); // recompile?
	3864	+
	3865	+ cRadio ab;
	3866	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3867	+ {
	3868	+ ab = (cRadio)e.nextElement();
	3869	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3870	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3871	+ if (test != null)
	3872	+ {
	3873	+ test.editWindow = ab.object.editWindow;
	3874	+ ab.object = test;
	3875	+ }
	3876	+ }
	3877	+
	3878	+ refreshContents();
	3879	+ }
	3880	+
	3881	+ cButton undoButton;
	3882	+ cButton restoreButton;
	3883	+ cButton replaceButton;
	3884	+ cButton redoButton;
	3885	+
	3886	+ boolean muteSlider;
	3887	+
	3888	+ int VersionCount()
	3889	+ {
	3890	+ int count = 0;
	3891	+
	3892	+ for (int i = copy.versionlist.length; --i >= 0;)
	3893	+ {
	3894	+ if (copy.versionlist[i] != null)
	3895	+ count++;
	3896	+ }
	3897	+
	3898	+ return count;
	3899	+ }
	3900	+
	3901	+ void SetUndoStates()
	3902	+ {
	3903	+ cRadio tab = GetCurrentTab();
	3904	+
	3905	+ restoreButton.setEnabled(copy.versionindex != -1);
	3906	+ replaceButton.setEnabled(copy.versionindex != -1);
	3907	+
	3908	+ undoButton.setEnabled(copy.versionindex > 0);
	3909	+ redoButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3910	+
	3911	+ muteSlider = true;
	3912	+ versionSlider.setMaximum(VersionCount() - 1);
	3913	+ versionSlider.setInteger(copy.versionindex);
	3914	+ muteSlider = false;
	3915	+ }
	3916	+
	3917	+ public boolean Undo()
	3918	+ {
	3919	+ // Option?
	3920	+ Replace();
	3921	+
	3922	+ System.err.println("Undo");
	3923	+
	3924	+ cRadio tab = GetCurrentTab();
	3925	+
	3926	+ if (copy.versionindex == 0)
	3927	+ {
	3928	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3929	+ return false;
	3930	+ }
	3931	+
	3932	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3933	+// {
	3934	+// if (Save(false))
	3935	+// tab.versionindex -= 1;
	3936	+// else
	3937	+// {
	3938	+// if (tab.versionindex <= 0)
	3939	+// return false;
	3940	+// else
	3941	+// tab.versionindex -= 1;
	3942	+// }
	3943	+// }
	3944	+
	3945	+ copy.versionindex -= 1;
	3946	+
	3947	+ CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
	3948	+
	3949	+ return true;
	3950	+ }
	3951	+
	3952	+ public boolean Restore()
	3953	+ {
	3954	+ System.err.println("Restore");
	3955	+
	3956	+ cRadio tab = GetCurrentTab();
	3957	+
	3958	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3959	+ {
	3960	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3961	+ return false;
	3962	+ }
	3963	+
	3964	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3965	+ CopyChanged(copy.versionlist[copy.versionindex]);
	3966	+
	3967	+ return true;
	3968	+ }
	3969	+
	3970	+ public boolean Replace()
	3971	+ {
	3972	+ System.err.println("Replace");
	3973	+
	3974	+ cRadio tab = GetCurrentTab();
	3975	+
	3976	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3977	+ {
	3978	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3979	+ return false;
	3980	+ }
	3981	+
	3982	+ copy.versionlist[copy.versionindex] = CompressCopy();
	3983	+
	3984	+ return true;
	3985	+ }
	3986	+
	3987	+ public void Redo()
	3988	+ {
	3989	+ // Option?
	3990	+ Replace();
	3991	+
	3992	+ cRadio tab = GetCurrentTab();
	3993	+
	3994	+ if (copy.versionlist[copy.versionindex + 1] == null)
	3995	+ {
	3996	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3997	+ return;
	3998	+ }
	3999	+
	4000	+ copy.versionindex += 1;
	4001	+
	4002	+ CopyChanged(copy.versionlist[copy.versionindex]);
	4003	+
	4004	+ //if (!tab.user[tab.versionindex])
	4005	+ // tab.graphs[tab.versionindex] = null;
	4006	+ }
	4007	+
	4008	+ void ImportGFD()
	4009	+ {
	4010	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3245	4011	browser.show();
3246	4012	String filename = browser.getFile();
3247	4013	if (filename != null && filename.length() > 0)
3248	4014	{
3249		- CameraPane.filename = browser.getDirectory() + filename;
	4015	+ String fullname = browser.getDirectory() + filename;
	4016	+
	4017	+ //Object3D readobj =
	4018	+ objEditor.ReadGFD(fullname, objEditor);
	4019	+ //makeSomething(readobj);
	4020	+ }
	4021	+ }
	4022	+
	4023	+ void ImportVRMLX3D()
	4024	+ {
	4025	+ if (Grafreed.standAlone)
	4026	+ {
	4027	+ /**/
	4028	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4029	+ browser.show();
	4030	+ String filename = browser.getFile();
	4031	+ if (filename != null && filename.length() > 0)
	4032	+ {
	4033	+ String fullname = browser.getDirectory() + filename;
	4034	+ LoadVRMLX3D(fullname);
	4035	+ }
	4036	+ /**/
	4037	+ }
	4038	+ }
	4039	+
	4040	+ void ToggleAnimation()
	4041	+ {
	4042	+ if (!Globals.ANIMATION)
	4043	+ {
	4044	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4045	+ browser.setVisible(true);
	4046	+ String filename = browser.getFile();
	4047	+ if (filename != null && filename.length() > 0)
	4048	+ {
	4049	+ Globals.filename = browser.getDirectory() + filename;
3250	4050	//CameraPane.framecount = 0;
3251		- CameraPane.imagecount = 0;
	4051	+ Globals.imagecount = 0;
3252	4052
3253		- CameraPane.ANIMATION ^= true;
	4053	+ Globals.ANIMATION ^= true;
3254	4054
3255		- GrafreeD.wav.cursor = 0;
3256		- GrafreeD.wav.loop = 0;
	4055	+ Grafreed.wav.cursor = 0;
	4056	+ Grafreed.wav.loop = 0;
3257	4057	}
3258	4058	} else
3259	4059	{
3260		- CameraPane.ANIMATION ^= true;
	4060	+ Globals.ANIMATION ^= true;
3261	4061	}
3262	4062	}
3263	4063
..	..	@@ -3303,7 +4103,7 @@
3303	4103	void CreateMaterial()
3304	4104	{
3305	4105	//copy.ClearMaterial(); // PATCH
3306		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4106	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3307	4107	if (copy.selection.size() > 0)
3308	4108	//SetMaterial(copy);
3309	4109	{
..	..	@@ -3354,7 +4154,7 @@
3354	4154	assert false;
3355	4155	}
3356	4156
3357		- void EditSelection()
	4157	+ void EditSelection(boolean newWindow)
3358	4158	{
3359	4159	}
3360	4160
..	..	@@ -3362,11 +4162,11 @@
3362	4162	{
3363	4163	copy.ResetBlockLoop(); // temporary problem
3364	4164
3365		- boolean random = CameraPane.RANDOM;
3366		- CameraPane.RANDOM = false; // parse everything
	4165	+ boolean random = CameraPane.SWITCH;
	4166	+ CameraPane.SWITCH = false; // parse everything
3367	4167	copy.ResetDisplayList();
3368	4168	copy.HardTouch();
3369		- CameraPane.RANDOM = random;
	4169	+ CameraPane.SWITCH = random;
3370	4170	}
3371	4171
3372	4172	// public void applySelf()
..	..	@@ -3413,7 +4213,7 @@
3413	4213	//copy.material = new cMaterial(copy.GetMaterial());
3414	4214
3415	4215	current.color = (float) colorField.getFloat();
3416		- current.modulation = (float) modulationField.getFloat();
	4216	+ current.modulation = (float) saturationField.getFloat();
3417	4217	current.metalness = (float) metalnessField.getFloat();
3418	4218	current.diffuse = (float) diffuseField.getFloat();
3419	4219	current.specular = (float) specularField.getFloat();
..	..	@@ -3436,10 +4236,40 @@
3436	4236	current.fakedepth = (float) fakedepthField.getFloat();
3437	4237	current.shadowbias = (float) shadowbiasField.getFloat();
3438	4238
3439		- if (!NumberSlider.frozen)
	4239	+ if (!cNumberSlider.frozen)
3440	4240	{
3441	4241	//System.out.println("Propagate = " + propagate);
3442	4242	copy.UpdateMaterial(anchor, current, propagate);
	4243	+
	4244	+ if (copy.material != null)
	4245	+ {
	4246	+ cMaterial mat = copy.material;
	4247	+
	4248	+ colorField.SetToolTipValue((mat.color));
	4249	+ saturationField.SetToolTipValue((mat.modulation));
	4250	+ metalnessField.SetToolTipValue((mat.metalness));
	4251	+ diffuseField.SetToolTipValue((mat.diffuse));
	4252	+ specularField.SetToolTipValue((mat.specular));
	4253	+ shininessField.SetToolTipValue((mat.shininess));
	4254	+ shiftField.SetToolTipValue((mat.shift));
	4255	+ ambientField.SetToolTipValue((mat.ambient));
	4256	+ lightareaField.SetToolTipValue((mat.lightarea));
	4257	+ diffusenessField.SetToolTipValue((mat.factor));
	4258	+ velvetField.SetToolTipValue((mat.velvet));
	4259	+ sheenField.SetToolTipValue((mat.sheen));
	4260	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4261	+ backlitField.SetToolTipValue((mat.bump));
	4262	+ anisoField.SetToolTipValue((mat.aniso));
	4263	+ anisoVField.SetToolTipValue((mat.anisoV));
	4264	+ cameraField.SetToolTipValue((mat.cameralight));
	4265	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4266	+ shadowField.SetToolTipValue((mat.shadow));
	4267	+ textureField.SetToolTipValue((mat.texture));
	4268	+ opacityField.SetToolTipValue((mat.opacity));
	4269	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4270	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4271	+ }
	4272	+
3443	4273	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3444	4274	{
3445	4275	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3468,9 +4298,25 @@
3468	4298	//copy.Touch();
3469	4299	}
3470	4300
	4301	+ cNumberSlider versionSlider;
	4302	+
3471	4303	public void stateChanged(ChangeEvent e)
3472	4304	{
3473	4305	// assert(false);
	4306	+ if (e.getSource() == versionSlider)
	4307	+ {
	4308	+ if (muteSlider)
	4309	+ return;
	4310	+
	4311	+ int version = versionSlider.getInteger();
	4312	+
	4313	+ if (copy.versionlist[version] != null)
	4314	+ {
	4315	+ CopyChanged(copy.versionlist[copy.versionindex = version]);
	4316	+ }
	4317	+
	4318	+ return;
	4319	+ }
3474	4320
3475	4321	if (freezematerial)
3476	4322	{
..	..	@@ -3484,6 +4330,7 @@
3484	4330	\|\| e.getSource() == apertureField
3485	4331	\|\| e.getSource() == shadowblurField)
3486	4332	{
	4333	+ new Exception().printStackTrace();
3487	4334	System.exit(0);
3488	4335	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3489	4336	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3505,12 +4352,24 @@
3505	4352	{
3506	4353	//System.out.println("stateChanged = " + this);
3507	4354	materialtouched = true;
	4355	+
	4356	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4357	+ {
	4358	+ saturationField.setFloat(1);
	4359	+ }
	4360	+
3508	4361	applySelf();
3509	4362	//System.out.println("this = " + this);
3510	4363	//System.out.println("PARENT = " + parent);
3511	4364	//if (parent != null)
3512	4365	// parent.applySelf();
3513		- refreshContents();
	4366	+ if (e.getSource() == normalpushField)
	4367	+ {
	4368	+ objEditor.refreshContents();
	4369	+ //Refresh();
	4370	+ }
	4371	+ else
	4372	+ refreshContents();
3514	4373	// ??? client.refreshEditWindow();
3515	4374	}
3516	4375	//else
..	..	@@ -3522,7 +4381,7 @@
3522	4381	//group.name = nameField.getText();
3523	4382	//objEditor.applySelf();
3524	4383
3525		- assert (objEditor == this);
	4384	+ // OCT2018: assert (objEditor == this);
3526	4385	if (copy.selection == null \|\| copy.selection.size() == 0)
3527	4386	//super.applySelf()
3528	4387	; else
..	..	@@ -3546,12 +4405,18 @@
3546	4405	objEditor.copy = keep;
3547	4406	}
3548	4407	}
	4408	+
	4409	+ if (normalpushField != null)
	4410	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3549	4411	}
3550	4412
3551	4413	void SnapObject()
3552	4414	{
3553		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3554		- SnapObject(obj);
	4415	+ if (copy.selection.size() > 0)
	4416	+ {
	4417	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4418	+ SnapObject(obj);
	4419	+ }
3555	4420	}
3556	4421
3557	4422	void SnapObject(Object3D obj)
..	..	@@ -3792,12 +4657,13 @@
3792	4657	{
3793	4658	if (GetTree() != null)
3794	4659	{
	4660	+ GetTree().revalidate();
3795	4661	GetTree().repaint();
3796	4662	}
3797	4663
3798	4664	radioPanel.revalidate();
3799	4665	radioPanel.repaint();
3800		- ctrlPanel.revalidate(); // ? new
	4666	+ ctrlPanel.validate(); // ? new
3801	4667	ctrlPanel.repaint();
3802	4668	}
3803	4669	}
..	..	@@ -3806,6 +4672,8 @@
3806	4672
3807	4673	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3808	4674	{
	4675	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4676	+ Save();
3809	4677	//Tween.set(thing, 0).target(1).start(tweenManager);
3810	4678	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3811	4679	// if (thing instanceof GenericJointDemo)
..	..	@@ -3892,6 +4760,12 @@
3892	4760	{
3893	4761	ResetModel();
3894	4762	Select(thing.GetTreePath(), true, false); // unselect... false);
	4763	+
	4764	+ if (thing.Size() == 0)
	4765	+ {
	4766	+ //EditSelection(false);
	4767	+ }
	4768	+
3895	4769	refreshContents();
3896	4770	}
3897	4771
..	..	@@ -4009,6 +4883,7 @@
4009	4883	}
4010	4884	}
4011	4885	}
	4886	+
4012	4887	LoadGFDThread loadGFDThread;
4013	4888
4014	4889	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4028,8 +4903,10 @@
4028	4903
4029	4904	try
4030	4905	{
	4906	+ // Try compressed version first.
4031	4907	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4032		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4908	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4909	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4033	4910
4034	4911	readobj = (Object3D) p.readObject();
4035	4912	istream.close();
..	..	@@ -4037,7 +4914,22 @@
4037	4914	readobj.ResetDisplayList();
4038	4915	} catch (Exception e)
4039	4916	{
4040		- e.printStackTrace();
	4917	+ if (!e.toString().contains("GZIP"))
	4918	+ e.printStackTrace();
	4919	+
	4920	+ try
	4921	+ {
	4922	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4923	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4924	+
	4925	+ readobj = (Object3D) p.readObject();
	4926	+ istream.close();
	4927	+
	4928	+ readobj.ResetDisplayList();
	4929	+ } catch (Exception e2)
	4930	+ {
	4931	+ e2.printStackTrace();
	4932	+ }
4041	4933	}
4042	4934	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4043	4935	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4083,6 +4975,12 @@
4083	4975
4084	4976	void LoadIt(Object obj)
4085	4977	{
	4978	+ if (obj == null)
	4979	+ {
	4980	+ // Invalid file
	4981	+ return;
	4982	+ }
	4983	+
4086	4984	System.out.println("Loaded " + obj);
4087	4985	//new Exception().printStackTrace();
4088	4986	Object3D readobj = (Object3D) obj;
..	..	@@ -4092,10 +4990,14 @@
4092	4990
4093	4991	if (readobj != null)
4094	4992	{
	4993	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4994	+ // Save();
4095	4995	try
4096	4996	{
4097	4997	//readobj.deepCopySelf(copy);
4098	4998	copy.clear(); // june 2014
	4999	+ copy.skyboxname = readobj.skyboxname;
	5000	+ copy.skyboxext = readobj.skyboxext;
4099	5001	for (int i = 0; i < readobj.size(); i++)
4100	5002	{
4101	5003	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4136,6 +5038,7 @@
4136	5038	}
4137	5039	} catch (ClassCastException e)
4138	5040	{
	5041	+ e.printStackTrace();
4139	5042	assert (false);
4140	5043	Composite c = (Composite) copy;
4141	5044	c.children.clear();
..	..	@@ -4146,15 +5049,26 @@
4146	5049	c.addChild(csg);
4147	5050	}
4148	5051
	5052	+ copy.versionlist = readobj.versionlist;
	5053	+ copy.versionindex = readobj.versionindex;
	5054	+
	5055	+ if (copy.versionlist == null)
	5056	+ {
	5057	+ copy.versionlist = new Object3D[100];
	5058	+ copy.versionindex = -1;
	5059	+ }
	5060	+
	5061	+ //? SetUndoStates();
	5062	+
4149	5063	ResetModel();
4150	5064	copy.HardTouch(); // recompile?
4151	5065	refreshContents();
4152	5066	}
4153	5067	}
4154	5068
4155		- void load() // throws ClassNotFoundException
	5069	+ void Open() // throws ClassNotFoundException
4156	5070	{
4157		- if (GrafreeD.standAlone)
	5071	+ if (Grafreed.standAlone)
4158	5072	{
4159	5073	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4160	5074	browser.show();
..	..	@@ -4241,11 +5155,13 @@
4241	5155	try
4242	5156	{
4243	5157	FileOutputStream ostream = new FileOutputStream(lastname);
4244		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5158	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5159	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4245	5160
4246	5161	p.writeObject(copy);
4247	5162	p.flush();
4248	5163
	5164	+ zstream.close();
4249	5165	ostream.close();
4250	5166
4251	5167	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4253,19 +5169,23 @@
4253	5169	//ps.print(buffer.toString());
4254	5170	} catch (IOException e)
4255	5171	{
	5172	+ e.printStackTrace();
4256	5173	}
4257	5174	}
	5175	+
4258	5176	String lastname;
4259	5177
4260	5178	void saveAs()
4261	5179	{
4262		- if (GrafreeD.standAlone)
	5180	+ if (Grafreed.standAlone)
4263	5181	{
4264	5182	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4265	5183	browser.setVisible(true);
4266	5184	String filename = browser.getFile();
4267	5185	if (filename != null && filename.length() > 0)
4268	5186	{
	5187	+ if (!filename.endsWith(".gfd"))
	5188	+ filename += ".gfd";
4269	5189	lastname = browser.getDirectory() + filename;
4270	5190	save();
4271	5191	}
..	..	@@ -4364,13 +5284,13 @@
4364	5284	try
4365	5285	{
4366	5286	FileOutputStream ostream = new FileOutputStream(filename);
4367		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4368		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5287	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5288	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4369	5289
4370	5290	Object3D objectparent = obj.parent;
4371	5291	obj.parent = null;
4372	5292
4373		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5293	+ Object3D object = (Object3D) Grafreed.clone(obj);
4374	5294
4375	5295	obj.parent = objectparent;
4376	5296
..	..	@@ -4382,8 +5302,8 @@
4382	5302	p.writeObject(object);
4383	5303	p.flush();
4384	5304
	5305	+ zstream.close();
4385	5306	ostream.close();
4386		- // zstream.close();
4387	5307
4388	5308	// group.selection.get(0).parent = parent;
4389	5309	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4404,7 +5324,7 @@
4404	5324	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4405	5325	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4406	5326	copy.generatePOV(buffer);
4407		- if (GrafreeD.standAlone)
	5327	+ if (Grafreed.standAlone)
4408	5328	{
4409	5329	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4410	5330	browser.show();
..	..	@@ -4430,53 +5350,70 @@
4430	5350	Object3D client;
4431	5351	Object3D copy;
4432	5352	MenuBar menuBar;
4433		- Menu windowMenu;
4434		- MenuItem loadItem;
	5353	+ Menu fileMenu;
	5354	+ MenuItem newItem;
	5355	+ MenuItem openItem;
4435	5356	MenuItem saveItem;
4436	5357	MenuItem saveAsItem;
4437	5358	MenuItem exportAsItem;
4438	5359	MenuItem reexportItem;
4439	5360	MenuItem povItem;
4440	5361	MenuItem closeItem;
4441		- Menu cameraMenu;
	5362	+
4442	5363	CheckboxMenuItem zBufferItem;
4443	5364	//MenuItem normalLensItem;
4444		- MenuItem editCameraItem;
4445		- MenuItem revertCameraItem;
4446		- CheckboxMenuItem toggleLiveItem;
4447	5365	MenuItem stepItem;
4448		- CheckboxMenuItem toggleFullItem;
	5366	+ CheckboxMenuItem toggleLiveItem;
	5367	+ CheckboxMenuItem toggleFullScreenItem;
	5368	+ CheckboxMenuItem toggleTimelineItem;
4449	5369	CheckboxMenuItem toggleRenderItem;
4450	5370	CheckboxMenuItem toggleDebugItem;
4451	5371	CheckboxMenuItem toggleFrustumItem;
4452	5372	CheckboxMenuItem toggleFootContactItem;
4453	5373	CheckboxMenuItem toggleDLItem;
4454	5374	CheckboxMenuItem toggleTextureItem;
4455		- CheckboxMenuItem toggleRandomItem;
	5375	+ CheckboxMenuItem toggleSwitchItem;
4456	5376	CheckboxMenuItem toggleRootItem;
4457	5377	CheckboxMenuItem animationItem;
	5378	+ MenuItem archiveItem;
4458	5379	CheckboxMenuItem toggleHandleItem;
4459	5380	CheckboxMenuItem togglePaintItem;
4460	5381	JSplitPane mainPanel;
4461	5382	JScrollPane scrollpane;
	5383	+
4462	5384	JPanel toolbarPanel;
4463		- JPanel treePanel;
	5385	+
	5386	+ cGridBag treePanel;
	5387	+
4464	5388	JPanel radioPanel;
4465	5389	ButtonGroup buttonGroup;
4466		- JPanel ctrlPanel;
4467		- JPanel materialPanel;
	5390	+
	5391	+ cGridBag toolboxPanel;
	5392	+ cGridBag materialPanel;
	5393	+ cGridBag ctrlPanel;
	5394	+
4468	5395	JScrollPane infoPanel;
4469		- JPanel optionsPanel;
	5396	+
	5397	+ cGridBag optionsPanel;
	5398	+
4470	5399	JTabbedPane objectPanel;
4471		- JPanel XYZPanel;
	5400	+ boolean materialFlushed;
	5401	+ Object3D latestObject;
	5402	+
	5403	+ cGridBag XYZPanel;
	5404	+
4472	5405	JSplitPane gridPanel;
4473	5406	JSplitPane bigPanel;
4474		- JPanel bigThree;
4475		- JTabbedPane scenePanel;
4476		- JPanel cameraPanel;
	5407	+
	5408	+ cGridBag bigThree;
	5409	+ cGridBag scenePanel;
	5410	+ cGridBag centralPanel;
	5411	+ JSplitPane cameraPanel;
	5412	+ JPanel timelinePanel;
	5413	+ JMenuBar timelineMenubar;
4477	5414	JSplitPane framePanel;
4478	5415	JTextArea/Field/ nameField;
4479		- cButton textureButton;
	5416	+ //cButton textureButton;
4480	5417	cButton okButton;
4481	5418	cButton applyButton;
4482	5419	cButton cancelButton;
..	..	@@ -4523,65 +5460,72 @@
4523	5460	// MATERIAL
4524	5461	JLabel materialLabel;
4525	5462	JLabel colorLabel;
4526		- NumberSlider colorField;
	5463	+ cNumberSlider colorField;
4527	5464	JLabel modulationLabel;
4528		- NumberSlider modulationField;
	5465	+ cNumberSlider saturationField;
4529	5466	JLabel metalnessLabel;
4530		- NumberSlider metalnessField;
	5467	+ cNumberSlider metalnessField;
4531	5468	JLabel diffuseLabel;
4532		- NumberSlider diffuseField;
	5469	+ cNumberSlider diffuseField;
4533	5470	JLabel specularLabel;
4534		- NumberSlider specularField;
	5471	+ cNumberSlider specularField;
4535	5472	JLabel shininessLabel;
4536		- NumberSlider shininessField;
	5473	+ cNumberSlider shininessField;
4537	5474	JLabel shiftLabel;
4538		- NumberSlider shiftField;
	5475	+ cNumberSlider shiftField;
4539	5476	JLabel ambientLabel;
4540		- NumberSlider ambientField;
	5477	+ cNumberSlider ambientField;
4541	5478	JLabel lightareaLabel;
4542		- NumberSlider lightareaField;
	5479	+ cNumberSlider lightareaField;
4543	5480	JLabel diffusenessLabel;
4544		- NumberSlider diffusenessField;
	5481	+ cNumberSlider diffusenessField;
4545	5482	JLabel velvetLabel;
4546		- NumberSlider velvetField;
	5483	+ cNumberSlider velvetField;
4547	5484	JLabel sheenLabel;
4548		- NumberSlider sheenField;
	5485	+ cNumberSlider sheenField;
4549	5486	JLabel subsurfaceLabel;
4550		- NumberSlider subsurfaceField;
	5487	+ cNumberSlider subsurfaceField;
4551	5488	//JLabel bumpLabel;
4552	5489	//NumberSlider bumpField;
4553	5490	JLabel backlitLabel;
4554		- NumberSlider backlitField;
	5491	+ cNumberSlider backlitField;
4555	5492	JLabel anisoLabel;
4556		- NumberSlider anisoField;
	5493	+ cNumberSlider anisoField;
4557	5494	JLabel anisoVLabel;
4558		- NumberSlider anisoVField;
	5495	+ cNumberSlider anisoVField;
4559	5496	JLabel cameraLabel;
4560		- NumberSlider cameraField;
	5497	+ cNumberSlider cameraField;
4561	5498	JLabel selfshadowLabel;
4562		- NumberSlider selfshadowField;
	5499	+ cNumberSlider selfshadowField;
4563	5500	JLabel shadowLabel;
4564		- NumberSlider shadowField;
	5501	+ cNumberSlider shadowField;
4565	5502	JLabel textureLabel;
4566		- NumberSlider textureField;
	5503	+ cNumberSlider textureField;
4567	5504	JLabel opacityLabel;
4568		- NumberSlider opacityField;
	5505	+ cNumberSlider opacityField;
4569	5506	JLabel fakedepthLabel;
4570		- NumberSlider fakedepthField;
	5507	+ cNumberSlider fakedepthField;
4571	5508	JLabel shadowbiasLabel;
4572		- NumberSlider shadowbiasField;
	5509	+ cNumberSlider shadowbiasField;
4573	5510	JLabel bumpLabel;
4574		- NumberSlider bumpField;
	5511	+ cNumberSlider bumpField;
4575	5512	JLabel noiseLabel;
4576		- NumberSlider noiseField;
	5513	+ cNumberSlider noiseField;
4577	5514	JLabel powerLabel;
4578		- NumberSlider powerField;
	5515	+ cNumberSlider powerField;
4579	5516	JLabel borderfadeLabel;
4580		- NumberSlider borderfadeField;
	5517	+ cNumberSlider borderfadeField;
4581	5518	JLabel fogLabel;
4582		- NumberSlider fogField;
	5519	+ cNumberSlider fogField;
4583	5520	JLabel opacityPowerLabel;
4584		- NumberSlider opacityPowerField;
4585		- JTree jTree;
	5521	+ cNumberSlider opacityPowerField;
	5522	+ cTree jTree;
4586	5523	//ObjectUI parent;
	5524	+
	5525	+ cNumberSlider normalpushField;
	5526	+
	5527	+ private MenuItem importGFDItem;
	5528	+ private MenuItem importVRMLX3DItem;
	5529	+ private MenuItem import3DSItem;
	5530	+ private MenuItem importOBJItem;
4587	5531	}