~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,
..	..	@@ -33,6 +39,53 @@
33	39
34	40	GroupEditor callee;
35	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
	49	+ }
	50	+
	51	+ cToggleButton GetToggleButton(String name, boolean border)
	52	+ {
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
	55	+ }
	56	+
	57	+ cCheckBox GetCheckBox(String name, boolean border)
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ ImageIcon GetIcon(String name)
	64	+ {
	65	+ try
	66	+ {
	67	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	68	+
	69	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	70	+// {
	71	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	72	+// Graphics2D g = resized.createGraphics();
	73	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	74	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	75	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	76	+// g.dispose();
	77	+//
	78	+// image = resized;
	79	+// }
	80	+
	81	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	82	+ return icon;
	83	+ }
	84	+ catch (Exception e)
	85	+ {
	86	+ return null;
	87	+ }
	88	+ }
36	89
37	90	// SCRIPT
38	91
..	..	@@ -136,34 +189,42 @@
136	189	public void closeUI()
137	190	{
138	191	//new Exception().printStackTrace();
139		- System.out.println("this = " + this);
140		- System.out.println("objEditor = " + objEditor);
	192	+// System.out.println("this = " + this);
	193	+// System.out.println("objEditor = " + objEditor);
141	194	//nameField.removeActionListener(this);
142		- objEditor.ctrlPanel.remove(nameField);
	195	+// objEditor.ctrlPanel.remove(nameField);
143	196
144		- if (!GroupEditor.allparams)
	197	+ objEditor.ctrlPanel.remove(namePanel);
	198	+
	199	+ if (!allparams)
145	200	return;
146	201
147		- objEditor.ctrlPanel.remove(liveCB);
148		- objEditor.ctrlPanel.remove(hideCB);
149		- objEditor.ctrlPanel.remove(markCB);
150		-
151		- objEditor.ctrlPanel.remove(randomCB);
152		- objEditor.ctrlPanel.remove(speedupCB);
153		- objEditor.ctrlPanel.remove(rewindCB);
154		-
155		- objEditor.ctrlPanel.remove(resetButton);
156		- objEditor.ctrlPanel.remove(stepButton);
157		-// objEditor.ctrlPanel.remove(stepAllButton);
158		-// objEditor.ctrlPanel.remove(resetAllButton);
159		- objEditor.ctrlPanel.remove(link2masterCB);
160		- //objEditor.ctrlPanel.remove(flipVCB);
161		- //objEditor.ctrlPanel.remove(texresMenu);
162		- objEditor.ctrlPanel.remove(slowerButton);
163		- objEditor.ctrlPanel.remove(fasterButton);
164		- objEditor.ctrlPanel.remove(remarkButton);
	202	+// objEditor.ctrlPanel.remove(liveCB);
	203	+// objEditor.ctrlPanel.remove(hideCB);
	204	+// objEditor.ctrlPanel.remove(markCB);
	205	+//
	206	+// objEditor.ctrlPanel.remove(randomCB);
	207	+// objEditor.ctrlPanel.remove(speedupCB);
	208	+// objEditor.ctrlPanel.remove(rewindCB);
	209	+//
	210	+// objEditor.ctrlPanel.remove(resetButton);
	211	+// objEditor.ctrlPanel.remove(stepButton);
	212	+//// objEditor.ctrlPanel.remove(stepAllButton);
	213	+//// objEditor.ctrlPanel.remove(resetAllButton);
	214	+// objEditor.ctrlPanel.remove(link2masterCB);
	215	+// //objEditor.ctrlPanel.remove(flipVCB);
	216	+// //objEditor.ctrlPanel.remove(texresMenu);
	217	+// objEditor.ctrlPanel.remove(slowerButton);
	218	+// objEditor.ctrlPanel.remove(fasterButton);
	219	+// objEditor.ctrlPanel.remove(remarkButton);
165	220
166		- Remove(normalpushField);
	221	+ objEditor.ctrlPanel.remove(setupPanel);
	222	+ objEditor.ctrlPanel.remove(setupPanel2);
	223	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	224	+ objEditor.ctrlPanel.remove(pushPanel);
	225	+ //objEditor.ctrlPanel.remove(fillPanel);
	226	+
	227	+ //Remove(normalpushField);
167	228	}
168	229
169	230	public ObjEditor GetEditor()
..	..	@@ -207,6 +268,12 @@
207	268	client = inClient;
208	269	copy = client;
209	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
210	277	// "this" is not called: SetupUI2(objEditor);
211	278	}
212	279
..	..	@@ -220,6 +287,12 @@
220	287	client = inClient;
221	288	copy = client;
222	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
223	296	SetupUI2(callee.GetEditor());
224	297	}
225	298
..	..	@@ -234,6 +307,7 @@
234	307	//localCopy.parent = null;
235	308
236	309	frame = new JFrame();
	310	+ frame.setUndecorated(false);
237	311	objEditor = this;
238	312	this.callee = callee;
239	313
..	..	@@ -251,6 +325,12 @@
251	325	copy = localCopy;
252	326	copy.editWindow = this;
253	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+// copy.versions = new byte[100][];
	331	+// copy.versionindex = -1;
	332	+ }
	333	+
254	334	SetupMenu();
255	335
256	336	//SetupName(objEditor); // new
..	..	@@ -264,28 +344,49 @@
264	344	return frame.action(event, obj);
265	345	}
266	346
	347	+ // Cannot work without static
	348	+ static boolean allparams = true;
	349	+
	350	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	351	+
267	352	void SetupMenu()
268	353	{
269	354	frame.setMenuBar(menuBar = new MenuBar());
270		- menuBar.add(windowMenu = new Menu("File"));
271		- windowMenu.add(loadItem = new MenuItem("Load..."));
272		- windowMenu.add("-");
273		- windowMenu.add(saveItem = new MenuItem("Save"));
274		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	355	+ menuBar.add(fileMenu = new Menu("File"));
	356	+ fileMenu.add(newItem = new MenuItem("New"));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
	358	+
	359	+ //oe.menuBar.add(menu = new Menu("Include"));
	360	+ Menu menu = new Menu("Import");
	361	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	362	+ importOBJItem.addActionListener(this);
	363	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	364	+ import3DSItem.addActionListener(this);
	365	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	366	+ importVRMLX3DItem.addActionListener(this);
	367	+ menu.add("-");
	368	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	369	+ importGFDItem.addActionListener(this);
	370	+ fileMenu.add(menu);
	371	+ fileMenu.add("-");
	372	+
	373	+ fileMenu.add(saveItem = new MenuItem("Save"));
	374	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
275	375	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
276		- windowMenu.add("-");
277		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
278		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
279		- windowMenu.add("-");
	376	+ fileMenu.add("-");
	377	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	378	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	379	+ fileMenu.add("-");
280	380	if (client.parent != null)
281	381	{
282		- windowMenu.add(closeItem = new MenuItem("Close"));
	382	+ fileMenu.add(closeItem = new MenuItem("Close"));
283	383	} else
284	384	{
285		- windowMenu.add(closeItem = new MenuItem("Exit"));
	385	+ fileMenu.add(closeItem = new MenuItem("Exit"));
286	386	}
287	387
288		- loadItem.addActionListener(this);
	388	+ newItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
289	390	saveItem.addActionListener(this);
290	391	saveAsItem.addActionListener(this);
291	392	exportAsItem.addActionListener(this);
..	..	@@ -293,82 +394,69 @@
293	394	//povItem.addActionListener(this);
294	395	closeItem.addActionListener(this);
295	396
296		- menuBar.add(cameraMenu = new Menu("View"));
297		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
298		- //zBufferItem.addActionListener(this);
299		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
300		- //normalLensItem.addActionListener(this);
301		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
302		- revertCameraItem.addActionListener(this);
303		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
304		- toggleTimelineItem.addItemListener(this);
305		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
306		- toggleFullScreenItem.addItemListener(this);
307		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
308		- cameraMenu.add("-");
309		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
310		- toggleTextureItem.addItemListener(this);
311		- toggleTextureItem.setState(CameraPane.textureon);
312		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
313		- toggleLiveItem.addItemListener(this);
314		- toggleLiveItem.setState(Globals.isLIVE());
315		- cameraMenu.add(stepItem = new MenuItem("Step"));
316		- stepItem.addActionListener(this);
317		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
318		-// toggleDLItem.addItemListener(this);
319		-// toggleDLItem.setState(false);
320		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
321		- toggleRenderItem.addItemListener(this);
322		- toggleRenderItem.setState(!CameraPane.frozen);
323		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
324		- toggleDebugItem.addItemListener(this);
325		- toggleDebugItem.setState(CameraPane.DEBUG);
326		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
327		- toggleFrustumItem.addItemListener(this);
328		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
329		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
330		- toggleFootContactItem.addItemListener(this);
331		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
332		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
333		- toggleRandomItem.addItemListener(this);
334		- toggleRandomItem.setState(CameraPane.RANDOM);
335		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
336		- toggleHandleItem.addItemListener(this);
337		- toggleHandleItem.setState(CameraPane.HANDLES);
338		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
339		- togglePaintItem.addItemListener(this);
340		- togglePaintItem.setState(CameraPane.PAINTMODE);
341		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
342		-// toggleRootItem.addItemListener(this);
343		-// toggleRootItem.setState(false);
344		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
345		-// animationItem.addItemListener(this);
346		-// animationItem.setState(CameraPane.ANIMATION);
347		- cameraMenu.add("-");
348		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
349		- editCameraItem.addActionListener(this);
350		-
351	397	objectPanel = new JTabbedPane();
	398	+
	399	+ ChangeListener changeListener = new ChangeListener()
	400	+ {
	401	+ public void stateChanged(ChangeEvent changeEvent)
	402	+ {
	403	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	404	+// {
	405	+// if (latestObject != null)
	406	+// {
	407	+// refreshContents(true);
	408	+// SetMaterial(latestObject);
	409	+// }
	410	+//
	411	+// materialFlushed = true;
	412	+// }
	413	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	414	+// {
	415	+// if (listUI.size() == 0)
	416	+// EditSelection(false);
	417	+// }
	418	+
	419	+ refreshContents(false); // To refresh Info tab
	420	+ }
	421	+ };
	422	+ objectPanel.addChangeListener(changeListener);
	423	+
352	424	toolbarPanel = new JPanel();
353	425	toolbarPanel.setName("Toolbar");
354		- treePanel = new JPanel();
	426	+
	427	+ treePanel = new cGridBag();
355	428	treePanel.setName("Tree");
356		- ctrlPanel = new JPanel(); // new GridBagLayout());
357		- ctrlPanel.setName("Edit");
358		- materialPanel = new JPanel();
359		- materialPanel.setName("Material");
	429	+
	430	+ editPanel = new cGridBag().setVertical(true);
	431	+ //editPanel.setName("Edit");
	432	+
	433	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	434	+
	435	+ editCommandsPanel = new cGridBag();
	436	+ editPanel.add(editCommandsPanel);
	437	+ editPanel.add(ctrlPanel);
	438	+
	439	+ toolboxPanel = new cGridBag().setVertical(true);
	440	+ //toolboxPanel.setName("Toolbox");
	441	+
	442	+ materialPanel = new cGridBag().setVertical(true);
	443	+ //materialPanel.setName("Material");
	444	+
360	445	/JTextPane/
361	446	infoarea = createTextPane();
	447	+ doc = infoarea.getStyledDocument();
	448	+
362	449	infoarea.setEditable(true);
363	450	SetText();
	451	+
364	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365	453	// infoarea.setOpaque(false);
366	454	// //infoarea.setForeground(textcolor);
367		- infoarea.setLineWrap(true);
368		- infoarea.setWrapStyleWord(true);
	455	+// TEXTAREA infoarea.setLineWrap(true);
	456	+// TEXTAREA infoarea.setWrapStyleWord(true);
369	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370		- infoPanel.setPreferredSize(new Dimension(50, 200));
371		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
372	460	//infoPanel.setLayout(new BorderLayout());
373	461	//infoPanel.add(createTextPane());
374	462
..	..	@@ -376,16 +464,23 @@
376	464	mainPanel.setName("Main");
377	465	mainPanel.setContinuousLayout(true);
378	466	mainPanel.setOneTouchExpandable(true);
379		- mainPanel.setDividerLocation(1.0);
380	467	mainPanel.setDividerSize(9);
381		- mainPanel.setResizeWeight(0);
382		-
	468	+ mainPanel.setDividerLocation(0.5); //1.0);
	469	+ mainPanel.setResizeWeight(0.5);
	470	+
	471	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	472	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	473	+ divider.setDividerSize(15);
	474	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	475	+
	476	+ mainPanel.setUI(new BasicSplitPaneUI());
	477	+
383	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384	479	//mainPanel.setLayout(new GridBagLayout());
385	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386		- treePanel.setLayout(new GridBagLayout());
387		- ctrlPanel.setLayout(new GridBagLayout());
388		- materialPanel.setLayout(new GridBagLayout());
	481	+// treePanel.setLayout(new GridBagLayout());
	482	+ //ctrlPanel.setLayout(new GridBagLayout());
	483	+ //materialPanel.setLayout(new GridBagLayout());
389	484
390	485	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391	486	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -424,7 +519,7 @@
424	519	static String newline = "\n";
425	520	protected static final String buttonString = "JButton";
426	521	StyledDocument doc;
427		- JTextArea infoarea;
	522	+ JTextPane infoarea;
428	523
429	524	void ClearInfo()
430	525	{
..	..	@@ -447,10 +542,10 @@
447	542	e.printStackTrace();
448	543	}
449	544
450		- String selection = infoarea.getText();
451		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
452		- java.awt.datatransfer.Clipboard clipboard =
453		- Toolkit.getDefaultToolkit().getSystemClipboard();
	545	+// String selection = infoarea.getText();
	546	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	547	+// java.awt.datatransfer.Clipboard clipboard =
	548	+// Toolkit.getDefaultToolkit().getSystemClipboard();
454	549	//clipboard.setContents(data, data);
455	550	}
456	551
..	..	@@ -473,13 +568,13 @@
473	568	//SendInfo("Name:", "bold");
474	569	if (sel.GetTextures() != null \|\| debug)
475	570	{
476		- si.SendInfo(sel.toString(), "bold");
	571	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
477	572	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
478	573	if (sel.Size() > 0)
479	574	{
480	575	si.SendInfo("#children = " + sel.Size(), "regular");
481	576	}
482		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	577	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
483	578	if (debug)
484	579	{
485	580	try
..	..	@@ -491,7 +586,10 @@
491	586	}
492	587
493	588	if (full)
494		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	589	+ {
	590	+ si.SendInfo(" BBox min: " + minima, "regular");
	591	+ si.SendInfo(" BBox max: " + maxima, "regular");
	592	+ }
495	593
496	594	if (sel.bRep != null)
497	595	{
..	..	@@ -518,7 +616,7 @@
518	616	}
519	617	if (sel.support != null)
520	618	{
521		- si.SendInfo(" support: " + sel.support, "regular");
	619	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
522	620	}
523	621	if (sel.scriptnode != null)
524	622	{
..	..	@@ -589,6 +687,9 @@
589	687	{
590	688	CameraPane.pointflow = (PointFlow) sel;
591	689	}
	690	+
	691	+ si.SendInfo("_____________________", "regular");
	692	+ si.SendInfo("", "regular");
592	693	}
593	694	}
594	695
..	..	@@ -604,68 +705,191 @@
604	705	}
605	706	}
606	707
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	710	+
	711	+ Rectangle keeprect;
	712	+ cRadio radio;
	713	+
	714	+cButton keepButton;
	715	+ cButton twoButton; // Full 3D
	716	+ cButton sixButton;
	717	+ cButton threeButton;
	718	+ cButton sevenButton;
	719	+ cButton fourButton; // full panel
	720	+ cButton oneButton; // full XYZ
	721	+ //cButton currentLayout;
	722	+
	723	+ boolean maximized;
	724	+
	725	+ cButton fullscreenLayout;
	726	+
	727	+ void Minimize()
	728	+ {
	729	+ frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
	731	+ }
	732	+
	733	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	734	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	735	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	736	+ void Maximize()
	737	+ {
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
	743	+ if (maximized)
	744	+ {
	745	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	746	+ }
	747	+ else
	748	+ {
	749	+ keeprect = frame.getBounds();
	750	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	751	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	752	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	753	+// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	755	+ }
	756	+
	757	+ maximized ^= true;
	758	+
	759	+ frame.validate();
	760	+ }
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
	765	+
607	766	void ToggleFullScreen()
608	767	{
609		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
610	773	{
611		- frame.getContentPane().remove(/"Center",/bigThree);
612		- framePanel.add(bigThree);
613		- frame.getContentPane().add(/"Center",/framePanel);
	774	+ device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
	780	+ //frame.setVisible(false);
	781	+// frame.removeNotify();
	782	+// frame.setUndecorated(false);
	783	+// frame.addNotify();
	784	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	785	+
	786	+// X frame.getContentPane().remove(/"Center",/bigThree);
	787	+// X framePanel.add(bigThree);
	788	+// X frame.getContentPane().add(/"Center",/framePanel);
	789	+ framePanel.setDividerLocation(46);
	790	+
	791	+ //frame.setVisible(true);
	792	+ radio.layout = keepButton;
	793	+ //theFrame = null;
	794	+ keepButton = null;
	795	+ radio.layout.doClick();
	796	+
614	797	} else
615	798	{
616		- frame.getContentPane().remove(/"Center",/framePanel);
617		- framePanel.remove(bigThree);
618		- frame.getContentPane().add(/"Center",/bigThree);
	799	+ keepButton = radio.layout;
	800	+ //keeprect = frame.getBounds();
	801	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	802	+// frame.getToolkit().getScreenSize().height);
	803	+ //frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
	807	+ device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
	810	+// frame.removeNotify();
	811	+// frame.setUndecorated(true);
	812	+// frame.addNotify();
	813	+// X frame.getContentPane().remove(/"Center",/framePanel);
	814	+// X framePanel.remove(bigThree);
	815	+// X frame.getContentPane().add(/"Center",/bigThree);
	816	+ framePanel.setDividerLocation(0);
	817	+
	818	+ radio.layout = fullscreenLayout;
	819	+ radio.layout.doClick();
	820	+ //frame.setVisible(true);
619	821	}
620		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
621	823	}
622	824
623		- private JTextArea createTextPane()
	825	+ private byte[] CompressCopy()
624	826	{
625		- String[] initString =
626		- {
627		- "This is an editable JTextPane, ", //regular
628		- "another ", //italic
629		- "styled ", //bold
630		- "text ", //small
631		- "component, ", //large
632		- "which supports embedded components..." + newline,//regular
633		- " " + newline, //button
634		- "...and embedded icons..." + newline, //regular
635		- " ", //icon
636		- newline + "JTextPane is a subclass of JEditorPane that "
637		- + "uses a StyledEditorKit and StyledDocument, and provides "
638		- + "cover methods for interacting with those objects."
639		- };
	827	+ boolean temp = CameraPane.SWITCH;
	828	+ CameraPane.SWITCH = false;
	829	+
	830	+ copy.ExtractBigData(versiontable);
	831	+ // if (copy == client)
	832	+
	833	+ byte[] versions[] = copy.versions;
	834	+ copy.versions = null;
	835	+
	836	+ byte[] compress = Compress(copy);
	837	+
	838	+ copy.versions = versions;
	839	+
	840	+ copy.RestoreBigData(versiontable);
	841	+
	842	+ CameraPane.SWITCH = temp;
	843	+
	844	+ return compress;
	845	+ }
640	846
641		- String[] initStyles =
642		- {
643		- "regular", "italic", "bold", "small", "large",
644		- "regular", "button", "regular", "icon",
645		- "regular"
646		- };
	847	+ private JTextPane createTextPane()
	848	+ {
	849	+// TEXTAREA String[] initString =
	850	+// {
	851	+// "This is an editable JTextPane, ", //regular
	852	+// "another ", //italic
	853	+// "styled ", //bold
	854	+// "text ", //small
	855	+// "component, ", //large
	856	+// "which supports embedded components..." + newline,//regular
	857	+// " " + newline, //button
	858	+// "...and embedded icons..." + newline, //regular
	859	+// " ", //icon
	860	+// newline + "JTextPane is a subclass of JEditorPane that "
	861	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	862	+// + "cover methods for interacting with those objects."
	863	+// };
	864	+//
	865	+// String[] initStyles =
	866	+// {
	867	+// "regular", "italic", "bold", "small", "large",
	868	+// "regular", "button", "regular", "icon",
	869	+// "regular"
	870	+// };
	871	+//
	872	+// JTextPane textPane = new JTextPane();
	873	+// textPane.setEditable(true);
	874	+// /StyledDocument/ doc = textPane.getStyledDocument();
	875	+// addStylesToDocument(doc);
	876	+//
	877	+// try
	878	+// {
	879	+// for (int j = 0; j < 2; j++)
	880	+// {
	881	+// for (int i = 0; i < initString.length; i++)
	882	+// {
	883	+// doc.insertString(doc.getLength(), initString[i],
	884	+// doc.getStyle(initStyles[i]));
	885	+// }
	886	+// }
	887	+// } catch (BadLocationException ble)
	888	+// {
	889	+// System.err.println("Couldn't insert initial text into text pane.");
	890	+// }
647	891
648		- JTextPane textPane = new JTextPane();
649		- textPane.setEditable(true);
650		- /StyledDocument/ doc = textPane.getStyledDocument();
651		- addStylesToDocument(doc);
652		-
653		- try
654		- {
655		- for (int j = 0; j < 2; j++)
656		- {
657		- for (int i = 0; i < initString.length; i++)
658		- {
659		- doc.insertString(doc.getLength(), initString[i],
660		- doc.getStyle(initStyles[i]));
661		- }
662		- }
663		- } catch (BadLocationException ble)
664		- {
665		- System.err.println("Couldn't insert initial text into text pane.");
666		- }
667		-
668		- return new JTextArea(); // textPane;
	892	+ return new JTextPane(); // textPane;
669	893	}
670	894
671	895	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -718,7 +942,7 @@
718	942	protected static ImageIcon createImageIcon(String path,
719	943	String description)
720	944	{
721		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	945	+ java.net.URL imgURL = Grafreed.class.getResource(path);
722	946	if (imgURL != null)
723	947	{
724	948	return new ImageIcon(imgURL, description);
..	..	@@ -750,6 +974,7 @@
750	974	// NumberSlider vDivsField;
751	975	// JCheckBox endcaps;
752	976	JCheckBox liveCB;
	977	+ JCheckBox selectableCB;
753	978	JCheckBox hideCB;
754	979	JCheckBox link2masterCB;
755	980	JCheckBox markCB;
..	..	@@ -757,7 +982,12 @@
757	982	JCheckBox speedupCB;
758	983	JCheckBox rewindCB;
759	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
760	989	JComboBox texresMenu;
	990	+
761	991	JButton resetButton;
762	992	JButton stepButton;
763	993	JButton stepAllButton;
..	..	@@ -765,115 +995,87 @@
765	995	JButton slowerButton;
766	996	JButton fasterButton;
767	997	JButton remarkButton;
	998	+
	999	+ cGridBag editPanel;
	1000	+ cGridBag editCommandsPanel;
	1001	+
	1002	+ cGridBag namePanel;
	1003	+ cGridBag setupPanel;
	1004	+ cGridBag setupPanel2;
	1005	+ cGridBag objectCommandsPanel;
	1006	+ cGridBag pushPanel;
	1007	+ cGridBag fillPanel;
768	1008
769		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1009	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
770	1010	{
771	1011	JCheckBox cb;
772	1012
773		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
774		- oe.aConstraints.gridwidth = 1; // 3;
775		-// oe.aConstraints.weightx = 1;
776		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
777		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1013	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
778	1014	cb.addItemListener(this);
779		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
780		- oe.aConstraints.gridwidth = 1;
781		- oe.aConstraints.gridx += 1;
782	1015
783	1016	return cb;
784	1017	}
785	1018
786		- cButton AddButton(ObjEditor oe, String label)
	1019	+ cButton AddButton(cGridBag panel, String label)
787	1020	{
788	1021	cButton cb;
789	1022
790		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
791		- oe.aConstraints.gridwidth = 1;
792		-// oe.aConstraints.weightx = 1;
793		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
794		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1023	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
795	1024	cb.addActionListener(this);
796		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
797		- oe.aConstraints.gridwidth = 1;
798		- oe.aConstraints.gridx += 1;
799	1025
800	1026	return cb;
801	1027	}
802	1028
803		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1029	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
804	1030	{
805	1031	JComboBox combo;
806	1032
807		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
808		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
809		- oe.aConstraints.gridx += 1;
	1033	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
810	1034	combo.addActionListener(this);
811	1035
812	1036	return combo;
813	1037	}
814	1038
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1039	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
816	1040	{
817		- NumberSlider combo;
	1041	+ cGridBag control = new cGridBag();
	1042	+
	1043	+ cNumberSlider combo;
818	1044
819	1045	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1046	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 1;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	1047	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1048	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1049	combo.setFloat(current);
833		-
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1050	+
	1051	+ panel.add(control);
	1052	+
	1053	+ return control;
839	1054	}
840	1055
841		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1056	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
842	1057	{
843		- NumberSlider combo;
	1058	+ cGridBag control = new cGridBag();
	1059	+
	1060	+ cNumberSlider combo;
844	1061
845	1062	JLabel jlabel = new JLabel(label);
846		-
847		- aConstraints.fill = GridBagConstraints.VERTICAL;
848	1063	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
849		- aConstraints.gridwidth = 2;
850		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
851		- aConstraints.gridx += 1;
852		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
853		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
854		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
855		- aConstraints.gridx += 1;
856		- aConstraints.gridwidth = 1;
857		-
	1064	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1065	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1066	combo.setInteger(current);
859	1067
860		- combo.label = jlabel;
861		-
862		- combo.addChangeListener(this);
863		-
864		- return combo;
	1068	+ panel.add(control);
	1069	+
	1070	+ return control;
865	1071	}
866	1072
867		- JTextArea AddText(JPanel ctrlPanel, String name)
	1073	+ JTextArea AddText(cGridBag ctrlPanel, String name)
868	1074	{
869	1075	JTextArea text;
870	1076
871		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
872		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1077	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874	1078	text.addCaretListener(this);
875		- aConstraints.gridx += 1;
876		- aConstraints.gridwidth = 1;
877	1079
878	1080	return text;
879	1081	}
..	..	@@ -903,9 +1105,16 @@
903	1105	objEditor.ctrlPanel.remove(j);
904	1106	}
905	1107
	1108	+ void Remove(cNumberSlider j)
	1109	+ {
	1110	+ j.removeChangeListener(this);
	1111	+ //objEditor.ctrlPanel.remove(j.label);
	1112	+ objEditor.ctrlPanel.remove(j);
	1113	+ }
	1114	+
906	1115	/*
907	1116	*/
908		- void Return() // ObjEditor oe)
	1117	+ void Return0() // ObjEditor oe)
909	1118	{
910	1119	aConstraints.gridy += 1;
911	1120	aConstraints.gridx = 0;
..	..	@@ -960,37 +1169,80 @@
960	1169
961	1170	void SetupUI2(ObjEditor oe)
962	1171	{
963		-// oe.aConstraints.weightx = 0;
964		-// oe.aConstraints.weighty = 0;
965		-// oe.aConstraints.gridx = 0;
966		-// oe.aConstraints.gridy = 0;
967		- SetupName(oe);
	1172	+ //SetupName(oe);
968	1173
969		- if (!GroupEditor.allparams)
	1174	+ namePanel = new cGridBag();
	1175	+
	1176	+ nameField = AddText(namePanel, copy.GetName());
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1178	+ oe.ctrlPanel.add(namePanel);
	1179	+
	1180	+ oe.ctrlPanel.Return();
	1181	+
	1182	+ if (!allparams)
970	1183	return;
971	1184
972		- liveCB = AddCheckBox(oe, "Live", copy.live);
973		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1185	+ setupPanel = new cGridBag().setVertical(false);
	1186	+
	1187	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1188	+ liveCB.setToolTipText("Animate object");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
975	1191	// Return();
976		- markCB = AddCheckBox(oe, "Mark", copy.marked);
977		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
978		- randomCB = AddCheckBox(oe, "Rand", copy.random);
979		- Return();
980		- resetButton = AddButton(oe, "Reset");
981		- stepButton = AddButton(oe, "Step");
	1192	+
	1193	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1194	+ hideCB.setToolTipText("Hide object");
	1195	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1196	+ markCB.setToolTipText("As animation target transform");
	1197	+
	1198	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1199	+
	1200	+ setupPanel2 = new cGridBag().setVertical(false);
	1201	+
	1202	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1203	+ rewindCB.setToolTipText("Rewind animation");
	1204	+
	1205	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1206	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1207	+
	1208	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1209	+ link2masterCB.setToolTipText("Attach to support");
	1210	+
	1211	+ if (Globals.ADVANCED)
	1212	+ {
	1213	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1214	+ speedupCB.setToolTipText("Option motion capture");
	1215	+ }
	1216	+
	1217	+ oe.ctrlPanel.add(setupPanel);
	1218	+ oe.ctrlPanel.Return();
	1219	+ oe.ctrlPanel.add(setupPanel2);
	1220	+ oe.ctrlPanel.Return();
	1221	+
	1222	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1223	+
	1224	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1225	+ resetButton.setToolTipText("Jump to frame zero");
	1226	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1227	+ stepButton.setToolTipText("Step one frame");
982	1228	// resetAllButton = AddButton(oe, "Reset All");
983	1229	// stepAllButton = AddButton(oe, "Step All");
984		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
985	1230	// Return();
986		- slowerButton = AddButton(oe, "Slow");
987		- fasterButton = AddButton(oe, "Fast");
988		- remarkButton = AddButton(oe, "Rem");
	1231	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1232	+ slowerButton.setToolTipText("Decrease animation speed");
	1233	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1234	+ fasterButton.setToolTipText("Increase animation speed");
	1235	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1236	+ remarkButton.setToolTipText("Set the current transform as the target");
989	1237
990		- Return();
	1238	+ oe.ctrlPanel.add(objectCommandsPanel);
	1239	+ oe.ctrlPanel.Return();
991	1240
992		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993		- Return();
	1241	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1242	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1243	+ //Return();
	1244	+
	1245	+ oe.ctrlPanel.Return();
994	1246
995	1247	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
996	1248	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1085,7 +1337,7 @@
1085	1337	oe.aConstraints.gridwidth = 1;
1086	1338	/**/
1087	1339	nameField = AddText(oe.ctrlPanel, copy.GetName());
1088		- Return();
	1340	+ oe.ctrlPanel.Return();
1089	1341
1090	1342	//ctrlPanel.add(textureButton = new Button("Texture..."));
1091	1343	//textureButton.setEnabled(false);
..	..	@@ -1187,9 +1439,13 @@
1187	1439	//JPanel worldPanel =
1188	1440	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1189	1441	//worldPanel.setName("World");
1190		- centralPanel = new JPanel(new BorderLayout());
1191		- timelinePanel = new JPanel(new BorderLayout());
1192		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1442	+ centralPanel = new cGridBag();
	1443	+ centralPanel.preferredWidth = 20;
	1444	+
	1445	+ if (Globals.ADVANCED)
	1446	+ {
	1447	+ timelinePanel = new JPanel(new BorderLayout());
	1448	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1193	1449
1194	1450	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195	1451	cameraPanel.setContinuousLayout(true);
..	..	@@ -1198,7 +1454,10 @@
1198	1454	// cameraPanel.setDividerSize(9);
1199	1455	cameraPanel.setResizeWeight(1.0);
1200	1456
	1457	+ }
	1458	+
1201	1459	centralPanel.add(cameraView);
	1460	+ centralPanel.setFocusable(true);
1202	1461	//frame.setJMenuBar(timelineMenubar);
1203	1462	//centralPanel.add(timelinePanel);
1204	1463
..	..	@@ -1217,12 +1476,14 @@
1217	1476	//frontView.object = copy;
1218	1477	//sideView.object = copy;
1219	1478
1220		- XYZPanel = new JPanel();
1221		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1479	+ XYZPanel = new cGridBag().setVertical(true);
	1480	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1222	1481
1223		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1224		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1225		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1482	+ XYZPanel.preferredWidth = 5;
	1483	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1484	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1485	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1486	+ //XYZPanel.setName("XYZ");
1226	1487
1227	1488	/*
1228	1489	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1260,11 +1521,23 @@
1260	1521	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1261	1522	//tmp.setName("Edit");
1262	1523	objectPanel.add(materialPanel);
1263		- JPanel north = new JPanel(new BorderLayout());
1264		- north.setName("Edit");
1265		- north.add(ctrlPanel, BorderLayout.NORTH);
1266		- objectPanel.add(north);
1267		- objectPanel.add(infoPanel);
	1524	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1525	+// JPanel north = new JPanel(new BorderLayout());
	1526	+// north.setName("Edit");
	1527	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1528	+// objectPanel.add(north);
	1529	+ objectPanel.add(editPanel);
	1530	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1531	+
	1532	+ //if (Globals.ADVANCED)
	1533	+ objectPanel.add(infoPanel);
	1534	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1535	+
	1536	+ objectPanel.add(XYZPanel);
	1537	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1538	+
	1539	+ objectPanel.add(toolboxPanel);
	1540	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1268	1541
1269	1542	/*
1270	1543	aConstraints.gridx = 0;
..	..	@@ -1273,7 +1546,7 @@
1273	1546	aConstraints.gridy += 1;
1274	1547	aConstraints.gridwidth = 1;
1275	1548	mainPanel.add(objectPanel, aConstraints);
1276		- */
	1549	+ */
1277	1550
1278	1551	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1279	1552	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1284,19 +1557,23 @@
1284	1557	scrollpane.setWheelScrollingEnabled(true);
1285	1558	scrollpane.addMouseWheelListener(this); // Default not fast enough
1286	1559
1287		- /JTabbedPane/ scenePanel = new JTabbedPane();
1288		- scenePanel.add(scrollpane);
	1560	+ /JTabbedPane/ scenePanel = new cGridBag();
	1561	+ scenePanel.preferredWidth = 5;
	1562	+
	1563	+ JTabbedPane tabbedPane = new JTabbedPane();
	1564	+ tabbedPane.add(scrollpane);
1289	1565
1290		- scenePanel.add(FSPane = new cFileSystemPane(this));
1291		-
1292		- optionsPanel = new JPanel(new GridBagLayout());
	1566	+ optionsPanel = new cGridBag().setVertical(false);
1293	1567
1294	1568	optionsPanel.setName("Options");
1295	1569
1296		- AddOptions(optionsPanel, aConstraints);
	1570	+ AddOptions(optionsPanel); //, aConstraints);
1297	1571
1298		- scenePanel.add(optionsPanel);
	1572	+ tabbedPane.add(optionsPanel);
	1573	+
	1574	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1299	1575
	1576	+ scenePanel.add(tabbedPane);
1300	1577
1301	1578	/*
1302	1579	cTree jTree = new cTree(null);
..	..	@@ -1330,6 +1607,7 @@
1330	1607	//bigPanel.setSize(new Dimension(10,10));
1331	1608	//bigPanel.add(ctrlPanel);
1332	1609	//bigPanel.add(gridPanel);
	1610	+ /**
1333	1611	bigThree = new JPanel();
1334	1612	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1335	1613	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1353,7 +1631,13 @@
1353	1631	// aConstraints.gridheight = 3;
1354	1632	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1355	1633	bigThree.add(XYZPanel, aWindowConstraints);
	1634	+ /**/
1356	1635
	1636	+ bigThree = new cGridBag();
	1637	+ bigThree.addComponent(centralPanel);
	1638	+ bigThree.addComponent(scenePanel);
	1639	+ //bigThree.addComponent(XYZPanel);
	1640	+
1357	1641	// // SIDE EFFECT!!!
1358	1642	// aConstraints.gridx = 0;
1359	1643	// aConstraints.gridy = 0;
..	..	@@ -1361,9 +1645,9 @@
1361	1645	// aConstraints.gridheight = 1;
1362	1646
1363	1647	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1364		- framePanel.setContinuousLayout(true);
1365		- framePanel.setOneTouchExpandable(true);
1366		- framePanel.setDividerLocation(0.8);
	1648	+ framePanel.setContinuousLayout(false);
	1649	+ framePanel.setOneTouchExpandable(false);
	1650	+ //.setDividerLocation(0.8);
1367	1651	//framePanel.setDividerSize(15);
1368	1652	//framePanel.setResizeWeight(0.15);
1369	1653	framePanel.setName("Frame");
..	..	@@ -1380,10 +1664,15 @@
1380	1664
1381	1665	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1382	1666
1383		- frame.setSize(1024, 768);
1384		- frame.show();
1385		-
	1667	+ frame.setSize(1280, 860);
	1668	+
	1669	+ cameraView.requestFocusInWindow();
	1670	+
1386	1671	gridPanel.setDividerLocation(1.0);
	1672	+
	1673	+ frame.validate();
	1674	+
	1675	+ frame.setVisible(true);
1387	1676
1388	1677	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1389	1678	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1396,7 +1685,7 @@
1396	1685	});
1397	1686	}
1398	1687
1399		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1688	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1400	1689	{
1401	1690	}
1402	1691
..	..	@@ -1411,260 +1700,161 @@
1411	1700	ctrlPanel.removeAll();
1412	1701	}
1413	1702
1414		- void SetupMaterial(JPanel ctrlPanel)
	1703	+ void SetupMaterial(cGridBag panel)
1415	1704	{
1416		- aConstraints.weighty = 0;
1417		- //aConstraints.weightx = 1;
1418		- /*
	1705	+ /*
1419	1706	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1420	1707	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423	1708	*/
1424	1709
1425		- aConstraints.gridwidth = 1;
1426		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1427		- aConstraints.gridx += 1;
1428		- aConstraints.weighty = 0;
1429		- aConstraints.gridwidth = 1;
	1710	+ cGridBag editBar = new cGridBag().setVertical(false);
	1711	+
	1712	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1713	+ createMaterialButton.setToolTipText("Create material");
1430	1714
1431	1715	/*
1432	1716	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1433		- aConstraints.gridx += 1;
1434		- aConstraints.weighty = 0;
1435		- aConstraints.gridwidth = 1;
1436	1717	*/
1437	1718
1438		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1439		- aConstraints.gridx += 1;
	1719	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1720	+ clearMaterialButton.setToolTipText("Clear material");
	1721	+
	1722	+ if (Globals.ADVANCED)
	1723	+ {
	1724	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1725	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1726	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1727	+ }
1440	1728
1441		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1442		-
1443		- aConstraints.gridx += 1;
1444		-
1445		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1446		-
1447		- aConstraints.gridx += 1;
1448		-
1449		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1450		-
1451		- aConstraints.gridx = 0;
1452		- aConstraints.gridy += 1;
1453		- aConstraints.weighty = 0;
1454		- aConstraints.gridwidth = 1;
	1729	+ editBar.preferredHeight = 15;
	1730	+
	1731	+ panel.add(editBar);
	1732	+
1455	1733	/**/
1456	1734	//aConstraints.weighty = 0;
1457	1735	////aConstraints.weightx = 1;
1458	1736	//aConstraints.weighty = 1;
1459	1737	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1460	1738	//aConstraints.gridx += 1;
1461		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1462		- aConstraints.weighty = 0;
1463		- aConstraints.gridx = 0;
1464		- aConstraints.gridy += 1;
1465		- aConstraints.gridwidth = 1;
	1739	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1466	1740
1467		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1468		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1469		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1470		- aConstraints.gridx += 1;
1471		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1472		- //aConstraints.weightx = 0;
1473		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1474		- aConstraints.gridx = 0;
1475		- aConstraints.gridy += 1;
1476		- aConstraints.gridwidth = 1;
	1741	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1742	+
	1743	+ cGridBag color = new cGridBag();
	1744	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1745	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1746	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1747	+ //colorField.preferredWidth = 200;
	1748	+ colorSection.add(color);
1477	1749
1478		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1479		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1480		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1481		- aConstraints.gridx += 1;
1482		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1483		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1484		- aConstraints.gridx = 0;
1485		- aConstraints.gridy += 1;
1486		- aConstraints.gridwidth = 1;
	1750	+ cGridBag modulation = new cGridBag();
	1751	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1752	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1753	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1754	+ colorSection.add(modulation);
1487	1755
1488		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1489		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1491		- aConstraints.gridx += 1;
1492		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1493		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1494		- aConstraints.gridx = 0;
1495		- aConstraints.gridy += 1;
1496		- aConstraints.gridwidth = 1;
	1756	+ cGridBag texture = new cGridBag();
	1757	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1758	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1759	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1760	+ colorSection.add(texture);
1497	1761
1498		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1499		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1501		- aConstraints.gridx += 1;
1502		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1503		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1504		- aConstraints.gridx = 0;
1505		- aConstraints.gridy += 1;
1506		- aConstraints.gridwidth = 1;
	1762	+ panel.add(new JSeparator());
	1763	+
	1764	+ panel.add(colorSection);
	1765	+
	1766	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1767	+
	1768	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1769	+
	1770	+ cGridBag diffuse = new cGridBag();
	1771	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1772	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1773	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1774	+ diffuseSection.add(diffuse);
1507	1775
1508		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1509		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1510		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1511		- aConstraints.gridx += 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1513		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1514		- aConstraints.gridx = 0;
1515		- aConstraints.gridy += 1;
1516		- aConstraints.gridwidth = 1;
	1776	+ cGridBag diffuseness = new cGridBag();
	1777	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1778	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1779	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1780	+ diffuseSection.add(diffuseness);
1517	1781
1518		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1519		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1520		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1521		- aConstraints.gridx += 1;
1522		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1523		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1524		- aConstraints.gridx = 0;
1525		- aConstraints.gridy += 1;
1526		- aConstraints.gridwidth = 1;
	1782	+ cGridBag selfshadow = new cGridBag();
	1783	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1784	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1785	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1786	+ diffuseSection.add(selfshadow);
1527	1787
1528		- //aConstraints.weighty = 1;
1529		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1530		- //aConstraints.gridx += 1;
1531		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1532		- aConstraints.weighty = 0;
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	1788	+ cGridBag sheen = new cGridBag();
	1789	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1790	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1791	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1792	+ diffuseSection.add(sheen);
1536	1793
1537		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1538		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1539		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1540		- aConstraints.gridx += 1;
1541		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1542		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1543		- aConstraints.gridx = 0;
1544		- aConstraints.gridy += 1;
1545		- aConstraints.gridwidth = 1;
	1794	+ cGridBag subsurface = new cGridBag();
	1795	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1796	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1797	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1798	+ diffuseSection.add(subsurface);
1546	1799
1547		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1548		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1549		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1550		- aConstraints.gridx += 1;
1551		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1552		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1553		- aConstraints.gridx = 0;
1554		- aConstraints.gridy += 1;
1555		- aConstraints.gridwidth = 1;
	1800	+ cGridBag shadow = new cGridBag();
	1801	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1802	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1803	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1804	+ diffuseSection.add(shadow);
1556	1805
1557		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1558		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1560		- aConstraints.gridx += 1;
1561		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1562		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1563		- aConstraints.gridx = 0;
1564		- aConstraints.gridy += 1;
1565		- aConstraints.gridwidth = 1;
	1806	+ cGridBag fakedepth = new cGridBag();
	1807	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1808	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1809	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1810	+ diffuseSection.add(fakedepth);
1566	1811
1567		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1568		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1569		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1570		- aConstraints.gridx += 1;
1571		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1572		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1573		- aConstraints.gridx = 0;
1574		- aConstraints.gridy += 1;
1575		- aConstraints.gridwidth = 1;
	1812	+ cGridBag shadowbias = new cGridBag();
	1813	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1814	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1815	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1816	+ diffuseSection.add(shadowbias);
1576	1817
1577		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1578		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1580		- aConstraints.gridx += 1;
1581		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1582		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1583		- aConstraints.gridx = 0;
1584		- aConstraints.gridy += 1;
1585		- aConstraints.gridwidth = 1;
	1818	+ panel.add(new JSeparator());
	1819	+
	1820	+ panel.add(diffuseSection);
	1821	+
	1822	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1823	+
	1824	+ cGridBag specularSection = new cGridBag().setVertical(true);
1586	1825
1587		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1588		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1589		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1590		- aConstraints.gridx += 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1592		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1593		- aConstraints.gridx = 0;
1594		- aConstraints.gridy += 1;
1595		- aConstraints.gridwidth = 1;
	1826	+ cGridBag specular = new cGridBag();
	1827	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1828	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1829	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1830	+ specularSection.add(specular);
1596	1831
1597		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1598		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1599		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1600		- aConstraints.gridx += 1;
1601		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1602		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1603		- aConstraints.gridx = 0;
1604		- aConstraints.gridy += 1;
1605		- aConstraints.gridwidth = 1;
	1832	+ cGridBag lightarea = new cGridBag();
	1833	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1834	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1835	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1836	+ specularSection.add(lightarea);
1606	1837
1607		- //aConstraints.weighty = 1;
1608		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1609		- //aConstraints.gridx += 1;
1610		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1611		- aConstraints.weighty = 0;
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	1838	+ cGridBag shininess = new cGridBag();
	1839	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1840	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1841	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1842	+ specularSection.add(shininess);
1615	1843
1616		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1617		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1619		- aConstraints.gridx += 1;
1620		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1621		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1622		- aConstraints.gridx = 0;
1623		- aConstraints.gridy += 1;
1624		- aConstraints.gridwidth = 1;
	1844	+ cGridBag metalness = new cGridBag();
	1845	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1846	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1847	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1848	+ specularSection.add(metalness);
1625	1849
1626		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1627		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1629		- aConstraints.gridx += 1;
1630		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1631		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1632		- aConstraints.gridx = 0;
1633		- aConstraints.gridy += 1;
1634		- aConstraints.gridwidth = 1;
	1850	+ cGridBag velvet = new cGridBag();
	1851	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1852	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1853	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1854	+ specularSection.add(velvet);
1635	1855
1636		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1637		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1639		- aConstraints.gridx += 1;
1640		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1641		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1642		- aConstraints.gridx = 0;
1643		- aConstraints.gridy += 1;
1644		- aConstraints.gridwidth = 1;
1645		-
1646		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1647		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1648		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1649		- aConstraints.gridx += 1;
1650		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1651		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1652		- aConstraints.gridx = 0;
1653		- aConstraints.gridy += 1;
1654		- aConstraints.gridwidth = 1;
1655		-
1656		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1657		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1658		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1659		- aConstraints.gridx += 1;
1660		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1661		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1662		- aConstraints.gridx = 0;
1663		- aConstraints.gridy += 1;
1664		- aConstraints.gridwidth = 1;
1665		-
1666		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1667		- Return();
	1856	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1857	+ //Return();
1668	1858	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1669	1859	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670	1860	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1675,130 +1865,105 @@
1675	1865	// aConstraints.gridy += 1;
1676	1866	// aConstraints.gridwidth = 1;
1677	1867
1678		- //aConstraints.weighty = 1;
1679		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1680		- //aConstraints.gridx += 1;
1681		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1682		- aConstraints.weighty = 0;
1683		- aConstraints.gridx = 0;
1684		- aConstraints.gridy += 1;
1685		- aConstraints.gridwidth = 1;
	1868	+ cGridBag anisoU = new cGridBag();
	1869	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1870	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1871	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1872	+ specularSection.add(anisoU);
1686	1873
1687		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1688		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1689		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1690		- aConstraints.gridx += 1;
1691		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1692		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1693		- aConstraints.gridx = 0;
1694		- aConstraints.gridy += 1;
1695		- aConstraints.gridwidth = 1;
	1874	+ cGridBag anisoV = new cGridBag();
	1875	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1876	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1877	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1878	+ specularSection.add(anisoV);
1696	1879
1697		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1698		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1700		- aConstraints.gridx += 1;
1701		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1702		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1703		- aConstraints.gridx = 0;
1704		- aConstraints.gridy += 1;
1705		- aConstraints.gridwidth = 1;
1706	1880
1707		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1708		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1710		- aConstraints.gridx += 1;
1711		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1712		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1713		- aConstraints.gridx = 0;
1714		- aConstraints.gridy += 1;
1715		- aConstraints.gridwidth = 1;
	1881	+ panel.add(new JSeparator());
	1882	+
	1883	+ panel.add(specularSection);
	1884	+
	1885	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1886	+
	1887	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1716	1888
1717		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1718		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1719		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1720		- aConstraints.gridx += 1;
1721		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1722		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1723		- aConstraints.gridx = 0;
1724		- aConstraints.gridy += 1;
1725		- aConstraints.gridwidth = 1;
1726		- aConstraints.weighty = 0;
	1889	+ cGridBag camera = new cGridBag();
	1890	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1891	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1892	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1893	+ colorSection.add(camera);
1727	1894
1728		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1729		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1730		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1731		- aConstraints.gridx += 1;
1732		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1733		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1734		- aConstraints.gridx = 0;
1735		- aConstraints.gridy += 1;
1736		- aConstraints.gridwidth = 1;
	1895	+ cGridBag ambient = new cGridBag();
	1896	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1897	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1898	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1899	+ colorSection.add(ambient);
1737	1900
1738		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1739		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1740		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1741		- aConstraints.gridx += 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1743		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1744		- aConstraints.gridx = 0;
1745		- aConstraints.gridy += 1;
1746		- aConstraints.gridwidth = 1;
	1901	+ cGridBag backlit = new cGridBag();
	1902	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1903	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1904	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1905	+ colorSection.add(backlit);
1747	1906
1748		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1749		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1750		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1751		- aConstraints.gridx += 1;
1752		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1753		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1754		- aConstraints.gridx = 0;
1755		- aConstraints.gridy += 1;
1756		- aConstraints.gridwidth = 1;
	1907	+ cGridBag opacity = new cGridBag();
	1908	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1909	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1910	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1911	+ colorSection.add(opacity);
1757	1912
1758		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1759		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1761		- aConstraints.gridx += 1;
1762		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1763		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1764		- aConstraints.gridx = 0;
1765		- aConstraints.gridy += 1;
1766		- aConstraints.gridwidth = 1;
	1913	+ //panel.add(new JSeparator());
	1914	+
	1915	+ //panel.add(globalSection);
	1916	+
	1917	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1918	+
	1919	+ cGridBag textureSection = new cGridBag().setVertical(true);
1767	1920
1768		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1769		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1771		- aConstraints.gridx += 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1773		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1774		- aConstraints.gridx = 0;
1775		- aConstraints.gridy += 1;
1776		- aConstraints.gridwidth = 1;
	1921	+ cGridBag bump = new cGridBag();
	1922	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1923	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1924	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1925	+ textureSection.add(bump);
1777	1926
1778		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1779		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1780		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1781		- aConstraints.gridx += 1;
1782		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1783		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1784		- aConstraints.gridx = 0;
1785		- aConstraints.gridy += 1;
1786		- aConstraints.gridwidth = 1;
	1927	+ cGridBag noise = new cGridBag();
	1928	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1929	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1930	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1931	+ textureSection.add(noise);
1787	1932
1788		- //aConstraints.weighty = 1;
1789		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1790		- //aConstraints.gridx += 1;
1791		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1792		- aConstraints.weighty = 0;
	1933	+ cGridBag power = new cGridBag();
	1934	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1935	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1936	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1937	+ textureSection.add(power);
1793	1938
1794		- aConstraints.gridx = 0;
1795		- aConstraints.gridy = 0;
1796		- aConstraints.gridwidth = 1;
	1939	+ cGridBag borderfade = new cGridBag();
	1940	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1941	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1942	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1943	+ textureSection.add(borderfade);
	1944	+
	1945	+ cGridBag fog = new cGridBag();
	1946	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1947	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1948	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1949	+ textureSection.add(fog);
	1950	+
	1951	+ cGridBag opacityPower = new cGridBag();
	1952	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1953	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1954	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1955	+ textureSection.add(opacityPower);
	1956	+
	1957	+ panel.add(new JSeparator());
	1958	+
	1959	+ panel.add(textureSection);
	1960	+
	1961	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	1962
1798	1963	SetMaterial(copy); // .GetMaterial());
1799	1964
1800		- colorField.addChangeListener(this);
1801		- modulationField.addChangeListener(this);
	1965	+ //colorField.addChangeListener(this);
	1966	+// modulationField.addChangeListener(this);
1802	1967	metalnessField.addChangeListener(this);
1803	1968	diffuseField.addChangeListener(this);
1804	1969	specularField.addChangeListener(this);
..	..	@@ -1828,12 +1993,15 @@
1828	1993	opacityPowerField.addChangeListener(this);
1829	1994	/**/
1830	1995
1831		- resetSlidersButton.addActionListener(this);
1832	1996	clearMaterialButton.addActionListener(this);
1833	1997	createMaterialButton.addActionListener(this);
1834		-
1835		- propagateToggle.addItemListener(this);
1836		- multiplyToggle.addItemListener(this);
	1998	+
	1999	+ if (Globals.ADVANCED)
	2000	+ {
	2001	+ resetSlidersButton.addActionListener(this);
	2002	+ propagateToggle.addItemListener(this);
	2003	+ multiplyToggle.addItemListener(this);
	2004	+ }
1837	2005	}
1838	2006
1839	2007	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1851,8 +2019,9 @@
1851	2019	// 3D models
1852	2020	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1853	2021	{
1854		- lastConverter = new com.jmex.model.converters.MaxToJme();
1855		- LoadFile(filename, lastConverter);
	2022	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2023	+ //LoadFile(filename, lastConverter);
	2024	+ LoadObjFile(filename); // New 3ds loader
1856	2025	continue;
1857	2026	}
1858	2027	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2004,7 +2173,7 @@
2004	2173
2005	2174	//? flashIt = false;
2006	2175	CameraPane pane = (CameraPane) cameraView;
2007		- pane.clickStart(location.x, location.y, 0);
	2176	+ pane.clickStart(location.x, location.y, 0, 0);
2008	2177	pane.clickEnd(location.x, location.y, 0, true);
2009	2178
2010	2179	if (group.selection.size() == 1)
..	..	@@ -2053,6 +2222,7 @@
2053	2222	e2.printStackTrace();
2054	2223	}
2055	2224	}
	2225	+
2056	2226	LoadJMEThread loadThread;
2057	2227
2058	2228	class LoadJMEThread extends Thread
..	..	@@ -2110,6 +2280,7 @@
2110	2280	//LoadFile0(filename, converter);
2111	2281	}
2112	2282	}
	2283	+
2113	2284	LoadOBJThread loadObjThread;
2114	2285
2115	2286	class LoadOBJThread extends Thread
..	..	@@ -2188,19 +2359,19 @@
2188	2359
2189	2360	void LoadObjFile(String fullname)
2190	2361	{
2191		- /*
	2362	+ System.out.println("Loading " + fullname);
	2363	+ /**/
2192	2364	//lastFilename = fullname;
2193	2365	if(loadObjThread == null)
2194	2366	{
2195		- loadObjThread = new LoadOBJThread();
2196		- loadObjThread.start();
	2367	+ loadObjThread = new LoadOBJThread();
	2368	+ loadObjThread.start();
2197	2369	}
2198	2370
2199	2371	loadObjThread.add(fullname);
2200		- */
	2372	+ /**/
2201	2373
2202		- System.out.println("Loading " + fullname);
2203		- makeSomething(new FileObject(fullname, true), true);
	2374	+ //makeSomething(new FileObject(fullname, true), true);
2204	2375	}
2205	2376
2206	2377	void LoadGFDFile(String fullname)
..	..	@@ -2461,11 +2632,11 @@
2461	2632
2462	2633	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2463	2634	{
2464		- if (GrafreeD.standAlone)
	2635	+ if (Grafreed.standAlone)
2465	2636	{
2466	2637	/**/
2467	2638	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2468		- browser.show();
	2639	+ browser.setVisible(true);
2469	2640	String filename = browser.getFile();
2470	2641	if (filename != null && filename.length() > 0)
2471	2642	{
..	..	@@ -2576,6 +2747,7 @@
2576	2747	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2577	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2578	2749	}
	2750	+
2579	2751	//cJME.count++;
2580	2752	//cJME.count %= 12;
2581	2753	if (gc)
..	..	@@ -2610,6 +2782,7 @@
2610	2782	}
2611	2783	if (input == null)
2612	2784	{
	2785	+ new Exception().printStackTrace();
2613	2786	System.exit(0);
2614	2787	}
2615	2788
..	..	@@ -2758,6 +2931,7 @@
2758	2931	}
2759	2932	}
2760	2933	}
	2934	+
2761	2935	cFileSystemPane FSPane;
2762	2936
2763	2937	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2811,11 +2985,14 @@
2811	2985	}
2812	2986	}
2813	2987	}
	2988	+
2814	2989	freezematerial = false;
2815	2990	}
2816	2991
2817	2992	void SetMaterial(Object3D object)
2818	2993	{
	2994	+ latestObject = object;
	2995	+
2819	2996	cMaterial mat = object.material;
2820	2997
2821	2998	if (mat == null)
..	..	@@ -2824,7 +3001,8 @@
2824	3001	return;
2825	3002	}
2826	3003
2827		- multiplyToggle.setSelected(mat.multiply);
	3004	+ if (multiplyToggle != null)
	3005	+ multiplyToggle.setSelected(mat.multiply);
2828	3006
2829	3007	assert (object.projectedVertices != null);
2830	3008
..	..	@@ -2926,12 +3104,17 @@
2926	3104	// }
2927	3105
2928	3106	/**/
2929		- if (deselect)
	3107	+ if (deselect \|\| child == null)
2930	3108	{
2931	3109	//group.deselectAll();
2932	3110	//freeze = true;
2933	3111	GetTree().clearSelection();
2934	3112	//freeze = false;
	3113	+
	3114	+ if (child == null)
	3115	+ {
	3116	+ return;
	3117	+ }
2935	3118	}
2936	3119
2937	3120	//group.addSelectee(child);
..	..	@@ -3000,7 +3183,7 @@
3000	3183	cameraView.ToggleDL();
3001	3184	cameraView.repaint();
3002	3185	return;
3003		- } else if (event.getSource() == toggleTextureItem)
	3186	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3004	3187	{
3005	3188	cameraView.ToggleTexture();
3006	3189	// june 2013 copy.HardTouch();
..	..	@@ -3039,9 +3222,9 @@
3039	3222	frame.validate();
3040	3223
3041	3224	return;
3042		- } else if (event.getSource() == toggleRandomItem)
	3225	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3043	3226	{
3044		- cameraView.ToggleRandom();
	3227	+ cameraView.ToggleSwitch();
3045	3228	cameraView.repaint();
3046	3229	return;
3047	3230	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3070,6 +3253,10 @@
3070	3253	{
3071	3254	copy.live ^= true;
3072	3255	return;
	3256	+ } else if (event.getSource() == selectableCB)
	3257	+ {
	3258	+ copy.dontselect ^= true;
	3259	+ return;
3073	3260	} else if (event.getSource() == hideCB)
3074	3261	{
3075	3262	copy.hide ^= true;
..	..	@@ -3084,6 +3271,7 @@
3084	3271	if (event.getSource() == randomCB)
3085	3272	{
3086	3273	copy.random ^= true;
	3274	+ objEditor.refreshContents();
3087	3275	return;
3088	3276	}
3089	3277	if (event.getSource() == speedupCB)
..	..	@@ -3107,8 +3295,9 @@
3107	3295
3108	3296	public void actionPerformed(ActionEvent event)
3109	3297	{
	3298	+ Object source = event.getSource();
3110	3299	// SCRIPT DIALOG
3111		- if (event.getSource() == okbutton)
	3300	+ if (source == okbutton)
3112	3301	{
3113	3302	textpanel.setVisible(false);
3114	3303	textpanel.remove(textarea);
..	..	@@ -3120,7 +3309,7 @@
3120	3309	textarea = null;
3121	3310	textpanel = null;
3122	3311	}
3123		- if (event.getSource() == cancelbutton)
	3312	+ if (source == cancelbutton)
3124	3313	{
3125	3314	textpanel.setVisible(false);
3126	3315	textpanel.remove(textarea);
..	..	@@ -3132,50 +3321,50 @@
3132	3321	//applySelf();
3133	3322	//client.refreshEditWindow();
3134	3323	//refreshContents();
3135		- if (event.getSource() == nameField)
	3324	+ if (source == nameField)
3136	3325	{
3137	3326	//System.out.println("ObjEditor " + event);
3138	3327	applySelf0(true);
3139	3328	//parent.applySelf();
3140	3329	objEditor.refreshContents();
3141		- } else if (event.getSource() == resetButton)
	3330	+ } else if (source == resetButton)
3142	3331	{
3143	3332	CameraPane.fullreset = true;
3144	3333	copy.Reset(); // ResetMeshes();
3145	3334	copy.Touch();
3146	3335	objEditor.refreshContents();
3147		- } else if (event.getSource() == stepItem)
	3336	+ } else if (source == stepItem)
3148	3337	{
3149	3338	//cameraView.ONESTEP = true;
3150	3339	Globals.ONESTEP = true;
3151	3340	cameraView.repaint();
3152	3341	return;
3153		- } else if (event.getSource() == stepButton)
	3342	+ } else if (source == stepButton)
3154	3343	{
3155	3344	copy.Step();
3156	3345	copy.Touch();
3157	3346	objEditor.refreshContents();
3158		- } else if (event.getSource() == slowerButton)
	3347	+ } else if (source == slowerButton)
3159	3348	{
3160	3349	copy.Slower();
3161	3350	copy.Touch();
3162	3351	objEditor.refreshContents();
3163		- } else if (event.getSource() == fasterButton)
	3352	+ } else if (source == fasterButton)
3164	3353	{
3165	3354	copy.Faster();
3166	3355	copy.Touch();
3167	3356	objEditor.refreshContents();
3168		- } else if (event.getSource() == remarkButton)
	3357	+ } else if (source == remarkButton)
3169	3358	{
3170	3359	copy.Remark();
3171	3360	copy.Touch();
3172	3361	objEditor.refreshContents();
3173		- } else if (event.getSource() == stepAllButton)
	3362	+ } else if (source == stepAllButton)
3174	3363	{
3175	3364	copy.StepAll();
3176	3365	copy.Touch();
3177	3366	objEditor.refreshContents();
3178		- } else if (event.getSource() == resetAllButton)
	3367	+ } else if (source == resetAllButton)
3179	3368	{
3180	3369	//CameraPane.fullreset = true;
3181	3370	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3208,53 +3397,79 @@
3208	3397	// Close();
3209	3398	// }
3210	3399	// else
3211		- if (event.getSource() == resetSlidersButton)
	3400	+ if (source == resetSlidersButton)
3212	3401	{
3213	3402	ResetSliders();
3214		- } else if (event.getSource() == clearMaterialButton)
	3403	+ } else if (source == clearMaterialButton)
3215	3404	{
3216	3405	ClearMaterial();
3217		- } else if (event.getSource() == createMaterialButton)
	3406	+ } else if (source == createMaterialButton)
3218	3407	{
3219	3408	CreateMaterial();
3220		- } else if (event.getSource() == clearPanelButton)
	3409	+ } else if (source == clearPanelButton)
3221	3410	{
3222	3411	copy.ClearUI();
3223	3412	refreshContents(true);
3224		- } /*
3225		- }
3226		-
3227		- public boolean action(Event event, Object arg)
3228		- {
3229		- */ else if (event.getSource() == closeItem)
	3413	+ } else if (source == importGFDItem)
	3414	+ {
	3415	+ ImportGFD();
	3416	+ } else
	3417	+ if (source == importVRMLX3DItem)
	3418	+ {
	3419	+ ImportVRMLX3D();
	3420	+ } else
	3421	+ if (source == import3DSItem)
	3422	+ {
	3423	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3424	+ } else
	3425	+ if (source == importOBJItem)
	3426	+ {
	3427	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3428	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3429	+ browser.setVisible(true);
	3430	+ String filename = browser.getFile();
	3431	+ if (filename != null && filename.length() > 0)
	3432	+ {
	3433	+ String fullname = browser.getDirectory() + filename;
	3434	+ makeSomething(ReadOBJ(fullname), true);
	3435	+ }
	3436	+ } else
	3437	+ if (source == closeItem)
3230	3438	{
3231	3439	Close();
3232	3440	//return true;
3233		- } else if (event.getSource() == loadItem)
	3441	+ } else if (source == openItem)
3234	3442	{
3235		- load();
	3443	+ Open();
3236	3444	//return true;
3237		- } else if (event.getSource() == saveItem)
	3445	+ } else if (source == newItem)
	3446	+ {
	3447	+ New();
	3448	+ } else if (source == saveItem)
3238	3449	{
3239	3450	save();
3240	3451	//return true;
3241		- } else if (event.getSource() == saveAsItem)
	3452	+ } else if (source == saveAsItem)
3242	3453	{
3243	3454	saveAs();
3244	3455	//return true;
3245		- } else if (event.getSource() == reexportItem)
	3456	+ } else if (source == reexportItem)
3246	3457	{
3247	3458	reexport();
3248	3459	//return true;
3249		- } else if (event.getSource() == exportAsItem)
	3460	+ } else if (source == exportAsItem)
3250	3461	{
3251	3462	export();
3252	3463	//return true;
3253		- } else if (event.getSource() == povItem)
	3464	+ } else if (source == povItem)
3254	3465	{
3255	3466	generatePOV();
3256	3467	//return true;
3257		- } else if (event.getSource() == zBufferItem)
	3468	+ } else if (event.getSource() == archiveItem)
	3469	+ {
	3470	+ cTools.Archive(frame);
	3471	+ return;
	3472	+ } else if (source == zBufferItem)
3258	3473	{
3259	3474	try
3260	3475	{
..	..	@@ -3276,21 +3491,8 @@
3276	3491	cameraView.repaint();
3277	3492	//return true;
3278	3493	}
3279		- */ else if (event.getSource() == editCameraItem)
3280		- {
3281		- cameraView.ProtectCamera();
3282		- cameraView.repaint();
3283		- return;
3284		- } else if (event.getSource() == revertCameraItem)
3285		- {
3286		- cameraView.RevertCamera();
3287		- cameraView.repaint();
3288		- return;
3289		-// } else if (event.getSource() == textureButton)
3290		-// {
3291		-// return; // true;
3292		- } else // combos...
3293		- if (event.getSource() == texresMenu)
	3494	+ */ else // combos...
	3495	+ if (source == texresMenu)
3294	3496	{
3295	3497	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3296	3498	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3302,12 +3504,409 @@
3302	3504	}
3303	3505	}
3304	3506
	3507	+ void New()
	3508	+ {
	3509	+ while (copy.Size() > 1)
	3510	+ {
	3511	+ copy.remove(1);
	3512	+ }
	3513	+
	3514	+ ResetModel();
	3515	+ objEditor.refreshContents();
	3516	+ }
	3517	+
	3518	+ static public byte[] Compress(Object3D o)
	3519	+ {
	3520	+ try
	3521	+ {
	3522	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3523	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3524	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3525	+
	3526	+ Object3D parent = o.parent;
	3527	+ o.parent = null;
	3528	+
	3529	+ out.writeObject(o);
	3530	+
	3531	+ o.parent = parent;
	3532	+
	3533	+ out.flush();
	3534	+
	3535	+ baos //zstream
	3536	+ .close();
	3537	+ out.close();
	3538	+
	3539	+ byte[] bytes = baos.toByteArray();
	3540	+
	3541	+ System.out.println("save #bytes = " + bytes.length);
	3542	+ return bytes;
	3543	+ } catch (Exception e)
	3544	+ {
	3545	+ System.err.println(e);
	3546	+ return null;
	3547	+ }
	3548	+ }
	3549	+
	3550	+ static public Object Uncompress(byte[] bytes)
	3551	+ {
	3552	+ System.out.println("restore #bytes = " + bytes.length);
	3553	+ try
	3554	+ {
	3555	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3556	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3557	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3558	+ Object obj = in.readObject();
	3559	+
	3560	+ bais //istream
	3561	+ .close();
	3562	+ in.close();
	3563	+
	3564	+ return obj;
	3565	+ } catch (Exception e)
	3566	+ {
	3567	+ System.err.println(e);
	3568	+ return null;
	3569	+ }
	3570	+ }
	3571	+
	3572	+ static public Object clone(Object o)
	3573	+ {
	3574	+ try
	3575	+ {
	3576	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3577	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3578	+
	3579	+ out.writeObject(o);
	3580	+
	3581	+ out.flush();
	3582	+ out.close();
	3583	+
	3584	+ byte[] bytes = baos.toByteArray();
	3585	+
	3586	+ System.out.println("clone = " + bytes.length);
	3587	+
	3588	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3589	+ ObjectInputStream in = new ObjectInputStream(bais);
	3590	+ Object obj = in.readObject();
	3591	+ in.close();
	3592	+
	3593	+ return obj;
	3594	+ } catch (Exception e)
	3595	+ {
	3596	+ System.err.println(e);
	3597	+ return null;
	3598	+ }
	3599	+ }
	3600	+
	3601	+ cRadio GetCurrentTab()
	3602	+ {
	3603	+ cRadio ab;
	3604	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3605	+ {
	3606	+ ab = (cRadio)e.nextElement();
	3607	+ if(ab.GetObject() == copy)
	3608	+ {
	3609	+ return ab;
	3610	+ }
	3611	+ }
	3612	+
	3613	+ return null;
	3614	+ }
	3615	+
	3616	+
	3617	+ public void Save()
	3618	+ {
	3619	+ //Save(true);
	3620	+ Replace();
	3621	+ }
	3622	+
	3623	+ private boolean Equal(byte[] compress, byte[] name)
	3624	+ {
	3625	+ if (compress.length != name.length)
	3626	+ {
	3627	+ return false;
	3628	+ }
	3629	+
	3630	+ for (int i=compress.length; --i>=0;)
	3631	+ {
	3632	+ if (compress[i] != name[i])
	3633	+ return false;
	3634	+ }
	3635	+
	3636	+ return true;
	3637	+ }
	3638	+
	3639	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3640	+
	3641	+ public boolean Save(boolean user)
	3642	+ {
	3643	+ System.err.println("Save");
	3644	+
	3645	+ cRadio tab = GetCurrentTab();
	3646	+
	3647	+ byte[] compress = CompressCopy();
	3648	+
	3649	+ boolean thesame = false;
	3650	+
	3651	+ // Quick heuristic using length. Works only when stream is compressed.
	3652	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3653	+ {
	3654	+ thesame = true;
	3655	+ }
	3656	+
	3657	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3658	+ if (!thesame)
	3659	+ {
	3660	+ //tab.user[tab.versionindex] = user;
	3661	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3662	+
	3663	+ copy.versions[++copy.versionindex] = compress;
	3664	+
	3665	+ // if (increment)
	3666	+ // tab.versionindex++;
	3667	+ }
	3668	+
	3669	+ //copy.RestoreBigData(versiontable);
	3670	+
	3671	+ //assert(hashtable.isEmpty());
	3672	+
	3673	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3674	+ {
	3675	+ //tab.user[i] = false;
	3676	+ copy.versions[i] = null;
	3677	+ }
	3678	+
	3679	+ SetUndoStates();
	3680	+
	3681	+ // test save
	3682	+ if (false)
	3683	+ {
	3684	+ try
	3685	+ {
	3686	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3687	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3688	+
	3689	+ p.writeObject(copy);
	3690	+
	3691	+ p.flush();
	3692	+
	3693	+ ostream.close();
	3694	+ } catch (Exception e)
	3695	+ {
	3696	+ e.printStackTrace();
	3697	+ }
	3698	+ }
	3699	+
	3700	+ return !thesame;
	3701	+ }
	3702	+
	3703	+ void CopyChanged(Object3D obj)
	3704	+ {
	3705	+ SetUndoStates();
	3706	+
	3707	+ boolean temp = CameraPane.SWITCH;
	3708	+ CameraPane.SWITCH = false;
	3709	+
	3710	+ copy.ExtractBigData(versiontable);
	3711	+
	3712	+ copy.clear();
	3713	+
	3714	+ for (int i=0; i<obj.Size(); i++)
	3715	+ {
	3716	+ copy.add(obj.get(i));
	3717	+ }
	3718	+
	3719	+ copy.RestoreBigData(versiontable);
	3720	+
	3721	+ CameraPane.SWITCH = temp;
	3722	+
	3723	+ //assert(hashtable.isEmpty());
	3724	+
	3725	+ copy.Touch();
	3726	+
	3727	+ ResetModel();
	3728	+ copy.HardTouch(); // recompile?
	3729	+
	3730	+ cRadio ab;
	3731	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3732	+ {
	3733	+ ab = (cRadio)e.nextElement();
	3734	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3735	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3736	+ if (test != null)
	3737	+ {
	3738	+ test.editWindow = ab.object.editWindow;
	3739	+ ab.object = test;
	3740	+ }
	3741	+ }
	3742	+
	3743	+ refreshContents();
	3744	+ }
	3745	+
	3746	+ cButton undoButton;
	3747	+ cButton restoreButton;
	3748	+ cButton replaceButton;
	3749	+ cButton redoButton;
	3750	+
	3751	+ boolean muteSlider;
	3752	+
	3753	+ int VersionCount()
	3754	+ {
	3755	+ int count = 0;
	3756	+
	3757	+ for (int i = copy.versions.length; --i >= 0;)
	3758	+ {
	3759	+ if (copy.versions[i] != null)
	3760	+ count++;
	3761	+ }
	3762	+
	3763	+ return count;
	3764	+ }
	3765	+
	3766	+ void SetUndoStates()
	3767	+ {
	3768	+ cRadio tab = GetCurrentTab();
	3769	+
	3770	+ restoreButton.setEnabled(copy.versionindex != -1);
	3771	+ replaceButton.setEnabled(copy.versionindex != -1);
	3772	+
	3773	+ undoButton.setEnabled(copy.versionindex > 0);
	3774	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3775	+
	3776	+ muteSlider = true;
	3777	+ versionSlider.setMaximum(VersionCount() - 1);
	3778	+ versionSlider.setInteger(copy.versionindex);
	3779	+ muteSlider = false;
	3780	+ }
	3781	+
	3782	+ public boolean Undo()
	3783	+ {
	3784	+ // Option?
	3785	+ Replace();
	3786	+
	3787	+ System.err.println("Undo");
	3788	+
	3789	+ cRadio tab = GetCurrentTab();
	3790	+
	3791	+ if (copy.versionindex == 0)
	3792	+ {
	3793	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3794	+ return false;
	3795	+ }
	3796	+
	3797	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3798	+// {
	3799	+// if (Save(false))
	3800	+// tab.versionindex -= 1;
	3801	+// else
	3802	+// {
	3803	+// if (tab.versionindex <= 0)
	3804	+// return false;
	3805	+// else
	3806	+// tab.versionindex -= 1;
	3807	+// }
	3808	+// }
	3809	+
	3810	+ copy.versionindex -= 1;
	3811	+
	3812	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3813	+
	3814	+ return true;
	3815	+ }
	3816	+
	3817	+ public boolean Restore()
	3818	+ {
	3819	+ System.err.println("Restore");
	3820	+
	3821	+ cRadio tab = GetCurrentTab();
	3822	+
	3823	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3824	+ {
	3825	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3826	+ return false;
	3827	+ }
	3828	+
	3829	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3830	+
	3831	+ return true;
	3832	+ }
	3833	+
	3834	+ public boolean Replace()
	3835	+ {
	3836	+ System.err.println("Replace");
	3837	+
	3838	+ cRadio tab = GetCurrentTab();
	3839	+
	3840	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3841	+ {
	3842	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3843	+ return false;
	3844	+ }
	3845	+
	3846	+ copy.versions[copy.versionindex] = CompressCopy();
	3847	+
	3848	+ return true;
	3849	+ }
	3850	+
	3851	+ public void Redo()
	3852	+ {
	3853	+ // Option?
	3854	+ Replace();
	3855	+
	3856	+ cRadio tab = GetCurrentTab();
	3857	+
	3858	+ if (copy.versions[copy.versionindex + 1] == null)
	3859	+ {
	3860	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3861	+ return;
	3862	+ }
	3863	+
	3864	+ copy.versionindex += 1;
	3865	+
	3866	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3867	+
	3868	+ //if (!tab.user[tab.versionindex])
	3869	+ // tab.graphs[tab.versionindex] = null;
	3870	+ }
	3871	+
	3872	+ void ImportGFD()
	3873	+ {
	3874	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3875	+ browser.show();
	3876	+ String filename = browser.getFile();
	3877	+ if (filename != null && filename.length() > 0)
	3878	+ {
	3879	+ String fullname = browser.getDirectory() + filename;
	3880	+
	3881	+ //Object3D readobj =
	3882	+ objEditor.ReadGFD(fullname, objEditor);
	3883	+ //makeSomething(readobj);
	3884	+ }
	3885	+ }
	3886	+
	3887	+ void ImportVRMLX3D()
	3888	+ {
	3889	+ if (Grafreed.standAlone)
	3890	+ {
	3891	+ /**/
	3892	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3893	+ browser.show();
	3894	+ String filename = browser.getFile();
	3895	+ if (filename != null && filename.length() > 0)
	3896	+ {
	3897	+ String fullname = browser.getDirectory() + filename;
	3898	+ LoadVRMLX3D(fullname);
	3899	+ }
	3900	+ /**/
	3901	+ }
	3902	+ }
	3903	+
3305	3904	void ToggleAnimation()
3306	3905	{
3307	3906	if (!Globals.ANIMATION)
3308	3907	{
3309	3908	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3310		- browser.show();
	3909	+ browser.setVisible(true);
3311	3910	String filename = browser.getFile();
3312	3911	if (filename != null && filename.length() > 0)
3313	3912	{
..	..	@@ -3317,8 +3916,8 @@
3317	3916
3318	3917	Globals.ANIMATION ^= true;
3319	3918
3320		- GrafreeD.wav.cursor = 0;
3321		- GrafreeD.wav.loop = 0;
	3919	+ Grafreed.wav.cursor = 0;
	3920	+ Grafreed.wav.loop = 0;
3322	3921	}
3323	3922	} else
3324	3923	{
..	..	@@ -3368,7 +3967,7 @@
3368	3967	void CreateMaterial()
3369	3968	{
3370	3969	//copy.ClearMaterial(); // PATCH
3371		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3970	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3372	3971	if (copy.selection.size() > 0)
3373	3972	//SetMaterial(copy);
3374	3973	{
..	..	@@ -3419,7 +4018,7 @@
3419	4018	assert false;
3420	4019	}
3421	4020
3422		- void EditSelection()
	4021	+ void EditSelection(boolean newWindow)
3423	4022	{
3424	4023	}
3425	4024
..	..	@@ -3427,11 +4026,11 @@
3427	4026	{
3428	4027	copy.ResetBlockLoop(); // temporary problem
3429	4028
3430		- boolean random = CameraPane.RANDOM;
3431		- CameraPane.RANDOM = false; // parse everything
	4029	+ boolean random = CameraPane.SWITCH;
	4030	+ CameraPane.SWITCH = false; // parse everything
3432	4031	copy.ResetDisplayList();
3433	4032	copy.HardTouch();
3434		- CameraPane.RANDOM = random;
	4033	+ CameraPane.SWITCH = random;
3435	4034	}
3436	4035
3437	4036	// public void applySelf()
..	..	@@ -3501,10 +4100,40 @@
3501	4100	current.fakedepth = (float) fakedepthField.getFloat();
3502	4101	current.shadowbias = (float) shadowbiasField.getFloat();
3503	4102
3504		- if (!NumberSlider.frozen)
	4103	+ if (!cNumberSlider.frozen)
3505	4104	{
3506	4105	//System.out.println("Propagate = " + propagate);
3507	4106	copy.UpdateMaterial(anchor, current, propagate);
	4107	+
	4108	+ if (copy.material != null)
	4109	+ {
	4110	+ cMaterial mat = copy.material;
	4111	+
	4112	+ colorField.SetToolTipValue((mat.color));
	4113	+ modulationField.SetToolTipValue((mat.modulation));
	4114	+ metalnessField.SetToolTipValue((mat.metalness));
	4115	+ diffuseField.SetToolTipValue((mat.diffuse));
	4116	+ specularField.SetToolTipValue((mat.specular));
	4117	+ shininessField.SetToolTipValue((mat.shininess));
	4118	+ shiftField.SetToolTipValue((mat.shift));
	4119	+ ambientField.SetToolTipValue((mat.ambient));
	4120	+ lightareaField.SetToolTipValue((mat.lightarea));
	4121	+ diffusenessField.SetToolTipValue((mat.factor));
	4122	+ velvetField.SetToolTipValue((mat.velvet));
	4123	+ sheenField.SetToolTipValue((mat.sheen));
	4124	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4125	+ backlitField.SetToolTipValue((mat.bump));
	4126	+ anisoField.SetToolTipValue((mat.aniso));
	4127	+ anisoVField.SetToolTipValue((mat.anisoV));
	4128	+ cameraField.SetToolTipValue((mat.cameralight));
	4129	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4130	+ shadowField.SetToolTipValue((mat.shadow));
	4131	+ textureField.SetToolTipValue((mat.texture));
	4132	+ opacityField.SetToolTipValue((mat.opacity));
	4133	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4134	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4135	+ }
	4136	+
3508	4137	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3509	4138	{
3510	4139	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3533,9 +4162,25 @@
3533	4162	//copy.Touch();
3534	4163	}
3535	4164
	4165	+ cNumberSlider versionSlider;
	4166	+
3536	4167	public void stateChanged(ChangeEvent e)
3537	4168	{
3538	4169	// assert(false);
	4170	+ if (e.getSource() == versionSlider)
	4171	+ {
	4172	+ if (muteSlider)
	4173	+ return;
	4174	+
	4175	+ int version = versionSlider.getInteger();
	4176	+
	4177	+ if (copy.versions[version] != null)
	4178	+ {
	4179	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4180	+ }
	4181	+
	4182	+ return;
	4183	+ }
3539	4184
3540	4185	if (freezematerial)
3541	4186	{
..	..	@@ -3549,6 +4194,7 @@
3549	4194	\|\| e.getSource() == apertureField
3550	4195	\|\| e.getSource() == shadowblurField)
3551	4196	{
	4197	+ new Exception().printStackTrace();
3552	4198	System.exit(0);
3553	4199	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3554	4200	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3619,7 +4265,7 @@
3619	4265	}
3620	4266
3621	4267	if (normalpushField != null)
3622		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4268	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3623	4269	}
3624	4270
3625	4271	void SnapObject()
..	..	@@ -3874,7 +4520,7 @@
3874	4520
3875	4521	radioPanel.revalidate();
3876	4522	radioPanel.repaint();
3877		- ctrlPanel.revalidate(); // ? new
	4523	+ ctrlPanel.validate(); // ? new
3878	4524	ctrlPanel.repaint();
3879	4525	}
3880	4526	}
..	..	@@ -3883,6 +4529,8 @@
3883	4529
3884	4530	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3885	4531	{
	4532	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4533	+ Save();
3886	4534	//Tween.set(thing, 0).target(1).start(tweenManager);
3887	4535	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3888	4536	// if (thing instanceof GenericJointDemo)
..	..	@@ -3969,6 +4617,12 @@
3969	4617	{
3970	4618	ResetModel();
3971	4619	Select(thing.GetTreePath(), true, false); // unselect... false);
	4620	+
	4621	+ if (thing.Size() == 0)
	4622	+ {
	4623	+ //EditSelection(false);
	4624	+ }
	4625	+
3972	4626	refreshContents();
3973	4627	}
3974	4628
..	..	@@ -4086,6 +4740,7 @@
4086	4740	}
4087	4741	}
4088	4742	}
	4743	+
4089	4744	LoadGFDThread loadGFDThread;
4090	4745
4091	4746	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4105,8 +4760,10 @@
4105	4760
4106	4761	try
4107	4762	{
	4763	+ // Try compressed version first.
4108	4764	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4109		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4765	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4766	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4110	4767
4111	4768	readobj = (Object3D) p.readObject();
4112	4769	istream.close();
..	..	@@ -4114,7 +4771,22 @@
4114	4771	readobj.ResetDisplayList();
4115	4772	} catch (Exception e)
4116	4773	{
4117		- e.printStackTrace();
	4774	+ if (!e.toString().contains("GZIP"))
	4775	+ e.printStackTrace();
	4776	+
	4777	+ try
	4778	+ {
	4779	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4780	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4781	+
	4782	+ readobj = (Object3D) p.readObject();
	4783	+ istream.close();
	4784	+
	4785	+ readobj.ResetDisplayList();
	4786	+ } catch (Exception e2)
	4787	+ {
	4788	+ e2.printStackTrace();
	4789	+ }
4118	4790	}
4119	4791	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4120	4792	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4160,6 +4832,12 @@
4160	4832
4161	4833	void LoadIt(Object obj)
4162	4834	{
	4835	+ if (obj == null)
	4836	+ {
	4837	+ // Invalid file
	4838	+ return;
	4839	+ }
	4840	+
4163	4841	System.out.println("Loaded " + obj);
4164	4842	//new Exception().printStackTrace();
4165	4843	Object3D readobj = (Object3D) obj;
..	..	@@ -4169,10 +4847,14 @@
4169	4847
4170	4848	if (readobj != null)
4171	4849	{
	4850	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4851	+ // Save();
4172	4852	try
4173	4853	{
4174	4854	//readobj.deepCopySelf(copy);
4175	4855	copy.clear(); // june 2014
	4856	+ copy.skyboxname = readobj.skyboxname;
	4857	+ copy.skyboxext = readobj.skyboxext;
4176	4858	for (int i = 0; i < readobj.size(); i++)
4177	4859	{
4178	4860	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4213,6 +4895,7 @@
4213	4895	}
4214	4896	} catch (ClassCastException e)
4215	4897	{
	4898	+ e.printStackTrace();
4216	4899	assert (false);
4217	4900	Composite c = (Composite) copy;
4218	4901	c.children.clear();
..	..	@@ -4223,15 +4906,26 @@
4223	4906	c.addChild(csg);
4224	4907	}
4225	4908
	4909	+ copy.versions = readobj.versions;
	4910	+ copy.versionindex = readobj.versionindex;
	4911	+
	4912	+ if (copy.versions == null)
	4913	+ {
	4914	+ copy.versions = new byte[100][];
	4915	+ copy.versionindex = -1;
	4916	+ }
	4917	+
	4918	+ //? SetUndoStates();
	4919	+
4226	4920	ResetModel();
4227	4921	copy.HardTouch(); // recompile?
4228	4922	refreshContents();
4229	4923	}
4230	4924	}
4231	4925
4232		- void load() // throws ClassNotFoundException
	4926	+ void Open() // throws ClassNotFoundException
4233	4927	{
4234		- if (GrafreeD.standAlone)
	4928	+ if (Grafreed.standAlone)
4235	4929	{
4236	4930	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4237	4931	browser.show();
..	..	@@ -4318,11 +5012,13 @@
4318	5012	try
4319	5013	{
4320	5014	FileOutputStream ostream = new FileOutputStream(lastname);
4321		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5015	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5016	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4322	5017
4323	5018	p.writeObject(copy);
4324	5019	p.flush();
4325	5020
	5021	+ zstream.close();
4326	5022	ostream.close();
4327	5023
4328	5024	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4330,19 +5026,23 @@
4330	5026	//ps.print(buffer.toString());
4331	5027	} catch (IOException e)
4332	5028	{
	5029	+ e.printStackTrace();
4333	5030	}
4334	5031	}
	5032	+
4335	5033	String lastname;
4336	5034
4337	5035	void saveAs()
4338	5036	{
4339		- if (GrafreeD.standAlone)
	5037	+ if (Grafreed.standAlone)
4340	5038	{
4341	5039	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4342	5040	browser.setVisible(true);
4343	5041	String filename = browser.getFile();
4344	5042	if (filename != null && filename.length() > 0)
4345	5043	{
	5044	+ if (!filename.endsWith(".gfd"))
	5045	+ filename += ".gfd";
4346	5046	lastname = browser.getDirectory() + filename;
4347	5047	save();
4348	5048	}
..	..	@@ -4441,13 +5141,13 @@
4441	5141	try
4442	5142	{
4443	5143	FileOutputStream ostream = new FileOutputStream(filename);
4444		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4445		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5144	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5145	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4446	5146
4447	5147	Object3D objectparent = obj.parent;
4448	5148	obj.parent = null;
4449	5149
4450		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5150	+ Object3D object = (Object3D) Grafreed.clone(obj);
4451	5151
4452	5152	obj.parent = objectparent;
4453	5153
..	..	@@ -4459,8 +5159,8 @@
4459	5159	p.writeObject(object);
4460	5160	p.flush();
4461	5161
	5162	+ zstream.close();
4462	5163	ostream.close();
4463		- // zstream.close();
4464	5164
4465	5165	// group.selection.get(0).parent = parent;
4466	5166	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4481,7 +5181,7 @@
4481	5181	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4482	5182	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4483	5183	copy.generatePOV(buffer);
4484		- if (GrafreeD.standAlone)
	5184	+ if (Grafreed.standAlone)
4485	5185	{
4486	5186	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4487	5187	browser.show();
..	..	@@ -4507,21 +5207,20 @@
4507	5207	Object3D client;
4508	5208	Object3D copy;
4509	5209	MenuBar menuBar;
4510		- Menu windowMenu;
4511		- MenuItem loadItem;
	5210	+ Menu fileMenu;
	5211	+ MenuItem newItem;
	5212	+ MenuItem openItem;
4512	5213	MenuItem saveItem;
4513	5214	MenuItem saveAsItem;
4514	5215	MenuItem exportAsItem;
4515	5216	MenuItem reexportItem;
4516	5217	MenuItem povItem;
4517	5218	MenuItem closeItem;
4518		- Menu cameraMenu;
	5219	+
4519	5220	CheckboxMenuItem zBufferItem;
4520	5221	//MenuItem normalLensItem;
4521		- MenuItem editCameraItem;
4522		- MenuItem revertCameraItem;
4523		- CheckboxMenuItem toggleLiveItem;
4524	5222	MenuItem stepItem;
	5223	+ CheckboxMenuItem toggleLiveItem;
4525	5224	CheckboxMenuItem toggleFullScreenItem;
4526	5225	CheckboxMenuItem toggleTimelineItem;
4527	5226	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4530,28 +5229,42 @@
4530	5229	CheckboxMenuItem toggleFootContactItem;
4531	5230	CheckboxMenuItem toggleDLItem;
4532	5231	CheckboxMenuItem toggleTextureItem;
4533		- CheckboxMenuItem toggleRandomItem;
	5232	+ CheckboxMenuItem toggleSwitchItem;
4534	5233	CheckboxMenuItem toggleRootItem;
4535	5234	CheckboxMenuItem animationItem;
	5235	+ MenuItem archiveItem;
4536	5236	CheckboxMenuItem toggleHandleItem;
4537	5237	CheckboxMenuItem togglePaintItem;
4538	5238	JSplitPane mainPanel;
4539	5239	JScrollPane scrollpane;
	5240	+
4540	5241	JPanel toolbarPanel;
4541		- JPanel treePanel;
	5242	+
	5243	+ cGridBag treePanel;
	5244	+
4542	5245	JPanel radioPanel;
4543	5246	ButtonGroup buttonGroup;
4544		- JPanel ctrlPanel;
4545		- JPanel materialPanel;
	5247	+
	5248	+ cGridBag toolboxPanel;
	5249	+ cGridBag materialPanel;
	5250	+ cGridBag ctrlPanel;
	5251	+
4546	5252	JScrollPane infoPanel;
4547		- JPanel optionsPanel;
	5253	+
	5254	+ cGridBag optionsPanel;
	5255	+
4548	5256	JTabbedPane objectPanel;
4549		- JPanel XYZPanel;
	5257	+ boolean materialFlushed;
	5258	+ Object3D latestObject;
	5259	+
	5260	+ cGridBag XYZPanel;
	5261	+
4550	5262	JSplitPane gridPanel;
4551	5263	JSplitPane bigPanel;
4552		- JPanel bigThree;
4553		- JTabbedPane scenePanel;
4554		- JPanel centralPanel;
	5264	+
	5265	+ cGridBag bigThree;
	5266	+ cGridBag scenePanel;
	5267	+ cGridBag centralPanel;
4555	5268	JSplitPane cameraPanel;
4556	5269	JPanel timelinePanel;
4557	5270	JMenuBar timelineMenubar;
..	..	@@ -4604,67 +5317,72 @@
4604	5317	// MATERIAL
4605	5318	JLabel materialLabel;
4606	5319	JLabel colorLabel;
4607		- NumberSlider colorField;
	5320	+ cNumberSlider colorField;
4608	5321	JLabel modulationLabel;
4609		- NumberSlider modulationField;
	5322	+ cNumberSlider modulationField;
4610	5323	JLabel metalnessLabel;
4611		- NumberSlider metalnessField;
	5324	+ cNumberSlider metalnessField;
4612	5325	JLabel diffuseLabel;
4613		- NumberSlider diffuseField;
	5326	+ cNumberSlider diffuseField;
4614	5327	JLabel specularLabel;
4615		- NumberSlider specularField;
	5328	+ cNumberSlider specularField;
4616	5329	JLabel shininessLabel;
4617		- NumberSlider shininessField;
	5330	+ cNumberSlider shininessField;
4618	5331	JLabel shiftLabel;
4619		- NumberSlider shiftField;
	5332	+ cNumberSlider shiftField;
4620	5333	JLabel ambientLabel;
4621		- NumberSlider ambientField;
	5334	+ cNumberSlider ambientField;
4622	5335	JLabel lightareaLabel;
4623		- NumberSlider lightareaField;
	5336	+ cNumberSlider lightareaField;
4624	5337	JLabel diffusenessLabel;
4625		- NumberSlider diffusenessField;
	5338	+ cNumberSlider diffusenessField;
4626	5339	JLabel velvetLabel;
4627		- NumberSlider velvetField;
	5340	+ cNumberSlider velvetField;
4628	5341	JLabel sheenLabel;
4629		- NumberSlider sheenField;
	5342	+ cNumberSlider sheenField;
4630	5343	JLabel subsurfaceLabel;
4631		- NumberSlider subsurfaceField;
	5344	+ cNumberSlider subsurfaceField;
4632	5345	//JLabel bumpLabel;
4633	5346	//NumberSlider bumpField;
4634	5347	JLabel backlitLabel;
4635		- NumberSlider backlitField;
	5348	+ cNumberSlider backlitField;
4636	5349	JLabel anisoLabel;
4637		- NumberSlider anisoField;
	5350	+ cNumberSlider anisoField;
4638	5351	JLabel anisoVLabel;
4639		- NumberSlider anisoVField;
	5352	+ cNumberSlider anisoVField;
4640	5353	JLabel cameraLabel;
4641		- NumberSlider cameraField;
	5354	+ cNumberSlider cameraField;
4642	5355	JLabel selfshadowLabel;
4643		- NumberSlider selfshadowField;
	5356	+ cNumberSlider selfshadowField;
4644	5357	JLabel shadowLabel;
4645		- NumberSlider shadowField;
	5358	+ cNumberSlider shadowField;
4646	5359	JLabel textureLabel;
4647		- NumberSlider textureField;
	5360	+ cNumberSlider textureField;
4648	5361	JLabel opacityLabel;
4649		- NumberSlider opacityField;
	5362	+ cNumberSlider opacityField;
4650	5363	JLabel fakedepthLabel;
4651		- NumberSlider fakedepthField;
	5364	+ cNumberSlider fakedepthField;
4652	5365	JLabel shadowbiasLabel;
4653		- NumberSlider shadowbiasField;
	5366	+ cNumberSlider shadowbiasField;
4654	5367	JLabel bumpLabel;
4655		- NumberSlider bumpField;
	5368	+ cNumberSlider bumpField;
4656	5369	JLabel noiseLabel;
4657		- NumberSlider noiseField;
	5370	+ cNumberSlider noiseField;
4658	5371	JLabel powerLabel;
4659		- NumberSlider powerField;
	5372	+ cNumberSlider powerField;
4660	5373	JLabel borderfadeLabel;
4661		- NumberSlider borderfadeField;
	5374	+ cNumberSlider borderfadeField;
4662	5375	JLabel fogLabel;
4663		- NumberSlider fogField;
	5376	+ cNumberSlider fogField;
4664	5377	JLabel opacityPowerLabel;
4665		- NumberSlider opacityPowerField;
4666		- JTree jTree;
	5378	+ cNumberSlider opacityPowerField;
	5379	+ cTree jTree;
4667	5380	//ObjectUI parent;
4668	5381
4669		- NumberSlider normalpushField;
	5382	+ cNumberSlider normalpushField;
	5383	+
	5384	+ private MenuItem importGFDItem;
	5385	+ private MenuItem importVRMLX3DItem;
	5386	+ private MenuItem import3DSItem;
	5387	+ private MenuItem importOBJItem;
4670	5388	}