~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.*;
..	..	@@ -19,6 +20,8 @@
19	20	import //weka.core.
20	21	matrix.Matrix;
21	22
	23	+import grafeme.ui.*;
	24	+
22	25	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	26	ActionListener, ChangeListener,
24	27	InputMethodListener,
..	..	@@ -28,7 +31,73 @@
28	31	iSendInfo
29	32	//KeyListener
30	33	{
	34	+ boolean timeline;
	35	+ boolean wasFullScreen;
31	36
	37	+ GroupEditor callee;
	38	+ JFrame frame;
	39	+
	40	+ static ObjEditor theFrame;
	41	+
	42	+ cButton GetButton(String name, boolean border)
	43	+ {
	44	+ try
	45	+ {
	46	+ ImageIcon icon = GetIcon(name);
	47	+ return new cButton(icon, border);
	48	+ }
	49	+ catch (Exception e)
	50	+ {
	51	+ return new cButton(name, border);
	52	+ }
	53	+ }
	54	+
	55	+ cToggleButton GetToggleButton(String name, boolean border)
	56	+ {
	57	+ try
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cToggleButton(icon, border);
	61	+ }
	62	+ catch (Exception e)
	63	+ {
	64	+ return new cToggleButton(name, border);
	65	+ }
	66	+ }
	67	+
	68	+ cCheckBox GetCheckBox(String name, boolean border)
	69	+ {
	70	+ try
	71	+ {
	72	+ ImageIcon icon = GetIcon(name);
	73	+ return new cCheckBox(icon, border);
	74	+ }
	75	+ catch (Exception e)
	76	+ {
	77	+ return new cCheckBox(name, border);
	78	+ }
	79	+ }
	80	+
	81	+ private ImageIcon GetIcon(String name) throws IOException
	82	+ {
	83	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	84	+
	85	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	86	+ {
	87	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	88	+ Graphics2D g = resized.createGraphics();
	89	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	90	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	91	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	92	+ g.dispose();
	93	+
	94	+ image = resized;
	95	+ }
	96	+
	97	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	98	+ return icon;
	99	+ }
	100	+
32	101	// SCRIPT
33	102
34	103	transient JFrame textpanel = null;
..	..	@@ -119,51 +188,62 @@
119	188	void keyPressed(int key, int modifiers)
120	189	{
121	190	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	191	+ Globals.theRenderer.keyPressed(key, modifiers);
123	192	}
124	193	*/
125	194
126	195	static GridBagConstraints aConstraints;
127	196	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	197	+
130	198	static int GRIDWIDTH = 100; // 4;
131	199
132	200	public void closeUI()
133	201	{
134	202	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	203	+// System.out.println("this = " + this);
	204	+// System.out.println("objEditor = " + objEditor);
137	205	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	206	+// objEditor.ctrlPanel.remove(nameField);
139	207
140		- if (!GroupEditor.allparams)
	208	+ objEditor.ctrlPanel.remove(namePanel);
	209	+
	210	+ if (!allparams)
141	211	return;
142	212
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);
	213	+// objEditor.ctrlPanel.remove(liveCB);
	214	+// objEditor.ctrlPanel.remove(hideCB);
	215	+// objEditor.ctrlPanel.remove(markCB);
	216	+//
	217	+// objEditor.ctrlPanel.remove(randomCB);
	218	+// objEditor.ctrlPanel.remove(speedupCB);
	219	+// objEditor.ctrlPanel.remove(rewindCB);
	220	+//
	221	+// objEditor.ctrlPanel.remove(resetButton);
	222	+// objEditor.ctrlPanel.remove(stepButton);
	223	+//// objEditor.ctrlPanel.remove(stepAllButton);
	224	+//// objEditor.ctrlPanel.remove(resetAllButton);
	225	+// objEditor.ctrlPanel.remove(link2masterCB);
	226	+// //objEditor.ctrlPanel.remove(flipVCB);
	227	+// //objEditor.ctrlPanel.remove(texresMenu);
	228	+// objEditor.ctrlPanel.remove(slowerButton);
	229	+// objEditor.ctrlPanel.remove(fasterButton);
	230	+// objEditor.ctrlPanel.remove(remarkButton);
	231	+
	232	+ objEditor.ctrlPanel.remove(setupPanel);
	233	+ objEditor.ctrlPanel.remove(setupPanel2);
	234	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	235	+ objEditor.ctrlPanel.remove(pushPanel);
	236	+ //objEditor.ctrlPanel.remove(fillPanel);
	237	+
	238	+ //Remove(normalpushField);
161	239	}
162	240
163	241	public ObjEditor GetEditor()
164	242	{
165	243	return objEditor; //.GetEditor();
166	244	}
	245	+
	246	+ // Sometimes myself, sometimes my callee's.
167	247	ObjEditor objEditor;
168	248
169	249	/*
..	..	@@ -226,6 +306,7 @@
226	306	//localCopy.parent = null;
227	307
228	308	frame = new JFrame();
	309	+ frame.setUndecorated(true);
229	310	objEditor = this;
230	311	this.callee = callee;
231	312
..	..	@@ -238,7 +319,7 @@
238	319	//if (!isDisplayable())
239	320	//setUndecorated(true);
240	321
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	322	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	323	client = inClient;
243	324	copy = localCopy;
244	325	copy.editWindow = this;
..	..	@@ -256,27 +337,48 @@
256	337	return frame.action(event, obj);
257	338	}
258	339
	340	+ // Cannot work without static
	341	+ static boolean allparams = true;
	342	+
	343	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	344	+
259	345	void SetupMenu()
260	346	{
261	347	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..."));
	348	+ menuBar.add(fileMenu = new Menu("File"));
	349	+ fileMenu.add(newItem = new MenuItem("New"));
	350	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	351	+
	352	+ //oe.menuBar.add(menu = new Menu("Include"));
	353	+ Menu menu = new Menu("Import");
	354	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	355	+ importOBJItem.addActionListener(this);
	356	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	357	+ import3DSItem.addActionListener(this);
	358	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	359	+ importVRMLX3DItem.addActionListener(this);
	360	+ menu.add("-");
	361	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	362	+ importGFDItem.addActionListener(this);
	363	+ fileMenu.add(menu);
	364	+ fileMenu.add("-");
	365	+
	366	+ fileMenu.add(saveItem = new MenuItem("Save"));
	367	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	368	//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("-");
	369	+ fileMenu.add("-");
	370	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	371	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	372	+ fileMenu.add("-");
272	373	if (client.parent != null)
273	374	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	375	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	376	} else
276	377	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	378	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	379	}
279	380
	381	+ newItem.addActionListener(this);
280	382	loadItem.addActionListener(this);
281	383	saveItem.addActionListener(this);
282	384	saveAsItem.addActionListener(this);
..	..	@@ -285,77 +387,64 @@
285	387	//povItem.addActionListener(this);
286	388	closeItem.addActionListener(this);
287	389
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	390	objectPanel = new JTabbedPane();
	391	+
	392	+ ChangeListener changeListener = new ChangeListener()
	393	+ {
	394	+ public void stateChanged(ChangeEvent changeEvent)
	395	+ {
	396	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	397	+// {
	398	+// if (latestObject != null)
	399	+// {
	400	+// refreshContents(true);
	401	+// SetMaterial(latestObject);
	402	+// }
	403	+//
	404	+// materialFlushed = true;
	405	+// }
	406	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	407	+// {
	408	+// if (listUI.size() == 0)
	409	+// EditSelection(false);
	410	+// }
	411	+
	412	+ refreshContents(false); // To refresh Info tab
	413	+ }
	414	+ };
	415	+ objectPanel.addChangeListener(changeListener);
	416	+
342	417	toolbarPanel = new JPanel();
343	418	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	419	+ treePanel = new cGridBag();
345	420	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	421	+
	422	+ editPanel = new cGridBag().setVertical(true);
	423	+ editPanel.setName("Edit");
	424	+
	425	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	426	+
	427	+ editCommandsPanel = new cGridBag();
	428	+ editPanel.add(editCommandsPanel);
	429	+ editPanel.add(ctrlPanel);
	430	+
	431	+ toolboxPanel = new cGridBag().setVertical(false);
	432	+ toolboxPanel.setName("Toolbox");
	433	+
	434	+ materialPanel = new cGridBag().setVertical(true);
349	435	materialPanel.setName("Material");
	436	+
350	437	/JTextPane/
351	438	infoarea = createTextPane();
	439	+ doc = infoarea.getStyledDocument();
	440	+
352	441	infoarea.setEditable(true);
353	442	SetText();
354	443	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	444	// infoarea.setOpaque(false);
356	445	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	446	+// TEXTAREA infoarea.setLineWrap(true);
	447	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	448	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360	449	infoPanel.setPreferredSize(new Dimension(50, 200));
361	450	infoPanel.setName("Info");
..	..	@@ -366,16 +455,16 @@
366	455	mainPanel.setName("Main");
367	456	mainPanel.setContinuousLayout(true);
368	457	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	458	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
	459	+ mainPanel.setDividerLocation(0.5); //1.0);
	460	+ mainPanel.setResizeWeight(0.5);
372	461
373	462	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	463	//mainPanel.setLayout(new GridBagLayout());
375	464	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	465	+// treePanel.setLayout(new GridBagLayout());
	466	+ //ctrlPanel.setLayout(new GridBagLayout());
	467	+ //materialPanel.setLayout(new GridBagLayout());
379	468
380	469	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	470	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +503,7 @@
414	503	static String newline = "\n";
415	504	protected static final String buttonString = "JButton";
416	505	StyledDocument doc;
417		- JTextArea infoarea;
	506	+ JTextPane infoarea;
418	507
419	508	void ClearInfo()
420	509	{
..	..	@@ -437,10 +526,10 @@
437	526	e.printStackTrace();
438	527	}
439	528
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();
	529	+// String selection = infoarea.getText();
	530	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	531	+// java.awt.datatransfer.Clipboard clipboard =
	532	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	533	//clipboard.setContents(data, data);
445	534	}
446	535
..	..	@@ -463,13 +552,13 @@
463	552	//SendInfo("Name:", "bold");
464	553	if (sel.GetTextures() != null \|\| debug)
465	554	{
466		- si.SendInfo(sel.toString(), "bold");
	555	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	556	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	557	if (sel.Size() > 0)
469	558	{
470	559	si.SendInfo("#children = " + sel.Size(), "regular");
471	560	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	561	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	562	if (debug)
474	563	{
475	564	try
..	..	@@ -481,7 +570,10 @@
481	570	}
482	571
483	572	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	573	+ {
	574	+ si.SendInfo(" BBox min: " + minima, "regular");
	575	+ si.SendInfo(" BBox max: " + maxima, "regular");
	576	+ }
485	577
486	578	if (sel.bRep != null)
487	579	{
..	..	@@ -508,7 +600,7 @@
508	600	}
509	601	if (sel.support != null)
510	602	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	603	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	604	}
513	605	if (sel.scriptnode != null)
514	606	{
..	..	@@ -522,18 +614,18 @@
522	614	maxima.y = sel.toParent[3][1];
523	615	maxima.z = sel.toParent[3][2];
524	616	si.SendInfo(" Orig: " + maxima, "regular");
525		- maxima.x = sel.globalTransform[3][0];
526		- maxima.y = sel.globalTransform[3][1];
527		- maxima.z = sel.globalTransform[3][2];
528		- if (full)
529		- si.SendInfo(" Global Orig: " + maxima, "regular");
530	617	maxima.x = sel.toParent[0][0];
531	618	maxima.y = sel.toParent[1][1];
532	619	maxima.z = sel.toParent[2][2];
533	620	si.SendInfo(" Scale: " + maxima, "regular");
534		- maxima.x = sel.globalTransform[0][0];
535		- maxima.y = sel.globalTransform[1][1];
536		- maxima.z = sel.globalTransform[2][2];
	621	+ maxima.x = sel.globalTransform[3][0];
	622	+ maxima.y = sel.globalTransform[3][1];
	623	+ maxima.z = sel.globalTransform[3][2];
	624	+ if (full)
	625	+ si.SendInfo(" Global Orig: " + maxima, "regular");
	626	+ maxima.x = sel.globalTransform[0][0];
	627	+ maxima.y = sel.globalTransform[1][1];
	628	+ maxima.z = sel.globalTransform[2][2];
537	629	if (full)
538	630	si.SendInfo(" Global Scale: " + maxima, "regular");
539	631	}
..	..	@@ -579,6 +671,9 @@
579	671	{
580	672	CameraPane.pointflow = (PointFlow) sel;
581	673	}
	674	+
	675	+ si.SendInfo("_____________________", "regular");
	676	+ si.SendInfo("", "regular");
582	677	}
583	678	}
584	679
..	..	@@ -594,52 +689,140 @@
594	689	}
595	690	}
596	691
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		- };
	692	+static GraphicsDevice device = GraphicsEnvironment
	693	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	694
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	695	+ Rectangle keeprect;
	696	+ cRadio radio;
	697	+
	698	+cButton keepButton;
	699	+ cButton twoButton; // Full 3D
	700	+ cButton sixButton;
	701	+ cButton threeButton;
	702	+ cButton sevenButton;
	703	+ cButton fourButton; // full panel
	704	+ cButton oneButton; // full XYZ
	705	+ //cButton currentLayout;
	706	+
	707	+ boolean maximized;
	708	+
	709	+ cButton fullscreenLayout;
621	710
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	711	+ void Minimize()
628	712	{
629		- for (int j = 0; j < 2; j++)
	713	+ frame.setState(Frame.ICONIFIED);
	714	+ }
	715	+
	716	+ void Maximize()
	717	+ {
	718	+ if (maximized)
630	719	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	720	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
636	721	}
637		- } catch (BadLocationException ble)
	722	+ else
	723	+ {
	724	+ keeprect = frame.getBounds();
	725	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	726	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	727	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	728	+// frame.setState(Frame.MAXIMIZED_BOTH);
	729	+ }
	730	+
	731	+ maximized ^= true;
	732	+ }
	733	+
	734	+ void ToggleFullScreen()
638	735	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	736	+ cameraView.ToggleFullScreen();
	737	+
	738	+ if (!CameraPane.FULLSCREEN)
	739	+ {
	740	+ device.setFullScreenWindow(null);
	741	+ //frame.setVisible(false);
	742	+// frame.removeNotify();
	743	+// frame.setUndecorated(false);
	744	+// frame.addNotify();
	745	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	746	+
	747	+// X frame.getContentPane().remove(/"Center",/bigThree);
	748	+// X framePanel.add(bigThree);
	749	+// X frame.getContentPane().add(/"Center",/framePanel);
	750	+ framePanel.setDividerLocation(1);
	751	+
	752	+ //frame.setVisible(true);
	753	+ radio.layout = keepButton;
	754	+ //theFrame = null;
	755	+ keepButton = null;
	756	+ radio.layout.doClick();
	757	+
	758	+ } else
	759	+ {
	760	+ keepButton = radio.layout;
	761	+ //keeprect = frame.getBounds();
	762	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	763	+// frame.getToolkit().getScreenSize().height);
	764	+ //frame.setVisible(false);
	765	+ device.setFullScreenWindow(frame);
	766	+// frame.removeNotify();
	767	+// frame.setUndecorated(true);
	768	+// frame.addNotify();
	769	+// X frame.getContentPane().remove(/"Center",/framePanel);
	770	+// X framePanel.remove(bigThree);
	771	+// X frame.getContentPane().add(/"Center",/bigThree);
	772	+ framePanel.setDividerLocation(0);
	773	+
	774	+ radio.layout = fullscreenLayout;
	775	+ radio.layout.doClick();
	776	+ //frame.setVisible(true);
	777	+ }
640	778	}
641	779
642		- return new JTextArea(); // textPane;
	780	+ private JTextPane createTextPane()
	781	+ {
	782	+// TEXTAREA String[] initString =
	783	+// {
	784	+// "This is an editable JTextPane, ", //regular
	785	+// "another ", //italic
	786	+// "styled ", //bold
	787	+// "text ", //small
	788	+// "component, ", //large
	789	+// "which supports embedded components..." + newline,//regular
	790	+// " " + newline, //button
	791	+// "...and embedded icons..." + newline, //regular
	792	+// " ", //icon
	793	+// newline + "JTextPane is a subclass of JEditorPane that "
	794	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	795	+// + "cover methods for interacting with those objects."
	796	+// };
	797	+//
	798	+// String[] initStyles =
	799	+// {
	800	+// "regular", "italic", "bold", "small", "large",
	801	+// "regular", "button", "regular", "icon",
	802	+// "regular"
	803	+// };
	804	+//
	805	+// JTextPane textPane = new JTextPane();
	806	+// textPane.setEditable(true);
	807	+// /StyledDocument/ doc = textPane.getStyledDocument();
	808	+// addStylesToDocument(doc);
	809	+//
	810	+// try
	811	+// {
	812	+// for (int j = 0; j < 2; j++)
	813	+// {
	814	+// for (int i = 0; i < initString.length; i++)
	815	+// {
	816	+// doc.insertString(doc.getLength(), initString[i],
	817	+// doc.getStyle(initStyles[i]));
	818	+// }
	819	+// }
	820	+// } catch (BadLocationException ble)
	821	+// {
	822	+// System.err.println("Couldn't insert initial text into text pane.");
	823	+// }
	824	+
	825	+ return new JTextPane(); // textPane;
643	826	}
644	827
645	828	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +875,7 @@
692	875	protected static ImageIcon createImageIcon(String path,
693	876	String description)
694	877	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	878	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	879	if (imgURL != null)
697	880	{
698	881	return new ImageIcon(imgURL, description);
..	..	@@ -724,6 +907,7 @@
724	907	// NumberSlider vDivsField;
725	908	// JCheckBox endcaps;
726	909	JCheckBox liveCB;
	910	+ JCheckBox selectCB;
727	911	JCheckBox hideCB;
728	912	JCheckBox link2masterCB;
729	913	JCheckBox markCB;
..	..	@@ -731,7 +915,12 @@
731	915	JCheckBox speedupCB;
732	916	JCheckBox rewindCB;
733	917	JCheckBox flipVCB;
	918	+
	919	+ cCheckBox toggleTextureCB;
	920	+ cCheckBox toggleSwitchCB;
	921	+
734	922	JComboBox texresMenu;
	923	+
735	924	JButton resetButton;
736	925	JButton stepButton;
737	926	JButton stepAllButton;
..	..	@@ -739,115 +928,87 @@
739	928	JButton slowerButton;
740	929	JButton fasterButton;
741	930	JButton remarkButton;
	931	+
	932	+ cGridBag editPanel;
	933	+ cGridBag editCommandsPanel;
	934	+
	935	+ cGridBag namePanel;
	936	+ cGridBag setupPanel;
	937	+ cGridBag setupPanel2;
	938	+ cGridBag objectCommandsPanel;
	939	+ cGridBag pushPanel;
	940	+ cGridBag fillPanel;
742	941
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	942	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	943	{
745	944	JCheckBox cb;
746	945
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);
	946	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	947	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	948
757	949	return cb;
758	950	}
759	951
760		- cButton AddButton(ObjEditor oe, String label)
	952	+ cButton AddButton(cGridBag panel, String label)
761	953	{
762	954	cButton cb;
763	955
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);
	956	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	957	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	958
774	959	return cb;
775	960	}
776	961
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	962	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	963	{
779	964	JComboBox combo;
780	965
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;
	966	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	967	combo.addActionListener(this);
785	968
786	969	return combo;
787	970	}
788	971
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	972	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	973	{
791		- NumberSlider combo;
	974	+ cGridBag control = new cGridBag();
	975	+
	976	+ cNumberSlider combo;
792	977
793	978	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	979	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		-
	980	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	981	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	982	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	983	+
	984	+ panel.add(control);
	985	+
	986	+ return control;
813	987	}
814	988
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	989	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	990	{
817		- NumberSlider combo;
	991	+ cGridBag control = new cGridBag();
	992	+
	993	+ cNumberSlider combo;
818	994
819	995	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	996	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		-
	997	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	998	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	999	combo.setInteger(current);
833	1000
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1001	+ panel.add(control);
	1002	+
	1003	+ return control;
839	1004	}
840	1005
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1006	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1007	{
843	1008	JTextArea text;
844	1009
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1010	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1011	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1012
852	1013	return text;
853	1014	}
..	..	@@ -877,9 +1038,16 @@
877	1038	objEditor.ctrlPanel.remove(j);
878	1039	}
879	1040
	1041	+ void Remove(cNumberSlider j)
	1042	+ {
	1043	+ j.removeChangeListener(this);
	1044	+ //objEditor.ctrlPanel.remove(j.label);
	1045	+ objEditor.ctrlPanel.remove(j);
	1046	+ }
	1047	+
880	1048	/*
881	1049	*/
882		- void Return() // ObjEditor oe)
	1050	+ void Return0() // ObjEditor oe)
883	1051	{
884	1052	aConstraints.gridy += 1;
885	1053	aConstraints.gridx = 0;
..	..	@@ -934,35 +1102,77 @@
934	1102
935	1103	void SetupUI2(ObjEditor oe)
936	1104	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1105	+ //SetupName(oe);
942	1106
943		- if (!GroupEditor.allparams)
	1107	+ namePanel = new cGridBag();
	1108	+
	1109	+ nameField = AddText(namePanel, copy.GetName());
	1110	+ namePanel.add(nameField);
	1111	+ oe.ctrlPanel.add(namePanel);
	1112	+
	1113	+ oe.ctrlPanel.Return();
	1114	+
	1115	+ if (!allparams)
944	1116	return;
945	1117
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1118	+ setupPanel = new cGridBag().setVertical(false);
	1119	+
	1120	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1121	+ liveCB.setToolTipText("Animate object");
	1122	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1123	+ selectCB.setToolTipText("Make object selectable");
949	1124	// 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");
	1125	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1126	+ hideCB.setToolTipText("Hide object");
	1127	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1128	+ markCB.setToolTipText("Set the animation target transform");
	1129	+
	1130	+ setupPanel2 = new cGridBag().setVertical(false);
	1131	+
	1132	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1133	+ rewindCB.setToolTipText("Rewind animation");
	1134	+
	1135	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1136	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1137	+
	1138	+ if (Globals.ADVANCED)
	1139	+ {
	1140	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1141	+ link2masterCB.setToolTipText("Attach to support");
	1142	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1143	+ speedupCB.setToolTipText("Option motion capture");
	1144	+ }
	1145	+
	1146	+ oe.ctrlPanel.add(setupPanel);
	1147	+ oe.ctrlPanel.Return();
	1148	+ oe.ctrlPanel.add(setupPanel2);
	1149	+ oe.ctrlPanel.Return();
	1150	+
	1151	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1152	+
	1153	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1154	+ resetButton.setToolTipText("Jump to frame zero");
	1155	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1156	+ stepButton.setToolTipText("Step one frame");
956	1157	// resetAllButton = AddButton(oe, "Reset All");
957	1158	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1159	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1160	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1161	+ slowerButton.setToolTipText("Decrease animation speed");
	1162	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1163	+ fasterButton.setToolTipText("Increase animation speed");
	1164	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1165	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1166
964		- Return();
	1167	+ oe.ctrlPanel.add(objectCommandsPanel);
	1168	+ oe.ctrlPanel.Return();
965	1169
	1170	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1171	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1172	+ //Return();
	1173	+
	1174	+ oe.ctrlPanel.Return();
	1175	+
966	1176	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1177	// ObjEditor.aConstraints.gridx += 1;
968	1178
..	..	@@ -1056,7 +1266,7 @@
1056	1266	oe.aConstraints.gridwidth = 1;
1057	1267	/**/
1058	1268	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1269	+ oe.ctrlPanel.Return();
1060	1270
1061	1271	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1272	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1368,28 @@
1158	1368	//JPanel worldPanel =
1159	1369	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1370	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1371	+ centralPanel = new cGridBag();
	1372	+ centralPanel.preferredWidth = 20;
	1373	+
	1374	+ if (Globals.ADVANCED)
	1375	+ {
	1376	+ timelinePanel = new JPanel(new BorderLayout());
	1377	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1378
	1379	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1380	+ cameraPanel.setContinuousLayout(true);
	1381	+ cameraPanel.setOneTouchExpandable(true);
	1382	+// cameraPanel.setDividerLocation(0.9);
	1383	+// cameraPanel.setDividerSize(9);
	1384	+ cameraPanel.setResizeWeight(1.0);
	1385	+
	1386	+ }
	1387	+
	1388	+ centralPanel.add(cameraView);
	1389	+ centralPanel.setFocusable(true);
	1390	+ //frame.setJMenuBar(timelineMenubar);
	1391	+ //centralPanel.add(timelinePanel);
	1392	+
1165	1393	//topView.camera = ;
1166	1394	//frontView.camera = new Camera(2);
1167	1395	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1405,13 @@
1177	1405	//frontView.object = copy;
1178	1406	//sideView.object = copy;
1179	1407
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1408	+ XYZPanel = new cGridBag().setVertical(true);
	1409	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1410
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1411	+ XYZPanel.preferredWidth = 5;
	1412	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1413	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1414	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1186	1415
1187	1416	/*
1188	1417	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1420,7 @@
1191	1420	gridPanel.add(cameraView);
1192	1421	gridPanel.add(XYZPanel);
1193	1422	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1423	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1424	gridPanel.setContinuousLayout(true);
1196	1425	gridPanel.setOneTouchExpandable(true);
1197	1426	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,11 +1449,13 @@
1220	1449	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1450	//tmp.setName("Edit");
1222	1451	objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- objectPanel.add(north);
	1452	+// JPanel north = new JPanel(new BorderLayout());
	1453	+// north.setName("Edit");
	1454	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1455	+// objectPanel.add(north);
	1456	+ objectPanel.add(editPanel);
1227	1457	objectPanel.add(infoPanel);
	1458	+ objectPanel.add(toolboxPanel);
1228	1459
1229	1460	/*
1230	1461	aConstraints.gridx = 0;
..	..	@@ -1233,7 +1464,7 @@
1233	1464	aConstraints.gridy += 1;
1234	1465	aConstraints.gridwidth = 1;
1235	1466	mainPanel.add(objectPanel, aConstraints);
1236		- */
	1467	+ */
1237	1468
1238	1469	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1239	1470	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1244,16 +1475,23 @@
1244	1475	scrollpane.setWheelScrollingEnabled(true);
1245	1476	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1477
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1478	+ /JTabbedPane/ scenePanel = new cGridBag();
	1479	+ scenePanel.preferredWidth = 6;
	1480	+
	1481	+ JTabbedPane tabbedPane = new JTabbedPane();
	1482	+ tabbedPane.add(scrollpane);
1249	1483
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1484	+ optionsPanel = new cGridBag().setVertical(false);
1253	1485
1254	1486	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1487	+
	1488	+ AddOptions(optionsPanel); //, aConstraints);
	1489	+
	1490	+ tabbedPane.add(optionsPanel);
	1491	+
	1492	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1493
	1494	+ scenePanel.add(tabbedPane);
1257	1495
1258	1496	/*
1259	1497	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1513,7 @@
1275	1513	jtp.add(tree);
1276	1514	*/
1277	1515
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1516	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1517	bigPanel.setContinuousLayout(true);
1280	1518	bigPanel.setOneTouchExpandable(true);
1281	1519	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1525,7 @@
1287	1525	//bigPanel.setSize(new Dimension(10,10));
1288	1526	//bigPanel.add(ctrlPanel);
1289	1527	//bigPanel.add(gridPanel);
	1528	+ /**
1290	1529	bigThree = new JPanel();
1291	1530	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1531	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1536,26 @@
1297	1536	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1537	aWindowConstraints.weightx = 0;
1299	1538	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1539	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1540	aWindowConstraints.weightx = 1;
1302	1541	aWindowConstraints.gridwidth = 3;
1303	1542	// aConstraints.gridheight = 3;
1304	1543	aWindowConstraints.gridx = 1;
1305	1544	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1545	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1546	aWindowConstraints.weightx = 0;
1308	1547	aWindowConstraints.gridx = 4;
1309	1548	aWindowConstraints.gridwidth = 1;
1310	1549	// aConstraints.gridheight = 3;
1311	1550	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1551	bigThree.add(XYZPanel, aWindowConstraints);
	1552	+ /**/
1313	1553
	1554	+ bigThree = new cGridBag();
	1555	+ bigThree.addComponent(scenePanel);
	1556	+ bigThree.addComponent(centralPanel);
	1557	+ bigThree.addComponent(XYZPanel);
	1558	+
1314	1559	// // SIDE EFFECT!!!
1315	1560	// aConstraints.gridx = 0;
1316	1561	// aConstraints.gridy = 0;
..	..	@@ -1331,14 +1576,19 @@
1331	1576	//worldPane.add(bigPanel);
1332	1577	//worldPane.add(worldPanel);
1333	1578	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1579	+ //frame.getContentPane().add(/"Center",/framePanel);
	1580	+ frame.add(/"Center",/framePanel);
1335	1581	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1582
1337	1583	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1584
1339		- frame.setSize(1024, 768);
1340		- frame.show();
	1585	+ frame.setSize(1280, 860);
	1586	+
	1587	+ frame.validate();
	1588	+ frame.setVisible(true);
1341	1589
	1590	+ cameraView.requestFocusInWindow();
	1591	+
1342	1592	gridPanel.setDividerLocation(1.0);
1343	1593
1344	1594	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1352,6 +1602,10 @@
1352	1602	});
1353	1603	}
1354	1604
	1605	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1606	+ {
	1607	+ }
	1608	+
1355	1609	JTree GetTree()
1356	1610	{
1357	1611	return objEditor.jTree;
..	..	@@ -1363,260 +1617,173 @@
1363	1617	ctrlPanel.removeAll();
1364	1618	}
1365	1619
1366		- void SetupMaterial(JPanel ctrlPanel)
	1620	+ void SetupMaterial(cGridBag panel)
1367	1621	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1622	+ /*
1371	1623	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1624	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1625	*/
1376	1626
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	1627	+ cGridBag editBar = new cGridBag().setVertical(false);
	1628	+
	1629	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1630	+ createMaterialButton.setToolTipText("Create material");
1382	1631
1383	1632	/*
1384	1633	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1634	*/
1389	1635
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	1636	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1637	+ clearMaterialButton.setToolTipText("Clear material");
	1638	+
	1639	+ if (Globals.ADVANCED)
	1640	+ {
	1641	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1642	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1643	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1644	+ }
1392	1645
1393		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394		-
1395		- aConstraints.gridx += 1;
1396		-
1397		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398		-
1399		- aConstraints.gridx += 1;
1400		-
1401		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402		-
1403		- aConstraints.gridx = 0;
1404		- aConstraints.gridy += 1;
1405		- aConstraints.weighty = 0;
1406		- aConstraints.gridwidth = 1;
	1646	+ editBar.preferredHeight = 15;
	1647	+
	1648	+ panel.add(editBar);
	1649	+
1407	1650	/**/
1408	1651	//aConstraints.weighty = 0;
1409	1652	////aConstraints.weightx = 1;
1410	1653	//aConstraints.weighty = 1;
1411	1654	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1655	//aConstraints.gridx += 1;
1413		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414		- aConstraints.weighty = 0;
1415		- aConstraints.gridx = 0;
1416		- aConstraints.gridy += 1;
1417		- aConstraints.gridwidth = 1;
	1656	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1657
1419		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424		- //aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426		- aConstraints.gridx = 0;
1427		- aConstraints.gridy += 1;
1428		- aConstraints.gridwidth = 1;
	1658	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1659	+
	1660	+ cGridBag color = new cGridBag();
	1661	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1662	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1663	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1664	+ //colorField.preferredWidth = 200;
	1665	+ colorSection.add(color);
1429	1666
1430		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433		- aConstraints.gridx += 1;
1434		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436		- aConstraints.gridx = 0;
1437		- aConstraints.gridy += 1;
1438		- aConstraints.gridwidth = 1;
	1667	+ cGridBag modulation = new cGridBag();
	1668	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1669	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1670	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1671	+ colorSection.add(modulation);
1439	1672
1440		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443		- aConstraints.gridx += 1;
1444		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	1673	+ cGridBag texture = new cGridBag();
	1674	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1675	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1676	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1677	+ colorSection.add(texture);
1449	1678
1450		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- aConstraints.gridwidth = 1;
	1679	+ cGridBag anisoU = new cGridBag();
	1680	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1681	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1682	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1683	+ colorSection.add(anisoU);
1459	1684
1460		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.gridwidth = 1;
	1685	+ cGridBag anisoV = new cGridBag();
	1686	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1687	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1688	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1689	+ colorSection.add(anisoV);
1469	1690
1470		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473		- aConstraints.gridx += 1;
1474		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476		- aConstraints.gridx = 0;
1477		- aConstraints.gridy += 1;
1478		- aConstraints.gridwidth = 1;
	1691	+ cGridBag shadowbias = new cGridBag();
	1692	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1693	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1694	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1695	+ colorSection.add(shadowbias);
1479	1696
1480		- //aConstraints.weighty = 1;
1481		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482		- //aConstraints.gridx += 1;
1483		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484		- aConstraints.weighty = 0;
1485		- aConstraints.gridx = 0;
1486		- aConstraints.gridy += 1;
1487		- aConstraints.gridwidth = 1;
	1697	+ panel.add(new JSeparator());
	1698	+
	1699	+ panel.add(colorSection);
	1700	+
	1701	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1702	+
	1703	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1704	+
	1705	+ cGridBag diffuse = new cGridBag();
	1706	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1707	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1708	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1709	+ diffuseSection.add(diffuse);
1488	1710
1489		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492		- aConstraints.gridx += 1;
1493		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495		- aConstraints.gridx = 0;
1496		- aConstraints.gridy += 1;
1497		- aConstraints.gridwidth = 1;
	1711	+ cGridBag diffuseness = new cGridBag();
	1712	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1713	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1714	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1715	+ diffuseSection.add(diffuseness);
1498	1716
1499		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502		- aConstraints.gridx += 1;
1503		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505		- aConstraints.gridx = 0;
1506		- aConstraints.gridy += 1;
1507		- aConstraints.gridwidth = 1;
	1717	+ cGridBag selfshadow = new cGridBag();
	1718	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1719	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1720	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1721	+ diffuseSection.add(selfshadow);
1508	1722
1509		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512		- aConstraints.gridx += 1;
1513		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515		- aConstraints.gridx = 0;
1516		- aConstraints.gridy += 1;
1517		- aConstraints.gridwidth = 1;
	1723	+ cGridBag sheen = new cGridBag();
	1724	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1725	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1726	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1727	+ diffuseSection.add(sheen);
1518	1728
1519		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522		- aConstraints.gridx += 1;
1523		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525		- aConstraints.gridx = 0;
1526		- aConstraints.gridy += 1;
1527		- aConstraints.gridwidth = 1;
	1729	+ cGridBag subsurface = new cGridBag();
	1730	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1731	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1732	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1733	+ diffuseSection.add(subsurface);
1528	1734
1529		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532		- aConstraints.gridx += 1;
1533		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535		- aConstraints.gridx = 0;
1536		- aConstraints.gridy += 1;
1537		- aConstraints.gridwidth = 1;
	1735	+ cGridBag shadow = new cGridBag();
	1736	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1737	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1738	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1739	+ diffuseSection.add(shadow);
1538	1740
1539		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542		- aConstraints.gridx += 1;
1543		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545		- aConstraints.gridx = 0;
1546		- aConstraints.gridy += 1;
1547		- aConstraints.gridwidth = 1;
	1741	+ cGridBag fakedepth = new cGridBag();
	1742	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1743	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1744	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1745	+ diffuseSection.add(fakedepth);
1548	1746
1549		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552		- aConstraints.gridx += 1;
1553		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555		- aConstraints.gridx = 0;
1556		- aConstraints.gridy += 1;
1557		- aConstraints.gridwidth = 1;
	1747	+ panel.add(new JSeparator());
	1748	+
	1749	+ panel.add(diffuseSection);
	1750	+
	1751	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1752	+
	1753	+ cGridBag specularSection = new cGridBag().setVertical(true);
1558	1754
1559		- //aConstraints.weighty = 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561		- //aConstraints.gridx += 1;
1562		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563		- aConstraints.weighty = 0;
1564		- aConstraints.gridx = 0;
1565		- aConstraints.gridy += 1;
1566		- aConstraints.gridwidth = 1;
	1755	+ cGridBag specular = new cGridBag();
	1756	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1757	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1758	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1759	+ specularSection.add(specular);
1567	1760
1568		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571		- aConstraints.gridx += 1;
1572		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574		- aConstraints.gridx = 0;
1575		- aConstraints.gridy += 1;
1576		- aConstraints.gridwidth = 1;
	1761	+ cGridBag lightarea = new cGridBag();
	1762	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1763	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1764	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1765	+ specularSection.add(lightarea);
1577	1766
1578		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581		- aConstraints.gridx += 1;
1582		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584		- aConstraints.gridx = 0;
1585		- aConstraints.gridy += 1;
1586		- aConstraints.gridwidth = 1;
	1767	+ cGridBag shininess = new cGridBag();
	1768	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1769	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1770	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1771	+ specularSection.add(shininess);
1587	1772
1588		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591		- aConstraints.gridx += 1;
1592		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594		- aConstraints.gridx = 0;
1595		- aConstraints.gridy += 1;
1596		- aConstraints.gridwidth = 1;
	1773	+ cGridBag metalness = new cGridBag();
	1774	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1775	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1776	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1777	+ specularSection.add(metalness);
1597	1778
1598		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601		- aConstraints.gridx += 1;
1602		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604		- aConstraints.gridx = 0;
1605		- aConstraints.gridy += 1;
1606		- aConstraints.gridwidth = 1;
	1779	+ cGridBag velvet = new cGridBag();
	1780	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1781	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1782	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1783	+ specularSection.add(velvet);
1607	1784
1608		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611		- aConstraints.gridx += 1;
1612		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614		- aConstraints.gridx = 0;
1615		- aConstraints.gridy += 1;
1616		- aConstraints.gridwidth = 1;
1617		-
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	1785	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1786	+ //Return();
1620	1787	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1788	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1789	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1794,93 @@
1627	1794	// aConstraints.gridy += 1;
1628	1795	// aConstraints.gridwidth = 1;
1629	1796
1630		- //aConstraints.weighty = 1;
1631		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632		- //aConstraints.gridx += 1;
1633		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634		- aConstraints.weighty = 0;
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
1638	1797
1639		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
	1798	+ panel.add(new JSeparator());
	1799	+
	1800	+ panel.add(specularSection);
	1801	+
	1802	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1803	+
	1804	+ cGridBag globalSection = new cGridBag().setVertical(true);
1648	1805
1649		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- aConstraints.gridwidth = 1;
	1806	+ cGridBag camera = new cGridBag();
	1807	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1808	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1809	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1810	+ globalSection.add(camera);
1658	1811
1659		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662		- aConstraints.gridx += 1;
1663		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665		- aConstraints.gridx = 0;
1666		- aConstraints.gridy += 1;
1667		- aConstraints.gridwidth = 1;
	1812	+ cGridBag ambient = new cGridBag();
	1813	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1814	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1815	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1816	+ globalSection.add(ambient);
1668	1817
1669		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672		- aConstraints.gridx += 1;
1673		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675		- aConstraints.gridx = 0;
1676		- aConstraints.gridy += 1;
1677		- aConstraints.gridwidth = 1;
1678		- aConstraints.weighty = 0;
	1818	+ cGridBag backlit = new cGridBag();
	1819	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1820	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1821	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1822	+ globalSection.add(backlit);
1679	1823
1680		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	1824	+ cGridBag opacity = new cGridBag();
	1825	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1826	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1827	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1828	+ globalSection.add(opacity);
1689	1829
1690		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
	1830	+ panel.add(new JSeparator());
	1831	+
	1832	+ panel.add(globalSection);
	1833	+
	1834	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1835	+
	1836	+ cGridBag textureSection = new cGridBag().setVertical(true);
1699	1837
1700		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
	1838	+ cGridBag bump = new cGridBag();
	1839	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1840	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1841	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1842	+ textureSection.add(bump);
1709	1843
1710		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- aConstraints.gridwidth = 1;
	1844	+ cGridBag noise = new cGridBag();
	1845	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1846	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1847	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1848	+ textureSection.add(noise);
1719	1849
1720		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723		- aConstraints.gridx += 1;
1724		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726		- aConstraints.gridx = 0;
1727		- aConstraints.gridy += 1;
1728		- aConstraints.gridwidth = 1;
	1850	+ cGridBag power = new cGridBag();
	1851	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1852	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1853	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1854	+ textureSection.add(power);
1729	1855
1730		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733		- aConstraints.gridx += 1;
1734		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1736		- aConstraints.gridx = 0;
1737		- aConstraints.gridy += 1;
1738		- aConstraints.gridwidth = 1;
	1856	+ cGridBag borderfade = new cGridBag();
	1857	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1858	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1859	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1860	+ textureSection.add(borderfade);
1739	1861
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	1862	+ cGridBag fog = new cGridBag();
	1863	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1864	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1865	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1866	+ textureSection.add(fog);
1745	1867
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	1868	+ cGridBag opacityPower = new cGridBag();
	1869	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1870	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1871	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1872	+ textureSection.add(opacityPower);
	1873	+
	1874	+ panel.add(new JSeparator());
	1875	+
	1876	+ panel.add(textureSection);
	1877	+
	1878	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	1879
1750	1880	SetMaterial(copy); // .GetMaterial());
1751	1881
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	1882	+ //colorField.addChangeListener(this);
	1883	+// modulationField.addChangeListener(this);
1754	1884	metalnessField.addChangeListener(this);
1755	1885	diffuseField.addChangeListener(this);
1756	1886	specularField.addChangeListener(this);
..	..	@@ -1780,12 +1910,15 @@
1780	1910	opacityPowerField.addChangeListener(this);
1781	1911	/**/
1782	1912
1783		- resetSlidersButton.addActionListener(this);
1784	1913	clearMaterialButton.addActionListener(this);
1785	1914	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	1915	+
	1916	+ if (Globals.ADVANCED)
	1917	+ {
	1918	+ resetSlidersButton.addActionListener(this);
	1919	+ propagateToggle.addItemListener(this);
	1920	+ multiplyToggle.addItemListener(this);
	1921	+ }
1789	1922	}
1790	1923
1791	1924	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1859,19 +1992,21 @@
1859	1992	}
1860	1993
1861	1994	// Images/textures
1862		- if (textures
1863		- && (filename.toLowerCase().endsWith(".jpg")
1864		- \|\| filename.toLowerCase().endsWith(".jpeg")
1865		- \|\| filename.toLowerCase().endsWith(".gif")
1866		- \|\| filename.toLowerCase().endsWith(".png")
1867		- \|\| filename.toLowerCase().endsWith(".tre")
1868		- \|\| filename.toLowerCase().endsWith(".bmp")
1869		- \|\| filename.toLowerCase().endsWith(".tga")
1870		- \|\| filename.toLowerCase().endsWith(".sgi")
1871		- \|\| filename.toLowerCase().endsWith(".tif")
1872		- \|\| filename.toLowerCase().endsWith(".tiff")))
	1995	+ if (filename.toLowerCase().endsWith(".jpg")
	1996	+ \|\| filename.toLowerCase().endsWith(".jpeg")
	1997	+ \|\| filename.toLowerCase().endsWith(".gif")
	1998	+ \|\| filename.toLowerCase().endsWith(".png")
	1999	+ \|\| filename.toLowerCase().endsWith(".tre")
	2000	+ \|\| filename.toLowerCase().endsWith(".bmp")
	2001	+ \|\| filename.toLowerCase().endsWith(".tga")
	2002	+ \|\| filename.toLowerCase().endsWith(".sgi")
	2003	+ \|\| filename.toLowerCase().endsWith(".tif")
	2004	+ \|\| filename.toLowerCase().endsWith(".tiff"))
1873	2005	{
1874		- DropTexture(filename);
	2006	+ if (textures)
	2007	+ DropTexture(filename);
	2008	+ else
	2009	+ CreateBillboard(filename);
1875	2010	continue;
1876	2011	}
1877	2012
..	..	@@ -1880,6 +2015,60 @@
1880	2015	}
1881	2016
1882	2017	ResetModel();
	2018	+ }
	2019	+
	2020	+ void CreateBillboard(String filename)
	2021	+ {
	2022	+ Object3D source = null;
	2023	+ Object3D group = copy;
	2024	+
	2025	+ if (group.selection.size() > 0)
	2026	+ {
	2027	+ source = group.selection.get(0);
	2028	+ }
	2029	+
	2030	+ Grid grid = new Grid(1,1);
	2031	+ grid.material = null;
	2032	+
	2033	+ grid.toParent = LA.newMatrix();
	2034	+ grid.fromParent = LA.newMatrix();
	2035	+ LA.matYRotate(grid.toParent, Math.PI/2);
	2036	+ LA.matXRotate(grid.toParent, -Math.PI/2);
	2037	+ LA.matXRotate(grid.fromParent, Math.PI/2);
	2038	+ LA.matYRotate(grid.fromParent, -Math.PI/2);
	2039	+
	2040	+ BillboardNode bb = new BillboardNode();
	2041	+ bb.addChild(grid);
	2042	+
	2043	+ Object3D newgroup = new Object3D();
	2044	+ newgroup.CreateMaterial();
	2045	+
	2046	+ File file = new File(filename);
	2047	+ newgroup.name = file.getName();
	2048	+ newgroup.addChild(bb);
	2049	+
	2050	+ Object3D main = newgroup;
	2051	+
	2052	+ main.SetPigmentTexture(filename);
	2053	+
	2054	+ if (source != null)
	2055	+ {
	2056	+ main.material = new cMaterial(source.material);
	2057	+ if (main.projectedVertices.length < source.projectedVertices.length)
	2058	+ {
	2059	+ main.projectedVertices = new Object3D.cVector2[source.projectedVertices.length];
	2060	+ }
	2061	+
	2062	+ for (int i=0; i<source.projectedVertices.length; i++)
	2063	+ {
	2064	+ main.projectedVertices[i].x = source.projectedVertices[i].x;
	2065	+ main.projectedVertices[i].y = source.projectedVertices[i].y;
	2066	+ }
	2067	+
	2068	+ main.texres = source.texres;
	2069	+ }
	2070	+
	2071	+ makeSomething(newgroup, false);
1883	2072	}
1884	2073
1885	2074	Point location;
..	..	@@ -1900,7 +2089,7 @@
1900	2089
1901	2090	//? flashIt = false;
1902	2091	CameraPane pane = (CameraPane) cameraView;
1903		- pane.clickStart(location.x, location.y, 0);
	2092	+ pane.clickStart(location.x, location.y, 0, 0);
1904	2093	pane.clickEnd(location.x, location.y, 0, true);
1905	2094
1906	2095	if (group.selection.size() == 1)
..	..	@@ -1949,6 +2138,7 @@
1949	2138	e2.printStackTrace();
1950	2139	}
1951	2140	}
	2141	+
1952	2142	LoadJMEThread loadThread;
1953	2143
1954	2144	class LoadJMEThread extends Thread
..	..	@@ -2006,6 +2196,7 @@
2006	2196	//LoadFile0(filename, converter);
2007	2197	}
2008	2198	}
	2199	+
2009	2200	LoadOBJThread loadObjThread;
2010	2201
2011	2202	class LoadOBJThread extends Thread
..	..	@@ -2084,19 +2275,19 @@
2084	2275
2085	2276	void LoadObjFile(String fullname)
2086	2277	{
2087		- /*
	2278	+ System.out.println("Loading " + fullname);
	2279	+ /**/
2088	2280	//lastFilename = fullname;
2089	2281	if(loadObjThread == null)
2090	2282	{
2091		- loadObjThread = new LoadOBJThread();
2092		- loadObjThread.start();
	2283	+ loadObjThread = new LoadOBJThread();
	2284	+ loadObjThread.start();
2093	2285	}
2094	2286
2095	2287	loadObjThread.add(fullname);
2096		- */
	2288	+ /**/
2097	2289
2098		- System.out.println("Loading " + fullname);
2099		- makeSomething(new FileObject(fullname, true), true);
	2290	+ //makeSomething(new FileObject(fullname, true), true);
2100	2291	}
2101	2292
2102	2293	void LoadGFDFile(String fullname)
..	..	@@ -2138,6 +2329,8 @@
2138	2329	{
2139	2330	Mocap sel = (Mocap) copy.selection.get(0);
2140	2331
	2332	+ sel.SetCurrentBones(sel.frame);
	2333	+
2141	2334	sel.fullname = fullname;
2142	2335
2143	2336	if (changename)
..	..	@@ -2151,14 +2344,18 @@
2151	2344	sel.smoothed = false;
2152	2345
2153	2346	// if (!changename)
2154		- sel.SetPositionDelta(false, true, true, true/?/); // false
	2347	+ //sel.SetPositionDelta(false, true, true, true/?/); // false
	2348	+ sel.SetGlobalTransform();
	2349	+ sel.LoadData();
	2350	+ sel.Rewind();
	2351	+ sel.Fade();
2155	2352	// sel.setPose(0);
2156	2353	refreshContents();
2157	2354	} else
2158	2355	{
2159	2356	mocap.Reset();
2160	2357	// new skeleton
2161		- makeSomething(mocap, false); // true);
	2358	+ makeSomething(mocap, true); // true);
2162	2359	}
2163	2360	} catch (Exception e)
2164	2361	{
..	..	@@ -2185,6 +2382,8 @@
2185	2382	{
2186	2383	Mocap sel = (Mocap) select;
2187	2384
	2385	+ sel.SetCurrentBones(sel.frame);
	2386	+
2188	2387	File file = new File(fullname);
2189	2388
2190	2389	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2251,7 +2450,11 @@
2251	2450
2252	2451	if (!changename)
2253	2452	{
2254		- sel.SetPositionDelta(false, true, true, true/?/);
	2453	+ //sel.SetPositionDelta(false, true, true, true/?/);
	2454	+ sel.SetGlobalTransform();
	2455	+ sel.LoadData();
	2456	+ sel.Rewind();
	2457	+ sel.Fade();
2255	2458	}
2256	2459
2257	2460	// sel.setPose(0);
..	..	@@ -2345,11 +2548,11 @@
2345	2548
2346	2549	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2550	{
2348		- if (GrafreeD.standAlone)
	2551	+ if (Grafreed.standAlone)
2349	2552	{
2350	2553	/**/
2351	2554	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2555	+ browser.setVisible(true);
2353	2556	String filename = browser.getFile();
2354	2557	if (filename != null && filename.length() > 0)
2355	2558	{
..	..	@@ -2494,6 +2697,7 @@
2494	2697	}
2495	2698	if (input == null)
2496	2699	{
	2700	+ new Exception().printStackTrace();
2497	2701	System.exit(0);
2498	2702	}
2499	2703
..	..	@@ -2700,6 +2904,8 @@
2700	2904
2701	2905	void SetMaterial(Object3D object)
2702	2906	{
	2907	+ latestObject = object;
	2908	+
2703	2909	cMaterial mat = object.material;
2704	2910
2705	2911	if (mat == null)
..	..	@@ -2708,7 +2914,8 @@
2708	2914	return;
2709	2915	}
2710	2916
2711		- multiplyToggle.setSelected(mat.multiply);
	2917	+ if (multiplyToggle != null)
	2918	+ multiplyToggle.setSelected(mat.multiply);
2712	2919
2713	2920	assert (object.projectedVertices != null);
2714	2921
..	..	@@ -2884,31 +3091,48 @@
2884	3091	cameraView.ToggleDL();
2885	3092	cameraView.repaint();
2886	3093	return;
2887		- } else if (event.getSource() == toggleTextureItem)
	3094	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2888	3095	{
2889	3096	cameraView.ToggleTexture();
2890	3097	// june 2013 copy.HardTouch();
2891	3098	cameraView.repaint();
2892	3099	return;
2893		- } else if (event.getSource() == toggleFullItem)
	3100	+ } else if (event.getSource() == toggleTimelineItem)
2894	3101	{
2895		- if (CameraPane.FULLSCREEN)
	3102	+ timeline ^= true;
	3103	+
	3104	+ if (timeline)
2896	3105	{
2897		- frame.getContentPane().remove(/"Center",/bigThree);
2898		- framePanel.add(bigThree);
2899		- frame.getContentPane().add(/"Center",/framePanel);
2900		- } else
2901		- {
2902		- frame.getContentPane().remove(/"Center",/framePanel);
2903		- frame.getContentPane().add(/"Center",/bigThree);
	3106	+ centralPanel.remove(cameraView);
	3107	+ cameraPanel.add(cameraView);
	3108	+ centralPanel.add(cameraPanel);
	3109	+ frame.setJMenuBar(timelineMenubar);
	3110	+ wasFullScreen = CameraPane.FULLSCREEN;
	3111	+ if (!CameraPane.FULLSCREEN)
	3112	+ ToggleFullScreen();
	3113	+ toggleFullScreenItem.setEnabled(false);
2904	3114	}
	3115	+ else
	3116	+ {
	3117	+ centralPanel.remove(cameraPanel);
	3118	+ centralPanel.add(cameraView);
	3119	+ frame.setJMenuBar(null);
	3120	+ if (!wasFullScreen)
	3121	+ ToggleFullScreen();
	3122	+ toggleFullScreenItem.setEnabled(true);
	3123	+ }
	3124	+
2905	3125	frame.validate();
2906		- cameraView.ToggleFullScreen();
	3126	+ return;
	3127	+ } else if (event.getSource() == toggleFullScreenItem)
	3128	+ {
	3129	+ ToggleFullScreen();
	3130	+ frame.validate();
2907	3131
2908	3132	return;
2909		- } else if (event.getSource() == toggleRandomItem)
	3133	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2910	3134	{
2911		- cameraView.ToggleRandom();
	3135	+ cameraView.ToggleSwitch();
2912	3136	cameraView.repaint();
2913	3137	return;
2914	3138	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2937,6 +3161,10 @@
2937	3161	{
2938	3162	copy.live ^= true;
2939	3163	return;
	3164	+ } else if (event.getSource() == selectCB)
	3165	+ {
	3166	+ copy.dontselect ^= true;
	3167	+ return;
2940	3168	} else if (event.getSource() == hideCB)
2941	3169	{
2942	3170	copy.hide ^= true;
..	..	@@ -2951,6 +3179,7 @@
2951	3179	if (event.getSource() == randomCB)
2952	3180	{
2953	3181	copy.random ^= true;
	3182	+ objEditor.refreshContents();
2954	3183	return;
2955	3184	}
2956	3185	if (event.getSource() == speedupCB)
..	..	@@ -2974,8 +3203,9 @@
2974	3203
2975	3204	public void actionPerformed(ActionEvent event)
2976	3205	{
	3206	+ Object source = event.getSource();
2977	3207	// SCRIPT DIALOG
2978		- if (event.getSource() == okbutton)
	3208	+ if (source == okbutton)
2979	3209	{
2980	3210	textpanel.setVisible(false);
2981	3211	textpanel.remove(textarea);
..	..	@@ -2987,7 +3217,7 @@
2987	3217	textarea = null;
2988	3218	textpanel = null;
2989	3219	}
2990		- if (event.getSource() == cancelbutton)
	3220	+ if (source == cancelbutton)
2991	3221	{
2992	3222	textpanel.setVisible(false);
2993	3223	textpanel.remove(textarea);
..	..	@@ -2999,49 +3229,50 @@
2999	3229	//applySelf();
3000	3230	//client.refreshEditWindow();
3001	3231	//refreshContents();
3002		- if (event.getSource() == nameField)
	3232	+ if (source == nameField)
3003	3233	{
3004	3234	//System.out.println("ObjEditor " + event);
3005	3235	applySelf0(true);
3006	3236	//parent.applySelf();
3007	3237	objEditor.refreshContents();
3008		- } else if (event.getSource() == resetButton)
	3238	+ } else if (source == resetButton)
3009	3239	{
3010	3240	CameraPane.fullreset = true;
3011	3241	copy.Reset(); // ResetMeshes();
3012	3242	copy.Touch();
3013	3243	objEditor.refreshContents();
3014		- } else if (event.getSource() == stepItem)
	3244	+ } else if (source == stepItem)
3015	3245	{
3016		- cameraView.ONESTEP = true;
	3246	+ //cameraView.ONESTEP = true;
	3247	+ Globals.ONESTEP = true;
3017	3248	cameraView.repaint();
3018	3249	return;
3019		- } else if (event.getSource() == stepButton)
	3250	+ } else if (source == stepButton)
3020	3251	{
3021	3252	copy.Step();
3022	3253	copy.Touch();
3023	3254	objEditor.refreshContents();
3024		- } else if (event.getSource() == slowerButton)
	3255	+ } else if (source == slowerButton)
3025	3256	{
3026	3257	copy.Slower();
3027	3258	copy.Touch();
3028	3259	objEditor.refreshContents();
3029		- } else if (event.getSource() == fasterButton)
	3260	+ } else if (source == fasterButton)
3030	3261	{
3031	3262	copy.Faster();
3032	3263	copy.Touch();
3033	3264	objEditor.refreshContents();
3034		- } else if (event.getSource() == remarkButton)
	3265	+ } else if (source == remarkButton)
3035	3266	{
3036	3267	copy.Remark();
3037	3268	copy.Touch();
3038	3269	objEditor.refreshContents();
3039		- } else if (event.getSource() == stepAllButton)
	3270	+ } else if (source == stepAllButton)
3040	3271	{
3041	3272	copy.StepAll();
3042	3273	copy.Touch();
3043	3274	objEditor.refreshContents();
3044		- } else if (event.getSource() == resetAllButton)
	3275	+ } else if (source == resetAllButton)
3045	3276	{
3046	3277	//CameraPane.fullreset = true;
3047	3278	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3074,53 +3305,75 @@
3074	3305	// Close();
3075	3306	// }
3076	3307	// else
3077		- if (event.getSource() == resetSlidersButton)
	3308	+ if (source == resetSlidersButton)
3078	3309	{
3079	3310	ResetSliders();
3080		- } else if (event.getSource() == clearMaterialButton)
	3311	+ } else if (source == clearMaterialButton)
3081	3312	{
3082	3313	ClearMaterial();
3083		- } else if (event.getSource() == createMaterialButton)
	3314	+ } else if (source == createMaterialButton)
3084	3315	{
3085	3316	CreateMaterial();
3086		- } else if (event.getSource() == clearPanelButton)
	3317	+ } else if (source == clearPanelButton)
3087	3318	{
3088	3319	copy.ClearUI();
3089	3320	refreshContents(true);
3090		- } /*
3091		- }
3092		-
3093		- public boolean action(Event event, Object arg)
3094		- {
3095		- */ else if (event.getSource() == closeItem)
	3321	+ } else if (source == importGFDItem)
	3322	+ {
	3323	+ ImportGFD();
	3324	+ } else
	3325	+ if (source == importVRMLX3DItem)
	3326	+ {
	3327	+ ImportVRMLX3D();
	3328	+ } else
	3329	+ if (source == import3DSItem)
	3330	+ {
	3331	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3332	+ } else
	3333	+ if (source == importOBJItem)
	3334	+ {
	3335	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3336	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3337	+ browser.setVisible(true);
	3338	+ String filename = browser.getFile();
	3339	+ if (filename != null && filename.length() > 0)
	3340	+ {
	3341	+ String fullname = browser.getDirectory() + filename;
	3342	+ makeSomething(ReadOBJ(fullname), true);
	3343	+ }
	3344	+ } else
	3345	+ if (source == closeItem)
3096	3346	{
3097	3347	Close();
3098	3348	//return true;
3099		- } else if (event.getSource() == loadItem)
	3349	+ } else if (source == loadItem)
3100	3350	{
3101	3351	load();
3102	3352	//return true;
3103		- } else if (event.getSource() == saveItem)
	3353	+ } else if (source == newItem)
	3354	+ {
	3355	+ New();
	3356	+ } else if (source == saveItem)
3104	3357	{
3105	3358	save();
3106	3359	//return true;
3107		- } else if (event.getSource() == saveAsItem)
	3360	+ } else if (source == saveAsItem)
3108	3361	{
3109	3362	saveAs();
3110	3363	//return true;
3111		- } else if (event.getSource() == reexportItem)
	3364	+ } else if (source == reexportItem)
3112	3365	{
3113	3366	reexport();
3114	3367	//return true;
3115		- } else if (event.getSource() == exportAsItem)
	3368	+ } else if (source == exportAsItem)
3116	3369	{
3117	3370	export();
3118	3371	//return true;
3119		- } else if (event.getSource() == povItem)
	3372	+ } else if (source == povItem)
3120	3373	{
3121	3374	generatePOV();
3122	3375	//return true;
3123		- } else if (event.getSource() == zBufferItem)
	3376	+ } else if (source == zBufferItem)
3124	3377	{
3125	3378	try
3126	3379	{
..	..	@@ -3142,21 +3395,8 @@
3142	3395	cameraView.repaint();
3143	3396	//return true;
3144	3397	}
3145		- */ else if (event.getSource() == editCameraItem)
3146		- {
3147		- cameraView.ProtectCamera();
3148		- cameraView.repaint();
3149		- return;
3150		- } else if (event.getSource() == revertCameraItem)
3151		- {
3152		- cameraView.RevertCamera();
3153		- cameraView.repaint();
3154		- return;
3155		- } else if (event.getSource() == textureButton)
3156		- {
3157		- return; // true;
3158		- } else // combos...
3159		- if (event.getSource() == texresMenu)
	3398	+ */ else // combos...
	3399	+ if (source == texresMenu)
3160	3400	{
3161	3401	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3162	3402	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3168,27 +3408,302 @@
3168	3408	}
3169	3409	}
3170	3410
3171		- void ToggleAnimation()
	3411	+ void New()
3172	3412	{
3173		- if (!CameraPane.ANIMATION)
	3413	+ while (copy.Size() > 1)
3174	3414	{
3175		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3415	+ copy.remove(1);
	3416	+ }
	3417	+
	3418	+ ResetModel();
	3419	+ objEditor.refreshContents();
	3420	+ }
	3421	+
	3422	+ static public byte[] Compress(Object3D o)
	3423	+ {
	3424	+ try
	3425	+ {
	3426	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3427	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3428	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3429	+
	3430	+ Object3D parent = o.parent;
	3431	+ o.parent = null;
	3432	+
	3433	+ out.writeObject(o);
	3434	+
	3435	+ o.parent = parent;
	3436	+
	3437	+ out.flush();
	3438	+
	3439	+ zstream.close();
	3440	+ out.close();
	3441	+
	3442	+ return baos.toByteArray();
	3443	+ } catch (Exception e)
	3444	+ {
	3445	+ System.err.println(e);
	3446	+ return null;
	3447	+ }
	3448	+ }
	3449	+
	3450	+ static public Object Uncompress(byte[] bytes)
	3451	+ {
	3452	+ System.out.println("#bytes = " + bytes.length);
	3453	+ try
	3454	+ {
	3455	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3456	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3457	+ ObjectInputStream in = new ObjectInputStream(istream);
	3458	+ Object obj = in.readObject();
	3459	+ in.close();
	3460	+
	3461	+ return obj;
	3462	+ } catch (Exception e)
	3463	+ {
	3464	+ System.err.println(e);
	3465	+ return null;
	3466	+ }
	3467	+ }
	3468	+
	3469	+ static public Object clone(Object o)
	3470	+ {
	3471	+ try
	3472	+ {
	3473	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3474	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3475	+
	3476	+ out.writeObject(o);
	3477	+
	3478	+ out.flush();
	3479	+ out.close();
	3480	+
	3481	+ byte[] bytes = baos.toByteArray();
	3482	+
	3483	+ System.out.println("clone = " + bytes.length);
	3484	+
	3485	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3486	+ ObjectInputStream in = new ObjectInputStream(bais);
	3487	+ Object obj = in.readObject();
	3488	+ in.close();
	3489	+
	3490	+ return obj;
	3491	+ } catch (Exception e)
	3492	+ {
	3493	+ System.err.println(e);
	3494	+ return null;
	3495	+ }
	3496	+ }
	3497	+
	3498	+ cRadio GetCurrentTab()
	3499	+ {
	3500	+ cRadio ab;
	3501	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3502	+ {
	3503	+ ab = (cRadio)e.nextElement();
	3504	+ if(ab.GetObject() == copy)
	3505	+ {
	3506	+ return ab;
	3507	+ }
	3508	+ }
	3509	+
	3510	+ return null;
	3511	+ }
	3512	+
	3513	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3514	+
	3515	+ public void Save()
	3516	+ {
	3517	+ System.err.println("Save");
	3518	+
	3519	+ cRadio tab = GetCurrentTab();
	3520	+
	3521	+ boolean temp = CameraPane.SWITCH;
	3522	+ CameraPane.SWITCH = false;
	3523	+
	3524	+ copy.ExtractBigData(hashtable);
	3525	+
	3526	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3527	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3528	+
	3529	+ copy.RestoreBigData(hashtable);
	3530	+
	3531	+ CameraPane.SWITCH = temp;
	3532	+
	3533	+ //assert(hashtable.isEmpty());
	3534	+
	3535	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3536	+ {
	3537	+ tab.graphs[i] = null;
	3538	+ }
	3539	+
	3540	+ SetUndoStates();
	3541	+
	3542	+ // test save
	3543	+ if (false)
	3544	+ {
	3545	+ try
	3546	+ {
	3547	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3548	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3549	+
	3550	+ p.writeObject(copy);
	3551	+
	3552	+ p.flush();
	3553	+
	3554	+ ostream.close();
	3555	+ } catch (Exception e)
	3556	+ {
	3557	+ e.printStackTrace();
	3558	+ }
	3559	+ }
	3560	+ }
	3561	+
	3562	+ void CopyChanged(Object3D obj)
	3563	+ {
	3564	+ SetUndoStates();
	3565	+
	3566	+ boolean temp = CameraPane.SWITCH;
	3567	+ CameraPane.SWITCH = false;
	3568	+
	3569	+ copy.ExtractBigData(hashtable);
	3570	+
	3571	+ copy.clear();
	3572	+
	3573	+ for (int i=0; i<obj.Size(); i++)
	3574	+ {
	3575	+ copy.add(obj.get(i));
	3576	+ }
	3577	+
	3578	+ copy.RestoreBigData(hashtable);
	3579	+
	3580	+ CameraPane.SWITCH = temp;
	3581	+
	3582	+ //assert(hashtable.isEmpty());
	3583	+
	3584	+ copy.Touch();
	3585	+
	3586	+ ResetModel();
	3587	+ copy.HardTouch(); // recompile?
	3588	+
	3589	+ cRadio ab;
	3590	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3591	+ {
	3592	+ ab = (cRadio)e.nextElement();
	3593	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3594	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3595	+ if (test != null)
	3596	+ {
	3597	+ test.editWindow = ab.object.editWindow;
	3598	+ ab.object = test;
	3599	+ }
	3600	+ }
	3601	+
	3602	+ refreshContents();
	3603	+ }
	3604	+
	3605	+ cButton undoButton;
	3606	+ cButton redoButton;
	3607	+
	3608	+ void SetUndoStates()
	3609	+ {
	3610	+ cRadio tab = GetCurrentTab();
	3611	+
	3612	+ undoButton.setEnabled(tab.undoindex > 0);
	3613	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3614	+ }
	3615	+
	3616	+ public void Undo()
	3617	+ {
	3618	+ System.err.println("Undo");
	3619	+
	3620	+ cRadio tab = GetCurrentTab();
	3621	+
	3622	+ if (tab.undoindex == 0)
	3623	+ {
	3624	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3625	+ return;
	3626	+ }
	3627	+
	3628	+ if (tab.graphs[tab.undoindex] == null)
	3629	+ {
	3630	+ Save();
	3631	+ tab.undoindex -= 1;
	3632	+ }
	3633	+
	3634	+ tab.undoindex -= 1;
	3635	+
	3636	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3637	+ }
	3638	+
	3639	+ public void Redo()
	3640	+ {
	3641	+ cRadio tab = GetCurrentTab();
	3642	+
	3643	+ if (tab.graphs[tab.undoindex + 1] == null)
	3644	+ {
	3645	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3646	+ return;
	3647	+ }
	3648	+
	3649	+ tab.undoindex += 1;
	3650	+
	3651	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3652	+ }
	3653	+
	3654	+ void ImportGFD()
	3655	+ {
	3656	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3176	3657	browser.show();
3177	3658	String filename = browser.getFile();
3178	3659	if (filename != null && filename.length() > 0)
3179	3660	{
3180		- CameraPane.filename = browser.getDirectory() + filename;
	3661	+ String fullname = browser.getDirectory() + filename;
	3662	+
	3663	+ //Object3D readobj =
	3664	+ objEditor.ReadGFD(fullname, objEditor);
	3665	+ //makeSomething(readobj);
	3666	+ }
	3667	+ }
	3668	+
	3669	+ void ImportVRMLX3D()
	3670	+ {
	3671	+ if (Grafreed.standAlone)
	3672	+ {
	3673	+ /**/
	3674	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3675	+ browser.show();
	3676	+ String filename = browser.getFile();
	3677	+ if (filename != null && filename.length() > 0)
	3678	+ {
	3679	+ String fullname = browser.getDirectory() + filename;
	3680	+ LoadVRMLX3D(fullname);
	3681	+ }
	3682	+ /**/
	3683	+ }
	3684	+ }
	3685	+
	3686	+ void ToggleAnimation()
	3687	+ {
	3688	+ if (!Globals.ANIMATION)
	3689	+ {
	3690	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3691	+ browser.setVisible(true);
	3692	+ String filename = browser.getFile();
	3693	+ if (filename != null && filename.length() > 0)
	3694	+ {
	3695	+ Globals.filename = browser.getDirectory() + filename;
3181	3696	//CameraPane.framecount = 0;
3182		- CameraPane.imagecount = 0;
	3697	+ Globals.imagecount = 0;
3183	3698
3184		- CameraPane.ANIMATION ^= true;
	3699	+ Globals.ANIMATION ^= true;
3185	3700
3186		- GrafreeD.wav.cursor = 0;
3187		- GrafreeD.wav.loop = 0;
	3701	+ Grafreed.wav.cursor = 0;
	3702	+ Grafreed.wav.loop = 0;
3188	3703	}
3189	3704	} else
3190	3705	{
3191		- CameraPane.ANIMATION ^= true;
	3706	+ Globals.ANIMATION ^= true;
3192	3707	}
3193	3708	}
3194	3709
..	..	@@ -3234,7 +3749,7 @@
3234	3749	void CreateMaterial()
3235	3750	{
3236	3751	//copy.ClearMaterial(); // PATCH
3237		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3752	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3238	3753	if (copy.selection.size() > 0)
3239	3754	//SetMaterial(copy);
3240	3755	{
..	..	@@ -3285,7 +3800,7 @@
3285	3800	assert false;
3286	3801	}
3287	3802
3288		- void EditSelection()
	3803	+ void EditSelection(boolean newWindow)
3289	3804	{
3290	3805	}
3291	3806
..	..	@@ -3293,11 +3808,11 @@
3293	3808	{
3294	3809	copy.ResetBlockLoop(); // temporary problem
3295	3810
3296		- boolean random = CameraPane.RANDOM;
3297		- CameraPane.RANDOM = false; // parse everything
	3811	+ boolean random = CameraPane.SWITCH;
	3812	+ CameraPane.SWITCH = false; // parse everything
3298	3813	copy.ResetDisplayList();
3299	3814	copy.HardTouch();
3300		- CameraPane.RANDOM = random;
	3815	+ CameraPane.SWITCH = random;
3301	3816	}
3302	3817
3303	3818	// public void applySelf()
..	..	@@ -3367,10 +3882,40 @@
3367	3882	current.fakedepth = (float) fakedepthField.getFloat();
3368	3883	current.shadowbias = (float) shadowbiasField.getFloat();
3369	3884
3370		- if (!NumberSlider.frozen)
	3885	+ if (!cNumberSlider.frozen)
3371	3886	{
3372	3887	//System.out.println("Propagate = " + propagate);
3373	3888	copy.UpdateMaterial(anchor, current, propagate);
	3889	+
	3890	+ if (copy.material != null)
	3891	+ {
	3892	+ cMaterial mat = copy.material;
	3893	+
	3894	+ colorField.SetToolTipValue((mat.color));
	3895	+ modulationField.SetToolTipValue((mat.modulation));
	3896	+ metalnessField.SetToolTipValue((mat.metalness));
	3897	+ diffuseField.SetToolTipValue((mat.diffuse));
	3898	+ specularField.SetToolTipValue((mat.specular));
	3899	+ shininessField.SetToolTipValue((mat.shininess));
	3900	+ shiftField.SetToolTipValue((mat.shift));
	3901	+ ambientField.SetToolTipValue((mat.ambient));
	3902	+ lightareaField.SetToolTipValue((mat.lightarea));
	3903	+ diffusenessField.SetToolTipValue((mat.factor));
	3904	+ velvetField.SetToolTipValue((mat.velvet));
	3905	+ sheenField.SetToolTipValue((mat.sheen));
	3906	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3907	+ backlitField.SetToolTipValue((mat.bump));
	3908	+ anisoField.SetToolTipValue((mat.aniso));
	3909	+ anisoVField.SetToolTipValue((mat.anisoV));
	3910	+ cameraField.SetToolTipValue((mat.cameralight));
	3911	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3912	+ shadowField.SetToolTipValue((mat.shadow));
	3913	+ textureField.SetToolTipValue((mat.texture));
	3914	+ opacityField.SetToolTipValue((mat.opacity));
	3915	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3916	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3917	+ }
	3918	+
3374	3919	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3375	3920	{
3376	3921	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3415,6 +3960,7 @@
3415	3960	\|\| e.getSource() == apertureField
3416	3961	\|\| e.getSource() == shadowblurField)
3417	3962	{
	3963	+ new Exception().printStackTrace();
3418	3964	System.exit(0);
3419	3965	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3420	3966	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3441,7 +3987,13 @@
3441	3987	//System.out.println("PARENT = " + parent);
3442	3988	//if (parent != null)
3443	3989	// parent.applySelf();
3444		- refreshContents();
	3990	+ if (e.getSource() == normalpushField)
	3991	+ {
	3992	+ objEditor.refreshContents();
	3993	+ //Refresh();
	3994	+ }
	3995	+ else
	3996	+ refreshContents();
3445	3997	// ??? client.refreshEditWindow();
3446	3998	}
3447	3999	//else
..	..	@@ -3453,7 +4005,7 @@
3453	4005	//group.name = nameField.getText();
3454	4006	//objEditor.applySelf();
3455	4007
3456		- assert (objEditor == this);
	4008	+ // OCT2018: assert (objEditor == this);
3457	4009	if (copy.selection == null \|\| copy.selection.size() == 0)
3458	4010	//super.applySelf()
3459	4011	; else
..	..	@@ -3477,12 +4029,18 @@
3477	4029	objEditor.copy = keep;
3478	4030	}
3479	4031	}
	4032	+
	4033	+ if (normalpushField != null)
	4034	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3480	4035	}
3481	4036
3482	4037	void SnapObject()
3483	4038	{
3484		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3485		- SnapObject(obj);
	4039	+ if (copy.selection.size() > 0)
	4040	+ {
	4041	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4042	+ SnapObject(obj);
	4043	+ }
3486	4044	}
3487	4045
3488	4046	void SnapObject(Object3D obj)
..	..	@@ -3596,7 +4154,7 @@
3596	4154
3597	4155	if (obj.parent != null)
3598	4156	{
3599		- obj.parent.TransformToWorld(interest);
	4157	+// obj.parent.TransformToWorld(interest);
3600	4158	}
3601	4159
3602	4160	if (!CameraPane.TRACK)
..	..	@@ -3728,7 +4286,7 @@
3728	4286
3729	4287	radioPanel.revalidate();
3730	4288	radioPanel.repaint();
3731		- ctrlPanel.revalidate(); // ? new
	4289	+ ctrlPanel.validate(); // ? new
3732	4290	ctrlPanel.repaint();
3733	4291	}
3734	4292	}
..	..	@@ -3737,6 +4295,8 @@
3737	4295
3738	4296	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3739	4297	{
	4298	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4299	+ Save();
3740	4300	//Tween.set(thing, 0).target(1).start(tweenManager);
3741	4301	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3742	4302	// if (thing instanceof GenericJointDemo)
..	..	@@ -3823,6 +4383,12 @@
3823	4383	{
3824	4384	ResetModel();
3825	4385	Select(thing.GetTreePath(), true, false); // unselect... false);
	4386	+
	4387	+ if (thing.Size() == 0)
	4388	+ {
	4389	+ //EditSelection(false);
	4390	+ }
	4391	+
3826	4392	refreshContents();
3827	4393	}
3828	4394
..	..	@@ -3940,6 +4506,7 @@
3940	4506	}
3941	4507	}
3942	4508	}
	4509	+
3943	4510	LoadGFDThread loadGFDThread;
3944	4511
3945	4512	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3959,8 +4526,10 @@
3959	4526
3960	4527	try
3961	4528	{
	4529	+ // Try compressed version first.
3962	4530	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3963		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4531	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4532	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3964	4533
3965	4534	readobj = (Object3D) p.readObject();
3966	4535	istream.close();
..	..	@@ -3968,7 +4537,20 @@
3968	4537	readobj.ResetDisplayList();
3969	4538	} catch (Exception e)
3970	4539	{
3971		- e.printStackTrace();
	4540	+ //e.printStackTrace();
	4541	+ try
	4542	+ {
	4543	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4544	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4545	+
	4546	+ readobj = (Object3D) p.readObject();
	4547	+ istream.close();
	4548	+
	4549	+ readobj.ResetDisplayList();
	4550	+ } catch (Exception e2)
	4551	+ {
	4552	+ e2.printStackTrace();
	4553	+ }
3972	4554	}
3973	4555	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3974	4556	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4014,6 +4596,12 @@
4014	4596
4015	4597	void LoadIt(Object obj)
4016	4598	{
	4599	+ if (obj == null)
	4600	+ {
	4601	+ // Invalid file
	4602	+ return;
	4603	+ }
	4604	+
4017	4605	System.out.println("Loaded " + obj);
4018	4606	//new Exception().printStackTrace();
4019	4607	Object3D readobj = (Object3D) obj;
..	..	@@ -4023,6 +4611,8 @@
4023	4611
4024	4612	if (readobj != null)
4025	4613	{
	4614	+ if (Globals.SAVEONMAKE)
	4615	+ Save();
4026	4616	try
4027	4617	{
4028	4618	//readobj.deepCopySelf(copy);
..	..	@@ -4085,7 +4675,7 @@
4085	4675
4086	4676	void load() // throws ClassNotFoundException
4087	4677	{
4088		- if (GrafreeD.standAlone)
	4678	+ if (Grafreed.standAlone)
4089	4679	{
4090	4680	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4091	4681	browser.show();
..	..	@@ -4172,11 +4762,13 @@
4172	4762	try
4173	4763	{
4174	4764	FileOutputStream ostream = new FileOutputStream(lastname);
4175		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4765	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4766	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4176	4767
4177	4768	p.writeObject(copy);
4178	4769	p.flush();
4179	4770
	4771	+ zstream.close();
4180	4772	ostream.close();
4181	4773
4182	4774	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4186,17 +4778,20 @@
4186	4778	{
4187	4779	}
4188	4780	}
	4781	+
4189	4782	String lastname;
4190	4783
4191	4784	void saveAs()
4192	4785	{
4193		- if (GrafreeD.standAlone)
	4786	+ if (Grafreed.standAlone)
4194	4787	{
4195	4788	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4196	4789	browser.setVisible(true);
4197	4790	String filename = browser.getFile();
4198	4791	if (filename != null && filename.length() > 0)
4199	4792	{
	4793	+ if (!filename.endsWith(".gfd"))
	4794	+ filename += ".gfd";
4200	4795	lastname = browser.getDirectory() + filename;
4201	4796	save();
4202	4797	}
..	..	@@ -4295,13 +4890,13 @@
4295	4890	try
4296	4891	{
4297	4892	FileOutputStream ostream = new FileOutputStream(filename);
4298		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4299		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4893	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4894	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4300	4895
4301	4896	Object3D objectparent = obj.parent;
4302	4897	obj.parent = null;
4303	4898
4304		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4899	+ Object3D object = (Object3D) Grafreed.clone(obj);
4305	4900
4306	4901	obj.parent = objectparent;
4307	4902
..	..	@@ -4313,8 +4908,8 @@
4313	4908	p.writeObject(object);
4314	4909	p.flush();
4315	4910
	4911	+ zstream.close();
4316	4912	ostream.close();
4317		- // zstream.close();
4318	4913
4319	4914	// group.selection.get(0).parent = parent;
4320	4915	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4335,7 +4930,7 @@
4335	4930	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4336	4931	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4337	4932	copy.generatePOV(buffer);
4338		- if (GrafreeD.standAlone)
	4933	+ if (Grafreed.standAlone)
4339	4934	{
4340	4935	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4341	4936	browser.show();
..	..	@@ -4361,7 +4956,8 @@
4361	4956	Object3D client;
4362	4957	Object3D copy;
4363	4958	MenuBar menuBar;
4364		- Menu windowMenu;
	4959	+ Menu fileMenu;
	4960	+ MenuItem newItem;
4365	4961	MenuItem loadItem;
4366	4962	MenuItem saveItem;
4367	4963	MenuItem saveAsItem;
..	..	@@ -4369,45 +4965,60 @@
4369	4965	MenuItem reexportItem;
4370	4966	MenuItem povItem;
4371	4967	MenuItem closeItem;
4372		- Menu cameraMenu;
	4968	+
4373	4969	CheckboxMenuItem zBufferItem;
4374	4970	//MenuItem normalLensItem;
4375		- MenuItem editCameraItem;
4376		- MenuItem revertCameraItem;
4377		- CheckboxMenuItem toggleLiveItem;
4378	4971	MenuItem stepItem;
4379		- CheckboxMenuItem toggleFullItem;
	4972	+ CheckboxMenuItem toggleLiveItem;
	4973	+ CheckboxMenuItem toggleFullScreenItem;
	4974	+ CheckboxMenuItem toggleTimelineItem;
4380	4975	CheckboxMenuItem toggleRenderItem;
4381	4976	CheckboxMenuItem toggleDebugItem;
4382	4977	CheckboxMenuItem toggleFrustumItem;
4383	4978	CheckboxMenuItem toggleFootContactItem;
4384	4979	CheckboxMenuItem toggleDLItem;
4385	4980	CheckboxMenuItem toggleTextureItem;
4386		- CheckboxMenuItem toggleRandomItem;
	4981	+ CheckboxMenuItem toggleSwitchItem;
4387	4982	CheckboxMenuItem toggleRootItem;
4388	4983	CheckboxMenuItem animationItem;
4389	4984	CheckboxMenuItem toggleHandleItem;
4390	4985	CheckboxMenuItem togglePaintItem;
4391	4986	JSplitPane mainPanel;
4392	4987	JScrollPane scrollpane;
	4988	+
4393	4989	JPanel toolbarPanel;
4394		- JPanel treePanel;
	4990	+
	4991	+ cGridBag treePanel;
	4992	+
4395	4993	JPanel radioPanel;
4396	4994	ButtonGroup buttonGroup;
4397		- JPanel ctrlPanel;
4398		- JPanel materialPanel;
	4995	+
	4996	+ cGridBag toolboxPanel;
	4997	+ cGridBag materialPanel;
	4998	+ cGridBag ctrlPanel;
	4999	+
4399	5000	JScrollPane infoPanel;
4400		- JPanel optionsPanel;
	5001	+
	5002	+ cGridBag optionsPanel;
	5003	+
4401	5004	JTabbedPane objectPanel;
4402		- JPanel XYZPanel;
	5005	+ boolean materialFlushed;
	5006	+ Object3D latestObject;
	5007	+
	5008	+ cGridBag XYZPanel;
	5009	+
4403	5010	JSplitPane gridPanel;
4404	5011	JSplitPane bigPanel;
4405		- JPanel bigThree;
4406		- JTabbedPane jtp;
4407		- JPanel cameraPanel;
	5012	+
	5013	+ cGridBag bigThree;
	5014	+ cGridBag scenePanel;
	5015	+ cGridBag centralPanel;
	5016	+ JSplitPane cameraPanel;
	5017	+ JPanel timelinePanel;
	5018	+ JMenuBar timelineMenubar;
4408	5019	JSplitPane framePanel;
4409	5020	JTextArea/Field/ nameField;
4410		- cButton textureButton;
	5021	+ //cButton textureButton;
4411	5022	cButton okButton;
4412	5023	cButton applyButton;
4413	5024	cButton cancelButton;
..	..	@@ -4454,65 +5065,72 @@
4454	5065	// MATERIAL
4455	5066	JLabel materialLabel;
4456	5067	JLabel colorLabel;
4457		- NumberSlider colorField;
	5068	+ cNumberSlider colorField;
4458	5069	JLabel modulationLabel;
4459		- NumberSlider modulationField;
	5070	+ cNumberSlider modulationField;
4460	5071	JLabel metalnessLabel;
4461		- NumberSlider metalnessField;
	5072	+ cNumberSlider metalnessField;
4462	5073	JLabel diffuseLabel;
4463		- NumberSlider diffuseField;
	5074	+ cNumberSlider diffuseField;
4464	5075	JLabel specularLabel;
4465		- NumberSlider specularField;
	5076	+ cNumberSlider specularField;
4466	5077	JLabel shininessLabel;
4467		- NumberSlider shininessField;
	5078	+ cNumberSlider shininessField;
4468	5079	JLabel shiftLabel;
4469		- NumberSlider shiftField;
	5080	+ cNumberSlider shiftField;
4470	5081	JLabel ambientLabel;
4471		- NumberSlider ambientField;
	5082	+ cNumberSlider ambientField;
4472	5083	JLabel lightareaLabel;
4473		- NumberSlider lightareaField;
	5084	+ cNumberSlider lightareaField;
4474	5085	JLabel diffusenessLabel;
4475		- NumberSlider diffusenessField;
	5086	+ cNumberSlider diffusenessField;
4476	5087	JLabel velvetLabel;
4477		- NumberSlider velvetField;
	5088	+ cNumberSlider velvetField;
4478	5089	JLabel sheenLabel;
4479		- NumberSlider sheenField;
	5090	+ cNumberSlider sheenField;
4480	5091	JLabel subsurfaceLabel;
4481		- NumberSlider subsurfaceField;
	5092	+ cNumberSlider subsurfaceField;
4482	5093	//JLabel bumpLabel;
4483	5094	//NumberSlider bumpField;
4484	5095	JLabel backlitLabel;
4485		- NumberSlider backlitField;
	5096	+ cNumberSlider backlitField;
4486	5097	JLabel anisoLabel;
4487		- NumberSlider anisoField;
	5098	+ cNumberSlider anisoField;
4488	5099	JLabel anisoVLabel;
4489		- NumberSlider anisoVField;
	5100	+ cNumberSlider anisoVField;
4490	5101	JLabel cameraLabel;
4491		- NumberSlider cameraField;
	5102	+ cNumberSlider cameraField;
4492	5103	JLabel selfshadowLabel;
4493		- NumberSlider selfshadowField;
	5104	+ cNumberSlider selfshadowField;
4494	5105	JLabel shadowLabel;
4495		- NumberSlider shadowField;
	5106	+ cNumberSlider shadowField;
4496	5107	JLabel textureLabel;
4497		- NumberSlider textureField;
	5108	+ cNumberSlider textureField;
4498	5109	JLabel opacityLabel;
4499		- NumberSlider opacityField;
	5110	+ cNumberSlider opacityField;
4500	5111	JLabel fakedepthLabel;
4501		- NumberSlider fakedepthField;
	5112	+ cNumberSlider fakedepthField;
4502	5113	JLabel shadowbiasLabel;
4503		- NumberSlider shadowbiasField;
	5114	+ cNumberSlider shadowbiasField;
4504	5115	JLabel bumpLabel;
4505		- NumberSlider bumpField;
	5116	+ cNumberSlider bumpField;
4506	5117	JLabel noiseLabel;
4507		- NumberSlider noiseField;
	5118	+ cNumberSlider noiseField;
4508	5119	JLabel powerLabel;
4509		- NumberSlider powerField;
	5120	+ cNumberSlider powerField;
4510	5121	JLabel borderfadeLabel;
4511		- NumberSlider borderfadeField;
	5122	+ cNumberSlider borderfadeField;
4512	5123	JLabel fogLabel;
4513		- NumberSlider fogField;
	5124	+ cNumberSlider fogField;
4514	5125	JLabel opacityPowerLabel;
4515		- NumberSlider opacityPowerField;
4516		- JTree jTree;
	5126	+ cNumberSlider opacityPowerField;
	5127	+ cTree jTree;
4517	5128	//ObjectUI parent;
	5129	+
	5130	+ cNumberSlider normalpushField;
	5131	+
	5132	+ private MenuItem importGFDItem;
	5133	+ private MenuItem importVRMLX3DItem;
	5134	+ private MenuItem import3DSItem;
	5135	+ private MenuItem importOBJItem;
4518	5136	}