~nbriere/GrafreeD.git - Noware Git Repository

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