~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,73 @@
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	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
	103	+
32	104	// SCRIPT
33	105
34	106	transient JFrame textpanel = null;
..	..	@@ -119,51 +191,62 @@
119	191	void keyPressed(int key, int modifiers)
120	192	{
121	193	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	194	+ Globals.theRenderer.keyPressed(key, modifiers);
123	195	}
124	196	*/
125	197
126	198	static GridBagConstraints aConstraints;
127	199	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	200	+
130	201	static int GRIDWIDTH = 100; // 4;
131	202
132	203	public void closeUI()
133	204	{
134	205	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
137	208	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
139	210
140		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
141	214	return;
142	215
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);
	216	+// objEditor.ctrlPanel.remove(liveCB);
	217	+// objEditor.ctrlPanel.remove(hideCB);
	218	+// objEditor.ctrlPanel.remove(markCB);
	219	+//
	220	+// objEditor.ctrlPanel.remove(randomCB);
	221	+// objEditor.ctrlPanel.remove(speedupCB);
	222	+// objEditor.ctrlPanel.remove(rewindCB);
	223	+//
	224	+// objEditor.ctrlPanel.remove(resetButton);
	225	+// objEditor.ctrlPanel.remove(stepButton);
	226	+//// objEditor.ctrlPanel.remove(stepAllButton);
	227	+//// objEditor.ctrlPanel.remove(resetAllButton);
	228	+// objEditor.ctrlPanel.remove(link2masterCB);
	229	+// //objEditor.ctrlPanel.remove(flipVCB);
	230	+// //objEditor.ctrlPanel.remove(texresMenu);
	231	+// objEditor.ctrlPanel.remove(slowerButton);
	232	+// objEditor.ctrlPanel.remove(fasterButton);
	233	+// objEditor.ctrlPanel.remove(remarkButton);
	234	+
	235	+ objEditor.ctrlPanel.remove(setupPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	238	+ objEditor.ctrlPanel.remove(pushPanel);
	239	+ //objEditor.ctrlPanel.remove(fillPanel);
	240	+
	241	+ //Remove(normalpushField);
161	242	}
162	243
163	244	public ObjEditor GetEditor()
164	245	{
165	246	return objEditor; //.GetEditor();
166	247	}
	248	+
	249	+ // Sometimes myself, sometimes my callee's.
167	250	ObjEditor objEditor;
168	251
169	252	/*
..	..	@@ -226,6 +309,7 @@
226	309	//localCopy.parent = null;
227	310
228	311	frame = new JFrame();
	312	+ frame.setUndecorated(true);
229	313	objEditor = this;
230	314	this.callee = callee;
231	315
..	..	@@ -238,7 +322,7 @@
238	322	//if (!isDisplayable())
239	323	//setUndecorated(true);
240	324
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	325	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	326	client = inClient;
243	327	copy = localCopy;
244	328	copy.editWindow = this;
..	..	@@ -256,27 +340,48 @@
256	340	return frame.action(event, obj);
257	341	}
258	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
259	348	void SetupMenu()
260	349	{
261	350	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..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	371	//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("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
272	376	if (client.parent != null)
273	377	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	379	} else
276	380	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	382	}
279	383
	384	+ newItem.addActionListener(this);
280	385	loadItem.addActionListener(this);
281	386	saveItem.addActionListener(this);
282	387	saveAsItem.addActionListener(this);
..	..	@@ -285,79 +390,66 @@
285	390	//povItem.addActionListener(this);
286	391	closeItem.addActionListener(this);
287	392
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	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
342	420	toolbarPanel = new JPanel();
343	421	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
345	423	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
	428	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
	437	+ materialPanel = new cGridBag().setVertical(true);
349	438	materialPanel.setName("Material");
	439	+
350	440	/JTextPane/
351	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
352	444	infoarea.setEditable(true);
353	445	SetText();
354	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	447	// infoarea.setOpaque(false);
356	448	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ //infoPanel.setPreferredSize(new Dimension(50, 200));
361	453	infoPanel.setName("Info");
362	454	//infoPanel.setLayout(new BorderLayout());
363	455	//infoPanel.add(createTextPane());
..	..	@@ -366,16 +458,23 @@
366	458	mainPanel.setName("Main");
367	459	mainPanel.setContinuousLayout(true);
368	460	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	461	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
372		-
	462	+ mainPanel.setDividerLocation(0.5); //1.0);
	463	+ mainPanel.setResizeWeight(0.5);
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
373	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	473	//mainPanel.setLayout(new GridBagLayout());
375	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
	477	+ //materialPanel.setLayout(new GridBagLayout());
379	478
380	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	480	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +513,7 @@
414	513	static String newline = "\n";
415	514	protected static final String buttonString = "JButton";
416	515	StyledDocument doc;
417		- JTextArea infoarea;
	516	+ JTextPane infoarea;
418	517
419	518	void ClearInfo()
420	519	{
..	..	@@ -437,10 +536,10 @@
437	536	e.printStackTrace();
438	537	}
439	538
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();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	543	//clipboard.setContents(data, data);
445	544	}
446	545
..	..	@@ -463,13 +562,13 @@
463	562	//SendInfo("Name:", "bold");
464	563	if (sel.GetTextures() != null \|\| debug)
465	564	{
466		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	567	if (sel.Size() > 0)
469	568	{
470	569	si.SendInfo("#children = " + sel.Size(), "regular");
471	570	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	572	if (debug)
474	573	{
475	574	try
..	..	@@ -481,7 +580,10 @@
481	580	}
482	581
483	582	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
485	587
486	588	if (sel.bRep != null)
487	589	{
..	..	@@ -508,7 +610,7 @@
508	610	}
509	611	if (sel.support != null)
510	612	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	614	}
513	615	if (sel.scriptnode != null)
514	616	{
..	..	@@ -579,6 +681,9 @@
579	681	{
580	682	CameraPane.pointflow = (PointFlow) sel;
581	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
582	687	}
583	688	}
584	689
..	..	@@ -594,52 +699,159 @@
594	699	}
595	700	}
596	701
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		- };
	702	+static GraphicsDevice device = GraphicsEnvironment
	703	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	704
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
621	720
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	721	+ void Minimize()
628	722	{
629		- for (int j = 0; j < 2; j++)
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
	725	+ }
	726	+
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	730	+ void Maximize()
	731	+ {
	732	+ if (CameraPane.FULLSCREEN)
630	733	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	734	+ ToggleFullScreen();
636	735	}
637		- } catch (BadLocationException ble)
	736	+
	737	+ if (maximized)
	738	+ {
	739	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	740	+ }
	741	+ else
	742	+ {
	743	+ keeprect = frame.getBounds();
	744	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	747	+// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ }
	749	+
	750	+ maximized ^= true;
	751	+
	752	+ frame.validate();
	753	+ }
	754	+
	755	+ cButton minButton;
	756	+ cButton maxButton;
	757	+ cButton fullButton;
	758	+
	759	+ void ToggleFullScreen()
638	760	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	761	+ cameraView.ToggleFullScreen();
	762	+
	763	+ if (!CameraPane.FULLSCREEN)
	764	+ {
	765	+ device.setFullScreenWindow(null);
	766	+ frame.validate();
	767	+
	768	+ //frame.setVisible(false);
	769	+// frame.removeNotify();
	770	+// frame.setUndecorated(false);
	771	+// frame.addNotify();
	772	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	773	+
	774	+// X frame.getContentPane().remove(/"Center",/bigThree);
	775	+// X framePanel.add(bigThree);
	776	+// X frame.getContentPane().add(/"Center",/framePanel);
	777	+ framePanel.setDividerLocation(1);
	778	+
	779	+ //frame.setVisible(true);
	780	+ radio.layout = keepButton;
	781	+ //theFrame = null;
	782	+ keepButton = null;
	783	+ radio.layout.doClick();
	784	+
	785	+ } else
	786	+ {
	787	+ keepButton = radio.layout;
	788	+ //keeprect = frame.getBounds();
	789	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	790	+// frame.getToolkit().getScreenSize().height);
	791	+ //frame.setVisible(false);
	792	+ device.setFullScreenWindow(frame);
	793	+ frame.validate();
	794	+// frame.removeNotify();
	795	+// frame.setUndecorated(true);
	796	+// frame.addNotify();
	797	+// X frame.getContentPane().remove(/"Center",/framePanel);
	798	+// X framePanel.remove(bigThree);
	799	+// X frame.getContentPane().add(/"Center",/bigThree);
	800	+ framePanel.setDividerLocation(0);
	801	+
	802	+ radio.layout = fullscreenLayout;
	803	+ radio.layout.doClick();
	804	+ //frame.setVisible(true);
	805	+ }
	806	+ frame.validate();
640	807	}
641	808
642		- return new JTextArea(); // textPane;
	809	+ private JTextPane createTextPane()
	810	+ {
	811	+// TEXTAREA String[] initString =
	812	+// {
	813	+// "This is an editable JTextPane, ", //regular
	814	+// "another ", //italic
	815	+// "styled ", //bold
	816	+// "text ", //small
	817	+// "component, ", //large
	818	+// "which supports embedded components..." + newline,//regular
	819	+// " " + newline, //button
	820	+// "...and embedded icons..." + newline, //regular
	821	+// " ", //icon
	822	+// newline + "JTextPane is a subclass of JEditorPane that "
	823	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	824	+// + "cover methods for interacting with those objects."
	825	+// };
	826	+//
	827	+// String[] initStyles =
	828	+// {
	829	+// "regular", "italic", "bold", "small", "large",
	830	+// "regular", "button", "regular", "icon",
	831	+// "regular"
	832	+// };
	833	+//
	834	+// JTextPane textPane = new JTextPane();
	835	+// textPane.setEditable(true);
	836	+// /StyledDocument/ doc = textPane.getStyledDocument();
	837	+// addStylesToDocument(doc);
	838	+//
	839	+// try
	840	+// {
	841	+// for (int j = 0; j < 2; j++)
	842	+// {
	843	+// for (int i = 0; i < initString.length; i++)
	844	+// {
	845	+// doc.insertString(doc.getLength(), initString[i],
	846	+// doc.getStyle(initStyles[i]));
	847	+// }
	848	+// }
	849	+// } catch (BadLocationException ble)
	850	+// {
	851	+// System.err.println("Couldn't insert initial text into text pane.");
	852	+// }
	853	+
	854	+ return new JTextPane(); // textPane;
643	855	}
644	856
645	857	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +904,7 @@
692	904	protected static ImageIcon createImageIcon(String path,
693	905	String description)
694	906	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	907	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	908	if (imgURL != null)
697	909	{
698	910	return new ImageIcon(imgURL, description);
..	..	@@ -724,6 +936,7 @@
724	936	// NumberSlider vDivsField;
725	937	// JCheckBox endcaps;
726	938	JCheckBox liveCB;
	939	+ JCheckBox selectCB;
727	940	JCheckBox hideCB;
728	941	JCheckBox link2masterCB;
729	942	JCheckBox markCB;
..	..	@@ -731,7 +944,12 @@
731	944	JCheckBox speedupCB;
732	945	JCheckBox rewindCB;
733	946	JCheckBox flipVCB;
	947	+
	948	+ cCheckBox toggleTextureCB;
	949	+ cCheckBox toggleSwitchCB;
	950	+
734	951	JComboBox texresMenu;
	952	+
735	953	JButton resetButton;
736	954	JButton stepButton;
737	955	JButton stepAllButton;
..	..	@@ -739,115 +957,87 @@
739	957	JButton slowerButton;
740	958	JButton fasterButton;
741	959	JButton remarkButton;
	960	+
	961	+ cGridBag editPanel;
	962	+ cGridBag editCommandsPanel;
	963	+
	964	+ cGridBag namePanel;
	965	+ cGridBag setupPanel;
	966	+ cGridBag setupPanel2;
	967	+ cGridBag objectCommandsPanel;
	968	+ cGridBag pushPanel;
	969	+ cGridBag fillPanel;
742	970
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	971	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	972	{
745	973	JCheckBox cb;
746	974
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);
	975	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	976	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	977
757	978	return cb;
758	979	}
759	980
760		- cButton AddButton(ObjEditor oe, String label)
	981	+ cButton AddButton(cGridBag panel, String label)
761	982	{
762	983	cButton cb;
763	984
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);
	985	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	986	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	987
774	988	return cb;
775	989	}
776	990
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	991	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	992	{
779	993	JComboBox combo;
780	994
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;
	995	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	996	combo.addActionListener(this);
785	997
786	998	return combo;
787	999	}
788	1000
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1001	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	1002	{
791		- NumberSlider combo;
	1003	+ cGridBag control = new cGridBag();
	1004	+
	1005	+ cNumberSlider combo;
792	1006
793	1007	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	1008	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		-
	1009	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1010	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	1011	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	1012	+
	1013	+ panel.add(control);
	1014	+
	1015	+ return control;
813	1016	}
814	1017
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1018	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	1019	{
817		- NumberSlider combo;
	1020	+ cGridBag control = new cGridBag();
	1021	+
	1022	+ cNumberSlider combo;
818	1023
819	1024	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1025	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		-
	1026	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1027	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1028	combo.setInteger(current);
833	1029
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1030	+ panel.add(control);
	1031	+
	1032	+ return control;
839	1033	}
840	1034
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1035	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1036	{
843	1037	JTextArea text;
844	1038
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1039	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1040	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1041
852	1042	return text;
853	1043	}
..	..	@@ -877,9 +1067,16 @@
877	1067	objEditor.ctrlPanel.remove(j);
878	1068	}
879	1069
	1070	+ void Remove(cNumberSlider j)
	1071	+ {
	1072	+ j.removeChangeListener(this);
	1073	+ //objEditor.ctrlPanel.remove(j.label);
	1074	+ objEditor.ctrlPanel.remove(j);
	1075	+ }
	1076	+
880	1077	/*
881	1078	*/
882		- void Return() // ObjEditor oe)
	1079	+ void Return0() // ObjEditor oe)
883	1080	{
884	1081	aConstraints.gridy += 1;
885	1082	aConstraints.gridx = 0;
..	..	@@ -934,35 +1131,77 @@
934	1131
935	1132	void SetupUI2(ObjEditor oe)
936	1133	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1134	+ //SetupName(oe);
942	1135
943		- if (!GroupEditor.allparams)
	1136	+ namePanel = new cGridBag();
	1137	+
	1138	+ nameField = AddText(namePanel, copy.GetName());
	1139	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1140	+ oe.ctrlPanel.add(namePanel);
	1141	+
	1142	+ oe.ctrlPanel.Return();
	1143	+
	1144	+ if (!allparams)
944	1145	return;
945	1146
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1147	+ setupPanel = new cGridBag().setVertical(false);
	1148	+
	1149	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1150	+ liveCB.setToolTipText("Animate object");
	1151	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1152	+ selectCB.setToolTipText("Make object selectable");
949	1153	// 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");
	1154	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1155	+ hideCB.setToolTipText("Hide object");
	1156	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1157	+ markCB.setToolTipText("As animation target transform");
	1158	+
	1159	+ setupPanel2 = new cGridBag().setVertical(false);
	1160	+
	1161	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1162	+ rewindCB.setToolTipText("Rewind animation");
	1163	+
	1164	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1165	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1166	+
	1167	+ if (Globals.ADVANCED)
	1168	+ {
	1169	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1170	+ link2masterCB.setToolTipText("Attach to support");
	1171	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1172	+ speedupCB.setToolTipText("Option motion capture");
	1173	+ }
	1174	+
	1175	+ oe.ctrlPanel.add(setupPanel);
	1176	+ oe.ctrlPanel.Return();
	1177	+ oe.ctrlPanel.add(setupPanel2);
	1178	+ oe.ctrlPanel.Return();
	1179	+
	1180	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1181	+
	1182	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1183	+ resetButton.setToolTipText("Jump to frame zero");
	1184	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1185	+ stepButton.setToolTipText("Step one frame");
956	1186	// resetAllButton = AddButton(oe, "Reset All");
957	1187	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1188	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1189	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1190	+ slowerButton.setToolTipText("Decrease animation speed");
	1191	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1192	+ fasterButton.setToolTipText("Increase animation speed");
	1193	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1194	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1195
964		- Return();
	1196	+ oe.ctrlPanel.add(objectCommandsPanel);
	1197	+ oe.ctrlPanel.Return();
965	1198
	1199	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1200	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1201	+ //Return();
	1202	+
	1203	+ oe.ctrlPanel.Return();
	1204	+
966	1205	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1206	// ObjEditor.aConstraints.gridx += 1;
968	1207
..	..	@@ -1056,7 +1295,7 @@
1056	1295	oe.aConstraints.gridwidth = 1;
1057	1296	/**/
1058	1297	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1298	+ oe.ctrlPanel.Return();
1060	1299
1061	1300	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1301	//textureButton.setEnabled(false);
..	..	@@ -1158,11 +1397,28 @@
1158	1397	//JPanel worldPanel =
1159	1398	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1399	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
1164		- //new timeflow.app.TimeflowApp().TimeFlowWindow(cameraPanel, frame);
	1400	+ centralPanel = new cGridBag();
	1401	+ centralPanel.preferredWidth = 20;
	1402	+
	1403	+ if (Globals.ADVANCED)
	1404	+ {
	1405	+ timelinePanel = new JPanel(new BorderLayout());
	1406	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1165	1407
	1408	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1409	+ cameraPanel.setContinuousLayout(true);
	1410	+ cameraPanel.setOneTouchExpandable(true);
	1411	+// cameraPanel.setDividerLocation(0.9);
	1412	+// cameraPanel.setDividerSize(9);
	1413	+ cameraPanel.setResizeWeight(1.0);
	1414	+
	1415	+ }
	1416	+
	1417	+ centralPanel.add(cameraView);
	1418	+ centralPanel.setFocusable(true);
	1419	+ //frame.setJMenuBar(timelineMenubar);
	1420	+ //centralPanel.add(timelinePanel);
	1421	+
1166	1422	//topView.camera = ;
1167	1423	//frontView.camera = new Camera(2);
1168	1424	//sideView.camera = new Camera(3);
..	..	@@ -1178,12 +1434,13 @@
1178	1434	//frontView.object = copy;
1179	1435	//sideView.object = copy;
1180	1436
1181		- XYZPanel = new JPanel();
1182		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1437	+ XYZPanel = new cGridBag().setVertical(true);
	1438	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1183	1439
1184		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1186		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1440	+ XYZPanel.preferredWidth = 5;
	1441	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1442	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1443	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1187	1444
1188	1445	/*
1189	1446	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1192,7 +1449,7 @@
1192	1449	gridPanel.add(cameraView);
1193	1450	gridPanel.add(XYZPanel);
1194	1451	*/
1195		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1452	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1196	1453	gridPanel.setContinuousLayout(true);
1197	1454	gridPanel.setOneTouchExpandable(true);
1198	1455	gridPanel.setDividerLocation(1.0);
..	..	@@ -1221,11 +1478,13 @@
1221	1478	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1222	1479	//tmp.setName("Edit");
1223	1480	objectPanel.add(materialPanel);
1224		- JPanel north = new JPanel(new BorderLayout());
1225		- north.setName("Edit");
1226		- north.add(ctrlPanel, BorderLayout.NORTH);
1227		- objectPanel.add(north);
	1481	+// JPanel north = new JPanel(new BorderLayout());
	1482	+// north.setName("Edit");
	1483	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1484	+// objectPanel.add(north);
	1485	+ objectPanel.add(editPanel);
1228	1486	objectPanel.add(infoPanel);
	1487	+ objectPanel.add(toolboxPanel);
1229	1488
1230	1489	/*
1231	1490	aConstraints.gridx = 0;
..	..	@@ -1234,7 +1493,7 @@
1234	1493	aConstraints.gridy += 1;
1235	1494	aConstraints.gridwidth = 1;
1236	1495	mainPanel.add(objectPanel, aConstraints);
1237		- */
	1496	+ */
1238	1497
1239	1498	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1240	1499	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1245,16 +1504,23 @@
1245	1504	scrollpane.setWheelScrollingEnabled(true);
1246	1505	scrollpane.addMouseWheelListener(this); // Default not fast enough
1247	1506
1248		- /JTabbedPane/ scenePanel = new JTabbedPane();
1249		- scenePanel.add(scrollpane);
	1507	+ /JTabbedPane/ scenePanel = new cGridBag();
	1508	+ scenePanel.preferredWidth = 6;
	1509	+
	1510	+ JTabbedPane tabbedPane = new JTabbedPane();
	1511	+ tabbedPane.add(scrollpane);
1250	1512
1251		- scenePanel.add(FSPane = new cFileSystemPane(this));
1252		-
1253		- optionsPanel = new JPanel(new GridBagLayout());
	1513	+ optionsPanel = new cGridBag().setVertical(false);
1254	1514
1255	1515	optionsPanel.setName("Options");
1256		- scenePanel.add(optionsPanel);
	1516	+
	1517	+ AddOptions(optionsPanel); //, aConstraints);
	1518	+
	1519	+ tabbedPane.add(optionsPanel);
	1520	+
	1521	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1257	1522
	1523	+ scenePanel.add(tabbedPane);
1258	1524
1259	1525	/*
1260	1526	cTree jTree = new cTree(null);
..	..	@@ -1288,6 +1554,7 @@
1288	1554	//bigPanel.setSize(new Dimension(10,10));
1289	1555	//bigPanel.add(ctrlPanel);
1290	1556	//bigPanel.add(gridPanel);
	1557	+ /**
1291	1558	bigThree = new JPanel();
1292	1559	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1293	1560	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1304,14 +1571,20 @@
1304	1571	// aConstraints.gridheight = 3;
1305	1572	aWindowConstraints.gridx = 1;
1306	1573	aWindowConstraints.fill = GridBagConstraints.BOTH;
1307		- bigThree.add(cameraPanel, aWindowConstraints);
	1574	+ bigThree.add(centralPanel, aWindowConstraints);
1308	1575	aWindowConstraints.weightx = 0;
1309	1576	aWindowConstraints.gridx = 4;
1310	1577	aWindowConstraints.gridwidth = 1;
1311	1578	// aConstraints.gridheight = 3;
1312	1579	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1313	1580	bigThree.add(XYZPanel, aWindowConstraints);
	1581	+ /**/
1314	1582
	1583	+ bigThree = new cGridBag();
	1584	+ bigThree.addComponent(scenePanel);
	1585	+ bigThree.addComponent(centralPanel);
	1586	+ bigThree.addComponent(XYZPanel);
	1587	+
1315	1588	// // SIDE EFFECT!!!
1316	1589	// aConstraints.gridx = 0;
1317	1590	// aConstraints.gridy = 0;
..	..	@@ -1332,14 +1605,19 @@
1332	1605	//worldPane.add(bigPanel);
1333	1606	//worldPane.add(worldPanel);
1334	1607	/**/
1335		- frame.getContentPane().add(/"Center",/framePanel);
	1608	+ //frame.getContentPane().add(/"Center",/framePanel);
	1609	+ frame.add(/"Center",/framePanel);
1336	1610	//frame.getContentPane().add(/"Center",/ worldPane);
1337	1611
1338	1612	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1339	1613
1340		- frame.setSize(1024, 768);
1341		- frame.show();
	1614	+ frame.setSize(1280, 860);
	1615	+
	1616	+ frame.validate();
	1617	+ frame.setVisible(true);
1342	1618
	1619	+ cameraView.requestFocusInWindow();
	1620	+
1343	1621	gridPanel.setDividerLocation(1.0);
1344	1622
1345	1623	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1353,6 +1631,10 @@
1353	1631	});
1354	1632	}
1355	1633
	1634	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1635	+ {
	1636	+ }
	1637	+
1356	1638	JTree GetTree()
1357	1639	{
1358	1640	return objEditor.jTree;
..	..	@@ -1364,260 +1646,161 @@
1364	1646	ctrlPanel.removeAll();
1365	1647	}
1366	1648
1367		- void SetupMaterial(JPanel ctrlPanel)
	1649	+ void SetupMaterial(cGridBag panel)
1368	1650	{
1369		- aConstraints.weighty = 0;
1370		- //aConstraints.weightx = 1;
1371		- /*
	1651	+ /*
1372	1652	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1373	1653	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1374		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1375		- aConstraints.gridx += 1;
1376	1654	*/
1377	1655
1378		- aConstraints.gridwidth = 1;
1379		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1380		- aConstraints.gridx += 1;
1381		- aConstraints.weighty = 0;
1382		- aConstraints.gridwidth = 1;
	1656	+ cGridBag editBar = new cGridBag().setVertical(false);
	1657	+
	1658	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1659	+ createMaterialButton.setToolTipText("Create material");
1383	1660
1384	1661	/*
1385	1662	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1386		- aConstraints.gridx += 1;
1387		- aConstraints.weighty = 0;
1388		- aConstraints.gridwidth = 1;
1389	1663	*/
1390	1664
1391		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1392		- aConstraints.gridx += 1;
	1665	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1666	+ clearMaterialButton.setToolTipText("Clear material");
	1667	+
	1668	+ if (Globals.ADVANCED)
	1669	+ {
	1670	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1671	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1672	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1673	+ }
1393	1674
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;
	1675	+ editBar.preferredHeight = 15;
	1676	+
	1677	+ panel.add(editBar);
	1678	+
1408	1679	/**/
1409	1680	//aConstraints.weighty = 0;
1410	1681	////aConstraints.weightx = 1;
1411	1682	//aConstraints.weighty = 1;
1412	1683	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1413	1684	//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;
	1685	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1419	1686
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;
	1687	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1688	+
	1689	+ cGridBag color = new cGridBag();
	1690	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1691	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1692	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1693	+ //colorField.preferredWidth = 200;
	1694	+ colorSection.add(color);
1430	1695
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;
	1696	+ cGridBag modulation = new cGridBag();
	1697	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1698	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1699	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1700	+ colorSection.add(modulation);
1440	1701
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;
	1702	+ cGridBag texture = new cGridBag();
	1703	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1704	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1705	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1706	+ colorSection.add(texture);
1450	1707
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;
	1708	+ panel.add(new JSeparator());
	1709	+
	1710	+ panel.add(colorSection);
	1711	+
	1712	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1713	+
	1714	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1715	+
	1716	+ cGridBag diffuse = new cGridBag();
	1717	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1718	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1719	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1720	+ diffuseSection.add(diffuse);
1460	1721
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;
	1722	+ cGridBag diffuseness = new cGridBag();
	1723	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1724	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1725	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1726	+ diffuseSection.add(diffuseness);
1470	1727
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;
	1728	+ cGridBag selfshadow = new cGridBag();
	1729	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1730	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1731	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1732	+ diffuseSection.add(selfshadow);
1480	1733
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;
	1734	+ cGridBag sheen = new cGridBag();
	1735	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1736	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1737	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1738	+ diffuseSection.add(sheen);
1489	1739
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;
	1740	+ cGridBag subsurface = new cGridBag();
	1741	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1742	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1743	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1744	+ diffuseSection.add(subsurface);
1499	1745
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;
	1746	+ cGridBag shadow = new cGridBag();
	1747	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1748	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1749	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1750	+ diffuseSection.add(shadow);
1509	1751
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;
	1752	+ cGridBag fakedepth = new cGridBag();
	1753	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1754	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1755	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1756	+ diffuseSection.add(fakedepth);
1519	1757
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;
	1758	+ cGridBag shadowbias = new cGridBag();
	1759	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1760	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1761	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1762	+ diffuseSection.add(shadowbias);
1529	1763
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;
	1764	+ panel.add(new JSeparator());
	1765	+
	1766	+ panel.add(diffuseSection);
	1767	+
	1768	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1769	+
	1770	+ cGridBag specularSection = new cGridBag().setVertical(true);
1539	1771
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;
	1772	+ cGridBag specular = new cGridBag();
	1773	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1774	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1775	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1776	+ specularSection.add(specular);
1549	1777
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;
	1778	+ cGridBag lightarea = new cGridBag();
	1779	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1780	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1781	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1782	+ specularSection.add(lightarea);
1559	1783
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;
	1784	+ cGridBag shininess = new cGridBag();
	1785	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1786	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1787	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1788	+ specularSection.add(shininess);
1568	1789
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;
	1790	+ cGridBag metalness = new cGridBag();
	1791	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1792	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1793	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1794	+ specularSection.add(metalness);
1578	1795
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;
	1796	+ cGridBag velvet = new cGridBag();
	1797	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1798	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1799	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1800	+ specularSection.add(velvet);
1588	1801
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;
1598		-
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;
1608		-
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;
1618		-
1619		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1620		- Return();
	1802	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1803	+ //Return();
1621	1804	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1622	1805	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	1806	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1628,130 +1811,105 @@
1628	1811	// aConstraints.gridy += 1;
1629	1812	// aConstraints.gridwidth = 1;
1630	1813
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;
	1814	+ cGridBag anisoU = new cGridBag();
	1815	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1816	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1817	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1818	+ specularSection.add(anisoU);
1639	1819
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;
	1820	+ cGridBag anisoV = new cGridBag();
	1821	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1822	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1823	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1824	+ specularSection.add(anisoV);
1649	1825
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	1826
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;
	1827	+ panel.add(new JSeparator());
	1828	+
	1829	+ panel.add(specularSection);
	1830	+
	1831	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1832	+
	1833	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1669	1834
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;
	1835	+ cGridBag camera = new cGridBag();
	1836	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1837	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1838	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1839	+ colorSection.add(camera);
1680	1840
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;
	1841	+ cGridBag ambient = new cGridBag();
	1842	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1843	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1844	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1845	+ colorSection.add(ambient);
1690	1846
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;
	1847	+ cGridBag backlit = new cGridBag();
	1848	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1849	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1850	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1851	+ colorSection.add(backlit);
1700	1852
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;
	1853	+ cGridBag opacity = new cGridBag();
	1854	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1855	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1856	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1857	+ colorSection.add(opacity);
1710	1858
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;
	1859	+ //panel.add(new JSeparator());
	1860	+
	1861	+ //panel.add(globalSection);
	1862	+
	1863	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1864	+
	1865	+ cGridBag textureSection = new cGridBag().setVertical(true);
1720	1866
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;
	1867	+ cGridBag bump = new cGridBag();
	1868	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1869	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1871	+ textureSection.add(bump);
1730	1872
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;
	1873	+ cGridBag noise = new cGridBag();
	1874	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1875	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1876	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1877	+ textureSection.add(noise);
1740	1878
1741		- //aConstraints.weighty = 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1743		- //aConstraints.gridx += 1;
1744		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1745		- aConstraints.weighty = 0;
	1879	+ cGridBag power = new cGridBag();
	1880	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1881	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1882	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1883	+ textureSection.add(power);
1746	1884
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy = 0;
1749		- aConstraints.gridwidth = 1;
	1885	+ cGridBag borderfade = new cGridBag();
	1886	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1887	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1888	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1889	+ textureSection.add(borderfade);
	1890	+
	1891	+ cGridBag fog = new cGridBag();
	1892	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1893	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1894	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1895	+ textureSection.add(fog);
	1896	+
	1897	+ cGridBag opacityPower = new cGridBag();
	1898	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1899	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1900	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1901	+ textureSection.add(opacityPower);
	1902	+
	1903	+ panel.add(new JSeparator());
	1904	+
	1905	+ panel.add(textureSection);
	1906	+
	1907	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1750	1908
1751	1909	SetMaterial(copy); // .GetMaterial());
1752	1910
1753		- colorField.addChangeListener(this);
1754		- modulationField.addChangeListener(this);
	1911	+ //colorField.addChangeListener(this);
	1912	+// modulationField.addChangeListener(this);
1755	1913	metalnessField.addChangeListener(this);
1756	1914	diffuseField.addChangeListener(this);
1757	1915	specularField.addChangeListener(this);
..	..	@@ -1781,12 +1939,15 @@
1781	1939	opacityPowerField.addChangeListener(this);
1782	1940	/**/
1783	1941
1784		- resetSlidersButton.addActionListener(this);
1785	1942	clearMaterialButton.addActionListener(this);
1786	1943	createMaterialButton.addActionListener(this);
1787		-
1788		- propagateToggle.addItemListener(this);
1789		- multiplyToggle.addItemListener(this);
	1944	+
	1945	+ if (Globals.ADVANCED)
	1946	+ {
	1947	+ resetSlidersButton.addActionListener(this);
	1948	+ propagateToggle.addItemListener(this);
	1949	+ multiplyToggle.addItemListener(this);
	1950	+ }
1790	1951	}
1791	1952
1792	1953	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1957,7 +2118,7 @@
1957	2118
1958	2119	//? flashIt = false;
1959	2120	CameraPane pane = (CameraPane) cameraView;
1960		- pane.clickStart(location.x, location.y, 0);
	2121	+ pane.clickStart(location.x, location.y, 0, 0);
1961	2122	pane.clickEnd(location.x, location.y, 0, true);
1962	2123
1963	2124	if (group.selection.size() == 1)
..	..	@@ -2006,6 +2167,7 @@
2006	2167	e2.printStackTrace();
2007	2168	}
2008	2169	}
	2170	+
2009	2171	LoadJMEThread loadThread;
2010	2172
2011	2173	class LoadJMEThread extends Thread
..	..	@@ -2063,6 +2225,7 @@
2063	2225	//LoadFile0(filename, converter);
2064	2226	}
2065	2227	}
	2228	+
2066	2229	LoadOBJThread loadObjThread;
2067	2230
2068	2231	class LoadOBJThread extends Thread
..	..	@@ -2141,19 +2304,19 @@
2141	2304
2142	2305	void LoadObjFile(String fullname)
2143	2306	{
2144		- /*
	2307	+ System.out.println("Loading " + fullname);
	2308	+ /**/
2145	2309	//lastFilename = fullname;
2146	2310	if(loadObjThread == null)
2147	2311	{
2148		- loadObjThread = new LoadOBJThread();
2149		- loadObjThread.start();
	2312	+ loadObjThread = new LoadOBJThread();
	2313	+ loadObjThread.start();
2150	2314	}
2151	2315
2152	2316	loadObjThread.add(fullname);
2153		- */
	2317	+ /**/
2154	2318
2155		- System.out.println("Loading " + fullname);
2156		- makeSomething(new FileObject(fullname, true), true);
	2319	+ //makeSomething(new FileObject(fullname, true), true);
2157	2320	}
2158	2321
2159	2322	void LoadGFDFile(String fullname)
..	..	@@ -2414,11 +2577,11 @@
2414	2577
2415	2578	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2416	2579	{
2417		- if (GrafreeD.standAlone)
	2580	+ if (Grafreed.standAlone)
2418	2581	{
2419	2582	/**/
2420	2583	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2421		- browser.show();
	2584	+ browser.setVisible(true);
2422	2585	String filename = browser.getFile();
2423	2586	if (filename != null && filename.length() > 0)
2424	2587	{
..	..	@@ -2563,6 +2726,7 @@
2563	2726	}
2564	2727	if (input == null)
2565	2728	{
	2729	+ new Exception().printStackTrace();
2566	2730	System.exit(0);
2567	2731	}
2568	2732
..	..	@@ -2769,6 +2933,8 @@
2769	2933
2770	2934	void SetMaterial(Object3D object)
2771	2935	{
	2936	+ latestObject = object;
	2937	+
2772	2938	cMaterial mat = object.material;
2773	2939
2774	2940	if (mat == null)
..	..	@@ -2777,7 +2943,8 @@
2777	2943	return;
2778	2944	}
2779	2945
2780		- multiplyToggle.setSelected(mat.multiply);
	2946	+ if (multiplyToggle != null)
	2947	+ multiplyToggle.setSelected(mat.multiply);
2781	2948
2782	2949	assert (object.projectedVertices != null);
2783	2950
..	..	@@ -2879,12 +3046,17 @@
2879	3046	// }
2880	3047
2881	3048	/**/
2882		- if (deselect)
	3049	+ if (deselect \|\| child == null)
2883	3050	{
2884	3051	//group.deselectAll();
2885	3052	//freeze = true;
2886	3053	GetTree().clearSelection();
2887	3054	//freeze = false;
	3055	+
	3056	+ if (child == null)
	3057	+ {
	3058	+ return;
	3059	+ }
2888	3060	}
2889	3061
2890	3062	//group.addSelectee(child);
..	..	@@ -2953,31 +3125,48 @@
2953	3125	cameraView.ToggleDL();
2954	3126	cameraView.repaint();
2955	3127	return;
2956		- } else if (event.getSource() == toggleTextureItem)
	3128	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2957	3129	{
2958	3130	cameraView.ToggleTexture();
2959	3131	// june 2013 copy.HardTouch();
2960	3132	cameraView.repaint();
2961	3133	return;
2962		- } else if (event.getSource() == toggleFullItem)
	3134	+ } else if (event.getSource() == toggleTimelineItem)
2963	3135	{
2964		- if (CameraPane.FULLSCREEN)
	3136	+ timeline ^= true;
	3137	+
	3138	+ if (timeline)
2965	3139	{
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);
	3140	+ centralPanel.remove(cameraView);
	3141	+ cameraPanel.add(cameraView);
	3142	+ centralPanel.add(cameraPanel);
	3143	+ frame.setJMenuBar(timelineMenubar);
	3144	+ wasFullScreen = CameraPane.FULLSCREEN;
	3145	+ if (!CameraPane.FULLSCREEN)
	3146	+ ToggleFullScreen();
	3147	+ toggleFullScreenItem.setEnabled(false);
2973	3148	}
	3149	+ else
	3150	+ {
	3151	+ centralPanel.remove(cameraPanel);
	3152	+ centralPanel.add(cameraView);
	3153	+ frame.setJMenuBar(null);
	3154	+ if (!wasFullScreen)
	3155	+ ToggleFullScreen();
	3156	+ toggleFullScreenItem.setEnabled(true);
	3157	+ }
	3158	+
2974	3159	frame.validate();
2975		- cameraView.ToggleFullScreen();
	3160	+ return;
	3161	+ } else if (event.getSource() == toggleFullScreenItem)
	3162	+ {
	3163	+ ToggleFullScreen();
	3164	+ frame.validate();
2976	3165
2977	3166	return;
2978		- } else if (event.getSource() == toggleRandomItem)
	3167	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2979	3168	{
2980		- cameraView.ToggleRandom();
	3169	+ cameraView.ToggleSwitch();
2981	3170	cameraView.repaint();
2982	3171	return;
2983	3172	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3006,6 +3195,10 @@
3006	3195	{
3007	3196	copy.live ^= true;
3008	3197	return;
	3198	+ } else if (event.getSource() == selectCB)
	3199	+ {
	3200	+ copy.dontselect ^= true;
	3201	+ return;
3009	3202	} else if (event.getSource() == hideCB)
3010	3203	{
3011	3204	copy.hide ^= true;
..	..	@@ -3020,6 +3213,7 @@
3020	3213	if (event.getSource() == randomCB)
3021	3214	{
3022	3215	copy.random ^= true;
	3216	+ objEditor.refreshContents();
3023	3217	return;
3024	3218	}
3025	3219	if (event.getSource() == speedupCB)
..	..	@@ -3043,8 +3237,9 @@
3043	3237
3044	3238	public void actionPerformed(ActionEvent event)
3045	3239	{
	3240	+ Object source = event.getSource();
3046	3241	// SCRIPT DIALOG
3047		- if (event.getSource() == okbutton)
	3242	+ if (source == okbutton)
3048	3243	{
3049	3244	textpanel.setVisible(false);
3050	3245	textpanel.remove(textarea);
..	..	@@ -3056,7 +3251,7 @@
3056	3251	textarea = null;
3057	3252	textpanel = null;
3058	3253	}
3059		- if (event.getSource() == cancelbutton)
	3254	+ if (source == cancelbutton)
3060	3255	{
3061	3256	textpanel.setVisible(false);
3062	3257	textpanel.remove(textarea);
..	..	@@ -3068,49 +3263,50 @@
3068	3263	//applySelf();
3069	3264	//client.refreshEditWindow();
3070	3265	//refreshContents();
3071		- if (event.getSource() == nameField)
	3266	+ if (source == nameField)
3072	3267	{
3073	3268	//System.out.println("ObjEditor " + event);
3074	3269	applySelf0(true);
3075	3270	//parent.applySelf();
3076	3271	objEditor.refreshContents();
3077		- } else if (event.getSource() == resetButton)
	3272	+ } else if (source == resetButton)
3078	3273	{
3079	3274	CameraPane.fullreset = true;
3080	3275	copy.Reset(); // ResetMeshes();
3081	3276	copy.Touch();
3082	3277	objEditor.refreshContents();
3083		- } else if (event.getSource() == stepItem)
	3278	+ } else if (source == stepItem)
3084	3279	{
3085		- cameraView.ONESTEP = true;
	3280	+ //cameraView.ONESTEP = true;
	3281	+ Globals.ONESTEP = true;
3086	3282	cameraView.repaint();
3087	3283	return;
3088		- } else if (event.getSource() == stepButton)
	3284	+ } else if (source == stepButton)
3089	3285	{
3090	3286	copy.Step();
3091	3287	copy.Touch();
3092	3288	objEditor.refreshContents();
3093		- } else if (event.getSource() == slowerButton)
	3289	+ } else if (source == slowerButton)
3094	3290	{
3095	3291	copy.Slower();
3096	3292	copy.Touch();
3097	3293	objEditor.refreshContents();
3098		- } else if (event.getSource() == fasterButton)
	3294	+ } else if (source == fasterButton)
3099	3295	{
3100	3296	copy.Faster();
3101	3297	copy.Touch();
3102	3298	objEditor.refreshContents();
3103		- } else if (event.getSource() == remarkButton)
	3299	+ } else if (source == remarkButton)
3104	3300	{
3105	3301	copy.Remark();
3106	3302	copy.Touch();
3107	3303	objEditor.refreshContents();
3108		- } else if (event.getSource() == stepAllButton)
	3304	+ } else if (source == stepAllButton)
3109	3305	{
3110	3306	copy.StepAll();
3111	3307	copy.Touch();
3112	3308	objEditor.refreshContents();
3113		- } else if (event.getSource() == resetAllButton)
	3309	+ } else if (source == resetAllButton)
3114	3310	{
3115	3311	//CameraPane.fullreset = true;
3116	3312	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3143,53 +3339,75 @@
3143	3339	// Close();
3144	3340	// }
3145	3341	// else
3146		- if (event.getSource() == resetSlidersButton)
	3342	+ if (source == resetSlidersButton)
3147	3343	{
3148	3344	ResetSliders();
3149		- } else if (event.getSource() == clearMaterialButton)
	3345	+ } else if (source == clearMaterialButton)
3150	3346	{
3151	3347	ClearMaterial();
3152		- } else if (event.getSource() == createMaterialButton)
	3348	+ } else if (source == createMaterialButton)
3153	3349	{
3154	3350	CreateMaterial();
3155		- } else if (event.getSource() == clearPanelButton)
	3351	+ } else if (source == clearPanelButton)
3156	3352	{
3157	3353	copy.ClearUI();
3158	3354	refreshContents(true);
3159		- } /*
3160		- }
3161		-
3162		- public boolean action(Event event, Object arg)
3163		- {
3164		- */ else if (event.getSource() == closeItem)
	3355	+ } else if (source == importGFDItem)
	3356	+ {
	3357	+ ImportGFD();
	3358	+ } else
	3359	+ if (source == importVRMLX3DItem)
	3360	+ {
	3361	+ ImportVRMLX3D();
	3362	+ } else
	3363	+ if (source == import3DSItem)
	3364	+ {
	3365	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3366	+ } else
	3367	+ if (source == importOBJItem)
	3368	+ {
	3369	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3370	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3371	+ browser.setVisible(true);
	3372	+ String filename = browser.getFile();
	3373	+ if (filename != null && filename.length() > 0)
	3374	+ {
	3375	+ String fullname = browser.getDirectory() + filename;
	3376	+ makeSomething(ReadOBJ(fullname), true);
	3377	+ }
	3378	+ } else
	3379	+ if (source == closeItem)
3165	3380	{
3166	3381	Close();
3167	3382	//return true;
3168		- } else if (event.getSource() == loadItem)
	3383	+ } else if (source == loadItem)
3169	3384	{
3170	3385	load();
3171	3386	//return true;
3172		- } else if (event.getSource() == saveItem)
	3387	+ } else if (source == newItem)
	3388	+ {
	3389	+ New();
	3390	+ } else if (source == saveItem)
3173	3391	{
3174	3392	save();
3175	3393	//return true;
3176		- } else if (event.getSource() == saveAsItem)
	3394	+ } else if (source == saveAsItem)
3177	3395	{
3178	3396	saveAs();
3179	3397	//return true;
3180		- } else if (event.getSource() == reexportItem)
	3398	+ } else if (source == reexportItem)
3181	3399	{
3182	3400	reexport();
3183	3401	//return true;
3184		- } else if (event.getSource() == exportAsItem)
	3402	+ } else if (source == exportAsItem)
3185	3403	{
3186	3404	export();
3187	3405	//return true;
3188		- } else if (event.getSource() == povItem)
	3406	+ } else if (source == povItem)
3189	3407	{
3190	3408	generatePOV();
3191	3409	//return true;
3192		- } else if (event.getSource() == zBufferItem)
	3410	+ } else if (source == zBufferItem)
3193	3411	{
3194	3412	try
3195	3413	{
..	..	@@ -3211,21 +3429,8 @@
3211	3429	cameraView.repaint();
3212	3430	//return true;
3213	3431	}
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)
	3432	+ */ else // combos...
	3433	+ if (source == texresMenu)
3229	3434	{
3230	3435	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3231	3436	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3237,27 +3442,304 @@
3237	3442	}
3238	3443	}
3239	3444
3240		- void ToggleAnimation()
	3445	+ void New()
3241	3446	{
3242		- if (!CameraPane.ANIMATION)
	3447	+ while (copy.Size() > 1)
3243	3448	{
3244		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3449	+ copy.remove(1);
	3450	+ }
	3451	+
	3452	+ ResetModel();
	3453	+ objEditor.refreshContents();
	3454	+ }
	3455	+
	3456	+ static public byte[] Compress(Object3D o)
	3457	+ {
	3458	+ try
	3459	+ {
	3460	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3461	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3462	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3463	+
	3464	+ Object3D parent = o.parent;
	3465	+ o.parent = null;
	3466	+
	3467	+ out.writeObject(o);
	3468	+
	3469	+ o.parent = parent;
	3470	+
	3471	+ out.flush();
	3472	+
	3473	+ zstream.close();
	3474	+ out.close();
	3475	+
	3476	+ return baos.toByteArray();
	3477	+ } catch (Exception e)
	3478	+ {
	3479	+ System.err.println(e);
	3480	+ return null;
	3481	+ }
	3482	+ }
	3483	+
	3484	+ static public Object Uncompress(byte[] bytes)
	3485	+ {
	3486	+ System.out.println("#bytes = " + bytes.length);
	3487	+ try
	3488	+ {
	3489	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3490	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3491	+ ObjectInputStream in = new ObjectInputStream(istream);
	3492	+ Object obj = in.readObject();
	3493	+ in.close();
	3494	+
	3495	+ return obj;
	3496	+ } catch (Exception e)
	3497	+ {
	3498	+ System.err.println(e);
	3499	+ return null;
	3500	+ }
	3501	+ }
	3502	+
	3503	+ static public Object clone(Object o)
	3504	+ {
	3505	+ try
	3506	+ {
	3507	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3508	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3509	+
	3510	+ out.writeObject(o);
	3511	+
	3512	+ out.flush();
	3513	+ out.close();
	3514	+
	3515	+ byte[] bytes = baos.toByteArray();
	3516	+
	3517	+ System.out.println("clone = " + bytes.length);
	3518	+
	3519	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3520	+ ObjectInputStream in = new ObjectInputStream(bais);
	3521	+ Object obj = in.readObject();
	3522	+ in.close();
	3523	+
	3524	+ return obj;
	3525	+ } catch (Exception e)
	3526	+ {
	3527	+ System.err.println(e);
	3528	+ return null;
	3529	+ }
	3530	+ }
	3531	+
	3532	+ cRadio GetCurrentTab()
	3533	+ {
	3534	+ cRadio ab;
	3535	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3536	+ {
	3537	+ ab = (cRadio)e.nextElement();
	3538	+ if(ab.GetObject() == copy)
	3539	+ {
	3540	+ return ab;
	3541	+ }
	3542	+ }
	3543	+
	3544	+ return null;
	3545	+ }
	3546	+
	3547	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3548	+
	3549	+ public void Save()
	3550	+ {
	3551	+ System.err.println("Save");
	3552	+
	3553	+ cRadio tab = GetCurrentTab();
	3554	+
	3555	+ boolean temp = CameraPane.SWITCH;
	3556	+ CameraPane.SWITCH = false;
	3557	+
	3558	+ copy.ExtractBigData(hashtable);
	3559	+
	3560	+ byte[] compress = Compress(copy);
	3561	+
	3562	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3563	+ tab.graphs[tab.undoindex++] = compress;
	3564	+
	3565	+ copy.RestoreBigData(hashtable);
	3566	+
	3567	+ CameraPane.SWITCH = temp;
	3568	+
	3569	+ //assert(hashtable.isEmpty());
	3570	+
	3571	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3572	+ {
	3573	+ tab.graphs[i] = null;
	3574	+ }
	3575	+
	3576	+ SetUndoStates();
	3577	+
	3578	+ // test save
	3579	+ if (false)
	3580	+ {
	3581	+ try
	3582	+ {
	3583	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3584	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3585	+
	3586	+ p.writeObject(copy);
	3587	+
	3588	+ p.flush();
	3589	+
	3590	+ ostream.close();
	3591	+ } catch (Exception e)
	3592	+ {
	3593	+ e.printStackTrace();
	3594	+ }
	3595	+ }
	3596	+ }
	3597	+
	3598	+ void CopyChanged(Object3D obj)
	3599	+ {
	3600	+ SetUndoStates();
	3601	+
	3602	+ boolean temp = CameraPane.SWITCH;
	3603	+ CameraPane.SWITCH = false;
	3604	+
	3605	+ copy.ExtractBigData(hashtable);
	3606	+
	3607	+ copy.clear();
	3608	+
	3609	+ for (int i=0; i<obj.Size(); i++)
	3610	+ {
	3611	+ copy.add(obj.get(i));
	3612	+ }
	3613	+
	3614	+ copy.RestoreBigData(hashtable);
	3615	+
	3616	+ CameraPane.SWITCH = temp;
	3617	+
	3618	+ //assert(hashtable.isEmpty());
	3619	+
	3620	+ copy.Touch();
	3621	+
	3622	+ ResetModel();
	3623	+ copy.HardTouch(); // recompile?
	3624	+
	3625	+ cRadio ab;
	3626	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3627	+ {
	3628	+ ab = (cRadio)e.nextElement();
	3629	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3630	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3631	+ if (test != null)
	3632	+ {
	3633	+ test.editWindow = ab.object.editWindow;
	3634	+ ab.object = test;
	3635	+ }
	3636	+ }
	3637	+
	3638	+ refreshContents();
	3639	+ }
	3640	+
	3641	+ cButton undoButton;
	3642	+ cButton redoButton;
	3643	+
	3644	+ void SetUndoStates()
	3645	+ {
	3646	+ cRadio tab = GetCurrentTab();
	3647	+
	3648	+ undoButton.setEnabled(tab.undoindex > 0);
	3649	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3650	+ }
	3651	+
	3652	+ public void Undo()
	3653	+ {
	3654	+ System.err.println("Undo");
	3655	+
	3656	+ cRadio tab = GetCurrentTab();
	3657	+
	3658	+ if (tab.undoindex == 0)
	3659	+ {
	3660	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3661	+ return;
	3662	+ }
	3663	+
	3664	+ if (tab.graphs[tab.undoindex] == null)
	3665	+ {
	3666	+ Save();
	3667	+ tab.undoindex -= 1;
	3668	+ }
	3669	+
	3670	+ tab.undoindex -= 1;
	3671	+
	3672	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3673	+ }
	3674	+
	3675	+ public void Redo()
	3676	+ {
	3677	+ cRadio tab = GetCurrentTab();
	3678	+
	3679	+ if (tab.graphs[tab.undoindex + 1] == null)
	3680	+ {
	3681	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3682	+ return;
	3683	+ }
	3684	+
	3685	+ tab.undoindex += 1;
	3686	+
	3687	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3688	+ }
	3689	+
	3690	+ void ImportGFD()
	3691	+ {
	3692	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3245	3693	browser.show();
3246	3694	String filename = browser.getFile();
3247	3695	if (filename != null && filename.length() > 0)
3248	3696	{
3249		- CameraPane.filename = browser.getDirectory() + filename;
	3697	+ String fullname = browser.getDirectory() + filename;
	3698	+
	3699	+ //Object3D readobj =
	3700	+ objEditor.ReadGFD(fullname, objEditor);
	3701	+ //makeSomething(readobj);
	3702	+ }
	3703	+ }
	3704	+
	3705	+ void ImportVRMLX3D()
	3706	+ {
	3707	+ if (Grafreed.standAlone)
	3708	+ {
	3709	+ /**/
	3710	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3711	+ browser.show();
	3712	+ String filename = browser.getFile();
	3713	+ if (filename != null && filename.length() > 0)
	3714	+ {
	3715	+ String fullname = browser.getDirectory() + filename;
	3716	+ LoadVRMLX3D(fullname);
	3717	+ }
	3718	+ /**/
	3719	+ }
	3720	+ }
	3721	+
	3722	+ void ToggleAnimation()
	3723	+ {
	3724	+ if (!Globals.ANIMATION)
	3725	+ {
	3726	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3727	+ browser.setVisible(true);
	3728	+ String filename = browser.getFile();
	3729	+ if (filename != null && filename.length() > 0)
	3730	+ {
	3731	+ Globals.filename = browser.getDirectory() + filename;
3250	3732	//CameraPane.framecount = 0;
3251		- CameraPane.imagecount = 0;
	3733	+ Globals.imagecount = 0;
3252	3734
3253		- CameraPane.ANIMATION ^= true;
	3735	+ Globals.ANIMATION ^= true;
3254	3736
3255		- GrafreeD.wav.cursor = 0;
3256		- GrafreeD.wav.loop = 0;
	3737	+ Grafreed.wav.cursor = 0;
	3738	+ Grafreed.wav.loop = 0;
3257	3739	}
3258	3740	} else
3259	3741	{
3260		- CameraPane.ANIMATION ^= true;
	3742	+ Globals.ANIMATION ^= true;
3261	3743	}
3262	3744	}
3263	3745
..	..	@@ -3303,7 +3785,7 @@
3303	3785	void CreateMaterial()
3304	3786	{
3305	3787	//copy.ClearMaterial(); // PATCH
3306		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3788	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3307	3789	if (copy.selection.size() > 0)
3308	3790	//SetMaterial(copy);
3309	3791	{
..	..	@@ -3354,7 +3836,7 @@
3354	3836	assert false;
3355	3837	}
3356	3838
3357		- void EditSelection()
	3839	+ void EditSelection(boolean newWindow)
3358	3840	{
3359	3841	}
3360	3842
..	..	@@ -3362,11 +3844,11 @@
3362	3844	{
3363	3845	copy.ResetBlockLoop(); // temporary problem
3364	3846
3365		- boolean random = CameraPane.RANDOM;
3366		- CameraPane.RANDOM = false; // parse everything
	3847	+ boolean random = CameraPane.SWITCH;
	3848	+ CameraPane.SWITCH = false; // parse everything
3367	3849	copy.ResetDisplayList();
3368	3850	copy.HardTouch();
3369		- CameraPane.RANDOM = random;
	3851	+ CameraPane.SWITCH = random;
3370	3852	}
3371	3853
3372	3854	// public void applySelf()
..	..	@@ -3436,10 +3918,40 @@
3436	3918	current.fakedepth = (float) fakedepthField.getFloat();
3437	3919	current.shadowbias = (float) shadowbiasField.getFloat();
3438	3920
3439		- if (!NumberSlider.frozen)
	3921	+ if (!cNumberSlider.frozen)
3440	3922	{
3441	3923	//System.out.println("Propagate = " + propagate);
3442	3924	copy.UpdateMaterial(anchor, current, propagate);
	3925	+
	3926	+ if (copy.material != null)
	3927	+ {
	3928	+ cMaterial mat = copy.material;
	3929	+
	3930	+ colorField.SetToolTipValue((mat.color));
	3931	+ modulationField.SetToolTipValue((mat.modulation));
	3932	+ metalnessField.SetToolTipValue((mat.metalness));
	3933	+ diffuseField.SetToolTipValue((mat.diffuse));
	3934	+ specularField.SetToolTipValue((mat.specular));
	3935	+ shininessField.SetToolTipValue((mat.shininess));
	3936	+ shiftField.SetToolTipValue((mat.shift));
	3937	+ ambientField.SetToolTipValue((mat.ambient));
	3938	+ lightareaField.SetToolTipValue((mat.lightarea));
	3939	+ diffusenessField.SetToolTipValue((mat.factor));
	3940	+ velvetField.SetToolTipValue((mat.velvet));
	3941	+ sheenField.SetToolTipValue((mat.sheen));
	3942	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3943	+ backlitField.SetToolTipValue((mat.bump));
	3944	+ anisoField.SetToolTipValue((mat.aniso));
	3945	+ anisoVField.SetToolTipValue((mat.anisoV));
	3946	+ cameraField.SetToolTipValue((mat.cameralight));
	3947	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3948	+ shadowField.SetToolTipValue((mat.shadow));
	3949	+ textureField.SetToolTipValue((mat.texture));
	3950	+ opacityField.SetToolTipValue((mat.opacity));
	3951	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3952	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3953	+ }
	3954	+
3443	3955	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3444	3956	{
3445	3957	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3484,6 +3996,7 @@
3484	3996	\|\| e.getSource() == apertureField
3485	3997	\|\| e.getSource() == shadowblurField)
3486	3998	{
	3999	+ new Exception().printStackTrace();
3487	4000	System.exit(0);
3488	4001	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3489	4002	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3510,7 +4023,13 @@
3510	4023	//System.out.println("PARENT = " + parent);
3511	4024	//if (parent != null)
3512	4025	// parent.applySelf();
3513		- refreshContents();
	4026	+ if (e.getSource() == normalpushField)
	4027	+ {
	4028	+ objEditor.refreshContents();
	4029	+ //Refresh();
	4030	+ }
	4031	+ else
	4032	+ refreshContents();
3514	4033	// ??? client.refreshEditWindow();
3515	4034	}
3516	4035	//else
..	..	@@ -3522,7 +4041,7 @@
3522	4041	//group.name = nameField.getText();
3523	4042	//objEditor.applySelf();
3524	4043
3525		- assert (objEditor == this);
	4044	+ // OCT2018: assert (objEditor == this);
3526	4045	if (copy.selection == null \|\| copy.selection.size() == 0)
3527	4046	//super.applySelf()
3528	4047	; else
..	..	@@ -3546,12 +4065,18 @@
3546	4065	objEditor.copy = keep;
3547	4066	}
3548	4067	}
	4068	+
	4069	+ if (normalpushField != null)
	4070	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3549	4071	}
3550	4072
3551	4073	void SnapObject()
3552	4074	{
3553		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3554		- SnapObject(obj);
	4075	+ if (copy.selection.size() > 0)
	4076	+ {
	4077	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4078	+ SnapObject(obj);
	4079	+ }
3555	4080	}
3556	4081
3557	4082	void SnapObject(Object3D obj)
..	..	@@ -3797,7 +4322,7 @@
3797	4322
3798	4323	radioPanel.revalidate();
3799	4324	radioPanel.repaint();
3800		- ctrlPanel.revalidate(); // ? new
	4325	+ ctrlPanel.validate(); // ? new
3801	4326	ctrlPanel.repaint();
3802	4327	}
3803	4328	}
..	..	@@ -3806,6 +4331,8 @@
3806	4331
3807	4332	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3808	4333	{
	4334	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4335	+ Save();
3809	4336	//Tween.set(thing, 0).target(1).start(tweenManager);
3810	4337	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3811	4338	// if (thing instanceof GenericJointDemo)
..	..	@@ -3892,6 +4419,12 @@
3892	4419	{
3893	4420	ResetModel();
3894	4421	Select(thing.GetTreePath(), true, false); // unselect... false);
	4422	+
	4423	+ if (thing.Size() == 0)
	4424	+ {
	4425	+ //EditSelection(false);
	4426	+ }
	4427	+
3895	4428	refreshContents();
3896	4429	}
3897	4430
..	..	@@ -4009,6 +4542,7 @@
4009	4542	}
4010	4543	}
4011	4544	}
	4545	+
4012	4546	LoadGFDThread loadGFDThread;
4013	4547
4014	4548	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4028,8 +4562,10 @@
4028	4562
4029	4563	try
4030	4564	{
	4565	+ // Try compressed version first.
4031	4566	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4032		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4567	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4568	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4033	4569
4034	4570	readobj = (Object3D) p.readObject();
4035	4571	istream.close();
..	..	@@ -4037,7 +4573,20 @@
4037	4573	readobj.ResetDisplayList();
4038	4574	} catch (Exception e)
4039	4575	{
4040		- e.printStackTrace();
	4576	+ //e.printStackTrace();
	4577	+ try
	4578	+ {
	4579	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4580	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4581	+
	4582	+ readobj = (Object3D) p.readObject();
	4583	+ istream.close();
	4584	+
	4585	+ readobj.ResetDisplayList();
	4586	+ } catch (Exception e2)
	4587	+ {
	4588	+ e2.printStackTrace();
	4589	+ }
4041	4590	}
4042	4591	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4043	4592	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4083,6 +4632,12 @@
4083	4632
4084	4633	void LoadIt(Object obj)
4085	4634	{
	4635	+ if (obj == null)
	4636	+ {
	4637	+ // Invalid file
	4638	+ return;
	4639	+ }
	4640	+
4086	4641	System.out.println("Loaded " + obj);
4087	4642	//new Exception().printStackTrace();
4088	4643	Object3D readobj = (Object3D) obj;
..	..	@@ -4092,6 +4647,8 @@
4092	4647
4093	4648	if (readobj != null)
4094	4649	{
	4650	+ if (Globals.SAVEONMAKE)
	4651	+ Save();
4095	4652	try
4096	4653	{
4097	4654	//readobj.deepCopySelf(copy);
..	..	@@ -4154,7 +4711,7 @@
4154	4711
4155	4712	void load() // throws ClassNotFoundException
4156	4713	{
4157		- if (GrafreeD.standAlone)
	4714	+ if (Grafreed.standAlone)
4158	4715	{
4159	4716	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4160	4717	browser.show();
..	..	@@ -4241,11 +4798,13 @@
4241	4798	try
4242	4799	{
4243	4800	FileOutputStream ostream = new FileOutputStream(lastname);
4244		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4801	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4802	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4245	4803
4246	4804	p.writeObject(copy);
4247	4805	p.flush();
4248	4806
	4807	+ zstream.close();
4249	4808	ostream.close();
4250	4809
4251	4810	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4255,17 +4814,20 @@
4255	4814	{
4256	4815	}
4257	4816	}
	4817	+
4258	4818	String lastname;
4259	4819
4260	4820	void saveAs()
4261	4821	{
4262		- if (GrafreeD.standAlone)
	4822	+ if (Grafreed.standAlone)
4263	4823	{
4264	4824	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4265	4825	browser.setVisible(true);
4266	4826	String filename = browser.getFile();
4267	4827	if (filename != null && filename.length() > 0)
4268	4828	{
	4829	+ if (!filename.endsWith(".gfd"))
	4830	+ filename += ".gfd";
4269	4831	lastname = browser.getDirectory() + filename;
4270	4832	save();
4271	4833	}
..	..	@@ -4364,13 +4926,13 @@
4364	4926	try
4365	4927	{
4366	4928	FileOutputStream ostream = new FileOutputStream(filename);
4367		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4368		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4929	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4930	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4369	4931
4370	4932	Object3D objectparent = obj.parent;
4371	4933	obj.parent = null;
4372	4934
4373		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4935	+ Object3D object = (Object3D) Grafreed.clone(obj);
4374	4936
4375	4937	obj.parent = objectparent;
4376	4938
..	..	@@ -4382,8 +4944,8 @@
4382	4944	p.writeObject(object);
4383	4945	p.flush();
4384	4946
	4947	+ zstream.close();
4385	4948	ostream.close();
4386		- // zstream.close();
4387	4949
4388	4950	// group.selection.get(0).parent = parent;
4389	4951	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4404,7 +4966,7 @@
4404	4966	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4405	4967	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4406	4968	copy.generatePOV(buffer);
4407		- if (GrafreeD.standAlone)
	4969	+ if (Grafreed.standAlone)
4408	4970	{
4409	4971	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4410	4972	browser.show();
..	..	@@ -4430,7 +4992,8 @@
4430	4992	Object3D client;
4431	4993	Object3D copy;
4432	4994	MenuBar menuBar;
4433		- Menu windowMenu;
	4995	+ Menu fileMenu;
	4996	+ MenuItem newItem;
4434	4997	MenuItem loadItem;
4435	4998	MenuItem saveItem;
4436	4999	MenuItem saveAsItem;
..	..	@@ -4438,45 +5001,60 @@
4438	5001	MenuItem reexportItem;
4439	5002	MenuItem povItem;
4440	5003	MenuItem closeItem;
4441		- Menu cameraMenu;
	5004	+
4442	5005	CheckboxMenuItem zBufferItem;
4443	5006	//MenuItem normalLensItem;
4444		- MenuItem editCameraItem;
4445		- MenuItem revertCameraItem;
4446		- CheckboxMenuItem toggleLiveItem;
4447	5007	MenuItem stepItem;
4448		- CheckboxMenuItem toggleFullItem;
	5008	+ CheckboxMenuItem toggleLiveItem;
	5009	+ CheckboxMenuItem toggleFullScreenItem;
	5010	+ CheckboxMenuItem toggleTimelineItem;
4449	5011	CheckboxMenuItem toggleRenderItem;
4450	5012	CheckboxMenuItem toggleDebugItem;
4451	5013	CheckboxMenuItem toggleFrustumItem;
4452	5014	CheckboxMenuItem toggleFootContactItem;
4453	5015	CheckboxMenuItem toggleDLItem;
4454	5016	CheckboxMenuItem toggleTextureItem;
4455		- CheckboxMenuItem toggleRandomItem;
	5017	+ CheckboxMenuItem toggleSwitchItem;
4456	5018	CheckboxMenuItem toggleRootItem;
4457	5019	CheckboxMenuItem animationItem;
4458	5020	CheckboxMenuItem toggleHandleItem;
4459	5021	CheckboxMenuItem togglePaintItem;
4460	5022	JSplitPane mainPanel;
4461	5023	JScrollPane scrollpane;
	5024	+
4462	5025	JPanel toolbarPanel;
4463		- JPanel treePanel;
	5026	+
	5027	+ cGridBag treePanel;
	5028	+
4464	5029	JPanel radioPanel;
4465	5030	ButtonGroup buttonGroup;
4466		- JPanel ctrlPanel;
4467		- JPanel materialPanel;
	5031	+
	5032	+ cGridBag toolboxPanel;
	5033	+ cGridBag materialPanel;
	5034	+ cGridBag ctrlPanel;
	5035	+
4468	5036	JScrollPane infoPanel;
4469		- JPanel optionsPanel;
	5037	+
	5038	+ cGridBag optionsPanel;
	5039	+
4470	5040	JTabbedPane objectPanel;
4471		- JPanel XYZPanel;
	5041	+ boolean materialFlushed;
	5042	+ Object3D latestObject;
	5043	+
	5044	+ cGridBag XYZPanel;
	5045	+
4472	5046	JSplitPane gridPanel;
4473	5047	JSplitPane bigPanel;
4474		- JPanel bigThree;
4475		- JTabbedPane scenePanel;
4476		- JPanel cameraPanel;
	5048	+
	5049	+ cGridBag bigThree;
	5050	+ cGridBag scenePanel;
	5051	+ cGridBag centralPanel;
	5052	+ JSplitPane cameraPanel;
	5053	+ JPanel timelinePanel;
	5054	+ JMenuBar timelineMenubar;
4477	5055	JSplitPane framePanel;
4478	5056	JTextArea/Field/ nameField;
4479		- cButton textureButton;
	5057	+ //cButton textureButton;
4480	5058	cButton okButton;
4481	5059	cButton applyButton;
4482	5060	cButton cancelButton;
..	..	@@ -4523,65 +5101,72 @@
4523	5101	// MATERIAL
4524	5102	JLabel materialLabel;
4525	5103	JLabel colorLabel;
4526		- NumberSlider colorField;
	5104	+ cNumberSlider colorField;
4527	5105	JLabel modulationLabel;
4528		- NumberSlider modulationField;
	5106	+ cNumberSlider modulationField;
4529	5107	JLabel metalnessLabel;
4530		- NumberSlider metalnessField;
	5108	+ cNumberSlider metalnessField;
4531	5109	JLabel diffuseLabel;
4532		- NumberSlider diffuseField;
	5110	+ cNumberSlider diffuseField;
4533	5111	JLabel specularLabel;
4534		- NumberSlider specularField;
	5112	+ cNumberSlider specularField;
4535	5113	JLabel shininessLabel;
4536		- NumberSlider shininessField;
	5114	+ cNumberSlider shininessField;
4537	5115	JLabel shiftLabel;
4538		- NumberSlider shiftField;
	5116	+ cNumberSlider shiftField;
4539	5117	JLabel ambientLabel;
4540		- NumberSlider ambientField;
	5118	+ cNumberSlider ambientField;
4541	5119	JLabel lightareaLabel;
4542		- NumberSlider lightareaField;
	5120	+ cNumberSlider lightareaField;
4543	5121	JLabel diffusenessLabel;
4544		- NumberSlider diffusenessField;
	5122	+ cNumberSlider diffusenessField;
4545	5123	JLabel velvetLabel;
4546		- NumberSlider velvetField;
	5124	+ cNumberSlider velvetField;
4547	5125	JLabel sheenLabel;
4548		- NumberSlider sheenField;
	5126	+ cNumberSlider sheenField;
4549	5127	JLabel subsurfaceLabel;
4550		- NumberSlider subsurfaceField;
	5128	+ cNumberSlider subsurfaceField;
4551	5129	//JLabel bumpLabel;
4552	5130	//NumberSlider bumpField;
4553	5131	JLabel backlitLabel;
4554		- NumberSlider backlitField;
	5132	+ cNumberSlider backlitField;
4555	5133	JLabel anisoLabel;
4556		- NumberSlider anisoField;
	5134	+ cNumberSlider anisoField;
4557	5135	JLabel anisoVLabel;
4558		- NumberSlider anisoVField;
	5136	+ cNumberSlider anisoVField;
4559	5137	JLabel cameraLabel;
4560		- NumberSlider cameraField;
	5138	+ cNumberSlider cameraField;
4561	5139	JLabel selfshadowLabel;
4562		- NumberSlider selfshadowField;
	5140	+ cNumberSlider selfshadowField;
4563	5141	JLabel shadowLabel;
4564		- NumberSlider shadowField;
	5142	+ cNumberSlider shadowField;
4565	5143	JLabel textureLabel;
4566		- NumberSlider textureField;
	5144	+ cNumberSlider textureField;
4567	5145	JLabel opacityLabel;
4568		- NumberSlider opacityField;
	5146	+ cNumberSlider opacityField;
4569	5147	JLabel fakedepthLabel;
4570		- NumberSlider fakedepthField;
	5148	+ cNumberSlider fakedepthField;
4571	5149	JLabel shadowbiasLabel;
4572		- NumberSlider shadowbiasField;
	5150	+ cNumberSlider shadowbiasField;
4573	5151	JLabel bumpLabel;
4574		- NumberSlider bumpField;
	5152	+ cNumberSlider bumpField;
4575	5153	JLabel noiseLabel;
4576		- NumberSlider noiseField;
	5154	+ cNumberSlider noiseField;
4577	5155	JLabel powerLabel;
4578		- NumberSlider powerField;
	5156	+ cNumberSlider powerField;
4579	5157	JLabel borderfadeLabel;
4580		- NumberSlider borderfadeField;
	5158	+ cNumberSlider borderfadeField;
4581	5159	JLabel fogLabel;
4582		- NumberSlider fogField;
	5160	+ cNumberSlider fogField;
4583	5161	JLabel opacityPowerLabel;
4584		- NumberSlider opacityPowerField;
4585		- JTree jTree;
	5162	+ cNumberSlider opacityPowerField;
	5163	+ cTree jTree;
4586	5164	//ObjectUI parent;
	5165	+
	5166	+ cNumberSlider normalpushField;
	5167	+
	5168	+ private MenuItem importGFDItem;
	5169	+ private MenuItem importVRMLX3DItem;
	5170	+ private MenuItem import3DSItem;
	5171	+ private MenuItem importOBJItem;
4587	5172	}