~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,28 +340,49 @@
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(openItem = 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
280		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
281	386	saveItem.addActionListener(this);
282	387	saveAsItem.addActionListener(this);
283	388	exportAsItem.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(1, 1));
361	453	infoPanel.setName("Info");
362	454	//infoPanel.setLayout(new BorderLayout());
363	455	//infoPanel.add(createTextPane());
..	..	@@ -366,16 +458,23 @@
366	458	mainPanel.setName("Main");
367	459	mainPanel.setContinuousLayout(true);
368	460	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	461	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
372		-
	462	+ mainPanel.setDividerLocation(0.5); //1.0);
	463	+ mainPanel.setResizeWeight(0.5);
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
373	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	473	//mainPanel.setLayout(new GridBagLayout());
375	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
	477	+ //materialPanel.setLayout(new GridBagLayout());
379	478
380	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	480	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +513,7 @@
414	513	static String newline = "\n";
415	514	protected static final String buttonString = "JButton";
416	515	StyledDocument doc;
417		- JTextArea infoarea;
	516	+ JTextPane infoarea;
418	517
419	518	void ClearInfo()
420	519	{
..	..	@@ -437,10 +536,10 @@
437	536	e.printStackTrace();
438	537	}
439	538
440		- String selection = infoarea.getText();
441		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
442		- java.awt.datatransfer.Clipboard clipboard =
443		- Toolkit.getDefaultToolkit().getSystemClipboard();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	543	//clipboard.setContents(data, data);
445	544	}
446	545
..	..	@@ -463,13 +562,13 @@
463	562	//SendInfo("Name:", "bold");
464	563	if (sel.GetTextures() != null \|\| debug)
465	564	{
466		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	567	if (sel.Size() > 0)
469	568	{
470	569	si.SendInfo("#children = " + sel.Size(), "regular");
471	570	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	572	if (debug)
474	573	{
475	574	try
..	..	@@ -481,7 +580,10 @@
481	580	}
482	581
483	582	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
485	587
486	588	if (sel.bRep != null)
487	589	{
..	..	@@ -508,7 +610,7 @@
508	610	}
509	611	if (sel.support != null)
510	612	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	614	}
513	615	if (sel.scriptnode != null)
514	616	{
..	..	@@ -579,6 +681,9 @@
579	681	{
580	682	CameraPane.pointflow = (PointFlow) sel;
581	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
582	687	}
583	688	}
584	689
..	..	@@ -594,52 +699,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(46);
	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,16 @@
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);
1227		- objectPanel.add(infoPanel);
	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);
	1496	+
	1497	+ //if (Globals.ADVANCED)
	1498	+ objectPanel.add(infoPanel);
	1499	+
	1500	+ objectPanel.add(toolboxPanel);
1228	1501
1229	1502	/*
1230	1503	aConstraints.gridx = 0;
..	..	@@ -1233,7 +1506,7 @@
1233	1506	aConstraints.gridy += 1;
1234	1507	aConstraints.gridwidth = 1;
1235	1508	mainPanel.add(objectPanel, aConstraints);
1236		- */
	1509	+ */
1237	1510
1238	1511	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1239	1512	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1244,16 +1517,23 @@
1244	1517	scrollpane.setWheelScrollingEnabled(true);
1245	1518	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1519
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1520	+ /JTabbedPane/ scenePanel = new cGridBag();
	1521	+ scenePanel.preferredWidth = 6;
	1522	+
	1523	+ JTabbedPane tabbedPane = new JTabbedPane();
	1524	+ tabbedPane.add(scrollpane);
1249	1525
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1526	+ optionsPanel = new cGridBag().setVertical(false);
1253	1527
1254	1528	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1529	+
	1530	+ AddOptions(optionsPanel); //, aConstraints);
	1531	+
	1532	+ tabbedPane.add(optionsPanel);
	1533	+
	1534	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1535
	1536	+ scenePanel.add(tabbedPane);
1257	1537
1258	1538	/*
1259	1539	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1555,7 @@
1275	1555	jtp.add(tree);
1276	1556	*/
1277	1557
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1558	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1559	bigPanel.setContinuousLayout(true);
1280	1560	bigPanel.setOneTouchExpandable(true);
1281	1561	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1567,7 @@
1287	1567	//bigPanel.setSize(new Dimension(10,10));
1288	1568	//bigPanel.add(ctrlPanel);
1289	1569	//bigPanel.add(gridPanel);
	1570	+ /**
1290	1571	bigThree = new JPanel();
1291	1572	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1573	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1578,26 @@
1297	1578	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1579	aWindowConstraints.weightx = 0;
1299	1580	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1581	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1582	aWindowConstraints.weightx = 1;
1302	1583	aWindowConstraints.gridwidth = 3;
1303	1584	// aConstraints.gridheight = 3;
1304	1585	aWindowConstraints.gridx = 1;
1305	1586	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1587	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1588	aWindowConstraints.weightx = 0;
1308	1589	aWindowConstraints.gridx = 4;
1309	1590	aWindowConstraints.gridwidth = 1;
1310	1591	// aConstraints.gridheight = 3;
1311	1592	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1593	bigThree.add(XYZPanel, aWindowConstraints);
	1594	+ /**/
1313	1595
	1596	+ bigThree = new cGridBag();
	1597	+ bigThree.addComponent(scenePanel);
	1598	+ bigThree.addComponent(centralPanel);
	1599	+ bigThree.addComponent(XYZPanel);
	1600	+
1314	1601	// // SIDE EFFECT!!!
1315	1602	// aConstraints.gridx = 0;
1316	1603	// aConstraints.gridy = 0;
..	..	@@ -1318,9 +1605,9 @@
1318	1605	// aConstraints.gridheight = 1;
1319	1606
1320	1607	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1321		- framePanel.setContinuousLayout(true);
1322		- framePanel.setOneTouchExpandable(true);
1323		- framePanel.setDividerLocation(0.8);
	1608	+ framePanel.setContinuousLayout(false);
	1609	+ framePanel.setOneTouchExpandable(false);
	1610	+ //.setDividerLocation(0.8);
1324	1611	//framePanel.setDividerSize(15);
1325	1612	//framePanel.setResizeWeight(0.15);
1326	1613	framePanel.setName("Frame");
..	..	@@ -1331,15 +1618,21 @@
1331	1618	//worldPane.add(bigPanel);
1332	1619	//worldPane.add(worldPanel);
1333	1620	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1621	+ //frame.getContentPane().add(/"Center",/framePanel);
	1622	+ frame.add(/"Center",/framePanel);
1335	1623	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1624
1337	1625	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1626
1339		- frame.setSize(1024, 768);
1340		- frame.show();
1341		-
	1627	+ frame.setSize(1280, 860);
	1628	+
	1629	+ cameraView.requestFocusInWindow();
	1630	+
1342	1631	gridPanel.setDividerLocation(1.0);
	1632	+
	1633	+ frame.validate();
	1634	+
	1635	+ frame.setVisible(true);
1343	1636
1344	1637	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1345	1638	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1352,6 +1645,10 @@
1352	1645	});
1353	1646	}
1354	1647
	1648	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1649	+ {
	1650	+ }
	1651	+
1355	1652	JTree GetTree()
1356	1653	{
1357	1654	return objEditor.jTree;
..	..	@@ -1363,260 +1660,161 @@
1363	1660	ctrlPanel.removeAll();
1364	1661	}
1365	1662
1366		- void SetupMaterial(JPanel ctrlPanel)
	1663	+ void SetupMaterial(cGridBag panel)
1367	1664	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1665	+ /*
1371	1666	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1667	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1668	*/
1376	1669
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	1670	+ cGridBag editBar = new cGridBag().setVertical(false);
	1671	+
	1672	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1673	+ createMaterialButton.setToolTipText("Create material");
1382	1674
1383	1675	/*
1384	1676	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1677	*/
1389	1678
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	1679	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1680	+ clearMaterialButton.setToolTipText("Clear material");
	1681	+
	1682	+ if (Globals.ADVANCED)
	1683	+ {
	1684	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1685	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1686	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1687	+ }
1392	1688
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;
	1689	+ editBar.preferredHeight = 15;
	1690	+
	1691	+ panel.add(editBar);
	1692	+
1407	1693	/**/
1408	1694	//aConstraints.weighty = 0;
1409	1695	////aConstraints.weightx = 1;
1410	1696	//aConstraints.weighty = 1;
1411	1697	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1698	//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;
	1699	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1700
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;
	1701	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1702	+
	1703	+ cGridBag color = new cGridBag();
	1704	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1705	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1706	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1707	+ //colorField.preferredWidth = 200;
	1708	+ colorSection.add(color);
1429	1709
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;
	1710	+ cGridBag modulation = new cGridBag();
	1711	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1712	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1713	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1714	+ colorSection.add(modulation);
1439	1715
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;
	1716	+ cGridBag texture = new cGridBag();
	1717	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1718	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1719	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1720	+ colorSection.add(texture);
1449	1721
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;
	1722	+ panel.add(new JSeparator());
	1723	+
	1724	+ panel.add(colorSection);
	1725	+
	1726	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1727	+
	1728	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1729	+
	1730	+ cGridBag diffuse = new cGridBag();
	1731	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1732	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1733	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1734	+ diffuseSection.add(diffuse);
1459	1735
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;
	1736	+ cGridBag diffuseness = new cGridBag();
	1737	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1738	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1739	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1740	+ diffuseSection.add(diffuseness);
1469	1741
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;
	1742	+ cGridBag selfshadow = new cGridBag();
	1743	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1744	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1745	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1746	+ diffuseSection.add(selfshadow);
1479	1747
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;
	1748	+ cGridBag sheen = new cGridBag();
	1749	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1750	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1751	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1752	+ diffuseSection.add(sheen);
1488	1753
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;
	1754	+ cGridBag subsurface = new cGridBag();
	1755	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1756	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1757	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1758	+ diffuseSection.add(subsurface);
1498	1759
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;
	1760	+ cGridBag shadow = new cGridBag();
	1761	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1762	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1763	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1764	+ diffuseSection.add(shadow);
1508	1765
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;
	1766	+ cGridBag fakedepth = new cGridBag();
	1767	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1768	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1769	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1770	+ diffuseSection.add(fakedepth);
1518	1771
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;
	1772	+ cGridBag shadowbias = new cGridBag();
	1773	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1774	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1775	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1776	+ diffuseSection.add(shadowbias);
1528	1777
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;
	1778	+ panel.add(new JSeparator());
	1779	+
	1780	+ panel.add(diffuseSection);
	1781	+
	1782	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1783	+
	1784	+ cGridBag specularSection = new cGridBag().setVertical(true);
1538	1785
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;
	1786	+ cGridBag specular = new cGridBag();
	1787	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1788	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1789	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1790	+ specularSection.add(specular);
1548	1791
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;
	1792	+ cGridBag lightarea = new cGridBag();
	1793	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1794	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1795	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1796	+ specularSection.add(lightarea);
1558	1797
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;
	1798	+ cGridBag shininess = new cGridBag();
	1799	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1800	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1801	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1802	+ specularSection.add(shininess);
1567	1803
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;
	1804	+ cGridBag metalness = new cGridBag();
	1805	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1806	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1807	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1808	+ specularSection.add(metalness);
1577	1809
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;
	1810	+ cGridBag velvet = new cGridBag();
	1811	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1812	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1813	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1814	+ specularSection.add(velvet);
1587	1815
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();
	1816	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1817	+ //Return();
1620	1818	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1819	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1820	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1825,105 @@
1627	1825	// aConstraints.gridy += 1;
1628	1826	// aConstraints.gridwidth = 1;
1629	1827
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;
	1828	+ cGridBag anisoU = new cGridBag();
	1829	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1830	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1831	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1832	+ specularSection.add(anisoU);
1638	1833
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;
	1834	+ cGridBag anisoV = new cGridBag();
	1835	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1836	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1837	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1838	+ specularSection.add(anisoV);
1648	1839
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	1840
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;
	1841	+ panel.add(new JSeparator());
	1842	+
	1843	+ panel.add(specularSection);
	1844	+
	1845	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1846	+
	1847	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1668	1848
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;
	1849	+ cGridBag camera = new cGridBag();
	1850	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1851	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1852	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1853	+ colorSection.add(camera);
1679	1854
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;
	1855	+ cGridBag ambient = new cGridBag();
	1856	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1857	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1858	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1859	+ colorSection.add(ambient);
1689	1860
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;
	1861	+ cGridBag backlit = new cGridBag();
	1862	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1863	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1864	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1865	+ colorSection.add(backlit);
1699	1866
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;
	1867	+ cGridBag opacity = new cGridBag();
	1868	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1869	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1871	+ colorSection.add(opacity);
1709	1872
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;
	1873	+ //panel.add(new JSeparator());
	1874	+
	1875	+ //panel.add(globalSection);
	1876	+
	1877	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1878	+
	1879	+ cGridBag textureSection = new cGridBag().setVertical(true);
1719	1880
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;
	1881	+ cGridBag bump = new cGridBag();
	1882	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1883	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1884	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1885	+ textureSection.add(bump);
1729	1886
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;
	1887	+ cGridBag noise = new cGridBag();
	1888	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1889	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1890	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1891	+ textureSection.add(noise);
1739	1892
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	1893	+ cGridBag power = new cGridBag();
	1894	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1895	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1896	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1897	+ textureSection.add(power);
1745	1898
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	1899	+ cGridBag borderfade = new cGridBag();
	1900	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1901	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1902	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1903	+ textureSection.add(borderfade);
	1904	+
	1905	+ cGridBag fog = new cGridBag();
	1906	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1907	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1908	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1909	+ textureSection.add(fog);
	1910	+
	1911	+ cGridBag opacityPower = new cGridBag();
	1912	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1913	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1914	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1915	+ textureSection.add(opacityPower);
	1916	+
	1917	+ panel.add(new JSeparator());
	1918	+
	1919	+ panel.add(textureSection);
	1920	+
	1921	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	1922
1750	1923	SetMaterial(copy); // .GetMaterial());
1751	1924
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	1925	+ //colorField.addChangeListener(this);
	1926	+// modulationField.addChangeListener(this);
1754	1927	metalnessField.addChangeListener(this);
1755	1928	diffuseField.addChangeListener(this);
1756	1929	specularField.addChangeListener(this);
..	..	@@ -1780,12 +1953,15 @@
1780	1953	opacityPowerField.addChangeListener(this);
1781	1954	/**/
1782	1955
1783		- resetSlidersButton.addActionListener(this);
1784	1956	clearMaterialButton.addActionListener(this);
1785	1957	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	1958	+
	1959	+ if (Globals.ADVANCED)
	1960	+ {
	1961	+ resetSlidersButton.addActionListener(this);
	1962	+ propagateToggle.addItemListener(this);
	1963	+ multiplyToggle.addItemListener(this);
	1964	+ }
1789	1965	}
1790	1966
1791	1967	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1956,7 +2132,7 @@
1956	2132
1957	2133	//? flashIt = false;
1958	2134	CameraPane pane = (CameraPane) cameraView;
1959		- pane.clickStart(location.x, location.y, 0);
	2135	+ pane.clickStart(location.x, location.y, 0, 0);
1960	2136	pane.clickEnd(location.x, location.y, 0, true);
1961	2137
1962	2138	if (group.selection.size() == 1)
..	..	@@ -2005,6 +2181,7 @@
2005	2181	e2.printStackTrace();
2006	2182	}
2007	2183	}
	2184	+
2008	2185	LoadJMEThread loadThread;
2009	2186
2010	2187	class LoadJMEThread extends Thread
..	..	@@ -2062,6 +2239,7 @@
2062	2239	//LoadFile0(filename, converter);
2063	2240	}
2064	2241	}
	2242	+
2065	2243	LoadOBJThread loadObjThread;
2066	2244
2067	2245	class LoadOBJThread extends Thread
..	..	@@ -2140,19 +2318,19 @@
2140	2318
2141	2319	void LoadObjFile(String fullname)
2142	2320	{
2143		- /*
	2321	+ System.out.println("Loading " + fullname);
	2322	+ /**/
2144	2323	//lastFilename = fullname;
2145	2324	if(loadObjThread == null)
2146	2325	{
2147		- loadObjThread = new LoadOBJThread();
2148		- loadObjThread.start();
	2326	+ loadObjThread = new LoadOBJThread();
	2327	+ loadObjThread.start();
2149	2328	}
2150	2329
2151	2330	loadObjThread.add(fullname);
2152		- */
	2331	+ /**/
2153	2332
2154		- System.out.println("Loading " + fullname);
2155		- makeSomething(new FileObject(fullname, true), true);
	2333	+ //makeSomething(new FileObject(fullname, true), true);
2156	2334	}
2157	2335
2158	2336	void LoadGFDFile(String fullname)
..	..	@@ -2413,11 +2591,11 @@
2413	2591
2414	2592	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2415	2593	{
2416		- if (GrafreeD.standAlone)
	2594	+ if (Grafreed.standAlone)
2417	2595	{
2418	2596	/**/
2419	2597	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2420		- browser.show();
	2598	+ browser.setVisible(true);
2421	2599	String filename = browser.getFile();
2422	2600	if (filename != null && filename.length() > 0)
2423	2601	{
..	..	@@ -2562,6 +2740,7 @@
2562	2740	}
2563	2741	if (input == null)
2564	2742	{
	2743	+ new Exception().printStackTrace();
2565	2744	System.exit(0);
2566	2745	}
2567	2746
..	..	@@ -2768,6 +2947,8 @@
2768	2947
2769	2948	void SetMaterial(Object3D object)
2770	2949	{
	2950	+ latestObject = object;
	2951	+
2771	2952	cMaterial mat = object.material;
2772	2953
2773	2954	if (mat == null)
..	..	@@ -2776,7 +2957,8 @@
2776	2957	return;
2777	2958	}
2778	2959
2779		- multiplyToggle.setSelected(mat.multiply);
	2960	+ if (multiplyToggle != null)
	2961	+ multiplyToggle.setSelected(mat.multiply);
2780	2962
2781	2963	assert (object.projectedVertices != null);
2782	2964
..	..	@@ -2878,12 +3060,17 @@
2878	3060	// }
2879	3061
2880	3062	/**/
2881		- if (deselect)
	3063	+ if (deselect \|\| child == null)
2882	3064	{
2883	3065	//group.deselectAll();
2884	3066	//freeze = true;
2885	3067	GetTree().clearSelection();
2886	3068	//freeze = false;
	3069	+
	3070	+ if (child == null)
	3071	+ {
	3072	+ return;
	3073	+ }
2887	3074	}
2888	3075
2889	3076	//group.addSelectee(child);
..	..	@@ -2952,31 +3139,48 @@
2952	3139	cameraView.ToggleDL();
2953	3140	cameraView.repaint();
2954	3141	return;
2955		- } else if (event.getSource() == toggleTextureItem)
	3142	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2956	3143	{
2957	3144	cameraView.ToggleTexture();
2958	3145	// june 2013 copy.HardTouch();
2959	3146	cameraView.repaint();
2960	3147	return;
2961		- } else if (event.getSource() == toggleFullItem)
	3148	+ } else if (event.getSource() == toggleTimelineItem)
2962	3149	{
2963		- if (CameraPane.FULLSCREEN)
	3150	+ timeline ^= true;
	3151	+
	3152	+ if (timeline)
2964	3153	{
2965		- frame.getContentPane().remove(/"Center",/bigThree);
2966		- framePanel.add(bigThree);
2967		- frame.getContentPane().add(/"Center",/framePanel);
2968		- } else
2969		- {
2970		- frame.getContentPane().remove(/"Center",/framePanel);
2971		- frame.getContentPane().add(/"Center",/bigThree);
	3154	+ centralPanel.remove(cameraView);
	3155	+ cameraPanel.add(cameraView);
	3156	+ centralPanel.add(cameraPanel);
	3157	+ frame.setJMenuBar(timelineMenubar);
	3158	+ wasFullScreen = CameraPane.FULLSCREEN;
	3159	+ if (!CameraPane.FULLSCREEN)
	3160	+ ToggleFullScreen();
	3161	+ toggleFullScreenItem.setEnabled(false);
2972	3162	}
	3163	+ else
	3164	+ {
	3165	+ centralPanel.remove(cameraPanel);
	3166	+ centralPanel.add(cameraView);
	3167	+ frame.setJMenuBar(null);
	3168	+ if (!wasFullScreen)
	3169	+ ToggleFullScreen();
	3170	+ toggleFullScreenItem.setEnabled(true);
	3171	+ }
	3172	+
2973	3173	frame.validate();
2974		- cameraView.ToggleFullScreen();
	3174	+ return;
	3175	+ } else if (event.getSource() == toggleFullScreenItem)
	3176	+ {
	3177	+ ToggleFullScreen();
	3178	+ frame.validate();
2975	3179
2976	3180	return;
2977		- } else if (event.getSource() == toggleRandomItem)
	3181	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2978	3182	{
2979		- cameraView.ToggleRandom();
	3183	+ cameraView.ToggleSwitch();
2980	3184	cameraView.repaint();
2981	3185	return;
2982	3186	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3005,6 +3209,10 @@
3005	3209	{
3006	3210	copy.live ^= true;
3007	3211	return;
	3212	+ } else if (event.getSource() == selectCB)
	3213	+ {
	3214	+ copy.dontselect ^= true;
	3215	+ return;
3008	3216	} else if (event.getSource() == hideCB)
3009	3217	{
3010	3218	copy.hide ^= true;
..	..	@@ -3019,6 +3227,7 @@
3019	3227	if (event.getSource() == randomCB)
3020	3228	{
3021	3229	copy.random ^= true;
	3230	+ objEditor.refreshContents();
3022	3231	return;
3023	3232	}
3024	3233	if (event.getSource() == speedupCB)
..	..	@@ -3042,8 +3251,9 @@
3042	3251
3043	3252	public void actionPerformed(ActionEvent event)
3044	3253	{
	3254	+ Object source = event.getSource();
3045	3255	// SCRIPT DIALOG
3046		- if (event.getSource() == okbutton)
	3256	+ if (source == okbutton)
3047	3257	{
3048	3258	textpanel.setVisible(false);
3049	3259	textpanel.remove(textarea);
..	..	@@ -3055,7 +3265,7 @@
3055	3265	textarea = null;
3056	3266	textpanel = null;
3057	3267	}
3058		- if (event.getSource() == cancelbutton)
	3268	+ if (source == cancelbutton)
3059	3269	{
3060	3270	textpanel.setVisible(false);
3061	3271	textpanel.remove(textarea);
..	..	@@ -3067,49 +3277,50 @@
3067	3277	//applySelf();
3068	3278	//client.refreshEditWindow();
3069	3279	//refreshContents();
3070		- if (event.getSource() == nameField)
	3280	+ if (source == nameField)
3071	3281	{
3072	3282	//System.out.println("ObjEditor " + event);
3073	3283	applySelf0(true);
3074	3284	//parent.applySelf();
3075	3285	objEditor.refreshContents();
3076		- } else if (event.getSource() == resetButton)
	3286	+ } else if (source == resetButton)
3077	3287	{
3078	3288	CameraPane.fullreset = true;
3079	3289	copy.Reset(); // ResetMeshes();
3080	3290	copy.Touch();
3081	3291	objEditor.refreshContents();
3082		- } else if (event.getSource() == stepItem)
	3292	+ } else if (source == stepItem)
3083	3293	{
3084		- cameraView.ONESTEP = true;
	3294	+ //cameraView.ONESTEP = true;
	3295	+ Globals.ONESTEP = true;
3085	3296	cameraView.repaint();
3086	3297	return;
3087		- } else if (event.getSource() == stepButton)
	3298	+ } else if (source == stepButton)
3088	3299	{
3089	3300	copy.Step();
3090	3301	copy.Touch();
3091	3302	objEditor.refreshContents();
3092		- } else if (event.getSource() == slowerButton)
	3303	+ } else if (source == slowerButton)
3093	3304	{
3094	3305	copy.Slower();
3095	3306	copy.Touch();
3096	3307	objEditor.refreshContents();
3097		- } else if (event.getSource() == fasterButton)
	3308	+ } else if (source == fasterButton)
3098	3309	{
3099	3310	copy.Faster();
3100	3311	copy.Touch();
3101	3312	objEditor.refreshContents();
3102		- } else if (event.getSource() == remarkButton)
	3313	+ } else if (source == remarkButton)
3103	3314	{
3104	3315	copy.Remark();
3105	3316	copy.Touch();
3106	3317	objEditor.refreshContents();
3107		- } else if (event.getSource() == stepAllButton)
	3318	+ } else if (source == stepAllButton)
3108	3319	{
3109	3320	copy.StepAll();
3110	3321	copy.Touch();
3111	3322	objEditor.refreshContents();
3112		- } else if (event.getSource() == resetAllButton)
	3323	+ } else if (source == resetAllButton)
3113	3324	{
3114	3325	//CameraPane.fullreset = true;
3115	3326	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3142,53 +3353,79 @@
3142	3353	// Close();
3143	3354	// }
3144	3355	// else
3145		- if (event.getSource() == resetSlidersButton)
	3356	+ if (source == resetSlidersButton)
3146	3357	{
3147	3358	ResetSliders();
3148		- } else if (event.getSource() == clearMaterialButton)
	3359	+ } else if (source == clearMaterialButton)
3149	3360	{
3150	3361	ClearMaterial();
3151		- } else if (event.getSource() == createMaterialButton)
	3362	+ } else if (source == createMaterialButton)
3152	3363	{
3153	3364	CreateMaterial();
3154		- } else if (event.getSource() == clearPanelButton)
	3365	+ } else if (source == clearPanelButton)
3155	3366	{
3156	3367	copy.ClearUI();
3157	3368	refreshContents(true);
3158		- } /*
3159		- }
3160		-
3161		- public boolean action(Event event, Object arg)
3162		- {
3163		- */ else if (event.getSource() == closeItem)
	3369	+ } else if (source == importGFDItem)
	3370	+ {
	3371	+ ImportGFD();
	3372	+ } else
	3373	+ if (source == importVRMLX3DItem)
	3374	+ {
	3375	+ ImportVRMLX3D();
	3376	+ } else
	3377	+ if (source == import3DSItem)
	3378	+ {
	3379	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3380	+ } else
	3381	+ if (source == importOBJItem)
	3382	+ {
	3383	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3384	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3385	+ browser.setVisible(true);
	3386	+ String filename = browser.getFile();
	3387	+ if (filename != null && filename.length() > 0)
	3388	+ {
	3389	+ String fullname = browser.getDirectory() + filename;
	3390	+ makeSomething(ReadOBJ(fullname), true);
	3391	+ }
	3392	+ } else
	3393	+ if (source == closeItem)
3164	3394	{
3165	3395	Close();
3166	3396	//return true;
3167		- } else if (event.getSource() == loadItem)
	3397	+ } else if (source == openItem)
3168	3398	{
3169		- load();
	3399	+ Open();
3170	3400	//return true;
3171		- } else if (event.getSource() == saveItem)
	3401	+ } else if (source == newItem)
	3402	+ {
	3403	+ New();
	3404	+ } else if (source == saveItem)
3172	3405	{
3173	3406	save();
3174	3407	//return true;
3175		- } else if (event.getSource() == saveAsItem)
	3408	+ } else if (source == saveAsItem)
3176	3409	{
3177	3410	saveAs();
3178	3411	//return true;
3179		- } else if (event.getSource() == reexportItem)
	3412	+ } else if (source == reexportItem)
3180	3413	{
3181	3414	reexport();
3182	3415	//return true;
3183		- } else if (event.getSource() == exportAsItem)
	3416	+ } else if (source == exportAsItem)
3184	3417	{
3185	3418	export();
3186	3419	//return true;
3187		- } else if (event.getSource() == povItem)
	3420	+ } else if (source == povItem)
3188	3421	{
3189	3422	generatePOV();
3190	3423	//return true;
3191		- } else if (event.getSource() == zBufferItem)
	3424	+ } else if (event.getSource() == archiveItem)
	3425	+ {
	3426	+ cTools.Archive(frame);
	3427	+ return;
	3428	+ } else if (source == zBufferItem)
3192	3429	{
3193	3430	try
3194	3431	{
..	..	@@ -3210,21 +3447,8 @@
3210	3447	cameraView.repaint();
3211	3448	//return true;
3212	3449	}
3213		- */ else if (event.getSource() == editCameraItem)
3214		- {
3215		- cameraView.ProtectCamera();
3216		- cameraView.repaint();
3217		- return;
3218		- } else if (event.getSource() == revertCameraItem)
3219		- {
3220		- cameraView.RevertCamera();
3221		- cameraView.repaint();
3222		- return;
3223		- } else if (event.getSource() == textureButton)
3224		- {
3225		- return; // true;
3226		- } else // combos...
3227		- if (event.getSource() == texresMenu)
	3450	+ */ else // combos...
	3451	+ if (source == texresMenu)
3228	3452	{
3229	3453	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3230	3454	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3236,27 +3460,304 @@
3236	3460	}
3237	3461	}
3238	3462
3239		- void ToggleAnimation()
	3463	+ void New()
3240	3464	{
3241		- if (!CameraPane.ANIMATION)
	3465	+ while (copy.Size() > 1)
3242	3466	{
3243		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3467	+ copy.remove(1);
	3468	+ }
	3469	+
	3470	+ ResetModel();
	3471	+ objEditor.refreshContents();
	3472	+ }
	3473	+
	3474	+ static public byte[] Compress(Object3D o)
	3475	+ {
	3476	+ try
	3477	+ {
	3478	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3479	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3480	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3481	+
	3482	+ Object3D parent = o.parent;
	3483	+ o.parent = null;
	3484	+
	3485	+ out.writeObject(o);
	3486	+
	3487	+ o.parent = parent;
	3488	+
	3489	+ out.flush();
	3490	+
	3491	+ zstream.close();
	3492	+ out.close();
	3493	+
	3494	+ return baos.toByteArray();
	3495	+ } catch (Exception e)
	3496	+ {
	3497	+ System.err.println(e);
	3498	+ return null;
	3499	+ }
	3500	+ }
	3501	+
	3502	+ static public Object Uncompress(byte[] bytes)
	3503	+ {
	3504	+ System.out.println("#bytes = " + bytes.length);
	3505	+ try
	3506	+ {
	3507	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3508	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3509	+ ObjectInputStream in = new ObjectInputStream(istream);
	3510	+ Object obj = in.readObject();
	3511	+ in.close();
	3512	+
	3513	+ return obj;
	3514	+ } catch (Exception e)
	3515	+ {
	3516	+ System.err.println(e);
	3517	+ return null;
	3518	+ }
	3519	+ }
	3520	+
	3521	+ static public Object clone(Object o)
	3522	+ {
	3523	+ try
	3524	+ {
	3525	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3526	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3527	+
	3528	+ out.writeObject(o);
	3529	+
	3530	+ out.flush();
	3531	+ out.close();
	3532	+
	3533	+ byte[] bytes = baos.toByteArray();
	3534	+
	3535	+ System.out.println("clone = " + bytes.length);
	3536	+
	3537	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3538	+ ObjectInputStream in = new ObjectInputStream(bais);
	3539	+ Object obj = in.readObject();
	3540	+ in.close();
	3541	+
	3542	+ return obj;
	3543	+ } catch (Exception e)
	3544	+ {
	3545	+ System.err.println(e);
	3546	+ return null;
	3547	+ }
	3548	+ }
	3549	+
	3550	+ cRadio GetCurrentTab()
	3551	+ {
	3552	+ cRadio ab;
	3553	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3554	+ {
	3555	+ ab = (cRadio)e.nextElement();
	3556	+ if(ab.GetObject() == copy)
	3557	+ {
	3558	+ return ab;
	3559	+ }
	3560	+ }
	3561	+
	3562	+ return null;
	3563	+ }
	3564	+
	3565	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3566	+
	3567	+ public void Save()
	3568	+ {
	3569	+ System.err.println("Save");
	3570	+
	3571	+ cRadio tab = GetCurrentTab();
	3572	+
	3573	+ boolean temp = CameraPane.SWITCH;
	3574	+ CameraPane.SWITCH = false;
	3575	+
	3576	+ copy.ExtractBigData(hashtable);
	3577	+
	3578	+ byte[] compress = Compress(copy);
	3579	+
	3580	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3581	+ tab.graphs[tab.undoindex++] = compress;
	3582	+
	3583	+ copy.RestoreBigData(hashtable);
	3584	+
	3585	+ CameraPane.SWITCH = temp;
	3586	+
	3587	+ //assert(hashtable.isEmpty());
	3588	+
	3589	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3590	+ {
	3591	+ tab.graphs[i] = null;
	3592	+ }
	3593	+
	3594	+ SetUndoStates();
	3595	+
	3596	+ // test save
	3597	+ if (false)
	3598	+ {
	3599	+ try
	3600	+ {
	3601	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3602	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3603	+
	3604	+ p.writeObject(copy);
	3605	+
	3606	+ p.flush();
	3607	+
	3608	+ ostream.close();
	3609	+ } catch (Exception e)
	3610	+ {
	3611	+ e.printStackTrace();
	3612	+ }
	3613	+ }
	3614	+ }
	3615	+
	3616	+ void CopyChanged(Object3D obj)
	3617	+ {
	3618	+ SetUndoStates();
	3619	+
	3620	+ boolean temp = CameraPane.SWITCH;
	3621	+ CameraPane.SWITCH = false;
	3622	+
	3623	+ copy.ExtractBigData(hashtable);
	3624	+
	3625	+ copy.clear();
	3626	+
	3627	+ for (int i=0; i<obj.Size(); i++)
	3628	+ {
	3629	+ copy.add(obj.get(i));
	3630	+ }
	3631	+
	3632	+ copy.RestoreBigData(hashtable);
	3633	+
	3634	+ CameraPane.SWITCH = temp;
	3635	+
	3636	+ //assert(hashtable.isEmpty());
	3637	+
	3638	+ copy.Touch();
	3639	+
	3640	+ ResetModel();
	3641	+ copy.HardTouch(); // recompile?
	3642	+
	3643	+ cRadio ab;
	3644	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3645	+ {
	3646	+ ab = (cRadio)e.nextElement();
	3647	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3648	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3649	+ if (test != null)
	3650	+ {
	3651	+ test.editWindow = ab.object.editWindow;
	3652	+ ab.object = test;
	3653	+ }
	3654	+ }
	3655	+
	3656	+ refreshContents();
	3657	+ }
	3658	+
	3659	+ cButton undoButton;
	3660	+ cButton redoButton;
	3661	+
	3662	+ void SetUndoStates()
	3663	+ {
	3664	+ cRadio tab = GetCurrentTab();
	3665	+
	3666	+ undoButton.setEnabled(tab.undoindex > 0);
	3667	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3668	+ }
	3669	+
	3670	+ public void Undo()
	3671	+ {
	3672	+ System.err.println("Undo");
	3673	+
	3674	+ cRadio tab = GetCurrentTab();
	3675	+
	3676	+ if (tab.undoindex == 0)
	3677	+ {
	3678	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3679	+ return;
	3680	+ }
	3681	+
	3682	+ if (tab.graphs[tab.undoindex] == null)
	3683	+ {
	3684	+ Save();
	3685	+ tab.undoindex -= 1;
	3686	+ }
	3687	+
	3688	+ tab.undoindex -= 1;
	3689	+
	3690	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3691	+ }
	3692	+
	3693	+ public void Redo()
	3694	+ {
	3695	+ cRadio tab = GetCurrentTab();
	3696	+
	3697	+ if (tab.graphs[tab.undoindex + 1] == null)
	3698	+ {
	3699	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3700	+ return;
	3701	+ }
	3702	+
	3703	+ tab.undoindex += 1;
	3704	+
	3705	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3706	+ }
	3707	+
	3708	+ void ImportGFD()
	3709	+ {
	3710	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3244	3711	browser.show();
3245	3712	String filename = browser.getFile();
3246	3713	if (filename != null && filename.length() > 0)
3247	3714	{
3248		- CameraPane.filename = browser.getDirectory() + filename;
	3715	+ String fullname = browser.getDirectory() + filename;
	3716	+
	3717	+ //Object3D readobj =
	3718	+ objEditor.ReadGFD(fullname, objEditor);
	3719	+ //makeSomething(readobj);
	3720	+ }
	3721	+ }
	3722	+
	3723	+ void ImportVRMLX3D()
	3724	+ {
	3725	+ if (Grafreed.standAlone)
	3726	+ {
	3727	+ /**/
	3728	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3729	+ browser.show();
	3730	+ String filename = browser.getFile();
	3731	+ if (filename != null && filename.length() > 0)
	3732	+ {
	3733	+ String fullname = browser.getDirectory() + filename;
	3734	+ LoadVRMLX3D(fullname);
	3735	+ }
	3736	+ /**/
	3737	+ }
	3738	+ }
	3739	+
	3740	+ void ToggleAnimation()
	3741	+ {
	3742	+ if (!Globals.ANIMATION)
	3743	+ {
	3744	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3745	+ browser.setVisible(true);
	3746	+ String filename = browser.getFile();
	3747	+ if (filename != null && filename.length() > 0)
	3748	+ {
	3749	+ Globals.filename = browser.getDirectory() + filename;
3249	3750	//CameraPane.framecount = 0;
3250		- CameraPane.imagecount = 0;
	3751	+ Globals.imagecount = 0;
3251	3752
3252		- CameraPane.ANIMATION ^= true;
	3753	+ Globals.ANIMATION ^= true;
3253	3754
3254		- GrafreeD.wav.cursor = 0;
3255		- GrafreeD.wav.loop = 0;
	3755	+ Grafreed.wav.cursor = 0;
	3756	+ Grafreed.wav.loop = 0;
3256	3757	}
3257	3758	} else
3258	3759	{
3259		- CameraPane.ANIMATION ^= true;
	3760	+ Globals.ANIMATION ^= true;
3260	3761	}
3261	3762	}
3262	3763
..	..	@@ -3302,7 +3803,7 @@
3302	3803	void CreateMaterial()
3303	3804	{
3304	3805	//copy.ClearMaterial(); // PATCH
3305		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3806	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3306	3807	if (copy.selection.size() > 0)
3307	3808	//SetMaterial(copy);
3308	3809	{
..	..	@@ -3353,7 +3854,7 @@
3353	3854	assert false;
3354	3855	}
3355	3856
3356		- void EditSelection()
	3857	+ void EditSelection(boolean newWindow)
3357	3858	{
3358	3859	}
3359	3860
..	..	@@ -3361,11 +3862,11 @@
3361	3862	{
3362	3863	copy.ResetBlockLoop(); // temporary problem
3363	3864
3364		- boolean random = CameraPane.RANDOM;
3365		- CameraPane.RANDOM = false; // parse everything
	3865	+ boolean random = CameraPane.SWITCH;
	3866	+ CameraPane.SWITCH = false; // parse everything
3366	3867	copy.ResetDisplayList();
3367	3868	copy.HardTouch();
3368		- CameraPane.RANDOM = random;
	3869	+ CameraPane.SWITCH = random;
3369	3870	}
3370	3871
3371	3872	// public void applySelf()
..	..	@@ -3435,10 +3936,40 @@
3435	3936	current.fakedepth = (float) fakedepthField.getFloat();
3436	3937	current.shadowbias = (float) shadowbiasField.getFloat();
3437	3938
3438		- if (!NumberSlider.frozen)
	3939	+ if (!cNumberSlider.frozen)
3439	3940	{
3440	3941	//System.out.println("Propagate = " + propagate);
3441	3942	copy.UpdateMaterial(anchor, current, propagate);
	3943	+
	3944	+ if (copy.material != null)
	3945	+ {
	3946	+ cMaterial mat = copy.material;
	3947	+
	3948	+ colorField.SetToolTipValue((mat.color));
	3949	+ modulationField.SetToolTipValue((mat.modulation));
	3950	+ metalnessField.SetToolTipValue((mat.metalness));
	3951	+ diffuseField.SetToolTipValue((mat.diffuse));
	3952	+ specularField.SetToolTipValue((mat.specular));
	3953	+ shininessField.SetToolTipValue((mat.shininess));
	3954	+ shiftField.SetToolTipValue((mat.shift));
	3955	+ ambientField.SetToolTipValue((mat.ambient));
	3956	+ lightareaField.SetToolTipValue((mat.lightarea));
	3957	+ diffusenessField.SetToolTipValue((mat.factor));
	3958	+ velvetField.SetToolTipValue((mat.velvet));
	3959	+ sheenField.SetToolTipValue((mat.sheen));
	3960	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3961	+ backlitField.SetToolTipValue((mat.bump));
	3962	+ anisoField.SetToolTipValue((mat.aniso));
	3963	+ anisoVField.SetToolTipValue((mat.anisoV));
	3964	+ cameraField.SetToolTipValue((mat.cameralight));
	3965	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3966	+ shadowField.SetToolTipValue((mat.shadow));
	3967	+ textureField.SetToolTipValue((mat.texture));
	3968	+ opacityField.SetToolTipValue((mat.opacity));
	3969	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3970	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3971	+ }
	3972	+
3442	3973	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3443	3974	{
3444	3975	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3483,6 +4014,7 @@
3483	4014	\|\| e.getSource() == apertureField
3484	4015	\|\| e.getSource() == shadowblurField)
3485	4016	{
	4017	+ new Exception().printStackTrace();
3486	4018	System.exit(0);
3487	4019	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3488	4020	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3509,7 +4041,13 @@
3509	4041	//System.out.println("PARENT = " + parent);
3510	4042	//if (parent != null)
3511	4043	// parent.applySelf();
3512		- refreshContents();
	4044	+ if (e.getSource() == normalpushField)
	4045	+ {
	4046	+ objEditor.refreshContents();
	4047	+ //Refresh();
	4048	+ }
	4049	+ else
	4050	+ refreshContents();
3513	4051	// ??? client.refreshEditWindow();
3514	4052	}
3515	4053	//else
..	..	@@ -3521,7 +4059,7 @@
3521	4059	//group.name = nameField.getText();
3522	4060	//objEditor.applySelf();
3523	4061
3524		- assert (objEditor == this);
	4062	+ // OCT2018: assert (objEditor == this);
3525	4063	if (copy.selection == null \|\| copy.selection.size() == 0)
3526	4064	//super.applySelf()
3527	4065	; else
..	..	@@ -3545,12 +4083,18 @@
3545	4083	objEditor.copy = keep;
3546	4084	}
3547	4085	}
	4086	+
	4087	+ if (normalpushField != null)
	4088	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3548	4089	}
3549	4090
3550	4091	void SnapObject()
3551	4092	{
3552		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3553		- SnapObject(obj);
	4093	+ if (copy.selection.size() > 0)
	4094	+ {
	4095	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4096	+ SnapObject(obj);
	4097	+ }
3554	4098	}
3555	4099
3556	4100	void SnapObject(Object3D obj)
..	..	@@ -3664,7 +4208,7 @@
3664	4208
3665	4209	if (obj.parent != null)
3666	4210	{
3667		- obj.parent.TransformToWorld(interest);
	4211	+// obj.parent.TransformToWorld(interest);
3668	4212	}
3669	4213
3670	4214	if (!CameraPane.TRACK)
..	..	@@ -3796,7 +4340,7 @@
3796	4340
3797	4341	radioPanel.revalidate();
3798	4342	radioPanel.repaint();
3799		- ctrlPanel.revalidate(); // ? new
	4343	+ ctrlPanel.validate(); // ? new
3800	4344	ctrlPanel.repaint();
3801	4345	}
3802	4346	}
..	..	@@ -3805,6 +4349,8 @@
3805	4349
3806	4350	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3807	4351	{
	4352	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4353	+ Save();
3808	4354	//Tween.set(thing, 0).target(1).start(tweenManager);
3809	4355	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3810	4356	// if (thing instanceof GenericJointDemo)
..	..	@@ -3891,6 +4437,12 @@
3891	4437	{
3892	4438	ResetModel();
3893	4439	Select(thing.GetTreePath(), true, false); // unselect... false);
	4440	+
	4441	+ if (thing.Size() == 0)
	4442	+ {
	4443	+ //EditSelection(false);
	4444	+ }
	4445	+
3894	4446	refreshContents();
3895	4447	}
3896	4448
..	..	@@ -4008,6 +4560,7 @@
4008	4560	}
4009	4561	}
4010	4562	}
	4563	+
4011	4564	LoadGFDThread loadGFDThread;
4012	4565
4013	4566	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4027,8 +4580,10 @@
4027	4580
4028	4581	try
4029	4582	{
	4583	+ // Try compressed version first.
4030	4584	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4031		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4585	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4586	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4032	4587
4033	4588	readobj = (Object3D) p.readObject();
4034	4589	istream.close();
..	..	@@ -4036,7 +4591,20 @@
4036	4591	readobj.ResetDisplayList();
4037	4592	} catch (Exception e)
4038	4593	{
4039		- e.printStackTrace();
	4594	+ //e.printStackTrace();
	4595	+ try
	4596	+ {
	4597	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4598	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4599	+
	4600	+ readobj = (Object3D) p.readObject();
	4601	+ istream.close();
	4602	+
	4603	+ readobj.ResetDisplayList();
	4604	+ } catch (Exception e2)
	4605	+ {
	4606	+ e2.printStackTrace();
	4607	+ }
4040	4608	}
4041	4609	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4042	4610	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4082,6 +4650,12 @@
4082	4650
4083	4651	void LoadIt(Object obj)
4084	4652	{
	4653	+ if (obj == null)
	4654	+ {
	4655	+ // Invalid file
	4656	+ return;
	4657	+ }
	4658	+
4085	4659	System.out.println("Loaded " + obj);
4086	4660	//new Exception().printStackTrace();
4087	4661	Object3D readobj = (Object3D) obj;
..	..	@@ -4091,6 +4665,8 @@
4091	4665
4092	4666	if (readobj != null)
4093	4667	{
	4668	+ if (Globals.SAVEONMAKE)
	4669	+ Save();
4094	4670	try
4095	4671	{
4096	4672	//readobj.deepCopySelf(copy);
..	..	@@ -4151,9 +4727,9 @@
4151	4727	}
4152	4728	}
4153	4729
4154		- void load() // throws ClassNotFoundException
	4730	+ void Open() // throws ClassNotFoundException
4155	4731	{
4156		- if (GrafreeD.standAlone)
	4732	+ if (Grafreed.standAlone)
4157	4733	{
4158	4734	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4159	4735	browser.show();
..	..	@@ -4240,11 +4816,13 @@
4240	4816	try
4241	4817	{
4242	4818	FileOutputStream ostream = new FileOutputStream(lastname);
4243		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4819	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4820	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4244	4821
4245	4822	p.writeObject(copy);
4246	4823	p.flush();
4247	4824
	4825	+ zstream.close();
4248	4826	ostream.close();
4249	4827
4250	4828	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4254,17 +4832,20 @@
4254	4832	{
4255	4833	}
4256	4834	}
	4835	+
4257	4836	String lastname;
4258	4837
4259	4838	void saveAs()
4260	4839	{
4261		- if (GrafreeD.standAlone)
	4840	+ if (Grafreed.standAlone)
4262	4841	{
4263	4842	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4264	4843	browser.setVisible(true);
4265	4844	String filename = browser.getFile();
4266	4845	if (filename != null && filename.length() > 0)
4267	4846	{
	4847	+ if (!filename.endsWith(".gfd"))
	4848	+ filename += ".gfd";
4268	4849	lastname = browser.getDirectory() + filename;
4269	4850	save();
4270	4851	}
..	..	@@ -4363,13 +4944,13 @@
4363	4944	try
4364	4945	{
4365	4946	FileOutputStream ostream = new FileOutputStream(filename);
4366		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4367		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4947	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4948	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4368	4949
4369	4950	Object3D objectparent = obj.parent;
4370	4951	obj.parent = null;
4371	4952
4372		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4953	+ Object3D object = (Object3D) Grafreed.clone(obj);
4373	4954
4374	4955	obj.parent = objectparent;
4375	4956
..	..	@@ -4381,8 +4962,8 @@
4381	4962	p.writeObject(object);
4382	4963	p.flush();
4383	4964
	4965	+ zstream.close();
4384	4966	ostream.close();
4385		- // zstream.close();
4386	4967
4387	4968	// group.selection.get(0).parent = parent;
4388	4969	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4403,7 +4984,7 @@
4403	4984	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4404	4985	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4405	4986	copy.generatePOV(buffer);
4406		- if (GrafreeD.standAlone)
	4987	+ if (Grafreed.standAlone)
4407	4988	{
4408	4989	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4409	4990	browser.show();
..	..	@@ -4429,53 +5010,70 @@
4429	5010	Object3D client;
4430	5011	Object3D copy;
4431	5012	MenuBar menuBar;
4432		- Menu windowMenu;
4433		- MenuItem loadItem;
	5013	+ Menu fileMenu;
	5014	+ MenuItem newItem;
	5015	+ MenuItem openItem;
4434	5016	MenuItem saveItem;
4435	5017	MenuItem saveAsItem;
4436	5018	MenuItem exportAsItem;
4437	5019	MenuItem reexportItem;
4438	5020	MenuItem povItem;
4439	5021	MenuItem closeItem;
4440		- Menu cameraMenu;
	5022	+
4441	5023	CheckboxMenuItem zBufferItem;
4442	5024	//MenuItem normalLensItem;
4443		- MenuItem editCameraItem;
4444		- MenuItem revertCameraItem;
4445		- CheckboxMenuItem toggleLiveItem;
4446	5025	MenuItem stepItem;
4447		- CheckboxMenuItem toggleFullItem;
	5026	+ CheckboxMenuItem toggleLiveItem;
	5027	+ CheckboxMenuItem toggleFullScreenItem;
	5028	+ CheckboxMenuItem toggleTimelineItem;
4448	5029	CheckboxMenuItem toggleRenderItem;
4449	5030	CheckboxMenuItem toggleDebugItem;
4450	5031	CheckboxMenuItem toggleFrustumItem;
4451	5032	CheckboxMenuItem toggleFootContactItem;
4452	5033	CheckboxMenuItem toggleDLItem;
4453	5034	CheckboxMenuItem toggleTextureItem;
4454		- CheckboxMenuItem toggleRandomItem;
	5035	+ CheckboxMenuItem toggleSwitchItem;
4455	5036	CheckboxMenuItem toggleRootItem;
4456	5037	CheckboxMenuItem animationItem;
	5038	+ MenuItem archiveItem;
4457	5039	CheckboxMenuItem toggleHandleItem;
4458	5040	CheckboxMenuItem togglePaintItem;
4459	5041	JSplitPane mainPanel;
4460	5042	JScrollPane scrollpane;
	5043	+
4461	5044	JPanel toolbarPanel;
4462		- JPanel treePanel;
	5045	+
	5046	+ cGridBag treePanel;
	5047	+
4463	5048	JPanel radioPanel;
4464	5049	ButtonGroup buttonGroup;
4465		- JPanel ctrlPanel;
4466		- JPanel materialPanel;
	5050	+
	5051	+ cGridBag toolboxPanel;
	5052	+ cGridBag materialPanel;
	5053	+ cGridBag ctrlPanel;
	5054	+
4467	5055	JScrollPane infoPanel;
4468		- JPanel optionsPanel;
	5056	+
	5057	+ cGridBag optionsPanel;
	5058	+
4469	5059	JTabbedPane objectPanel;
4470		- JPanel XYZPanel;
	5060	+ boolean materialFlushed;
	5061	+ Object3D latestObject;
	5062	+
	5063	+ cGridBag XYZPanel;
	5064	+
4471	5065	JSplitPane gridPanel;
4472	5066	JSplitPane bigPanel;
4473		- JPanel bigThree;
4474		- JTabbedPane jtp;
4475		- JPanel cameraPanel;
	5067	+
	5068	+ cGridBag bigThree;
	5069	+ cGridBag scenePanel;
	5070	+ cGridBag centralPanel;
	5071	+ JSplitPane cameraPanel;
	5072	+ JPanel timelinePanel;
	5073	+ JMenuBar timelineMenubar;
4476	5074	JSplitPane framePanel;
4477	5075	JTextArea/Field/ nameField;
4478		- cButton textureButton;
	5076	+ //cButton textureButton;
4479	5077	cButton okButton;
4480	5078	cButton applyButton;
4481	5079	cButton cancelButton;
..	..	@@ -4522,65 +5120,72 @@
4522	5120	// MATERIAL
4523	5121	JLabel materialLabel;
4524	5122	JLabel colorLabel;
4525		- NumberSlider colorField;
	5123	+ cNumberSlider colorField;
4526	5124	JLabel modulationLabel;
4527		- NumberSlider modulationField;
	5125	+ cNumberSlider modulationField;
4528	5126	JLabel metalnessLabel;
4529		- NumberSlider metalnessField;
	5127	+ cNumberSlider metalnessField;
4530	5128	JLabel diffuseLabel;
4531		- NumberSlider diffuseField;
	5129	+ cNumberSlider diffuseField;
4532	5130	JLabel specularLabel;
4533		- NumberSlider specularField;
	5131	+ cNumberSlider specularField;
4534	5132	JLabel shininessLabel;
4535		- NumberSlider shininessField;
	5133	+ cNumberSlider shininessField;
4536	5134	JLabel shiftLabel;
4537		- NumberSlider shiftField;
	5135	+ cNumberSlider shiftField;
4538	5136	JLabel ambientLabel;
4539		- NumberSlider ambientField;
	5137	+ cNumberSlider ambientField;
4540	5138	JLabel lightareaLabel;
4541		- NumberSlider lightareaField;
	5139	+ cNumberSlider lightareaField;
4542	5140	JLabel diffusenessLabel;
4543		- NumberSlider diffusenessField;
	5141	+ cNumberSlider diffusenessField;
4544	5142	JLabel velvetLabel;
4545		- NumberSlider velvetField;
	5143	+ cNumberSlider velvetField;
4546	5144	JLabel sheenLabel;
4547		- NumberSlider sheenField;
	5145	+ cNumberSlider sheenField;
4548	5146	JLabel subsurfaceLabel;
4549		- NumberSlider subsurfaceField;
	5147	+ cNumberSlider subsurfaceField;
4550	5148	//JLabel bumpLabel;
4551	5149	//NumberSlider bumpField;
4552	5150	JLabel backlitLabel;
4553		- NumberSlider backlitField;
	5151	+ cNumberSlider backlitField;
4554	5152	JLabel anisoLabel;
4555		- NumberSlider anisoField;
	5153	+ cNumberSlider anisoField;
4556	5154	JLabel anisoVLabel;
4557		- NumberSlider anisoVField;
	5155	+ cNumberSlider anisoVField;
4558	5156	JLabel cameraLabel;
4559		- NumberSlider cameraField;
	5157	+ cNumberSlider cameraField;
4560	5158	JLabel selfshadowLabel;
4561		- NumberSlider selfshadowField;
	5159	+ cNumberSlider selfshadowField;
4562	5160	JLabel shadowLabel;
4563		- NumberSlider shadowField;
	5161	+ cNumberSlider shadowField;
4564	5162	JLabel textureLabel;
4565		- NumberSlider textureField;
	5163	+ cNumberSlider textureField;
4566	5164	JLabel opacityLabel;
4567		- NumberSlider opacityField;
	5165	+ cNumberSlider opacityField;
4568	5166	JLabel fakedepthLabel;
4569		- NumberSlider fakedepthField;
	5167	+ cNumberSlider fakedepthField;
4570	5168	JLabel shadowbiasLabel;
4571		- NumberSlider shadowbiasField;
	5169	+ cNumberSlider shadowbiasField;
4572	5170	JLabel bumpLabel;
4573		- NumberSlider bumpField;
	5171	+ cNumberSlider bumpField;
4574	5172	JLabel noiseLabel;
4575		- NumberSlider noiseField;
	5173	+ cNumberSlider noiseField;
4576	5174	JLabel powerLabel;
4577		- NumberSlider powerField;
	5175	+ cNumberSlider powerField;
4578	5176	JLabel borderfadeLabel;
4579		- NumberSlider borderfadeField;
	5177	+ cNumberSlider borderfadeField;
4580	5178	JLabel fogLabel;
4581		- NumberSlider fogField;
	5179	+ cNumberSlider fogField;
4582	5180	JLabel opacityPowerLabel;
4583		- NumberSlider opacityPowerField;
4584		- JTree jTree;
	5181	+ cNumberSlider opacityPowerField;
	5182	+ cTree jTree;
4585	5183	//ObjectUI parent;
	5184	+
	5185	+ cNumberSlider normalpushField;
	5186	+
	5187	+ private MenuItem importGFDItem;
	5188	+ private MenuItem importVRMLX3DItem;
	5189	+ private MenuItem import3DSItem;
	5190	+ private MenuItem importOBJItem;
4586	5191	}