~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -28,7 +34,73 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ boolean timeline;
	38	+ boolean wasFullScreen;
31	39
	40	+ GroupEditor callee;
	41	+ JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
	103	+
32	104	// SCRIPT
33	105
34	106	transient JFrame textpanel = null;
..	..	@@ -119,51 +191,62 @@
119	191	void keyPressed(int key, int modifiers)
120	192	{
121	193	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	194	+ Globals.theRenderer.keyPressed(key, modifiers);
123	195	}
124	196	*/
125	197
126	198	static GridBagConstraints aConstraints;
127	199	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	200	+
130	201	static int GRIDWIDTH = 100; // 4;
131	202
132	203	public void closeUI()
133	204	{
134	205	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
137	208	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
139	210
140		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
141	214	return;
142	215
143		- objEditor.ctrlPanel.remove(liveCB);
144		- objEditor.ctrlPanel.remove(hideCB);
145		- objEditor.ctrlPanel.remove(markCB);
146		-
147		- objEditor.ctrlPanel.remove(randomCB);
148		- objEditor.ctrlPanel.remove(speedupCB);
149		- objEditor.ctrlPanel.remove(rewindCB);
150		-
151		- objEditor.ctrlPanel.remove(resetButton);
152		- objEditor.ctrlPanel.remove(stepButton);
153		-// objEditor.ctrlPanel.remove(stepAllButton);
154		-// objEditor.ctrlPanel.remove(resetAllButton);
155		- objEditor.ctrlPanel.remove(link2masterCB);
156		- //objEditor.ctrlPanel.remove(flipVCB);
157		- //objEditor.ctrlPanel.remove(texresMenu);
158		- objEditor.ctrlPanel.remove(slowerButton);
159		- objEditor.ctrlPanel.remove(fasterButton);
160		- objEditor.ctrlPanel.remove(remarkButton);
	216	+// objEditor.ctrlPanel.remove(liveCB);
	217	+// objEditor.ctrlPanel.remove(hideCB);
	218	+// objEditor.ctrlPanel.remove(markCB);
	219	+//
	220	+// objEditor.ctrlPanel.remove(randomCB);
	221	+// objEditor.ctrlPanel.remove(speedupCB);
	222	+// objEditor.ctrlPanel.remove(rewindCB);
	223	+//
	224	+// objEditor.ctrlPanel.remove(resetButton);
	225	+// objEditor.ctrlPanel.remove(stepButton);
	226	+//// objEditor.ctrlPanel.remove(stepAllButton);
	227	+//// objEditor.ctrlPanel.remove(resetAllButton);
	228	+// objEditor.ctrlPanel.remove(link2masterCB);
	229	+// //objEditor.ctrlPanel.remove(flipVCB);
	230	+// //objEditor.ctrlPanel.remove(texresMenu);
	231	+// objEditor.ctrlPanel.remove(slowerButton);
	232	+// objEditor.ctrlPanel.remove(fasterButton);
	233	+// objEditor.ctrlPanel.remove(remarkButton);
	234	+
	235	+ objEditor.ctrlPanel.remove(setupPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	238	+ objEditor.ctrlPanel.remove(pushPanel);
	239	+ //objEditor.ctrlPanel.remove(fillPanel);
	240	+
	241	+ //Remove(normalpushField);
161	242	}
162	243
163	244	public ObjEditor GetEditor()
164	245	{
165	246	return objEditor; //.GetEditor();
166	247	}
	248	+
	249	+ // Sometimes myself, sometimes my callee's.
167	250	ObjEditor objEditor;
168	251
169	252	/*
..	..	@@ -226,6 +309,7 @@
226	309	//localCopy.parent = null;
227	310
228	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
229	313	objEditor = this;
230	314	this.callee = callee;
231	315
..	..	@@ -238,7 +322,7 @@
238	322	//if (!isDisplayable())
239	323	//setUndecorated(true);
240	324
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	325	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	326	client = inClient;
243	327	copy = localCopy;
244	328	copy.editWindow = this;
..	..	@@ -256,27 +340,48 @@
256	340	return frame.action(event, obj);
257	341	}
258	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
259	348	void SetupMenu()
260	349	{
261	350	frame.setMenuBar(menuBar = new MenuBar());
262		- menuBar.add(windowMenu = new Menu("File"));
263		- windowMenu.add(loadItem = new MenuItem("Load..."));
264		- windowMenu.add("-");
265		- windowMenu.add(saveItem = new MenuItem("Save"));
266		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
268		- windowMenu.add("-");
269		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
270		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
271		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
272	376	if (client.parent != null)
273	377	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	379	} else
276	380	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	382	}
279	383
	384	+ newItem.addActionListener(this);
280	385	loadItem.addActionListener(this);
281	386	saveItem.addActionListener(this);
282	387	saveAsItem.addActionListener(this);
..	..	@@ -285,79 +390,66 @@
285	390	//povItem.addActionListener(this);
286	391	closeItem.addActionListener(this);
287	392
288		- menuBar.add(cameraMenu = new Menu("View"));
289		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
290		- //zBufferItem.addActionListener(this);
291		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
292		- //normalLensItem.addActionListener(this);
293		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294		- revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
298		- cameraMenu.add("-");
299		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300		- toggleTextureItem.addItemListener(this);
301		- toggleTextureItem.setState(CameraPane.textureon);
302		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303		- toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
305		- cameraMenu.add(stepItem = new MenuItem("Step"));
306		- stepItem.addActionListener(this);
307		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
308		-// toggleDLItem.addItemListener(this);
309		-// toggleDLItem.setState(false);
310		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
311		- toggleRenderItem.addItemListener(this);
312		- toggleRenderItem.setState(!CameraPane.frozen);
313		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
314		- toggleDebugItem.addItemListener(this);
315		- toggleDebugItem.setState(CameraPane.DEBUG);
316		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
317		- toggleFrustumItem.addItemListener(this);
318		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
319		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
320		- toggleFootContactItem.addItemListener(this);
321		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
322		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
323		- toggleRandomItem.addItemListener(this);
324		- toggleRandomItem.setState(CameraPane.RANDOM);
325		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
326		- toggleHandleItem.addItemListener(this);
327		- toggleHandleItem.setState(CameraPane.HANDLES);
328		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
329		- togglePaintItem.addItemListener(this);
330		- togglePaintItem.setState(CameraPane.PAINTMODE);
331		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
332		-// toggleRootItem.addItemListener(this);
333		-// toggleRootItem.setState(false);
334		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
335		-// animationItem.addItemListener(this);
336		-// animationItem.setState(CameraPane.ANIMATION);
337		- cameraMenu.add("-");
338		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
339		- editCameraItem.addActionListener(this);
340		-
341	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
342	420	toolbarPanel = new JPanel();
343	421	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
345	423	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
	428	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
	437	+ materialPanel = new cGridBag().setVertical(true);
349	438	materialPanel.setName("Material");
	439	+
350	440	/JTextPane/
351	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
352	444	infoarea.setEditable(true);
353	445	SetText();
354	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	447	// infoarea.setOpaque(false);
356	448	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ //infoPanel.setPreferredSize(new Dimension(50, 200));
361	453	infoPanel.setName("Info");
362	454	//infoPanel.setLayout(new BorderLayout());
363	455	//infoPanel.add(createTextPane());
..	..	@@ -366,16 +458,23 @@
366	458	mainPanel.setName("Main");
367	459	mainPanel.setContinuousLayout(true);
368	460	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	461	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
372		-
	462	+ mainPanel.setDividerLocation(0.5); //1.0);
	463	+ mainPanel.setResizeWeight(0.5);
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
373	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	473	//mainPanel.setLayout(new GridBagLayout());
375	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
	477	+ //materialPanel.setLayout(new GridBagLayout());
379	478
380	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	480	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +513,7 @@
414	513	static String newline = "\n";
415	514	protected static final String buttonString = "JButton";
416	515	StyledDocument doc;
417		- JTextArea infoarea;
	516	+ JTextPane infoarea;
418	517
419	518	void ClearInfo()
420	519	{
..	..	@@ -437,10 +536,10 @@
437	536	e.printStackTrace();
438	537	}
439	538
440		- String selection = infoarea.getText();
441		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
442		- java.awt.datatransfer.Clipboard clipboard =
443		- Toolkit.getDefaultToolkit().getSystemClipboard();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	543	//clipboard.setContents(data, data);
445	544	}
446	545
..	..	@@ -463,13 +562,13 @@
463	562	//SendInfo("Name:", "bold");
464	563	if (sel.GetTextures() != null \|\| debug)
465	564	{
466		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	567	if (sel.Size() > 0)
469	568	{
470	569	si.SendInfo("#children = " + sel.Size(), "regular");
471	570	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	572	if (debug)
474	573	{
475	574	try
..	..	@@ -481,7 +580,10 @@
481	580	}
482	581
483	582	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
485	587
486	588	if (sel.bRep != null)
487	589	{
..	..	@@ -508,7 +610,7 @@
508	610	}
509	611	if (sel.support != null)
510	612	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	614	}
513	615	if (sel.scriptnode != null)
514	616	{
..	..	@@ -522,18 +624,18 @@
522	624	maxima.y = sel.toParent[3][1];
523	625	maxima.z = sel.toParent[3][2];
524	626	si.SendInfo(" Orig: " + maxima, "regular");
525		- maxima.x = sel.globalTransform[3][0];
526		- maxima.y = sel.globalTransform[3][1];
527		- maxima.z = sel.globalTransform[3][2];
528		- if (full)
529		- si.SendInfo(" Global Orig: " + maxima, "regular");
530	627	maxima.x = sel.toParent[0][0];
531	628	maxima.y = sel.toParent[1][1];
532	629	maxima.z = sel.toParent[2][2];
533	630	si.SendInfo(" Scale: " + maxima, "regular");
534		- maxima.x = sel.globalTransform[0][0];
535		- maxima.y = sel.globalTransform[1][1];
536		- maxima.z = sel.globalTransform[2][2];
	631	+ maxima.x = sel.globalTransform[3][0];
	632	+ maxima.y = sel.globalTransform[3][1];
	633	+ maxima.z = sel.globalTransform[3][2];
	634	+ if (full)
	635	+ si.SendInfo(" Global Orig: " + maxima, "regular");
	636	+ maxima.x = sel.globalTransform[0][0];
	637	+ maxima.y = sel.globalTransform[1][1];
	638	+ maxima.z = sel.globalTransform[2][2];
537	639	if (full)
538	640	si.SendInfo(" Global Scale: " + maxima, "regular");
539	641	}
..	..	@@ -579,6 +681,9 @@
579	681	{
580	682	CameraPane.pointflow = (PointFlow) sel;
581	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
582	687	}
583	688	}
584	689
..	..	@@ -594,52 +699,169 @@
594	699	}
595	700	}
596	701
597		- private JTextArea createTextPane()
598		- {
599		- String[] initString =
600		- {
601		- "This is an editable JTextPane, ", //regular
602		- "another ", //italic
603		- "styled ", //bold
604		- "text ", //small
605		- "component, ", //large
606		- "which supports embedded components..." + newline,//regular
607		- " " + newline, //button
608		- "...and embedded icons..." + newline, //regular
609		- " ", //icon
610		- newline + "JTextPane is a subclass of JEditorPane that "
611		- + "uses a StyledEditorKit and StyledDocument, and provides "
612		- + "cover methods for interacting with those objects."
613		- };
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	704
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
621	720
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	721	+ void Minimize()
628	722	{
629		- for (int j = 0; j < 2; j++)
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
	725	+ }
	726	+
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	730	+ void Maximize()
	731	+ {
	732	+ if (CameraPane.FULLSCREEN)
630	733	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	734	+ ToggleFullScreen();
636	735	}
637		- } catch (BadLocationException ble)
	736	+
	737	+ if (maximized)
	738	+ {
	739	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	740	+ }
	741	+ else
	742	+ {
	743	+ keeprect = frame.getBounds();
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	747	+// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	749	+ }
	750	+
	751	+ maximized ^= true;
	752	+
	753	+ frame.validate();
	754	+ }
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
	759	+
	760	+ void ToggleFullScreen()
638	761	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
	767	+ {
	768	+ device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
	774	+ //frame.setVisible(false);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(false);
	777	+// frame.addNotify();
	778	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	779	+
	780	+// X frame.getContentPane().remove(/"Center",/bigThree);
	781	+// X framePanel.add(bigThree);
	782	+// X frame.getContentPane().add(/"Center",/framePanel);
	783	+ framePanel.setDividerLocation(1);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
	791	+ } else
	792	+ {
	793	+ keepButton = radio.layout;
	794	+ //keeprect = frame.getBounds();
	795	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	796	+// frame.getToolkit().getScreenSize().height);
	797	+ //frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
	801	+ device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
	804	+// frame.removeNotify();
	805	+// frame.setUndecorated(true);
	806	+// frame.addNotify();
	807	+// X frame.getContentPane().remove(/"Center",/framePanel);
	808	+// X framePanel.remove(bigThree);
	809	+// X frame.getContentPane().add(/"Center",/bigThree);
	810	+ framePanel.setDividerLocation(0);
	811	+
	812	+ radio.layout = fullscreenLayout;
	813	+ radio.layout.doClick();
	814	+ //frame.setVisible(true);
	815	+ }
	816	+ frame.validate();
640	817	}
641	818
642		- return new JTextArea(); // textPane;
	819	+ private JTextPane createTextPane()
	820	+ {
	821	+// TEXTAREA String[] initString =
	822	+// {
	823	+// "This is an editable JTextPane, ", //regular
	824	+// "another ", //italic
	825	+// "styled ", //bold
	826	+// "text ", //small
	827	+// "component, ", //large
	828	+// "which supports embedded components..." + newline,//regular
	829	+// " " + newline, //button
	830	+// "...and embedded icons..." + newline, //regular
	831	+// " ", //icon
	832	+// newline + "JTextPane is a subclass of JEditorPane that "
	833	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	834	+// + "cover methods for interacting with those objects."
	835	+// };
	836	+//
	837	+// String[] initStyles =
	838	+// {
	839	+// "regular", "italic", "bold", "small", "large",
	840	+// "regular", "button", "regular", "icon",
	841	+// "regular"
	842	+// };
	843	+//
	844	+// JTextPane textPane = new JTextPane();
	845	+// textPane.setEditable(true);
	846	+// /StyledDocument/ doc = textPane.getStyledDocument();
	847	+// addStylesToDocument(doc);
	848	+//
	849	+// try
	850	+// {
	851	+// for (int j = 0; j < 2; j++)
	852	+// {
	853	+// for (int i = 0; i < initString.length; i++)
	854	+// {
	855	+// doc.insertString(doc.getLength(), initString[i],
	856	+// doc.getStyle(initStyles[i]));
	857	+// }
	858	+// }
	859	+// } catch (BadLocationException ble)
	860	+// {
	861	+// System.err.println("Couldn't insert initial text into text pane.");
	862	+// }
	863	+
	864	+ return new JTextPane(); // textPane;
643	865	}
644	866
645	867	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +914,7 @@
692	914	protected static ImageIcon createImageIcon(String path,
693	915	String description)
694	916	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	917	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	918	if (imgURL != null)
697	919	{
698	920	return new ImageIcon(imgURL, description);
..	..	@@ -724,6 +946,7 @@
724	946	// NumberSlider vDivsField;
725	947	// JCheckBox endcaps;
726	948	JCheckBox liveCB;
	949	+ JCheckBox selectCB;
727	950	JCheckBox hideCB;
728	951	JCheckBox link2masterCB;
729	952	JCheckBox markCB;
..	..	@@ -731,7 +954,12 @@
731	954	JCheckBox speedupCB;
732	955	JCheckBox rewindCB;
733	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
734	961	JComboBox texresMenu;
	962	+
735	963	JButton resetButton;
736	964	JButton stepButton;
737	965	JButton stepAllButton;
..	..	@@ -739,115 +967,87 @@
739	967	JButton slowerButton;
740	968	JButton fasterButton;
741	969	JButton remarkButton;
	970	+
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
	974	+ cGridBag namePanel;
	975	+ cGridBag setupPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
	978	+ cGridBag pushPanel;
	979	+ cGridBag fillPanel;
742	980
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	981	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	982	{
745	983	JCheckBox cb;
746	984
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);
	985	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	986	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	987
757	988	return cb;
758	989	}
759	990
760		- cButton AddButton(ObjEditor oe, String label)
	991	+ cButton AddButton(cGridBag panel, String label)
761	992	{
762	993	cButton cb;
763	994
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);
	995	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	996	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	997
774	998	return cb;
775	999	}
776	1000
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1001	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	1002	{
779	1003	JComboBox combo;
780	1004
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;
	1005	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	1006	combo.addActionListener(this);
785	1007
786	1008	return combo;
787	1009	}
788	1010
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1011	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	1012	{
791		- NumberSlider combo;
	1013	+ cGridBag control = new cGridBag();
	1014	+
	1015	+ cNumberSlider combo;
792	1016
793	1017	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	1018	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		-
	1019	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1020	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	1021	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	1022	+
	1023	+ panel.add(control);
	1024	+
	1025	+ return control;
813	1026	}
814	1027
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1028	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	1029	{
817		- NumberSlider combo;
	1030	+ cGridBag control = new cGridBag();
	1031	+
	1032	+ cNumberSlider combo;
818	1033
819	1034	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1035	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		-
	1036	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1037	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1038	combo.setInteger(current);
833	1039
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1040	+ panel.add(control);
	1041	+
	1042	+ return control;
839	1043	}
840	1044
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1045	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1046	{
843	1047	JTextArea text;
844	1048
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1049	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1050	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1051
852	1052	return text;
853	1053	}
..	..	@@ -877,9 +1077,16 @@
877	1077	objEditor.ctrlPanel.remove(j);
878	1078	}
879	1079
	1080	+ void Remove(cNumberSlider j)
	1081	+ {
	1082	+ j.removeChangeListener(this);
	1083	+ //objEditor.ctrlPanel.remove(j.label);
	1084	+ objEditor.ctrlPanel.remove(j);
	1085	+ }
	1086	+
880	1087	/*
881	1088	*/
882		- void Return() // ObjEditor oe)
	1089	+ void Return0() // ObjEditor oe)
883	1090	{
884	1091	aConstraints.gridy += 1;
885	1092	aConstraints.gridx = 0;
..	..	@@ -934,35 +1141,77 @@
934	1141
935	1142	void SetupUI2(ObjEditor oe)
936	1143	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1144	+ //SetupName(oe);
942	1145
943		- if (!GroupEditor.allparams)
	1146	+ namePanel = new cGridBag();
	1147	+
	1148	+ nameField = AddText(namePanel, copy.GetName());
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1150	+ oe.ctrlPanel.add(namePanel);
	1151	+
	1152	+ oe.ctrlPanel.Return();
	1153	+
	1154	+ if (!allparams)
944	1155	return;
945	1156
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1157	+ setupPanel = new cGridBag().setVertical(false);
	1158	+
	1159	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1160	+ liveCB.setToolTipText("Animate object");
	1161	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1162	+ selectCB.setToolTipText("Make object selectable");
949	1163	// 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");
	1164	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1165	+ hideCB.setToolTipText("Hide object");
	1166	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1167	+ markCB.setToolTipText("As animation target transform");
	1168	+
	1169	+ setupPanel2 = new cGridBag().setVertical(false);
	1170	+
	1171	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1172	+ rewindCB.setToolTipText("Rewind animation");
	1173	+
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1176	+
	1177	+ if (Globals.ADVANCED)
	1178	+ {
	1179	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1180	+ link2masterCB.setToolTipText("Attach to support");
	1181	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1182	+ speedupCB.setToolTipText("Option motion capture");
	1183	+ }
	1184	+
	1185	+ oe.ctrlPanel.add(setupPanel);
	1186	+ oe.ctrlPanel.Return();
	1187	+ oe.ctrlPanel.add(setupPanel2);
	1188	+ oe.ctrlPanel.Return();
	1189	+
	1190	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1191	+
	1192	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1193	+ resetButton.setToolTipText("Jump to frame zero");
	1194	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1195	+ stepButton.setToolTipText("Step one frame");
956	1196	// resetAllButton = AddButton(oe, "Reset All");
957	1197	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1198	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1199	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1200	+ slowerButton.setToolTipText("Decrease animation speed");
	1201	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1202	+ fasterButton.setToolTipText("Increase animation speed");
	1203	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1204	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1205
964		- Return();
	1206	+ oe.ctrlPanel.add(objectCommandsPanel);
	1207	+ oe.ctrlPanel.Return();
965	1208
	1209	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1210	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1211	+ //Return();
	1212	+
	1213	+ oe.ctrlPanel.Return();
	1214	+
966	1215	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1216	// ObjEditor.aConstraints.gridx += 1;
968	1217
..	..	@@ -1056,7 +1305,7 @@
1056	1305	oe.aConstraints.gridwidth = 1;
1057	1306	/**/
1058	1307	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1308	+ oe.ctrlPanel.Return();
1060	1309
1061	1310	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1311	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1407,28 @@
1158	1407	//JPanel worldPanel =
1159	1408	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1409	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1410	+ centralPanel = new cGridBag();
	1411	+ centralPanel.preferredWidth = 20;
	1412	+
	1413	+ if (Globals.ADVANCED)
	1414	+ {
	1415	+ timelinePanel = new JPanel(new BorderLayout());
	1416	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1417
	1418	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1419	+ cameraPanel.setContinuousLayout(true);
	1420	+ cameraPanel.setOneTouchExpandable(true);
	1421	+// cameraPanel.setDividerLocation(0.9);
	1422	+// cameraPanel.setDividerSize(9);
	1423	+ cameraPanel.setResizeWeight(1.0);
	1424	+
	1425	+ }
	1426	+
	1427	+ centralPanel.add(cameraView);
	1428	+ centralPanel.setFocusable(true);
	1429	+ //frame.setJMenuBar(timelineMenubar);
	1430	+ //centralPanel.add(timelinePanel);
	1431	+
1165	1432	//topView.camera = ;
1166	1433	//frontView.camera = new Camera(2);
1167	1434	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1444,13 @@
1177	1444	//frontView.object = copy;
1178	1445	//sideView.object = copy;
1179	1446
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1447	+ XYZPanel = new cGridBag().setVertical(true);
	1448	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1449
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1450	+ XYZPanel.preferredWidth = 5;
	1451	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1452	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1453	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1186	1454
1187	1455	/*
1188	1456	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1459,7 @@
1191	1459	gridPanel.add(cameraView);
1192	1460	gridPanel.add(XYZPanel);
1193	1461	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1462	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1463	gridPanel.setContinuousLayout(true);
1196	1464	gridPanel.setOneTouchExpandable(true);
1197	1465	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,11 +1488,13 @@
1220	1488	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1489	//tmp.setName("Edit");
1222	1490	objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- objectPanel.add(north);
	1491	+// JPanel north = new JPanel(new BorderLayout());
	1492	+// north.setName("Edit");
	1493	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1494	+// objectPanel.add(north);
	1495	+ objectPanel.add(editPanel);
1227	1496	objectPanel.add(infoPanel);
	1497	+ objectPanel.add(toolboxPanel);
1228	1498
1229	1499	/*
1230	1500	aConstraints.gridx = 0;
..	..	@@ -1233,7 +1503,7 @@
1233	1503	aConstraints.gridy += 1;
1234	1504	aConstraints.gridwidth = 1;
1235	1505	mainPanel.add(objectPanel, aConstraints);
1236		- */
	1506	+ */
1237	1507
1238	1508	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1239	1509	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1244,16 +1514,23 @@
1244	1514	scrollpane.setWheelScrollingEnabled(true);
1245	1515	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1516
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1517	+ /JTabbedPane/ scenePanel = new cGridBag();
	1518	+ scenePanel.preferredWidth = 6;
	1519	+
	1520	+ JTabbedPane tabbedPane = new JTabbedPane();
	1521	+ tabbedPane.add(scrollpane);
1249	1522
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1523	+ optionsPanel = new cGridBag().setVertical(false);
1253	1524
1254	1525	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1526	+
	1527	+ AddOptions(optionsPanel); //, aConstraints);
	1528	+
	1529	+ tabbedPane.add(optionsPanel);
	1530	+
	1531	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1532
	1533	+ scenePanel.add(tabbedPane);
1257	1534
1258	1535	/*
1259	1536	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1552,7 @@
1275	1552	jtp.add(tree);
1276	1553	*/
1277	1554
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1555	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1556	bigPanel.setContinuousLayout(true);
1280	1557	bigPanel.setOneTouchExpandable(true);
1281	1558	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1564,7 @@
1287	1564	//bigPanel.setSize(new Dimension(10,10));
1288	1565	//bigPanel.add(ctrlPanel);
1289	1566	//bigPanel.add(gridPanel);
	1567	+ /**
1290	1568	bigThree = new JPanel();
1291	1569	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1570	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1575,26 @@
1297	1575	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1576	aWindowConstraints.weightx = 0;
1299	1577	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1578	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1579	aWindowConstraints.weightx = 1;
1302	1580	aWindowConstraints.gridwidth = 3;
1303	1581	// aConstraints.gridheight = 3;
1304	1582	aWindowConstraints.gridx = 1;
1305	1583	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1584	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1585	aWindowConstraints.weightx = 0;
1308	1586	aWindowConstraints.gridx = 4;
1309	1587	aWindowConstraints.gridwidth = 1;
1310	1588	// aConstraints.gridheight = 3;
1311	1589	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1590	bigThree.add(XYZPanel, aWindowConstraints);
	1591	+ /**/
1313	1592
	1593	+ bigThree = new cGridBag();
	1594	+ bigThree.addComponent(scenePanel);
	1595	+ bigThree.addComponent(centralPanel);
	1596	+ bigThree.addComponent(XYZPanel);
	1597	+
1314	1598	// // SIDE EFFECT!!!
1315	1599	// aConstraints.gridx = 0;
1316	1600	// aConstraints.gridy = 0;
..	..	@@ -1331,15 +1615,21 @@
1331	1615	//worldPane.add(bigPanel);
1332	1616	//worldPane.add(worldPanel);
1333	1617	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1618	+ //frame.getContentPane().add(/"Center",/framePanel);
	1619	+ frame.add(/"Center",/framePanel);
1335	1620	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1621
1337	1622	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1623
1339		- frame.setSize(1024, 768);
1340		- frame.show();
1341		-
	1624	+ frame.setSize(1280, 860);
	1625	+
	1626	+ cameraView.requestFocusInWindow();
	1627	+
1342	1628	gridPanel.setDividerLocation(1.0);
	1629	+
	1630	+ frame.validate();
	1631	+
	1632	+ frame.setVisible(true);
1343	1633
1344	1634	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1345	1635	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1352,6 +1642,10 @@
1352	1642	});
1353	1643	}
1354	1644
	1645	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1646	+ {
	1647	+ }
	1648	+
1355	1649	JTree GetTree()
1356	1650	{
1357	1651	return objEditor.jTree;
..	..	@@ -1363,260 +1657,161 @@
1363	1657	ctrlPanel.removeAll();
1364	1658	}
1365	1659
1366		- void SetupMaterial(JPanel ctrlPanel)
	1660	+ void SetupMaterial(cGridBag panel)
1367	1661	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1662	+ /*
1371	1663	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1664	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1665	*/
1376	1666
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	1667	+ cGridBag editBar = new cGridBag().setVertical(false);
	1668	+
	1669	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1670	+ createMaterialButton.setToolTipText("Create material");
1382	1671
1383	1672	/*
1384	1673	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1674	*/
1389	1675
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	1676	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1677	+ clearMaterialButton.setToolTipText("Clear material");
	1678	+
	1679	+ if (Globals.ADVANCED)
	1680	+ {
	1681	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1682	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1683	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1684	+ }
1392	1685
1393		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394		-
1395		- aConstraints.gridx += 1;
1396		-
1397		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398		-
1399		- aConstraints.gridx += 1;
1400		-
1401		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402		-
1403		- aConstraints.gridx = 0;
1404		- aConstraints.gridy += 1;
1405		- aConstraints.weighty = 0;
1406		- aConstraints.gridwidth = 1;
	1686	+ editBar.preferredHeight = 15;
	1687	+
	1688	+ panel.add(editBar);
	1689	+
1407	1690	/**/
1408	1691	//aConstraints.weighty = 0;
1409	1692	////aConstraints.weightx = 1;
1410	1693	//aConstraints.weighty = 1;
1411	1694	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1695	//aConstraints.gridx += 1;
1413		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414		- aConstraints.weighty = 0;
1415		- aConstraints.gridx = 0;
1416		- aConstraints.gridy += 1;
1417		- aConstraints.gridwidth = 1;
	1696	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1697
1419		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424		- //aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426		- aConstraints.gridx = 0;
1427		- aConstraints.gridy += 1;
1428		- aConstraints.gridwidth = 1;
	1698	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1699	+
	1700	+ cGridBag color = new cGridBag();
	1701	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1702	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1703	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1704	+ //colorField.preferredWidth = 200;
	1705	+ colorSection.add(color);
1429	1706
1430		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433		- aConstraints.gridx += 1;
1434		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436		- aConstraints.gridx = 0;
1437		- aConstraints.gridy += 1;
1438		- aConstraints.gridwidth = 1;
	1707	+ cGridBag modulation = new cGridBag();
	1708	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1709	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1710	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1711	+ colorSection.add(modulation);
1439	1712
1440		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443		- aConstraints.gridx += 1;
1444		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	1713	+ cGridBag texture = new cGridBag();
	1714	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1715	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1716	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1717	+ colorSection.add(texture);
1449	1718
1450		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- aConstraints.gridwidth = 1;
	1719	+ panel.add(new JSeparator());
	1720	+
	1721	+ panel.add(colorSection);
	1722	+
	1723	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1724	+
	1725	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1726	+
	1727	+ cGridBag diffuse = new cGridBag();
	1728	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1729	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1730	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1731	+ diffuseSection.add(diffuse);
1459	1732
1460		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.gridwidth = 1;
	1733	+ cGridBag diffuseness = new cGridBag();
	1734	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1735	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1736	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1737	+ diffuseSection.add(diffuseness);
1469	1738
1470		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473		- aConstraints.gridx += 1;
1474		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476		- aConstraints.gridx = 0;
1477		- aConstraints.gridy += 1;
1478		- aConstraints.gridwidth = 1;
	1739	+ cGridBag selfshadow = new cGridBag();
	1740	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1741	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1742	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1743	+ diffuseSection.add(selfshadow);
1479	1744
1480		- //aConstraints.weighty = 1;
1481		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482		- //aConstraints.gridx += 1;
1483		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484		- aConstraints.weighty = 0;
1485		- aConstraints.gridx = 0;
1486		- aConstraints.gridy += 1;
1487		- aConstraints.gridwidth = 1;
	1745	+ cGridBag sheen = new cGridBag();
	1746	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1747	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1748	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1749	+ diffuseSection.add(sheen);
1488	1750
1489		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492		- aConstraints.gridx += 1;
1493		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495		- aConstraints.gridx = 0;
1496		- aConstraints.gridy += 1;
1497		- aConstraints.gridwidth = 1;
	1751	+ cGridBag subsurface = new cGridBag();
	1752	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1753	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1754	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1755	+ diffuseSection.add(subsurface);
1498	1756
1499		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502		- aConstraints.gridx += 1;
1503		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505		- aConstraints.gridx = 0;
1506		- aConstraints.gridy += 1;
1507		- aConstraints.gridwidth = 1;
	1757	+ cGridBag shadow = new cGridBag();
	1758	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1759	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1760	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1761	+ diffuseSection.add(shadow);
1508	1762
1509		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512		- aConstraints.gridx += 1;
1513		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515		- aConstraints.gridx = 0;
1516		- aConstraints.gridy += 1;
1517		- aConstraints.gridwidth = 1;
	1763	+ cGridBag fakedepth = new cGridBag();
	1764	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1765	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1766	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1767	+ diffuseSection.add(fakedepth);
1518	1768
1519		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522		- aConstraints.gridx += 1;
1523		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525		- aConstraints.gridx = 0;
1526		- aConstraints.gridy += 1;
1527		- aConstraints.gridwidth = 1;
	1769	+ cGridBag shadowbias = new cGridBag();
	1770	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1771	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1772	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1773	+ diffuseSection.add(shadowbias);
1528	1774
1529		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532		- aConstraints.gridx += 1;
1533		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535		- aConstraints.gridx = 0;
1536		- aConstraints.gridy += 1;
1537		- aConstraints.gridwidth = 1;
	1775	+ panel.add(new JSeparator());
	1776	+
	1777	+ panel.add(diffuseSection);
	1778	+
	1779	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1780	+
	1781	+ cGridBag specularSection = new cGridBag().setVertical(true);
1538	1782
1539		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542		- aConstraints.gridx += 1;
1543		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545		- aConstraints.gridx = 0;
1546		- aConstraints.gridy += 1;
1547		- aConstraints.gridwidth = 1;
	1783	+ cGridBag specular = new cGridBag();
	1784	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1785	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1786	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1787	+ specularSection.add(specular);
1548	1788
1549		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552		- aConstraints.gridx += 1;
1553		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555		- aConstraints.gridx = 0;
1556		- aConstraints.gridy += 1;
1557		- aConstraints.gridwidth = 1;
	1789	+ cGridBag lightarea = new cGridBag();
	1790	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1791	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1792	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1793	+ specularSection.add(lightarea);
1558	1794
1559		- //aConstraints.weighty = 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561		- //aConstraints.gridx += 1;
1562		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563		- aConstraints.weighty = 0;
1564		- aConstraints.gridx = 0;
1565		- aConstraints.gridy += 1;
1566		- aConstraints.gridwidth = 1;
	1795	+ cGridBag shininess = new cGridBag();
	1796	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1797	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1798	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1799	+ specularSection.add(shininess);
1567	1800
1568		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571		- aConstraints.gridx += 1;
1572		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574		- aConstraints.gridx = 0;
1575		- aConstraints.gridy += 1;
1576		- aConstraints.gridwidth = 1;
	1801	+ cGridBag metalness = new cGridBag();
	1802	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1803	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1804	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1805	+ specularSection.add(metalness);
1577	1806
1578		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581		- aConstraints.gridx += 1;
1582		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584		- aConstraints.gridx = 0;
1585		- aConstraints.gridy += 1;
1586		- aConstraints.gridwidth = 1;
	1807	+ cGridBag velvet = new cGridBag();
	1808	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1809	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1810	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1811	+ specularSection.add(velvet);
1587	1812
1588		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591		- aConstraints.gridx += 1;
1592		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594		- aConstraints.gridx = 0;
1595		- aConstraints.gridy += 1;
1596		- aConstraints.gridwidth = 1;
1597		-
1598		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601		- aConstraints.gridx += 1;
1602		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604		- aConstraints.gridx = 0;
1605		- aConstraints.gridy += 1;
1606		- aConstraints.gridwidth = 1;
1607		-
1608		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611		- aConstraints.gridx += 1;
1612		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614		- aConstraints.gridx = 0;
1615		- aConstraints.gridy += 1;
1616		- aConstraints.gridwidth = 1;
1617		-
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	1813	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1814	+ //Return();
1620	1815	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1816	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1817	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1822,105 @@
1627	1822	// aConstraints.gridy += 1;
1628	1823	// aConstraints.gridwidth = 1;
1629	1824
1630		- //aConstraints.weighty = 1;
1631		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632		- //aConstraints.gridx += 1;
1633		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634		- aConstraints.weighty = 0;
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
	1825	+ cGridBag anisoU = new cGridBag();
	1826	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1827	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1828	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1829	+ specularSection.add(anisoU);
1638	1830
1639		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
	1831	+ cGridBag anisoV = new cGridBag();
	1832	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1833	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1834	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1835	+ specularSection.add(anisoV);
1648	1836
1649		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- aConstraints.gridwidth = 1;
1658	1837
1659		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662		- aConstraints.gridx += 1;
1663		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665		- aConstraints.gridx = 0;
1666		- aConstraints.gridy += 1;
1667		- aConstraints.gridwidth = 1;
	1838	+ panel.add(new JSeparator());
	1839	+
	1840	+ panel.add(specularSection);
	1841	+
	1842	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1843	+
	1844	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1668	1845
1669		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672		- aConstraints.gridx += 1;
1673		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675		- aConstraints.gridx = 0;
1676		- aConstraints.gridy += 1;
1677		- aConstraints.gridwidth = 1;
1678		- aConstraints.weighty = 0;
	1846	+ cGridBag camera = new cGridBag();
	1847	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1848	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1849	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1850	+ colorSection.add(camera);
1679	1851
1680		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	1852	+ cGridBag ambient = new cGridBag();
	1853	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1854	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1855	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1856	+ colorSection.add(ambient);
1689	1857
1690		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
	1858	+ cGridBag backlit = new cGridBag();
	1859	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1860	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1861	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1862	+ colorSection.add(backlit);
1699	1863
1700		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
	1864	+ cGridBag opacity = new cGridBag();
	1865	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1866	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1867	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1868	+ colorSection.add(opacity);
1709	1869
1710		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- aConstraints.gridwidth = 1;
	1870	+ //panel.add(new JSeparator());
	1871	+
	1872	+ //panel.add(globalSection);
	1873	+
	1874	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1875	+
	1876	+ cGridBag textureSection = new cGridBag().setVertical(true);
1719	1877
1720		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723		- aConstraints.gridx += 1;
1724		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726		- aConstraints.gridx = 0;
1727		- aConstraints.gridy += 1;
1728		- aConstraints.gridwidth = 1;
	1878	+ cGridBag bump = new cGridBag();
	1879	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1880	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1881	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1882	+ textureSection.add(bump);
1729	1883
1730		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733		- aConstraints.gridx += 1;
1734		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1736		- aConstraints.gridx = 0;
1737		- aConstraints.gridy += 1;
1738		- aConstraints.gridwidth = 1;
	1884	+ cGridBag noise = new cGridBag();
	1885	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1886	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1887	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1888	+ textureSection.add(noise);
1739	1889
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	1890	+ cGridBag power = new cGridBag();
	1891	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1892	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1893	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1894	+ textureSection.add(power);
1745	1895
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	1896	+ cGridBag borderfade = new cGridBag();
	1897	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1898	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1899	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1900	+ textureSection.add(borderfade);
	1901	+
	1902	+ cGridBag fog = new cGridBag();
	1903	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1904	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1905	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1906	+ textureSection.add(fog);
	1907	+
	1908	+ cGridBag opacityPower = new cGridBag();
	1909	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1910	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1911	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1912	+ textureSection.add(opacityPower);
	1913	+
	1914	+ panel.add(new JSeparator());
	1915	+
	1916	+ panel.add(textureSection);
	1917	+
	1918	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	1919
1750	1920	SetMaterial(copy); // .GetMaterial());
1751	1921
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	1922	+ //colorField.addChangeListener(this);
	1923	+// modulationField.addChangeListener(this);
1754	1924	metalnessField.addChangeListener(this);
1755	1925	diffuseField.addChangeListener(this);
1756	1926	specularField.addChangeListener(this);
..	..	@@ -1780,12 +1950,15 @@
1780	1950	opacityPowerField.addChangeListener(this);
1781	1951	/**/
1782	1952
1783		- resetSlidersButton.addActionListener(this);
1784	1953	clearMaterialButton.addActionListener(this);
1785	1954	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	1955	+
	1956	+ if (Globals.ADVANCED)
	1957	+ {
	1958	+ resetSlidersButton.addActionListener(this);
	1959	+ propagateToggle.addItemListener(this);
	1960	+ multiplyToggle.addItemListener(this);
	1961	+ }
1789	1962	}
1790	1963
1791	1964	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1956,7 +2129,7 @@
1956	2129
1957	2130	//? flashIt = false;
1958	2131	CameraPane pane = (CameraPane) cameraView;
1959		- pane.clickStart(location.x, location.y, 0);
	2132	+ pane.clickStart(location.x, location.y, 0, 0);
1960	2133	pane.clickEnd(location.x, location.y, 0, true);
1961	2134
1962	2135	if (group.selection.size() == 1)
..	..	@@ -2005,6 +2178,7 @@
2005	2178	e2.printStackTrace();
2006	2179	}
2007	2180	}
	2181	+
2008	2182	LoadJMEThread loadThread;
2009	2183
2010	2184	class LoadJMEThread extends Thread
..	..	@@ -2062,6 +2236,7 @@
2062	2236	//LoadFile0(filename, converter);
2063	2237	}
2064	2238	}
	2239	+
2065	2240	LoadOBJThread loadObjThread;
2066	2241
2067	2242	class LoadOBJThread extends Thread
..	..	@@ -2140,19 +2315,19 @@
2140	2315
2141	2316	void LoadObjFile(String fullname)
2142	2317	{
2143		- /*
	2318	+ System.out.println("Loading " + fullname);
	2319	+ /**/
2144	2320	//lastFilename = fullname;
2145	2321	if(loadObjThread == null)
2146	2322	{
2147		- loadObjThread = new LoadOBJThread();
2148		- loadObjThread.start();
	2323	+ loadObjThread = new LoadOBJThread();
	2324	+ loadObjThread.start();
2149	2325	}
2150	2326
2151	2327	loadObjThread.add(fullname);
2152		- */
	2328	+ /**/
2153	2329
2154		- System.out.println("Loading " + fullname);
2155		- makeSomething(new FileObject(fullname, true), true);
	2330	+ //makeSomething(new FileObject(fullname, true), true);
2156	2331	}
2157	2332
2158	2333	void LoadGFDFile(String fullname)
..	..	@@ -2194,6 +2369,8 @@
2194	2369	{
2195	2370	Mocap sel = (Mocap) copy.selection.get(0);
2196	2371
	2372	+ sel.SetCurrentBones(sel.frame);
	2373	+
2197	2374	sel.fullname = fullname;
2198	2375
2199	2376	if (changename)
..	..	@@ -2207,14 +2384,18 @@
2207	2384	sel.smoothed = false;
2208	2385
2209	2386	// if (!changename)
2210		- sel.SetPositionDelta(false, true, true, true/?/); // false
	2387	+ //sel.SetPositionDelta(false, true, true, true/?/); // false
	2388	+ sel.SetGlobalTransform();
	2389	+ sel.LoadData();
	2390	+ sel.Rewind();
	2391	+ sel.Fade();
2211	2392	// sel.setPose(0);
2212	2393	refreshContents();
2213	2394	} else
2214	2395	{
2215	2396	mocap.Reset();
2216	2397	// new skeleton
2217		- makeSomething(mocap, false); // true);
	2398	+ makeSomething(mocap, true); // true);
2218	2399	}
2219	2400	} catch (Exception e)
2220	2401	{
..	..	@@ -2241,6 +2422,8 @@
2241	2422	{
2242	2423	Mocap sel = (Mocap) select;
2243	2424
	2425	+ sel.SetCurrentBones(sel.frame);
	2426	+
2244	2427	File file = new File(fullname);
2245	2428
2246	2429	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2307,7 +2490,11 @@
2307	2490
2308	2491	if (!changename)
2309	2492	{
2310		- sel.SetPositionDelta(false, true, true, true/?/);
	2493	+ //sel.SetPositionDelta(false, true, true, true/?/);
	2494	+ sel.SetGlobalTransform();
	2495	+ sel.LoadData();
	2496	+ sel.Rewind();
	2497	+ sel.Fade();
2311	2498	}
2312	2499
2313	2500	// sel.setPose(0);
..	..	@@ -2401,11 +2588,11 @@
2401	2588
2402	2589	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2403	2590	{
2404		- if (GrafreeD.standAlone)
	2591	+ if (Grafreed.standAlone)
2405	2592	{
2406	2593	/**/
2407	2594	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2408		- browser.show();
	2595	+ browser.setVisible(true);
2409	2596	String filename = browser.getFile();
2410	2597	if (filename != null && filename.length() > 0)
2411	2598	{
..	..	@@ -2550,6 +2737,7 @@
2550	2737	}
2551	2738	if (input == null)
2552	2739	{
	2740	+ new Exception().printStackTrace();
2553	2741	System.exit(0);
2554	2742	}
2555	2743
..	..	@@ -2756,6 +2944,8 @@
2756	2944
2757	2945	void SetMaterial(Object3D object)
2758	2946	{
	2947	+ latestObject = object;
	2948	+
2759	2949	cMaterial mat = object.material;
2760	2950
2761	2951	if (mat == null)
..	..	@@ -2764,7 +2954,8 @@
2764	2954	return;
2765	2955	}
2766	2956
2767		- multiplyToggle.setSelected(mat.multiply);
	2957	+ if (multiplyToggle != null)
	2958	+ multiplyToggle.setSelected(mat.multiply);
2768	2959
2769	2960	assert (object.projectedVertices != null);
2770	2961
..	..	@@ -2866,12 +3057,17 @@
2866	3057	// }
2867	3058
2868	3059	/**/
2869		- if (deselect)
	3060	+ if (deselect \|\| child == null)
2870	3061	{
2871	3062	//group.deselectAll();
2872	3063	//freeze = true;
2873	3064	GetTree().clearSelection();
2874	3065	//freeze = false;
	3066	+
	3067	+ if (child == null)
	3068	+ {
	3069	+ return;
	3070	+ }
2875	3071	}
2876	3072
2877	3073	//group.addSelectee(child);
..	..	@@ -2940,31 +3136,48 @@
2940	3136	cameraView.ToggleDL();
2941	3137	cameraView.repaint();
2942	3138	return;
2943		- } else if (event.getSource() == toggleTextureItem)
	3139	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2944	3140	{
2945	3141	cameraView.ToggleTexture();
2946	3142	// june 2013 copy.HardTouch();
2947	3143	cameraView.repaint();
2948	3144	return;
2949		- } else if (event.getSource() == toggleFullItem)
	3145	+ } else if (event.getSource() == toggleTimelineItem)
2950	3146	{
2951		- if (CameraPane.FULLSCREEN)
	3147	+ timeline ^= true;
	3148	+
	3149	+ if (timeline)
2952	3150	{
2953		- frame.getContentPane().remove(/"Center",/bigThree);
2954		- framePanel.add(bigThree);
2955		- frame.getContentPane().add(/"Center",/framePanel);
2956		- } else
2957		- {
2958		- frame.getContentPane().remove(/"Center",/framePanel);
2959		- frame.getContentPane().add(/"Center",/bigThree);
	3151	+ centralPanel.remove(cameraView);
	3152	+ cameraPanel.add(cameraView);
	3153	+ centralPanel.add(cameraPanel);
	3154	+ frame.setJMenuBar(timelineMenubar);
	3155	+ wasFullScreen = CameraPane.FULLSCREEN;
	3156	+ if (!CameraPane.FULLSCREEN)
	3157	+ ToggleFullScreen();
	3158	+ toggleFullScreenItem.setEnabled(false);
2960	3159	}
	3160	+ else
	3161	+ {
	3162	+ centralPanel.remove(cameraPanel);
	3163	+ centralPanel.add(cameraView);
	3164	+ frame.setJMenuBar(null);
	3165	+ if (!wasFullScreen)
	3166	+ ToggleFullScreen();
	3167	+ toggleFullScreenItem.setEnabled(true);
	3168	+ }
	3169	+
2961	3170	frame.validate();
2962		- cameraView.ToggleFullScreen();
	3171	+ return;
	3172	+ } else if (event.getSource() == toggleFullScreenItem)
	3173	+ {
	3174	+ ToggleFullScreen();
	3175	+ frame.validate();
2963	3176
2964	3177	return;
2965		- } else if (event.getSource() == toggleRandomItem)
	3178	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2966	3179	{
2967		- cameraView.ToggleRandom();
	3180	+ cameraView.ToggleSwitch();
2968	3181	cameraView.repaint();
2969	3182	return;
2970	3183	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2993,6 +3206,10 @@
2993	3206	{
2994	3207	copy.live ^= true;
2995	3208	return;
	3209	+ } else if (event.getSource() == selectCB)
	3210	+ {
	3211	+ copy.dontselect ^= true;
	3212	+ return;
2996	3213	} else if (event.getSource() == hideCB)
2997	3214	{
2998	3215	copy.hide ^= true;
..	..	@@ -3007,6 +3224,7 @@
3007	3224	if (event.getSource() == randomCB)
3008	3225	{
3009	3226	copy.random ^= true;
	3227	+ objEditor.refreshContents();
3010	3228	return;
3011	3229	}
3012	3230	if (event.getSource() == speedupCB)
..	..	@@ -3030,8 +3248,9 @@
3030	3248
3031	3249	public void actionPerformed(ActionEvent event)
3032	3250	{
	3251	+ Object source = event.getSource();
3033	3252	// SCRIPT DIALOG
3034		- if (event.getSource() == okbutton)
	3253	+ if (source == okbutton)
3035	3254	{
3036	3255	textpanel.setVisible(false);
3037	3256	textpanel.remove(textarea);
..	..	@@ -3043,7 +3262,7 @@
3043	3262	textarea = null;
3044	3263	textpanel = null;
3045	3264	}
3046		- if (event.getSource() == cancelbutton)
	3265	+ if (source == cancelbutton)
3047	3266	{
3048	3267	textpanel.setVisible(false);
3049	3268	textpanel.remove(textarea);
..	..	@@ -3055,49 +3274,50 @@
3055	3274	//applySelf();
3056	3275	//client.refreshEditWindow();
3057	3276	//refreshContents();
3058		- if (event.getSource() == nameField)
	3277	+ if (source == nameField)
3059	3278	{
3060	3279	//System.out.println("ObjEditor " + event);
3061	3280	applySelf0(true);
3062	3281	//parent.applySelf();
3063	3282	objEditor.refreshContents();
3064		- } else if (event.getSource() == resetButton)
	3283	+ } else if (source == resetButton)
3065	3284	{
3066	3285	CameraPane.fullreset = true;
3067	3286	copy.Reset(); // ResetMeshes();
3068	3287	copy.Touch();
3069	3288	objEditor.refreshContents();
3070		- } else if (event.getSource() == stepItem)
	3289	+ } else if (source == stepItem)
3071	3290	{
3072		- cameraView.ONESTEP = true;
	3291	+ //cameraView.ONESTEP = true;
	3292	+ Globals.ONESTEP = true;
3073	3293	cameraView.repaint();
3074	3294	return;
3075		- } else if (event.getSource() == stepButton)
	3295	+ } else if (source == stepButton)
3076	3296	{
3077	3297	copy.Step();
3078	3298	copy.Touch();
3079	3299	objEditor.refreshContents();
3080		- } else if (event.getSource() == slowerButton)
	3300	+ } else if (source == slowerButton)
3081	3301	{
3082	3302	copy.Slower();
3083	3303	copy.Touch();
3084	3304	objEditor.refreshContents();
3085		- } else if (event.getSource() == fasterButton)
	3305	+ } else if (source == fasterButton)
3086	3306	{
3087	3307	copy.Faster();
3088	3308	copy.Touch();
3089	3309	objEditor.refreshContents();
3090		- } else if (event.getSource() == remarkButton)
	3310	+ } else if (source == remarkButton)
3091	3311	{
3092	3312	copy.Remark();
3093	3313	copy.Touch();
3094	3314	objEditor.refreshContents();
3095		- } else if (event.getSource() == stepAllButton)
	3315	+ } else if (source == stepAllButton)
3096	3316	{
3097	3317	copy.StepAll();
3098	3318	copy.Touch();
3099	3319	objEditor.refreshContents();
3100		- } else if (event.getSource() == resetAllButton)
	3320	+ } else if (source == resetAllButton)
3101	3321	{
3102	3322	//CameraPane.fullreset = true;
3103	3323	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3130,53 +3350,75 @@
3130	3350	// Close();
3131	3351	// }
3132	3352	// else
3133		- if (event.getSource() == resetSlidersButton)
	3353	+ if (source == resetSlidersButton)
3134	3354	{
3135	3355	ResetSliders();
3136		- } else if (event.getSource() == clearMaterialButton)
	3356	+ } else if (source == clearMaterialButton)
3137	3357	{
3138	3358	ClearMaterial();
3139		- } else if (event.getSource() == createMaterialButton)
	3359	+ } else if (source == createMaterialButton)
3140	3360	{
3141	3361	CreateMaterial();
3142		- } else if (event.getSource() == clearPanelButton)
	3362	+ } else if (source == clearPanelButton)
3143	3363	{
3144	3364	copy.ClearUI();
3145	3365	refreshContents(true);
3146		- } /*
3147		- }
3148		-
3149		- public boolean action(Event event, Object arg)
3150		- {
3151		- */ else if (event.getSource() == closeItem)
	3366	+ } else if (source == importGFDItem)
	3367	+ {
	3368	+ ImportGFD();
	3369	+ } else
	3370	+ if (source == importVRMLX3DItem)
	3371	+ {
	3372	+ ImportVRMLX3D();
	3373	+ } else
	3374	+ if (source == import3DSItem)
	3375	+ {
	3376	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3377	+ } else
	3378	+ if (source == importOBJItem)
	3379	+ {
	3380	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3381	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3382	+ browser.setVisible(true);
	3383	+ String filename = browser.getFile();
	3384	+ if (filename != null && filename.length() > 0)
	3385	+ {
	3386	+ String fullname = browser.getDirectory() + filename;
	3387	+ makeSomething(ReadOBJ(fullname), true);
	3388	+ }
	3389	+ } else
	3390	+ if (source == closeItem)
3152	3391	{
3153	3392	Close();
3154	3393	//return true;
3155		- } else if (event.getSource() == loadItem)
	3394	+ } else if (source == loadItem)
3156	3395	{
3157	3396	load();
3158	3397	//return true;
3159		- } else if (event.getSource() == saveItem)
	3398	+ } else if (source == newItem)
	3399	+ {
	3400	+ New();
	3401	+ } else if (source == saveItem)
3160	3402	{
3161	3403	save();
3162	3404	//return true;
3163		- } else if (event.getSource() == saveAsItem)
	3405	+ } else if (source == saveAsItem)
3164	3406	{
3165	3407	saveAs();
3166	3408	//return true;
3167		- } else if (event.getSource() == reexportItem)
	3409	+ } else if (source == reexportItem)
3168	3410	{
3169	3411	reexport();
3170	3412	//return true;
3171		- } else if (event.getSource() == exportAsItem)
	3413	+ } else if (source == exportAsItem)
3172	3414	{
3173	3415	export();
3174	3416	//return true;
3175		- } else if (event.getSource() == povItem)
	3417	+ } else if (source == povItem)
3176	3418	{
3177	3419	generatePOV();
3178	3420	//return true;
3179		- } else if (event.getSource() == zBufferItem)
	3421	+ } else if (source == zBufferItem)
3180	3422	{
3181	3423	try
3182	3424	{
..	..	@@ -3198,21 +3440,8 @@
3198	3440	cameraView.repaint();
3199	3441	//return true;
3200	3442	}
3201		- */ else if (event.getSource() == editCameraItem)
3202		- {
3203		- cameraView.ProtectCamera();
3204		- cameraView.repaint();
3205		- return;
3206		- } else if (event.getSource() == revertCameraItem)
3207		- {
3208		- cameraView.RevertCamera();
3209		- cameraView.repaint();
3210		- return;
3211		- } else if (event.getSource() == textureButton)
3212		- {
3213		- return; // true;
3214		- } else // combos...
3215		- if (event.getSource() == texresMenu)
	3443	+ */ else // combos...
	3444	+ if (source == texresMenu)
3216	3445	{
3217	3446	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3218	3447	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3224,27 +3453,304 @@
3224	3453	}
3225	3454	}
3226	3455
3227		- void ToggleAnimation()
	3456	+ void New()
3228	3457	{
3229		- if (!CameraPane.ANIMATION)
	3458	+ while (copy.Size() > 1)
3230	3459	{
3231		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3460	+ copy.remove(1);
	3461	+ }
	3462	+
	3463	+ ResetModel();
	3464	+ objEditor.refreshContents();
	3465	+ }
	3466	+
	3467	+ static public byte[] Compress(Object3D o)
	3468	+ {
	3469	+ try
	3470	+ {
	3471	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3472	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3473	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3474	+
	3475	+ Object3D parent = o.parent;
	3476	+ o.parent = null;
	3477	+
	3478	+ out.writeObject(o);
	3479	+
	3480	+ o.parent = parent;
	3481	+
	3482	+ out.flush();
	3483	+
	3484	+ zstream.close();
	3485	+ out.close();
	3486	+
	3487	+ return baos.toByteArray();
	3488	+ } catch (Exception e)
	3489	+ {
	3490	+ System.err.println(e);
	3491	+ return null;
	3492	+ }
	3493	+ }
	3494	+
	3495	+ static public Object Uncompress(byte[] bytes)
	3496	+ {
	3497	+ System.out.println("#bytes = " + bytes.length);
	3498	+ try
	3499	+ {
	3500	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3501	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3502	+ ObjectInputStream in = new ObjectInputStream(istream);
	3503	+ Object obj = in.readObject();
	3504	+ in.close();
	3505	+
	3506	+ return obj;
	3507	+ } catch (Exception e)
	3508	+ {
	3509	+ System.err.println(e);
	3510	+ return null;
	3511	+ }
	3512	+ }
	3513	+
	3514	+ static public Object clone(Object o)
	3515	+ {
	3516	+ try
	3517	+ {
	3518	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3519	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3520	+
	3521	+ out.writeObject(o);
	3522	+
	3523	+ out.flush();
	3524	+ out.close();
	3525	+
	3526	+ byte[] bytes = baos.toByteArray();
	3527	+
	3528	+ System.out.println("clone = " + bytes.length);
	3529	+
	3530	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3531	+ ObjectInputStream in = new ObjectInputStream(bais);
	3532	+ Object obj = in.readObject();
	3533	+ in.close();
	3534	+
	3535	+ return obj;
	3536	+ } catch (Exception e)
	3537	+ {
	3538	+ System.err.println(e);
	3539	+ return null;
	3540	+ }
	3541	+ }
	3542	+
	3543	+ cRadio GetCurrentTab()
	3544	+ {
	3545	+ cRadio ab;
	3546	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3547	+ {
	3548	+ ab = (cRadio)e.nextElement();
	3549	+ if(ab.GetObject() == copy)
	3550	+ {
	3551	+ return ab;
	3552	+ }
	3553	+ }
	3554	+
	3555	+ return null;
	3556	+ }
	3557	+
	3558	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3559	+
	3560	+ public void Save()
	3561	+ {
	3562	+ System.err.println("Save");
	3563	+
	3564	+ cRadio tab = GetCurrentTab();
	3565	+
	3566	+ boolean temp = CameraPane.SWITCH;
	3567	+ CameraPane.SWITCH = false;
	3568	+
	3569	+ copy.ExtractBigData(hashtable);
	3570	+
	3571	+ byte[] compress = Compress(copy);
	3572	+
	3573	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3574	+ tab.graphs[tab.undoindex++] = compress;
	3575	+
	3576	+ copy.RestoreBigData(hashtable);
	3577	+
	3578	+ CameraPane.SWITCH = temp;
	3579	+
	3580	+ //assert(hashtable.isEmpty());
	3581	+
	3582	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3583	+ {
	3584	+ tab.graphs[i] = null;
	3585	+ }
	3586	+
	3587	+ SetUndoStates();
	3588	+
	3589	+ // test save
	3590	+ if (false)
	3591	+ {
	3592	+ try
	3593	+ {
	3594	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3595	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3596	+
	3597	+ p.writeObject(copy);
	3598	+
	3599	+ p.flush();
	3600	+
	3601	+ ostream.close();
	3602	+ } catch (Exception e)
	3603	+ {
	3604	+ e.printStackTrace();
	3605	+ }
	3606	+ }
	3607	+ }
	3608	+
	3609	+ void CopyChanged(Object3D obj)
	3610	+ {
	3611	+ SetUndoStates();
	3612	+
	3613	+ boolean temp = CameraPane.SWITCH;
	3614	+ CameraPane.SWITCH = false;
	3615	+
	3616	+ copy.ExtractBigData(hashtable);
	3617	+
	3618	+ copy.clear();
	3619	+
	3620	+ for (int i=0; i<obj.Size(); i++)
	3621	+ {
	3622	+ copy.add(obj.get(i));
	3623	+ }
	3624	+
	3625	+ copy.RestoreBigData(hashtable);
	3626	+
	3627	+ CameraPane.SWITCH = temp;
	3628	+
	3629	+ //assert(hashtable.isEmpty());
	3630	+
	3631	+ copy.Touch();
	3632	+
	3633	+ ResetModel();
	3634	+ copy.HardTouch(); // recompile?
	3635	+
	3636	+ cRadio ab;
	3637	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3638	+ {
	3639	+ ab = (cRadio)e.nextElement();
	3640	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3641	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3642	+ if (test != null)
	3643	+ {
	3644	+ test.editWindow = ab.object.editWindow;
	3645	+ ab.object = test;
	3646	+ }
	3647	+ }
	3648	+
	3649	+ refreshContents();
	3650	+ }
	3651	+
	3652	+ cButton undoButton;
	3653	+ cButton redoButton;
	3654	+
	3655	+ void SetUndoStates()
	3656	+ {
	3657	+ cRadio tab = GetCurrentTab();
	3658	+
	3659	+ undoButton.setEnabled(tab.undoindex > 0);
	3660	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3661	+ }
	3662	+
	3663	+ public void Undo()
	3664	+ {
	3665	+ System.err.println("Undo");
	3666	+
	3667	+ cRadio tab = GetCurrentTab();
	3668	+
	3669	+ if (tab.undoindex == 0)
	3670	+ {
	3671	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3672	+ return;
	3673	+ }
	3674	+
	3675	+ if (tab.graphs[tab.undoindex] == null)
	3676	+ {
	3677	+ Save();
	3678	+ tab.undoindex -= 1;
	3679	+ }
	3680	+
	3681	+ tab.undoindex -= 1;
	3682	+
	3683	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3684	+ }
	3685	+
	3686	+ public void Redo()
	3687	+ {
	3688	+ cRadio tab = GetCurrentTab();
	3689	+
	3690	+ if (tab.graphs[tab.undoindex + 1] == null)
	3691	+ {
	3692	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3693	+ return;
	3694	+ }
	3695	+
	3696	+ tab.undoindex += 1;
	3697	+
	3698	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3699	+ }
	3700	+
	3701	+ void ImportGFD()
	3702	+ {
	3703	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3232	3704	browser.show();
3233	3705	String filename = browser.getFile();
3234	3706	if (filename != null && filename.length() > 0)
3235	3707	{
3236		- CameraPane.filename = browser.getDirectory() + filename;
	3708	+ String fullname = browser.getDirectory() + filename;
	3709	+
	3710	+ //Object3D readobj =
	3711	+ objEditor.ReadGFD(fullname, objEditor);
	3712	+ //makeSomething(readobj);
	3713	+ }
	3714	+ }
	3715	+
	3716	+ void ImportVRMLX3D()
	3717	+ {
	3718	+ if (Grafreed.standAlone)
	3719	+ {
	3720	+ /**/
	3721	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3722	+ browser.show();
	3723	+ String filename = browser.getFile();
	3724	+ if (filename != null && filename.length() > 0)
	3725	+ {
	3726	+ String fullname = browser.getDirectory() + filename;
	3727	+ LoadVRMLX3D(fullname);
	3728	+ }
	3729	+ /**/
	3730	+ }
	3731	+ }
	3732	+
	3733	+ void ToggleAnimation()
	3734	+ {
	3735	+ if (!Globals.ANIMATION)
	3736	+ {
	3737	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3738	+ browser.setVisible(true);
	3739	+ String filename = browser.getFile();
	3740	+ if (filename != null && filename.length() > 0)
	3741	+ {
	3742	+ Globals.filename = browser.getDirectory() + filename;
3237	3743	//CameraPane.framecount = 0;
3238		- CameraPane.imagecount = 0;
	3744	+ Globals.imagecount = 0;
3239	3745
3240		- CameraPane.ANIMATION ^= true;
	3746	+ Globals.ANIMATION ^= true;
3241	3747
3242		- GrafreeD.wav.cursor = 0;
3243		- GrafreeD.wav.loop = 0;
	3748	+ Grafreed.wav.cursor = 0;
	3749	+ Grafreed.wav.loop = 0;
3244	3750	}
3245	3751	} else
3246	3752	{
3247		- CameraPane.ANIMATION ^= true;
	3753	+ Globals.ANIMATION ^= true;
3248	3754	}
3249	3755	}
3250	3756
..	..	@@ -3290,7 +3796,7 @@
3290	3796	void CreateMaterial()
3291	3797	{
3292	3798	//copy.ClearMaterial(); // PATCH
3293		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3799	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3294	3800	if (copy.selection.size() > 0)
3295	3801	//SetMaterial(copy);
3296	3802	{
..	..	@@ -3341,7 +3847,7 @@
3341	3847	assert false;
3342	3848	}
3343	3849
3344		- void EditSelection()
	3850	+ void EditSelection(boolean newWindow)
3345	3851	{
3346	3852	}
3347	3853
..	..	@@ -3349,11 +3855,11 @@
3349	3855	{
3350	3856	copy.ResetBlockLoop(); // temporary problem
3351	3857
3352		- boolean random = CameraPane.RANDOM;
3353		- CameraPane.RANDOM = false; // parse everything
	3858	+ boolean random = CameraPane.SWITCH;
	3859	+ CameraPane.SWITCH = false; // parse everything
3354	3860	copy.ResetDisplayList();
3355	3861	copy.HardTouch();
3356		- CameraPane.RANDOM = random;
	3862	+ CameraPane.SWITCH = random;
3357	3863	}
3358	3864
3359	3865	// public void applySelf()
..	..	@@ -3423,10 +3929,40 @@
3423	3929	current.fakedepth = (float) fakedepthField.getFloat();
3424	3930	current.shadowbias = (float) shadowbiasField.getFloat();
3425	3931
3426		- if (!NumberSlider.frozen)
	3932	+ if (!cNumberSlider.frozen)
3427	3933	{
3428	3934	//System.out.println("Propagate = " + propagate);
3429	3935	copy.UpdateMaterial(anchor, current, propagate);
	3936	+
	3937	+ if (copy.material != null)
	3938	+ {
	3939	+ cMaterial mat = copy.material;
	3940	+
	3941	+ colorField.SetToolTipValue((mat.color));
	3942	+ modulationField.SetToolTipValue((mat.modulation));
	3943	+ metalnessField.SetToolTipValue((mat.metalness));
	3944	+ diffuseField.SetToolTipValue((mat.diffuse));
	3945	+ specularField.SetToolTipValue((mat.specular));
	3946	+ shininessField.SetToolTipValue((mat.shininess));
	3947	+ shiftField.SetToolTipValue((mat.shift));
	3948	+ ambientField.SetToolTipValue((mat.ambient));
	3949	+ lightareaField.SetToolTipValue((mat.lightarea));
	3950	+ diffusenessField.SetToolTipValue((mat.factor));
	3951	+ velvetField.SetToolTipValue((mat.velvet));
	3952	+ sheenField.SetToolTipValue((mat.sheen));
	3953	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3954	+ backlitField.SetToolTipValue((mat.bump));
	3955	+ anisoField.SetToolTipValue((mat.aniso));
	3956	+ anisoVField.SetToolTipValue((mat.anisoV));
	3957	+ cameraField.SetToolTipValue((mat.cameralight));
	3958	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3959	+ shadowField.SetToolTipValue((mat.shadow));
	3960	+ textureField.SetToolTipValue((mat.texture));
	3961	+ opacityField.SetToolTipValue((mat.opacity));
	3962	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3963	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3964	+ }
	3965	+
3430	3966	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3431	3967	{
3432	3968	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3471,6 +4007,7 @@
3471	4007	\|\| e.getSource() == apertureField
3472	4008	\|\| e.getSource() == shadowblurField)
3473	4009	{
	4010	+ new Exception().printStackTrace();
3474	4011	System.exit(0);
3475	4012	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3476	4013	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3497,7 +4034,13 @@
3497	4034	//System.out.println("PARENT = " + parent);
3498	4035	//if (parent != null)
3499	4036	// parent.applySelf();
3500		- refreshContents();
	4037	+ if (e.getSource() == normalpushField)
	4038	+ {
	4039	+ objEditor.refreshContents();
	4040	+ //Refresh();
	4041	+ }
	4042	+ else
	4043	+ refreshContents();
3501	4044	// ??? client.refreshEditWindow();
3502	4045	}
3503	4046	//else
..	..	@@ -3509,7 +4052,7 @@
3509	4052	//group.name = nameField.getText();
3510	4053	//objEditor.applySelf();
3511	4054
3512		- assert (objEditor == this);
	4055	+ // OCT2018: assert (objEditor == this);
3513	4056	if (copy.selection == null \|\| copy.selection.size() == 0)
3514	4057	//super.applySelf()
3515	4058	; else
..	..	@@ -3533,12 +4076,18 @@
3533	4076	objEditor.copy = keep;
3534	4077	}
3535	4078	}
	4079	+
	4080	+ if (normalpushField != null)
	4081	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3536	4082	}
3537	4083
3538	4084	void SnapObject()
3539	4085	{
3540		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3541		- SnapObject(obj);
	4086	+ if (copy.selection.size() > 0)
	4087	+ {
	4088	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4089	+ SnapObject(obj);
	4090	+ }
3542	4091	}
3543	4092
3544	4093	void SnapObject(Object3D obj)
..	..	@@ -3652,7 +4201,7 @@
3652	4201
3653	4202	if (obj.parent != null)
3654	4203	{
3655		- obj.parent.TransformToWorld(interest);
	4204	+// obj.parent.TransformToWorld(interest);
3656	4205	}
3657	4206
3658	4207	if (!CameraPane.TRACK)
..	..	@@ -3784,7 +4333,7 @@
3784	4333
3785	4334	radioPanel.revalidate();
3786	4335	radioPanel.repaint();
3787		- ctrlPanel.revalidate(); // ? new
	4336	+ ctrlPanel.validate(); // ? new
3788	4337	ctrlPanel.repaint();
3789	4338	}
3790	4339	}
..	..	@@ -3793,6 +4342,8 @@
3793	4342
3794	4343	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3795	4344	{
	4345	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4346	+ Save();
3796	4347	//Tween.set(thing, 0).target(1).start(tweenManager);
3797	4348	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3798	4349	// if (thing instanceof GenericJointDemo)
..	..	@@ -3879,6 +4430,12 @@
3879	4430	{
3880	4431	ResetModel();
3881	4432	Select(thing.GetTreePath(), true, false); // unselect... false);
	4433	+
	4434	+ if (thing.Size() == 0)
	4435	+ {
	4436	+ //EditSelection(false);
	4437	+ }
	4438	+
3882	4439	refreshContents();
3883	4440	}
3884	4441
..	..	@@ -3996,6 +4553,7 @@
3996	4553	}
3997	4554	}
3998	4555	}
	4556	+
3999	4557	LoadGFDThread loadGFDThread;
4000	4558
4001	4559	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4015,8 +4573,10 @@
4015	4573
4016	4574	try
4017	4575	{
	4576	+ // Try compressed version first.
4018	4577	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4019		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4578	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4579	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4020	4580
4021	4581	readobj = (Object3D) p.readObject();
4022	4582	istream.close();
..	..	@@ -4024,7 +4584,20 @@
4024	4584	readobj.ResetDisplayList();
4025	4585	} catch (Exception e)
4026	4586	{
4027		- e.printStackTrace();
	4587	+ //e.printStackTrace();
	4588	+ try
	4589	+ {
	4590	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4591	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4592	+
	4593	+ readobj = (Object3D) p.readObject();
	4594	+ istream.close();
	4595	+
	4596	+ readobj.ResetDisplayList();
	4597	+ } catch (Exception e2)
	4598	+ {
	4599	+ e2.printStackTrace();
	4600	+ }
4028	4601	}
4029	4602	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4030	4603	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4070,6 +4643,12 @@
4070	4643
4071	4644	void LoadIt(Object obj)
4072	4645	{
	4646	+ if (obj == null)
	4647	+ {
	4648	+ // Invalid file
	4649	+ return;
	4650	+ }
	4651	+
4073	4652	System.out.println("Loaded " + obj);
4074	4653	//new Exception().printStackTrace();
4075	4654	Object3D readobj = (Object3D) obj;
..	..	@@ -4079,6 +4658,8 @@
4079	4658
4080	4659	if (readobj != null)
4081	4660	{
	4661	+ if (Globals.SAVEONMAKE)
	4662	+ Save();
4082	4663	try
4083	4664	{
4084	4665	//readobj.deepCopySelf(copy);
..	..	@@ -4141,7 +4722,7 @@
4141	4722
4142	4723	void load() // throws ClassNotFoundException
4143	4724	{
4144		- if (GrafreeD.standAlone)
	4725	+ if (Grafreed.standAlone)
4145	4726	{
4146	4727	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4147	4728	browser.show();
..	..	@@ -4228,11 +4809,13 @@
4228	4809	try
4229	4810	{
4230	4811	FileOutputStream ostream = new FileOutputStream(lastname);
4231		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4812	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4813	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4232	4814
4233	4815	p.writeObject(copy);
4234	4816	p.flush();
4235	4817
	4818	+ zstream.close();
4236	4819	ostream.close();
4237	4820
4238	4821	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4242,17 +4825,20 @@
4242	4825	{
4243	4826	}
4244	4827	}
	4828	+
4245	4829	String lastname;
4246	4830
4247	4831	void saveAs()
4248	4832	{
4249		- if (GrafreeD.standAlone)
	4833	+ if (Grafreed.standAlone)
4250	4834	{
4251	4835	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4252	4836	browser.setVisible(true);
4253	4837	String filename = browser.getFile();
4254	4838	if (filename != null && filename.length() > 0)
4255	4839	{
	4840	+ if (!filename.endsWith(".gfd"))
	4841	+ filename += ".gfd";
4256	4842	lastname = browser.getDirectory() + filename;
4257	4843	save();
4258	4844	}
..	..	@@ -4351,13 +4937,13 @@
4351	4937	try
4352	4938	{
4353	4939	FileOutputStream ostream = new FileOutputStream(filename);
4354		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4355		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4940	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4941	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4356	4942
4357	4943	Object3D objectparent = obj.parent;
4358	4944	obj.parent = null;
4359	4945
4360		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4946	+ Object3D object = (Object3D) Grafreed.clone(obj);
4361	4947
4362	4948	obj.parent = objectparent;
4363	4949
..	..	@@ -4369,8 +4955,8 @@
4369	4955	p.writeObject(object);
4370	4956	p.flush();
4371	4957
	4958	+ zstream.close();
4372	4959	ostream.close();
4373		- // zstream.close();
4374	4960
4375	4961	// group.selection.get(0).parent = parent;
4376	4962	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4391,7 +4977,7 @@
4391	4977	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4392	4978	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4393	4979	copy.generatePOV(buffer);
4394		- if (GrafreeD.standAlone)
	4980	+ if (Grafreed.standAlone)
4395	4981	{
4396	4982	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4397	4983	browser.show();
..	..	@@ -4417,7 +5003,8 @@
4417	5003	Object3D client;
4418	5004	Object3D copy;
4419	5005	MenuBar menuBar;
4420		- Menu windowMenu;
	5006	+ Menu fileMenu;
	5007	+ MenuItem newItem;
4421	5008	MenuItem loadItem;
4422	5009	MenuItem saveItem;
4423	5010	MenuItem saveAsItem;
..	..	@@ -4425,45 +5012,60 @@
4425	5012	MenuItem reexportItem;
4426	5013	MenuItem povItem;
4427	5014	MenuItem closeItem;
4428		- Menu cameraMenu;
	5015	+
4429	5016	CheckboxMenuItem zBufferItem;
4430	5017	//MenuItem normalLensItem;
4431		- MenuItem editCameraItem;
4432		- MenuItem revertCameraItem;
4433		- CheckboxMenuItem toggleLiveItem;
4434	5018	MenuItem stepItem;
4435		- CheckboxMenuItem toggleFullItem;
	5019	+ CheckboxMenuItem toggleLiveItem;
	5020	+ CheckboxMenuItem toggleFullScreenItem;
	5021	+ CheckboxMenuItem toggleTimelineItem;
4436	5022	CheckboxMenuItem toggleRenderItem;
4437	5023	CheckboxMenuItem toggleDebugItem;
4438	5024	CheckboxMenuItem toggleFrustumItem;
4439	5025	CheckboxMenuItem toggleFootContactItem;
4440	5026	CheckboxMenuItem toggleDLItem;
4441	5027	CheckboxMenuItem toggleTextureItem;
4442		- CheckboxMenuItem toggleRandomItem;
	5028	+ CheckboxMenuItem toggleSwitchItem;
4443	5029	CheckboxMenuItem toggleRootItem;
4444	5030	CheckboxMenuItem animationItem;
4445	5031	CheckboxMenuItem toggleHandleItem;
4446	5032	CheckboxMenuItem togglePaintItem;
4447	5033	JSplitPane mainPanel;
4448	5034	JScrollPane scrollpane;
	5035	+
4449	5036	JPanel toolbarPanel;
4450		- JPanel treePanel;
	5037	+
	5038	+ cGridBag treePanel;
	5039	+
4451	5040	JPanel radioPanel;
4452	5041	ButtonGroup buttonGroup;
4453		- JPanel ctrlPanel;
4454		- JPanel materialPanel;
	5042	+
	5043	+ cGridBag toolboxPanel;
	5044	+ cGridBag materialPanel;
	5045	+ cGridBag ctrlPanel;
	5046	+
4455	5047	JScrollPane infoPanel;
4456		- JPanel optionsPanel;
	5048	+
	5049	+ cGridBag optionsPanel;
	5050	+
4457	5051	JTabbedPane objectPanel;
4458		- JPanel XYZPanel;
	5052	+ boolean materialFlushed;
	5053	+ Object3D latestObject;
	5054	+
	5055	+ cGridBag XYZPanel;
	5056	+
4459	5057	JSplitPane gridPanel;
4460	5058	JSplitPane bigPanel;
4461		- JPanel bigThree;
4462		- JTabbedPane jtp;
4463		- JPanel cameraPanel;
	5059	+
	5060	+ cGridBag bigThree;
	5061	+ cGridBag scenePanel;
	5062	+ cGridBag centralPanel;
	5063	+ JSplitPane cameraPanel;
	5064	+ JPanel timelinePanel;
	5065	+ JMenuBar timelineMenubar;
4464	5066	JSplitPane framePanel;
4465	5067	JTextArea/Field/ nameField;
4466		- cButton textureButton;
	5068	+ //cButton textureButton;
4467	5069	cButton okButton;
4468	5070	cButton applyButton;
4469	5071	cButton cancelButton;
..	..	@@ -4510,65 +5112,72 @@
4510	5112	// MATERIAL
4511	5113	JLabel materialLabel;
4512	5114	JLabel colorLabel;
4513		- NumberSlider colorField;
	5115	+ cNumberSlider colorField;
4514	5116	JLabel modulationLabel;
4515		- NumberSlider modulationField;
	5117	+ cNumberSlider modulationField;
4516	5118	JLabel metalnessLabel;
4517		- NumberSlider metalnessField;
	5119	+ cNumberSlider metalnessField;
4518	5120	JLabel diffuseLabel;
4519		- NumberSlider diffuseField;
	5121	+ cNumberSlider diffuseField;
4520	5122	JLabel specularLabel;
4521		- NumberSlider specularField;
	5123	+ cNumberSlider specularField;
4522	5124	JLabel shininessLabel;
4523		- NumberSlider shininessField;
	5125	+ cNumberSlider shininessField;
4524	5126	JLabel shiftLabel;
4525		- NumberSlider shiftField;
	5127	+ cNumberSlider shiftField;
4526	5128	JLabel ambientLabel;
4527		- NumberSlider ambientField;
	5129	+ cNumberSlider ambientField;
4528	5130	JLabel lightareaLabel;
4529		- NumberSlider lightareaField;
	5131	+ cNumberSlider lightareaField;
4530	5132	JLabel diffusenessLabel;
4531		- NumberSlider diffusenessField;
	5133	+ cNumberSlider diffusenessField;
4532	5134	JLabel velvetLabel;
4533		- NumberSlider velvetField;
	5135	+ cNumberSlider velvetField;
4534	5136	JLabel sheenLabel;
4535		- NumberSlider sheenField;
	5137	+ cNumberSlider sheenField;
4536	5138	JLabel subsurfaceLabel;
4537		- NumberSlider subsurfaceField;
	5139	+ cNumberSlider subsurfaceField;
4538	5140	//JLabel bumpLabel;
4539	5141	//NumberSlider bumpField;
4540	5142	JLabel backlitLabel;
4541		- NumberSlider backlitField;
	5143	+ cNumberSlider backlitField;
4542	5144	JLabel anisoLabel;
4543		- NumberSlider anisoField;
	5145	+ cNumberSlider anisoField;
4544	5146	JLabel anisoVLabel;
4545		- NumberSlider anisoVField;
	5147	+ cNumberSlider anisoVField;
4546	5148	JLabel cameraLabel;
4547		- NumberSlider cameraField;
	5149	+ cNumberSlider cameraField;
4548	5150	JLabel selfshadowLabel;
4549		- NumberSlider selfshadowField;
	5151	+ cNumberSlider selfshadowField;
4550	5152	JLabel shadowLabel;
4551		- NumberSlider shadowField;
	5153	+ cNumberSlider shadowField;
4552	5154	JLabel textureLabel;
4553		- NumberSlider textureField;
	5155	+ cNumberSlider textureField;
4554	5156	JLabel opacityLabel;
4555		- NumberSlider opacityField;
	5157	+ cNumberSlider opacityField;
4556	5158	JLabel fakedepthLabel;
4557		- NumberSlider fakedepthField;
	5159	+ cNumberSlider fakedepthField;
4558	5160	JLabel shadowbiasLabel;
4559		- NumberSlider shadowbiasField;
	5161	+ cNumberSlider shadowbiasField;
4560	5162	JLabel bumpLabel;
4561		- NumberSlider bumpField;
	5163	+ cNumberSlider bumpField;
4562	5164	JLabel noiseLabel;
4563		- NumberSlider noiseField;
	5165	+ cNumberSlider noiseField;
4564	5166	JLabel powerLabel;
4565		- NumberSlider powerField;
	5167	+ cNumberSlider powerField;
4566	5168	JLabel borderfadeLabel;
4567		- NumberSlider borderfadeField;
	5169	+ cNumberSlider borderfadeField;
4568	5170	JLabel fogLabel;
4569		- NumberSlider fogField;
	5171	+ cNumberSlider fogField;
4570	5172	JLabel opacityPowerLabel;
4571		- NumberSlider opacityPowerField;
4572		- JTree jTree;
	5173	+ cNumberSlider opacityPowerField;
	5174	+ cTree jTree;
4573	5175	//ObjectUI parent;
	5176	+
	5177	+ cNumberSlider normalpushField;
	5178	+
	5179	+ private MenuItem importGFDItem;
	5180	+ private MenuItem importVRMLX3DItem;
	5181	+ private MenuItem import3DSItem;
	5182	+ private MenuItem importOBJItem;
4574	5183	}