~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);
	207	+
	208	+ objEditor.ctrlPanel.remove(namePanel);
139	209
140	210	if (!GroupEditor.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;
..	..	@@ -259,24 +340,40 @@
259	340	void SetupMenu()
260	341	{
261	342	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..."));
	343	+ menuBar.add(fileMenu = new Menu("File"));
	344	+ fileMenu.add(newItem = new MenuItem("New"));
	345	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	346	+
	347	+ //oe.menuBar.add(menu = new Menu("Include"));
	348	+ Menu menu = new Menu("Import");
	349	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	350	+ importOBJItem.addActionListener(this);
	351	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	352	+ import3DSItem.addActionListener(this);
	353	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	354	+ importVRMLX3DItem.addActionListener(this);
	355	+ menu.add("-");
	356	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	357	+ importGFDItem.addActionListener(this);
	358	+ fileMenu.add(menu);
	359	+ fileMenu.add("-");
	360	+
	361	+ fileMenu.add(saveItem = new MenuItem("Save"));
	362	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	363	//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("-");
	364	+ fileMenu.add("-");
	365	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	366	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	367	+ fileMenu.add("-");
272	368	if (client.parent != null)
273	369	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	370	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	371	} else
276	372	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	373	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	374	}
279	375
	376	+ newItem.addActionListener(this);
280	377	loadItem.addActionListener(this);
281	378	saveItem.addActionListener(this);
282	379	saveAsItem.addActionListener(this);
..	..	@@ -285,77 +382,38 @@
285	382	//povItem.addActionListener(this);
286	383	closeItem.addActionListener(this);
287	384
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	385	objectPanel = new JTabbedPane();
342	386	toolbarPanel = new JPanel();
343	387	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	388	+ treePanel = new cGridBag();
345	389	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	390	+
	391	+ editPanel = new cGridBag().setVertical(true);
	392	+ editPanel.setName("Edit");
	393	+
	394	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	395	+
	396	+ editCommandsPanel = new cGridBag();
	397	+ editPanel.add(editCommandsPanel);
	398	+ editPanel.add(ctrlPanel);
	399	+
	400	+ toolboxPanel = new cGridBag().setVertical(false);
	401	+ toolboxPanel.setName("Toolbox");
	402	+
	403	+ materialPanel = new cGridBag().setVertical(true);
349	404	materialPanel.setName("Material");
	405	+
350	406	/JTextPane/
351	407	infoarea = createTextPane();
	408	+ doc = infoarea.getStyledDocument();
	409	+
352	410	infoarea.setEditable(true);
353	411	SetText();
354	412	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	413	// infoarea.setOpaque(false);
356	414	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	415	+// TEXTAREA infoarea.setLineWrap(true);
	416	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	417	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360	418	infoPanel.setPreferredSize(new Dimension(50, 200));
361	419	infoPanel.setName("Info");
..	..	@@ -366,16 +424,16 @@
366	424	mainPanel.setName("Main");
367	425	mainPanel.setContinuousLayout(true);
368	426	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	427	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
	428	+ mainPanel.setDividerLocation(0.5); //1.0);
	429	+ mainPanel.setResizeWeight(0.5);
372	430
373	431	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	432	//mainPanel.setLayout(new GridBagLayout());
375	433	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	434	+// treePanel.setLayout(new GridBagLayout());
	435	+ //ctrlPanel.setLayout(new GridBagLayout());
	436	+ //materialPanel.setLayout(new GridBagLayout());
379	437
380	438	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	439	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +472,7 @@
414	472	static String newline = "\n";
415	473	protected static final String buttonString = "JButton";
416	474	StyledDocument doc;
417		- JTextArea infoarea;
	475	+ JTextPane infoarea;
418	476
419	477	void ClearInfo()
420	478	{
..	..	@@ -437,10 +495,10 @@
437	495	e.printStackTrace();
438	496	}
439	497
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();
	498	+// String selection = infoarea.getText();
	499	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	500	+// java.awt.datatransfer.Clipboard clipboard =
	501	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	502	//clipboard.setContents(data, data);
445	503	}
446	504
..	..	@@ -463,13 +521,13 @@
463	521	//SendInfo("Name:", "bold");
464	522	if (sel.GetTextures() != null \|\| debug)
465	523	{
466		- si.SendInfo(sel.toString(), "bold");
	524	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	525	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	526	if (sel.Size() > 0)
469	527	{
470	528	si.SendInfo("#children = " + sel.Size(), "regular");
471	529	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	530	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	531	if (debug)
474	532	{
475	533	try
..	..	@@ -481,7 +539,10 @@
481	539	}
482	540
483	541	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	542	+ {
	543	+ si.SendInfo(" BBox min: " + minima, "regular");
	544	+ si.SendInfo(" BBox max: " + maxima, "regular");
	545	+ }
485	546
486	547	if (sel.bRep != null)
487	548	{
..	..	@@ -508,7 +569,7 @@
508	569	}
509	570	if (sel.support != null)
510	571	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	572	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	573	}
513	574	if (sel.scriptnode != null)
514	575	{
..	..	@@ -579,6 +640,9 @@
579	640	{
580	641	CameraPane.pointflow = (PointFlow) sel;
581	642	}
	643	+
	644	+ si.SendInfo("_____________________", "regular");
	645	+ si.SendInfo("", "regular");
582	646	}
583	647	}
584	648
..	..	@@ -594,52 +658,140 @@
594	658	}
595	659	}
596	660
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		- };
	661	+static GraphicsDevice device = GraphicsEnvironment
	662	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	663
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	664	+ Rectangle keeprect;
	665	+ cRadio radio;
	666	+
	667	+cButton keepButton;
	668	+ cButton twoButton; // Full 3D
	669	+ cButton sixButton;
	670	+ cButton threeButton;
	671	+ cButton sevenButton;
	672	+ cButton fourButton; // full panel
	673	+ cButton oneButton; // full XYZ
	674	+ //cButton currentLayout;
	675	+
	676	+ boolean maximized;
	677	+
	678	+ cButton fullscreenLayout;
621	679
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	680	+ void Minimize()
628	681	{
629		- for (int j = 0; j < 2; j++)
	682	+ frame.setState(Frame.ICONIFIED);
	683	+ }
	684	+
	685	+ void Maximize()
	686	+ {
	687	+ if (maximized)
630	688	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	689	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
636	690	}
637		- } catch (BadLocationException ble)
	691	+ else
	692	+ {
	693	+ keeprect = frame.getBounds();
	694	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	695	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	696	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	697	+// frame.setState(Frame.MAXIMIZED_BOTH);
	698	+ }
	699	+
	700	+ maximized ^= true;
	701	+ }
	702	+
	703	+ void ToggleFullScreen()
638	704	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	705	+ if (CameraPane.FULLSCREEN)
	706	+ {
	707	+ device.setFullScreenWindow(null);
	708	+ //frame.setVisible(false);
	709	+// frame.removeNotify();
	710	+// frame.setUndecorated(false);
	711	+// frame.addNotify();
	712	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	713	+
	714	+// X frame.getContentPane().remove(/"Center",/bigThree);
	715	+// X framePanel.add(bigThree);
	716	+// X frame.getContentPane().add(/"Center",/framePanel);
	717	+ framePanel.setDividerLocation(1);
	718	+
	719	+ //frame.setVisible(true);
	720	+ radio.layout = keepButton;
	721	+ //theFrame = null;
	722	+ keepButton = null;
	723	+ radio.layout.doClick();
	724	+
	725	+ } else
	726	+ {
	727	+ keepButton = radio.layout;
	728	+ //keeprect = frame.getBounds();
	729	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	730	+// frame.getToolkit().getScreenSize().height);
	731	+ //frame.setVisible(false);
	732	+ device.setFullScreenWindow(frame);
	733	+// frame.removeNotify();
	734	+// frame.setUndecorated(true);
	735	+// frame.addNotify();
	736	+// X frame.getContentPane().remove(/"Center",/framePanel);
	737	+// X framePanel.remove(bigThree);
	738	+// X frame.getContentPane().add(/"Center",/bigThree);
	739	+ framePanel.setDividerLocation(0);
	740	+
	741	+ radio.layout = fullscreenLayout;
	742	+ radio.layout.doClick();
	743	+ //frame.setVisible(true);
	744	+ }
	745	+
	746	+ cameraView.ToggleFullScreen();
640	747	}
641	748
642		- return new JTextArea(); // textPane;
	749	+ private JTextPane createTextPane()
	750	+ {
	751	+// TEXTAREA String[] initString =
	752	+// {
	753	+// "This is an editable JTextPane, ", //regular
	754	+// "another ", //italic
	755	+// "styled ", //bold
	756	+// "text ", //small
	757	+// "component, ", //large
	758	+// "which supports embedded components..." + newline,//regular
	759	+// " " + newline, //button
	760	+// "...and embedded icons..." + newline, //regular
	761	+// " ", //icon
	762	+// newline + "JTextPane is a subclass of JEditorPane that "
	763	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	764	+// + "cover methods for interacting with those objects."
	765	+// };
	766	+//
	767	+// String[] initStyles =
	768	+// {
	769	+// "regular", "italic", "bold", "small", "large",
	770	+// "regular", "button", "regular", "icon",
	771	+// "regular"
	772	+// };
	773	+//
	774	+// JTextPane textPane = new JTextPane();
	775	+// textPane.setEditable(true);
	776	+// /StyledDocument/ doc = textPane.getStyledDocument();
	777	+// addStylesToDocument(doc);
	778	+//
	779	+// try
	780	+// {
	781	+// for (int j = 0; j < 2; j++)
	782	+// {
	783	+// for (int i = 0; i < initString.length; i++)
	784	+// {
	785	+// doc.insertString(doc.getLength(), initString[i],
	786	+// doc.getStyle(initStyles[i]));
	787	+// }
	788	+// }
	789	+// } catch (BadLocationException ble)
	790	+// {
	791	+// System.err.println("Couldn't insert initial text into text pane.");
	792	+// }
	793	+
	794	+ return new JTextPane(); // textPane;
643	795	}
644	796
645	797	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +844,7 @@
692	844	protected static ImageIcon createImageIcon(String path,
693	845	String description)
694	846	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	847	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	848	if (imgURL != null)
697	849	{
698	850	return new ImageIcon(imgURL, description);
..	..	@@ -724,6 +876,7 @@
724	876	// NumberSlider vDivsField;
725	877	// JCheckBox endcaps;
726	878	JCheckBox liveCB;
	879	+ JCheckBox selectCB;
727	880	JCheckBox hideCB;
728	881	JCheckBox link2masterCB;
729	882	JCheckBox markCB;
..	..	@@ -739,115 +892,87 @@
739	892	JButton slowerButton;
740	893	JButton fasterButton;
741	894	JButton remarkButton;
	895	+
	896	+ cGridBag editPanel;
	897	+ cGridBag editCommandsPanel;
	898	+
	899	+ cGridBag namePanel;
	900	+ cGridBag setupPanel;
	901	+ cGridBag setupPanel2;
	902	+ cGridBag objectCommandsPanel;
	903	+ cGridBag pushPanel;
	904	+ cGridBag fillPanel;
742	905
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	906	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	907	{
745	908	JCheckBox cb;
746	909
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);
	910	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	911	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	912
757	913	return cb;
758	914	}
759	915
760		- cButton AddButton(ObjEditor oe, String label)
	916	+ cButton AddButton(cGridBag panel, String label)
761	917	{
762	918	cButton cb;
763	919
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);
	920	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	921	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	922
774	923	return cb;
775	924	}
776	925
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	926	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	927	{
779	928	JComboBox combo;
780	929
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;
	930	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	931	combo.addActionListener(this);
785	932
786	933	return combo;
787	934	}
788	935
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	936	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	937	{
791		- NumberSlider combo;
	938	+ cGridBag control = new cGridBag();
	939	+
	940	+ cNumberSlider combo;
792	941
793	942	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	943	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		-
	944	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	945	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	946	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	947	+
	948	+ panel.add(control);
	949	+
	950	+ return control;
813	951	}
814	952
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	953	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	954	{
817		- NumberSlider combo;
	955	+ cGridBag control = new cGridBag();
	956	+
	957	+ cNumberSlider combo;
818	958
819	959	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	960	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		-
	961	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	962	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	963	combo.setInteger(current);
833	964
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	965	+ panel.add(control);
	966	+
	967	+ return control;
839	968	}
840	969
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	970	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	971	{
843	972	JTextArea text;
844	973
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	974	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	975	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	976
852	977	return text;
853	978	}
..	..	@@ -877,9 +1002,16 @@
877	1002	objEditor.ctrlPanel.remove(j);
878	1003	}
879	1004
	1005	+ void Remove(cNumberSlider j)
	1006	+ {
	1007	+ j.removeChangeListener(this);
	1008	+ //objEditor.ctrlPanel.remove(j.label);
	1009	+ objEditor.ctrlPanel.remove(j);
	1010	+ }
	1011	+
880	1012	/*
881	1013	*/
882		- void Return() // ObjEditor oe)
	1014	+ void Return0() // ObjEditor oe)
883	1015	{
884	1016	aConstraints.gridy += 1;
885	1017	aConstraints.gridx = 0;
..	..	@@ -934,35 +1066,77 @@
934	1066
935	1067	void SetupUI2(ObjEditor oe)
936	1068	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1069	+ //SetupName(oe);
	1070	+
	1071	+ namePanel = new cGridBag();
	1072	+
	1073	+ nameField = AddText(namePanel, copy.GetName());
	1074	+ namePanel.add(nameField);
	1075	+ oe.ctrlPanel.add(namePanel);
	1076	+
	1077	+ oe.ctrlPanel.Return();
942	1078
943	1079	if (!GroupEditor.allparams)
944	1080	return;
945	1081
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1082	+ setupPanel = new cGridBag().setVertical(false);
	1083	+
	1084	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1085	+ liveCB.setToolTipText("Animate object");
	1086	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1087	+ selectCB.setToolTipText("Make object selectable");
949	1088	// 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");
	1089	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1090	+ hideCB.setToolTipText("Hide object");
	1091	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1092	+ markCB.setToolTipText("Set the animation target transform");
	1093	+
	1094	+ setupPanel2 = new cGridBag().setVertical(false);
	1095	+
	1096	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1097	+ rewindCB.setToolTipText("Rewind animation");
	1098	+
	1099	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1100	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1101	+
	1102	+ if (Globals.ADVANCED)
	1103	+ {
	1104	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1105	+ link2masterCB.setToolTipText("Attach to support");
	1106	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1107	+ speedupCB.setToolTipText("Option motion capture");
	1108	+ }
	1109	+
	1110	+ oe.ctrlPanel.add(setupPanel);
	1111	+ oe.ctrlPanel.Return();
	1112	+ oe.ctrlPanel.add(setupPanel2);
	1113	+ oe.ctrlPanel.Return();
	1114	+
	1115	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1116	+
	1117	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1118	+ resetButton.setToolTipText("Jump to frame zero");
	1119	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1120	+ stepButton.setToolTipText("Step one frame");
956	1121	// resetAllButton = AddButton(oe, "Reset All");
957	1122	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1123	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1124	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1125	+ slowerButton.setToolTipText("Decrease animation speed");
	1126	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1127	+ fasterButton.setToolTipText("Increase animation speed");
	1128	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1129	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1130
964		- Return();
	1131	+ oe.ctrlPanel.add(objectCommandsPanel);
	1132	+ oe.ctrlPanel.Return();
965	1133
	1134	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1135	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1136	+ //Return();
	1137	+
	1138	+ oe.ctrlPanel.Return();
	1139	+
966	1140	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1141	// ObjEditor.aConstraints.gridx += 1;
968	1142
..	..	@@ -1056,7 +1230,7 @@
1056	1230	oe.aConstraints.gridwidth = 1;
1057	1231	/**/
1058	1232	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1233	+ oe.ctrlPanel.Return();
1060	1234
1061	1235	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1236	//textureButton.setEnabled(false);
..	..	@@ -1158,11 +1332,28 @@
1158	1332	//JPanel worldPanel =
1159	1333	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1334	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
1164		- //new timeflow.app.TimeflowApp().TimeFlowWindow(cameraPanel, frame);
	1335	+ centralPanel = new cGridBag();
	1336	+ centralPanel.preferredWidth = 20;
	1337	+
	1338	+ if (Globals.ADVANCED)
	1339	+ {
	1340	+ timelinePanel = new JPanel(new BorderLayout());
	1341	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1165	1342
	1343	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1344	+ cameraPanel.setContinuousLayout(true);
	1345	+ cameraPanel.setOneTouchExpandable(true);
	1346	+// cameraPanel.setDividerLocation(0.9);
	1347	+// cameraPanel.setDividerSize(9);
	1348	+ cameraPanel.setResizeWeight(1.0);
	1349	+
	1350	+ }
	1351	+
	1352	+ centralPanel.add(cameraView);
	1353	+ centralPanel.setFocusable(true);
	1354	+ //frame.setJMenuBar(timelineMenubar);
	1355	+ //centralPanel.add(timelinePanel);
	1356	+
1166	1357	//topView.camera = ;
1167	1358	//frontView.camera = new Camera(2);
1168	1359	//sideView.camera = new Camera(3);
..	..	@@ -1178,12 +1369,13 @@
1178	1369	//frontView.object = copy;
1179	1370	//sideView.object = copy;
1180	1371
1181		- XYZPanel = new JPanel();
1182		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1372	+ XYZPanel = new cGridBag().setVertical(true);
	1373	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1183	1374
1184		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1186		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1375	+ XYZPanel.preferredWidth = 5;
	1376	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1377	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1378	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1187	1379
1188	1380	/*
1189	1381	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1192,7 +1384,7 @@
1192	1384	gridPanel.add(cameraView);
1193	1385	gridPanel.add(XYZPanel);
1194	1386	*/
1195		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1387	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1196	1388	gridPanel.setContinuousLayout(true);
1197	1389	gridPanel.setOneTouchExpandable(true);
1198	1390	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,11 +1412,13 @@
1220	1412
1221	1413	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1222	1414	//tmp.setName("Edit");
	1415	+ objectPanel.add(toolboxPanel);
1223	1416	objectPanel.add(materialPanel);
1224		- JPanel north = new JPanel(new BorderLayout());
1225		- north.setName("Edit");
1226		- north.add(ctrlPanel, BorderLayout.NORTH);
1227		- objectPanel.add(north);
	1417	+// JPanel north = new JPanel(new BorderLayout());
	1418	+// north.setName("Edit");
	1419	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1420	+// objectPanel.add(north);
	1421	+ objectPanel.add(editPanel);
1228	1422	objectPanel.add(infoPanel);
1229	1423
1230	1424	/*
..	..	@@ -1245,16 +1439,23 @@
1245	1439	scrollpane.setWheelScrollingEnabled(true);
1246	1440	scrollpane.addMouseWheelListener(this); // Default not fast enough
1247	1441
1248		- /JTabbedPane/ scenePanel = new JTabbedPane();
1249		- scenePanel.add(scrollpane);
	1442	+ /JTabbedPane/ scenePanel = new cGridBag();
	1443	+ scenePanel.preferredWidth = 6;
	1444	+
	1445	+ JTabbedPane tabbedPane = new JTabbedPane();
	1446	+ tabbedPane.add(scrollpane);
1250	1447
1251		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1448	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1252	1449
1253		- optionsPanel = new JPanel(new GridBagLayout());
	1450	+ optionsPanel = new cGridBag().setVertical(true);
1254	1451
1255	1452	optionsPanel.setName("Options");
1256		- scenePanel.add(optionsPanel);
1257		-
	1453	+
	1454	+ AddOptions(optionsPanel); //, aConstraints);
	1455	+
	1456	+ tabbedPane.add(optionsPanel);
	1457	+
	1458	+ scenePanel.add(tabbedPane);
1258	1459
1259	1460	/*
1260	1461	cTree jTree = new cTree(null);
..	..	@@ -1288,6 +1489,7 @@
1288	1489	//bigPanel.setSize(new Dimension(10,10));
1289	1490	//bigPanel.add(ctrlPanel);
1290	1491	//bigPanel.add(gridPanel);
	1492	+ /**
1291	1493	bigThree = new JPanel();
1292	1494	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1293	1495	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1304,14 +1506,20 @@
1304	1506	// aConstraints.gridheight = 3;
1305	1507	aWindowConstraints.gridx = 1;
1306	1508	aWindowConstraints.fill = GridBagConstraints.BOTH;
1307		- bigThree.add(cameraPanel, aWindowConstraints);
	1509	+ bigThree.add(centralPanel, aWindowConstraints);
1308	1510	aWindowConstraints.weightx = 0;
1309	1511	aWindowConstraints.gridx = 4;
1310	1512	aWindowConstraints.gridwidth = 1;
1311	1513	// aConstraints.gridheight = 3;
1312	1514	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1313	1515	bigThree.add(XYZPanel, aWindowConstraints);
	1516	+ /**/
1314	1517
	1518	+ bigThree = new cGridBag();
	1519	+ bigThree.addComponent(scenePanel);
	1520	+ bigThree.addComponent(centralPanel);
	1521	+ bigThree.addComponent(XYZPanel);
	1522	+
1315	1523	// // SIDE EFFECT!!!
1316	1524	// aConstraints.gridx = 0;
1317	1525	// aConstraints.gridy = 0;
..	..	@@ -1332,14 +1540,17 @@
1332	1540	//worldPane.add(bigPanel);
1333	1541	//worldPane.add(worldPanel);
1334	1542	/**/
1335		- frame.getContentPane().add(/"Center",/framePanel);
	1543	+ //frame.getContentPane().add(/"Center",/framePanel);
	1544	+ frame.add(/"Center",/framePanel);
1336	1545	//frame.getContentPane().add(/"Center",/ worldPane);
1337	1546
1338	1547	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1339	1548
1340		- frame.setSize(1024, 768);
1341		- frame.show();
	1549	+ frame.setSize(1280, 860);
	1550	+ frame.setVisible(true);
1342	1551
	1552	+ cameraView.requestFocusInWindow();
	1553	+
1343	1554	gridPanel.setDividerLocation(1.0);
1344	1555
1345	1556	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1353,6 +1564,10 @@
1353	1564	});
1354	1565	}
1355	1566
	1567	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1568	+ {
	1569	+ }
	1570	+
1356	1571	JTree GetTree()
1357	1572	{
1358	1573	return objEditor.jTree;
..	..	@@ -1364,260 +1579,173 @@
1364	1579	ctrlPanel.removeAll();
1365	1580	}
1366	1581
1367		- void SetupMaterial(JPanel ctrlPanel)
	1582	+ void SetupMaterial(cGridBag panel)
1368	1583	{
1369		- aConstraints.weighty = 0;
1370		- //aConstraints.weightx = 1;
1371		- /*
	1584	+ /*
1372	1585	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1373	1586	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1374		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1375		- aConstraints.gridx += 1;
1376	1587	*/
1377	1588
1378		- aConstraints.gridwidth = 1;
1379		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1380		- aConstraints.gridx += 1;
1381		- aConstraints.weighty = 0;
1382		- aConstraints.gridwidth = 1;
	1589	+ cGridBag editBar = new cGridBag().setVertical(false);
	1590	+
	1591	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1592	+ createMaterialButton.setToolTipText("Create material");
1383	1593
1384	1594	/*
1385	1595	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1386		- aConstraints.gridx += 1;
1387		- aConstraints.weighty = 0;
1388		- aConstraints.gridwidth = 1;
1389	1596	*/
1390	1597
1391		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1392		- aConstraints.gridx += 1;
	1598	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1599	+ clearMaterialButton.setToolTipText("Clear material");
	1600	+
	1601	+ if (Globals.ADVANCED)
	1602	+ {
	1603	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1604	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1605	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1606	+ }
1393	1607
1394		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1395		-
1396		- aConstraints.gridx += 1;
1397		-
1398		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1399		-
1400		- aConstraints.gridx += 1;
1401		-
1402		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1403		-
1404		- aConstraints.gridx = 0;
1405		- aConstraints.gridy += 1;
1406		- aConstraints.weighty = 0;
1407		- aConstraints.gridwidth = 1;
	1608	+ editBar.preferredHeight = 15;
	1609	+
	1610	+ panel.add(editBar);
	1611	+
1408	1612	/**/
1409	1613	//aConstraints.weighty = 0;
1410	1614	////aConstraints.weightx = 1;
1411	1615	//aConstraints.weighty = 1;
1412	1616	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1413	1617	//aConstraints.gridx += 1;
1414		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1415		- aConstraints.weighty = 0;
1416		- aConstraints.gridx = 0;
1417		- aConstraints.gridy += 1;
1418		- aConstraints.gridwidth = 1;
	1618	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1419	1619
1420		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1421		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1422		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1423		- aConstraints.gridx += 1;
1424		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1425		- //aConstraints.weightx = 0;
1426		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.gridwidth = 1;
	1620	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1621	+
	1622	+ cGridBag color = new cGridBag();
	1623	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1624	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1625	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1626	+ //colorField.preferredWidth = 200;
	1627	+ colorSection.add(color);
1430	1628
1431		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1432		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1433		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1434		- aConstraints.gridx += 1;
1435		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1436		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1437		- aConstraints.gridx = 0;
1438		- aConstraints.gridy += 1;
1439		- aConstraints.gridwidth = 1;
	1629	+ cGridBag modulation = new cGridBag();
	1630	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1631	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1632	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1633	+ colorSection.add(modulation);
1440	1634
1441		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1442		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1443		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1444		- aConstraints.gridx += 1;
1445		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1446		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1447		- aConstraints.gridx = 0;
1448		- aConstraints.gridy += 1;
1449		- aConstraints.gridwidth = 1;
	1635	+ cGridBag texture = new cGridBag();
	1636	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1637	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1638	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1639	+ colorSection.add(texture);
1450	1640
1451		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1452		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1453		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1454		- aConstraints.gridx += 1;
1455		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1456		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1457		- aConstraints.gridx = 0;
1458		- aConstraints.gridy += 1;
1459		- aConstraints.gridwidth = 1;
	1641	+ cGridBag anisoU = new cGridBag();
	1642	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1643	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1644	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1645	+ colorSection.add(anisoU);
1460	1646
1461		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1462		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1463		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1464		- aConstraints.gridx += 1;
1465		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- aConstraints.gridwidth = 1;
	1647	+ cGridBag anisoV = new cGridBag();
	1648	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1649	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1650	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1651	+ colorSection.add(anisoV);
1470	1652
1471		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1472		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- aConstraints.gridwidth = 1;
	1653	+ cGridBag shadowbias = new cGridBag();
	1654	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1655	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1656	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1657	+ colorSection.add(shadowbias);
1480	1658
1481		- //aConstraints.weighty = 1;
1482		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1483		- //aConstraints.gridx += 1;
1484		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1485		- aConstraints.weighty = 0;
1486		- aConstraints.gridx = 0;
1487		- aConstraints.gridy += 1;
1488		- aConstraints.gridwidth = 1;
	1659	+ panel.add(new JSeparator());
	1660	+
	1661	+ panel.add(colorSection);
	1662	+
	1663	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1664	+
	1665	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1666	+
	1667	+ cGridBag diffuse = new cGridBag();
	1668	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1669	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1670	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1671	+ diffuseSection.add(diffuse);
1489	1672
1490		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1491		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1492		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1493		- aConstraints.gridx += 1;
1494		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1495		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1496		- aConstraints.gridx = 0;
1497		- aConstraints.gridy += 1;
1498		- aConstraints.gridwidth = 1;
	1673	+ cGridBag diffuseness = new cGridBag();
	1674	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1675	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1676	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1677	+ diffuseSection.add(diffuseness);
1499	1678
1500		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1501		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1502		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1503		- aConstraints.gridx += 1;
1504		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1505		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1506		- aConstraints.gridx = 0;
1507		- aConstraints.gridy += 1;
1508		- aConstraints.gridwidth = 1;
	1679	+ cGridBag selfshadow = new cGridBag();
	1680	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1681	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1682	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1683	+ diffuseSection.add(selfshadow);
1509	1684
1510		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1511		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1512		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1513		- aConstraints.gridx += 1;
1514		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1515		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1516		- aConstraints.gridx = 0;
1517		- aConstraints.gridy += 1;
1518		- aConstraints.gridwidth = 1;
	1685	+ cGridBag sheen = new cGridBag();
	1686	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1687	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1688	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1689	+ diffuseSection.add(sheen);
1519	1690
1520		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1521		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1523		- aConstraints.gridx += 1;
1524		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1525		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- aConstraints.gridwidth = 1;
	1691	+ cGridBag subsurface = new cGridBag();
	1692	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1693	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1694	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1695	+ diffuseSection.add(subsurface);
1529	1696
1530		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1531		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- aConstraints.gridwidth = 1;
	1697	+ cGridBag shadow = new cGridBag();
	1698	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1699	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1700	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1701	+ diffuseSection.add(shadow);
1539	1702
1540		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1541		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- aConstraints.gridwidth = 1;
	1703	+ cGridBag fakedepth = new cGridBag();
	1704	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1705	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1706	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1707	+ diffuseSection.add(fakedepth);
1549	1708
1550		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1551		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- aConstraints.gridwidth = 1;
	1709	+ panel.add(new JSeparator());
	1710	+
	1711	+ panel.add(diffuseSection);
	1712	+
	1713	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1714	+
	1715	+ cGridBag specularSection = new cGridBag().setVertical(true);
1559	1716
1560		- //aConstraints.weighty = 1;
1561		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1562		- //aConstraints.gridx += 1;
1563		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1564		- aConstraints.weighty = 0;
1565		- aConstraints.gridx = 0;
1566		- aConstraints.gridy += 1;
1567		- aConstraints.gridwidth = 1;
	1717	+ cGridBag specular = new cGridBag();
	1718	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1719	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1720	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1721	+ specularSection.add(specular);
1568	1722
1569		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1570		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1571		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1572		- aConstraints.gridx += 1;
1573		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1574		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1575		- aConstraints.gridx = 0;
1576		- aConstraints.gridy += 1;
1577		- aConstraints.gridwidth = 1;
	1723	+ cGridBag lightarea = new cGridBag();
	1724	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1725	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1726	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1727	+ specularSection.add(lightarea);
1578	1728
1579		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1580		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1581		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1582		- aConstraints.gridx += 1;
1583		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1584		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1585		- aConstraints.gridx = 0;
1586		- aConstraints.gridy += 1;
1587		- aConstraints.gridwidth = 1;
	1729	+ cGridBag shininess = new cGridBag();
	1730	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1731	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1732	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1733	+ specularSection.add(shininess);
1588	1734
1589		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1590		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1591		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1592		- aConstraints.gridx += 1;
1593		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1594		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1595		- aConstraints.gridx = 0;
1596		- aConstraints.gridy += 1;
1597		- aConstraints.gridwidth = 1;
	1735	+ cGridBag metalness = new cGridBag();
	1736	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1737	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1738	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1739	+ specularSection.add(metalness);
1598	1740
1599		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1600		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1601		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1602		- aConstraints.gridx += 1;
1603		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- aConstraints.gridwidth = 1;
	1741	+ cGridBag velvet = new cGridBag();
	1742	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1743	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1744	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1745	+ specularSection.add(velvet);
1608	1746
1609		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1610		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- aConstraints.gridwidth = 1;
1618		-
1619		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1620		- Return();
	1747	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1748	+ //Return();
1621	1749	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1622	1750	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	1751	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1628,130 +1756,93 @@
1628	1756	// aConstraints.gridy += 1;
1629	1757	// aConstraints.gridwidth = 1;
1630	1758
1631		- //aConstraints.weighty = 1;
1632		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1633		- //aConstraints.gridx += 1;
1634		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1635		- aConstraints.weighty = 0;
1636		- aConstraints.gridx = 0;
1637		- aConstraints.gridy += 1;
1638		- aConstraints.gridwidth = 1;
1639	1759
1640		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1641		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1642		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1643		- aConstraints.gridx += 1;
1644		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1645		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1646		- aConstraints.gridx = 0;
1647		- aConstraints.gridy += 1;
1648		- aConstraints.gridwidth = 1;
	1760	+ panel.add(new JSeparator());
	1761	+
	1762	+ panel.add(specularSection);
	1763	+
	1764	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1765	+
	1766	+ cGridBag globalSection = new cGridBag().setVertical(true);
1649	1767
1650		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1651		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1652		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1653		- aConstraints.gridx += 1;
1654		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1655		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1656		- aConstraints.gridx = 0;
1657		- aConstraints.gridy += 1;
1658		- aConstraints.gridwidth = 1;
	1768	+ cGridBag camera = new cGridBag();
	1769	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1770	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1771	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1772	+ globalSection.add(camera);
1659	1773
1660		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1661		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1663		- aConstraints.gridx += 1;
1664		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1665		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1666		- aConstraints.gridx = 0;
1667		- aConstraints.gridy += 1;
1668		- aConstraints.gridwidth = 1;
	1774	+ cGridBag ambient = new cGridBag();
	1775	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1776	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1777	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1778	+ globalSection.add(ambient);
1669	1779
1670		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1671		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1673		- aConstraints.gridx += 1;
1674		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- aConstraints.gridwidth = 1;
1679		- aConstraints.weighty = 0;
	1780	+ cGridBag backlit = new cGridBag();
	1781	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1782	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1783	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1784	+ globalSection.add(backlit);
1680	1785
1681		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1682		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1683		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1684		- aConstraints.gridx += 1;
1685		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1686		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1687		- aConstraints.gridx = 0;
1688		- aConstraints.gridy += 1;
1689		- aConstraints.gridwidth = 1;
	1786	+ cGridBag opacity = new cGridBag();
	1787	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1788	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1789	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1790	+ globalSection.add(opacity);
1690	1791
1691		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1692		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1694		- aConstraints.gridx += 1;
1695		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1696		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1697		- aConstraints.gridx = 0;
1698		- aConstraints.gridy += 1;
1699		- aConstraints.gridwidth = 1;
	1792	+ panel.add(new JSeparator());
	1793	+
	1794	+ panel.add(globalSection);
	1795	+
	1796	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1797	+
	1798	+ cGridBag textureSection = new cGridBag().setVertical(true);
1700	1799
1701		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1702		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1704		- aConstraints.gridx += 1;
1705		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1706		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1707		- aConstraints.gridx = 0;
1708		- aConstraints.gridy += 1;
1709		- aConstraints.gridwidth = 1;
	1800	+ cGridBag bump = new cGridBag();
	1801	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1802	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1803	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1804	+ textureSection.add(bump);
1710	1805
1711		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1712		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1714		- aConstraints.gridx += 1;
1715		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1716		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1717		- aConstraints.gridx = 0;
1718		- aConstraints.gridy += 1;
1719		- aConstraints.gridwidth = 1;
	1806	+ cGridBag noise = new cGridBag();
	1807	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1808	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1809	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1810	+ textureSection.add(noise);
1720	1811
1721		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1722		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- aConstraints.gridwidth = 1;
	1812	+ cGridBag power = new cGridBag();
	1813	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1814	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1815	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1816	+ textureSection.add(power);
1730	1817
1731		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1732		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- aConstraints.gridwidth = 1;
	1818	+ cGridBag borderfade = new cGridBag();
	1819	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1820	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1821	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1822	+ textureSection.add(borderfade);
1740	1823
1741		- //aConstraints.weighty = 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1743		- //aConstraints.gridx += 1;
1744		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1745		- aConstraints.weighty = 0;
	1824	+ cGridBag fog = new cGridBag();
	1825	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1826	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1827	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1828	+ textureSection.add(fog);
1746	1829
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy = 0;
1749		- aConstraints.gridwidth = 1;
	1830	+ cGridBag opacityPower = new cGridBag();
	1831	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1832	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1833	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1834	+ textureSection.add(opacityPower);
	1835	+
	1836	+ panel.add(new JSeparator());
	1837	+
	1838	+ panel.add(textureSection);
	1839	+
	1840	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1750	1841
1751	1842	SetMaterial(copy); // .GetMaterial());
1752	1843
1753		- colorField.addChangeListener(this);
1754		- modulationField.addChangeListener(this);
	1844	+ //colorField.addChangeListener(this);
	1845	+// modulationField.addChangeListener(this);
1755	1846	metalnessField.addChangeListener(this);
1756	1847	diffuseField.addChangeListener(this);
1757	1848	specularField.addChangeListener(this);
..	..	@@ -1781,12 +1872,15 @@
1781	1872	opacityPowerField.addChangeListener(this);
1782	1873	/**/
1783	1874
1784		- resetSlidersButton.addActionListener(this);
1785	1875	clearMaterialButton.addActionListener(this);
1786	1876	createMaterialButton.addActionListener(this);
1787		-
1788		- propagateToggle.addItemListener(this);
1789		- multiplyToggle.addItemListener(this);
	1877	+
	1878	+ if (Globals.ADVANCED)
	1879	+ {
	1880	+ resetSlidersButton.addActionListener(this);
	1881	+ propagateToggle.addItemListener(this);
	1882	+ multiplyToggle.addItemListener(this);
	1883	+ }
1790	1884	}
1791	1885
1792	1886	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1957,7 +2051,7 @@
1957	2051
1958	2052	//? flashIt = false;
1959	2053	CameraPane pane = (CameraPane) cameraView;
1960		- pane.clickStart(location.x, location.y, 0);
	2054	+ pane.clickStart(location.x, location.y, 0, 0);
1961	2055	pane.clickEnd(location.x, location.y, 0, true);
1962	2056
1963	2057	if (group.selection.size() == 1)
..	..	@@ -2006,6 +2100,7 @@
2006	2100	e2.printStackTrace();
2007	2101	}
2008	2102	}
	2103	+
2009	2104	LoadJMEThread loadThread;
2010	2105
2011	2106	class LoadJMEThread extends Thread
..	..	@@ -2063,6 +2158,7 @@
2063	2158	//LoadFile0(filename, converter);
2064	2159	}
2065	2160	}
	2161	+
2066	2162	LoadOBJThread loadObjThread;
2067	2163
2068	2164	class LoadOBJThread extends Thread
..	..	@@ -2141,19 +2237,19 @@
2141	2237
2142	2238	void LoadObjFile(String fullname)
2143	2239	{
2144		- /*
	2240	+ System.out.println("Loading " + fullname);
	2241	+ /**/
2145	2242	//lastFilename = fullname;
2146	2243	if(loadObjThread == null)
2147	2244	{
2148		- loadObjThread = new LoadOBJThread();
2149		- loadObjThread.start();
	2245	+ loadObjThread = new LoadOBJThread();
	2246	+ loadObjThread.start();
2150	2247	}
2151	2248
2152	2249	loadObjThread.add(fullname);
2153		- */
	2250	+ /**/
2154	2251
2155		- System.out.println("Loading " + fullname);
2156		- makeSomething(new FileObject(fullname, true), true);
	2252	+ //makeSomething(new FileObject(fullname, true), true);
2157	2253	}
2158	2254
2159	2255	void LoadGFDFile(String fullname)
..	..	@@ -2414,11 +2510,11 @@
2414	2510
2415	2511	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2416	2512	{
2417		- if (GrafreeD.standAlone)
	2513	+ if (Grafreed.standAlone)
2418	2514	{
2419	2515	/**/
2420	2516	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2421		- browser.show();
	2517	+ browser.setVisible(true);
2422	2518	String filename = browser.getFile();
2423	2519	if (filename != null && filename.length() > 0)
2424	2520	{
..	..	@@ -2563,6 +2659,7 @@
2563	2659	}
2564	2660	if (input == null)
2565	2661	{
	2662	+ new Exception().printStackTrace();
2566	2663	System.exit(0);
2567	2664	}
2568	2665
..	..	@@ -2777,7 +2874,8 @@
2777	2874	return;
2778	2875	}
2779	2876
2780		- multiplyToggle.setSelected(mat.multiply);
	2877	+ if (multiplyToggle != null)
	2878	+ multiplyToggle.setSelected(mat.multiply);
2781	2879
2782	2880	assert (object.projectedVertices != null);
2783	2881
..	..	@@ -2959,25 +3057,42 @@
2959	3057	// june 2013 copy.HardTouch();
2960	3058	cameraView.repaint();
2961	3059	return;
2962		- } else if (event.getSource() == toggleFullItem)
	3060	+ } else if (event.getSource() == toggleTimelineItem)
2963	3061	{
2964		- if (CameraPane.FULLSCREEN)
	3062	+ timeline ^= true;
	3063	+
	3064	+ if (timeline)
2965	3065	{
2966		- frame.getContentPane().remove(/"Center",/bigThree);
2967		- framePanel.add(bigThree);
2968		- frame.getContentPane().add(/"Center",/framePanel);
2969		- } else
2970		- {
2971		- frame.getContentPane().remove(/"Center",/framePanel);
2972		- frame.getContentPane().add(/"Center",/bigThree);
	3066	+ centralPanel.remove(cameraView);
	3067	+ cameraPanel.add(cameraView);
	3068	+ centralPanel.add(cameraPanel);
	3069	+ frame.setJMenuBar(timelineMenubar);
	3070	+ wasFullScreen = CameraPane.FULLSCREEN;
	3071	+ if (!CameraPane.FULLSCREEN)
	3072	+ ToggleFullScreen();
	3073	+ toggleFullScreenItem.setEnabled(false);
2973	3074	}
	3075	+ else
	3076	+ {
	3077	+ centralPanel.remove(cameraPanel);
	3078	+ centralPanel.add(cameraView);
	3079	+ frame.setJMenuBar(null);
	3080	+ if (!wasFullScreen)
	3081	+ ToggleFullScreen();
	3082	+ toggleFullScreenItem.setEnabled(true);
	3083	+ }
	3084	+
2974	3085	frame.validate();
2975		- cameraView.ToggleFullScreen();
	3086	+ return;
	3087	+ } else if (event.getSource() == toggleFullScreenItem)
	3088	+ {
	3089	+ ToggleFullScreen();
	3090	+ frame.validate();
2976	3091
2977	3092	return;
2978		- } else if (event.getSource() == toggleRandomItem)
	3093	+ } else if (event.getSource() == toggleSwitchItem)
2979	3094	{
2980		- cameraView.ToggleRandom();
	3095	+ cameraView.ToggleSwitch();
2981	3096	cameraView.repaint();
2982	3097	return;
2983	3098	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3006,6 +3121,10 @@
3006	3121	{
3007	3122	copy.live ^= true;
3008	3123	return;
	3124	+ } else if (event.getSource() == selectCB)
	3125	+ {
	3126	+ copy.dontselect ^= true;
	3127	+ return;
3009	3128	} else if (event.getSource() == hideCB)
3010	3129	{
3011	3130	copy.hide ^= true;
..	..	@@ -3020,6 +3139,7 @@
3020	3139	if (event.getSource() == randomCB)
3021	3140	{
3022	3141	copy.random ^= true;
	3142	+ objEditor.refreshContents();
3023	3143	return;
3024	3144	}
3025	3145	if (event.getSource() == speedupCB)
..	..	@@ -3043,8 +3163,9 @@
3043	3163
3044	3164	public void actionPerformed(ActionEvent event)
3045	3165	{
	3166	+ Object source = event.getSource();
3046	3167	// SCRIPT DIALOG
3047		- if (event.getSource() == okbutton)
	3168	+ if (source == okbutton)
3048	3169	{
3049	3170	textpanel.setVisible(false);
3050	3171	textpanel.remove(textarea);
..	..	@@ -3056,7 +3177,7 @@
3056	3177	textarea = null;
3057	3178	textpanel = null;
3058	3179	}
3059		- if (event.getSource() == cancelbutton)
	3180	+ if (source == cancelbutton)
3060	3181	{
3061	3182	textpanel.setVisible(false);
3062	3183	textpanel.remove(textarea);
..	..	@@ -3068,49 +3189,50 @@
3068	3189	//applySelf();
3069	3190	//client.refreshEditWindow();
3070	3191	//refreshContents();
3071		- if (event.getSource() == nameField)
	3192	+ if (source == nameField)
3072	3193	{
3073	3194	//System.out.println("ObjEditor " + event);
3074	3195	applySelf0(true);
3075	3196	//parent.applySelf();
3076	3197	objEditor.refreshContents();
3077		- } else if (event.getSource() == resetButton)
	3198	+ } else if (source == resetButton)
3078	3199	{
3079	3200	CameraPane.fullreset = true;
3080	3201	copy.Reset(); // ResetMeshes();
3081	3202	copy.Touch();
3082	3203	objEditor.refreshContents();
3083		- } else if (event.getSource() == stepItem)
	3204	+ } else if (source == stepItem)
3084	3205	{
3085		- cameraView.ONESTEP = true;
	3206	+ //cameraView.ONESTEP = true;
	3207	+ Globals.ONESTEP = true;
3086	3208	cameraView.repaint();
3087	3209	return;
3088		- } else if (event.getSource() == stepButton)
	3210	+ } else if (source == stepButton)
3089	3211	{
3090	3212	copy.Step();
3091	3213	copy.Touch();
3092	3214	objEditor.refreshContents();
3093		- } else if (event.getSource() == slowerButton)
	3215	+ } else if (source == slowerButton)
3094	3216	{
3095	3217	copy.Slower();
3096	3218	copy.Touch();
3097	3219	objEditor.refreshContents();
3098		- } else if (event.getSource() == fasterButton)
	3220	+ } else if (source == fasterButton)
3099	3221	{
3100	3222	copy.Faster();
3101	3223	copy.Touch();
3102	3224	objEditor.refreshContents();
3103		- } else if (event.getSource() == remarkButton)
	3225	+ } else if (source == remarkButton)
3104	3226	{
3105	3227	copy.Remark();
3106	3228	copy.Touch();
3107	3229	objEditor.refreshContents();
3108		- } else if (event.getSource() == stepAllButton)
	3230	+ } else if (source == stepAllButton)
3109	3231	{
3110	3232	copy.StepAll();
3111	3233	copy.Touch();
3112	3234	objEditor.refreshContents();
3113		- } else if (event.getSource() == resetAllButton)
	3235	+ } else if (source == resetAllButton)
3114	3236	{
3115	3237	//CameraPane.fullreset = true;
3116	3238	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3143,53 +3265,75 @@
3143	3265	// Close();
3144	3266	// }
3145	3267	// else
3146		- if (event.getSource() == resetSlidersButton)
	3268	+ if (source == resetSlidersButton)
3147	3269	{
3148	3270	ResetSliders();
3149		- } else if (event.getSource() == clearMaterialButton)
	3271	+ } else if (source == clearMaterialButton)
3150	3272	{
3151	3273	ClearMaterial();
3152		- } else if (event.getSource() == createMaterialButton)
	3274	+ } else if (source == createMaterialButton)
3153	3275	{
3154	3276	CreateMaterial();
3155		- } else if (event.getSource() == clearPanelButton)
	3277	+ } else if (source == clearPanelButton)
3156	3278	{
3157	3279	copy.ClearUI();
3158	3280	refreshContents(true);
3159		- } /*
3160		- }
3161		-
3162		- public boolean action(Event event, Object arg)
3163		- {
3164		- */ else if (event.getSource() == closeItem)
	3281	+ } else if (source == importGFDItem)
	3282	+ {
	3283	+ ImportGFD();
	3284	+ } else
	3285	+ if (source == importVRMLX3DItem)
	3286	+ {
	3287	+ ImportVRMLX3D();
	3288	+ } else
	3289	+ if (source == import3DSItem)
	3290	+ {
	3291	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3292	+ } else
	3293	+ if (source == importOBJItem)
	3294	+ {
	3295	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3296	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3297	+ browser.setVisible(true);
	3298	+ String filename = browser.getFile();
	3299	+ if (filename != null && filename.length() > 0)
	3300	+ {
	3301	+ String fullname = browser.getDirectory() + filename;
	3302	+ makeSomething(ReadOBJ(fullname), true);
	3303	+ }
	3304	+ } else
	3305	+ if (source == closeItem)
3165	3306	{
3166	3307	Close();
3167	3308	//return true;
3168		- } else if (event.getSource() == loadItem)
	3309	+ } else if (source == loadItem)
3169	3310	{
3170	3311	load();
3171	3312	//return true;
3172		- } else if (event.getSource() == saveItem)
	3313	+ } else if (source == newItem)
	3314	+ {
	3315	+ New();
	3316	+ } else if (source == saveItem)
3173	3317	{
3174	3318	save();
3175	3319	//return true;
3176		- } else if (event.getSource() == saveAsItem)
	3320	+ } else if (source == saveAsItem)
3177	3321	{
3178	3322	saveAs();
3179	3323	//return true;
3180		- } else if (event.getSource() == reexportItem)
	3324	+ } else if (source == reexportItem)
3181	3325	{
3182	3326	reexport();
3183	3327	//return true;
3184		- } else if (event.getSource() == exportAsItem)
	3328	+ } else if (source == exportAsItem)
3185	3329	{
3186	3330	export();
3187	3331	//return true;
3188		- } else if (event.getSource() == povItem)
	3332	+ } else if (source == povItem)
3189	3333	{
3190	3334	generatePOV();
3191	3335	//return true;
3192		- } else if (event.getSource() == zBufferItem)
	3336	+ } else if (source == zBufferItem)
3193	3337	{
3194	3338	try
3195	3339	{
..	..	@@ -3211,21 +3355,8 @@
3211	3355	cameraView.repaint();
3212	3356	//return true;
3213	3357	}
3214		- */ else if (event.getSource() == editCameraItem)
3215		- {
3216		- cameraView.ProtectCamera();
3217		- cameraView.repaint();
3218		- return;
3219		- } else if (event.getSource() == revertCameraItem)
3220		- {
3221		- cameraView.RevertCamera();
3222		- cameraView.repaint();
3223		- return;
3224		- } else if (event.getSource() == textureButton)
3225		- {
3226		- return; // true;
3227		- } else // combos...
3228		- if (event.getSource() == texresMenu)
	3358	+ */ else // combos...
	3359	+ if (source == texresMenu)
3229	3360	{
3230	3361	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3231	3362	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3237,27 +3368,287 @@
3237	3368	}
3238	3369	}
3239	3370
3240		- void ToggleAnimation()
	3371	+ void New()
3241	3372	{
3242		- if (!CameraPane.ANIMATION)
	3373	+ while (copy.Size() > 1)
3243	3374	{
3244		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3375	+ copy.remove(1);
	3376	+ }
	3377	+
	3378	+ ResetModel();
	3379	+ objEditor.refreshContents();
	3380	+ }
	3381	+
	3382	+ static public byte[] Compress(Object3D o)
	3383	+ {
	3384	+ try
	3385	+ {
	3386	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3387	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3388	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3389	+
	3390	+ Object3D parent = o.parent;
	3391	+ o.parent = null;
	3392	+
	3393	+ out.writeObject(o);
	3394	+
	3395	+ o.parent = parent;
	3396	+
	3397	+ out.flush();
	3398	+
	3399	+ zstream.close();
	3400	+ out.close();
	3401	+
	3402	+ return baos.toByteArray();
	3403	+ } catch (Exception e)
	3404	+ {
	3405	+ System.err.println(e);
	3406	+ return null;
	3407	+ }
	3408	+ }
	3409	+
	3410	+ static public Object Uncompress(byte[] bytes)
	3411	+ {
	3412	+ System.out.println("#bytes = " + bytes.length);
	3413	+ try
	3414	+ {
	3415	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3416	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3417	+ ObjectInputStream in = new ObjectInputStream(istream);
	3418	+ Object obj = in.readObject();
	3419	+ in.close();
	3420	+
	3421	+ return obj;
	3422	+ } catch (Exception e)
	3423	+ {
	3424	+ System.err.println(e);
	3425	+ return null;
	3426	+ }
	3427	+ }
	3428	+
	3429	+ static public Object clone(Object o)
	3430	+ {
	3431	+ try
	3432	+ {
	3433	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3434	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3435	+
	3436	+ out.writeObject(o);
	3437	+
	3438	+ out.flush();
	3439	+ out.close();
	3440	+
	3441	+ byte[] bytes = baos.toByteArray();
	3442	+
	3443	+ System.out.println("clone = " + bytes.length);
	3444	+
	3445	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3446	+ ObjectInputStream in = new ObjectInputStream(bais);
	3447	+ Object obj = in.readObject();
	3448	+ in.close();
	3449	+
	3450	+ return obj;
	3451	+ } catch (Exception e)
	3452	+ {
	3453	+ System.err.println(e);
	3454	+ return null;
	3455	+ }
	3456	+ }
	3457	+
	3458	+ cRadio GetCurrentTab()
	3459	+ {
	3460	+ cRadio ab;
	3461	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3462	+ {
	3463	+ ab = (cRadio)e.nextElement();
	3464	+ if(ab.GetObject() == copy)
	3465	+ {
	3466	+ return ab;
	3467	+ }
	3468	+ }
	3469	+
	3470	+ return null;
	3471	+ }
	3472	+
	3473	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3474	+
	3475	+ public void Save()
	3476	+ {
	3477	+ System.err.println("Save");
	3478	+
	3479	+ cRadio tab = GetCurrentTab();
	3480	+
	3481	+ boolean temp = CameraPane.SWITCH;
	3482	+ CameraPane.SWITCH = false;
	3483	+
	3484	+ copy.ExtractBigData(hashtable);
	3485	+
	3486	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3487	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3488	+
	3489	+ copy.RestoreBigData(hashtable);
	3490	+
	3491	+ CameraPane.SWITCH = temp;
	3492	+
	3493	+ //assert(hashtable.isEmpty());
	3494	+
	3495	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3496	+ {
	3497	+ tab.graphs[i] = null;
	3498	+ }
	3499	+
	3500	+ // test save
	3501	+ if (false)
	3502	+ {
	3503	+ try
	3504	+ {
	3505	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3506	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3507	+
	3508	+ p.writeObject(copy);
	3509	+
	3510	+ p.flush();
	3511	+
	3512	+ ostream.close();
	3513	+ } catch (Exception e)
	3514	+ {
	3515	+ e.printStackTrace();
	3516	+ }
	3517	+ }
	3518	+ }
	3519	+
	3520	+ void CopyChanged(Object3D obj)
	3521	+ {
	3522	+ boolean temp = CameraPane.SWITCH;
	3523	+ CameraPane.SWITCH = false;
	3524	+
	3525	+ copy.ExtractBigData(hashtable);
	3526	+
	3527	+ copy.clear();
	3528	+
	3529	+ for (int i=0; i<obj.Size(); i++)
	3530	+ {
	3531	+ copy.add(obj.get(i));
	3532	+ }
	3533	+
	3534	+ copy.RestoreBigData(hashtable);
	3535	+
	3536	+ CameraPane.SWITCH = temp;
	3537	+
	3538	+ //assert(hashtable.isEmpty());
	3539	+
	3540	+ copy.Touch();
	3541	+
	3542	+ ResetModel();
	3543	+ copy.HardTouch(); // recompile?
	3544	+
	3545	+ cRadio ab;
	3546	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3547	+ {
	3548	+ ab = (cRadio)e.nextElement();
	3549	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3550	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3551	+ if (test != null)
	3552	+ {
	3553	+ test.editWindow = ab.object.editWindow;
	3554	+ ab.object = test;
	3555	+ }
	3556	+ }
	3557	+
	3558	+ refreshContents();
	3559	+ }
	3560	+
	3561	+ public void Undo()
	3562	+ {
	3563	+ System.err.println("Undo");
	3564	+
	3565	+ cRadio tab = GetCurrentTab();
	3566	+
	3567	+ if (tab.undoindex == 0)
	3568	+ {
	3569	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3570	+ return;
	3571	+ }
	3572	+
	3573	+ if (tab.graphs[tab.undoindex] == null)
	3574	+ {
	3575	+ Save();
	3576	+ tab.undoindex -= 1;
	3577	+ }
	3578	+
	3579	+ tab.undoindex -= 1;
	3580	+
	3581	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3582	+ }
	3583	+
	3584	+ public void Redo()
	3585	+ {
	3586	+ cRadio tab = GetCurrentTab();
	3587	+
	3588	+ if (tab.graphs[tab.undoindex + 1] == null)
	3589	+ {
	3590	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3591	+ return;
	3592	+ }
	3593	+
	3594	+ tab.undoindex += 1;
	3595	+
	3596	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3597	+ }
	3598	+
	3599	+ void ImportGFD()
	3600	+ {
	3601	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3245	3602	browser.show();
3246	3603	String filename = browser.getFile();
3247	3604	if (filename != null && filename.length() > 0)
3248	3605	{
3249		- CameraPane.filename = browser.getDirectory() + filename;
	3606	+ String fullname = browser.getDirectory() + filename;
	3607	+
	3608	+ //Object3D readobj =
	3609	+ objEditor.ReadGFD(fullname, objEditor);
	3610	+ //makeSomething(readobj);
	3611	+ }
	3612	+ }
	3613	+
	3614	+ void ImportVRMLX3D()
	3615	+ {
	3616	+ if (Grafreed.standAlone)
	3617	+ {
	3618	+ /**/
	3619	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3620	+ browser.show();
	3621	+ String filename = browser.getFile();
	3622	+ if (filename != null && filename.length() > 0)
	3623	+ {
	3624	+ String fullname = browser.getDirectory() + filename;
	3625	+ LoadVRMLX3D(fullname);
	3626	+ }
	3627	+ /**/
	3628	+ }
	3629	+ }
	3630	+
	3631	+ void ToggleAnimation()
	3632	+ {
	3633	+ if (!Globals.ANIMATION)
	3634	+ {
	3635	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3636	+ browser.setVisible(true);
	3637	+ String filename = browser.getFile();
	3638	+ if (filename != null && filename.length() > 0)
	3639	+ {
	3640	+ Globals.filename = browser.getDirectory() + filename;
3250	3641	//CameraPane.framecount = 0;
3251		- CameraPane.imagecount = 0;
	3642	+ Globals.imagecount = 0;
3252	3643
3253		- CameraPane.ANIMATION ^= true;
	3644	+ Globals.ANIMATION ^= true;
3254	3645
3255		- GrafreeD.wav.cursor = 0;
3256		- GrafreeD.wav.loop = 0;
	3646	+ Grafreed.wav.cursor = 0;
	3647	+ Grafreed.wav.loop = 0;
3257	3648	}
3258	3649	} else
3259	3650	{
3260		- CameraPane.ANIMATION ^= true;
	3651	+ Globals.ANIMATION ^= true;
3261	3652	}
3262	3653	}
3263	3654
..	..	@@ -3303,7 +3694,7 @@
3303	3694	void CreateMaterial()
3304	3695	{
3305	3696	//copy.ClearMaterial(); // PATCH
3306		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3697	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3307	3698	if (copy.selection.size() > 0)
3308	3699	//SetMaterial(copy);
3309	3700	{
..	..	@@ -3354,7 +3745,7 @@
3354	3745	assert false;
3355	3746	}
3356	3747
3357		- void EditSelection()
	3748	+ void EditSelection(boolean newWindow)
3358	3749	{
3359	3750	}
3360	3751
..	..	@@ -3362,11 +3753,11 @@
3362	3753	{
3363	3754	copy.ResetBlockLoop(); // temporary problem
3364	3755
3365		- boolean random = CameraPane.RANDOM;
3366		- CameraPane.RANDOM = false; // parse everything
	3756	+ boolean random = CameraPane.SWITCH;
	3757	+ CameraPane.SWITCH = false; // parse everything
3367	3758	copy.ResetDisplayList();
3368	3759	copy.HardTouch();
3369		- CameraPane.RANDOM = random;
	3760	+ CameraPane.SWITCH = random;
3370	3761	}
3371	3762
3372	3763	// public void applySelf()
..	..	@@ -3436,10 +3827,40 @@
3436	3827	current.fakedepth = (float) fakedepthField.getFloat();
3437	3828	current.shadowbias = (float) shadowbiasField.getFloat();
3438	3829
3439		- if (!NumberSlider.frozen)
	3830	+ if (!cNumberSlider.frozen)
3440	3831	{
3441	3832	//System.out.println("Propagate = " + propagate);
3442	3833	copy.UpdateMaterial(anchor, current, propagate);
	3834	+
	3835	+ if (copy.material != null)
	3836	+ {
	3837	+ cMaterial mat = copy.material;
	3838	+
	3839	+ colorField.SetToolTipValue((mat.color));
	3840	+ modulationField.SetToolTipValue((mat.modulation));
	3841	+ metalnessField.SetToolTipValue((mat.metalness));
	3842	+ diffuseField.SetToolTipValue((mat.diffuse));
	3843	+ specularField.SetToolTipValue((mat.specular));
	3844	+ shininessField.SetToolTipValue((mat.shininess));
	3845	+ shiftField.SetToolTipValue((mat.shift));
	3846	+ ambientField.SetToolTipValue((mat.ambient));
	3847	+ lightareaField.SetToolTipValue((mat.lightarea));
	3848	+ diffusenessField.SetToolTipValue((mat.factor));
	3849	+ velvetField.SetToolTipValue((mat.velvet));
	3850	+ sheenField.SetToolTipValue((mat.sheen));
	3851	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3852	+ backlitField.SetToolTipValue((mat.bump));
	3853	+ anisoField.SetToolTipValue((mat.aniso));
	3854	+ anisoVField.SetToolTipValue((mat.anisoV));
	3855	+ cameraField.SetToolTipValue((mat.cameralight));
	3856	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3857	+ shadowField.SetToolTipValue((mat.shadow));
	3858	+ textureField.SetToolTipValue((mat.texture));
	3859	+ opacityField.SetToolTipValue((mat.opacity));
	3860	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3861	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3862	+ }
	3863	+
3443	3864	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3444	3865	{
3445	3866	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3484,6 +3905,7 @@
3484	3905	\|\| e.getSource() == apertureField
3485	3906	\|\| e.getSource() == shadowblurField)
3486	3907	{
	3908	+ new Exception().printStackTrace();
3487	3909	System.exit(0);
3488	3910	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3489	3911	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3510,7 +3932,13 @@
3510	3932	//System.out.println("PARENT = " + parent);
3511	3933	//if (parent != null)
3512	3934	// parent.applySelf();
3513		- refreshContents();
	3935	+ if (e.getSource() == normalpushField)
	3936	+ {
	3937	+ objEditor.refreshContents();
	3938	+ //Refresh();
	3939	+ }
	3940	+ else
	3941	+ refreshContents();
3514	3942	// ??? client.refreshEditWindow();
3515	3943	}
3516	3944	//else
..	..	@@ -3522,7 +3950,7 @@
3522	3950	//group.name = nameField.getText();
3523	3951	//objEditor.applySelf();
3524	3952
3525		- assert (objEditor == this);
	3953	+ // OCT2018: assert (objEditor == this);
3526	3954	if (copy.selection == null \|\| copy.selection.size() == 0)
3527	3955	//super.applySelf()
3528	3956	; else
..	..	@@ -3546,12 +3974,18 @@
3546	3974	objEditor.copy = keep;
3547	3975	}
3548	3976	}
	3977	+
	3978	+ if (normalpushField != null)
	3979	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3549	3980	}
3550	3981
3551	3982	void SnapObject()
3552	3983	{
3553		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3554		- SnapObject(obj);
	3984	+ if (copy.selection.size() > 0)
	3985	+ {
	3986	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3987	+ SnapObject(obj);
	3988	+ }
3555	3989	}
3556	3990
3557	3991	void SnapObject(Object3D obj)
..	..	@@ -3797,7 +4231,7 @@
3797	4231
3798	4232	radioPanel.revalidate();
3799	4233	radioPanel.repaint();
3800		- ctrlPanel.revalidate(); // ? new
	4234	+ ctrlPanel.validate(); // ? new
3801	4235	ctrlPanel.repaint();
3802	4236	}
3803	4237	}
..	..	@@ -3806,6 +4240,8 @@
3806	4240
3807	4241	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3808	4242	{
	4243	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4244	+ Save();
3809	4245	//Tween.set(thing, 0).target(1).start(tweenManager);
3810	4246	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3811	4247	// if (thing instanceof GenericJointDemo)
..	..	@@ -3892,6 +4328,12 @@
3892	4328	{
3893	4329	ResetModel();
3894	4330	Select(thing.GetTreePath(), true, false); // unselect... false);
	4331	+
	4332	+ if (thing.Size() == 0)
	4333	+ {
	4334	+ //EditSelection(false);
	4335	+ }
	4336	+
3895	4337	refreshContents();
3896	4338	}
3897	4339
..	..	@@ -4009,6 +4451,7 @@
4009	4451	}
4010	4452	}
4011	4453	}
	4454	+
4012	4455	LoadGFDThread loadGFDThread;
4013	4456
4014	4457	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4028,8 +4471,10 @@
4028	4471
4029	4472	try
4030	4473	{
	4474	+ // Try compressed version first.
4031	4475	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4032		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4476	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4477	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4033	4478
4034	4479	readobj = (Object3D) p.readObject();
4035	4480	istream.close();
..	..	@@ -4037,7 +4482,20 @@
4037	4482	readobj.ResetDisplayList();
4038	4483	} catch (Exception e)
4039	4484	{
4040		- e.printStackTrace();
	4485	+ //e.printStackTrace();
	4486	+ try
	4487	+ {
	4488	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4489	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4490	+
	4491	+ readobj = (Object3D) p.readObject();
	4492	+ istream.close();
	4493	+
	4494	+ readobj.ResetDisplayList();
	4495	+ } catch (Exception e2)
	4496	+ {
	4497	+ e2.printStackTrace();
	4498	+ }
4041	4499	}
4042	4500	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4043	4501	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4083,6 +4541,12 @@
4083	4541
4084	4542	void LoadIt(Object obj)
4085	4543	{
	4544	+ if (obj == null)
	4545	+ {
	4546	+ // Invalid file
	4547	+ return;
	4548	+ }
	4549	+
4086	4550	System.out.println("Loaded " + obj);
4087	4551	//new Exception().printStackTrace();
4088	4552	Object3D readobj = (Object3D) obj;
..	..	@@ -4092,6 +4556,8 @@
4092	4556
4093	4557	if (readobj != null)
4094	4558	{
	4559	+ if (Globals.SAVEONMAKE)
	4560	+ Save();
4095	4561	try
4096	4562	{
4097	4563	//readobj.deepCopySelf(copy);
..	..	@@ -4154,7 +4620,7 @@
4154	4620
4155	4621	void load() // throws ClassNotFoundException
4156	4622	{
4157		- if (GrafreeD.standAlone)
	4623	+ if (Grafreed.standAlone)
4158	4624	{
4159	4625	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4160	4626	browser.show();
..	..	@@ -4241,11 +4707,13 @@
4241	4707	try
4242	4708	{
4243	4709	FileOutputStream ostream = new FileOutputStream(lastname);
4244		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4710	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4711	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4245	4712
4246	4713	p.writeObject(copy);
4247	4714	p.flush();
4248	4715
	4716	+ zstream.close();
4249	4717	ostream.close();
4250	4718
4251	4719	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4255,11 +4723,12 @@
4255	4723	{
4256	4724	}
4257	4725	}
	4726	+
4258	4727	String lastname;
4259	4728
4260	4729	void saveAs()
4261	4730	{
4262		- if (GrafreeD.standAlone)
	4731	+ if (Grafreed.standAlone)
4263	4732	{
4264	4733	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4265	4734	browser.setVisible(true);
..	..	@@ -4364,13 +4833,13 @@
4364	4833	try
4365	4834	{
4366	4835	FileOutputStream ostream = new FileOutputStream(filename);
4367		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4368		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4836	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4837	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4369	4838
4370	4839	Object3D objectparent = obj.parent;
4371	4840	obj.parent = null;
4372	4841
4373		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4842	+ Object3D object = (Object3D) Grafreed.clone(obj);
4374	4843
4375	4844	obj.parent = objectparent;
4376	4845
..	..	@@ -4382,8 +4851,8 @@
4382	4851	p.writeObject(object);
4383	4852	p.flush();
4384	4853
	4854	+ zstream.close();
4385	4855	ostream.close();
4386		- // zstream.close();
4387	4856
4388	4857	// group.selection.get(0).parent = parent;
4389	4858	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4404,7 +4873,7 @@
4404	4873	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4405	4874	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4406	4875	copy.generatePOV(buffer);
4407		- if (GrafreeD.standAlone)
	4876	+ if (Grafreed.standAlone)
4408	4877	{
4409	4878	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4410	4879	browser.show();
..	..	@@ -4430,7 +4899,8 @@
4430	4899	Object3D client;
4431	4900	Object3D copy;
4432	4901	MenuBar menuBar;
4433		- Menu windowMenu;
	4902	+ Menu fileMenu;
	4903	+ MenuItem newItem;
4434	4904	MenuItem loadItem;
4435	4905	MenuItem saveItem;
4436	4906	MenuItem saveAsItem;
..	..	@@ -4438,45 +4908,58 @@
4438	4908	MenuItem reexportItem;
4439	4909	MenuItem povItem;
4440	4910	MenuItem closeItem;
4441		- Menu cameraMenu;
	4911	+
4442	4912	CheckboxMenuItem zBufferItem;
4443	4913	//MenuItem normalLensItem;
4444		- MenuItem editCameraItem;
4445		- MenuItem revertCameraItem;
4446		- CheckboxMenuItem toggleLiveItem;
4447	4914	MenuItem stepItem;
4448		- CheckboxMenuItem toggleFullItem;
	4915	+ CheckboxMenuItem toggleLiveItem;
	4916	+ CheckboxMenuItem toggleFullScreenItem;
	4917	+ CheckboxMenuItem toggleTimelineItem;
4449	4918	CheckboxMenuItem toggleRenderItem;
4450	4919	CheckboxMenuItem toggleDebugItem;
4451	4920	CheckboxMenuItem toggleFrustumItem;
4452	4921	CheckboxMenuItem toggleFootContactItem;
4453	4922	CheckboxMenuItem toggleDLItem;
4454	4923	CheckboxMenuItem toggleTextureItem;
4455		- CheckboxMenuItem toggleRandomItem;
	4924	+ CheckboxMenuItem toggleSwitchItem;
4456	4925	CheckboxMenuItem toggleRootItem;
4457	4926	CheckboxMenuItem animationItem;
4458	4927	CheckboxMenuItem toggleHandleItem;
4459	4928	CheckboxMenuItem togglePaintItem;
4460	4929	JSplitPane mainPanel;
4461	4930	JScrollPane scrollpane;
	4931	+
4462	4932	JPanel toolbarPanel;
4463		- JPanel treePanel;
	4933	+
	4934	+ cGridBag treePanel;
	4935	+
4464	4936	JPanel radioPanel;
4465	4937	ButtonGroup buttonGroup;
4466		- JPanel ctrlPanel;
4467		- JPanel materialPanel;
	4938	+
	4939	+ cGridBag toolboxPanel;
	4940	+ cGridBag materialPanel;
	4941	+ cGridBag ctrlPanel;
	4942	+
4468	4943	JScrollPane infoPanel;
4469		- JPanel optionsPanel;
	4944	+
	4945	+ cGridBag optionsPanel;
	4946	+
4470	4947	JTabbedPane objectPanel;
4471		- JPanel XYZPanel;
	4948	+
	4949	+ cGridBag XYZPanel;
	4950	+
4472	4951	JSplitPane gridPanel;
4473	4952	JSplitPane bigPanel;
4474		- JPanel bigThree;
4475		- JTabbedPane scenePanel;
4476		- JPanel cameraPanel;
	4953	+
	4954	+ cGridBag bigThree;
	4955	+ cGridBag scenePanel;
	4956	+ cGridBag centralPanel;
	4957	+ JSplitPane cameraPanel;
	4958	+ JPanel timelinePanel;
	4959	+ JMenuBar timelineMenubar;
4477	4960	JSplitPane framePanel;
4478	4961	JTextArea/Field/ nameField;
4479		- cButton textureButton;
	4962	+ //cButton textureButton;
4480	4963	cButton okButton;
4481	4964	cButton applyButton;
4482	4965	cButton cancelButton;
..	..	@@ -4523,65 +5006,72 @@
4523	5006	// MATERIAL
4524	5007	JLabel materialLabel;
4525	5008	JLabel colorLabel;
4526		- NumberSlider colorField;
	5009	+ cNumberSlider colorField;
4527	5010	JLabel modulationLabel;
4528		- NumberSlider modulationField;
	5011	+ cNumberSlider modulationField;
4529	5012	JLabel metalnessLabel;
4530		- NumberSlider metalnessField;
	5013	+ cNumberSlider metalnessField;
4531	5014	JLabel diffuseLabel;
4532		- NumberSlider diffuseField;
	5015	+ cNumberSlider diffuseField;
4533	5016	JLabel specularLabel;
4534		- NumberSlider specularField;
	5017	+ cNumberSlider specularField;
4535	5018	JLabel shininessLabel;
4536		- NumberSlider shininessField;
	5019	+ cNumberSlider shininessField;
4537	5020	JLabel shiftLabel;
4538		- NumberSlider shiftField;
	5021	+ cNumberSlider shiftField;
4539	5022	JLabel ambientLabel;
4540		- NumberSlider ambientField;
	5023	+ cNumberSlider ambientField;
4541	5024	JLabel lightareaLabel;
4542		- NumberSlider lightareaField;
	5025	+ cNumberSlider lightareaField;
4543	5026	JLabel diffusenessLabel;
4544		- NumberSlider diffusenessField;
	5027	+ cNumberSlider diffusenessField;
4545	5028	JLabel velvetLabel;
4546		- NumberSlider velvetField;
	5029	+ cNumberSlider velvetField;
4547	5030	JLabel sheenLabel;
4548		- NumberSlider sheenField;
	5031	+ cNumberSlider sheenField;
4549	5032	JLabel subsurfaceLabel;
4550		- NumberSlider subsurfaceField;
	5033	+ cNumberSlider subsurfaceField;
4551	5034	//JLabel bumpLabel;
4552	5035	//NumberSlider bumpField;
4553	5036	JLabel backlitLabel;
4554		- NumberSlider backlitField;
	5037	+ cNumberSlider backlitField;
4555	5038	JLabel anisoLabel;
4556		- NumberSlider anisoField;
	5039	+ cNumberSlider anisoField;
4557	5040	JLabel anisoVLabel;
4558		- NumberSlider anisoVField;
	5041	+ cNumberSlider anisoVField;
4559	5042	JLabel cameraLabel;
4560		- NumberSlider cameraField;
	5043	+ cNumberSlider cameraField;
4561	5044	JLabel selfshadowLabel;
4562		- NumberSlider selfshadowField;
	5045	+ cNumberSlider selfshadowField;
4563	5046	JLabel shadowLabel;
4564		- NumberSlider shadowField;
	5047	+ cNumberSlider shadowField;
4565	5048	JLabel textureLabel;
4566		- NumberSlider textureField;
	5049	+ cNumberSlider textureField;
4567	5050	JLabel opacityLabel;
4568		- NumberSlider opacityField;
	5051	+ cNumberSlider opacityField;
4569	5052	JLabel fakedepthLabel;
4570		- NumberSlider fakedepthField;
	5053	+ cNumberSlider fakedepthField;
4571	5054	JLabel shadowbiasLabel;
4572		- NumberSlider shadowbiasField;
	5055	+ cNumberSlider shadowbiasField;
4573	5056	JLabel bumpLabel;
4574		- NumberSlider bumpField;
	5057	+ cNumberSlider bumpField;
4575	5058	JLabel noiseLabel;
4576		- NumberSlider noiseField;
	5059	+ cNumberSlider noiseField;
4577	5060	JLabel powerLabel;
4578		- NumberSlider powerField;
	5061	+ cNumberSlider powerField;
4579	5062	JLabel borderfadeLabel;
4580		- NumberSlider borderfadeField;
	5063	+ cNumberSlider borderfadeField;
4581	5064	JLabel fogLabel;
4582		- NumberSlider fogField;
	5065	+ cNumberSlider fogField;
4583	5066	JLabel opacityPowerLabel;
4584		- NumberSlider opacityPowerField;
4585		- JTree jTree;
	5067	+ cNumberSlider opacityPowerField;
	5068	+ cTree jTree;
4586	5069	//ObjectUI parent;
	5070	+
	5071	+ cNumberSlider normalpushField;
	5072	+
	5073	+ private MenuItem importGFDItem;
	5074	+ private MenuItem importVRMLX3DItem;
	5075	+ private MenuItem import3DSItem;
	5076	+ private MenuItem importOBJItem;
4587	5077	}