~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,
..	..	@@ -31,6 +37,70 @@
31	37	boolean timeline;
32	38	boolean wasFullScreen;
33	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	+
34	104	// SCRIPT
35	105
36	106	transient JFrame textpanel = null;
..	..	@@ -121,51 +191,62 @@
121	191	void keyPressed(int key, int modifiers)
122	192	{
123	193	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	194	+ Globals.theRenderer.keyPressed(key, modifiers);
125	195	}
126	196	*/
127	197
128	198	static GridBagConstraints aConstraints;
129	199	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	200	+
132	201	static int GRIDWIDTH = 100; // 4;
133	202
134	203	public void closeUI()
135	204	{
136	205	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
139	208	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
141	210
142		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
143	214	return;
144	215
145		- objEditor.ctrlPanel.remove(liveCB);
146		- objEditor.ctrlPanel.remove(hideCB);
147		- objEditor.ctrlPanel.remove(markCB);
148		-
149		- objEditor.ctrlPanel.remove(randomCB);
150		- objEditor.ctrlPanel.remove(speedupCB);
151		- objEditor.ctrlPanel.remove(rewindCB);
152		-
153		- objEditor.ctrlPanel.remove(resetButton);
154		- objEditor.ctrlPanel.remove(stepButton);
155		-// objEditor.ctrlPanel.remove(stepAllButton);
156		-// objEditor.ctrlPanel.remove(resetAllButton);
157		- objEditor.ctrlPanel.remove(link2masterCB);
158		- //objEditor.ctrlPanel.remove(flipVCB);
159		- //objEditor.ctrlPanel.remove(texresMenu);
160		- objEditor.ctrlPanel.remove(slowerButton);
161		- objEditor.ctrlPanel.remove(fasterButton);
162		- 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);
163	242	}
164	243
165	244	public ObjEditor GetEditor()
166	245	{
167	246	return objEditor; //.GetEditor();
168	247	}
	248	+
	249	+ // Sometimes myself, sometimes my callee's.
169	250	ObjEditor objEditor;
170	251
171	252	/*
..	..	@@ -228,6 +309,7 @@
228	309	//localCopy.parent = null;
229	310
230	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
231	313	objEditor = this;
232	314	this.callee = callee;
233	315
..	..	@@ -258,28 +340,49 @@
258	340	return frame.action(event, obj);
259	341	}
260	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	+
261	348	void SetupMenu()
262	349	{
263	350	frame.setMenuBar(menuBar = new MenuBar());
264		- menuBar.add(windowMenu = new Menu("File"));
265		- windowMenu.add(loadItem = new MenuItem("Load..."));
266		- windowMenu.add("-");
267		- windowMenu.add(saveItem = new MenuItem("Save"));
268		- 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..."));
269	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
270		- windowMenu.add("-");
271		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
272		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
273		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
274	376	if (client.parent != null)
275	377	{
276		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
277	379	} else
278	380	{
279		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
280	382	}
281	383
282		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
283	386	saveItem.addActionListener(this);
284	387	saveAsItem.addActionListener(this);
285	388	exportAsItem.addActionListener(this);
..	..	@@ -287,81 +390,66 @@
287	390	//povItem.addActionListener(this);
288	391	closeItem.addActionListener(this);
289	392
290		- menuBar.add(cameraMenu = new Menu("View"));
291		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
292		- //zBufferItem.addActionListener(this);
293		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
294		- //normalLensItem.addActionListener(this);
295		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
296		- revertCameraItem.addActionListener(this);
297		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
298		- toggleTimelineItem.addItemListener(this);
299		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
300		- toggleFullScreenItem.addItemListener(this);
301		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
302		- cameraMenu.add("-");
303		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
304		- toggleTextureItem.addItemListener(this);
305		- toggleTextureItem.setState(CameraPane.textureon);
306		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
307		- toggleLiveItem.addItemListener(this);
308		- toggleLiveItem.setState(CameraPane.isLIVE());
309		- cameraMenu.add(stepItem = new MenuItem("Step"));
310		- stepItem.addActionListener(this);
311		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
312		-// toggleDLItem.addItemListener(this);
313		-// toggleDLItem.setState(false);
314		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
315		- toggleRenderItem.addItemListener(this);
316		- toggleRenderItem.setState(!CameraPane.frozen);
317		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
318		- toggleDebugItem.addItemListener(this);
319		- toggleDebugItem.setState(CameraPane.DEBUG);
320		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
321		- toggleFrustumItem.addItemListener(this);
322		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
323		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
324		- toggleFootContactItem.addItemListener(this);
325		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
326		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
327		- toggleRandomItem.addItemListener(this);
328		- toggleRandomItem.setState(CameraPane.RANDOM);
329		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
330		- toggleHandleItem.addItemListener(this);
331		- toggleHandleItem.setState(CameraPane.HANDLES);
332		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
333		- togglePaintItem.addItemListener(this);
334		- togglePaintItem.setState(CameraPane.PAINTMODE);
335		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
336		-// toggleRootItem.addItemListener(this);
337		-// toggleRootItem.setState(false);
338		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
339		-// animationItem.addItemListener(this);
340		-// animationItem.setState(CameraPane.ANIMATION);
341		- cameraMenu.add("-");
342		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
343		- editCameraItem.addActionListener(this);
344		-
345	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	+
346	420	toolbarPanel = new JPanel();
347	421	toolbarPanel.setName("Toolbar");
348		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
349	423	treePanel.setName("Tree");
350		- ctrlPanel = new JPanel(); // new GridBagLayout());
351		- ctrlPanel.setName("Edit");
352		- 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);
353	438	materialPanel.setName("Material");
	439	+
354	440	/JTextPane/
355	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
356	444	infoarea.setEditable(true);
357	445	SetText();
358	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
359	447	// infoarea.setOpaque(false);
360	448	// //infoarea.setForeground(textcolor);
361		- infoarea.setLineWrap(true);
362		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
363	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
364		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
365	453	infoPanel.setName("Info");
366	454	//infoPanel.setLayout(new BorderLayout());
367	455	//infoPanel.add(createTextPane());
..	..	@@ -370,16 +458,23 @@
370	458	mainPanel.setName("Main");
371	459	mainPanel.setContinuousLayout(true);
372	460	mainPanel.setOneTouchExpandable(true);
373		- mainPanel.setDividerLocation(1.0);
374	461	mainPanel.setDividerSize(9);
375		- mainPanel.setResizeWeight(0);
376		-
	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	+
377	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
378	473	//mainPanel.setLayout(new GridBagLayout());
379	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
380		- treePanel.setLayout(new GridBagLayout());
381		- ctrlPanel.setLayout(new GridBagLayout());
382		- materialPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
	477	+ //materialPanel.setLayout(new GridBagLayout());
383	478
384	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
385	480	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -418,7 +513,7 @@
418	513	static String newline = "\n";
419	514	protected static final String buttonString = "JButton";
420	515	StyledDocument doc;
421		- JTextArea infoarea;
	516	+ JTextPane infoarea;
422	517
423	518	void ClearInfo()
424	519	{
..	..	@@ -441,10 +536,10 @@
441	536	e.printStackTrace();
442	537	}
443	538
444		- String selection = infoarea.getText();
445		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
446		- java.awt.datatransfer.Clipboard clipboard =
447		- 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();
448	543	//clipboard.setContents(data, data);
449	544	}
450	545
..	..	@@ -467,13 +562,13 @@
467	562	//SendInfo("Name:", "bold");
468	563	if (sel.GetTextures() != null \|\| debug)
469	564	{
470		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
471	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
472	567	if (sel.Size() > 0)
473	568	{
474	569	si.SendInfo("#children = " + sel.Size(), "regular");
475	570	}
476		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
477	572	if (debug)
478	573	{
479	574	try
..	..	@@ -485,7 +580,10 @@
485	580	}
486	581
487	582	if (full)
488		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
489	587
490	588	if (sel.bRep != null)
491	589	{
..	..	@@ -512,7 +610,7 @@
512	610	}
513	611	if (sel.support != null)
514	612	{
515		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
516	614	}
517	615	if (sel.scriptnode != null)
518	616	{
..	..	@@ -583,6 +681,9 @@
583	681	{
584	682	CameraPane.pointflow = (PointFlow) sel;
585	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
586	687	}
587	688	}
588	689
..	..	@@ -598,68 +699,191 @@
598	699	}
599	700	}
600	701
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	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;
	720	+
	721	+ void Minimize()
	722	+ {
	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)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	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	+
601	760	void ToggleFullScreen()
602	761	{
603		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
604	767	{
605		- frame.getContentPane().remove(/"Center",/bigThree);
606		- framePanel.add(bigThree);
607		- frame.getContentPane().add(/"Center",/framePanel);
	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	+
608	791	} else
609	792	{
610		- frame.getContentPane().remove(/"Center",/framePanel);
611		- framePanel.remove(bigThree);
612		- frame.getContentPane().add(/"Center",/bigThree);
	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);
613	815	}
614		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
615	817	}
616	818
617		- private JTextArea createTextPane()
	819	+ private byte[] CompressCopy()
618	820	{
619		- String[] initString =
620		- {
621		- "This is an editable JTextPane, ", //regular
622		- "another ", //italic
623		- "styled ", //bold
624		- "text ", //small
625		- "component, ", //large
626		- "which supports embedded components..." + newline,//regular
627		- " " + newline, //button
628		- "...and embedded icons..." + newline, //regular
629		- " ", //icon
630		- newline + "JTextPane is a subclass of JEditorPane that "
631		- + "uses a StyledEditorKit and StyledDocument, and provides "
632		- + "cover methods for interacting with those objects."
633		- };
	821	+ boolean temp = CameraPane.SWITCH;
	822	+ CameraPane.SWITCH = false;
	823	+
	824	+ copy.ExtractBigData(versiontable);
	825	+ // if (copy == client)
	826	+
	827	+ byte[] versions[] = copy.versions;
	828	+ copy.versions = null;
	829	+
	830	+ byte[] compress = Compress(copy);
	831	+
	832	+ copy.versions = versions;
	833	+
	834	+ copy.RestoreBigData(versiontable);
	835	+
	836	+ CameraPane.SWITCH = temp;
	837	+
	838	+ return compress;
	839	+ }
634	840
635		- String[] initStyles =
636		- {
637		- "regular", "italic", "bold", "small", "large",
638		- "regular", "button", "regular", "icon",
639		- "regular"
640		- };
	841	+ private JTextPane createTextPane()
	842	+ {
	843	+// TEXTAREA String[] initString =
	844	+// {
	845	+// "This is an editable JTextPane, ", //regular
	846	+// "another ", //italic
	847	+// "styled ", //bold
	848	+// "text ", //small
	849	+// "component, ", //large
	850	+// "which supports embedded components..." + newline,//regular
	851	+// " " + newline, //button
	852	+// "...and embedded icons..." + newline, //regular
	853	+// " ", //icon
	854	+// newline + "JTextPane is a subclass of JEditorPane that "
	855	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	856	+// + "cover methods for interacting with those objects."
	857	+// };
	858	+//
	859	+// String[] initStyles =
	860	+// {
	861	+// "regular", "italic", "bold", "small", "large",
	862	+// "regular", "button", "regular", "icon",
	863	+// "regular"
	864	+// };
	865	+//
	866	+// JTextPane textPane = new JTextPane();
	867	+// textPane.setEditable(true);
	868	+// /StyledDocument/ doc = textPane.getStyledDocument();
	869	+// addStylesToDocument(doc);
	870	+//
	871	+// try
	872	+// {
	873	+// for (int j = 0; j < 2; j++)
	874	+// {
	875	+// for (int i = 0; i < initString.length; i++)
	876	+// {
	877	+// doc.insertString(doc.getLength(), initString[i],
	878	+// doc.getStyle(initStyles[i]));
	879	+// }
	880	+// }
	881	+// } catch (BadLocationException ble)
	882	+// {
	883	+// System.err.println("Couldn't insert initial text into text pane.");
	884	+// }
641	885
642		- JTextPane textPane = new JTextPane();
643		- textPane.setEditable(true);
644		- /StyledDocument/ doc = textPane.getStyledDocument();
645		- addStylesToDocument(doc);
646		-
647		- try
648		- {
649		- for (int j = 0; j < 2; j++)
650		- {
651		- for (int i = 0; i < initString.length; i++)
652		- {
653		- doc.insertString(doc.getLength(), initString[i],
654		- doc.getStyle(initStyles[i]));
655		- }
656		- }
657		- } catch (BadLocationException ble)
658		- {
659		- System.err.println("Couldn't insert initial text into text pane.");
660		- }
661		-
662		- return new JTextArea(); // textPane;
	886	+ return new JTextPane(); // textPane;
663	887	}
664	888
665	889	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -712,7 +936,7 @@
712	936	protected static ImageIcon createImageIcon(String path,
713	937	String description)
714	938	{
715		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	939	+ java.net.URL imgURL = Grafreed.class.getResource(path);
716	940	if (imgURL != null)
717	941	{
718	942	return new ImageIcon(imgURL, description);
..	..	@@ -744,6 +968,7 @@
744	968	// NumberSlider vDivsField;
745	969	// JCheckBox endcaps;
746	970	JCheckBox liveCB;
	971	+ JCheckBox selectCB;
747	972	JCheckBox hideCB;
748	973	JCheckBox link2masterCB;
749	974	JCheckBox markCB;
..	..	@@ -751,7 +976,12 @@
751	976	JCheckBox speedupCB;
752	977	JCheckBox rewindCB;
753	978	JCheckBox flipVCB;
	979	+
	980	+ cCheckBox toggleTextureCB;
	981	+ cCheckBox toggleSwitchCB;
	982	+
754	983	JComboBox texresMenu;
	984	+
755	985	JButton resetButton;
756	986	JButton stepButton;
757	987	JButton stepAllButton;
..	..	@@ -759,115 +989,87 @@
759	989	JButton slowerButton;
760	990	JButton fasterButton;
761	991	JButton remarkButton;
	992	+
	993	+ cGridBag editPanel;
	994	+ cGridBag editCommandsPanel;
	995	+
	996	+ cGridBag namePanel;
	997	+ cGridBag setupPanel;
	998	+ cGridBag setupPanel2;
	999	+ cGridBag objectCommandsPanel;
	1000	+ cGridBag pushPanel;
	1001	+ cGridBag fillPanel;
762	1002
763		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1003	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
764	1004	{
765	1005	JCheckBox cb;
766	1006
767		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
768		- oe.aConstraints.gridwidth = 1; // 3;
769		-// oe.aConstraints.weightx = 1;
770		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
771		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1007	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
772	1008	cb.addItemListener(this);
773		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
774		- oe.aConstraints.gridwidth = 1;
775		- oe.aConstraints.gridx += 1;
776	1009
777	1010	return cb;
778	1011	}
779	1012
780		- cButton AddButton(ObjEditor oe, String label)
	1013	+ cButton AddButton(cGridBag panel, String label)
781	1014	{
782	1015	cButton cb;
783	1016
784		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
785		- oe.aConstraints.gridwidth = 1;
786		-// oe.aConstraints.weightx = 1;
787		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
788		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1017	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
789	1018	cb.addActionListener(this);
790		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
791		- oe.aConstraints.gridwidth = 1;
792		- oe.aConstraints.gridx += 1;
793	1019
794	1020	return cb;
795	1021	}
796	1022
797		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1023	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
798	1024	{
799	1025	JComboBox combo;
800	1026
801		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
802		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- oe.aConstraints.gridx += 1;
	1027	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
804	1028	combo.addActionListener(this);
805	1029
806	1030	return combo;
807	1031	}
808	1032
809		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1033	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
810	1034	{
811		- NumberSlider combo;
	1035	+ cGridBag control = new cGridBag();
	1036	+
	1037	+ cNumberSlider combo;
812	1038
813	1039	JLabel jlabel = new JLabel(label);
814		-
815		- aConstraints.fill = GridBagConstraints.VERTICAL;
816	1040	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
817		- aConstraints.gridwidth = 2;
818		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
819		- aConstraints.gridx += 1;
820		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
822		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.gridwidth = 1;
825		-
	1041	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1042	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826	1043	combo.setFloat(current);
827		-
828		- combo.label = jlabel;
829		-
830		- combo.addChangeListener(this);
831		-
832		- return combo;
	1044	+
	1045	+ panel.add(control);
	1046	+
	1047	+ return control;
833	1048	}
834	1049
835		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1050	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
836	1051	{
837		- NumberSlider combo;
	1052	+ cGridBag control = new cGridBag();
	1053	+
	1054	+ cNumberSlider combo;
838	1055
839	1056	JLabel jlabel = new JLabel(label);
840		-
841		- aConstraints.fill = GridBagConstraints.VERTICAL;
842	1057	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
843		- aConstraints.gridwidth = 2;
844		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
845		- aConstraints.gridx += 1;
846		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
847		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
848		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851		-
	1058	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1059	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
852	1060	combo.setInteger(current);
853	1061
854		- combo.label = jlabel;
855		-
856		- combo.addChangeListener(this);
857		-
858		- return combo;
	1062	+ panel.add(control);
	1063	+
	1064	+ return control;
859	1065	}
860	1066
861		- JTextArea AddText(JPanel ctrlPanel, String name)
	1067	+ JTextArea AddText(cGridBag ctrlPanel, String name)
862	1068	{
863	1069	JTextArea text;
864	1070
865		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
866		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
867		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1071	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
868	1072	text.addCaretListener(this);
869		- aConstraints.gridx += 1;
870		- aConstraints.gridwidth = 1;
871	1073
872	1074	return text;
873	1075	}
..	..	@@ -897,9 +1099,16 @@
897	1099	objEditor.ctrlPanel.remove(j);
898	1100	}
899	1101
	1102	+ void Remove(cNumberSlider j)
	1103	+ {
	1104	+ j.removeChangeListener(this);
	1105	+ //objEditor.ctrlPanel.remove(j.label);
	1106	+ objEditor.ctrlPanel.remove(j);
	1107	+ }
	1108	+
900	1109	/*
901	1110	*/
902		- void Return() // ObjEditor oe)
	1111	+ void Return0() // ObjEditor oe)
903	1112	{
904	1113	aConstraints.gridy += 1;
905	1114	aConstraints.gridx = 0;
..	..	@@ -954,35 +1163,78 @@
954	1163
955	1164	void SetupUI2(ObjEditor oe)
956	1165	{
957		-// oe.aConstraints.weightx = 0;
958		-// oe.aConstraints.weighty = 0;
959		-// oe.aConstraints.gridx = 0;
960		-// oe.aConstraints.gridy = 0;
961		- SetupName(oe);
	1166	+ //SetupName(oe);
962	1167
963		- if (!GroupEditor.allparams)
	1168	+ namePanel = new cGridBag();
	1169	+
	1170	+ nameField = AddText(namePanel, copy.GetName());
	1171	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1172	+ oe.ctrlPanel.add(namePanel);
	1173	+
	1174	+ oe.ctrlPanel.Return();
	1175	+
	1176	+ if (!allparams)
964	1177	return;
965	1178
966		- liveCB = AddCheckBox(oe, "Live", copy.live);
967		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
968		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1179	+ setupPanel = new cGridBag().setVertical(false);
	1180	+
	1181	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1182	+ liveCB.setToolTipText("Animate object");
	1183	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1184	+ selectCB.setToolTipText("Make object selectable");
969	1185	// Return();
970		- markCB = AddCheckBox(oe, "Mark", copy.marked);
971		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
972		- randomCB = AddCheckBox(oe, "Rand", copy.random);
973		- Return();
974		- resetButton = AddButton(oe, "Reset");
975		- stepButton = AddButton(oe, "Step");
	1186	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1187	+ hideCB.setToolTipText("Hide object");
	1188	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1189	+ markCB.setToolTipText("As animation target transform");
	1190	+
	1191	+ setupPanel2 = new cGridBag().setVertical(false);
	1192	+
	1193	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1194	+ rewindCB.setToolTipText("Rewind animation");
	1195	+
	1196	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1197	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1198	+
	1199	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1200	+ link2masterCB.setToolTipText("Attach to support");
	1201	+
	1202	+ if (Globals.ADVANCED)
	1203	+ {
	1204	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1205	+ speedupCB.setToolTipText("Option motion capture");
	1206	+ }
	1207	+
	1208	+ oe.ctrlPanel.add(setupPanel);
	1209	+ oe.ctrlPanel.Return();
	1210	+ oe.ctrlPanel.add(setupPanel2);
	1211	+ oe.ctrlPanel.Return();
	1212	+
	1213	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1214	+
	1215	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1216	+ resetButton.setToolTipText("Jump to frame zero");
	1217	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1218	+ stepButton.setToolTipText("Step one frame");
976	1219	// resetAllButton = AddButton(oe, "Reset All");
977	1220	// stepAllButton = AddButton(oe, "Step All");
978		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
979	1221	// Return();
980		- slowerButton = AddButton(oe, "Slow");
981		- fasterButton = AddButton(oe, "Fast");
982		- remarkButton = AddButton(oe, "Rem");
	1222	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1223	+ slowerButton.setToolTipText("Decrease animation speed");
	1224	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1225	+ fasterButton.setToolTipText("Increase animation speed");
	1226	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1227	+ remarkButton.setToolTipText("Set the current transform as the target");
983	1228
984		- Return();
	1229	+ oe.ctrlPanel.add(objectCommandsPanel);
	1230	+ oe.ctrlPanel.Return();
985	1231
	1232	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1233	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1234	+ //Return();
	1235	+
	1236	+ oe.ctrlPanel.Return();
	1237	+
986	1238	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1239	// ObjEditor.aConstraints.gridx += 1;
988	1240
..	..	@@ -1076,7 +1328,7 @@
1076	1328	oe.aConstraints.gridwidth = 1;
1077	1329	/**/
1078	1330	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1331	+ oe.ctrlPanel.Return();
1080	1332
1081	1333	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1334	//textureButton.setEnabled(false);
..	..	@@ -1178,11 +1430,25 @@
1178	1430	//JPanel worldPanel =
1179	1431	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1180	1432	//worldPanel.setName("World");
1181		- centralPanel = new JPanel(new BorderLayout());
1182		- timelinePanel = new JPanel(new BorderLayout());
1183		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1433	+ centralPanel = new cGridBag();
	1434	+ centralPanel.preferredWidth = 20;
	1435	+
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ timelinePanel = new JPanel(new BorderLayout());
	1439	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1184	1440
	1441	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1442	+ cameraPanel.setContinuousLayout(true);
	1443	+ cameraPanel.setOneTouchExpandable(true);
	1444	+// cameraPanel.setDividerLocation(0.9);
	1445	+// cameraPanel.setDividerSize(9);
	1446	+ cameraPanel.setResizeWeight(1.0);
	1447	+
	1448	+ }
	1449	+
1185	1450	centralPanel.add(cameraView);
	1451	+ centralPanel.setFocusable(true);
1186	1452	//frame.setJMenuBar(timelineMenubar);
1187	1453	//centralPanel.add(timelinePanel);
1188	1454
..	..	@@ -1201,12 +1467,13 @@
1201	1467	//frontView.object = copy;
1202	1468	//sideView.object = copy;
1203	1469
1204		- XYZPanel = new JPanel();
1205		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1470	+ XYZPanel = new cGridBag().setVertical(true);
	1471	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1206	1472
1207		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1208		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1209		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1473	+ XYZPanel.preferredWidth = 5;
	1474	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1475	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1476	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1210	1477
1211	1478	/*
1212	1479	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1244,11 +1511,16 @@
1244	1511	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1245	1512	//tmp.setName("Edit");
1246	1513	objectPanel.add(materialPanel);
1247		- JPanel north = new JPanel(new BorderLayout());
1248		- north.setName("Edit");
1249		- north.add(ctrlPanel, BorderLayout.NORTH);
1250		- objectPanel.add(north);
1251		- objectPanel.add(infoPanel);
	1514	+// JPanel north = new JPanel(new BorderLayout());
	1515	+// north.setName("Edit");
	1516	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1517	+// objectPanel.add(north);
	1518	+ objectPanel.add(editPanel);
	1519	+
	1520	+ //if (Globals.ADVANCED)
	1521	+ objectPanel.add(infoPanel);
	1522	+
	1523	+ objectPanel.add(toolboxPanel);
1252	1524
1253	1525	/*
1254	1526	aConstraints.gridx = 0;
..	..	@@ -1257,7 +1529,7 @@
1257	1529	aConstraints.gridy += 1;
1258	1530	aConstraints.gridwidth = 1;
1259	1531	mainPanel.add(objectPanel, aConstraints);
1260		- */
	1532	+ */
1261	1533
1262	1534	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1263	1535	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1268,16 +1540,23 @@
1268	1540	scrollpane.setWheelScrollingEnabled(true);
1269	1541	scrollpane.addMouseWheelListener(this); // Default not fast enough
1270	1542
1271		- /JTabbedPane/ scenePanel = new JTabbedPane();
1272		- scenePanel.add(scrollpane);
	1543	+ /JTabbedPane/ scenePanel = new cGridBag();
	1544	+ scenePanel.preferredWidth = 6;
	1545	+
	1546	+ JTabbedPane tabbedPane = new JTabbedPane();
	1547	+ tabbedPane.add(scrollpane);
1273	1548
1274		- scenePanel.add(FSPane = new cFileSystemPane(this));
1275		-
1276		- optionsPanel = new JPanel(new GridBagLayout());
	1549	+ optionsPanel = new cGridBag().setVertical(false);
1277	1550
1278	1551	optionsPanel.setName("Options");
1279		- scenePanel.add(optionsPanel);
	1552	+
	1553	+ AddOptions(optionsPanel); //, aConstraints);
	1554	+
	1555	+ tabbedPane.add(optionsPanel);
	1556	+
	1557	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1280	1558
	1559	+ scenePanel.add(tabbedPane);
1281	1560
1282	1561	/*
1283	1562	cTree jTree = new cTree(null);
..	..	@@ -1311,6 +1590,7 @@
1311	1590	//bigPanel.setSize(new Dimension(10,10));
1312	1591	//bigPanel.add(ctrlPanel);
1313	1592	//bigPanel.add(gridPanel);
	1593	+ /**
1314	1594	bigThree = new JPanel();
1315	1595	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1316	1596	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1334,7 +1614,13 @@
1334	1614	// aConstraints.gridheight = 3;
1335	1615	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1336	1616	bigThree.add(XYZPanel, aWindowConstraints);
	1617	+ /**/
1337	1618
	1619	+ bigThree = new cGridBag();
	1620	+ bigThree.addComponent(scenePanel);
	1621	+ bigThree.addComponent(centralPanel);
	1622	+ bigThree.addComponent(XYZPanel);
	1623	+
1338	1624	// // SIDE EFFECT!!!
1339	1625	// aConstraints.gridx = 0;
1340	1626	// aConstraints.gridy = 0;
..	..	@@ -1342,9 +1628,9 @@
1342	1628	// aConstraints.gridheight = 1;
1343	1629
1344	1630	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1345		- framePanel.setContinuousLayout(true);
1346		- framePanel.setOneTouchExpandable(true);
1347		- framePanel.setDividerLocation(0.8);
	1631	+ framePanel.setContinuousLayout(false);
	1632	+ framePanel.setOneTouchExpandable(false);
	1633	+ //.setDividerLocation(0.8);
1348	1634	//framePanel.setDividerSize(15);
1349	1635	//framePanel.setResizeWeight(0.15);
1350	1636	framePanel.setName("Frame");
..	..	@@ -1355,15 +1641,21 @@
1355	1641	//worldPane.add(bigPanel);
1356	1642	//worldPane.add(worldPanel);
1357	1643	/**/
1358		- frame.getContentPane().add(/"Center",/framePanel);
	1644	+ //frame.getContentPane().add(/"Center",/framePanel);
	1645	+ frame.add(/"Center",/framePanel);
1359	1646	//frame.getContentPane().add(/"Center",/ worldPane);
1360	1647
1361	1648	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1362	1649
1363		- frame.setSize(1024, 768);
1364		- frame.show();
1365		-
	1650	+ frame.setSize(1280, 860);
	1651	+
	1652	+ cameraView.requestFocusInWindow();
	1653	+
1366	1654	gridPanel.setDividerLocation(1.0);
	1655	+
	1656	+ frame.validate();
	1657	+
	1658	+ frame.setVisible(true);
1367	1659
1368	1660	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1369	1661	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1376,6 +1668,10 @@
1376	1668	});
1377	1669	}
1378	1670
	1671	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1672	+ {
	1673	+ }
	1674	+
1379	1675	JTree GetTree()
1380	1676	{
1381	1677	return objEditor.jTree;
..	..	@@ -1387,260 +1683,161 @@
1387	1683	ctrlPanel.removeAll();
1388	1684	}
1389	1685
1390		- void SetupMaterial(JPanel ctrlPanel)
	1686	+ void SetupMaterial(cGridBag panel)
1391	1687	{
1392		- aConstraints.weighty = 0;
1393		- //aConstraints.weightx = 1;
1394		- /*
	1688	+ /*
1395	1689	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1396	1690	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1397		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1398		- aConstraints.gridx += 1;
1399	1691	*/
1400	1692
1401		- aConstraints.gridwidth = 1;
1402		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1403		- aConstraints.gridx += 1;
1404		- aConstraints.weighty = 0;
1405		- aConstraints.gridwidth = 1;
	1693	+ cGridBag editBar = new cGridBag().setVertical(false);
	1694	+
	1695	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1696	+ createMaterialButton.setToolTipText("Create material");
1406	1697
1407	1698	/*
1408	1699	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1409		- aConstraints.gridx += 1;
1410		- aConstraints.weighty = 0;
1411		- aConstraints.gridwidth = 1;
1412	1700	*/
1413	1701
1414		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1415		- aConstraints.gridx += 1;
	1702	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1703	+ clearMaterialButton.setToolTipText("Clear material");
	1704	+
	1705	+ if (Globals.ADVANCED)
	1706	+ {
	1707	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1708	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1709	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1710	+ }
1416	1711
1417		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1418		-
1419		- aConstraints.gridx += 1;
1420		-
1421		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1422		-
1423		- aConstraints.gridx += 1;
1424		-
1425		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1426		-
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.weighty = 0;
1430		- aConstraints.gridwidth = 1;
	1712	+ editBar.preferredHeight = 15;
	1713	+
	1714	+ panel.add(editBar);
	1715	+
1431	1716	/**/
1432	1717	//aConstraints.weighty = 0;
1433	1718	////aConstraints.weightx = 1;
1434	1719	//aConstraints.weighty = 1;
1435	1720	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1436	1721	//aConstraints.gridx += 1;
1437		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1438		- aConstraints.weighty = 0;
1439		- aConstraints.gridx = 0;
1440		- aConstraints.gridy += 1;
1441		- aConstraints.gridwidth = 1;
	1722	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1442	1723
1443		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1444		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1445		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1446		- aConstraints.gridx += 1;
1447		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1448		- //aConstraints.weightx = 0;
1449		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1450		- aConstraints.gridx = 0;
1451		- aConstraints.gridy += 1;
1452		- aConstraints.gridwidth = 1;
	1724	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1725	+
	1726	+ cGridBag color = new cGridBag();
	1727	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1728	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1729	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1730	+ //colorField.preferredWidth = 200;
	1731	+ colorSection.add(color);
1453	1732
1454		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1455		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1456		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1457		- aConstraints.gridx += 1;
1458		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.gridwidth = 1;
	1733	+ cGridBag modulation = new cGridBag();
	1734	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1735	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1736	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1737	+ colorSection.add(modulation);
1463	1738
1464		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1465		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1467		- aConstraints.gridx += 1;
1468		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1470		- aConstraints.gridx = 0;
1471		- aConstraints.gridy += 1;
1472		- aConstraints.gridwidth = 1;
	1739	+ cGridBag texture = new cGridBag();
	1740	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1741	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1742	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1743	+ colorSection.add(texture);
1473	1744
1474		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1477		- aConstraints.gridx += 1;
1478		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1480		- aConstraints.gridx = 0;
1481		- aConstraints.gridy += 1;
1482		- aConstraints.gridwidth = 1;
	1745	+ panel.add(new JSeparator());
	1746	+
	1747	+ panel.add(colorSection);
	1748	+
	1749	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1750	+
	1751	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1752	+
	1753	+ cGridBag diffuse = new cGridBag();
	1754	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1755	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1756	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1757	+ diffuseSection.add(diffuse);
1483	1758
1484		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1485		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1486		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1487		- aConstraints.gridx += 1;
1488		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1490		- aConstraints.gridx = 0;
1491		- aConstraints.gridy += 1;
1492		- aConstraints.gridwidth = 1;
	1759	+ cGridBag diffuseness = new cGridBag();
	1760	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1761	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1762	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1763	+ diffuseSection.add(diffuseness);
1493	1764
1494		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1497		- aConstraints.gridx += 1;
1498		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1499		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1500		- aConstraints.gridx = 0;
1501		- aConstraints.gridy += 1;
1502		- aConstraints.gridwidth = 1;
	1765	+ cGridBag selfshadow = new cGridBag();
	1766	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1767	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1768	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1769	+ diffuseSection.add(selfshadow);
1503	1770
1504		- //aConstraints.weighty = 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1506		- //aConstraints.gridx += 1;
1507		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1508		- aConstraints.weighty = 0;
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	1771	+ cGridBag sheen = new cGridBag();
	1772	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1773	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1774	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1775	+ diffuseSection.add(sheen);
1512	1776
1513		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1514		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	1777	+ cGridBag subsurface = new cGridBag();
	1778	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1779	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1780	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1781	+ diffuseSection.add(subsurface);
1522	1782
1523		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1524		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	1783	+ cGridBag shadow = new cGridBag();
	1784	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1785	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1786	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1787	+ diffuseSection.add(shadow);
1532	1788
1533		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1534		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	1789	+ cGridBag fakedepth = new cGridBag();
	1790	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1791	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1792	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1793	+ diffuseSection.add(fakedepth);
1542	1794
1543		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1544		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1545		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1546		- aConstraints.gridx += 1;
1547		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1548		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1549		- aConstraints.gridx = 0;
1550		- aConstraints.gridy += 1;
1551		- aConstraints.gridwidth = 1;
	1795	+ cGridBag shadowbias = new cGridBag();
	1796	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1797	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1798	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1799	+ diffuseSection.add(shadowbias);
1552	1800
1553		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1554		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1555		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1556		- aConstraints.gridx += 1;
1557		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1559		- aConstraints.gridx = 0;
1560		- aConstraints.gridy += 1;
1561		- aConstraints.gridwidth = 1;
	1801	+ panel.add(new JSeparator());
	1802	+
	1803	+ panel.add(diffuseSection);
	1804	+
	1805	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1806	+
	1807	+ cGridBag specularSection = new cGridBag().setVertical(true);
1562	1808
1563		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1564		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1565		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1566		- aConstraints.gridx += 1;
1567		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1568		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1569		- aConstraints.gridx = 0;
1570		- aConstraints.gridy += 1;
1571		- aConstraints.gridwidth = 1;
	1809	+ cGridBag specular = new cGridBag();
	1810	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1811	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1812	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1813	+ specularSection.add(specular);
1572	1814
1573		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1574		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1575		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1576		- aConstraints.gridx += 1;
1577		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1578		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1579		- aConstraints.gridx = 0;
1580		- aConstraints.gridy += 1;
1581		- aConstraints.gridwidth = 1;
	1815	+ cGridBag lightarea = new cGridBag();
	1816	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1817	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1818	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1819	+ specularSection.add(lightarea);
1582	1820
1583		- //aConstraints.weighty = 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1585		- //aConstraints.gridx += 1;
1586		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1587		- aConstraints.weighty = 0;
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	1821	+ cGridBag shininess = new cGridBag();
	1822	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1823	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1824	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1825	+ specularSection.add(shininess);
1591	1826
1592		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1593		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	1827	+ cGridBag metalness = new cGridBag();
	1828	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1829	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1830	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1831	+ specularSection.add(metalness);
1601	1832
1602		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1603		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	1833	+ cGridBag velvet = new cGridBag();
	1834	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1835	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1836	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1837	+ specularSection.add(velvet);
1611	1838
1612		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1613		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
1621		-
1622		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1623		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1625		- aConstraints.gridx += 1;
1626		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1628		- aConstraints.gridx = 0;
1629		- aConstraints.gridy += 1;
1630		- aConstraints.gridwidth = 1;
1631		-
1632		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1633		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1634		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1635		- aConstraints.gridx += 1;
1636		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1637		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1638		- aConstraints.gridx = 0;
1639		- aConstraints.gridy += 1;
1640		- aConstraints.gridwidth = 1;
1641		-
1642		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1643		- Return();
	1839	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1840	+ //Return();
1644	1841	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1645	1842	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1646	1843	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1651,130 +1848,105 @@
1651	1848	// aConstraints.gridy += 1;
1652	1849	// aConstraints.gridwidth = 1;
1653	1850
1654		- //aConstraints.weighty = 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1656		- //aConstraints.gridx += 1;
1657		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1658		- aConstraints.weighty = 0;
1659		- aConstraints.gridx = 0;
1660		- aConstraints.gridy += 1;
1661		- aConstraints.gridwidth = 1;
	1851	+ cGridBag anisoU = new cGridBag();
	1852	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1853	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1854	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1855	+ specularSection.add(anisoU);
1662	1856
1663		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1664		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1666		- aConstraints.gridx += 1;
1667		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1668		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1669		- aConstraints.gridx = 0;
1670		- aConstraints.gridy += 1;
1671		- aConstraints.gridwidth = 1;
	1857	+ cGridBag anisoV = new cGridBag();
	1858	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1859	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1860	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1861	+ specularSection.add(anisoV);
1672	1862
1673		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1674		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1675		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1676		- aConstraints.gridx += 1;
1677		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1678		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1679		- aConstraints.gridx = 0;
1680		- aConstraints.gridy += 1;
1681		- aConstraints.gridwidth = 1;
1682	1863
1683		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1684		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1686		- aConstraints.gridx += 1;
1687		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1688		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1689		- aConstraints.gridx = 0;
1690		- aConstraints.gridy += 1;
1691		- aConstraints.gridwidth = 1;
	1864	+ panel.add(new JSeparator());
	1865	+
	1866	+ panel.add(specularSection);
	1867	+
	1868	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1869	+
	1870	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1692	1871
1693		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1694		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1695		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1696		- aConstraints.gridx += 1;
1697		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1699		- aConstraints.gridx = 0;
1700		- aConstraints.gridy += 1;
1701		- aConstraints.gridwidth = 1;
1702		- aConstraints.weighty = 0;
	1872	+ cGridBag camera = new cGridBag();
	1873	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1874	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1875	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1876	+ colorSection.add(camera);
1703	1877
1704		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1705		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1707		- aConstraints.gridx += 1;
1708		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1709		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1710		- aConstraints.gridx = 0;
1711		- aConstraints.gridy += 1;
1712		- aConstraints.gridwidth = 1;
	1878	+ cGridBag ambient = new cGridBag();
	1879	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1880	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1881	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1882	+ colorSection.add(ambient);
1713	1883
1714		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1715		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1717		- aConstraints.gridx += 1;
1718		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1719		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1720		- aConstraints.gridx = 0;
1721		- aConstraints.gridy += 1;
1722		- aConstraints.gridwidth = 1;
	1884	+ cGridBag backlit = new cGridBag();
	1885	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1886	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1887	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1888	+ colorSection.add(backlit);
1723	1889
1724		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1725		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1726		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1727		- aConstraints.gridx += 1;
1728		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1729		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1730		- aConstraints.gridx = 0;
1731		- aConstraints.gridy += 1;
1732		- aConstraints.gridwidth = 1;
	1890	+ cGridBag opacity = new cGridBag();
	1891	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1892	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1893	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1894	+ colorSection.add(opacity);
1733	1895
1734		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1735		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1737		- aConstraints.gridx += 1;
1738		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1739		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1740		- aConstraints.gridx = 0;
1741		- aConstraints.gridy += 1;
1742		- aConstraints.gridwidth = 1;
	1896	+ //panel.add(new JSeparator());
	1897	+
	1898	+ //panel.add(globalSection);
	1899	+
	1900	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1901	+
	1902	+ cGridBag textureSection = new cGridBag().setVertical(true);
1743	1903
1744		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1745		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1747		- aConstraints.gridx += 1;
1748		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1749		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1750		- aConstraints.gridx = 0;
1751		- aConstraints.gridy += 1;
1752		- aConstraints.gridwidth = 1;
	1904	+ cGridBag bump = new cGridBag();
	1905	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1906	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1907	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1908	+ textureSection.add(bump);
1753	1909
1754		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1755		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1756		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1757		- aConstraints.gridx += 1;
1758		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1759		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1760		- aConstraints.gridx = 0;
1761		- aConstraints.gridy += 1;
1762		- aConstraints.gridwidth = 1;
	1910	+ cGridBag noise = new cGridBag();
	1911	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1912	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1913	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1914	+ textureSection.add(noise);
1763	1915
1764		- //aConstraints.weighty = 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1766		- //aConstraints.gridx += 1;
1767		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1768		- aConstraints.weighty = 0;
	1916	+ cGridBag power = new cGridBag();
	1917	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1918	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1919	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1920	+ textureSection.add(power);
1769	1921
1770		- aConstraints.gridx = 0;
1771		- aConstraints.gridy = 0;
1772		- aConstraints.gridwidth = 1;
	1922	+ cGridBag borderfade = new cGridBag();
	1923	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1924	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1925	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1926	+ textureSection.add(borderfade);
	1927	+
	1928	+ cGridBag fog = new cGridBag();
	1929	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1930	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1931	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1932	+ textureSection.add(fog);
	1933	+
	1934	+ cGridBag opacityPower = new cGridBag();
	1935	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1936	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1937	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1938	+ textureSection.add(opacityPower);
	1939	+
	1940	+ panel.add(new JSeparator());
	1941	+
	1942	+ panel.add(textureSection);
	1943	+
	1944	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1773	1945
1774	1946	SetMaterial(copy); // .GetMaterial());
1775	1947
1776		- colorField.addChangeListener(this);
1777		- modulationField.addChangeListener(this);
	1948	+ //colorField.addChangeListener(this);
	1949	+// modulationField.addChangeListener(this);
1778	1950	metalnessField.addChangeListener(this);
1779	1951	diffuseField.addChangeListener(this);
1780	1952	specularField.addChangeListener(this);
..	..	@@ -1804,12 +1976,15 @@
1804	1976	opacityPowerField.addChangeListener(this);
1805	1977	/**/
1806	1978
1807		- resetSlidersButton.addActionListener(this);
1808	1979	clearMaterialButton.addActionListener(this);
1809	1980	createMaterialButton.addActionListener(this);
1810		-
1811		- propagateToggle.addItemListener(this);
1812		- multiplyToggle.addItemListener(this);
	1981	+
	1982	+ if (Globals.ADVANCED)
	1983	+ {
	1984	+ resetSlidersButton.addActionListener(this);
	1985	+ propagateToggle.addItemListener(this);
	1986	+ multiplyToggle.addItemListener(this);
	1987	+ }
1813	1988	}
1814	1989
1815	1990	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1827,8 +2002,9 @@
1827	2002	// 3D models
1828	2003	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1829	2004	{
1830		- lastConverter = new com.jmex.model.converters.MaxToJme();
1831		- LoadFile(filename, lastConverter);
	2005	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2006	+ //LoadFile(filename, lastConverter);
	2007	+ LoadObjFile(filename); // New 3ds loader
1832	2008	continue;
1833	2009	}
1834	2010	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1980,7 +2156,7 @@
1980	2156
1981	2157	//? flashIt = false;
1982	2158	CameraPane pane = (CameraPane) cameraView;
1983		- pane.clickStart(location.x, location.y, 0);
	2159	+ pane.clickStart(location.x, location.y, 0, 0);
1984	2160	pane.clickEnd(location.x, location.y, 0, true);
1985	2161
1986	2162	if (group.selection.size() == 1)
..	..	@@ -2029,6 +2205,7 @@
2029	2205	e2.printStackTrace();
2030	2206	}
2031	2207	}
	2208	+
2032	2209	LoadJMEThread loadThread;
2033	2210
2034	2211	class LoadJMEThread extends Thread
..	..	@@ -2086,6 +2263,7 @@
2086	2263	//LoadFile0(filename, converter);
2087	2264	}
2088	2265	}
	2266	+
2089	2267	LoadOBJThread loadObjThread;
2090	2268
2091	2269	class LoadOBJThread extends Thread
..	..	@@ -2164,19 +2342,19 @@
2164	2342
2165	2343	void LoadObjFile(String fullname)
2166	2344	{
2167		- /*
	2345	+ System.out.println("Loading " + fullname);
	2346	+ /**/
2168	2347	//lastFilename = fullname;
2169	2348	if(loadObjThread == null)
2170	2349	{
2171		- loadObjThread = new LoadOBJThread();
2172		- loadObjThread.start();
	2350	+ loadObjThread = new LoadOBJThread();
	2351	+ loadObjThread.start();
2173	2352	}
2174	2353
2175	2354	loadObjThread.add(fullname);
2176		- */
	2355	+ /**/
2177	2356
2178		- System.out.println("Loading " + fullname);
2179		- makeSomething(new FileObject(fullname, true), true);
	2357	+ //makeSomething(new FileObject(fullname, true), true);
2180	2358	}
2181	2359
2182	2360	void LoadGFDFile(String fullname)
..	..	@@ -2437,11 +2615,11 @@
2437	2615
2438	2616	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2439	2617	{
2440		- if (GrafreeD.standAlone)
	2618	+ if (Grafreed.standAlone)
2441	2619	{
2442	2620	/**/
2443	2621	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2444		- browser.show();
	2622	+ browser.setVisible(true);
2445	2623	String filename = browser.getFile();
2446	2624	if (filename != null && filename.length() > 0)
2447	2625	{
..	..	@@ -2552,6 +2730,7 @@
2552	2730	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2553	2731	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2554	2732	}
	2733	+
2555	2734	//cJME.count++;
2556	2735	//cJME.count %= 12;
2557	2736	if (gc)
..	..	@@ -2586,6 +2765,7 @@
2586	2765	}
2587	2766	if (input == null)
2588	2767	{
	2768	+ new Exception().printStackTrace();
2589	2769	System.exit(0);
2590	2770	}
2591	2771
..	..	@@ -2734,6 +2914,7 @@
2734	2914	}
2735	2915	}
2736	2916	}
	2917	+
2737	2918	cFileSystemPane FSPane;
2738	2919
2739	2920	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2787,11 +2968,14 @@
2787	2968	}
2788	2969	}
2789	2970	}
	2971	+
2790	2972	freezematerial = false;
2791	2973	}
2792	2974
2793	2975	void SetMaterial(Object3D object)
2794	2976	{
	2977	+ latestObject = object;
	2978	+
2795	2979	cMaterial mat = object.material;
2796	2980
2797	2981	if (mat == null)
..	..	@@ -2800,7 +2984,8 @@
2800	2984	return;
2801	2985	}
2802	2986
2803		- multiplyToggle.setSelected(mat.multiply);
	2987	+ if (multiplyToggle != null)
	2988	+ multiplyToggle.setSelected(mat.multiply);
2804	2989
2805	2990	assert (object.projectedVertices != null);
2806	2991
..	..	@@ -2902,12 +3087,17 @@
2902	3087	// }
2903	3088
2904	3089	/**/
2905		- if (deselect)
	3090	+ if (deselect \|\| child == null)
2906	3091	{
2907	3092	//group.deselectAll();
2908	3093	//freeze = true;
2909	3094	GetTree().clearSelection();
2910	3095	//freeze = false;
	3096	+
	3097	+ if (child == null)
	3098	+ {
	3099	+ return;
	3100	+ }
2911	3101	}
2912	3102
2913	3103	//group.addSelectee(child);
..	..	@@ -2976,7 +3166,7 @@
2976	3166	cameraView.ToggleDL();
2977	3167	cameraView.repaint();
2978	3168	return;
2979		- } else if (event.getSource() == toggleTextureItem)
	3169	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2980	3170	{
2981	3171	cameraView.ToggleTexture();
2982	3172	// june 2013 copy.HardTouch();
..	..	@@ -2989,7 +3179,8 @@
2989	3179	if (timeline)
2990	3180	{
2991	3181	centralPanel.remove(cameraView);
2992		- centralPanel.add(timelinePanel);
	3182	+ cameraPanel.add(cameraView);
	3183	+ centralPanel.add(cameraPanel);
2993	3184	frame.setJMenuBar(timelineMenubar);
2994	3185	wasFullScreen = CameraPane.FULLSCREEN;
2995	3186	if (!CameraPane.FULLSCREEN)
..	..	@@ -2998,7 +3189,7 @@
2998	3189	}
2999	3190	else
3000	3191	{
3001		- centralPanel.remove(timelinePanel);
	3192	+ centralPanel.remove(cameraPanel);
3002	3193	centralPanel.add(cameraView);
3003	3194	frame.setJMenuBar(null);
3004	3195	if (!wasFullScreen)
..	..	@@ -3014,9 +3205,9 @@
3014	3205	frame.validate();
3015	3206
3016	3207	return;
3017		- } else if (event.getSource() == toggleRandomItem)
	3208	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3018	3209	{
3019		- cameraView.ToggleRandom();
	3210	+ cameraView.ToggleSwitch();
3020	3211	cameraView.repaint();
3021	3212	return;
3022	3213	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3045,6 +3236,10 @@
3045	3236	{
3046	3237	copy.live ^= true;
3047	3238	return;
	3239	+ } else if (event.getSource() == selectCB)
	3240	+ {
	3241	+ copy.dontselect ^= true;
	3242	+ return;
3048	3243	} else if (event.getSource() == hideCB)
3049	3244	{
3050	3245	copy.hide ^= true;
..	..	@@ -3059,6 +3254,7 @@
3059	3254	if (event.getSource() == randomCB)
3060	3255	{
3061	3256	copy.random ^= true;
	3257	+ objEditor.refreshContents();
3062	3258	return;
3063	3259	}
3064	3260	if (event.getSource() == speedupCB)
..	..	@@ -3082,8 +3278,9 @@
3082	3278
3083	3279	public void actionPerformed(ActionEvent event)
3084	3280	{
	3281	+ Object source = event.getSource();
3085	3282	// SCRIPT DIALOG
3086		- if (event.getSource() == okbutton)
	3283	+ if (source == okbutton)
3087	3284	{
3088	3285	textpanel.setVisible(false);
3089	3286	textpanel.remove(textarea);
..	..	@@ -3095,7 +3292,7 @@
3095	3292	textarea = null;
3096	3293	textpanel = null;
3097	3294	}
3098		- if (event.getSource() == cancelbutton)
	3295	+ if (source == cancelbutton)
3099	3296	{
3100	3297	textpanel.setVisible(false);
3101	3298	textpanel.remove(textarea);
..	..	@@ -3107,49 +3304,50 @@
3107	3304	//applySelf();
3108	3305	//client.refreshEditWindow();
3109	3306	//refreshContents();
3110		- if (event.getSource() == nameField)
	3307	+ if (source == nameField)
3111	3308	{
3112	3309	//System.out.println("ObjEditor " + event);
3113	3310	applySelf0(true);
3114	3311	//parent.applySelf();
3115	3312	objEditor.refreshContents();
3116		- } else if (event.getSource() == resetButton)
	3313	+ } else if (source == resetButton)
3117	3314	{
3118	3315	CameraPane.fullreset = true;
3119	3316	copy.Reset(); // ResetMeshes();
3120	3317	copy.Touch();
3121	3318	objEditor.refreshContents();
3122		- } else if (event.getSource() == stepItem)
	3319	+ } else if (source == stepItem)
3123	3320	{
3124		- cameraView.ONESTEP = true;
	3321	+ //cameraView.ONESTEP = true;
	3322	+ Globals.ONESTEP = true;
3125	3323	cameraView.repaint();
3126	3324	return;
3127		- } else if (event.getSource() == stepButton)
	3325	+ } else if (source == stepButton)
3128	3326	{
3129	3327	copy.Step();
3130	3328	copy.Touch();
3131	3329	objEditor.refreshContents();
3132		- } else if (event.getSource() == slowerButton)
	3330	+ } else if (source == slowerButton)
3133	3331	{
3134	3332	copy.Slower();
3135	3333	copy.Touch();
3136	3334	objEditor.refreshContents();
3137		- } else if (event.getSource() == fasterButton)
	3335	+ } else if (source == fasterButton)
3138	3336	{
3139	3337	copy.Faster();
3140	3338	copy.Touch();
3141	3339	objEditor.refreshContents();
3142		- } else if (event.getSource() == remarkButton)
	3340	+ } else if (source == remarkButton)
3143	3341	{
3144	3342	copy.Remark();
3145	3343	copy.Touch();
3146	3344	objEditor.refreshContents();
3147		- } else if (event.getSource() == stepAllButton)
	3345	+ } else if (source == stepAllButton)
3148	3346	{
3149	3347	copy.StepAll();
3150	3348	copy.Touch();
3151	3349	objEditor.refreshContents();
3152		- } else if (event.getSource() == resetAllButton)
	3350	+ } else if (source == resetAllButton)
3153	3351	{
3154	3352	//CameraPane.fullreset = true;
3155	3353	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3182,53 +3380,79 @@
3182	3380	// Close();
3183	3381	// }
3184	3382	// else
3185		- if (event.getSource() == resetSlidersButton)
	3383	+ if (source == resetSlidersButton)
3186	3384	{
3187	3385	ResetSliders();
3188		- } else if (event.getSource() == clearMaterialButton)
	3386	+ } else if (source == clearMaterialButton)
3189	3387	{
3190	3388	ClearMaterial();
3191		- } else if (event.getSource() == createMaterialButton)
	3389	+ } else if (source == createMaterialButton)
3192	3390	{
3193	3391	CreateMaterial();
3194		- } else if (event.getSource() == clearPanelButton)
	3392	+ } else if (source == clearPanelButton)
3195	3393	{
3196	3394	copy.ClearUI();
3197	3395	refreshContents(true);
3198		- } /*
3199		- }
3200		-
3201		- public boolean action(Event event, Object arg)
3202		- {
3203		- */ else if (event.getSource() == closeItem)
	3396	+ } else if (source == importGFDItem)
	3397	+ {
	3398	+ ImportGFD();
	3399	+ } else
	3400	+ if (source == importVRMLX3DItem)
	3401	+ {
	3402	+ ImportVRMLX3D();
	3403	+ } else
	3404	+ if (source == import3DSItem)
	3405	+ {
	3406	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3407	+ } else
	3408	+ if (source == importOBJItem)
	3409	+ {
	3410	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3411	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3412	+ browser.setVisible(true);
	3413	+ String filename = browser.getFile();
	3414	+ if (filename != null && filename.length() > 0)
	3415	+ {
	3416	+ String fullname = browser.getDirectory() + filename;
	3417	+ makeSomething(ReadOBJ(fullname), true);
	3418	+ }
	3419	+ } else
	3420	+ if (source == closeItem)
3204	3421	{
3205	3422	Close();
3206	3423	//return true;
3207		- } else if (event.getSource() == loadItem)
	3424	+ } else if (source == openItem)
3208	3425	{
3209		- load();
	3426	+ Open();
3210	3427	//return true;
3211		- } else if (event.getSource() == saveItem)
	3428	+ } else if (source == newItem)
	3429	+ {
	3430	+ New();
	3431	+ } else if (source == saveItem)
3212	3432	{
3213	3433	save();
3214	3434	//return true;
3215		- } else if (event.getSource() == saveAsItem)
	3435	+ } else if (source == saveAsItem)
3216	3436	{
3217	3437	saveAs();
3218	3438	//return true;
3219		- } else if (event.getSource() == reexportItem)
	3439	+ } else if (source == reexportItem)
3220	3440	{
3221	3441	reexport();
3222	3442	//return true;
3223		- } else if (event.getSource() == exportAsItem)
	3443	+ } else if (source == exportAsItem)
3224	3444	{
3225	3445	export();
3226	3446	//return true;
3227		- } else if (event.getSource() == povItem)
	3447	+ } else if (source == povItem)
3228	3448	{
3229	3449	generatePOV();
3230	3450	//return true;
3231		- } else if (event.getSource() == zBufferItem)
	3451	+ } else if (event.getSource() == archiveItem)
	3452	+ {
	3453	+ cTools.Archive(frame);
	3454	+ return;
	3455	+ } else if (source == zBufferItem)
3232	3456	{
3233	3457	try
3234	3458	{
..	..	@@ -3250,21 +3474,8 @@
3250	3474	cameraView.repaint();
3251	3475	//return true;
3252	3476	}
3253		- */ else if (event.getSource() == editCameraItem)
3254		- {
3255		- cameraView.ProtectCamera();
3256		- cameraView.repaint();
3257		- return;
3258		- } else if (event.getSource() == revertCameraItem)
3259		- {
3260		- cameraView.RevertCamera();
3261		- cameraView.repaint();
3262		- return;
3263		-// } else if (event.getSource() == textureButton)
3264		-// {
3265		-// return; // true;
3266		- } else // combos...
3267		- if (event.getSource() == texresMenu)
	3477	+ */ else // combos...
	3478	+ if (source == texresMenu)
3268	3479	{
3269	3480	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3270	3481	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3276,27 +3487,397 @@
3276	3487	}
3277	3488	}
3278	3489
3279		- void ToggleAnimation()
	3490	+ void New()
3280	3491	{
3281		- if (!CameraPane.ANIMATION)
	3492	+ while (copy.Size() > 1)
3282	3493	{
3283		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3494	+ copy.remove(1);
	3495	+ }
	3496	+
	3497	+ ResetModel();
	3498	+ objEditor.refreshContents();
	3499	+ }
	3500	+
	3501	+ static public byte[] Compress(Object3D o)
	3502	+ {
	3503	+ try
	3504	+ {
	3505	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3506	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3507	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3508	+
	3509	+ Object3D parent = o.parent;
	3510	+ o.parent = null;
	3511	+
	3512	+ out.writeObject(o);
	3513	+
	3514	+ o.parent = parent;
	3515	+
	3516	+ out.flush();
	3517	+
	3518	+ baos //zstream
	3519	+ .close();
	3520	+ out.close();
	3521	+
	3522	+ byte[] bytes = baos.toByteArray();
	3523	+
	3524	+ System.out.println("save #bytes = " + bytes.length);
	3525	+ return bytes;
	3526	+ } catch (Exception e)
	3527	+ {
	3528	+ System.err.println(e);
	3529	+ return null;
	3530	+ }
	3531	+ }
	3532	+
	3533	+ static public Object Uncompress(byte[] bytes)
	3534	+ {
	3535	+ System.out.println("restore #bytes = " + bytes.length);
	3536	+ try
	3537	+ {
	3538	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3539	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3540	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3541	+ Object obj = in.readObject();
	3542	+
	3543	+ bais //istream
	3544	+ .close();
	3545	+ in.close();
	3546	+
	3547	+ return obj;
	3548	+ } catch (Exception e)
	3549	+ {
	3550	+ System.err.println(e);
	3551	+ return null;
	3552	+ }
	3553	+ }
	3554	+
	3555	+ static public Object clone(Object o)
	3556	+ {
	3557	+ try
	3558	+ {
	3559	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3560	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3561	+
	3562	+ out.writeObject(o);
	3563	+
	3564	+ out.flush();
	3565	+ out.close();
	3566	+
	3567	+ byte[] bytes = baos.toByteArray();
	3568	+
	3569	+ System.out.println("clone = " + bytes.length);
	3570	+
	3571	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3572	+ ObjectInputStream in = new ObjectInputStream(bais);
	3573	+ Object obj = in.readObject();
	3574	+ in.close();
	3575	+
	3576	+ return obj;
	3577	+ } catch (Exception e)
	3578	+ {
	3579	+ System.err.println(e);
	3580	+ return null;
	3581	+ }
	3582	+ }
	3583	+
	3584	+ cRadio GetCurrentTab()
	3585	+ {
	3586	+ cRadio ab;
	3587	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3588	+ {
	3589	+ ab = (cRadio)e.nextElement();
	3590	+ if(ab.GetObject() == copy)
	3591	+ {
	3592	+ return ab;
	3593	+ }
	3594	+ }
	3595	+
	3596	+ return null;
	3597	+ }
	3598	+
	3599	+
	3600	+ public void Save()
	3601	+ {
	3602	+ //Save(true);
	3603	+ Replace();
	3604	+ }
	3605	+
	3606	+ private boolean Equal(byte[] compress, byte[] name)
	3607	+ {
	3608	+ if (compress.length != name.length)
	3609	+ {
	3610	+ return false;
	3611	+ }
	3612	+
	3613	+ for (int i=compress.length; --i>=0;)
	3614	+ {
	3615	+ if (compress[i] != name[i])
	3616	+ return false;
	3617	+ }
	3618	+
	3619	+ return true;
	3620	+ }
	3621	+
	3622	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3623	+
	3624	+ public boolean Save(boolean user)
	3625	+ {
	3626	+ System.err.println("Save");
	3627	+
	3628	+ cRadio tab = GetCurrentTab();
	3629	+
	3630	+ byte[] compress = CompressCopy();
	3631	+
	3632	+ boolean thesame = false;
	3633	+
	3634	+ // Quick heuristic using length. Works only when stream is compressed.
	3635	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3636	+ {
	3637	+ thesame = true;
	3638	+ }
	3639	+
	3640	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3641	+ if (!thesame)
	3642	+ {
	3643	+ //tab.user[tab.versionindex] = user;
	3644	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3645	+
	3646	+ copy.versions[++copy.versionindex] = compress;
	3647	+
	3648	+ // if (increment)
	3649	+ // tab.versionindex++;
	3650	+ }
	3651	+
	3652	+ //copy.RestoreBigData(versiontable);
	3653	+
	3654	+ //assert(hashtable.isEmpty());
	3655	+
	3656	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3657	+ {
	3658	+ //tab.user[i] = false;
	3659	+ copy.versions[i] = null;
	3660	+ }
	3661	+
	3662	+ SetUndoStates();
	3663	+
	3664	+ // test save
	3665	+ if (false)
	3666	+ {
	3667	+ try
	3668	+ {
	3669	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3670	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3671	+
	3672	+ p.writeObject(copy);
	3673	+
	3674	+ p.flush();
	3675	+
	3676	+ ostream.close();
	3677	+ } catch (Exception e)
	3678	+ {
	3679	+ e.printStackTrace();
	3680	+ }
	3681	+ }
	3682	+
	3683	+ return !thesame;
	3684	+ }
	3685	+
	3686	+ void CopyChanged(Object3D obj)
	3687	+ {
	3688	+ SetUndoStates();
	3689	+
	3690	+ boolean temp = CameraPane.SWITCH;
	3691	+ CameraPane.SWITCH = false;
	3692	+
	3693	+ copy.ExtractBigData(versiontable);
	3694	+
	3695	+ copy.clear();
	3696	+
	3697	+ for (int i=0; i<obj.Size(); i++)
	3698	+ {
	3699	+ copy.add(obj.get(i));
	3700	+ }
	3701	+
	3702	+ copy.RestoreBigData(versiontable);
	3703	+
	3704	+ CameraPane.SWITCH = temp;
	3705	+
	3706	+ //assert(hashtable.isEmpty());
	3707	+
	3708	+ copy.Touch();
	3709	+
	3710	+ ResetModel();
	3711	+ copy.HardTouch(); // recompile?
	3712	+
	3713	+ cRadio ab;
	3714	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3715	+ {
	3716	+ ab = (cRadio)e.nextElement();
	3717	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3718	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3719	+ if (test != null)
	3720	+ {
	3721	+ test.editWindow = ab.object.editWindow;
	3722	+ ab.object = test;
	3723	+ }
	3724	+ }
	3725	+
	3726	+ refreshContents();
	3727	+ }
	3728	+
	3729	+ cButton undoButton;
	3730	+ cButton restoreButton;
	3731	+ cButton replaceButton;
	3732	+ cButton redoButton;
	3733	+
	3734	+ void SetUndoStates()
	3735	+ {
	3736	+ cRadio tab = GetCurrentTab();
	3737	+
	3738	+ restoreButton.setEnabled(copy.versionindex != -1);
	3739	+ replaceButton.setEnabled(copy.versionindex != -1);
	3740	+ undoButton.setEnabled(copy.versionindex > 0);
	3741	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3742	+ }
	3743	+
	3744	+ public boolean Undo()
	3745	+ {
	3746	+ System.err.println("Undo");
	3747	+
	3748	+ cRadio tab = GetCurrentTab();
	3749	+
	3750	+ if (copy.versionindex == 0)
	3751	+ {
	3752	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3753	+ return false;
	3754	+ }
	3755	+
	3756	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3757	+// {
	3758	+// if (Save(false))
	3759	+// tab.versionindex -= 1;
	3760	+// else
	3761	+// {
	3762	+// if (tab.versionindex <= 0)
	3763	+// return false;
	3764	+// else
	3765	+// tab.versionindex -= 1;
	3766	+// }
	3767	+// }
	3768	+
	3769	+ copy.versionindex -= 1;
	3770	+
	3771	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3772	+
	3773	+ return true;
	3774	+ }
	3775	+
	3776	+ public boolean Restore()
	3777	+ {
	3778	+ System.err.println("Restore");
	3779	+
	3780	+ cRadio tab = GetCurrentTab();
	3781	+
	3782	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3783	+ {
	3784	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3785	+ return false;
	3786	+ }
	3787	+
	3788	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3789	+
	3790	+ return true;
	3791	+ }
	3792	+
	3793	+ public boolean Replace()
	3794	+ {
	3795	+ System.err.println("Replace");
	3796	+
	3797	+ cRadio tab = GetCurrentTab();
	3798	+
	3799	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3800	+ {
	3801	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3802	+ return false;
	3803	+ }
	3804	+
	3805	+ copy.versions[copy.versionindex] = CompressCopy();
	3806	+
	3807	+ return true;
	3808	+ }
	3809	+
	3810	+ public void Redo()
	3811	+ {
	3812	+ cRadio tab = GetCurrentTab();
	3813	+
	3814	+ if (copy.versions[copy.versionindex + 1] == null)
	3815	+ {
	3816	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3817	+ return;
	3818	+ }
	3819	+
	3820	+ copy.versionindex += 1;
	3821	+
	3822	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3823	+
	3824	+ //if (!tab.user[tab.versionindex])
	3825	+ // tab.graphs[tab.versionindex] = null;
	3826	+ }
	3827	+
	3828	+ void ImportGFD()
	3829	+ {
	3830	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3284	3831	browser.show();
3285	3832	String filename = browser.getFile();
3286	3833	if (filename != null && filename.length() > 0)
3287	3834	{
3288		- CameraPane.filename = browser.getDirectory() + filename;
	3835	+ String fullname = browser.getDirectory() + filename;
	3836	+
	3837	+ //Object3D readobj =
	3838	+ objEditor.ReadGFD(fullname, objEditor);
	3839	+ //makeSomething(readobj);
	3840	+ }
	3841	+ }
	3842	+
	3843	+ void ImportVRMLX3D()
	3844	+ {
	3845	+ if (Grafreed.standAlone)
	3846	+ {
	3847	+ /**/
	3848	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3849	+ browser.show();
	3850	+ String filename = browser.getFile();
	3851	+ if (filename != null && filename.length() > 0)
	3852	+ {
	3853	+ String fullname = browser.getDirectory() + filename;
	3854	+ LoadVRMLX3D(fullname);
	3855	+ }
	3856	+ /**/
	3857	+ }
	3858	+ }
	3859	+
	3860	+ void ToggleAnimation()
	3861	+ {
	3862	+ if (!Globals.ANIMATION)
	3863	+ {
	3864	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3865	+ browser.setVisible(true);
	3866	+ String filename = browser.getFile();
	3867	+ if (filename != null && filename.length() > 0)
	3868	+ {
	3869	+ Globals.filename = browser.getDirectory() + filename;
3289	3870	//CameraPane.framecount = 0;
3290		- CameraPane.imagecount = 0;
	3871	+ Globals.imagecount = 0;
3291	3872
3292		- CameraPane.ANIMATION ^= true;
	3873	+ Globals.ANIMATION ^= true;
3293	3874
3294		- GrafreeD.wav.cursor = 0;
3295		- GrafreeD.wav.loop = 0;
	3875	+ Grafreed.wav.cursor = 0;
	3876	+ Grafreed.wav.loop = 0;
3296	3877	}
3297	3878	} else
3298	3879	{
3299		- CameraPane.ANIMATION ^= true;
	3880	+ Globals.ANIMATION ^= true;
3300	3881	}
3301	3882	}
3302	3883
..	..	@@ -3342,7 +3923,7 @@
3342	3923	void CreateMaterial()
3343	3924	{
3344	3925	//copy.ClearMaterial(); // PATCH
3345		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3926	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3346	3927	if (copy.selection.size() > 0)
3347	3928	//SetMaterial(copy);
3348	3929	{
..	..	@@ -3393,7 +3974,7 @@
3393	3974	assert false;
3394	3975	}
3395	3976
3396		- void EditSelection()
	3977	+ void EditSelection(boolean newWindow)
3397	3978	{
3398	3979	}
3399	3980
..	..	@@ -3401,11 +3982,11 @@
3401	3982	{
3402	3983	copy.ResetBlockLoop(); // temporary problem
3403	3984
3404		- boolean random = CameraPane.RANDOM;
3405		- CameraPane.RANDOM = false; // parse everything
	3985	+ boolean random = CameraPane.SWITCH;
	3986	+ CameraPane.SWITCH = false; // parse everything
3406	3987	copy.ResetDisplayList();
3407	3988	copy.HardTouch();
3408		- CameraPane.RANDOM = random;
	3989	+ CameraPane.SWITCH = random;
3409	3990	}
3410	3991
3411	3992	// public void applySelf()
..	..	@@ -3475,10 +4056,40 @@
3475	4056	current.fakedepth = (float) fakedepthField.getFloat();
3476	4057	current.shadowbias = (float) shadowbiasField.getFloat();
3477	4058
3478		- if (!NumberSlider.frozen)
	4059	+ if (!cNumberSlider.frozen)
3479	4060	{
3480	4061	//System.out.println("Propagate = " + propagate);
3481	4062	copy.UpdateMaterial(anchor, current, propagate);
	4063	+
	4064	+ if (copy.material != null)
	4065	+ {
	4066	+ cMaterial mat = copy.material;
	4067	+
	4068	+ colorField.SetToolTipValue((mat.color));
	4069	+ modulationField.SetToolTipValue((mat.modulation));
	4070	+ metalnessField.SetToolTipValue((mat.metalness));
	4071	+ diffuseField.SetToolTipValue((mat.diffuse));
	4072	+ specularField.SetToolTipValue((mat.specular));
	4073	+ shininessField.SetToolTipValue((mat.shininess));
	4074	+ shiftField.SetToolTipValue((mat.shift));
	4075	+ ambientField.SetToolTipValue((mat.ambient));
	4076	+ lightareaField.SetToolTipValue((mat.lightarea));
	4077	+ diffusenessField.SetToolTipValue((mat.factor));
	4078	+ velvetField.SetToolTipValue((mat.velvet));
	4079	+ sheenField.SetToolTipValue((mat.sheen));
	4080	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4081	+ backlitField.SetToolTipValue((mat.bump));
	4082	+ anisoField.SetToolTipValue((mat.aniso));
	4083	+ anisoVField.SetToolTipValue((mat.anisoV));
	4084	+ cameraField.SetToolTipValue((mat.cameralight));
	4085	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4086	+ shadowField.SetToolTipValue((mat.shadow));
	4087	+ textureField.SetToolTipValue((mat.texture));
	4088	+ opacityField.SetToolTipValue((mat.opacity));
	4089	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4090	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4091	+ }
	4092	+
3482	4093	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3483	4094	{
3484	4095	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3507,9 +4118,22 @@
3507	4118	//copy.Touch();
3508	4119	}
3509	4120
	4121	+ cNumberSlider versionField;
	4122	+
3510	4123	public void stateChanged(ChangeEvent e)
3511	4124	{
3512	4125	// assert(false);
	4126	+ if (e.getSource() == versionField)
	4127	+ {
	4128	+ int version = versionField.getInteger();
	4129	+
	4130	+ if (copy.versions[version] != null)
	4131	+ {
	4132	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4133	+ }
	4134	+
	4135	+ return;
	4136	+ }
3513	4137
3514	4138	if (freezematerial)
3515	4139	{
..	..	@@ -3523,6 +4147,7 @@
3523	4147	\|\| e.getSource() == apertureField
3524	4148	\|\| e.getSource() == shadowblurField)
3525	4149	{
	4150	+ new Exception().printStackTrace();
3526	4151	System.exit(0);
3527	4152	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3528	4153	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3549,7 +4174,13 @@
3549	4174	//System.out.println("PARENT = " + parent);
3550	4175	//if (parent != null)
3551	4176	// parent.applySelf();
3552		- refreshContents();
	4177	+ if (e.getSource() == normalpushField)
	4178	+ {
	4179	+ objEditor.refreshContents();
	4180	+ //Refresh();
	4181	+ }
	4182	+ else
	4183	+ refreshContents();
3553	4184	// ??? client.refreshEditWindow();
3554	4185	}
3555	4186	//else
..	..	@@ -3561,7 +4192,7 @@
3561	4192	//group.name = nameField.getText();
3562	4193	//objEditor.applySelf();
3563	4194
3564		- assert (objEditor == this);
	4195	+ // OCT2018: assert (objEditor == this);
3565	4196	if (copy.selection == null \|\| copy.selection.size() == 0)
3566	4197	//super.applySelf()
3567	4198	; else
..	..	@@ -3585,6 +4216,9 @@
3585	4216	objEditor.copy = keep;
3586	4217	}
3587	4218	}
	4219	+
	4220	+ if (normalpushField != null)
	4221	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3588	4222	}
3589	4223
3590	4224	void SnapObject()
..	..	@@ -3839,7 +4473,7 @@
3839	4473
3840	4474	radioPanel.revalidate();
3841	4475	radioPanel.repaint();
3842		- ctrlPanel.revalidate(); // ? new
	4476	+ ctrlPanel.validate(); // ? new
3843	4477	ctrlPanel.repaint();
3844	4478	}
3845	4479	}
..	..	@@ -3848,6 +4482,8 @@
3848	4482
3849	4483	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3850	4484	{
	4485	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4486	+ Save();
3851	4487	//Tween.set(thing, 0).target(1).start(tweenManager);
3852	4488	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3853	4489	// if (thing instanceof GenericJointDemo)
..	..	@@ -3934,6 +4570,12 @@
3934	4570	{
3935	4571	ResetModel();
3936	4572	Select(thing.GetTreePath(), true, false); // unselect... false);
	4573	+
	4574	+ if (thing.Size() == 0)
	4575	+ {
	4576	+ //EditSelection(false);
	4577	+ }
	4578	+
3937	4579	refreshContents();
3938	4580	}
3939	4581
..	..	@@ -4051,6 +4693,7 @@
4051	4693	}
4052	4694	}
4053	4695	}
	4696	+
4054	4697	LoadGFDThread loadGFDThread;
4055	4698
4056	4699	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4070,8 +4713,10 @@
4070	4713
4071	4714	try
4072	4715	{
	4716	+ // Try compressed version first.
4073	4717	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4074		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4718	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4719	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4075	4720
4076	4721	readobj = (Object3D) p.readObject();
4077	4722	istream.close();
..	..	@@ -4079,7 +4724,20 @@
4079	4724	readobj.ResetDisplayList();
4080	4725	} catch (Exception e)
4081	4726	{
4082		- e.printStackTrace();
	4727	+ //e.printStackTrace();
	4728	+ try
	4729	+ {
	4730	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4731	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4732	+
	4733	+ readobj = (Object3D) p.readObject();
	4734	+ istream.close();
	4735	+
	4736	+ readobj.ResetDisplayList();
	4737	+ } catch (Exception e2)
	4738	+ {
	4739	+ e2.printStackTrace();
	4740	+ }
4083	4741	}
4084	4742	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4085	4743	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4125,6 +4783,12 @@
4125	4783
4126	4784	void LoadIt(Object obj)
4127	4785	{
	4786	+ if (obj == null)
	4787	+ {
	4788	+ // Invalid file
	4789	+ return;
	4790	+ }
	4791	+
4128	4792	System.out.println("Loaded " + obj);
4129	4793	//new Exception().printStackTrace();
4130	4794	Object3D readobj = (Object3D) obj;
..	..	@@ -4134,6 +4798,8 @@
4134	4798
4135	4799	if (readobj != null)
4136	4800	{
	4801	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4802	+ // Save();
4137	4803	try
4138	4804	{
4139	4805	//readobj.deepCopySelf(copy);
..	..	@@ -4188,15 +4854,20 @@
4188	4854	c.addChild(csg);
4189	4855	}
4190	4856
	4857	+ copy.versions = readobj.versions;
	4858	+ copy.versionindex = readobj.versionindex;
	4859	+
	4860	+ SetUndoStates();
	4861	+
4191	4862	ResetModel();
4192	4863	copy.HardTouch(); // recompile?
4193	4864	refreshContents();
4194	4865	}
4195	4866	}
4196	4867
4197		- void load() // throws ClassNotFoundException
	4868	+ void Open() // throws ClassNotFoundException
4198	4869	{
4199		- if (GrafreeD.standAlone)
	4870	+ if (Grafreed.standAlone)
4200	4871	{
4201	4872	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4202	4873	browser.show();
..	..	@@ -4283,11 +4954,13 @@
4283	4954	try
4284	4955	{
4285	4956	FileOutputStream ostream = new FileOutputStream(lastname);
4286		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4957	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4958	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4287	4959
4288	4960	p.writeObject(copy);
4289	4961	p.flush();
4290	4962
	4963	+ zstream.close();
4291	4964	ostream.close();
4292	4965
4293	4966	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4297,17 +4970,20 @@
4297	4970	{
4298	4971	}
4299	4972	}
	4973	+
4300	4974	String lastname;
4301	4975
4302	4976	void saveAs()
4303	4977	{
4304		- if (GrafreeD.standAlone)
	4978	+ if (Grafreed.standAlone)
4305	4979	{
4306	4980	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4307	4981	browser.setVisible(true);
4308	4982	String filename = browser.getFile();
4309	4983	if (filename != null && filename.length() > 0)
4310	4984	{
	4985	+ if (!filename.endsWith(".gfd"))
	4986	+ filename += ".gfd";
4311	4987	lastname = browser.getDirectory() + filename;
4312	4988	save();
4313	4989	}
..	..	@@ -4406,13 +5082,13 @@
4406	5082	try
4407	5083	{
4408	5084	FileOutputStream ostream = new FileOutputStream(filename);
4409		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4410		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5085	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5086	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4411	5087
4412	5088	Object3D objectparent = obj.parent;
4413	5089	obj.parent = null;
4414	5090
4415		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5091	+ Object3D object = (Object3D) Grafreed.clone(obj);
4416	5092
4417	5093	obj.parent = objectparent;
4418	5094
..	..	@@ -4424,8 +5100,8 @@
4424	5100	p.writeObject(object);
4425	5101	p.flush();
4426	5102
	5103	+ zstream.close();
4427	5104	ostream.close();
4428		- // zstream.close();
4429	5105
4430	5106	// group.selection.get(0).parent = parent;
4431	5107	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4446,7 +5122,7 @@
4446	5122	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4447	5123	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4448	5124	copy.generatePOV(buffer);
4449		- if (GrafreeD.standAlone)
	5125	+ if (Grafreed.standAlone)
4450	5126	{
4451	5127	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4452	5128	browser.show();
..	..	@@ -4472,21 +5148,20 @@
4472	5148	Object3D client;
4473	5149	Object3D copy;
4474	5150	MenuBar menuBar;
4475		- Menu windowMenu;
4476		- MenuItem loadItem;
	5151	+ Menu fileMenu;
	5152	+ MenuItem newItem;
	5153	+ MenuItem openItem;
4477	5154	MenuItem saveItem;
4478	5155	MenuItem saveAsItem;
4479	5156	MenuItem exportAsItem;
4480	5157	MenuItem reexportItem;
4481	5158	MenuItem povItem;
4482	5159	MenuItem closeItem;
4483		- Menu cameraMenu;
	5160	+
4484	5161	CheckboxMenuItem zBufferItem;
4485	5162	//MenuItem normalLensItem;
4486		- MenuItem editCameraItem;
4487		- MenuItem revertCameraItem;
4488		- CheckboxMenuItem toggleLiveItem;
4489	5163	MenuItem stepItem;
	5164	+ CheckboxMenuItem toggleLiveItem;
4490	5165	CheckboxMenuItem toggleFullScreenItem;
4491	5166	CheckboxMenuItem toggleTimelineItem;
4492	5167	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4495,28 +5170,43 @@
4495	5170	CheckboxMenuItem toggleFootContactItem;
4496	5171	CheckboxMenuItem toggleDLItem;
4497	5172	CheckboxMenuItem toggleTextureItem;
4498		- CheckboxMenuItem toggleRandomItem;
	5173	+ CheckboxMenuItem toggleSwitchItem;
4499	5174	CheckboxMenuItem toggleRootItem;
4500	5175	CheckboxMenuItem animationItem;
	5176	+ MenuItem archiveItem;
4501	5177	CheckboxMenuItem toggleHandleItem;
4502	5178	CheckboxMenuItem togglePaintItem;
4503	5179	JSplitPane mainPanel;
4504	5180	JScrollPane scrollpane;
	5181	+
4505	5182	JPanel toolbarPanel;
4506		- JPanel treePanel;
	5183	+
	5184	+ cGridBag treePanel;
	5185	+
4507	5186	JPanel radioPanel;
4508	5187	ButtonGroup buttonGroup;
4509		- JPanel ctrlPanel;
4510		- JPanel materialPanel;
	5188	+
	5189	+ cGridBag toolboxPanel;
	5190	+ cGridBag materialPanel;
	5191	+ cGridBag ctrlPanel;
	5192	+
4511	5193	JScrollPane infoPanel;
4512		- JPanel optionsPanel;
	5194	+
	5195	+ cGridBag optionsPanel;
	5196	+
4513	5197	JTabbedPane objectPanel;
4514		- JPanel XYZPanel;
	5198	+ boolean materialFlushed;
	5199	+ Object3D latestObject;
	5200	+
	5201	+ cGridBag XYZPanel;
	5202	+
4515	5203	JSplitPane gridPanel;
4516	5204	JSplitPane bigPanel;
4517		- JPanel bigThree;
4518		- JTabbedPane scenePanel;
4519		- JPanel centralPanel;
	5205	+
	5206	+ cGridBag bigThree;
	5207	+ cGridBag scenePanel;
	5208	+ cGridBag centralPanel;
	5209	+ JSplitPane cameraPanel;
4520	5210	JPanel timelinePanel;
4521	5211	JMenuBar timelineMenubar;
4522	5212	JSplitPane framePanel;
..	..	@@ -4568,65 +5258,72 @@
4568	5258	// MATERIAL
4569	5259	JLabel materialLabel;
4570	5260	JLabel colorLabel;
4571		- NumberSlider colorField;
	5261	+ cNumberSlider colorField;
4572	5262	JLabel modulationLabel;
4573		- NumberSlider modulationField;
	5263	+ cNumberSlider modulationField;
4574	5264	JLabel metalnessLabel;
4575		- NumberSlider metalnessField;
	5265	+ cNumberSlider metalnessField;
4576	5266	JLabel diffuseLabel;
4577		- NumberSlider diffuseField;
	5267	+ cNumberSlider diffuseField;
4578	5268	JLabel specularLabel;
4579		- NumberSlider specularField;
	5269	+ cNumberSlider specularField;
4580	5270	JLabel shininessLabel;
4581		- NumberSlider shininessField;
	5271	+ cNumberSlider shininessField;
4582	5272	JLabel shiftLabel;
4583		- NumberSlider shiftField;
	5273	+ cNumberSlider shiftField;
4584	5274	JLabel ambientLabel;
4585		- NumberSlider ambientField;
	5275	+ cNumberSlider ambientField;
4586	5276	JLabel lightareaLabel;
4587		- NumberSlider lightareaField;
	5277	+ cNumberSlider lightareaField;
4588	5278	JLabel diffusenessLabel;
4589		- NumberSlider diffusenessField;
	5279	+ cNumberSlider diffusenessField;
4590	5280	JLabel velvetLabel;
4591		- NumberSlider velvetField;
	5281	+ cNumberSlider velvetField;
4592	5282	JLabel sheenLabel;
4593		- NumberSlider sheenField;
	5283	+ cNumberSlider sheenField;
4594	5284	JLabel subsurfaceLabel;
4595		- NumberSlider subsurfaceField;
	5285	+ cNumberSlider subsurfaceField;
4596	5286	//JLabel bumpLabel;
4597	5287	//NumberSlider bumpField;
4598	5288	JLabel backlitLabel;
4599		- NumberSlider backlitField;
	5289	+ cNumberSlider backlitField;
4600	5290	JLabel anisoLabel;
4601		- NumberSlider anisoField;
	5291	+ cNumberSlider anisoField;
4602	5292	JLabel anisoVLabel;
4603		- NumberSlider anisoVField;
	5293	+ cNumberSlider anisoVField;
4604	5294	JLabel cameraLabel;
4605		- NumberSlider cameraField;
	5295	+ cNumberSlider cameraField;
4606	5296	JLabel selfshadowLabel;
4607		- NumberSlider selfshadowField;
	5297	+ cNumberSlider selfshadowField;
4608	5298	JLabel shadowLabel;
4609		- NumberSlider shadowField;
	5299	+ cNumberSlider shadowField;
4610	5300	JLabel textureLabel;
4611		- NumberSlider textureField;
	5301	+ cNumberSlider textureField;
4612	5302	JLabel opacityLabel;
4613		- NumberSlider opacityField;
	5303	+ cNumberSlider opacityField;
4614	5304	JLabel fakedepthLabel;
4615		- NumberSlider fakedepthField;
	5305	+ cNumberSlider fakedepthField;
4616	5306	JLabel shadowbiasLabel;
4617		- NumberSlider shadowbiasField;
	5307	+ cNumberSlider shadowbiasField;
4618	5308	JLabel bumpLabel;
4619		- NumberSlider bumpField;
	5309	+ cNumberSlider bumpField;
4620	5310	JLabel noiseLabel;
4621		- NumberSlider noiseField;
	5311	+ cNumberSlider noiseField;
4622	5312	JLabel powerLabel;
4623		- NumberSlider powerField;
	5313	+ cNumberSlider powerField;
4624	5314	JLabel borderfadeLabel;
4625		- NumberSlider borderfadeField;
	5315	+ cNumberSlider borderfadeField;
4626	5316	JLabel fogLabel;
4627		- NumberSlider fogField;
	5317	+ cNumberSlider fogField;
4628	5318	JLabel opacityPowerLabel;
4629		- NumberSlider opacityPowerField;
4630		- JTree jTree;
	5319	+ cNumberSlider opacityPowerField;
	5320	+ cTree jTree;
4631	5321	//ObjectUI parent;
	5322	+
	5323	+ cNumberSlider normalpushField;
	5324	+
	5325	+ private MenuItem importGFDItem;
	5326	+ private MenuItem importVRMLX3DItem;
	5327	+ private MenuItem import3DSItem;
	5328	+ private MenuItem importOBJItem;
4632	5329	}