~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.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,81 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
38	117
39	118	// SCRIPT
40	119
..	..	@@ -138,34 +217,42 @@
138	217	public void closeUI()
139	218	{
140	219	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	220	+// System.out.println("this = " + this);
	221	+// System.out.println("objEditor = " + objEditor);
143	222	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	223	+// objEditor.ctrlPanel.remove(nameField);
145	224
146		- if (!GroupEditor.allparams)
	225	+ objEditor.ctrlPanel.remove(namePanel);
	226	+
	227	+ if (!allparams)
147	228	return;
148	229
149		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- objEditor.ctrlPanel.remove(remarkButton);
	230	+// objEditor.ctrlPanel.remove(liveCB);
	231	+// objEditor.ctrlPanel.remove(hideCB);
	232	+// objEditor.ctrlPanel.remove(markCB);
	233	+//
	234	+// objEditor.ctrlPanel.remove(randomCB);
	235	+// objEditor.ctrlPanel.remove(speedupCB);
	236	+// objEditor.ctrlPanel.remove(rewindCB);
	237	+//
	238	+// objEditor.ctrlPanel.remove(resetButton);
	239	+// objEditor.ctrlPanel.remove(stepButton);
	240	+//// objEditor.ctrlPanel.remove(stepAllButton);
	241	+//// objEditor.ctrlPanel.remove(resetAllButton);
	242	+// objEditor.ctrlPanel.remove(link2masterCB);
	243	+// //objEditor.ctrlPanel.remove(flipVCB);
	244	+// //objEditor.ctrlPanel.remove(texresMenu);
	245	+// objEditor.ctrlPanel.remove(slowerButton);
	246	+// objEditor.ctrlPanel.remove(fasterButton);
	247	+// objEditor.ctrlPanel.remove(remarkButton);
167	248
168		- Remove(normalpushField);
	249	+ objEditor.ctrlPanel.remove(setupPanel);
	250	+ objEditor.ctrlPanel.remove(setupPanel2);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	252	+ objEditor.ctrlPanel.remove(pushPanel);
	253	+ //objEditor.ctrlPanel.remove(fillPanel);
	254	+
	255	+ //Remove(normalpushField);
169	256	}
170	257
171	258	public ObjEditor GetEditor()
..	..	@@ -209,6 +296,12 @@
209	296	client = inClient;
210	297	copy = client;
211	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new byte[100][];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
212	305	// "this" is not called: SetupUI2(objEditor);
213	306	}
214	307
..	..	@@ -222,6 +315,12 @@
222	315	client = inClient;
223	316	copy = client;
224	317
	318	+ if (copy.versions == null)
	319	+ {
	320	+ copy.versions = new byte[100][];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
225	324	SetupUI2(callee.GetEditor());
226	325	}
227	326
..	..	@@ -236,6 +335,7 @@
236	335	//localCopy.parent = null;
237	336
238	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
239	339	objEditor = this;
240	340	this.callee = callee;
241	341
..	..	@@ -253,6 +353,12 @@
253	353	copy = localCopy;
254	354	copy.editWindow = this;
255	355
	356	+ if (copy.versions == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
256	362	SetupMenu();
257	363
258	364	//SetupName(objEditor); // new
..	..	@@ -266,28 +372,49 @@
266	372	return frame.action(event, obj);
267	373	}
268	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
269	380	void SetupMenu()
270	381	{
271	382	frame.setMenuBar(menuBar = new MenuBar());
272		- menuBar.add(windowMenu = new Menu("File"));
273		- windowMenu.add(loadItem = new MenuItem("Load..."));
274		- windowMenu.add("-");
275		- windowMenu.add(saveItem = new MenuItem("Save"));
276		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	383	+ menuBar.add(fileMenu = new Menu("File"));
	384	+ fileMenu.add(newItem = new MenuItem("New"));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
	386	+
	387	+ //oe.menuBar.add(menu = new Menu("Include"));
	388	+ Menu menu = new Menu("Import");
	389	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	390	+ importOBJItem.addActionListener(this);
	391	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	392	+ import3DSItem.addActionListener(this);
	393	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	394	+ importVRMLX3DItem.addActionListener(this);
	395	+ menu.add("-");
	396	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	397	+ importGFDItem.addActionListener(this);
	398	+ fileMenu.add(menu);
	399	+ fileMenu.add("-");
	400	+
	401	+ fileMenu.add(saveItem = new MenuItem("Save"));
	402	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	403	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278		- windowMenu.add("-");
279		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281		- windowMenu.add("-");
	404	+ fileMenu.add("-");
	405	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	406	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	407	+ fileMenu.add("-");
282	408	if (client.parent != null)
283	409	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	410	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	411	} else
286	412	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	413	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	414	}
289	415
290		- loadItem.addActionListener(this);
	416	+ newItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
291	418	saveItem.addActionListener(this);
292	419	saveAsItem.addActionListener(this);
293	420	exportAsItem.addActionListener(this);
..	..	@@ -295,82 +422,69 @@
295	422	//povItem.addActionListener(this);
296	423	closeItem.addActionListener(this);
297	424
298		- menuBar.add(cameraMenu = new Menu("View"));
299		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300		- //zBufferItem.addActionListener(this);
301		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302		- //normalLensItem.addActionListener(this);
303		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304		- revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
307		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308		- toggleFullScreenItem.addItemListener(this);
309		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310		- cameraMenu.add("-");
311		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312		- toggleTextureItem.addItemListener(this);
313		- toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
337		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338		- toggleHandleItem.addItemListener(this);
339		- toggleHandleItem.setState(CameraPane.HANDLES);
340		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341		- togglePaintItem.addItemListener(this);
342		- togglePaintItem.setState(CameraPane.PAINTMODE);
343		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344		-// toggleRootItem.addItemListener(this);
345		-// toggleRootItem.setState(false);
346		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347		-// animationItem.addItemListener(this);
348		-// animationItem.setState(CameraPane.ANIMATION);
349		- cameraMenu.add("-");
350		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351		- editCameraItem.addActionListener(this);
352		-
353	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
354	452	toolbarPanel = new JPanel();
355	453	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	454	+
	455	+ treePanel = new cGridBag();
357	456	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- materialPanel = new JPanel();
361		- materialPanel.setName("Material");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
	461	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
	470	+ materialPanel = new cGridBag().setVertical(true);
	471	+ //materialPanel.setName("Material");
	472	+
362	473	/JTextPane/
363	474	infoarea = createTextPane();
	475	+ doc = infoarea.getStyledDocument();
	476	+
364	477	infoarea.setEditable(true);
365	478	SetText();
	479	+
366	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	481	// infoarea.setOpaque(false);
368	482	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	483	+// TEXTAREA infoarea.setLineWrap(true);
	484	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372		- infoPanel.setPreferredSize(new Dimension(50, 200));
373		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
374	488	//infoPanel.setLayout(new BorderLayout());
375	489	//infoPanel.add(createTextPane());
376	490
..	..	@@ -378,16 +492,23 @@
378	492	mainPanel.setName("Main");
379	493	mainPanel.setContinuousLayout(true);
380	494	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	495	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	496	+ mainPanel.setDividerLocation(0.5); //1.0);
	497	+ mainPanel.setResizeWeight(0.5);
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
385	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	507	//mainPanel.setLayout(new GridBagLayout());
387	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	509	+// treePanel.setLayout(new GridBagLayout());
	510	+ //ctrlPanel.setLayout(new GridBagLayout());
	511	+ //materialPanel.setLayout(new GridBagLayout());
391	512
392	513	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	514	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +547,7 @@
426	547	static String newline = "\n";
427	548	protected static final String buttonString = "JButton";
428	549	StyledDocument doc;
429		- JTextArea infoarea;
	550	+ JTextPane infoarea;
430	551
431	552	void ClearInfo()
432	553	{
..	..	@@ -449,10 +570,10 @@
449	570	e.printStackTrace();
450	571	}
451	572
452		- String selection = infoarea.getText();
453		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454		- java.awt.datatransfer.Clipboard clipboard =
455		- Toolkit.getDefaultToolkit().getSystemClipboard();
	573	+// String selection = infoarea.getText();
	574	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	575	+// java.awt.datatransfer.Clipboard clipboard =
	576	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	577	//clipboard.setContents(data, data);
457	578	}
458	579
..	..	@@ -475,13 +596,13 @@
475	596	//SendInfo("Name:", "bold");
476	597	if (sel.GetTextures() != null \|\| debug)
477	598	{
478		- si.SendInfo(sel.toString(), "bold");
	599	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	600	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	601	if (sel.Size() > 0)
481	602	{
482	603	si.SendInfo("#children = " + sel.Size(), "regular");
483	604	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	605	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	606	if (debug)
486	607	{
487	608	try
..	..	@@ -493,7 +614,10 @@
493	614	}
494	615
495	616	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	617	+ {
	618	+ si.SendInfo(" BBox min: " + minima, "regular");
	619	+ si.SendInfo(" BBox max: " + maxima, "regular");
	620	+ }
497	621
498	622	if (sel.bRep != null)
499	623	{
..	..	@@ -520,7 +644,7 @@
520	644	}
521	645	if (sel.support != null)
522	646	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	647	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	648	}
525	649	if (sel.scriptnode != null)
526	650	{
..	..	@@ -591,6 +715,9 @@
591	715	{
592	716	CameraPane.pointflow = (PointFlow) sel;
593	717	}
	718	+
	719	+ si.SendInfo("_____________________", "regular");
	720	+ si.SendInfo("", "regular");
594	721	}
595	722	}
596	723
..	..	@@ -606,68 +733,191 @@
606	733	}
607	734	}
608	735
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	738	+
	739	+ Rectangle keeprect;
	740	+ cRadio radio;
	741	+
	742	+cButton keepButton;
	743	+ cButton twoButton; // Full 3D
	744	+ cButton sixButton;
	745	+ cButton threeButton;
	746	+ cButton sevenButton;
	747	+ cButton fourButton; // full panel
	748	+ cButton oneButton; // full XYZ
	749	+ //cButton currentLayout;
	750	+
	751	+ boolean maximized;
	752	+
	753	+ cButton fullscreenLayout;
	754	+
	755	+ void Minimize()
	756	+ {
	757	+ frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
	759	+ }
	760	+
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	764	+ void Maximize()
	765	+ {
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
	771	+ if (maximized)
	772	+ {
	773	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	774	+ }
	775	+ else
	776	+ {
	777	+ keeprect = frame.getBounds();
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	781	+// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	783	+ }
	784	+
	785	+ maximized ^= true;
	786	+
	787	+ frame.validate();
	788	+ }
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
	793	+
609	794	void ToggleFullScreen()
610	795	{
611		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
612	801	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	802	+ device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
	808	+ //frame.setVisible(false);
	809	+// frame.removeNotify();
	810	+// frame.setUndecorated(false);
	811	+// frame.addNotify();
	812	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	813	+
	814	+// X frame.getContentPane().remove(/"Center",/bigThree);
	815	+// X framePanel.add(bigThree);
	816	+// X frame.getContentPane().add(/"Center",/framePanel);
	817	+ framePanel.setDividerLocation(46);
	818	+
	819	+ //frame.setVisible(true);
	820	+ radio.layout = keepButton;
	821	+ //theFrame = null;
	822	+ keepButton = null;
	823	+ radio.layout.doClick();
	824	+
616	825	} else
617	826	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	827	+ keepButton = radio.layout;
	828	+ //keeprect = frame.getBounds();
	829	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	830	+// frame.getToolkit().getScreenSize().height);
	831	+ //frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
	835	+ device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
	838	+// frame.removeNotify();
	839	+// frame.setUndecorated(true);
	840	+// frame.addNotify();
	841	+// X frame.getContentPane().remove(/"Center",/framePanel);
	842	+// X framePanel.remove(bigThree);
	843	+// X frame.getContentPane().add(/"Center",/bigThree);
	844	+ framePanel.setDividerLocation(0);
	845	+
	846	+ radio.layout = fullscreenLayout;
	847	+ radio.layout.doClick();
	848	+ //frame.setVisible(true);
621	849	}
622		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
623	851	}
624	852
625		- private JTextArea createTextPane()
	853	+ private byte[] CompressCopy()
626	854	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ byte[] versions[] = copy.versions;
	862	+ copy.versions = null;
	863	+
	864	+ byte[] compress = Compress(copy);
	865	+
	866	+ copy.versions = versions;
	867	+
	868	+ copy.RestoreBigData(versiontable);
	869	+
	870	+ CameraPane.SWITCH = temp;
	871	+
	872	+ return compress;
	873	+ }
642	874
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
	875	+ private JTextPane createTextPane()
	876	+ {
	877	+// TEXTAREA String[] initString =
	878	+// {
	879	+// "This is an editable JTextPane, ", //regular
	880	+// "another ", //italic
	881	+// "styled ", //bold
	882	+// "text ", //small
	883	+// "component, ", //large
	884	+// "which supports embedded components..." + newline,//regular
	885	+// " " + newline, //button
	886	+// "...and embedded icons..." + newline, //regular
	887	+// " ", //icon
	888	+// newline + "JTextPane is a subclass of JEditorPane that "
	889	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	890	+// + "cover methods for interacting with those objects."
	891	+// };
	892	+//
	893	+// String[] initStyles =
	894	+// {
	895	+// "regular", "italic", "bold", "small", "large",
	896	+// "regular", "button", "regular", "icon",
	897	+// "regular"
	898	+// };
	899	+//
	900	+// JTextPane textPane = new JTextPane();
	901	+// textPane.setEditable(true);
	902	+// /StyledDocument/ doc = textPane.getStyledDocument();
	903	+// addStylesToDocument(doc);
	904	+//
	905	+// try
	906	+// {
	907	+// for (int j = 0; j < 2; j++)
	908	+// {
	909	+// for (int i = 0; i < initString.length; i++)
	910	+// {
	911	+// doc.insertString(doc.getLength(), initString[i],
	912	+// doc.getStyle(initStyles[i]));
	913	+// }
	914	+// }
	915	+// } catch (BadLocationException ble)
	916	+// {
	917	+// System.err.println("Couldn't insert initial text into text pane.");
	918	+// }
649	919
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	920	+ return new JTextPane(); // textPane;
671	921	}
672	922
673	923	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +970,7 @@
720	970	protected static ImageIcon createImageIcon(String path,
721	971	String description)
722	972	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	973	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	974	if (imgURL != null)
725	975	{
726	976	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +1002,7 @@
752	1002	// NumberSlider vDivsField;
753	1003	// JCheckBox endcaps;
754	1004	JCheckBox liveCB;
	1005	+ JCheckBox selectableCB;
755	1006	JCheckBox hideCB;
756	1007	JCheckBox link2masterCB;
757	1008	JCheckBox markCB;
..	..	@@ -759,7 +1010,12 @@
759	1010	JCheckBox speedupCB;
760	1011	JCheckBox rewindCB;
761	1012	JCheckBox flipVCB;
	1013	+
	1014	+ cCheckBox toggleTextureCB;
	1015	+ cCheckBox toggleSwitchCB;
	1016	+
762	1017	JComboBox texresMenu;
	1018	+
763	1019	JButton resetButton;
764	1020	JButton stepButton;
765	1021	JButton stepAllButton;
..	..	@@ -767,115 +1023,87 @@
767	1023	JButton slowerButton;
768	1024	JButton fasterButton;
769	1025	JButton remarkButton;
	1026	+
	1027	+ cGridBag editPanel;
	1028	+ cGridBag editCommandsPanel;
	1029	+
	1030	+ cGridBag namePanel;
	1031	+ cGridBag setupPanel;
	1032	+ cGridBag setupPanel2;
	1033	+ cGridBag objectCommandsPanel;
	1034	+ cGridBag pushPanel;
	1035	+ cGridBag fillPanel;
770	1036
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1037	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	1038	{
773	1039	JCheckBox cb;
774	1040
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1041	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	1042	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	1043
785	1044	return cb;
786	1045	}
787	1046
788		- cButton AddButton(ObjEditor oe, String label)
	1047	+ cButton AddButton(cGridBag panel, String label)
789	1048	{
790	1049	cButton cb;
791	1050
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1051	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	1052	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	1053
802	1054	return cb;
803	1055	}
804	1056
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1057	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1058	{
807	1059	JComboBox combo;
808	1060
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	1061	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1062	combo.addActionListener(this);
813	1063
814	1064	return combo;
815	1065	}
816	1066
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1067	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1068	{
819		- NumberSlider combo;
	1069	+ cGridBag control = new cGridBag();
	1070	+
	1071	+ cNumberSlider combo;
820	1072
821	1073	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	1074	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 1;
826		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
829		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	1075	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1076	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	1077	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	1078	+
	1079	+ panel.add(control);
	1080	+
	1081	+ return control;
841	1082	}
842	1083
843		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1084	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
844	1085	{
845		- NumberSlider combo;
	1086	+ cGridBag control = new cGridBag();
	1087	+
	1088	+ cNumberSlider combo;
846	1089
847	1090	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	1091	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
851		- aConstraints.gridwidth = 2;
852		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
855		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
856		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857		- aConstraints.gridx += 1;
858		- aConstraints.gridwidth = 1;
859		-
	1092	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1093	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	1094	combo.setInteger(current);
861	1095
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	1096	+ panel.add(control);
	1097	+
	1098	+ return control;
867	1099	}
868	1100
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	1101	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	1102	{
871	1103	JTextArea text;
872	1104
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1105	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	1106	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	1107
880	1108	return text;
881	1109	}
..	..	@@ -905,9 +1133,16 @@
905	1133	objEditor.ctrlPanel.remove(j);
906	1134	}
907	1135
	1136	+ void Remove(cNumberSlider j)
	1137	+ {
	1138	+ j.removeChangeListener(this);
	1139	+ //objEditor.ctrlPanel.remove(j.label);
	1140	+ objEditor.ctrlPanel.remove(j);
	1141	+ }
	1142	+
908	1143	/*
909	1144	*/
910		- void Return() // ObjEditor oe)
	1145	+ void Return0() // ObjEditor oe)
911	1146	{
912	1147	aConstraints.gridy += 1;
913	1148	aConstraints.gridx = 0;
..	..	@@ -962,37 +1197,80 @@
962	1197
963	1198	void SetupUI2(ObjEditor oe)
964	1199	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	1200	+ //SetupName(oe);
970	1201
971		- if (!GroupEditor.allparams)
	1202	+ namePanel = new cGridBag();
	1203	+
	1204	+ nameField = AddText(namePanel, copy.GetName());
	1205	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1206	+ oe.ctrlPanel.add(namePanel);
	1207	+
	1208	+ oe.ctrlPanel.Return();
	1209	+
	1210	+ if (!allparams)
972	1211	return;
973	1212
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1213	+ setupPanel = new cGridBag().setVertical(false);
	1214	+
	1215	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1216	+ liveCB.setToolTipText("Animate object");
	1217	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1218	+ selectableCB.setToolTipText("Make object selectable");
977	1219	// Return();
978		- markCB = AddCheckBox(oe, "Mark", copy.marked);
979		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
980		- randomCB = AddCheckBox(oe, "Rand", copy.random);
981		- Return();
982		- resetButton = AddButton(oe, "Reset");
983		- stepButton = AddButton(oe, "Step");
	1220	+
	1221	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1222	+ hideCB.setToolTipText("Hide object");
	1223	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1224	+ markCB.setToolTipText("As animation target transform");
	1225	+
	1226	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1227	+
	1228	+ setupPanel2 = new cGridBag().setVertical(false);
	1229	+
	1230	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1231	+ rewindCB.setToolTipText("Rewind animation");
	1232	+
	1233	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1234	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1235	+
	1236	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1237	+ link2masterCB.setToolTipText("Attach to support");
	1238	+
	1239	+ if (Globals.ADVANCED)
	1240	+ {
	1241	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1242	+ speedupCB.setToolTipText("Option motion capture");
	1243	+ }
	1244	+
	1245	+ oe.ctrlPanel.add(setupPanel);
	1246	+ oe.ctrlPanel.Return();
	1247	+ oe.ctrlPanel.add(setupPanel2);
	1248	+ oe.ctrlPanel.Return();
	1249	+
	1250	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1251	+
	1252	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1253	+ resetButton.setToolTipText("Jump to frame zero");
	1254	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1255	+ stepButton.setToolTipText("Step one frame");
984	1256	// resetAllButton = AddButton(oe, "Reset All");
985	1257	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1258	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	1259	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1260	+ slowerButton.setToolTipText("Decrease animation speed");
	1261	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1262	+ fasterButton.setToolTipText("Increase animation speed");
	1263	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1264	+ remarkButton.setToolTipText("Set the current transform as the target");
991	1265
992		- Return();
	1266	+ oe.ctrlPanel.add(objectCommandsPanel);
	1267	+ oe.ctrlPanel.Return();
993	1268
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	1269	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1270	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1271	+ //Return();
	1272	+
	1273	+ oe.ctrlPanel.Return();
996	1274
997	1275	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	1276	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1365,7 @@
1087	1365	oe.aConstraints.gridwidth = 1;
1088	1366	/**/
1089	1367	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1368	+ oe.ctrlPanel.Return();
1091	1369
1092	1370	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1371	//textureButton.setEnabled(false);
..	..	@@ -1191,8 +1469,11 @@
1191	1469	//worldPanel.setName("World");
1192	1470	centralPanel = new cGridBag();
1193	1471	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1472	+
	1473	+ if (Globals.ADVANCED)
	1474	+ {
	1475	+ timelinePanel = new JPanel(new BorderLayout());
	1476	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1477
1197	1478	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1479	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1482,10 @@
1201	1482	// cameraPanel.setDividerSize(9);
1202	1483	cameraPanel.setResizeWeight(1.0);
1203	1484
	1485	+ }
	1486	+
1204	1487	centralPanel.add(cameraView);
	1488	+ centralPanel.setFocusable(true);
1205	1489	//frame.setJMenuBar(timelineMenubar);
1206	1490	//centralPanel.add(timelinePanel);
1207	1491
..	..	@@ -1227,6 +1511,7 @@
1227	1511	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1228	1512	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1229	1513	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1514	+ //XYZPanel.setName("XYZ");
1230	1515
1231	1516	/*
1232	1517	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1264,11 +1549,29 @@
1264	1549	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1550	//tmp.setName("Edit");
1266	1551	objectPanel.add(materialPanel);
1267		- JPanel north = new JPanel(new BorderLayout());
1268		- north.setName("Edit");
1269		- north.add(ctrlPanel, BorderLayout.NORTH);
1270		- objectPanel.add(north);
1271		- objectPanel.add(infoPanel);
	1552	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1553	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1554	+
	1555	+// JPanel north = new JPanel(new BorderLayout());
	1556	+// north.setName("Edit");
	1557	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1558	+// objectPanel.add(north);
	1559	+ objectPanel.add(editPanel);
	1560	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1561	+ objectPanel.setToolTipTextAt(1, "Edit panel");
	1562	+
	1563	+ //if (Globals.ADVANCED)
	1564	+ objectPanel.add(infoPanel);
	1565	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1566	+ objectPanel.setToolTipTextAt(2, "Info panel");
	1567	+
	1568	+ objectPanel.add(XYZPanel);
	1569	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1570	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1571	+
	1572	+ objectPanel.add(toolboxPanel);
	1573	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1574	+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1272	1575
1273	1576	/*
1274	1577	aConstraints.gridx = 0;
..	..	@@ -1277,7 +1580,7 @@
1277	1580	aConstraints.gridy += 1;
1278	1581	aConstraints.gridwidth = 1;
1279	1582	mainPanel.add(objectPanel, aConstraints);
1280		- */
	1583	+ */
1281	1584
1282	1585	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1283	1586	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1289,21 +1592,21 @@
1289	1592	scrollpane.addMouseWheelListener(this); // Default not fast enough
1290	1593
1291	1594	/JTabbedPane/ scenePanel = new cGridBag();
1292		- scenePanel.preferredWidth = 7;
	1595	+ scenePanel.preferredWidth = 5;
1293	1596
1294	1597	JTabbedPane tabbedPane = new JTabbedPane();
1295	1598	tabbedPane.add(scrollpane);
1296	1599
1297		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1298		-
1299		- optionsPanel = new JPanel(new GridBagLayout());
	1600	+ optionsPanel = new cGridBag().setVertical(false);
1300	1601
1301	1602	optionsPanel.setName("Options");
1302	1603
1303		- AddOptions(optionsPanel, aConstraints);
	1604	+ AddOptions(optionsPanel); //, aConstraints);
1304	1605
1305	1606	tabbedPane.add(optionsPanel);
1306	1607
	1608	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1609	+
1307	1610	scenePanel.add(tabbedPane);
1308	1611
1309	1612	/*
..	..	@@ -1367,7 +1670,7 @@
1367	1670	bigThree = new cGridBag();
1368	1671	bigThree.addComponent(scenePanel);
1369	1672	bigThree.addComponent(centralPanel);
1370		- bigThree.addComponent(XYZPanel);
	1673	+ //bigThree.addComponent(XYZPanel);
1371	1674
1372	1675	// // SIDE EFFECT!!!
1373	1676	// aConstraints.gridx = 0;
..	..	@@ -1376,9 +1679,9 @@
1376	1679	// aConstraints.gridheight = 1;
1377	1680
1378	1681	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1379		- framePanel.setContinuousLayout(true);
1380		- framePanel.setOneTouchExpandable(true);
1381		- framePanel.setDividerLocation(0.8);
	1682	+ framePanel.setContinuousLayout(false);
	1683	+ framePanel.setOneTouchExpandable(false);
	1684	+ //.setDividerLocation(0.8);
1382	1685	//framePanel.setDividerSize(15);
1383	1686	//framePanel.setResizeWeight(0.15);
1384	1687	framePanel.setName("Frame");
..	..	@@ -1395,15 +1698,19 @@
1395	1698
1396	1699	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1397	1700
1398		- frame.setSize(1024, 768);
1399		- frame.show();
1400		-
	1701	+ frame.setSize(1280, 860);
	1702	+
	1703	+ cameraView.requestFocusInWindow();
	1704	+
1401	1705	gridPanel.setDividerLocation(1.0);
	1706	+
	1707	+ frame.validate();
	1708	+
	1709	+ frame.setVisible(true);
1402	1710
1403	1711	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1404	1712	frame.addWindowListener(new WindowAdapter()
1405	1713	{
1406		-
1407	1714	public void windowClosing(WindowEvent e)
1408	1715	{
1409	1716	Close();
..	..	@@ -1411,7 +1718,7 @@
1411	1718	});
1412	1719	}
1413	1720
1414		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1721	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1415	1722	{
1416	1723	}
1417	1724
..	..	@@ -1426,260 +1733,182 @@
1426	1733	ctrlPanel.removeAll();
1427	1734	}
1428	1735
1429		- void SetupMaterial(JPanel ctrlPanel)
	1736	+ void SetupMaterial(cGridBag panel)
1430	1737	{
1431		- aConstraints.weighty = 0;
1432		- //aConstraints.weightx = 1;
1433		- /*
	1738	+ /*
1434	1739	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1435	1740	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1436		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1437		- aConstraints.gridx += 1;
1438	1741	*/
1439	1742
1440		- aConstraints.gridwidth = 1;
1441		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
	1743	+ cGridBag editBar = new cGridBag().setVertical(false);
	1744	+
	1745	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1746	+ createMaterialButton.setToolTipText("Create material");
1445	1747
1446	1748	/*
1447	1749	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1448		- aConstraints.gridx += 1;
1449		- aConstraints.weighty = 0;
1450		- aConstraints.gridwidth = 1;
1451	1750	*/
1452	1751
1453		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1454		- aConstraints.gridx += 1;
	1752	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1753	+ clearMaterialButton.setToolTipText("Clear material");
	1754	+
	1755	+ if (Globals.ADVANCED)
	1756	+ {
	1757	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1758	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1759	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1760	+ }
1455	1761
1456		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1457		-
1458		- aConstraints.gridx += 1;
1459		-
1460		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1461		-
1462		- aConstraints.gridx += 1;
1463		-
1464		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1465		-
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.weighty = 0;
1469		- aConstraints.gridwidth = 1;
	1762	+ editBar.preferredHeight = 15;
	1763	+
	1764	+ panel.add(editBar);
	1765	+
1470	1766	/**/
1471	1767	//aConstraints.weighty = 0;
1472	1768	////aConstraints.weightx = 1;
1473	1769	//aConstraints.weighty = 1;
1474	1770	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1475	1771	//aConstraints.gridx += 1;
1476		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1477		- aConstraints.weighty = 0;
1478		- aConstraints.gridx = 0;
1479		- aConstraints.gridy += 1;
1480		- aConstraints.gridwidth = 1;
	1772	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1481	1773
1482		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1483		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1485		- aConstraints.gridx += 1;
1486		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1487		- //aConstraints.weightx = 0;
1488		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1489		- aConstraints.gridx = 0;
1490		- aConstraints.gridy += 1;
1491		- aConstraints.gridwidth = 1;
	1774	+ cGridBag colorSection = new cGridBag().setVertical(true);
1492	1775
1493		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1494		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1495		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1496		- aConstraints.gridx += 1;
1497		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1498		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1499		- aConstraints.gridx = 0;
1500		- aConstraints.gridy += 1;
1501		- aConstraints.gridwidth = 1;
	1776	+ cGridBag huepanel = new cGridBag();
	1777	+ cGridBag huelabel = new cGridBag();
	1778	+ huelabel.add(GetLabel("icons/hue.png", false));
	1779	+ huelabel.preferredWidth = 20;
	1780	+ huepanel.add(new cGridBag()); // Label
	1781	+ huepanel.add(huelabel); // Field/slider
	1782	+
	1783	+ huepanel.preferredHeight = 7;
1502	1784
1503		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1504		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1505		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1506		- aConstraints.gridx += 1;
1507		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1508		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	1785	+ colorSection.add(huepanel);
	1786	+
	1787	+ cGridBag color = new cGridBag();
	1788	+
	1789	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1790	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1791	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1512	1792
1513		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1514		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	1793	+ //colorField.preferredWidth = 200;
	1794	+ colorSection.add(color);
1522	1795
1523		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1524		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	1796	+ cGridBag modulation = new cGridBag();
	1797	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1798	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1799	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1800	+ colorSection.add(modulation);
1532	1801
1533		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1534		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	1802	+ cGridBag opacity = new cGridBag();
	1803	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1804	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1805	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1806	+ colorSection.add(opacity);
1542	1807
1543		- //aConstraints.weighty = 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1545		- //aConstraints.gridx += 1;
1546		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1547		- aConstraints.weighty = 0;
1548		- aConstraints.gridx = 0;
1549		- aConstraints.gridy += 1;
1550		- aConstraints.gridwidth = 1;
	1808	+ colorSection.add(GetSeparator());
	1809	+
	1810	+ cGridBag texture = new cGridBag();
	1811	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1812	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1813	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1814	+ colorSection.add(texture);
1551	1815
1552		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1553		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1555		- aConstraints.gridx += 1;
1556		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1557		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1558		- aConstraints.gridx = 0;
1559		- aConstraints.gridy += 1;
1560		- aConstraints.gridwidth = 1;
	1816	+ panel.add(GetSeparator());
	1817	+
	1818	+ panel.add(colorSection);
	1819	+
	1820	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1821	+
	1822	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1823	+
	1824	+ cGridBag diffuse = new cGridBag();
	1825	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1826	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1827	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1828	+ diffuseSection.add(diffuse);
1561	1829
1562		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1563		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1564		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1565		- aConstraints.gridx += 1;
1566		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1567		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1568		- aConstraints.gridx = 0;
1569		- aConstraints.gridy += 1;
1570		- aConstraints.gridwidth = 1;
	1830	+ cGridBag diffuseness = new cGridBag();
	1831	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1832	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1833	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1834	+ diffuseSection.add(diffuseness);
1571	1835
1572		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1573		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1574		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1575		- aConstraints.gridx += 1;
1576		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1577		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1578		- aConstraints.gridx = 0;
1579		- aConstraints.gridy += 1;
1580		- aConstraints.gridwidth = 1;
	1836	+ cGridBag selfshadow = new cGridBag();
	1837	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1838	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1839	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1840	+ diffuseSection.add(selfshadow);
1581	1841
1582		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1583		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1585		- aConstraints.gridx += 1;
1586		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1587		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	1842	+ cGridBag sheen = new cGridBag();
	1843	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1844	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1845	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1846	+ diffuseSection.add(sheen);
1591	1847
1592		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1593		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	1848	+ cGridBag subsurface = new cGridBag();
	1849	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1850	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1851	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1852	+ diffuseSection.add(subsurface);
1601	1853
1602		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1603		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	1854	+ cGridBag shadow = new cGridBag();
	1855	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1856	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1857	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1858	+ diffuseSection.add(shadow);
1611	1859
1612		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1613		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
	1860	+ cGridBag fakedepth = new cGridBag();
	1861	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1862	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1863	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1864	+ diffuseSection.add(fakedepth);
1621	1865
1622		- //aConstraints.weighty = 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1624		- //aConstraints.gridx += 1;
1625		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1626		- aConstraints.weighty = 0;
1627		- aConstraints.gridx = 0;
1628		- aConstraints.gridy += 1;
1629		- aConstraints.gridwidth = 1;
	1866	+ cGridBag shadowbias = new cGridBag();
	1867	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1868	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1869	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1870	+ diffuseSection.add(shadowbias);
1630	1871
1631		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1632		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1633		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1634		- aConstraints.gridx += 1;
1635		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1636		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1637		- aConstraints.gridx = 0;
1638		- aConstraints.gridy += 1;
1639		- aConstraints.gridwidth = 1;
	1872	+ panel.add(GetSeparator());
	1873	+
	1874	+ panel.add(diffuseSection);
	1875	+
	1876	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1877	+
	1878	+ cGridBag specularSection = new cGridBag().setVertical(true);
1640	1879
1641		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1642		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1643		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1644		- aConstraints.gridx += 1;
1645		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1646		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1647		- aConstraints.gridx = 0;
1648		- aConstraints.gridy += 1;
1649		- aConstraints.gridwidth = 1;
	1880	+ cGridBag specular = new cGridBag();
	1881	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1882	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1883	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1884	+ specularSection.add(specular);
1650	1885
1651		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1652		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1654		- aConstraints.gridx += 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1656		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1657		- aConstraints.gridx = 0;
1658		- aConstraints.gridy += 1;
1659		- aConstraints.gridwidth = 1;
	1886	+ cGridBag lightarea = new cGridBag();
	1887	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1888	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1889	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1890	+ specularSection.add(lightarea);
1660	1891
1661		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1662		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1664		- aConstraints.gridx += 1;
1665		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1666		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1667		- aConstraints.gridx = 0;
1668		- aConstraints.gridy += 1;
1669		- aConstraints.gridwidth = 1;
	1892	+ cGridBag shininess = new cGridBag();
	1893	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1894	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1895	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1896	+ specularSection.add(shininess);
1670	1897
1671		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1672		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1673		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1674		- aConstraints.gridx += 1;
1675		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1676		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1677		- aConstraints.gridx = 0;
1678		- aConstraints.gridy += 1;
1679		- aConstraints.gridwidth = 1;
	1898	+ cGridBag metalness = new cGridBag();
	1899	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1900	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1901	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1902	+ specularSection.add(metalness);
1680	1903
1681		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1682		- Return();
	1904	+ cGridBag velvet = new cGridBag();
	1905	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1906	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1907	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1908	+ specularSection.add(velvet);
	1909	+
	1910	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1911	+ //Return();
1683	1912	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1684	1913	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685	1914	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1690,130 +1919,99 @@
1690	1919	// aConstraints.gridy += 1;
1691	1920	// aConstraints.gridwidth = 1;
1692	1921
1693		- //aConstraints.weighty = 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1695		- //aConstraints.gridx += 1;
1696		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1697		- aConstraints.weighty = 0;
1698		- aConstraints.gridx = 0;
1699		- aConstraints.gridy += 1;
1700		- aConstraints.gridwidth = 1;
	1922	+ cGridBag anisoU = new cGridBag();
	1923	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1924	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1925	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1926	+ specularSection.add(anisoU);
1701	1927
1702		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1703		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1704		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1705		- aConstraints.gridx += 1;
1706		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1707		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1708		- aConstraints.gridx = 0;
1709		- aConstraints.gridy += 1;
1710		- aConstraints.gridwidth = 1;
	1928	+ cGridBag anisoV = new cGridBag();
	1929	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1930	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1931	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1932	+ specularSection.add(anisoV);
1711	1933
1712		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1713		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1715		- aConstraints.gridx += 1;
1716		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1717		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1718		- aConstraints.gridx = 0;
1719		- aConstraints.gridy += 1;
1720		- aConstraints.gridwidth = 1;
1721	1934
1722		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1723		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1724		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1725		- aConstraints.gridx += 1;
1726		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1727		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1728		- aConstraints.gridx = 0;
1729		- aConstraints.gridy += 1;
1730		- aConstraints.gridwidth = 1;
	1935	+ panel.add(GetSeparator());
	1936	+
	1937	+ panel.add(specularSection);
	1938	+
	1939	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1940	+
	1941	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1731	1942
1732		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1733		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1734		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1735		- aConstraints.gridx += 1;
1736		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1737		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1738		- aConstraints.gridx = 0;
1739		- aConstraints.gridy += 1;
1740		- aConstraints.gridwidth = 1;
1741		- aConstraints.weighty = 0;
	1943	+ cGridBag camera = new cGridBag();
	1944	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1945	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1946	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1947	+ colorSection.add(camera);
1742	1948
1743		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1744		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1745		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1746		- aConstraints.gridx += 1;
1747		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1748		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1749		- aConstraints.gridx = 0;
1750		- aConstraints.gridy += 1;
1751		- aConstraints.gridwidth = 1;
	1949	+ cGridBag ambient = new cGridBag();
	1950	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1951	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1952	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1953	+ colorSection.add(ambient);
1752	1954
1753		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1754		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1755		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1756		- aConstraints.gridx += 1;
1757		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1758		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1759		- aConstraints.gridx = 0;
1760		- aConstraints.gridy += 1;
1761		- aConstraints.gridwidth = 1;
	1955	+ cGridBag backlit = new cGridBag();
	1956	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1957	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1958	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1959	+ colorSection.add(backlit);
1762	1960
1763		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1764		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1765		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1766		- aConstraints.gridx += 1;
1767		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1768		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1769		- aConstraints.gridx = 0;
1770		- aConstraints.gridy += 1;
1771		- aConstraints.gridwidth = 1;
	1961	+ //panel.add(new JSeparator());
	1962	+
	1963	+ //panel.add(globalSection);
	1964	+
	1965	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1966	+
	1967	+ cGridBag textureSection = new cGridBag().setVertical(true);
1772	1968
1773		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1774		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1775		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1776		- aConstraints.gridx += 1;
1777		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1778		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1779		- aConstraints.gridx = 0;
1780		- aConstraints.gridy += 1;
1781		- aConstraints.gridwidth = 1;
	1969	+ cGridBag bump = new cGridBag();
	1970	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1971	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1972	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1973	+ textureSection.add(bump);
1782	1974
1783		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1784		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1785		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1786		- aConstraints.gridx += 1;
1787		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1788		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1789		- aConstraints.gridx = 0;
1790		- aConstraints.gridy += 1;
1791		- aConstraints.gridwidth = 1;
	1975	+ cGridBag noise = new cGridBag();
	1976	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1977	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1978	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1979	+ textureSection.add(noise);
1792	1980
1793		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1794		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1795		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1796		- aConstraints.gridx += 1;
1797		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1798		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1799		- aConstraints.gridx = 0;
1800		- aConstraints.gridy += 1;
1801		- aConstraints.gridwidth = 1;
	1981	+ cGridBag power = new cGridBag();
	1982	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1983	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1984	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1985	+ textureSection.add(power);
1802	1986
1803		- //aConstraints.weighty = 1;
1804		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1805		- //aConstraints.gridx += 1;
1806		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1807		- aConstraints.weighty = 0;
	1987	+ cGridBag borderfade = new cGridBag();
	1988	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1989	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1990	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1991	+ textureSection.add(borderfade);
1808	1992
1809		- aConstraints.gridx = 0;
1810		- aConstraints.gridy = 0;
1811		- aConstraints.gridwidth = 1;
	1993	+ cGridBag fog = new cGridBag();
	1994	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1995	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1996	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1997	+ textureSection.add(fog);
	1998	+
	1999	+ cGridBag opacityPower = new cGridBag();
	2000	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2001	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2002	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2003	+ textureSection.add(opacityPower);
	2004	+
	2005	+ panel.add(GetSeparator());
	2006	+
	2007	+ panel.add(textureSection);
	2008	+
	2009	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1812	2010
1813	2011	SetMaterial(copy); // .GetMaterial());
1814	2012
1815		- colorField.addChangeListener(this);
1816		- modulationField.addChangeListener(this);
	2013	+ //colorField.addChangeListener(this);
	2014	+// modulationField.addChangeListener(this);
1817	2015	metalnessField.addChangeListener(this);
1818	2016	diffuseField.addChangeListener(this);
1819	2017	specularField.addChangeListener(this);
..	..	@@ -1843,12 +2041,15 @@
1843	2041	opacityPowerField.addChangeListener(this);
1844	2042	/**/
1845	2043
1846		- resetSlidersButton.addActionListener(this);
1847	2044	clearMaterialButton.addActionListener(this);
1848	2045	createMaterialButton.addActionListener(this);
1849		-
1850		- propagateToggle.addItemListener(this);
1851		- multiplyToggle.addItemListener(this);
	2046	+
	2047	+ if (Globals.ADVANCED)
	2048	+ {
	2049	+ resetSlidersButton.addActionListener(this);
	2050	+ propagateToggle.addItemListener(this);
	2051	+ multiplyToggle.addItemListener(this);
	2052	+ }
1852	2053	}
1853	2054
1854	2055	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1866,8 +2067,9 @@
1866	2067	// 3D models
1867	2068	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1868	2069	{
1869		- lastConverter = new com.jmex.model.converters.MaxToJme();
1870		- LoadFile(filename, lastConverter);
	2070	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2071	+ //LoadFile(filename, lastConverter);
	2072	+ LoadObjFile(filename); // New 3ds loader
1871	2073	continue;
1872	2074	}
1873	2075	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2019,7 +2221,7 @@
2019	2221
2020	2222	//? flashIt = false;
2021	2223	CameraPane pane = (CameraPane) cameraView;
2022		- pane.clickStart(location.x, location.y, 0);
	2224	+ pane.clickStart(location.x, location.y, 0, 0);
2023	2225	pane.clickEnd(location.x, location.y, 0, true);
2024	2226
2025	2227	if (group.selection.size() == 1)
..	..	@@ -2068,6 +2270,7 @@
2068	2270	e2.printStackTrace();
2069	2271	}
2070	2272	}
	2273	+
2071	2274	LoadJMEThread loadThread;
2072	2275
2073	2276	class LoadJMEThread extends Thread
..	..	@@ -2125,6 +2328,7 @@
2125	2328	//LoadFile0(filename, converter);
2126	2329	}
2127	2330	}
	2331	+
2128	2332	LoadOBJThread loadObjThread;
2129	2333
2130	2334	class LoadOBJThread extends Thread
..	..	@@ -2203,19 +2407,19 @@
2203	2407
2204	2408	void LoadObjFile(String fullname)
2205	2409	{
2206		- /*
	2410	+ System.out.println("Loading " + fullname);
	2411	+ /**/
2207	2412	//lastFilename = fullname;
2208	2413	if(loadObjThread == null)
2209	2414	{
2210		- loadObjThread = new LoadOBJThread();
2211		- loadObjThread.start();
	2415	+ loadObjThread = new LoadOBJThread();
	2416	+ loadObjThread.start();
2212	2417	}
2213	2418
2214	2419	loadObjThread.add(fullname);
2215		- */
	2420	+ /**/
2216	2421
2217		- System.out.println("Loading " + fullname);
2218		- makeSomething(new FileObject(fullname, true), true);
	2422	+ //makeSomething(new FileObject(fullname, true), true);
2219	2423	}
2220	2424
2221	2425	void LoadGFDFile(String fullname)
..	..	@@ -2476,11 +2680,11 @@
2476	2680
2477	2681	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2478	2682	{
2479		- if (GrafreeD.standAlone)
	2683	+ if (Grafreed.standAlone)
2480	2684	{
2481	2685	/**/
2482	2686	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2483		- browser.show();
	2687	+ browser.setVisible(true);
2484	2688	String filename = browser.getFile();
2485	2689	if (filename != null && filename.length() > 0)
2486	2690	{
..	..	@@ -2591,6 +2795,7 @@
2591	2795	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2592	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2593	2797	}
	2798	+
2594	2799	//cJME.count++;
2595	2800	//cJME.count %= 12;
2596	2801	if (gc)
..	..	@@ -2625,6 +2830,7 @@
2625	2830	}
2626	2831	if (input == null)
2627	2832	{
	2833	+ new Exception().printStackTrace();
2628	2834	System.exit(0);
2629	2835	}
2630	2836
..	..	@@ -2773,6 +2979,7 @@
2773	2979	}
2774	2980	}
2775	2981	}
	2982	+
2776	2983	cFileSystemPane FSPane;
2777	2984
2778	2985	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2826,11 +3033,14 @@
2826	3033	}
2827	3034	}
2828	3035	}
	3036	+
2829	3037	freezematerial = false;
2830	3038	}
2831	3039
2832	3040	void SetMaterial(Object3D object)
2833	3041	{
	3042	+ latestObject = object;
	3043	+
2834	3044	cMaterial mat = object.material;
2835	3045
2836	3046	if (mat == null)
..	..	@@ -2839,7 +3049,8 @@
2839	3049	return;
2840	3050	}
2841	3051
2842		- multiplyToggle.setSelected(mat.multiply);
	3052	+ if (multiplyToggle != null)
	3053	+ multiplyToggle.setSelected(mat.multiply);
2843	3054
2844	3055	assert (object.projectedVertices != null);
2845	3056
..	..	@@ -2941,12 +3152,17 @@
2941	3152	// }
2942	3153
2943	3154	/**/
2944		- if (deselect)
	3155	+ if (deselect \|\| child == null)
2945	3156	{
2946	3157	//group.deselectAll();
2947	3158	//freeze = true;
2948	3159	GetTree().clearSelection();
2949	3160	//freeze = false;
	3161	+
	3162	+ if (child == null)
	3163	+ {
	3164	+ return;
	3165	+ }
2950	3166	}
2951	3167
2952	3168	//group.addSelectee(child);
..	..	@@ -3015,7 +3231,7 @@
3015	3231	cameraView.ToggleDL();
3016	3232	cameraView.repaint();
3017	3233	return;
3018		- } else if (event.getSource() == toggleTextureItem)
	3234	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3019	3235	{
3020	3236	cameraView.ToggleTexture();
3021	3237	// june 2013 copy.HardTouch();
..	..	@@ -3054,9 +3270,9 @@
3054	3270	frame.validate();
3055	3271
3056	3272	return;
3057		- } else if (event.getSource() == toggleRandomItem)
	3273	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3058	3274	{
3059		- cameraView.ToggleRandom();
	3275	+ cameraView.ToggleSwitch();
3060	3276	cameraView.repaint();
3061	3277	return;
3062	3278	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3085,6 +3301,10 @@
3085	3301	{
3086	3302	copy.live ^= true;
3087	3303	return;
	3304	+ } else if (event.getSource() == selectableCB)
	3305	+ {
	3306	+ copy.dontselect ^= true;
	3307	+ return;
3088	3308	} else if (event.getSource() == hideCB)
3089	3309	{
3090	3310	copy.hide ^= true;
..	..	@@ -3099,6 +3319,7 @@
3099	3319	if (event.getSource() == randomCB)
3100	3320	{
3101	3321	copy.random ^= true;
	3322	+ objEditor.refreshContents();
3102	3323	return;
3103	3324	}
3104	3325	if (event.getSource() == speedupCB)
..	..	@@ -3122,8 +3343,9 @@
3122	3343
3123	3344	public void actionPerformed(ActionEvent event)
3124	3345	{
	3346	+ Object source = event.getSource();
3125	3347	// SCRIPT DIALOG
3126		- if (event.getSource() == okbutton)
	3348	+ if (source == okbutton)
3127	3349	{
3128	3350	textpanel.setVisible(false);
3129	3351	textpanel.remove(textarea);
..	..	@@ -3135,7 +3357,7 @@
3135	3357	textarea = null;
3136	3358	textpanel = null;
3137	3359	}
3138		- if (event.getSource() == cancelbutton)
	3360	+ if (source == cancelbutton)
3139	3361	{
3140	3362	textpanel.setVisible(false);
3141	3363	textpanel.remove(textarea);
..	..	@@ -3147,50 +3369,50 @@
3147	3369	//applySelf();
3148	3370	//client.refreshEditWindow();
3149	3371	//refreshContents();
3150		- if (event.getSource() == nameField)
	3372	+ if (source == nameField)
3151	3373	{
3152	3374	//System.out.println("ObjEditor " + event);
3153	3375	applySelf0(true);
3154	3376	//parent.applySelf();
3155	3377	objEditor.refreshContents();
3156		- } else if (event.getSource() == resetButton)
	3378	+ } else if (source == resetButton)
3157	3379	{
3158	3380	CameraPane.fullreset = true;
3159	3381	copy.Reset(); // ResetMeshes();
3160	3382	copy.Touch();
3161	3383	objEditor.refreshContents();
3162		- } else if (event.getSource() == stepItem)
	3384	+ } else if (source == stepItem)
3163	3385	{
3164	3386	//cameraView.ONESTEP = true;
3165	3387	Globals.ONESTEP = true;
3166	3388	cameraView.repaint();
3167	3389	return;
3168		- } else if (event.getSource() == stepButton)
	3390	+ } else if (source == stepButton)
3169	3391	{
3170	3392	copy.Step();
3171	3393	copy.Touch();
3172	3394	objEditor.refreshContents();
3173		- } else if (event.getSource() == slowerButton)
	3395	+ } else if (source == slowerButton)
3174	3396	{
3175	3397	copy.Slower();
3176	3398	copy.Touch();
3177	3399	objEditor.refreshContents();
3178		- } else if (event.getSource() == fasterButton)
	3400	+ } else if (source == fasterButton)
3179	3401	{
3180	3402	copy.Faster();
3181	3403	copy.Touch();
3182	3404	objEditor.refreshContents();
3183		- } else if (event.getSource() == remarkButton)
	3405	+ } else if (source == remarkButton)
3184	3406	{
3185	3407	copy.Remark();
3186	3408	copy.Touch();
3187	3409	objEditor.refreshContents();
3188		- } else if (event.getSource() == stepAllButton)
	3410	+ } else if (source == stepAllButton)
3189	3411	{
3190	3412	copy.StepAll();
3191	3413	copy.Touch();
3192	3414	objEditor.refreshContents();
3193		- } else if (event.getSource() == resetAllButton)
	3415	+ } else if (source == resetAllButton)
3194	3416	{
3195	3417	//CameraPane.fullreset = true;
3196	3418	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3223,53 +3445,79 @@
3223	3445	// Close();
3224	3446	// }
3225	3447	// else
3226		- if (event.getSource() == resetSlidersButton)
	3448	+ if (source == resetSlidersButton)
3227	3449	{
3228	3450	ResetSliders();
3229		- } else if (event.getSource() == clearMaterialButton)
	3451	+ } else if (source == clearMaterialButton)
3230	3452	{
3231	3453	ClearMaterial();
3232		- } else if (event.getSource() == createMaterialButton)
	3454	+ } else if (source == createMaterialButton)
3233	3455	{
3234	3456	CreateMaterial();
3235		- } else if (event.getSource() == clearPanelButton)
	3457	+ } else if (source == clearPanelButton)
3236	3458	{
3237	3459	copy.ClearUI();
3238	3460	refreshContents(true);
3239		- } /*
3240		- }
3241		-
3242		- public boolean action(Event event, Object arg)
3243		- {
3244		- */ else if (event.getSource() == closeItem)
	3461	+ } else if (source == importGFDItem)
	3462	+ {
	3463	+ ImportGFD();
	3464	+ } else
	3465	+ if (source == importVRMLX3DItem)
	3466	+ {
	3467	+ ImportVRMLX3D();
	3468	+ } else
	3469	+ if (source == import3DSItem)
	3470	+ {
	3471	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3472	+ } else
	3473	+ if (source == importOBJItem)
	3474	+ {
	3475	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3476	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3477	+ browser.setVisible(true);
	3478	+ String filename = browser.getFile();
	3479	+ if (filename != null && filename.length() > 0)
	3480	+ {
	3481	+ String fullname = browser.getDirectory() + filename;
	3482	+ makeSomething(ReadOBJ(fullname), true);
	3483	+ }
	3484	+ } else
	3485	+ if (source == closeItem)
3245	3486	{
3246	3487	Close();
3247	3488	//return true;
3248		- } else if (event.getSource() == loadItem)
	3489	+ } else if (source == openItem)
3249	3490	{
3250		- load();
	3491	+ Open();
3251	3492	//return true;
3252		- } else if (event.getSource() == saveItem)
	3493	+ } else if (source == newItem)
	3494	+ {
	3495	+ New();
	3496	+ } else if (source == saveItem)
3253	3497	{
3254	3498	save();
3255	3499	//return true;
3256		- } else if (event.getSource() == saveAsItem)
	3500	+ } else if (source == saveAsItem)
3257	3501	{
3258	3502	saveAs();
3259	3503	//return true;
3260		- } else if (event.getSource() == reexportItem)
	3504	+ } else if (source == reexportItem)
3261	3505	{
3262	3506	reexport();
3263	3507	//return true;
3264		- } else if (event.getSource() == exportAsItem)
	3508	+ } else if (source == exportAsItem)
3265	3509	{
3266	3510	export();
3267	3511	//return true;
3268		- } else if (event.getSource() == povItem)
	3512	+ } else if (source == povItem)
3269	3513	{
3270	3514	generatePOV();
3271	3515	//return true;
3272		- } else if (event.getSource() == zBufferItem)
	3516	+ } else if (event.getSource() == archiveItem)
	3517	+ {
	3518	+ cTools.Archive(frame);
	3519	+ return;
	3520	+ } else if (source == zBufferItem)
3273	3521	{
3274	3522	try
3275	3523	{
..	..	@@ -3291,21 +3539,8 @@
3291	3539	cameraView.repaint();
3292	3540	//return true;
3293	3541	}
3294		- */ else if (event.getSource() == editCameraItem)
3295		- {
3296		- cameraView.ProtectCamera();
3297		- cameraView.repaint();
3298		- return;
3299		- } else if (event.getSource() == revertCameraItem)
3300		- {
3301		- cameraView.RevertCamera();
3302		- cameraView.repaint();
3303		- return;
3304		-// } else if (event.getSource() == textureButton)
3305		-// {
3306		-// return; // true;
3307		- } else // combos...
3308		- if (event.getSource() == texresMenu)
	3542	+ */ else // combos...
	3543	+ if (source == texresMenu)
3309	3544	{
3310	3545	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3311	3546	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3317,12 +3552,412 @@
3317	3552	}
3318	3553	}
3319	3554
	3555	+ void New()
	3556	+ {
	3557	+ while (copy.Size() > 1)
	3558	+ {
	3559	+ copy.remove(1);
	3560	+ }
	3561	+
	3562	+ ResetModel();
	3563	+ objEditor.refreshContents();
	3564	+ }
	3565	+
	3566	+ static public byte[] Compress(Object3D o)
	3567	+ {
	3568	+ try
	3569	+ {
	3570	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3571	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3572	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3573	+
	3574	+ Object3D parent = o.parent;
	3575	+ o.parent = null;
	3576	+
	3577	+ out.writeObject(o);
	3578	+
	3579	+ o.parent = parent;
	3580	+
	3581	+ out.flush();
	3582	+
	3583	+ baos //zstream
	3584	+ .close();
	3585	+ out.close();
	3586	+
	3587	+ byte[] bytes = baos.toByteArray();
	3588	+
	3589	+ System.out.println("save #bytes = " + bytes.length);
	3590	+ return bytes;
	3591	+ } catch (Exception e)
	3592	+ {
	3593	+ System.err.println(e);
	3594	+ return null;
	3595	+ }
	3596	+ }
	3597	+
	3598	+ static public Object Uncompress(byte[] bytes)
	3599	+ {
	3600	+ System.out.println("restore #bytes = " + bytes.length);
	3601	+ try
	3602	+ {
	3603	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3604	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3605	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3606	+ Object obj = in.readObject();
	3607	+
	3608	+ bais //istream
	3609	+ .close();
	3610	+ in.close();
	3611	+
	3612	+ return obj;
	3613	+ } catch (Exception e)
	3614	+ {
	3615	+ System.err.println(e);
	3616	+ return null;
	3617	+ }
	3618	+ }
	3619	+
	3620	+ static public Object clone(Object o)
	3621	+ {
	3622	+ try
	3623	+ {
	3624	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3625	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3626	+
	3627	+ out.writeObject(o);
	3628	+
	3629	+ out.flush();
	3630	+ out.close();
	3631	+
	3632	+ byte[] bytes = baos.toByteArray();
	3633	+
	3634	+ System.out.println("clone = " + bytes.length);
	3635	+
	3636	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3637	+ ObjectInputStream in = new ObjectInputStream(bais);
	3638	+ Object obj = in.readObject();
	3639	+ in.close();
	3640	+
	3641	+ return obj;
	3642	+ } catch (Exception e)
	3643	+ {
	3644	+ System.err.println(e);
	3645	+ return null;
	3646	+ }
	3647	+ }
	3648	+
	3649	+ cRadio GetCurrentTab()
	3650	+ {
	3651	+ cRadio ab;
	3652	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3653	+ {
	3654	+ ab = (cRadio)e.nextElement();
	3655	+ if(ab.GetObject() == copy)
	3656	+ {
	3657	+ return ab;
	3658	+ }
	3659	+ }
	3660	+
	3661	+ return null;
	3662	+ }
	3663	+
	3664	+
	3665	+ public void Save()
	3666	+ {
	3667	+ //Save(true);
	3668	+ Replace();
	3669	+ }
	3670	+
	3671	+ private boolean Equal(byte[] compress, byte[] name)
	3672	+ {
	3673	+ if (compress.length != name.length)
	3674	+ {
	3675	+ return false;
	3676	+ }
	3677	+
	3678	+ for (int i=compress.length; --i>=0;)
	3679	+ {
	3680	+ if (compress[i] != name[i])
	3681	+ return false;
	3682	+ }
	3683	+
	3684	+ return true;
	3685	+ }
	3686	+
	3687	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3688	+
	3689	+ public boolean Save(boolean user)
	3690	+ {
	3691	+ System.err.println("Save");
	3692	+
	3693	+ cRadio tab = GetCurrentTab();
	3694	+
	3695	+ byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
	3696	+
	3697	+ boolean thesame = false;
	3698	+
	3699	+ // Quick heuristic using length. Works only when stream is compressed.
	3700	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3701	+ {
	3702	+ thesame = true;
	3703	+ }
	3704	+
	3705	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3706	+ if (!thesame)
	3707	+ {
	3708	+ //tab.user[tab.versionindex] = user;
	3709	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3710	+
	3711	+ copy.versions[++copy.versionindex] = compress;
	3712	+
	3713	+ // if (increment)
	3714	+ // tab.versionindex++;
	3715	+ }
	3716	+
	3717	+ //copy.RestoreBigData(versiontable);
	3718	+
	3719	+ //assert(hashtable.isEmpty());
	3720	+
	3721	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3722	+ {
	3723	+ //tab.user[i] = false;
	3724	+ copy.versions[i] = null;
	3725	+ }
	3726	+
	3727	+ SetUndoStates();
	3728	+
	3729	+ // test save
	3730	+ if (false)
	3731	+ {
	3732	+ try
	3733	+ {
	3734	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3735	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3736	+
	3737	+ p.writeObject(copy);
	3738	+
	3739	+ p.flush();
	3740	+
	3741	+ ostream.close();
	3742	+ } catch (Exception e)
	3743	+ {
	3744	+ e.printStackTrace();
	3745	+ }
	3746	+ }
	3747	+
	3748	+ return !thesame;
	3749	+ }
	3750	+
	3751	+ void CopyChanged(Object3D obj)
	3752	+ {
	3753	+ SetUndoStates();
	3754	+
	3755	+ boolean temp = CameraPane.SWITCH;
	3756	+ CameraPane.SWITCH = false;
	3757	+
	3758	+ copy.ExtractBigData(versiontable);
	3759	+
	3760	+ copy.clear();
	3761	+
	3762	+ copy.skyboxname = obj.skyboxname;
	3763	+ copy.skyboxext = obj.skyboxext;
	3764	+
	3765	+ for (int i=0; i<obj.Size(); i++)
	3766	+ {
	3767	+ copy.add(obj.get(i));
	3768	+ }
	3769	+
	3770	+ copy.RestoreBigData(versiontable);
	3771	+
	3772	+ CameraPane.SWITCH = temp;
	3773	+
	3774	+ //assert(hashtable.isEmpty());
	3775	+
	3776	+ copy.Touch();
	3777	+
	3778	+ ResetModel();
	3779	+ copy.HardTouch(); // recompile?
	3780	+
	3781	+ cRadio ab;
	3782	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3783	+ {
	3784	+ ab = (cRadio)e.nextElement();
	3785	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3786	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3787	+ if (test != null)
	3788	+ {
	3789	+ test.editWindow = ab.object.editWindow;
	3790	+ ab.object = test;
	3791	+ }
	3792	+ }
	3793	+
	3794	+ refreshContents();
	3795	+ }
	3796	+
	3797	+ cButton undoButton;
	3798	+ cButton restoreButton;
	3799	+ cButton replaceButton;
	3800	+ cButton redoButton;
	3801	+
	3802	+ boolean muteSlider;
	3803	+
	3804	+ int VersionCount()
	3805	+ {
	3806	+ int count = 0;
	3807	+
	3808	+ for (int i = copy.versions.length; --i >= 0;)
	3809	+ {
	3810	+ if (copy.versions[i] != null)
	3811	+ count++;
	3812	+ }
	3813	+
	3814	+ return count;
	3815	+ }
	3816	+
	3817	+ void SetUndoStates()
	3818	+ {
	3819	+ cRadio tab = GetCurrentTab();
	3820	+
	3821	+ restoreButton.setEnabled(copy.versionindex != -1);
	3822	+ replaceButton.setEnabled(copy.versionindex != -1);
	3823	+
	3824	+ undoButton.setEnabled(copy.versionindex > 0);
	3825	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3826	+
	3827	+ muteSlider = true;
	3828	+ versionSlider.setMaximum(VersionCount() - 1);
	3829	+ versionSlider.setInteger(copy.versionindex);
	3830	+ muteSlider = false;
	3831	+ }
	3832	+
	3833	+ public boolean Undo()
	3834	+ {
	3835	+ // Option?
	3836	+ Replace();
	3837	+
	3838	+ System.err.println("Undo");
	3839	+
	3840	+ cRadio tab = GetCurrentTab();
	3841	+
	3842	+ if (copy.versionindex == 0)
	3843	+ {
	3844	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3845	+ return false;
	3846	+ }
	3847	+
	3848	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3849	+// {
	3850	+// if (Save(false))
	3851	+// tab.versionindex -= 1;
	3852	+// else
	3853	+// {
	3854	+// if (tab.versionindex <= 0)
	3855	+// return false;
	3856	+// else
	3857	+// tab.versionindex -= 1;
	3858	+// }
	3859	+// }
	3860	+
	3861	+ copy.versionindex -= 1;
	3862	+
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3864	+
	3865	+ return true;
	3866	+ }
	3867	+
	3868	+ public boolean Restore()
	3869	+ {
	3870	+ System.err.println("Restore");
	3871	+
	3872	+ cRadio tab = GetCurrentTab();
	3873	+
	3874	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3875	+ {
	3876	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3877	+ return false;
	3878	+ }
	3879	+
	3880	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3881	+
	3882	+ return true;
	3883	+ }
	3884	+
	3885	+ public boolean Replace()
	3886	+ {
	3887	+ System.err.println("Replace");
	3888	+
	3889	+ cRadio tab = GetCurrentTab();
	3890	+
	3891	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3892	+ {
	3893	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3894	+ return false;
	3895	+ }
	3896	+
	3897	+ copy.versions[copy.versionindex] = CompressCopy();
	3898	+
	3899	+ return true;
	3900	+ }
	3901	+
	3902	+ public void Redo()
	3903	+ {
	3904	+ // Option?
	3905	+ Replace();
	3906	+
	3907	+ cRadio tab = GetCurrentTab();
	3908	+
	3909	+ if (copy.versions[copy.versionindex + 1] == null)
	3910	+ {
	3911	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3912	+ return;
	3913	+ }
	3914	+
	3915	+ copy.versionindex += 1;
	3916	+
	3917	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3918	+
	3919	+ //if (!tab.user[tab.versionindex])
	3920	+ // tab.graphs[tab.versionindex] = null;
	3921	+ }
	3922	+
	3923	+ void ImportGFD()
	3924	+ {
	3925	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3926	+ browser.show();
	3927	+ String filename = browser.getFile();
	3928	+ if (filename != null && filename.length() > 0)
	3929	+ {
	3930	+ String fullname = browser.getDirectory() + filename;
	3931	+
	3932	+ //Object3D readobj =
	3933	+ objEditor.ReadGFD(fullname, objEditor);
	3934	+ //makeSomething(readobj);
	3935	+ }
	3936	+ }
	3937	+
	3938	+ void ImportVRMLX3D()
	3939	+ {
	3940	+ if (Grafreed.standAlone)
	3941	+ {
	3942	+ /**/
	3943	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3944	+ browser.show();
	3945	+ String filename = browser.getFile();
	3946	+ if (filename != null && filename.length() > 0)
	3947	+ {
	3948	+ String fullname = browser.getDirectory() + filename;
	3949	+ LoadVRMLX3D(fullname);
	3950	+ }
	3951	+ /**/
	3952	+ }
	3953	+ }
	3954	+
3320	3955	void ToggleAnimation()
3321	3956	{
3322	3957	if (!Globals.ANIMATION)
3323	3958	{
3324	3959	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3325		- browser.show();
	3960	+ browser.setVisible(true);
3326	3961	String filename = browser.getFile();
3327	3962	if (filename != null && filename.length() > 0)
3328	3963	{
..	..	@@ -3332,8 +3967,8 @@
3332	3967
3333	3968	Globals.ANIMATION ^= true;
3334	3969
3335		- GrafreeD.wav.cursor = 0;
3336		- GrafreeD.wav.loop = 0;
	3970	+ Grafreed.wav.cursor = 0;
	3971	+ Grafreed.wav.loop = 0;
3337	3972	}
3338	3973	} else
3339	3974	{
..	..	@@ -3383,7 +4018,7 @@
3383	4018	void CreateMaterial()
3384	4019	{
3385	4020	//copy.ClearMaterial(); // PATCH
3386		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4021	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3387	4022	if (copy.selection.size() > 0)
3388	4023	//SetMaterial(copy);
3389	4024	{
..	..	@@ -3434,7 +4069,7 @@
3434	4069	assert false;
3435	4070	}
3436	4071
3437		- void EditSelection()
	4072	+ void EditSelection(boolean newWindow)
3438	4073	{
3439	4074	}
3440	4075
..	..	@@ -3442,11 +4077,11 @@
3442	4077	{
3443	4078	copy.ResetBlockLoop(); // temporary problem
3444	4079
3445		- boolean random = CameraPane.RANDOM;
3446		- CameraPane.RANDOM = false; // parse everything
	4080	+ boolean random = CameraPane.SWITCH;
	4081	+ CameraPane.SWITCH = false; // parse everything
3447	4082	copy.ResetDisplayList();
3448	4083	copy.HardTouch();
3449		- CameraPane.RANDOM = random;
	4084	+ CameraPane.SWITCH = random;
3450	4085	}
3451	4086
3452	4087	// public void applySelf()
..	..	@@ -3516,10 +4151,40 @@
3516	4151	current.fakedepth = (float) fakedepthField.getFloat();
3517	4152	current.shadowbias = (float) shadowbiasField.getFloat();
3518	4153
3519		- if (!NumberSlider.frozen)
	4154	+ if (!cNumberSlider.frozen)
3520	4155	{
3521	4156	//System.out.println("Propagate = " + propagate);
3522	4157	copy.UpdateMaterial(anchor, current, propagate);
	4158	+
	4159	+ if (copy.material != null)
	4160	+ {
	4161	+ cMaterial mat = copy.material;
	4162	+
	4163	+ colorField.SetToolTipValue((mat.color));
	4164	+ modulationField.SetToolTipValue((mat.modulation));
	4165	+ metalnessField.SetToolTipValue((mat.metalness));
	4166	+ diffuseField.SetToolTipValue((mat.diffuse));
	4167	+ specularField.SetToolTipValue((mat.specular));
	4168	+ shininessField.SetToolTipValue((mat.shininess));
	4169	+ shiftField.SetToolTipValue((mat.shift));
	4170	+ ambientField.SetToolTipValue((mat.ambient));
	4171	+ lightareaField.SetToolTipValue((mat.lightarea));
	4172	+ diffusenessField.SetToolTipValue((mat.factor));
	4173	+ velvetField.SetToolTipValue((mat.velvet));
	4174	+ sheenField.SetToolTipValue((mat.sheen));
	4175	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4176	+ backlitField.SetToolTipValue((mat.bump));
	4177	+ anisoField.SetToolTipValue((mat.aniso));
	4178	+ anisoVField.SetToolTipValue((mat.anisoV));
	4179	+ cameraField.SetToolTipValue((mat.cameralight));
	4180	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4181	+ shadowField.SetToolTipValue((mat.shadow));
	4182	+ textureField.SetToolTipValue((mat.texture));
	4183	+ opacityField.SetToolTipValue((mat.opacity));
	4184	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4185	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4186	+ }
	4187	+
3523	4188	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3524	4189	{
3525	4190	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3548,9 +4213,25 @@
3548	4213	//copy.Touch();
3549	4214	}
3550	4215
	4216	+ cNumberSlider versionSlider;
	4217	+
3551	4218	public void stateChanged(ChangeEvent e)
3552	4219	{
3553	4220	// assert(false);
	4221	+ if (e.getSource() == versionSlider)
	4222	+ {
	4223	+ if (muteSlider)
	4224	+ return;
	4225	+
	4226	+ int version = versionSlider.getInteger();
	4227	+
	4228	+ if (copy.versions[version] != null)
	4229	+ {
	4230	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4231	+ }
	4232	+
	4233	+ return;
	4234	+ }
3554	4235
3555	4236	if (freezematerial)
3556	4237	{
..	..	@@ -3564,6 +4245,7 @@
3564	4245	\|\| e.getSource() == apertureField
3565	4246	\|\| e.getSource() == shadowblurField)
3566	4247	{
	4248	+ new Exception().printStackTrace();
3567	4249	System.exit(0);
3568	4250	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3569	4251	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3634,7 +4316,7 @@
3634	4316	}
3635	4317
3636	4318	if (normalpushField != null)
3637		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4319	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3638	4320	}
3639	4321
3640	4322	void SnapObject()
..	..	@@ -3889,7 +4571,7 @@
3889	4571
3890	4572	radioPanel.revalidate();
3891	4573	radioPanel.repaint();
3892		- ctrlPanel.revalidate(); // ? new
	4574	+ ctrlPanel.validate(); // ? new
3893	4575	ctrlPanel.repaint();
3894	4576	}
3895	4577	}
..	..	@@ -3898,6 +4580,8 @@
3898	4580
3899	4581	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3900	4582	{
	4583	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4584	+ Save();
3901	4585	//Tween.set(thing, 0).target(1).start(tweenManager);
3902	4586	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3903	4587	// if (thing instanceof GenericJointDemo)
..	..	@@ -3984,6 +4668,12 @@
3984	4668	{
3985	4669	ResetModel();
3986	4670	Select(thing.GetTreePath(), true, false); // unselect... false);
	4671	+
	4672	+ if (thing.Size() == 0)
	4673	+ {
	4674	+ //EditSelection(false);
	4675	+ }
	4676	+
3987	4677	refreshContents();
3988	4678	}
3989	4679
..	..	@@ -4101,6 +4791,7 @@
4101	4791	}
4102	4792	}
4103	4793	}
	4794	+
4104	4795	LoadGFDThread loadGFDThread;
4105	4796
4106	4797	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4120,8 +4811,10 @@
4120	4811
4121	4812	try
4122	4813	{
	4814	+ // Try compressed version first.
4123	4815	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4124		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4816	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4817	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4125	4818
4126	4819	readobj = (Object3D) p.readObject();
4127	4820	istream.close();
..	..	@@ -4129,7 +4822,22 @@
4129	4822	readobj.ResetDisplayList();
4130	4823	} catch (Exception e)
4131	4824	{
4132		- e.printStackTrace();
	4825	+ if (!e.toString().contains("GZIP"))
	4826	+ e.printStackTrace();
	4827	+
	4828	+ try
	4829	+ {
	4830	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4831	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4832	+
	4833	+ readobj = (Object3D) p.readObject();
	4834	+ istream.close();
	4835	+
	4836	+ readobj.ResetDisplayList();
	4837	+ } catch (Exception e2)
	4838	+ {
	4839	+ e2.printStackTrace();
	4840	+ }
4133	4841	}
4134	4842	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4135	4843	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4175,6 +4883,12 @@
4175	4883
4176	4884	void LoadIt(Object obj)
4177	4885	{
	4886	+ if (obj == null)
	4887	+ {
	4888	+ // Invalid file
	4889	+ return;
	4890	+ }
	4891	+
4178	4892	System.out.println("Loaded " + obj);
4179	4893	//new Exception().printStackTrace();
4180	4894	Object3D readobj = (Object3D) obj;
..	..	@@ -4184,10 +4898,14 @@
4184	4898
4185	4899	if (readobj != null)
4186	4900	{
	4901	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4902	+ // Save();
4187	4903	try
4188	4904	{
4189	4905	//readobj.deepCopySelf(copy);
4190	4906	copy.clear(); // june 2014
	4907	+ copy.skyboxname = readobj.skyboxname;
	4908	+ copy.skyboxext = readobj.skyboxext;
4191	4909	for (int i = 0; i < readobj.size(); i++)
4192	4910	{
4193	4911	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4228,6 +4946,7 @@
4228	4946	}
4229	4947	} catch (ClassCastException e)
4230	4948	{
	4949	+ e.printStackTrace();
4231	4950	assert (false);
4232	4951	Composite c = (Composite) copy;
4233	4952	c.children.clear();
..	..	@@ -4238,15 +4957,26 @@
4238	4957	c.addChild(csg);
4239	4958	}
4240	4959
	4960	+ copy.versions = readobj.versions;
	4961	+ copy.versionindex = readobj.versionindex;
	4962	+
	4963	+ if (copy.versions == null)
	4964	+ {
	4965	+ copy.versions = new byte[100][];
	4966	+ copy.versionindex = -1;
	4967	+ }
	4968	+
	4969	+ //? SetUndoStates();
	4970	+
4241	4971	ResetModel();
4242	4972	copy.HardTouch(); // recompile?
4243	4973	refreshContents();
4244	4974	}
4245	4975	}
4246	4976
4247		- void load() // throws ClassNotFoundException
	4977	+ void Open() // throws ClassNotFoundException
4248	4978	{
4249		- if (GrafreeD.standAlone)
	4979	+ if (Grafreed.standAlone)
4250	4980	{
4251	4981	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4252	4982	browser.show();
..	..	@@ -4333,11 +5063,13 @@
4333	5063	try
4334	5064	{
4335	5065	FileOutputStream ostream = new FileOutputStream(lastname);
4336		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5066	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5067	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4337	5068
4338	5069	p.writeObject(copy);
4339	5070	p.flush();
4340	5071
	5072	+ zstream.close();
4341	5073	ostream.close();
4342	5074
4343	5075	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4345,19 +5077,23 @@
4345	5077	//ps.print(buffer.toString());
4346	5078	} catch (IOException e)
4347	5079	{
	5080	+ e.printStackTrace();
4348	5081	}
4349	5082	}
	5083	+
4350	5084	String lastname;
4351	5085
4352	5086	void saveAs()
4353	5087	{
4354		- if (GrafreeD.standAlone)
	5088	+ if (Grafreed.standAlone)
4355	5089	{
4356	5090	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4357	5091	browser.setVisible(true);
4358	5092	String filename = browser.getFile();
4359	5093	if (filename != null && filename.length() > 0)
4360	5094	{
	5095	+ if (!filename.endsWith(".gfd"))
	5096	+ filename += ".gfd";
4361	5097	lastname = browser.getDirectory() + filename;
4362	5098	save();
4363	5099	}
..	..	@@ -4456,13 +5192,13 @@
4456	5192	try
4457	5193	{
4458	5194	FileOutputStream ostream = new FileOutputStream(filename);
4459		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4460		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5195	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5196	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4461	5197
4462	5198	Object3D objectparent = obj.parent;
4463	5199	obj.parent = null;
4464	5200
4465		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5201	+ Object3D object = (Object3D) Grafreed.clone(obj);
4466	5202
4467	5203	obj.parent = objectparent;
4468	5204
..	..	@@ -4474,8 +5210,8 @@
4474	5210	p.writeObject(object);
4475	5211	p.flush();
4476	5212
	5213	+ zstream.close();
4477	5214	ostream.close();
4478		- // zstream.close();
4479	5215
4480	5216	// group.selection.get(0).parent = parent;
4481	5217	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4496,7 +5232,7 @@
4496	5232	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4497	5233	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4498	5234	copy.generatePOV(buffer);
4499		- if (GrafreeD.standAlone)
	5235	+ if (Grafreed.standAlone)
4500	5236	{
4501	5237	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4502	5238	browser.show();
..	..	@@ -4522,21 +5258,20 @@
4522	5258	Object3D client;
4523	5259	Object3D copy;
4524	5260	MenuBar menuBar;
4525		- Menu windowMenu;
4526		- MenuItem loadItem;
	5261	+ Menu fileMenu;
	5262	+ MenuItem newItem;
	5263	+ MenuItem openItem;
4527	5264	MenuItem saveItem;
4528	5265	MenuItem saveAsItem;
4529	5266	MenuItem exportAsItem;
4530	5267	MenuItem reexportItem;
4531	5268	MenuItem povItem;
4532	5269	MenuItem closeItem;
4533		- Menu cameraMenu;
	5270	+
4534	5271	CheckboxMenuItem zBufferItem;
4535	5272	//MenuItem normalLensItem;
4536		- MenuItem editCameraItem;
4537		- MenuItem revertCameraItem;
4538		- CheckboxMenuItem toggleLiveItem;
4539	5273	MenuItem stepItem;
	5274	+ CheckboxMenuItem toggleLiveItem;
4540	5275	CheckboxMenuItem toggleFullScreenItem;
4541	5276	CheckboxMenuItem toggleTimelineItem;
4542	5277	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4545,25 +5280,39 @@
4545	5280	CheckboxMenuItem toggleFootContactItem;
4546	5281	CheckboxMenuItem toggleDLItem;
4547	5282	CheckboxMenuItem toggleTextureItem;
4548		- CheckboxMenuItem toggleRandomItem;
	5283	+ CheckboxMenuItem toggleSwitchItem;
4549	5284	CheckboxMenuItem toggleRootItem;
4550	5285	CheckboxMenuItem animationItem;
	5286	+ MenuItem archiveItem;
4551	5287	CheckboxMenuItem toggleHandleItem;
4552	5288	CheckboxMenuItem togglePaintItem;
4553	5289	JSplitPane mainPanel;
4554	5290	JScrollPane scrollpane;
	5291	+
4555	5292	JPanel toolbarPanel;
4556		- JPanel treePanel;
	5293	+
	5294	+ cGridBag treePanel;
	5295	+
4557	5296	JPanel radioPanel;
4558	5297	ButtonGroup buttonGroup;
4559		- JPanel ctrlPanel;
4560		- JPanel materialPanel;
	5298	+
	5299	+ cGridBag toolboxPanel;
	5300	+ cGridBag materialPanel;
	5301	+ cGridBag ctrlPanel;
	5302	+
4561	5303	JScrollPane infoPanel;
4562		- JPanel optionsPanel;
	5304	+
	5305	+ cGridBag optionsPanel;
	5306	+
4563	5307	JTabbedPane objectPanel;
	5308	+ boolean materialFlushed;
	5309	+ Object3D latestObject;
	5310	+
4564	5311	cGridBag XYZPanel;
	5312	+
4565	5313	JSplitPane gridPanel;
4566	5314	JSplitPane bigPanel;
	5315	+
4567	5316	cGridBag bigThree;
4568	5317	cGridBag scenePanel;
4569	5318	cGridBag centralPanel;
..	..	@@ -4619,67 +5368,72 @@
4619	5368	// MATERIAL
4620	5369	JLabel materialLabel;
4621	5370	JLabel colorLabel;
4622		- NumberSlider colorField;
	5371	+ cNumberSlider colorField;
4623	5372	JLabel modulationLabel;
4624		- NumberSlider modulationField;
	5373	+ cNumberSlider modulationField;
4625	5374	JLabel metalnessLabel;
4626		- NumberSlider metalnessField;
	5375	+ cNumberSlider metalnessField;
4627	5376	JLabel diffuseLabel;
4628		- NumberSlider diffuseField;
	5377	+ cNumberSlider diffuseField;
4629	5378	JLabel specularLabel;
4630		- NumberSlider specularField;
	5379	+ cNumberSlider specularField;
4631	5380	JLabel shininessLabel;
4632		- NumberSlider shininessField;
	5381	+ cNumberSlider shininessField;
4633	5382	JLabel shiftLabel;
4634		- NumberSlider shiftField;
	5383	+ cNumberSlider shiftField;
4635	5384	JLabel ambientLabel;
4636		- NumberSlider ambientField;
	5385	+ cNumberSlider ambientField;
4637	5386	JLabel lightareaLabel;
4638		- NumberSlider lightareaField;
	5387	+ cNumberSlider lightareaField;
4639	5388	JLabel diffusenessLabel;
4640		- NumberSlider diffusenessField;
	5389	+ cNumberSlider diffusenessField;
4641	5390	JLabel velvetLabel;
4642		- NumberSlider velvetField;
	5391	+ cNumberSlider velvetField;
4643	5392	JLabel sheenLabel;
4644		- NumberSlider sheenField;
	5393	+ cNumberSlider sheenField;
4645	5394	JLabel subsurfaceLabel;
4646		- NumberSlider subsurfaceField;
	5395	+ cNumberSlider subsurfaceField;
4647	5396	//JLabel bumpLabel;
4648	5397	//NumberSlider bumpField;
4649	5398	JLabel backlitLabel;
4650		- NumberSlider backlitField;
	5399	+ cNumberSlider backlitField;
4651	5400	JLabel anisoLabel;
4652		- NumberSlider anisoField;
	5401	+ cNumberSlider anisoField;
4653	5402	JLabel anisoVLabel;
4654		- NumberSlider anisoVField;
	5403	+ cNumberSlider anisoVField;
4655	5404	JLabel cameraLabel;
4656		- NumberSlider cameraField;
	5405	+ cNumberSlider cameraField;
4657	5406	JLabel selfshadowLabel;
4658		- NumberSlider selfshadowField;
	5407	+ cNumberSlider selfshadowField;
4659	5408	JLabel shadowLabel;
4660		- NumberSlider shadowField;
	5409	+ cNumberSlider shadowField;
4661	5410	JLabel textureLabel;
4662		- NumberSlider textureField;
	5411	+ cNumberSlider textureField;
4663	5412	JLabel opacityLabel;
4664		- NumberSlider opacityField;
	5413	+ cNumberSlider opacityField;
4665	5414	JLabel fakedepthLabel;
4666		- NumberSlider fakedepthField;
	5415	+ cNumberSlider fakedepthField;
4667	5416	JLabel shadowbiasLabel;
4668		- NumberSlider shadowbiasField;
	5417	+ cNumberSlider shadowbiasField;
4669	5418	JLabel bumpLabel;
4670		- NumberSlider bumpField;
	5419	+ cNumberSlider bumpField;
4671	5420	JLabel noiseLabel;
4672		- NumberSlider noiseField;
	5421	+ cNumberSlider noiseField;
4673	5422	JLabel powerLabel;
4674		- NumberSlider powerField;
	5423	+ cNumberSlider powerField;
4675	5424	JLabel borderfadeLabel;
4676		- NumberSlider borderfadeField;
	5425	+ cNumberSlider borderfadeField;
4677	5426	JLabel fogLabel;
4678		- NumberSlider fogField;
	5427	+ cNumberSlider fogField;
4679	5428	JLabel opacityPowerLabel;
4680		- NumberSlider opacityPowerField;
4681		- JTree jTree;
	5429	+ cNumberSlider opacityPowerField;
	5430	+ cTree jTree;
4682	5431	//ObjectUI parent;
4683	5432
4684		- NumberSlider normalpushField;
	5433	+ cNumberSlider normalpushField;
	5434	+
	5435	+ private MenuItem importGFDItem;
	5436	+ private MenuItem importVRMLX3DItem;
	5437	+ private MenuItem import3DSItem;
	5438	+ private MenuItem importOBJItem;
4685	5439	}