~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,67 @@
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	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
36	103
37	104	// SCRIPT
38	105
..	..	@@ -136,34 +203,42 @@
136	203	public void closeUI()
137	204	{
138	205	//new Exception().printStackTrace();
139		- System.out.println("this = " + this);
140		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
141	208	//nameField.removeActionListener(this);
142		- objEditor.ctrlPanel.remove(nameField);
	209	+// objEditor.ctrlPanel.remove(nameField);
143	210
144		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
145	214	return;
146	215
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);
	216	+// objEditor.ctrlPanel.remove(liveCB);
	217	+// objEditor.ctrlPanel.remove(hideCB);
	218	+// objEditor.ctrlPanel.remove(markCB);
	219	+//
	220	+// objEditor.ctrlPanel.remove(randomCB);
	221	+// objEditor.ctrlPanel.remove(speedupCB);
	222	+// objEditor.ctrlPanel.remove(rewindCB);
	223	+//
	224	+// objEditor.ctrlPanel.remove(resetButton);
	225	+// objEditor.ctrlPanel.remove(stepButton);
	226	+//// objEditor.ctrlPanel.remove(stepAllButton);
	227	+//// objEditor.ctrlPanel.remove(resetAllButton);
	228	+// objEditor.ctrlPanel.remove(link2masterCB);
	229	+// //objEditor.ctrlPanel.remove(flipVCB);
	230	+// //objEditor.ctrlPanel.remove(texresMenu);
	231	+// objEditor.ctrlPanel.remove(slowerButton);
	232	+// objEditor.ctrlPanel.remove(fasterButton);
	233	+// objEditor.ctrlPanel.remove(remarkButton);
165	234
166		- Remove(normalpushField);
	235	+ objEditor.ctrlPanel.remove(setupPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	238	+ objEditor.ctrlPanel.remove(pushPanel);
	239	+ //objEditor.ctrlPanel.remove(fillPanel);
	240	+
	241	+ //Remove(normalpushField);
167	242	}
168	243
169	244	public ObjEditor GetEditor()
..	..	@@ -234,6 +309,7 @@
234	309	//localCopy.parent = null;
235	310
236	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
237	313	objEditor = this;
238	314	this.callee = callee;
239	315
..	..	@@ -264,28 +340,49 @@
264	340	return frame.action(event, obj);
265	341	}
266	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
267	348	void SetupMenu()
268	349	{
269	350	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..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(openItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
275	371	//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("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
280	376	if (client.parent != null)
281	377	{
282		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
283	379	} else
284	380	{
285		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
286	382	}
287	383
288		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
289	386	saveItem.addActionListener(this);
290	387	saveAsItem.addActionListener(this);
291	388	exportAsItem.addActionListener(this);
..	..	@@ -293,81 +390,66 @@
293	390	//povItem.addActionListener(this);
294	391	closeItem.addActionListener(this);
295	392
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	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
352	420	toolbarPanel = new JPanel();
353	421	toolbarPanel.setName("Toolbar");
354		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
355	423	treePanel.setName("Tree");
356		- ctrlPanel = new JPanel(); // new GridBagLayout());
357		- ctrlPanel.setName("Edit");
358		- materialPanel = new JPanel();
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
	428	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
	437	+ materialPanel = new cGridBag().setVertical(true);
359	438	materialPanel.setName("Material");
	439	+
360	440	/JTextPane/
361	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
362	444	infoarea.setEditable(true);
363	445	SetText();
364	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365	447	// infoarea.setOpaque(false);
366	448	// //infoarea.setForeground(textcolor);
367		- infoarea.setLineWrap(true);
368		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
369	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
371	453	infoPanel.setName("Info");
372	454	//infoPanel.setLayout(new BorderLayout());
373	455	//infoPanel.add(createTextPane());
..	..	@@ -376,16 +458,23 @@
376	458	mainPanel.setName("Main");
377	459	mainPanel.setContinuousLayout(true);
378	460	mainPanel.setOneTouchExpandable(true);
379		- mainPanel.setDividerLocation(1.0);
380	461	mainPanel.setDividerSize(9);
381		- mainPanel.setResizeWeight(0);
382		-
	462	+ mainPanel.setDividerLocation(0.5); //1.0);
	463	+ mainPanel.setResizeWeight(0.5);
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
383	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384	473	//mainPanel.setLayout(new GridBagLayout());
385	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386		- treePanel.setLayout(new GridBagLayout());
387		- ctrlPanel.setLayout(new GridBagLayout());
388		- materialPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
	477	+ //materialPanel.setLayout(new GridBagLayout());
389	478
390	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391	480	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -424,7 +513,7 @@
424	513	static String newline = "\n";
425	514	protected static final String buttonString = "JButton";
426	515	StyledDocument doc;
427		- JTextArea infoarea;
	516	+ JTextPane infoarea;
428	517
429	518	void ClearInfo()
430	519	{
..	..	@@ -447,10 +536,10 @@
447	536	e.printStackTrace();
448	537	}
449	538
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();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
454	543	//clipboard.setContents(data, data);
455	544	}
456	545
..	..	@@ -473,13 +562,13 @@
473	562	//SendInfo("Name:", "bold");
474	563	if (sel.GetTextures() != null \|\| debug)
475	564	{
476		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
477	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
478	567	if (sel.Size() > 0)
479	568	{
480	569	si.SendInfo("#children = " + sel.Size(), "regular");
481	570	}
482		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
483	572	if (debug)
484	573	{
485	574	try
..	..	@@ -491,7 +580,10 @@
491	580	}
492	581
493	582	if (full)
494		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
495	587
496	588	if (sel.bRep != null)
497	589	{
..	..	@@ -518,7 +610,7 @@
518	610	}
519	611	if (sel.support != null)
520	612	{
521		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
522	614	}
523	615	if (sel.scriptnode != null)
524	616	{
..	..	@@ -589,6 +681,9 @@
589	681	{
590	682	CameraPane.pointflow = (PointFlow) sel;
591	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
592	687	}
593	688	}
594	689
..	..	@@ -604,68 +699,191 @@
604	699	}
605	700	}
606	701
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
	720	+
	721	+ void Minimize()
	722	+ {
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
	725	+ }
	726	+
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	730	+ void Maximize()
	731	+ {
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
	737	+ if (maximized)
	738	+ {
	739	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	740	+ }
	741	+ else
	742	+ {
	743	+ keeprect = frame.getBounds();
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	747	+// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	749	+ }
	750	+
	751	+ maximized ^= true;
	752	+
	753	+ frame.validate();
	754	+ }
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
	759	+
607	760	void ToggleFullScreen()
608	761	{
609		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
610	767	{
611		- frame.getContentPane().remove(/"Center",/bigThree);
612		- framePanel.add(bigThree);
613		- frame.getContentPane().add(/"Center",/framePanel);
	768	+ device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
	774	+ //frame.setVisible(false);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(false);
	777	+// frame.addNotify();
	778	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	779	+
	780	+// X frame.getContentPane().remove(/"Center",/bigThree);
	781	+// X framePanel.add(bigThree);
	782	+// X frame.getContentPane().add(/"Center",/framePanel);
	783	+ framePanel.setDividerLocation(46);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
614	791	} else
615	792	{
616		- frame.getContentPane().remove(/"Center",/framePanel);
617		- framePanel.remove(bigThree);
618		- frame.getContentPane().add(/"Center",/bigThree);
	793	+ keepButton = radio.layout;
	794	+ //keeprect = frame.getBounds();
	795	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	796	+// frame.getToolkit().getScreenSize().height);
	797	+ //frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
	801	+ device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
	804	+// frame.removeNotify();
	805	+// frame.setUndecorated(true);
	806	+// frame.addNotify();
	807	+// X frame.getContentPane().remove(/"Center",/framePanel);
	808	+// X framePanel.remove(bigThree);
	809	+// X frame.getContentPane().add(/"Center",/bigThree);
	810	+ framePanel.setDividerLocation(0);
	811	+
	812	+ radio.layout = fullscreenLayout;
	813	+ radio.layout.doClick();
	814	+ //frame.setVisible(true);
619	815	}
620		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
621	817	}
622	818
623		- private JTextArea createTextPane()
	819	+ private byte[] CompressCopy()
624	820	{
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		- };
	821	+ boolean temp = CameraPane.SWITCH;
	822	+ CameraPane.SWITCH = false;
	823	+
	824	+ copy.ExtractBigData(versiontable);
	825	+ // if (copy == client)
	826	+
	827	+ byte[] versions[] = copy.versions;
	828	+ copy.versions = null;
	829	+
	830	+ byte[] compress = Compress(copy);
	831	+
	832	+ copy.versions = versions;
	833	+
	834	+ copy.RestoreBigData(versiontable);
	835	+
	836	+ CameraPane.SWITCH = temp;
	837	+
	838	+ return compress;
	839	+ }
640	840
641		- String[] initStyles =
642		- {
643		- "regular", "italic", "bold", "small", "large",
644		- "regular", "button", "regular", "icon",
645		- "regular"
646		- };
	841	+ private JTextPane createTextPane()
	842	+ {
	843	+// TEXTAREA String[] initString =
	844	+// {
	845	+// "This is an editable JTextPane, ", //regular
	846	+// "another ", //italic
	847	+// "styled ", //bold
	848	+// "text ", //small
	849	+// "component, ", //large
	850	+// "which supports embedded components..." + newline,//regular
	851	+// " " + newline, //button
	852	+// "...and embedded icons..." + newline, //regular
	853	+// " ", //icon
	854	+// newline + "JTextPane is a subclass of JEditorPane that "
	855	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	856	+// + "cover methods for interacting with those objects."
	857	+// };
	858	+//
	859	+// String[] initStyles =
	860	+// {
	861	+// "regular", "italic", "bold", "small", "large",
	862	+// "regular", "button", "regular", "icon",
	863	+// "regular"
	864	+// };
	865	+//
	866	+// JTextPane textPane = new JTextPane();
	867	+// textPane.setEditable(true);
	868	+// /StyledDocument/ doc = textPane.getStyledDocument();
	869	+// addStylesToDocument(doc);
	870	+//
	871	+// try
	872	+// {
	873	+// for (int j = 0; j < 2; j++)
	874	+// {
	875	+// for (int i = 0; i < initString.length; i++)
	876	+// {
	877	+// doc.insertString(doc.getLength(), initString[i],
	878	+// doc.getStyle(initStyles[i]));
	879	+// }
	880	+// }
	881	+// } catch (BadLocationException ble)
	882	+// {
	883	+// System.err.println("Couldn't insert initial text into text pane.");
	884	+// }
647	885
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;
	886	+ return new JTextPane(); // textPane;
669	887	}
670	888
671	889	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -718,7 +936,7 @@
718	936	protected static ImageIcon createImageIcon(String path,
719	937	String description)
720	938	{
721		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	939	+ java.net.URL imgURL = Grafreed.class.getResource(path);
722	940	if (imgURL != null)
723	941	{
724	942	return new ImageIcon(imgURL, description);
..	..	@@ -750,6 +968,7 @@
750	968	// NumberSlider vDivsField;
751	969	// JCheckBox endcaps;
752	970	JCheckBox liveCB;
	971	+ JCheckBox selectCB;
753	972	JCheckBox hideCB;
754	973	JCheckBox link2masterCB;
755	974	JCheckBox markCB;
..	..	@@ -757,7 +976,12 @@
757	976	JCheckBox speedupCB;
758	977	JCheckBox rewindCB;
759	978	JCheckBox flipVCB;
	979	+
	980	+ cCheckBox toggleTextureCB;
	981	+ cCheckBox toggleSwitchCB;
	982	+
760	983	JComboBox texresMenu;
	984	+
761	985	JButton resetButton;
762	986	JButton stepButton;
763	987	JButton stepAllButton;
..	..	@@ -765,115 +989,87 @@
765	989	JButton slowerButton;
766	990	JButton fasterButton;
767	991	JButton remarkButton;
	992	+
	993	+ cGridBag editPanel;
	994	+ cGridBag editCommandsPanel;
	995	+
	996	+ cGridBag namePanel;
	997	+ cGridBag setupPanel;
	998	+ cGridBag setupPanel2;
	999	+ cGridBag objectCommandsPanel;
	1000	+ cGridBag pushPanel;
	1001	+ cGridBag fillPanel;
768	1002
769		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1003	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
770	1004	{
771	1005	JCheckBox cb;
772	1006
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);
	1007	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
778	1008	cb.addItemListener(this);
779		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
780		- oe.aConstraints.gridwidth = 1;
781		- oe.aConstraints.gridx += 1;
782	1009
783	1010	return cb;
784	1011	}
785	1012
786		- cButton AddButton(ObjEditor oe, String label)
	1013	+ cButton AddButton(cGridBag panel, String label)
787	1014	{
788	1015	cButton cb;
789	1016
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);
	1017	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
795	1018	cb.addActionListener(this);
796		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
797		- oe.aConstraints.gridwidth = 1;
798		- oe.aConstraints.gridx += 1;
799	1019
800	1020	return cb;
801	1021	}
802	1022
803		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1023	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
804	1024	{
805	1025	JComboBox combo;
806	1026
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;
	1027	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
810	1028	combo.addActionListener(this);
811	1029
812	1030	return combo;
813	1031	}
814	1032
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1033	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
816	1034	{
817		- NumberSlider combo;
	1035	+ cGridBag control = new cGridBag();
	1036	+
	1037	+ cNumberSlider combo;
818	1038
819	1039	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1040	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		-
	1041	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1042	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1043	combo.setFloat(current);
833		-
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1044	+
	1045	+ panel.add(control);
	1046	+
	1047	+ return control;
839	1048	}
840	1049
841		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1050	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
842	1051	{
843		- NumberSlider combo;
	1052	+ cGridBag control = new cGridBag();
	1053	+
	1054	+ cNumberSlider combo;
844	1055
845	1056	JLabel jlabel = new JLabel(label);
846		-
847		- aConstraints.fill = GridBagConstraints.VERTICAL;
848	1057	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		-
	1058	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1059	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1060	combo.setInteger(current);
859	1061
860		- combo.label = jlabel;
861		-
862		- combo.addChangeListener(this);
863		-
864		- return combo;
	1062	+ panel.add(control);
	1063	+
	1064	+ return control;
865	1065	}
866	1066
867		- JTextArea AddText(JPanel ctrlPanel, String name)
	1067	+ JTextArea AddText(cGridBag ctrlPanel, String name)
868	1068	{
869	1069	JTextArea text;
870	1070
871		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
872		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1071	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
874	1072	text.addCaretListener(this);
875		- aConstraints.gridx += 1;
876		- aConstraints.gridwidth = 1;
877	1073
878	1074	return text;
879	1075	}
..	..	@@ -903,9 +1099,16 @@
903	1099	objEditor.ctrlPanel.remove(j);
904	1100	}
905	1101
	1102	+ void Remove(cNumberSlider j)
	1103	+ {
	1104	+ j.removeChangeListener(this);
	1105	+ //objEditor.ctrlPanel.remove(j.label);
	1106	+ objEditor.ctrlPanel.remove(j);
	1107	+ }
	1108	+
906	1109	/*
907	1110	*/
908		- void Return() // ObjEditor oe)
	1111	+ void Return0() // ObjEditor oe)
909	1112	{
910	1113	aConstraints.gridy += 1;
911	1114	aConstraints.gridx = 0;
..	..	@@ -960,37 +1163,77 @@
960	1163
961	1164	void SetupUI2(ObjEditor oe)
962	1165	{
963		-// oe.aConstraints.weightx = 0;
964		-// oe.aConstraints.weighty = 0;
965		-// oe.aConstraints.gridx = 0;
966		-// oe.aConstraints.gridy = 0;
967		- SetupName(oe);
	1166	+ //SetupName(oe);
968	1167
969		- if (!GroupEditor.allparams)
	1168	+ namePanel = new cGridBag();
	1169	+
	1170	+ nameField = AddText(namePanel, copy.GetName());
	1171	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1172	+ oe.ctrlPanel.add(namePanel);
	1173	+
	1174	+ oe.ctrlPanel.Return();
	1175	+
	1176	+ if (!allparams)
970	1177	return;
971	1178
972		- liveCB = AddCheckBox(oe, "Live", copy.live);
973		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1179	+ setupPanel = new cGridBag().setVertical(false);
	1180	+
	1181	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1182	+ liveCB.setToolTipText("Animate object");
	1183	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1184	+ selectCB.setToolTipText("Make object selectable");
975	1185	// 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");
	1186	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1187	+ hideCB.setToolTipText("Hide object");
	1188	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1189	+ markCB.setToolTipText("As animation target transform");
	1190	+
	1191	+ setupPanel2 = new cGridBag().setVertical(false);
	1192	+
	1193	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1194	+ rewindCB.setToolTipText("Rewind animation");
	1195	+
	1196	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1197	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1198	+
	1199	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1200	+ link2masterCB.setToolTipText("Attach to support");
	1201	+
	1202	+ if (Globals.ADVANCED)
	1203	+ {
	1204	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1205	+ speedupCB.setToolTipText("Option motion capture");
	1206	+ }
	1207	+
	1208	+ oe.ctrlPanel.add(setupPanel);
	1209	+ oe.ctrlPanel.Return();
	1210	+ oe.ctrlPanel.add(setupPanel2);
	1211	+ oe.ctrlPanel.Return();
	1212	+
	1213	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1214	+
	1215	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1216	+ resetButton.setToolTipText("Jump to frame zero");
	1217	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1218	+ stepButton.setToolTipText("Step one frame");
982	1219	// resetAllButton = AddButton(oe, "Reset All");
983	1220	// stepAllButton = AddButton(oe, "Step All");
984		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
985	1221	// Return();
986		- slowerButton = AddButton(oe, "Slow");
987		- fasterButton = AddButton(oe, "Fast");
988		- remarkButton = AddButton(oe, "Rem");
	1222	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1223	+ slowerButton.setToolTipText("Decrease animation speed");
	1224	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1225	+ fasterButton.setToolTipText("Increase animation speed");
	1226	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1227	+ remarkButton.setToolTipText("Set the current transform as the target");
989	1228
990		- Return();
	1229	+ oe.ctrlPanel.add(objectCommandsPanel);
	1230	+ oe.ctrlPanel.Return();
991	1231
992		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993		- Return();
	1232	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1233	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1234	+ //Return();
	1235	+
	1236	+ oe.ctrlPanel.Return();
994	1237
995	1238	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
996	1239	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1085,7 +1328,7 @@
1085	1328	oe.aConstraints.gridwidth = 1;
1086	1329	/**/
1087	1330	nameField = AddText(oe.ctrlPanel, copy.GetName());
1088		- Return();
	1331	+ oe.ctrlPanel.Return();
1089	1332
1090	1333	//ctrlPanel.add(textureButton = new Button("Texture..."));
1091	1334	//textureButton.setEnabled(false);
..	..	@@ -1187,9 +1430,13 @@
1187	1430	//JPanel worldPanel =
1188	1431	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1189	1432	//worldPanel.setName("World");
1190		- centralPanel = new JPanel(new BorderLayout());
1191		- timelinePanel = new JPanel(new BorderLayout());
1192		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1433	+ centralPanel = new cGridBag();
	1434	+ centralPanel.preferredWidth = 20;
	1435	+
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ timelinePanel = new JPanel(new BorderLayout());
	1439	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1193	1440
1194	1441	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195	1442	cameraPanel.setContinuousLayout(true);
..	..	@@ -1198,7 +1445,10 @@
1198	1445	// cameraPanel.setDividerSize(9);
1199	1446	cameraPanel.setResizeWeight(1.0);
1200	1447
	1448	+ }
	1449	+
1201	1450	centralPanel.add(cameraView);
	1451	+ centralPanel.setFocusable(true);
1202	1452	//frame.setJMenuBar(timelineMenubar);
1203	1453	//centralPanel.add(timelinePanel);
1204	1454
..	..	@@ -1217,12 +1467,13 @@
1217	1467	//frontView.object = copy;
1218	1468	//sideView.object = copy;
1219	1469
1220		- XYZPanel = new JPanel();
1221		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1470	+ XYZPanel = new cGridBag().setVertical(true);
	1471	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1222	1472
1223		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1224		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1225		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1473	+ XYZPanel.preferredWidth = 5;
	1474	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1475	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1476	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1226	1477
1227	1478	/*
1228	1479	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1260,11 +1511,16 @@
1260	1511	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1261	1512	//tmp.setName("Edit");
1262	1513	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);
	1514	+// JPanel north = new JPanel(new BorderLayout());
	1515	+// north.setName("Edit");
	1516	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1517	+// objectPanel.add(north);
	1518	+ objectPanel.add(editPanel);
	1519	+
	1520	+ //if (Globals.ADVANCED)
	1521	+ objectPanel.add(infoPanel);
	1522	+
	1523	+ objectPanel.add(toolboxPanel);
1268	1524
1269	1525	/*
1270	1526	aConstraints.gridx = 0;
..	..	@@ -1273,7 +1529,7 @@
1273	1529	aConstraints.gridy += 1;
1274	1530	aConstraints.gridwidth = 1;
1275	1531	mainPanel.add(objectPanel, aConstraints);
1276		- */
	1532	+ */
1277	1533
1278	1534	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1279	1535	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1284,19 +1540,23 @@
1284	1540	scrollpane.setWheelScrollingEnabled(true);
1285	1541	scrollpane.addMouseWheelListener(this); // Default not fast enough
1286	1542
1287		- /JTabbedPane/ scenePanel = new JTabbedPane();
1288		- scenePanel.add(scrollpane);
	1543	+ /JTabbedPane/ scenePanel = new cGridBag();
	1544	+ scenePanel.preferredWidth = 6;
	1545	+
	1546	+ JTabbedPane tabbedPane = new JTabbedPane();
	1547	+ tabbedPane.add(scrollpane);
1289	1548
1290		- scenePanel.add(FSPane = new cFileSystemPane(this));
1291		-
1292		- optionsPanel = new JPanel(new GridBagLayout());
	1549	+ optionsPanel = new cGridBag().setVertical(false);
1293	1550
1294	1551	optionsPanel.setName("Options");
1295	1552
1296		- AddOptions(optionsPanel, aConstraints);
	1553	+ AddOptions(optionsPanel); //, aConstraints);
1297	1554
1298		- scenePanel.add(optionsPanel);
	1555	+ tabbedPane.add(optionsPanel);
	1556	+
	1557	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1299	1558
	1559	+ scenePanel.add(tabbedPane);
1300	1560
1301	1561	/*
1302	1562	cTree jTree = new cTree(null);
..	..	@@ -1330,6 +1590,7 @@
1330	1590	//bigPanel.setSize(new Dimension(10,10));
1331	1591	//bigPanel.add(ctrlPanel);
1332	1592	//bigPanel.add(gridPanel);
	1593	+ /**
1333	1594	bigThree = new JPanel();
1334	1595	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1335	1596	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1353,7 +1614,13 @@
1353	1614	// aConstraints.gridheight = 3;
1354	1615	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1355	1616	bigThree.add(XYZPanel, aWindowConstraints);
	1617	+ /**/
1356	1618
	1619	+ bigThree = new cGridBag();
	1620	+ bigThree.addComponent(scenePanel);
	1621	+ bigThree.addComponent(centralPanel);
	1622	+ bigThree.addComponent(XYZPanel);
	1623	+
1357	1624	// // SIDE EFFECT!!!
1358	1625	// aConstraints.gridx = 0;
1359	1626	// aConstraints.gridy = 0;
..	..	@@ -1361,9 +1628,9 @@
1361	1628	// aConstraints.gridheight = 1;
1362	1629
1363	1630	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1364		- framePanel.setContinuousLayout(true);
1365		- framePanel.setOneTouchExpandable(true);
1366		- framePanel.setDividerLocation(0.8);
	1631	+ framePanel.setContinuousLayout(false);
	1632	+ framePanel.setOneTouchExpandable(false);
	1633	+ //.setDividerLocation(0.8);
1367	1634	//framePanel.setDividerSize(15);
1368	1635	//framePanel.setResizeWeight(0.15);
1369	1636	framePanel.setName("Frame");
..	..	@@ -1380,10 +1647,15 @@
1380	1647
1381	1648	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1382	1649
1383		- frame.setSize(1024, 768);
1384		- frame.show();
1385		-
	1650	+ frame.setSize(1280, 860);
	1651	+
	1652	+ cameraView.requestFocusInWindow();
	1653	+
1386	1654	gridPanel.setDividerLocation(1.0);
	1655	+
	1656	+ frame.validate();
	1657	+
	1658	+ frame.setVisible(true);
1387	1659
1388	1660	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1389	1661	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1396,7 +1668,7 @@
1396	1668	});
1397	1669	}
1398	1670
1399		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1671	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1400	1672	{
1401	1673	}
1402	1674
..	..	@@ -1411,260 +1683,161 @@
1411	1683	ctrlPanel.removeAll();
1412	1684	}
1413	1685
1414		- void SetupMaterial(JPanel ctrlPanel)
	1686	+ void SetupMaterial(cGridBag panel)
1415	1687	{
1416		- aConstraints.weighty = 0;
1417		- //aConstraints.weightx = 1;
1418		- /*
	1688	+ /*
1419	1689	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1420	1690	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423	1691	*/
1424	1692
1425		- aConstraints.gridwidth = 1;
1426		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1427		- aConstraints.gridx += 1;
1428		- aConstraints.weighty = 0;
1429		- aConstraints.gridwidth = 1;
	1693	+ cGridBag editBar = new cGridBag().setVertical(false);
	1694	+
	1695	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1696	+ createMaterialButton.setToolTipText("Create material");
1430	1697
1431	1698	/*
1432	1699	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1433		- aConstraints.gridx += 1;
1434		- aConstraints.weighty = 0;
1435		- aConstraints.gridwidth = 1;
1436	1700	*/
1437	1701
1438		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1439		- aConstraints.gridx += 1;
	1702	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1703	+ clearMaterialButton.setToolTipText("Clear material");
	1704	+
	1705	+ if (Globals.ADVANCED)
	1706	+ {
	1707	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1708	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1709	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1710	+ }
1440	1711
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;
	1712	+ editBar.preferredHeight = 15;
	1713	+
	1714	+ panel.add(editBar);
	1715	+
1455	1716	/**/
1456	1717	//aConstraints.weighty = 0;
1457	1718	////aConstraints.weightx = 1;
1458	1719	//aConstraints.weighty = 1;
1459	1720	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1460	1721	//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;
	1722	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1466	1723
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;
	1724	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1725	+
	1726	+ cGridBag color = new cGridBag();
	1727	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1728	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1729	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1730	+ //colorField.preferredWidth = 200;
	1731	+ colorSection.add(color);
1477	1732
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;
	1733	+ cGridBag modulation = new cGridBag();
	1734	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1735	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1736	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1737	+ colorSection.add(modulation);
1487	1738
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;
	1739	+ cGridBag texture = new cGridBag();
	1740	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1741	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1742	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1743	+ colorSection.add(texture);
1497	1744
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;
	1745	+ panel.add(new JSeparator());
	1746	+
	1747	+ panel.add(colorSection);
	1748	+
	1749	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1750	+
	1751	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1752	+
	1753	+ cGridBag diffuse = new cGridBag();
	1754	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1755	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1756	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1757	+ diffuseSection.add(diffuse);
1507	1758
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;
	1759	+ cGridBag diffuseness = new cGridBag();
	1760	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1761	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1762	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1763	+ diffuseSection.add(diffuseness);
1517	1764
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;
	1765	+ cGridBag selfshadow = new cGridBag();
	1766	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1767	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1768	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1769	+ diffuseSection.add(selfshadow);
1527	1770
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;
	1771	+ cGridBag sheen = new cGridBag();
	1772	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1773	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1774	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1775	+ diffuseSection.add(sheen);
1536	1776
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;
	1777	+ cGridBag subsurface = new cGridBag();
	1778	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1779	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1780	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1781	+ diffuseSection.add(subsurface);
1546	1782
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;
	1783	+ cGridBag shadow = new cGridBag();
	1784	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1785	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1786	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1787	+ diffuseSection.add(shadow);
1556	1788
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;
	1789	+ cGridBag fakedepth = new cGridBag();
	1790	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1791	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1792	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1793	+ diffuseSection.add(fakedepth);
1566	1794
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;
	1795	+ cGridBag shadowbias = new cGridBag();
	1796	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1797	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1798	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1799	+ diffuseSection.add(shadowbias);
1576	1800
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;
	1801	+ panel.add(new JSeparator());
	1802	+
	1803	+ panel.add(diffuseSection);
	1804	+
	1805	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1806	+
	1807	+ cGridBag specularSection = new cGridBag().setVertical(true);
1586	1808
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;
	1809	+ cGridBag specular = new cGridBag();
	1810	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1811	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1812	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1813	+ specularSection.add(specular);
1596	1814
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;
	1815	+ cGridBag lightarea = new cGridBag();
	1816	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1817	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1818	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1819	+ specularSection.add(lightarea);
1606	1820
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;
	1821	+ cGridBag shininess = new cGridBag();
	1822	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1823	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1824	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1825	+ specularSection.add(shininess);
1615	1826
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;
	1827	+ cGridBag metalness = new cGridBag();
	1828	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1829	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1830	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1831	+ specularSection.add(metalness);
1625	1832
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;
	1833	+ cGridBag velvet = new cGridBag();
	1834	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1835	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1836	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1837	+ specularSection.add(velvet);
1635	1838
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();
	1839	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1840	+ //Return();
1668	1841	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1669	1842	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670	1843	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1675,130 +1848,105 @@
1675	1848	// aConstraints.gridy += 1;
1676	1849	// aConstraints.gridwidth = 1;
1677	1850
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;
	1851	+ cGridBag anisoU = new cGridBag();
	1852	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1853	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1854	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1855	+ specularSection.add(anisoU);
1686	1856
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;
	1857	+ cGridBag anisoV = new cGridBag();
	1858	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1859	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1860	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1861	+ specularSection.add(anisoV);
1696	1862
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	1863
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;
	1864	+ panel.add(new JSeparator());
	1865	+
	1866	+ panel.add(specularSection);
	1867	+
	1868	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1869	+
	1870	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1716	1871
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;
	1872	+ cGridBag camera = new cGridBag();
	1873	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1874	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1875	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1876	+ colorSection.add(camera);
1727	1877
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;
	1878	+ cGridBag ambient = new cGridBag();
	1879	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1880	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1881	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1882	+ colorSection.add(ambient);
1737	1883
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;
	1884	+ cGridBag backlit = new cGridBag();
	1885	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1886	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1887	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1888	+ colorSection.add(backlit);
1747	1889
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;
	1890	+ cGridBag opacity = new cGridBag();
	1891	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1892	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1893	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1894	+ colorSection.add(opacity);
1757	1895
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;
	1896	+ //panel.add(new JSeparator());
	1897	+
	1898	+ //panel.add(globalSection);
	1899	+
	1900	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1901	+
	1902	+ cGridBag textureSection = new cGridBag().setVertical(true);
1767	1903
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;
	1904	+ cGridBag bump = new cGridBag();
	1905	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1906	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1907	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1908	+ textureSection.add(bump);
1777	1909
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;
	1910	+ cGridBag noise = new cGridBag();
	1911	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1912	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1913	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1914	+ textureSection.add(noise);
1787	1915
1788		- //aConstraints.weighty = 1;
1789		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1790		- //aConstraints.gridx += 1;
1791		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1792		- aConstraints.weighty = 0;
	1916	+ cGridBag power = new cGridBag();
	1917	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1918	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1919	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1920	+ textureSection.add(power);
1793	1921
1794		- aConstraints.gridx = 0;
1795		- aConstraints.gridy = 0;
1796		- aConstraints.gridwidth = 1;
	1922	+ cGridBag borderfade = new cGridBag();
	1923	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1924	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1925	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1926	+ textureSection.add(borderfade);
	1927	+
	1928	+ cGridBag fog = new cGridBag();
	1929	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1930	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1931	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1932	+ textureSection.add(fog);
	1933	+
	1934	+ cGridBag opacityPower = new cGridBag();
	1935	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1936	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1937	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1938	+ textureSection.add(opacityPower);
	1939	+
	1940	+ panel.add(new JSeparator());
	1941	+
	1942	+ panel.add(textureSection);
	1943	+
	1944	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	1945
1798	1946	SetMaterial(copy); // .GetMaterial());
1799	1947
1800		- colorField.addChangeListener(this);
1801		- modulationField.addChangeListener(this);
	1948	+ //colorField.addChangeListener(this);
	1949	+// modulationField.addChangeListener(this);
1802	1950	metalnessField.addChangeListener(this);
1803	1951	diffuseField.addChangeListener(this);
1804	1952	specularField.addChangeListener(this);
..	..	@@ -1828,12 +1976,15 @@
1828	1976	opacityPowerField.addChangeListener(this);
1829	1977	/**/
1830	1978
1831		- resetSlidersButton.addActionListener(this);
1832	1979	clearMaterialButton.addActionListener(this);
1833	1980	createMaterialButton.addActionListener(this);
1834		-
1835		- propagateToggle.addItemListener(this);
1836		- multiplyToggle.addItemListener(this);
	1981	+
	1982	+ if (Globals.ADVANCED)
	1983	+ {
	1984	+ resetSlidersButton.addActionListener(this);
	1985	+ propagateToggle.addItemListener(this);
	1986	+ multiplyToggle.addItemListener(this);
	1987	+ }
1837	1988	}
1838	1989
1839	1990	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1851,8 +2002,9 @@
1851	2002	// 3D models
1852	2003	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1853	2004	{
1854		- lastConverter = new com.jmex.model.converters.MaxToJme();
1855		- LoadFile(filename, lastConverter);
	2005	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2006	+ //LoadFile(filename, lastConverter);
	2007	+ LoadObjFile(filename); // New 3ds loader
1856	2008	continue;
1857	2009	}
1858	2010	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2004,7 +2156,7 @@
2004	2156
2005	2157	//? flashIt = false;
2006	2158	CameraPane pane = (CameraPane) cameraView;
2007		- pane.clickStart(location.x, location.y, 0);
	2159	+ pane.clickStart(location.x, location.y, 0, 0);
2008	2160	pane.clickEnd(location.x, location.y, 0, true);
2009	2161
2010	2162	if (group.selection.size() == 1)
..	..	@@ -2053,6 +2205,7 @@
2053	2205	e2.printStackTrace();
2054	2206	}
2055	2207	}
	2208	+
2056	2209	LoadJMEThread loadThread;
2057	2210
2058	2211	class LoadJMEThread extends Thread
..	..	@@ -2110,6 +2263,7 @@
2110	2263	//LoadFile0(filename, converter);
2111	2264	}
2112	2265	}
	2266	+
2113	2267	LoadOBJThread loadObjThread;
2114	2268
2115	2269	class LoadOBJThread extends Thread
..	..	@@ -2188,19 +2342,19 @@
2188	2342
2189	2343	void LoadObjFile(String fullname)
2190	2344	{
2191		- /*
	2345	+ System.out.println("Loading " + fullname);
	2346	+ /**/
2192	2347	//lastFilename = fullname;
2193	2348	if(loadObjThread == null)
2194	2349	{
2195		- loadObjThread = new LoadOBJThread();
2196		- loadObjThread.start();
	2350	+ loadObjThread = new LoadOBJThread();
	2351	+ loadObjThread.start();
2197	2352	}
2198	2353
2199	2354	loadObjThread.add(fullname);
2200		- */
	2355	+ /**/
2201	2356
2202		- System.out.println("Loading " + fullname);
2203		- makeSomething(new FileObject(fullname, true), true);
	2357	+ //makeSomething(new FileObject(fullname, true), true);
2204	2358	}
2205	2359
2206	2360	void LoadGFDFile(String fullname)
..	..	@@ -2461,11 +2615,11 @@
2461	2615
2462	2616	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2463	2617	{
2464		- if (GrafreeD.standAlone)
	2618	+ if (Grafreed.standAlone)
2465	2619	{
2466	2620	/**/
2467	2621	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2468		- browser.show();
	2622	+ browser.setVisible(true);
2469	2623	String filename = browser.getFile();
2470	2624	if (filename != null && filename.length() > 0)
2471	2625	{
..	..	@@ -2576,6 +2730,7 @@
2576	2730	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2577	2731	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2578	2732	}
	2733	+
2579	2734	//cJME.count++;
2580	2735	//cJME.count %= 12;
2581	2736	if (gc)
..	..	@@ -2610,6 +2765,7 @@
2610	2765	}
2611	2766	if (input == null)
2612	2767	{
	2768	+ new Exception().printStackTrace();
2613	2769	System.exit(0);
2614	2770	}
2615	2771
..	..	@@ -2758,6 +2914,7 @@
2758	2914	}
2759	2915	}
2760	2916	}
	2917	+
2761	2918	cFileSystemPane FSPane;
2762	2919
2763	2920	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2811,11 +2968,14 @@
2811	2968	}
2812	2969	}
2813	2970	}
	2971	+
2814	2972	freezematerial = false;
2815	2973	}
2816	2974
2817	2975	void SetMaterial(Object3D object)
2818	2976	{
	2977	+ latestObject = object;
	2978	+
2819	2979	cMaterial mat = object.material;
2820	2980
2821	2981	if (mat == null)
..	..	@@ -2824,7 +2984,8 @@
2824	2984	return;
2825	2985	}
2826	2986
2827		- multiplyToggle.setSelected(mat.multiply);
	2987	+ if (multiplyToggle != null)
	2988	+ multiplyToggle.setSelected(mat.multiply);
2828	2989
2829	2990	assert (object.projectedVertices != null);
2830	2991
..	..	@@ -2926,12 +3087,17 @@
2926	3087	// }
2927	3088
2928	3089	/**/
2929		- if (deselect)
	3090	+ if (deselect \|\| child == null)
2930	3091	{
2931	3092	//group.deselectAll();
2932	3093	//freeze = true;
2933	3094	GetTree().clearSelection();
2934	3095	//freeze = false;
	3096	+
	3097	+ if (child == null)
	3098	+ {
	3099	+ return;
	3100	+ }
2935	3101	}
2936	3102
2937	3103	//group.addSelectee(child);
..	..	@@ -3000,7 +3166,7 @@
3000	3166	cameraView.ToggleDL();
3001	3167	cameraView.repaint();
3002	3168	return;
3003		- } else if (event.getSource() == toggleTextureItem)
	3169	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3004	3170	{
3005	3171	cameraView.ToggleTexture();
3006	3172	// june 2013 copy.HardTouch();
..	..	@@ -3039,9 +3205,9 @@
3039	3205	frame.validate();
3040	3206
3041	3207	return;
3042		- } else if (event.getSource() == toggleRandomItem)
	3208	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3043	3209	{
3044		- cameraView.ToggleRandom();
	3210	+ cameraView.ToggleSwitch();
3045	3211	cameraView.repaint();
3046	3212	return;
3047	3213	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3070,6 +3236,10 @@
3070	3236	{
3071	3237	copy.live ^= true;
3072	3238	return;
	3239	+ } else if (event.getSource() == selectCB)
	3240	+ {
	3241	+ copy.dontselect ^= true;
	3242	+ return;
3073	3243	} else if (event.getSource() == hideCB)
3074	3244	{
3075	3245	copy.hide ^= true;
..	..	@@ -3084,6 +3254,7 @@
3084	3254	if (event.getSource() == randomCB)
3085	3255	{
3086	3256	copy.random ^= true;
	3257	+ objEditor.refreshContents();
3087	3258	return;
3088	3259	}
3089	3260	if (event.getSource() == speedupCB)
..	..	@@ -3107,8 +3278,9 @@
3107	3278
3108	3279	public void actionPerformed(ActionEvent event)
3109	3280	{
	3281	+ Object source = event.getSource();
3110	3282	// SCRIPT DIALOG
3111		- if (event.getSource() == okbutton)
	3283	+ if (source == okbutton)
3112	3284	{
3113	3285	textpanel.setVisible(false);
3114	3286	textpanel.remove(textarea);
..	..	@@ -3120,7 +3292,7 @@
3120	3292	textarea = null;
3121	3293	textpanel = null;
3122	3294	}
3123		- if (event.getSource() == cancelbutton)
	3295	+ if (source == cancelbutton)
3124	3296	{
3125	3297	textpanel.setVisible(false);
3126	3298	textpanel.remove(textarea);
..	..	@@ -3132,50 +3304,50 @@
3132	3304	//applySelf();
3133	3305	//client.refreshEditWindow();
3134	3306	//refreshContents();
3135		- if (event.getSource() == nameField)
	3307	+ if (source == nameField)
3136	3308	{
3137	3309	//System.out.println("ObjEditor " + event);
3138	3310	applySelf0(true);
3139	3311	//parent.applySelf();
3140	3312	objEditor.refreshContents();
3141		- } else if (event.getSource() == resetButton)
	3313	+ } else if (source == resetButton)
3142	3314	{
3143	3315	CameraPane.fullreset = true;
3144	3316	copy.Reset(); // ResetMeshes();
3145	3317	copy.Touch();
3146	3318	objEditor.refreshContents();
3147		- } else if (event.getSource() == stepItem)
	3319	+ } else if (source == stepItem)
3148	3320	{
3149	3321	//cameraView.ONESTEP = true;
3150	3322	Globals.ONESTEP = true;
3151	3323	cameraView.repaint();
3152	3324	return;
3153		- } else if (event.getSource() == stepButton)
	3325	+ } else if (source == stepButton)
3154	3326	{
3155	3327	copy.Step();
3156	3328	copy.Touch();
3157	3329	objEditor.refreshContents();
3158		- } else if (event.getSource() == slowerButton)
	3330	+ } else if (source == slowerButton)
3159	3331	{
3160	3332	copy.Slower();
3161	3333	copy.Touch();
3162	3334	objEditor.refreshContents();
3163		- } else if (event.getSource() == fasterButton)
	3335	+ } else if (source == fasterButton)
3164	3336	{
3165	3337	copy.Faster();
3166	3338	copy.Touch();
3167	3339	objEditor.refreshContents();
3168		- } else if (event.getSource() == remarkButton)
	3340	+ } else if (source == remarkButton)
3169	3341	{
3170	3342	copy.Remark();
3171	3343	copy.Touch();
3172	3344	objEditor.refreshContents();
3173		- } else if (event.getSource() == stepAllButton)
	3345	+ } else if (source == stepAllButton)
3174	3346	{
3175	3347	copy.StepAll();
3176	3348	copy.Touch();
3177	3349	objEditor.refreshContents();
3178		- } else if (event.getSource() == resetAllButton)
	3350	+ } else if (source == resetAllButton)
3179	3351	{
3180	3352	//CameraPane.fullreset = true;
3181	3353	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3208,53 +3380,79 @@
3208	3380	// Close();
3209	3381	// }
3210	3382	// else
3211		- if (event.getSource() == resetSlidersButton)
	3383	+ if (source == resetSlidersButton)
3212	3384	{
3213	3385	ResetSliders();
3214		- } else if (event.getSource() == clearMaterialButton)
	3386	+ } else if (source == clearMaterialButton)
3215	3387	{
3216	3388	ClearMaterial();
3217		- } else if (event.getSource() == createMaterialButton)
	3389	+ } else if (source == createMaterialButton)
3218	3390	{
3219	3391	CreateMaterial();
3220		- } else if (event.getSource() == clearPanelButton)
	3392	+ } else if (source == clearPanelButton)
3221	3393	{
3222	3394	copy.ClearUI();
3223	3395	refreshContents(true);
3224		- } /*
3225		- }
3226		-
3227		- public boolean action(Event event, Object arg)
3228		- {
3229		- */ else if (event.getSource() == closeItem)
	3396	+ } else if (source == importGFDItem)
	3397	+ {
	3398	+ ImportGFD();
	3399	+ } else
	3400	+ if (source == importVRMLX3DItem)
	3401	+ {
	3402	+ ImportVRMLX3D();
	3403	+ } else
	3404	+ if (source == import3DSItem)
	3405	+ {
	3406	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3407	+ } else
	3408	+ if (source == importOBJItem)
	3409	+ {
	3410	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3411	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3412	+ browser.setVisible(true);
	3413	+ String filename = browser.getFile();
	3414	+ if (filename != null && filename.length() > 0)
	3415	+ {
	3416	+ String fullname = browser.getDirectory() + filename;
	3417	+ makeSomething(ReadOBJ(fullname), true);
	3418	+ }
	3419	+ } else
	3420	+ if (source == closeItem)
3230	3421	{
3231	3422	Close();
3232	3423	//return true;
3233		- } else if (event.getSource() == loadItem)
	3424	+ } else if (source == openItem)
3234	3425	{
3235		- load();
	3426	+ Open();
3236	3427	//return true;
3237		- } else if (event.getSource() == saveItem)
	3428	+ } else if (source == newItem)
	3429	+ {
	3430	+ New();
	3431	+ } else if (source == saveItem)
3238	3432	{
3239	3433	save();
3240	3434	//return true;
3241		- } else if (event.getSource() == saveAsItem)
	3435	+ } else if (source == saveAsItem)
3242	3436	{
3243	3437	saveAs();
3244	3438	//return true;
3245		- } else if (event.getSource() == reexportItem)
	3439	+ } else if (source == reexportItem)
3246	3440	{
3247	3441	reexport();
3248	3442	//return true;
3249		- } else if (event.getSource() == exportAsItem)
	3443	+ } else if (source == exportAsItem)
3250	3444	{
3251	3445	export();
3252	3446	//return true;
3253		- } else if (event.getSource() == povItem)
	3447	+ } else if (source == povItem)
3254	3448	{
3255	3449	generatePOV();
3256	3450	//return true;
3257		- } else if (event.getSource() == zBufferItem)
	3451	+ } else if (event.getSource() == archiveItem)
	3452	+ {
	3453	+ cTools.Archive(frame);
	3454	+ return;
	3455	+ } else if (source == zBufferItem)
3258	3456	{
3259	3457	try
3260	3458	{
..	..	@@ -3276,21 +3474,8 @@
3276	3474	cameraView.repaint();
3277	3475	//return true;
3278	3476	}
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)
	3477	+ */ else // combos...
	3478	+ if (source == texresMenu)
3294	3479	{
3295	3480	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3296	3481	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3302,12 +3487,382 @@
3302	3487	}
3303	3488	}
3304	3489
	3490	+ void New()
	3491	+ {
	3492	+ while (copy.Size() > 1)
	3493	+ {
	3494	+ copy.remove(1);
	3495	+ }
	3496	+
	3497	+ ResetModel();
	3498	+ objEditor.refreshContents();
	3499	+ }
	3500	+
	3501	+ static public byte[] Compress(Object3D o)
	3502	+ {
	3503	+ try
	3504	+ {
	3505	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3506	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3507	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3508	+
	3509	+ Object3D parent = o.parent;
	3510	+ o.parent = null;
	3511	+
	3512	+ out.writeObject(o);
	3513	+
	3514	+ o.parent = parent;
	3515	+
	3516	+ out.flush();
	3517	+
	3518	+ baos //zstream
	3519	+ .close();
	3520	+ out.close();
	3521	+
	3522	+ byte[] bytes = baos.toByteArray();
	3523	+
	3524	+ System.out.println("save #bytes = " + bytes.length);
	3525	+ return bytes;
	3526	+ } catch (Exception e)
	3527	+ {
	3528	+ System.err.println(e);
	3529	+ return null;
	3530	+ }
	3531	+ }
	3532	+
	3533	+ static public Object Uncompress(byte[] bytes)
	3534	+ {
	3535	+ System.out.println("restore #bytes = " + bytes.length);
	3536	+ try
	3537	+ {
	3538	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3539	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3540	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3541	+ Object obj = in.readObject();
	3542	+
	3543	+ bais //istream
	3544	+ .close();
	3545	+ in.close();
	3546	+
	3547	+ return obj;
	3548	+ } catch (Exception e)
	3549	+ {
	3550	+ System.err.println(e);
	3551	+ return null;
	3552	+ }
	3553	+ }
	3554	+
	3555	+ static public Object clone(Object o)
	3556	+ {
	3557	+ try
	3558	+ {
	3559	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3560	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3561	+
	3562	+ out.writeObject(o);
	3563	+
	3564	+ out.flush();
	3565	+ out.close();
	3566	+
	3567	+ byte[] bytes = baos.toByteArray();
	3568	+
	3569	+ System.out.println("clone = " + bytes.length);
	3570	+
	3571	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3572	+ ObjectInputStream in = new ObjectInputStream(bais);
	3573	+ Object obj = in.readObject();
	3574	+ in.close();
	3575	+
	3576	+ return obj;
	3577	+ } catch (Exception e)
	3578	+ {
	3579	+ System.err.println(e);
	3580	+ return null;
	3581	+ }
	3582	+ }
	3583	+
	3584	+ cRadio GetCurrentTab()
	3585	+ {
	3586	+ cRadio ab;
	3587	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3588	+ {
	3589	+ ab = (cRadio)e.nextElement();
	3590	+ if(ab.GetObject() == copy)
	3591	+ {
	3592	+ return ab;
	3593	+ }
	3594	+ }
	3595	+
	3596	+ return null;
	3597	+ }
	3598	+
	3599	+
	3600	+ public void Save()
	3601	+ {
	3602	+ //Save(true);
	3603	+ Replace();
	3604	+ }
	3605	+
	3606	+ private boolean Equal(byte[] compress, byte[] name)
	3607	+ {
	3608	+ if (compress.length != name.length)
	3609	+ {
	3610	+ return false;
	3611	+ }
	3612	+
	3613	+ for (int i=compress.length; --i>=0;)
	3614	+ {
	3615	+ if (compress[i] != name[i])
	3616	+ return false;
	3617	+ }
	3618	+
	3619	+ return true;
	3620	+ }
	3621	+
	3622	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3623	+
	3624	+ public boolean Save(boolean user)
	3625	+ {
	3626	+ System.err.println("Save");
	3627	+
	3628	+ cRadio tab = GetCurrentTab();
	3629	+
	3630	+ byte[] compress = CompressCopy();
	3631	+
	3632	+ boolean thesame = false;
	3633	+
	3634	+ // Quick heuristic using length. Works only when stream is compressed.
	3635	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3636	+ {
	3637	+ thesame = true;
	3638	+ }
	3639	+
	3640	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3641	+ if (!thesame)
	3642	+ {
	3643	+ //tab.user[tab.versionindex] = user;
	3644	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3645	+
	3646	+ copy.versions[++copy.versionindex] = compress;
	3647	+
	3648	+ // if (increment)
	3649	+ // tab.versionindex++;
	3650	+ }
	3651	+
	3652	+ //copy.RestoreBigData(versiontable);
	3653	+
	3654	+ //assert(hashtable.isEmpty());
	3655	+
	3656	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3657	+ {
	3658	+ //tab.user[i] = false;
	3659	+ copy.versions[i] = null;
	3660	+ }
	3661	+
	3662	+ SetUndoStates();
	3663	+
	3664	+ // test save
	3665	+ if (false)
	3666	+ {
	3667	+ try
	3668	+ {
	3669	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3670	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3671	+
	3672	+ p.writeObject(copy);
	3673	+
	3674	+ p.flush();
	3675	+
	3676	+ ostream.close();
	3677	+ } catch (Exception e)
	3678	+ {
	3679	+ e.printStackTrace();
	3680	+ }
	3681	+ }
	3682	+
	3683	+ return !thesame;
	3684	+ }
	3685	+
	3686	+ void CopyChanged(Object3D obj)
	3687	+ {
	3688	+ SetUndoStates();
	3689	+
	3690	+ boolean temp = CameraPane.SWITCH;
	3691	+ CameraPane.SWITCH = false;
	3692	+
	3693	+ copy.ExtractBigData(versiontable);
	3694	+
	3695	+ copy.clear();
	3696	+
	3697	+ for (int i=0; i<obj.Size(); i++)
	3698	+ {
	3699	+ copy.add(obj.get(i));
	3700	+ }
	3701	+
	3702	+ copy.RestoreBigData(versiontable);
	3703	+
	3704	+ CameraPane.SWITCH = temp;
	3705	+
	3706	+ //assert(hashtable.isEmpty());
	3707	+
	3708	+ copy.Touch();
	3709	+
	3710	+ ResetModel();
	3711	+ copy.HardTouch(); // recompile?
	3712	+
	3713	+ cRadio ab;
	3714	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3715	+ {
	3716	+ ab = (cRadio)e.nextElement();
	3717	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3718	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3719	+ if (test != null)
	3720	+ {
	3721	+ test.editWindow = ab.object.editWindow;
	3722	+ ab.object = test;
	3723	+ }
	3724	+ }
	3725	+
	3726	+ refreshContents();
	3727	+ }
	3728	+
	3729	+ cButton undoButton;
	3730	+ cButton restoreButton;
	3731	+ cButton replaceButton;
	3732	+ cButton redoButton;
	3733	+
	3734	+ void SetUndoStates()
	3735	+ {
	3736	+ cRadio tab = GetCurrentTab();
	3737	+
	3738	+ restoreButton.setEnabled(copy.versionindex != -1);
	3739	+ replaceButton.setEnabled(copy.versionindex != -1);
	3740	+ undoButton.setEnabled(copy.versionindex > 0);
	3741	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3742	+ }
	3743	+
	3744	+ public boolean Undo()
	3745	+ {
	3746	+ System.err.println("Undo");
	3747	+
	3748	+ cRadio tab = GetCurrentTab();
	3749	+
	3750	+ if (copy.versionindex == 0)
	3751	+ {
	3752	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3753	+ return false;
	3754	+ }
	3755	+
	3756	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3757	+// {
	3758	+// if (Save(false))
	3759	+// tab.versionindex -= 1;
	3760	+// else
	3761	+// {
	3762	+// if (tab.versionindex <= 0)
	3763	+// return false;
	3764	+// else
	3765	+// tab.versionindex -= 1;
	3766	+// }
	3767	+// }
	3768	+
	3769	+ copy.versionindex -= 1;
	3770	+
	3771	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3772	+
	3773	+ return true;
	3774	+ }
	3775	+
	3776	+ public boolean Restore()
	3777	+ {
	3778	+ System.err.println("Restore");
	3779	+
	3780	+ cRadio tab = GetCurrentTab();
	3781	+
	3782	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3783	+ {
	3784	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3785	+ return false;
	3786	+ }
	3787	+
	3788	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3789	+
	3790	+ return true;
	3791	+ }
	3792	+
	3793	+ public boolean Replace()
	3794	+ {
	3795	+ System.err.println("Replace");
	3796	+
	3797	+ cRadio tab = GetCurrentTab();
	3798	+
	3799	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3800	+ {
	3801	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3802	+ return false;
	3803	+ }
	3804	+
	3805	+ copy.versions[copy.versionindex] = CompressCopy();
	3806	+
	3807	+ return true;
	3808	+ }
	3809	+
	3810	+ public void Redo()
	3811	+ {
	3812	+ cRadio tab = GetCurrentTab();
	3813	+
	3814	+ if (copy.versions[copy.versionindex + 1] == null)
	3815	+ {
	3816	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3817	+ return;
	3818	+ }
	3819	+
	3820	+ copy.versionindex += 1;
	3821	+
	3822	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3823	+
	3824	+ //if (!tab.user[tab.versionindex])
	3825	+ // tab.graphs[tab.versionindex] = null;
	3826	+ }
	3827	+
	3828	+ void ImportGFD()
	3829	+ {
	3830	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3831	+ browser.show();
	3832	+ String filename = browser.getFile();
	3833	+ if (filename != null && filename.length() > 0)
	3834	+ {
	3835	+ String fullname = browser.getDirectory() + filename;
	3836	+
	3837	+ //Object3D readobj =
	3838	+ objEditor.ReadGFD(fullname, objEditor);
	3839	+ //makeSomething(readobj);
	3840	+ }
	3841	+ }
	3842	+
	3843	+ void ImportVRMLX3D()
	3844	+ {
	3845	+ if (Grafreed.standAlone)
	3846	+ {
	3847	+ /**/
	3848	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3849	+ browser.show();
	3850	+ String filename = browser.getFile();
	3851	+ if (filename != null && filename.length() > 0)
	3852	+ {
	3853	+ String fullname = browser.getDirectory() + filename;
	3854	+ LoadVRMLX3D(fullname);
	3855	+ }
	3856	+ /**/
	3857	+ }
	3858	+ }
	3859	+
3305	3860	void ToggleAnimation()
3306	3861	{
3307	3862	if (!Globals.ANIMATION)
3308	3863	{
3309	3864	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3310		- browser.show();
	3865	+ browser.setVisible(true);
3311	3866	String filename = browser.getFile();
3312	3867	if (filename != null && filename.length() > 0)
3313	3868	{
..	..	@@ -3317,8 +3872,8 @@
3317	3872
3318	3873	Globals.ANIMATION ^= true;
3319	3874
3320		- GrafreeD.wav.cursor = 0;
3321		- GrafreeD.wav.loop = 0;
	3875	+ Grafreed.wav.cursor = 0;
	3876	+ Grafreed.wav.loop = 0;
3322	3877	}
3323	3878	} else
3324	3879	{
..	..	@@ -3368,7 +3923,7 @@
3368	3923	void CreateMaterial()
3369	3924	{
3370	3925	//copy.ClearMaterial(); // PATCH
3371		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3926	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3372	3927	if (copy.selection.size() > 0)
3373	3928	//SetMaterial(copy);
3374	3929	{
..	..	@@ -3419,7 +3974,7 @@
3419	3974	assert false;
3420	3975	}
3421	3976
3422		- void EditSelection()
	3977	+ void EditSelection(boolean newWindow)
3423	3978	{
3424	3979	}
3425	3980
..	..	@@ -3427,11 +3982,11 @@
3427	3982	{
3428	3983	copy.ResetBlockLoop(); // temporary problem
3429	3984
3430		- boolean random = CameraPane.RANDOM;
3431		- CameraPane.RANDOM = false; // parse everything
	3985	+ boolean random = CameraPane.SWITCH;
	3986	+ CameraPane.SWITCH = false; // parse everything
3432	3987	copy.ResetDisplayList();
3433	3988	copy.HardTouch();
3434		- CameraPane.RANDOM = random;
	3989	+ CameraPane.SWITCH = random;
3435	3990	}
3436	3991
3437	3992	// public void applySelf()
..	..	@@ -3501,10 +4056,40 @@
3501	4056	current.fakedepth = (float) fakedepthField.getFloat();
3502	4057	current.shadowbias = (float) shadowbiasField.getFloat();
3503	4058
3504		- if (!NumberSlider.frozen)
	4059	+ if (!cNumberSlider.frozen)
3505	4060	{
3506	4061	//System.out.println("Propagate = " + propagate);
3507	4062	copy.UpdateMaterial(anchor, current, propagate);
	4063	+
	4064	+ if (copy.material != null)
	4065	+ {
	4066	+ cMaterial mat = copy.material;
	4067	+
	4068	+ colorField.SetToolTipValue((mat.color));
	4069	+ modulationField.SetToolTipValue((mat.modulation));
	4070	+ metalnessField.SetToolTipValue((mat.metalness));
	4071	+ diffuseField.SetToolTipValue((mat.diffuse));
	4072	+ specularField.SetToolTipValue((mat.specular));
	4073	+ shininessField.SetToolTipValue((mat.shininess));
	4074	+ shiftField.SetToolTipValue((mat.shift));
	4075	+ ambientField.SetToolTipValue((mat.ambient));
	4076	+ lightareaField.SetToolTipValue((mat.lightarea));
	4077	+ diffusenessField.SetToolTipValue((mat.factor));
	4078	+ velvetField.SetToolTipValue((mat.velvet));
	4079	+ sheenField.SetToolTipValue((mat.sheen));
	4080	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4081	+ backlitField.SetToolTipValue((mat.bump));
	4082	+ anisoField.SetToolTipValue((mat.aniso));
	4083	+ anisoVField.SetToolTipValue((mat.anisoV));
	4084	+ cameraField.SetToolTipValue((mat.cameralight));
	4085	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4086	+ shadowField.SetToolTipValue((mat.shadow));
	4087	+ textureField.SetToolTipValue((mat.texture));
	4088	+ opacityField.SetToolTipValue((mat.opacity));
	4089	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4090	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4091	+ }
	4092	+
3508	4093	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3509	4094	{
3510	4095	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3533,9 +4118,22 @@
3533	4118	//copy.Touch();
3534	4119	}
3535	4120
	4121	+ cNumberSlider versionField;
	4122	+
3536	4123	public void stateChanged(ChangeEvent e)
3537	4124	{
3538	4125	// assert(false);
	4126	+ if (e.getSource() == versionField)
	4127	+ {
	4128	+ int version = versionField.getInteger();
	4129	+
	4130	+ if (copy.versions[version] != null)
	4131	+ {
	4132	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4133	+ }
	4134	+
	4135	+ return;
	4136	+ }
3539	4137
3540	4138	if (freezematerial)
3541	4139	{
..	..	@@ -3549,6 +4147,7 @@
3549	4147	\|\| e.getSource() == apertureField
3550	4148	\|\| e.getSource() == shadowblurField)
3551	4149	{
	4150	+ new Exception().printStackTrace();
3552	4151	System.exit(0);
3553	4152	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3554	4153	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3619,7 +4218,7 @@
3619	4218	}
3620	4219
3621	4220	if (normalpushField != null)
3622		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4221	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3623	4222	}
3624	4223
3625	4224	void SnapObject()
..	..	@@ -3874,7 +4473,7 @@
3874	4473
3875	4474	radioPanel.revalidate();
3876	4475	radioPanel.repaint();
3877		- ctrlPanel.revalidate(); // ? new
	4476	+ ctrlPanel.validate(); // ? new
3878	4477	ctrlPanel.repaint();
3879	4478	}
3880	4479	}
..	..	@@ -3883,6 +4482,8 @@
3883	4482
3884	4483	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3885	4484	{
	4485	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4486	+ Save();
3886	4487	//Tween.set(thing, 0).target(1).start(tweenManager);
3887	4488	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3888	4489	// if (thing instanceof GenericJointDemo)
..	..	@@ -3969,6 +4570,12 @@
3969	4570	{
3970	4571	ResetModel();
3971	4572	Select(thing.GetTreePath(), true, false); // unselect... false);
	4573	+
	4574	+ if (thing.Size() == 0)
	4575	+ {
	4576	+ //EditSelection(false);
	4577	+ }
	4578	+
3972	4579	refreshContents();
3973	4580	}
3974	4581
..	..	@@ -4086,6 +4693,7 @@
4086	4693	}
4087	4694	}
4088	4695	}
	4696	+
4089	4697	LoadGFDThread loadGFDThread;
4090	4698
4091	4699	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4105,8 +4713,10 @@
4105	4713
4106	4714	try
4107	4715	{
	4716	+ // Try compressed version first.
4108	4717	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4109		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4718	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4719	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4110	4720
4111	4721	readobj = (Object3D) p.readObject();
4112	4722	istream.close();
..	..	@@ -4114,7 +4724,20 @@
4114	4724	readobj.ResetDisplayList();
4115	4725	} catch (Exception e)
4116	4726	{
4117		- e.printStackTrace();
	4727	+ //e.printStackTrace();
	4728	+ try
	4729	+ {
	4730	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4731	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4732	+
	4733	+ readobj = (Object3D) p.readObject();
	4734	+ istream.close();
	4735	+
	4736	+ readobj.ResetDisplayList();
	4737	+ } catch (Exception e2)
	4738	+ {
	4739	+ e2.printStackTrace();
	4740	+ }
4118	4741	}
4119	4742	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4120	4743	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4160,6 +4783,12 @@
4160	4783
4161	4784	void LoadIt(Object obj)
4162	4785	{
	4786	+ if (obj == null)
	4787	+ {
	4788	+ // Invalid file
	4789	+ return;
	4790	+ }
	4791	+
4163	4792	System.out.println("Loaded " + obj);
4164	4793	//new Exception().printStackTrace();
4165	4794	Object3D readobj = (Object3D) obj;
..	..	@@ -4169,6 +4798,8 @@
4169	4798
4170	4799	if (readobj != null)
4171	4800	{
	4801	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4802	+ // Save();
4172	4803	try
4173	4804	{
4174	4805	//readobj.deepCopySelf(copy);
..	..	@@ -4223,15 +4854,20 @@
4223	4854	c.addChild(csg);
4224	4855	}
4225	4856
	4857	+ copy.versions = readobj.versions;
	4858	+ copy.versionindex = readobj.versionindex;
	4859	+
	4860	+ SetUndoStates();
	4861	+
4226	4862	ResetModel();
4227	4863	copy.HardTouch(); // recompile?
4228	4864	refreshContents();
4229	4865	}
4230	4866	}
4231	4867
4232		- void load() // throws ClassNotFoundException
	4868	+ void Open() // throws ClassNotFoundException
4233	4869	{
4234		- if (GrafreeD.standAlone)
	4870	+ if (Grafreed.standAlone)
4235	4871	{
4236	4872	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4237	4873	browser.show();
..	..	@@ -4318,11 +4954,13 @@
4318	4954	try
4319	4955	{
4320	4956	FileOutputStream ostream = new FileOutputStream(lastname);
4321		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4957	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4958	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4322	4959
4323	4960	p.writeObject(copy);
4324	4961	p.flush();
4325	4962
	4963	+ zstream.close();
4326	4964	ostream.close();
4327	4965
4328	4966	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4332,17 +4970,20 @@
4332	4970	{
4333	4971	}
4334	4972	}
	4973	+
4335	4974	String lastname;
4336	4975
4337	4976	void saveAs()
4338	4977	{
4339		- if (GrafreeD.standAlone)
	4978	+ if (Grafreed.standAlone)
4340	4979	{
4341	4980	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4342	4981	browser.setVisible(true);
4343	4982	String filename = browser.getFile();
4344	4983	if (filename != null && filename.length() > 0)
4345	4984	{
	4985	+ if (!filename.endsWith(".gfd"))
	4986	+ filename += ".gfd";
4346	4987	lastname = browser.getDirectory() + filename;
4347	4988	save();
4348	4989	}
..	..	@@ -4441,13 +5082,13 @@
4441	5082	try
4442	5083	{
4443	5084	FileOutputStream ostream = new FileOutputStream(filename);
4444		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4445		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5085	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5086	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4446	5087
4447	5088	Object3D objectparent = obj.parent;
4448	5089	obj.parent = null;
4449	5090
4450		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5091	+ Object3D object = (Object3D) Grafreed.clone(obj);
4451	5092
4452	5093	obj.parent = objectparent;
4453	5094
..	..	@@ -4459,8 +5100,8 @@
4459	5100	p.writeObject(object);
4460	5101	p.flush();
4461	5102
	5103	+ zstream.close();
4462	5104	ostream.close();
4463		- // zstream.close();
4464	5105
4465	5106	// group.selection.get(0).parent = parent;
4466	5107	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4481,7 +5122,7 @@
4481	5122	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4482	5123	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4483	5124	copy.generatePOV(buffer);
4484		- if (GrafreeD.standAlone)
	5125	+ if (Grafreed.standAlone)
4485	5126	{
4486	5127	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4487	5128	browser.show();
..	..	@@ -4507,21 +5148,20 @@
4507	5148	Object3D client;
4508	5149	Object3D copy;
4509	5150	MenuBar menuBar;
4510		- Menu windowMenu;
4511		- MenuItem loadItem;
	5151	+ Menu fileMenu;
	5152	+ MenuItem newItem;
	5153	+ MenuItem openItem;
4512	5154	MenuItem saveItem;
4513	5155	MenuItem saveAsItem;
4514	5156	MenuItem exportAsItem;
4515	5157	MenuItem reexportItem;
4516	5158	MenuItem povItem;
4517	5159	MenuItem closeItem;
4518		- Menu cameraMenu;
	5160	+
4519	5161	CheckboxMenuItem zBufferItem;
4520	5162	//MenuItem normalLensItem;
4521		- MenuItem editCameraItem;
4522		- MenuItem revertCameraItem;
4523		- CheckboxMenuItem toggleLiveItem;
4524	5163	MenuItem stepItem;
	5164	+ CheckboxMenuItem toggleLiveItem;
4525	5165	CheckboxMenuItem toggleFullScreenItem;
4526	5166	CheckboxMenuItem toggleTimelineItem;
4527	5167	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4530,28 +5170,42 @@
4530	5170	CheckboxMenuItem toggleFootContactItem;
4531	5171	CheckboxMenuItem toggleDLItem;
4532	5172	CheckboxMenuItem toggleTextureItem;
4533		- CheckboxMenuItem toggleRandomItem;
	5173	+ CheckboxMenuItem toggleSwitchItem;
4534	5174	CheckboxMenuItem toggleRootItem;
4535	5175	CheckboxMenuItem animationItem;
	5176	+ MenuItem archiveItem;
4536	5177	CheckboxMenuItem toggleHandleItem;
4537	5178	CheckboxMenuItem togglePaintItem;
4538	5179	JSplitPane mainPanel;
4539	5180	JScrollPane scrollpane;
	5181	+
4540	5182	JPanel toolbarPanel;
4541		- JPanel treePanel;
	5183	+
	5184	+ cGridBag treePanel;
	5185	+
4542	5186	JPanel radioPanel;
4543	5187	ButtonGroup buttonGroup;
4544		- JPanel ctrlPanel;
4545		- JPanel materialPanel;
	5188	+
	5189	+ cGridBag toolboxPanel;
	5190	+ cGridBag materialPanel;
	5191	+ cGridBag ctrlPanel;
	5192	+
4546	5193	JScrollPane infoPanel;
4547		- JPanel optionsPanel;
	5194	+
	5195	+ cGridBag optionsPanel;
	5196	+
4548	5197	JTabbedPane objectPanel;
4549		- JPanel XYZPanel;
	5198	+ boolean materialFlushed;
	5199	+ Object3D latestObject;
	5200	+
	5201	+ cGridBag XYZPanel;
	5202	+
4550	5203	JSplitPane gridPanel;
4551	5204	JSplitPane bigPanel;
4552		- JPanel bigThree;
4553		- JTabbedPane scenePanel;
4554		- JPanel centralPanel;
	5205	+
	5206	+ cGridBag bigThree;
	5207	+ cGridBag scenePanel;
	5208	+ cGridBag centralPanel;
4555	5209	JSplitPane cameraPanel;
4556	5210	JPanel timelinePanel;
4557	5211	JMenuBar timelineMenubar;
..	..	@@ -4604,67 +5258,72 @@
4604	5258	// MATERIAL
4605	5259	JLabel materialLabel;
4606	5260	JLabel colorLabel;
4607		- NumberSlider colorField;
	5261	+ cNumberSlider colorField;
4608	5262	JLabel modulationLabel;
4609		- NumberSlider modulationField;
	5263	+ cNumberSlider modulationField;
4610	5264	JLabel metalnessLabel;
4611		- NumberSlider metalnessField;
	5265	+ cNumberSlider metalnessField;
4612	5266	JLabel diffuseLabel;
4613		- NumberSlider diffuseField;
	5267	+ cNumberSlider diffuseField;
4614	5268	JLabel specularLabel;
4615		- NumberSlider specularField;
	5269	+ cNumberSlider specularField;
4616	5270	JLabel shininessLabel;
4617		- NumberSlider shininessField;
	5271	+ cNumberSlider shininessField;
4618	5272	JLabel shiftLabel;
4619		- NumberSlider shiftField;
	5273	+ cNumberSlider shiftField;
4620	5274	JLabel ambientLabel;
4621		- NumberSlider ambientField;
	5275	+ cNumberSlider ambientField;
4622	5276	JLabel lightareaLabel;
4623		- NumberSlider lightareaField;
	5277	+ cNumberSlider lightareaField;
4624	5278	JLabel diffusenessLabel;
4625		- NumberSlider diffusenessField;
	5279	+ cNumberSlider diffusenessField;
4626	5280	JLabel velvetLabel;
4627		- NumberSlider velvetField;
	5281	+ cNumberSlider velvetField;
4628	5282	JLabel sheenLabel;
4629		- NumberSlider sheenField;
	5283	+ cNumberSlider sheenField;
4630	5284	JLabel subsurfaceLabel;
4631		- NumberSlider subsurfaceField;
	5285	+ cNumberSlider subsurfaceField;
4632	5286	//JLabel bumpLabel;
4633	5287	//NumberSlider bumpField;
4634	5288	JLabel backlitLabel;
4635		- NumberSlider backlitField;
	5289	+ cNumberSlider backlitField;
4636	5290	JLabel anisoLabel;
4637		- NumberSlider anisoField;
	5291	+ cNumberSlider anisoField;
4638	5292	JLabel anisoVLabel;
4639		- NumberSlider anisoVField;
	5293	+ cNumberSlider anisoVField;
4640	5294	JLabel cameraLabel;
4641		- NumberSlider cameraField;
	5295	+ cNumberSlider cameraField;
4642	5296	JLabel selfshadowLabel;
4643		- NumberSlider selfshadowField;
	5297	+ cNumberSlider selfshadowField;
4644	5298	JLabel shadowLabel;
4645		- NumberSlider shadowField;
	5299	+ cNumberSlider shadowField;
4646	5300	JLabel textureLabel;
4647		- NumberSlider textureField;
	5301	+ cNumberSlider textureField;
4648	5302	JLabel opacityLabel;
4649		- NumberSlider opacityField;
	5303	+ cNumberSlider opacityField;
4650	5304	JLabel fakedepthLabel;
4651		- NumberSlider fakedepthField;
	5305	+ cNumberSlider fakedepthField;
4652	5306	JLabel shadowbiasLabel;
4653		- NumberSlider shadowbiasField;
	5307	+ cNumberSlider shadowbiasField;
4654	5308	JLabel bumpLabel;
4655		- NumberSlider bumpField;
	5309	+ cNumberSlider bumpField;
4656	5310	JLabel noiseLabel;
4657		- NumberSlider noiseField;
	5311	+ cNumberSlider noiseField;
4658	5312	JLabel powerLabel;
4659		- NumberSlider powerField;
	5313	+ cNumberSlider powerField;
4660	5314	JLabel borderfadeLabel;
4661		- NumberSlider borderfadeField;
	5315	+ cNumberSlider borderfadeField;
4662	5316	JLabel fogLabel;
4663		- NumberSlider fogField;
	5317	+ cNumberSlider fogField;
4664	5318	JLabel opacityPowerLabel;
4665		- NumberSlider opacityPowerField;
4666		- JTree jTree;
	5319	+ cNumberSlider opacityPowerField;
	5320	+ cTree jTree;
4667	5321	//ObjectUI parent;
4668	5322
4669		- NumberSlider normalpushField;
	5323	+ cNumberSlider normalpushField;
	5324	+
	5325	+ private MenuItem importGFDItem;
	5326	+ private MenuItem importVRMLX3DItem;
	5327	+ private MenuItem import3DSItem;
	5328	+ private MenuItem importOBJItem;
4670	5329	}