~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -28,7 +34,153 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ public cToggleButton pinButton;
	38	+ boolean timeline;
	39	+ boolean wasFullScreen;
31	40
	41	+ GroupEditor callee;
	42	+ JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
	90	+ public cGridBag GetSeparator()
	91	+ {
	92	+ cGridBag separator = new cGridBag();
	93	+ separator.add(new JSeparator());
	94	+ separator.preferredHeight = 5;
	95	+ return separator;
	96	+ }
	97	+
	98	+ cButton GetButton(String name, boolean border)
	99	+ {
	100	+ ImageIcon icon = GetIcon(name);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
	111	+ }
	112	+
	113	+ cToggleButton GetToggleButton(String name, boolean border)
	114	+ {
	115	+ ImageIcon icon = GetIcon(name);
	116	+ return new cToggleButton(icon, border);
	117	+ }
	118	+
	119	+ cCheckBox GetCheckBox(String name, boolean border)
	120	+ {
	121	+ ImageIcon icon = GetIcon(name);
	122	+ return new cCheckBox(icon, border);
	123	+ }
	124	+
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
	128	+ {
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
	135	+ try
	136	+ {
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
	145	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	146	+// {
	147	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	148	+// Graphics2D g = resized.createGraphics();
	149	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	150	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	151	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	152	+// g.dispose();
	153	+//
	154	+// image = resized;
	155	+// }
	156	+
	157	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
	161	+ return icon;
	162	+ }
	163	+ catch (Exception e)
	164	+ {
	165	+ //icons.put(name, null);
	166	+ return null;
	167	+ }
	168	+ }
	169	+
	170	+ BufferedImage GetImage(String name)
	171	+ {
	172	+ try
	173	+ {
	174	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	175	+
	176	+ return image;
	177	+ }
	178	+ catch (Exception e)
	179	+ {
	180	+ return null;
	181	+ }
	182	+ }
	183	+
32	184	// SCRIPT
33	185
34	186	transient JFrame textpanel = null;
..	..	@@ -119,51 +271,62 @@
119	271	void keyPressed(int key, int modifiers)
120	272	{
121	273	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	274	+ Globals.theRenderer.keyPressed(key, modifiers);
123	275	}
124	276	*/
125	277
126	278	static GridBagConstraints aConstraints;
127	279	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	280	+
130	281	static int GRIDWIDTH = 100; // 4;
131	282
132	283	public void closeUI()
133	284	{
134	285	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	286	+// System.out.println("this = " + this);
	287	+// System.out.println("objEditor = " + objEditor);
137	288	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	289	+// objEditor.ctrlPanel.remove(nameField);
139	290
140		- if (!GroupEditor.allparams)
	291	+ objEditor.ctrlPanel.remove(namePanel);
	292	+
	293	+ if (!allparams)
141	294	return;
142	295
143		- objEditor.ctrlPanel.remove(liveCB);
144		- objEditor.ctrlPanel.remove(hideCB);
145		- objEditor.ctrlPanel.remove(markCB);
146		-
147		- objEditor.ctrlPanel.remove(randomCB);
148		- objEditor.ctrlPanel.remove(speedupCB);
149		- objEditor.ctrlPanel.remove(rewindCB);
150		-
151		- objEditor.ctrlPanel.remove(resetButton);
152		- objEditor.ctrlPanel.remove(stepButton);
153		-// objEditor.ctrlPanel.remove(stepAllButton);
154		-// objEditor.ctrlPanel.remove(resetAllButton);
155		- objEditor.ctrlPanel.remove(link2masterCB);
156		- //objEditor.ctrlPanel.remove(flipVCB);
157		- //objEditor.ctrlPanel.remove(texresMenu);
158		- objEditor.ctrlPanel.remove(slowerButton);
159		- objEditor.ctrlPanel.remove(fasterButton);
160		- objEditor.ctrlPanel.remove(remarkButton);
	296	+// objEditor.ctrlPanel.remove(liveCB);
	297	+// objEditor.ctrlPanel.remove(hideCB);
	298	+// objEditor.ctrlPanel.remove(markCB);
	299	+//
	300	+// objEditor.ctrlPanel.remove(randomCB);
	301	+// objEditor.ctrlPanel.remove(speedupCB);
	302	+// objEditor.ctrlPanel.remove(rewindCB);
	303	+//
	304	+// objEditor.ctrlPanel.remove(resetButton);
	305	+// objEditor.ctrlPanel.remove(stepButton);
	306	+//// objEditor.ctrlPanel.remove(stepAllButton);
	307	+//// objEditor.ctrlPanel.remove(resetAllButton);
	308	+// objEditor.ctrlPanel.remove(link2masterCB);
	309	+// //objEditor.ctrlPanel.remove(flipVCB);
	310	+// //objEditor.ctrlPanel.remove(texresMenu);
	311	+// objEditor.ctrlPanel.remove(slowerButton);
	312	+// objEditor.ctrlPanel.remove(fasterButton);
	313	+// objEditor.ctrlPanel.remove(remarkButton);
	314	+
	315	+ objEditor.ctrlPanel.remove(setupPanel);
	316	+ objEditor.ctrlPanel.remove(setupPanel2);
	317	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	318	+ objEditor.ctrlPanel.remove(pushPanel);
	319	+ //objEditor.ctrlPanel.remove(fillPanel);
	320	+
	321	+ //Remove(normalpushField);
161	322	}
162	323
163	324	public ObjEditor GetEditor()
164	325	{
165	326	return objEditor; //.GetEditor();
166	327	}
	328	+
	329	+ // Sometimes myself, sometimes my callee's.
167	330	ObjEditor objEditor;
168	331
169	332	/*
..	..	@@ -199,6 +362,14 @@
199	362	client = inClient;
200	363	copy = client;
201	364
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
	372	+
202	373	// "this" is not called: SetupUI2(objEditor);
203	374	}
204	375
..	..	@@ -226,23 +397,33 @@
226	397	//localCopy.parent = null;
227	398
228	399	frame = new JFrame();
	400	+ frame.setUndecorated(false);
229	401	objEditor = this;
230	402	this.callee = callee;
231	403
232	404	//parent = p;
233	405
234	406	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
235		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	407	+ if (Globals.DEBUG)
	408	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
236	409	//gd.setFullScreenWindow(this);
237	410	//setResizable(false);
238	411	//if (!isDisplayable())
239	412	//setUndecorated(true);
240	413
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	414	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	415	client = inClient;
243	416	copy = localCopy;
244	417	copy.editWindow = this;
245	418
	419	+// if (copy.versionlist == null)
	420	+// {
	421	+// copy.versionlist = new Object3D[100];
	422	+// copy.versionindex = -1;
	423	+//
	424	+// Save(true);
	425	+// }
	426	+
246	427	SetupMenu();
247	428
248	429	//SetupName(objEditor); // new
..	..	@@ -256,28 +437,55 @@
256	437	return frame.action(event, obj);
257	438	}
258	439
	440	+ // Cannot work without static
	441	+ static boolean allparams = true;
	442	+
	443	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	444	+
	445	+ // This is to refresh the UI of the material panel.
	446	+ boolean patchMaterial;
	447	+
259	448	void SetupMenu()
260	449	{
261	450	frame.setMenuBar(menuBar = new MenuBar());
262		- menuBar.add(windowMenu = new Menu("File"));
263		- windowMenu.add(loadItem = new MenuItem("Load..."));
264		- windowMenu.add("-");
265		- windowMenu.add(saveItem = new MenuItem("Save"));
266		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	451	+ menuBar.add(fileMenu = new Menu("File"));
	452	+ fileMenu.add(newItem = new MenuItem("New"));
	453	+ fileMenu.add(openItem = new MenuItem("Open..."));
	454	+
	455	+ //oe.menuBar.add(menu = new Menu("Include"));
	456	+ Menu menu = new Menu("Import");
	457	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	458	+ importOBJItem.addActionListener(this);
	459	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	460	+ import3DSItem.addActionListener(this);
	461	+ if (Globals.ADVANCED)
	462	+ {
	463	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	464	+ importVRMLX3DItem.addActionListener(this);
	465	+ }
	466	+ menu.add("-");
	467	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	468	+ importGFDItem.addActionListener(this);
	469	+ fileMenu.add(menu);
	470	+ fileMenu.add("-");
	471	+
	472	+ fileMenu.add(saveItem = new MenuItem("Save"));
	473	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	474	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
268		- windowMenu.add("-");
269		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
270		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
271		- windowMenu.add("-");
	475	+ fileMenu.add("-");
	476	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	477	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	478	+ fileMenu.add("-");
272	479	if (client.parent != null)
273	480	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	481	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	482	} else
276	483	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	484	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	485	}
279	486
280		- loadItem.addActionListener(this);
	487	+ newItem.addActionListener(this);
	488	+ openItem.addActionListener(this);
281	489	saveItem.addActionListener(this);
282	490	saveAsItem.addActionListener(this);
283	491	exportAsItem.addActionListener(this);
..	..	@@ -285,80 +493,103 @@
285	493	//povItem.addActionListener(this);
286	494	closeItem.addActionListener(this);
287	495
288		- menuBar.add(cameraMenu = new Menu("View"));
289		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
290		- //zBufferItem.addActionListener(this);
291		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
292		- //normalLensItem.addActionListener(this);
293		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294		- revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
298		- cameraMenu.add("-");
299		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300		- toggleTextureItem.addItemListener(this);
301		- toggleTextureItem.setState(CameraPane.textureon);
302		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303		- toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
305		- cameraMenu.add(stepItem = new MenuItem("Step"));
306		- stepItem.addActionListener(this);
307		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
308		-// toggleDLItem.addItemListener(this);
309		-// toggleDLItem.setState(false);
310		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
311		- toggleRenderItem.addItemListener(this);
312		- toggleRenderItem.setState(!CameraPane.frozen);
313		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
314		- toggleDebugItem.addItemListener(this);
315		- toggleDebugItem.setState(CameraPane.DEBUG);
316		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
317		- toggleFrustumItem.addItemListener(this);
318		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
319		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
320		- toggleFootContactItem.addItemListener(this);
321		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
322		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
323		- toggleRandomItem.addItemListener(this);
324		- toggleRandomItem.setState(CameraPane.RANDOM);
325		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
326		- toggleHandleItem.addItemListener(this);
327		- toggleHandleItem.setState(CameraPane.HANDLES);
328		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
329		- togglePaintItem.addItemListener(this);
330		- togglePaintItem.setState(CameraPane.PAINTMODE);
331		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
332		-// toggleRootItem.addItemListener(this);
333		-// toggleRootItem.setState(false);
334		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
335		-// animationItem.addItemListener(this);
336		-// animationItem.setState(CameraPane.ANIMATION);
337		- cameraMenu.add("-");
338		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
339		- editCameraItem.addActionListener(this);
340		-
341	496	objectPanel = new JTabbedPane();
	497	+
	498	+ ChangeListener changeListener = new ChangeListener()
	499	+ {
	500	+ //String name;
	501	+
	502	+ public void stateChanged(ChangeEvent changeEvent)
	503	+ {
	504	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	505	+// {
	506	+// if (latestObject != null)
	507	+// {
	508	+// refreshContents(true);
	509	+// SetMaterial(latestObject);
	510	+// }
	511	+//
	512	+// materialFlushed = true;
	513	+// }
	514	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	515	+// {
	516	+// if (listUI.size() == 0)
	517	+// EditSelection(false);
	518	+// }
	519	+
	520	+// if (objectPanel.getSelectedIndex() == 4)
	521	+// {
	522	+// name = copy.skyboxname;
	523	+//
	524	+// if (name == null)
	525	+// {
	526	+// name = "";
	527	+// }
	528	+//
	529	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	530	+// copy.skyboxext = "jpg";
	531	+// }
	532	+// else
	533	+// {
	534	+// if (name != null)
	535	+// {
	536	+// if (name.equals(""))
	537	+// {
	538	+// copy.skyboxname = null;
	539	+// copy.skyboxext = null;
	540	+// }
	541	+// else
	542	+// {
	543	+// copy.skyboxname = name;
	544	+// }
	545	+// }
	546	+// }
	547	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	548	+
	549	+// refreshContents(false); // To refresh Info tab
	550	+ cameraView.repaint();
	551	+ }
	552	+ };
	553	+ objectPanel.addChangeListener(changeListener);
	554	+
342	555	toolbarPanel = new JPanel();
343	556	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	557	+
	558	+ treePanel = new cGridBag();
345	559	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
349		- materialPanel.setName("Material");
	560	+
	561	+ editPanel = new cGridBag().setVertical(true);
	562	+ //editPanel.setName("Edit");
	563	+
	564	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	565	+
	566	+ editCommandsPanel = new cGridBag();
	567	+ editPanel.add(editCommandsPanel);
	568	+ editPanel.add(ctrlPanel);
	569	+
	570	+ toolboxPanel = new cGridBag().setVertical(true);
	571	+ //toolboxPanel.setName("Toolbox");
	572	+
	573	+ skyboxPanel = new cGridBag().setVertical(true);
	574	+
	575	+ materialPanel = new cGridBag().setVertical(false);
	576	+ //materialPanel.setName("Material");
	577	+
350	578	/JTextPane/
351	579	infoarea = createTextPane();
	580	+ doc = infoarea.getStyledDocument();
	581	+
352	582	infoarea.setEditable(true);
353	583	SetText();
	584	+
354	585	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	586	// infoarea.setOpaque(false);
356	587	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	588	+// TEXTAREA infoarea.setLineWrap(true);
	589	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	590	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360		- infoPanel.setPreferredSize(new Dimension(50, 200));
361		- infoPanel.setName("Info");
	591	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	592	+ //infoPanel.setName("Info");
362	593	//infoPanel.setLayout(new BorderLayout());
363	594	//infoPanel.add(createTextPane());
364	595
..	..	@@ -366,16 +597,23 @@
366	597	mainPanel.setName("Main");
367	598	mainPanel.setContinuousLayout(true);
368	599	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	600	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
372		-
	601	+ mainPanel.setDividerLocation(0.5); //1.0);
	602	+ mainPanel.setResizeWeight(0.5);
	603	+
	604	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	605	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	606	+ divider.setDividerSize(15);
	607	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	608	+
	609	+ mainPanel.setUI(new BasicSplitPaneUI());
	610	+
373	611	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	612	//mainPanel.setLayout(new GridBagLayout());
375	613	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	614	+// treePanel.setLayout(new GridBagLayout());
	615	+ //ctrlPanel.setLayout(new GridBagLayout());
	616	+ //materialPanel.setLayout(new GridBagLayout());
379	617
380	618	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	619	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +652,7 @@
414	652	static String newline = "\n";
415	653	protected static final String buttonString = "JButton";
416	654	StyledDocument doc;
417		- JTextArea infoarea;
	655	+ JTextPane infoarea;
418	656
419	657	void ClearInfo()
420	658	{
..	..	@@ -437,10 +675,10 @@
437	675	e.printStackTrace();
438	676	}
439	677
440		- String selection = infoarea.getText();
441		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
442		- java.awt.datatransfer.Clipboard clipboard =
443		- Toolkit.getDefaultToolkit().getSystemClipboard();
	678	+// String selection = infoarea.getText();
	679	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	680	+// java.awt.datatransfer.Clipboard clipboard =
	681	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	682	//clipboard.setContents(data, data);
445	683	}
446	684
..	..	@@ -463,13 +701,13 @@
463	701	//SendInfo("Name:", "bold");
464	702	if (sel.GetTextures() != null \|\| debug)
465	703	{
466		- si.SendInfo(sel.toString(), "bold");
	704	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	705	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	706	if (sel.Size() > 0)
469	707	{
470	708	si.SendInfo("#children = " + sel.Size(), "regular");
471	709	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	710	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	711	if (debug)
474	712	{
475	713	try
..	..	@@ -481,7 +719,10 @@
481	719	}
482	720
483	721	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	722	+ {
	723	+ si.SendInfo(" BBox min: " + minima, "regular");
	724	+ si.SendInfo(" BBox max: " + maxima, "regular");
	725	+ }
485	726
486	727	if (sel.bRep != null)
487	728	{
..	..	@@ -508,7 +749,7 @@
508	749	}
509	750	if (sel.support != null)
510	751	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	752	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	753	}
513	754	if (sel.scriptnode != null)
514	755	{
..	..	@@ -522,18 +763,18 @@
522	763	maxima.y = sel.toParent[3][1];
523	764	maxima.z = sel.toParent[3][2];
524	765	si.SendInfo(" Orig: " + maxima, "regular");
525		- maxima.x = sel.globalTransform[3][0];
526		- maxima.y = sel.globalTransform[3][1];
527		- maxima.z = sel.globalTransform[3][2];
528		- if (full)
529		- si.SendInfo(" Global Orig: " + maxima, "regular");
530	766	maxima.x = sel.toParent[0][0];
531	767	maxima.y = sel.toParent[1][1];
532	768	maxima.z = sel.toParent[2][2];
533	769	si.SendInfo(" Scale: " + maxima, "regular");
534		- maxima.x = sel.globalTransform[0][0];
535		- maxima.y = sel.globalTransform[1][1];
536		- maxima.z = sel.globalTransform[2][2];
	770	+ maxima.x = sel.globalTransform[3][0];
	771	+ maxima.y = sel.globalTransform[3][1];
	772	+ maxima.z = sel.globalTransform[3][2];
	773	+ if (full)
	774	+ si.SendInfo(" Global Orig: " + maxima, "regular");
	775	+ maxima.x = sel.globalTransform[0][0];
	776	+ maxima.y = sel.globalTransform[1][1];
	777	+ maxima.z = sel.globalTransform[2][2];
537	778	if (full)
538	779	si.SendInfo(" Global Scale: " + maxima, "regular");
539	780	}
..	..	@@ -579,6 +820,9 @@
579	820	{
580	821	CameraPane.pointflow = (PointFlow) sel;
581	822	}
	823	+
	824	+ si.SendInfo("_____________________", "regular");
	825	+ si.SendInfo("", "regular");
582	826	}
583	827	}
584	828
..	..	@@ -594,52 +838,216 @@
594	838	}
595	839	}
596	840
597		- private JTextArea createTextPane()
598		- {
599		- String[] initString =
600		- {
601		- "This is an editable JTextPane, ", //regular
602		- "another ", //italic
603		- "styled ", //bold
604		- "text ", //small
605		- "component, ", //large
606		- "which supports embedded components..." + newline,//regular
607		- " " + newline, //button
608		- "...and embedded icons..." + newline, //regular
609		- " ", //icon
610		- newline + "JTextPane is a subclass of JEditorPane that "
611		- + "uses a StyledEditorKit and StyledDocument, and provides "
612		- + "cover methods for interacting with those objects."
613		- };
	841	+//static GraphicsDevice device = GraphicsEnvironment
	842	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	843
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	844	+ Rectangle keeprect;
	845	+ cRadio radio;
	846	+
	847	+cButton keepButton;
	848	+ cButton twoButton; // Full 3D
	849	+ cButton sixButton;
	850	+ cButton threeButton;
	851	+ cButton sevenButton;
	852	+ cButton fourButton; // full panel
	853	+ cButton oneButton; // full XYZ
	854	+ //cButton currentLayout;
	855	+
	856	+ boolean maximized;
	857	+
	858	+ cButton fullscreenLayout;
	859	+ cButton expandedLayout;
621	860
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	861	+ void Minimize()
628	862	{
629		- for (int j = 0; j < 2; j++)
	863	+ frame.setState(Frame.ICONIFIED);
	864	+ frame.validate();
	865	+ }
	866	+
	867	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	868	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	869	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	870	+ void Maximize()
	871	+ {
	872	+ if (CameraPane.FULLSCREEN)
630	873	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	874	+ ToggleFullScreen();
636	875	}
637		- } catch (BadLocationException ble)
	876	+
	877	+ if (maximized)
	878	+ {
	879	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	880	+ }
	881	+ else
	882	+ {
	883	+ keeprect = frame.getBounds();
	884	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	885	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	886	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	887	+// frame.setState(Frame.MAXIMIZED_BOTH);
	888	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	889	+ }
	890	+
	891	+ maximized ^= true;
	892	+
	893	+ frame.validate();
	894	+ }
	895	+
	896	+ cButton minButton;
	897	+ cButton maxButton;
	898	+ cButton fullButton;
	899	+ cButton collapseButton;
	900	+ cButton maximize3DButton;
	901	+
	902	+ void ToggleFullScreen()
638	903	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	904	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	905	+
	906	+ cameraView.ToggleFullScreen();
	907	+
	908	+ if (!CameraPane.FULLSCREEN)
	909	+ {
	910	+ device.setFullScreenWindow(null);
	911	+ frame.dispose();
	912	+ frame.setUndecorated(false);
	913	+ frame.validate();
	914	+ frame.setVisible(true);
	915	+
	916	+ //frame.setVisible(false);
	917	+// frame.removeNotify();
	918	+// frame.setUndecorated(false);
	919	+// frame.addNotify();
	920	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	921	+
	922	+// X frame.getContentPane().remove(/"Center",/bigThree);
	923	+// X framePanel.add(bigThree);
	924	+// X frame.getContentPane().add(/"Center",/framePanel);
	925	+// framePanel.setDividerLocation(46); // icons are 24x24
	926	+
	927	+ //frame.setVisible(true);
	928	+// radio.layout = keepButton;
	929	+ //theFrame = null;
	930	+ keepButton = null;
	931	+// radio.layout.doClick();
	932	+
	933	+ } else
	934	+ {
	935	+ keepButton = radio.layout;
	936	+ //keeprect = frame.getBounds();
	937	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	938	+// frame.getToolkit().getScreenSize().height);
	939	+ //frame.setVisible(false);
	940	+
	941	+ frame.dispose();
	942	+ frame.setUndecorated(true);
	943	+ device.setFullScreenWindow(frame);
	944	+ frame.validate();
	945	+ frame.setVisible(true);
	946	+// frame.removeNotify();
	947	+// frame.setUndecorated(true);
	948	+// frame.addNotify();
	949	+// X frame.getContentPane().remove(/"Center",/framePanel);
	950	+// X framePanel.remove(bigThree);
	951	+// X frame.getContentPane().add(/"Center",/bigThree);
	952	+// framePanel.setDividerLocation(0);
	953	+
	954	+// radio.layout = fullscreenLayout;
	955	+// radio.layout.doClick();
	956	+ //frame.setVisible(true);
	957	+ }
	958	+ frame.validate();
	959	+
	960	+ cameraView.requestFocusInWindow();
640	961	}
641	962
642		- return new JTextArea(); // textPane;
	963	+ void CollapseToolbar()
	964	+ {
	965	+ framePanel.setDividerLocation(0);
	966	+ //frame.validate();
	967	+
	968	+ cameraView.requestFocusInWindow();
	969	+ }
	970	+
	971	+ private Object3D Duplicate(Object3D object)
	972	+ {
	973	+ boolean temp = CameraPane.SWITCH;
	974	+ CameraPane.SWITCH = false;
	975	+
	976	+ if (Grafreed.grafreed.universe.versiontable == null)
	977	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	978	+
	979	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	980	+ // if (copy == client)
	981	+
	982	+ Object3D versions[] = object.versionlist;
	983	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	984	+ object.versionlist = null;
	985	+ object.versiontable = null;
	986	+
	987	+ Object3D parent = object.parent;
	988	+ object.parent = null;
	989	+
	990	+ //byte[] compress = Compress(copy);
	991	+ Object3D compress = (Object3D)Grafreed.clone(object);
	992	+
	993	+ object.parent = parent;
	994	+
	995	+ object.versionlist = versions;
	996	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	997	+
	998	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	999	+
	1000	+ CameraPane.SWITCH = temp;
	1001	+
	1002	+ return compress;
	1003	+ }
	1004	+
	1005	+ private JTextPane createTextPane()
	1006	+ {
	1007	+// TEXTAREA String[] initString =
	1008	+// {
	1009	+// "This is an editable JTextPane, ", //regular
	1010	+// "another ", //italic
	1011	+// "styled ", //bold
	1012	+// "text ", //small
	1013	+// "component, ", //large
	1014	+// "which supports embedded components..." + newline,//regular
	1015	+// " " + newline, //button
	1016	+// "...and embedded icons..." + newline, //regular
	1017	+// " ", //icon
	1018	+// newline + "JTextPane is a subclass of JEditorPane that "
	1019	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	1020	+// + "cover methods for interacting with those objects."
	1021	+// };
	1022	+//
	1023	+// String[] initStyles =
	1024	+// {
	1025	+// "regular", "italic", "bold", "small", "large",
	1026	+// "regular", "button", "regular", "icon",
	1027	+// "regular"
	1028	+// };
	1029	+//
	1030	+// JTextPane textPane = new JTextPane();
	1031	+// textPane.setEditable(true);
	1032	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1033	+// addStylesToDocument(doc);
	1034	+//
	1035	+// try
	1036	+// {
	1037	+// for (int j = 0; j < 2; j++)
	1038	+// {
	1039	+// for (int i = 0; i < initString.length; i++)
	1040	+// {
	1041	+// doc.insertString(doc.getLength(), initString[i],
	1042	+// doc.getStyle(initStyles[i]));
	1043	+// }
	1044	+// }
	1045	+// } catch (BadLocationException ble)
	1046	+// {
	1047	+// System.err.println("Couldn't insert initial text into text pane.");
	1048	+// }
	1049	+
	1050	+ return new JTextPane(); // textPane;
643	1051	}
644	1052
645	1053	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +1100,7 @@
692	1100	protected static ImageIcon createImageIcon(String path,
693	1101	String description)
694	1102	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1103	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	1104	if (imgURL != null)
697	1105	{
698	1106	return new ImageIcon(imgURL, description);
..	..	@@ -715,6 +1123,7 @@
715	1123	{
716	1124	SetupMaterial(materialPanel);
717	1125	}
	1126	+
718	1127	//SetupName();
719	1128	//SetupViews();
720	1129	}
..	..	@@ -724,6 +1133,7 @@
724	1133	// NumberSlider vDivsField;
725	1134	// JCheckBox endcaps;
726	1135	JCheckBox liveCB;
	1136	+ JCheckBox selectableCB;
727	1137	JCheckBox hideCB;
728	1138	JCheckBox link2masterCB;
729	1139	JCheckBox markCB;
..	..	@@ -731,7 +1141,12 @@
731	1141	JCheckBox speedupCB;
732	1142	JCheckBox rewindCB;
733	1143	JCheckBox flipVCB;
	1144	+
	1145	+ cCheckBox toggleTextureCB;
	1146	+ cCheckBox toggleSwitchCB;
	1147	+
734	1148	JComboBox texresMenu;
	1149	+
735	1150	JButton resetButton;
736	1151	JButton stepButton;
737	1152	JButton stepAllButton;
..	..	@@ -739,115 +1154,87 @@
739	1154	JButton slowerButton;
740	1155	JButton fasterButton;
741	1156	JButton remarkButton;
	1157	+
	1158	+ cGridBag editPanel;
	1159	+ cGridBag editCommandsPanel;
	1160	+
	1161	+ cGridBag namePanel;
	1162	+ cGridBag setupPanel;
	1163	+ cGridBag setupPanel2;
	1164	+ cGridBag objectCommandsPanel;
	1165	+ cGridBag pushPanel;
	1166	+ cGridBag fillPanel;
742	1167
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1168	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	1169	{
745	1170	JCheckBox cb;
746	1171
747		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
748		- oe.aConstraints.gridwidth = 1; // 3;
749		-// oe.aConstraints.weightx = 1;
750		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
751		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1172	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	1173	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	1174
757	1175	return cb;
758	1176	}
759	1177
760		- cButton AddButton(ObjEditor oe, String label)
	1178	+ cButton AddButton(cGridBag panel, String label)
761	1179	{
762	1180	cButton cb;
763	1181
764		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
765		- oe.aConstraints.gridwidth = 1;
766		-// oe.aConstraints.weightx = 1;
767		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
768		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1182	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	1183	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	1184
774	1185	return cb;
775	1186	}
776	1187
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1188	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	1189	{
779	1190	JComboBox combo;
780	1191
781		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
782		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
783		- oe.aConstraints.gridx += 1;
	1192	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	1193	combo.addActionListener(this);
785	1194
786	1195	return combo;
787	1196	}
788	1197
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1198	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	1199	{
791		- NumberSlider combo;
	1200	+ cGridBag control = new cGridBag();
	1201	+
	1202	+ cNumberSlider combo;
792	1203
793	1204	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	1205	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797		- aConstraints.gridwidth = 2;
798		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799		- aConstraints.gridx += 1;
800		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
801		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- aConstraints.gridx += 1;
804		- aConstraints.gridwidth = 1;
805		-
	1206	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1207	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	1208	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	1209	+
	1210	+ panel.add(control);
	1211	+
	1212	+ return control;
813	1213	}
814	1214
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1215	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	1216	{
817		- NumberSlider combo;
	1217	+ cGridBag control = new cGridBag();
	1218	+
	1219	+ cNumberSlider combo;
818	1220
819	1221	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1222	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 2;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	1223	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1224	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1225	combo.setInteger(current);
833	1226
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1227	+ panel.add(control);
	1228	+
	1229	+ return control;
839	1230	}
840	1231
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1232	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1233	{
843	1234	JTextArea text;
844	1235
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1236	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1237	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1238
852	1239	return text;
853	1240	}
..	..	@@ -877,9 +1264,16 @@
877	1264	objEditor.ctrlPanel.remove(j);
878	1265	}
879	1266
	1267	+ void Remove(cNumberSlider j)
	1268	+ {
	1269	+ j.removeChangeListener(this);
	1270	+ //objEditor.ctrlPanel.remove(j.label);
	1271	+ objEditor.ctrlPanel.remove(j);
	1272	+ }
	1273	+
880	1274	/*
881	1275	*/
882		- void Return() // ObjEditor oe)
	1276	+ void Return0() // ObjEditor oe)
883	1277	{
884	1278	aConstraints.gridy += 1;
885	1279	aConstraints.gridx = 0;
..	..	@@ -934,35 +1328,93 @@
934	1328
935	1329	void SetupUI2(ObjEditor oe)
936	1330	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1331	+ //SetupName(oe);
942	1332
943		- if (!GroupEditor.allparams)
	1333	+ namePanel = new cGridBag();
	1334	+
	1335	+ //if (copy.pinned)
	1336	+ {
	1337	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1338	+ pinButton.setSelected(copy.pinned);
	1339	+ cGridBag t = new cGridBag();
	1340	+ t.preferredWidth = 2;
	1341	+ t.add(pinButton);
	1342	+ namePanel.add(t);
	1343	+
	1344	+ pinButton.addItemListener(this);
	1345	+ }
	1346	+
	1347	+ nameField = AddText(namePanel, copy.GetName());
	1348	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1349	+ oe.ctrlPanel.add(namePanel);
	1350	+
	1351	+ oe.ctrlPanel.Return();
	1352	+
	1353	+ if (!allparams)
944	1354	return;
945	1355
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1356	+ setupPanel = new cGridBag().setVertical(false);
	1357	+
	1358	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1359	+ liveCB.setToolTipText("Animate object");
	1360	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1361	+ markCB.setToolTipText("Set target transform");
	1362	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1363	+ selectableCB.setToolTipText("Make object selectable");
949	1364	// Return();
950		- markCB = AddCheckBox(oe, "Mark", copy.marked);
951		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
952		- randomCB = AddCheckBox(oe, "Rand", copy.random);
953		- Return();
954		- resetButton = AddButton(oe, "Reset");
955		- stepButton = AddButton(oe, "Step");
	1365	+
	1366	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1367	+ hideCB.setToolTipText("Hide object");
	1368	+
	1369	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1370	+
	1371	+ setupPanel2 = new cGridBag().setVertical(false);
	1372	+
	1373	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1374	+ rewindCB.setToolTipText("Rewind animation");
	1375	+
	1376	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1377	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1378	+
	1379	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1380	+ link2masterCB.setToolTipText("Attach to support");
	1381	+
	1382	+ if (Globals.ADVANCED)
	1383	+ {
	1384	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1385	+ speedupCB.setToolTipText("Option motion capture");
	1386	+ }
	1387	+
	1388	+ oe.ctrlPanel.add(setupPanel);
	1389	+ oe.ctrlPanel.Return();
	1390	+ oe.ctrlPanel.add(setupPanel2);
	1391	+ oe.ctrlPanel.Return();
	1392	+
	1393	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1394	+
	1395	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1396	+ resetButton.setToolTipText("Jump to frame zero");
	1397	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1398	+ stepButton.setToolTipText("Step one frame");
956	1399	// resetAllButton = AddButton(oe, "Reset All");
957	1400	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1401	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1402	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1403	+ slowerButton.setToolTipText("Decrease animation speed");
	1404	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1405	+ fasterButton.setToolTipText("Increase animation speed");
	1406	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1407	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1408
964		- Return();
	1409	+ oe.ctrlPanel.add(objectCommandsPanel);
	1410	+ oe.ctrlPanel.Return();
965	1411
	1412	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1413	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1414	+ //Return();
	1415	+
	1416	+ oe.ctrlPanel.Return();
	1417	+
966	1418	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1419	// ObjEditor.aConstraints.gridx += 1;
968	1420
..	..	@@ -1056,7 +1508,7 @@
1056	1508	oe.aConstraints.gridwidth = 1;
1057	1509	/**/
1058	1510	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1511	+ oe.ctrlPanel.Return();
1060	1512
1061	1513	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1514	//textureButton.setEnabled(false);
..	..	@@ -1114,22 +1566,9 @@
1114	1566
1115	1567	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1116	1568	{
1117		- System.out.println("CREATE CAMERAS");
1118		- cams = new cTemplate();
1119		- cams.name = "Cameras";
1120		- copy.insertElementAt(cams, 0);
1121		- //cams.parent = copy;
1122		-
1123		- cam = new Camera(); // LA.newVector(3, 2, 1));
1124		- cams.addChild(cam);
1125		- cam = new Camera(1);
1126		- cams.addChild(cam);
1127		- cam = new Camera(2);
1128		- cams.addChild(cam);
1129		- cam = new Camera(3);
1130		- cams.addChild(cam);
1131		- cam = new Camera(4); // Light
1132		- cams.addChild(cam);
	1569	+ if (Globals.DEBUG)
	1570	+ System.out.println("CREATE CAMERAS");
	1571	+ cams = CreateCameras();
1133	1572	} else
1134	1573	{
1135	1574	cams = (cGroup) copy.get(0);
..	..	@@ -1158,10 +1597,28 @@
1158	1597	//JPanel worldPanel =
1159	1598	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1599	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1600	+ centralPanel = new cGridBag();
	1601	+ centralPanel.preferredWidth = 20;
	1602	+
	1603	+ if (Globals.ADVANCED)
	1604	+ {
	1605	+ timelinePanel = new JPanel(new BorderLayout());
	1606	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1607
	1608	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1609	+ cameraPanel.setContinuousLayout(true);
	1610	+ cameraPanel.setOneTouchExpandable(true);
	1611	+// cameraPanel.setDividerLocation(0.9);
	1612	+// cameraPanel.setDividerSize(9);
	1613	+ cameraPanel.setResizeWeight(1.0);
	1614	+
	1615	+ }
	1616	+
	1617	+ centralPanel.add(cameraView);
	1618	+ centralPanel.setFocusable(true);
	1619	+ //frame.setJMenuBar(timelineMenubar);
	1620	+ //centralPanel.add(timelinePanel);
	1621	+
1165	1622	//topView.camera = ;
1166	1623	//frontView.camera = new Camera(2);
1167	1624	//sideView.camera = new Camera(3);
..	..	@@ -1177,13 +1634,57 @@
1177	1634	//frontView.object = copy;
1178	1635	//sideView.object = copy;
1179	1636
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1637	+ transformPanel = new cGridBag().setVertical(true);
	1638	+
	1639	+ cGridBag resetTransformPanel = new cGridBag();
	1640	+
	1641	+ resetTransformPanel.preferredHeight = 2;
	1642	+
	1643	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1644	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1645	+ resetTransform.addMouseListener(new MouseAdapter()
	1646	+ {
	1647	+ public void mouseClicked(MouseEvent e)
	1648	+ {
	1649	+ ResetTransform();
	1650	+ }
	1651	+ });
	1652	+ resetTransformPanel.add(resetTransform);
	1653	+
	1654	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1655	+ resetTransform.setToolTipText("Reset Translation only");
	1656	+ resetTransform.addMouseListener(new MouseAdapter()
	1657	+ {
	1658	+ public void mouseClicked(MouseEvent e)
	1659	+ {
	1660	+ ResetTransform(1);
	1661	+ }
	1662	+ });
	1663	+ resetTransformPanel.add(resetTransform);
	1664	+
	1665	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1666	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1667	+ resetTransform.addMouseListener(new MouseAdapter()
	1668	+ {
	1669	+ public void mouseClicked(MouseEvent e)
	1670	+ {
	1671	+ ResetTransform(2);
	1672	+ }
	1673	+ });
	1674	+ resetTransformPanel.add(resetTransform);
	1675	+
	1676	+ XYZPanel = new cGridBag().setVertical(true);
	1677	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1678
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1679	+ XYZPanel.preferredWidth = 5;
	1680	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1681	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1682	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1683	+ //XYZPanel.setName("XYZ");
1186	1684
	1685	+ transformPanel.add(resetTransformPanel);
	1686	+ transformPanel.add(XYZPanel);
	1687	+
1187	1688	/*
1188	1689	gridPanel = new JPanel(); //new BorderLayout());
1189	1690	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1191,12 +1692,12 @@
1191	1692	gridPanel.add(cameraView);
1192	1693	gridPanel.add(XYZPanel);
1193	1694	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1195		- gridPanel.setContinuousLayout(true);
1196		- gridPanel.setOneTouchExpandable(true);
1197		- gridPanel.setDividerLocation(1.0);
1198		- gridPanel.setDividerSize(9);
1199		- gridPanel.setResizeWeight(0.85);
	1695	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1696	+// gridPanel.setContinuousLayout(true);
	1697	+// gridPanel.setOneTouchExpandable(true);
	1698	+// gridPanel.setDividerLocation(1.0);
	1699	+// gridPanel.setDividerSize(9);
	1700	+// gridPanel.setResizeWeight(0.85);
1200	1701
1201	1702	// aConstraints.weighty = 0;
1202	1703	//System.out.println("THIS = " + this);
..	..	@@ -1219,13 +1720,34 @@
1219	1720
1220	1721	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1722	//tmp.setName("Edit");
1222		- objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- objectPanel.add(north);
1227		- objectPanel.add(infoPanel);
	1723	+ objectPanel.add(skyboxPanel);
	1724	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1725	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1726	+
	1727	+ objectPanel.add(toolboxPanel);
	1728	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1729	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1228	1730
	1731	+ objectPanel.add(materialPanel);
	1732	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1733	+ objectPanel.setToolTipTextAt(2, "Material");
	1734	+
	1735	+// JPanel north = new JPanel(new BorderLayout());
	1736	+// north.setName("Edit");
	1737	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1738	+// objectPanel.add(north);
	1739	+ objectPanel.add(editPanel);
	1740	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1741	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1742	+
	1743	+ objectPanel.add(transformPanel);
	1744	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1745	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1746	+
	1747	+ patchMaterial = true;
	1748	+ cameraView.patchMaterial = this;
	1749	+ objectPanel.setSelectedIndex(2);
	1750	+
1229	1751	/*
1230	1752	aConstraints.gridx = 0;
1231	1753	aConstraints.gridwidth = 1;
..	..	@@ -1233,7 +1755,7 @@
1233	1755	aConstraints.gridy += 1;
1234	1756	aConstraints.gridwidth = 1;
1235	1757	mainPanel.add(objectPanel, aConstraints);
1236		- */
	1758	+ */
1237	1759
1238	1760	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1239	1761	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1244,16 +1766,120 @@
1244	1766	scrollpane.setWheelScrollingEnabled(true);
1245	1767	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1768
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1769	+ /JTabbedPane/ scenePanel = new cGridBag();
	1770	+ scenePanel.preferredWidth = 5;
	1771	+
	1772	+ JTabbedPane tabbedPane = new JTabbedPane();
	1773	+ tabbedPane.add(scrollpane);
1249	1774
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1775	+ optionsPanel = new cGridBag().setVertical(false);
1253	1776
1254	1777	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1778	+
	1779	+ AddOptions(optionsPanel); //, aConstraints);
	1780	+
	1781	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1782
	1783	+ tabbedPane.add(optionsPanel);
	1784	+
	1785	+ scenePanel.add(tabbedPane);
	1786	+
	1787	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1788	+ creditsPanel.setName("Credits");
	1789	+
	1790	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1791	+ creditsPanel.add(ogaLabel);
	1792	+
	1793	+ cButton creditButton;
	1794	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1795	+ creditButton.setToolTipText("https://opengameart.org");
	1796	+
	1797	+ creditButton.addMouseListener(new MouseAdapter()
	1798	+ {
	1799	+ public void mouseClicked(MouseEvent e)
	1800	+ {
	1801	+ try
	1802	+ {
	1803	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1804	+ } catch (Exception e1)
	1805	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1806	+ {
	1807	+ e1.printStackTrace();
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
	1812	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1813	+ creditsPanel.add(ogaLabel);
	1814	+
	1815	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1816	+ creditButton.setToolTipText("https://3delicious.net");
	1817	+
	1818	+ creditButton.addMouseListener(new MouseAdapter()
	1819	+ {
	1820	+ public void mouseClicked(MouseEvent e)
	1821	+ {
	1822	+ try
	1823	+ {
	1824	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1825	+ } catch (Exception e1)
	1826	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1827	+ {
	1828	+ e1.printStackTrace();
	1829	+ }
	1830	+ }
	1831	+ });
	1832	+
	1833	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1834	+ creditButton.setToolTipText("https://archive3d.net");
	1835	+
	1836	+ creditButton.addMouseListener(new MouseAdapter()
	1837	+ {
	1838	+ public void mouseClicked(MouseEvent e)
	1839	+ {
	1840	+ try
	1841	+ {
	1842	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1843	+ } catch (Exception e1)
	1844	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1845	+ {
	1846	+ e1.printStackTrace();
	1847	+ }
	1848	+ }
	1849	+ });
	1850	+
	1851	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1852	+ creditButton.setToolTipText("https://turbosquid.com");
	1853	+
	1854	+ creditButton.addMouseListener(new MouseAdapter()
	1855	+ {
	1856	+ public void mouseClicked(MouseEvent e)
	1857	+ {
	1858	+ try
	1859	+ {
	1860	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1861	+ } catch (Exception e1)
	1862	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1863	+ {
	1864	+ e1.printStackTrace();
	1865	+ }
	1866	+ }
	1867	+ });
	1868	+
	1869	+ for (int i=6; --i>=0;)
	1870	+ {
	1871	+ creditsPanel.add(new cGridBag());
	1872	+ }
	1873	+
	1874	+ tabbedPane.add(creditsPanel);
	1875	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1876	+
	1877	+ if (Globals.ADVANCED)
	1878	+ {
	1879	+ objectPanel.add(infoPanel);
	1880	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1881	+ objectPanel.setToolTipTextAt(4, "Information");
	1882	+ }
1257	1883
1258	1884	/*
1259	1885	cTree jTree = new cTree(null);
..	..	@@ -1275,18 +1901,19 @@
1275	1901	jtp.add(tree);
1276	1902	*/
1277	1903
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
1279		- bigPanel.setContinuousLayout(true);
1280		- bigPanel.setOneTouchExpandable(true);
1281		- bigPanel.setDividerLocation(0.8);
1282		- bigPanel.setDividerSize(15);
1283		- bigPanel.setResizeWeight(0.15);
1284		- bigPanel.setName("Scene");
	1904	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1905	+// bigPanel.setContinuousLayout(true);
	1906	+// bigPanel.setOneTouchExpandable(true);
	1907	+// bigPanel.setDividerLocation(0.8);
	1908	+// bigPanel.setDividerSize(15);
	1909	+// bigPanel.setResizeWeight(0.15);
	1910	+// bigPanel.setName("Scene");
1285	1911
1286	1912	//bigPanel.setLayout(new BorderLayout());
1287	1913	//bigPanel.setSize(new Dimension(10,10));
1288	1914	//bigPanel.add(ctrlPanel);
1289	1915	//bigPanel.add(gridPanel);
	1916	+ /**
1290	1917	bigThree = new JPanel();
1291	1918	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1919	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1924,26 @@
1297	1924	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1925	aWindowConstraints.weightx = 0;
1299	1926	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1927	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1928	aWindowConstraints.weightx = 1;
1302	1929	aWindowConstraints.gridwidth = 3;
1303	1930	// aConstraints.gridheight = 3;
1304	1931	aWindowConstraints.gridx = 1;
1305	1932	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1933	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1934	aWindowConstraints.weightx = 0;
1308	1935	aWindowConstraints.gridx = 4;
1309	1936	aWindowConstraints.gridwidth = 1;
1310	1937	// aConstraints.gridheight = 3;
1311	1938	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1939	bigThree.add(XYZPanel, aWindowConstraints);
	1940	+ /**/
1313	1941
	1942	+ bigThree = new cGridBag();
	1943	+ bigThree.addComponent(scenePanel);
	1944	+ bigThree.addComponent(centralPanel);
	1945	+ //bigThree.addComponent(XYZPanel);
	1946	+
1314	1947	// // SIDE EFFECT!!!
1315	1948	// aConstraints.gridx = 0;
1316	1949	// aConstraints.gridy = 0;
..	..	@@ -1318,33 +1951,55 @@
1318	1951	// aConstraints.gridheight = 1;
1319	1952
1320	1953	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1321		- framePanel.setContinuousLayout(true);
1322		- framePanel.setOneTouchExpandable(true);
1323		- framePanel.setDividerLocation(0.8);
	1954	+
	1955	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1956	+ new java.beans.PropertyChangeListener()
	1957	+ {
	1958	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1959	+ {
	1960	+ if ((Integer)pce.getOldValue() == 1)
	1961	+ {
	1962	+ if (radio.layout != expandedLayout)
	1963	+ {
	1964	+ radio.layout = expandedLayout;
	1965	+ radio.layout.doClick();
	1966	+ }
	1967	+ }
	1968	+ }
	1969	+ });
	1970	+
	1971	+ framePanel.setContinuousLayout(false);
	1972	+ framePanel.setOneTouchExpandable(false);
	1973	+ //.setDividerLocation(0.8);
1324	1974	//framePanel.setDividerSize(15);
1325	1975	//framePanel.setResizeWeight(0.15);
1326	1976	framePanel.setName("Frame");
1327	1977
1328	1978	frame.getContentPane().setLayout(new BorderLayout());
1329	1979	/**/
1330		- JTabbedPane worldPane = new JTabbedPane();
	1980	+ //JTabbedPane worldPane = new JTabbedPane();
1331	1981	//worldPane.add(bigPanel);
1332	1982	//worldPane.add(worldPanel);
1333	1983	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1984	+ //frame.getContentPane().add(/"Center",/framePanel);
	1985	+ frame.add(/"Center",/framePanel);
1335	1986	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1987
1337	1988	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1989
1339		- frame.setSize(1024, 768);
1340		- frame.show();
	1990	+ frame.setSize(1280, 860);
	1991	+
	1992	+ cameraView.requestFocusInWindow();
	1993	+
	1994	+// gridPanel.setDividerLocation(1.0);
	1995	+
	1996	+ frame.validate();
1341	1997
1342		- gridPanel.setDividerLocation(1.0);
	1998	+ frame.setVisible(true);
1343	1999
1344	2000	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1345	2001	frame.addWindowListener(new WindowAdapter()
1346	2002	{
1347		-
1348	2003	public void windowClosing(WindowEvent e)
1349	2004	{
1350	2005	Close();
..	..	@@ -1352,6 +2007,10 @@
1352	2007	});
1353	2008	}
1354	2009
	2010	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	2011	+ {
	2012	+ }
	2013	+
1355	2014	JTree GetTree()
1356	2015	{
1357	2016	return objEditor.jTree;
..	..	@@ -1363,260 +2022,651 @@
1363	2022	ctrlPanel.removeAll();
1364	2023	}
1365	2024
1366		- void SetupMaterial(JPanel ctrlPanel)
	2025	+ void SetupMaterial(cGridBag materialpanel)
1367	2026	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	2027	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2028	+
	2029	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2030	+ skin.setToolTipText("Skin");
	2031	+ skin.addMouseListener(new MouseAdapter()
	2032	+ {
	2033	+ public void mouseClicked(MouseEvent e)
	2034	+ {
	2035	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2036	+ cMaterial material = object.material;
	2037	+
	2038	+ // Skin
	2039	+ colorField.setFloat(material.color);
	2040	+ float saturation = material.modulation;
	2041	+
	2042	+ if (!cameraView.Skinshader)
	2043	+ {
	2044	+ saturation /= 1.5;
	2045	+ }
	2046	+
	2047	+ saturationField.setFloat(saturation);
	2048	+
	2049	+ subsurfaceField.setFloat(material.subsurface);
	2050	+ selfshadowField.setFloat(material.diffuseness);
	2051	+ diffusenessField.setFloat(material.factor);
	2052	+ shininessField.setFloat(material.shininess);
	2053	+ shadowbiasField.setFloat(material.shadowbias);
	2054	+ diffuseField.setFloat(material.diffuse);
	2055	+ specularField.setFloat(material.specular);
	2056	+
	2057	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2058	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2059	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2060	+
	2061	+ materialtouched = true;
	2062	+ applySelf();
	2063	+ }
	2064	+ });
	2065	+ presetpanel.add(skin);
	2066	+
	2067	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2068	+ lambert.setToolTipText("Diffuse");
	2069	+ lambert.addMouseListener(new MouseAdapter()
	2070	+ {
	2071	+ public void mouseClicked(MouseEvent e)
	2072	+ {
	2073	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2074	+ cMaterial material = object.material;
	2075	+
	2076	+ diffusenessField.setFloat(material.factor);
	2077	+ selfshadowField.setFloat(material.diffuseness);
	2078	+
	2079	+ materialtouched = true;
	2080	+ applySelf();
	2081	+ }
	2082	+ });
	2083	+ presetpanel.add(lambert);
	2084	+
	2085	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2086	+ diffuse2.setToolTipText("Diffuse2");
	2087	+ diffuse2.addMouseListener(new MouseAdapter()
	2088	+ {
	2089	+ public void mouseClicked(MouseEvent e)
	2090	+ {
	2091	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2092	+ cMaterial material = object.material;
	2093	+
	2094	+ diffusenessField.setFloat(material.factor);
	2095	+ selfshadowField.setFloat(material.diffuseness);
	2096	+
	2097	+ materialtouched = true;
	2098	+ applySelf();
	2099	+ }
	2100	+ });
	2101	+ presetpanel.add(diffuse2);
	2102	+
	2103	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2104	+ diffusemoon.setToolTipText("Moon");
	2105	+ diffusemoon.addMouseListener(new MouseAdapter()
	2106	+ {
	2107	+ public void mouseClicked(MouseEvent e)
	2108	+ {
	2109	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2110	+ cMaterial material = object.material;
	2111	+
	2112	+ diffusenessField.setFloat(material.factor);
	2113	+ selfshadowField.setFloat(material.diffuseness);
	2114	+
	2115	+ materialtouched = true;
	2116	+ applySelf();
	2117	+ }
	2118	+ });
	2119	+ presetpanel.add(diffusemoon);
	2120	+
	2121	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2122	+ diffusemoon2.setToolTipText("Moon2");
	2123	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2124	+ {
	2125	+ public void mouseClicked(MouseEvent e)
	2126	+ {
	2127	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2128	+ cMaterial material = object.material;
	2129	+
	2130	+ diffusenessField.setFloat(material.factor);
	2131	+ selfshadowField.setFloat(material.diffuseness);
	2132	+
	2133	+ materialtouched = true;
	2134	+ applySelf();
	2135	+ }
	2136	+ });
	2137	+ presetpanel.add(diffusemoon2);
	2138	+
	2139	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2140	+ diffusemoon3.setToolTipText("Moon3");
	2141	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2142	+ {
	2143	+ public void mouseClicked(MouseEvent e)
	2144	+ {
	2145	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2146	+ cMaterial material = object.material;
	2147	+
	2148	+ diffusenessField.setFloat(material.factor);
	2149	+ selfshadowField.setFloat(material.diffuseness);
	2150	+
	2151	+ materialtouched = true;
	2152	+ applySelf();
	2153	+ }
	2154	+ });
	2155	+ presetpanel.add(diffusemoon3);
	2156	+
	2157	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2158	+ diffusesheen.setToolTipText("Sheen");
	2159	+ diffusesheen.addMouseListener(new MouseAdapter()
	2160	+ {
	2161	+ public void mouseClicked(MouseEvent e)
	2162	+ {
	2163	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2164	+ cMaterial material = object.material;
	2165	+
	2166	+ sheenField.setFloat(material.sheen);
	2167	+
	2168	+ materialtouched = true;
	2169	+ applySelf();
	2170	+ }
	2171	+ });
	2172	+ presetpanel.add(diffusesheen);
	2173	+
	2174	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2175	+ rough.setToolTipText("Rough metal");
	2176	+ rough.addMouseListener(new MouseAdapter()
	2177	+ {
	2178	+ public void mouseClicked(MouseEvent e)
	2179	+ {
	2180	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2181	+ cMaterial material = object.material;
	2182	+
	2183	+ shininessField.setFloat(material.shininess);
	2184	+ velvetField.setFloat(material.velvet);
	2185	+
	2186	+ materialtouched = true;
	2187	+ applySelf();
	2188	+ }
	2189	+ });
	2190	+ presetpanel.add(rough);
	2191	+
	2192	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2193	+ rough2.setToolTipText("Medium metal");
	2194	+ rough2.addMouseListener(new MouseAdapter()
	2195	+ {
	2196	+ public void mouseClicked(MouseEvent e)
	2197	+ {
	2198	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2199	+ cMaterial material = object.material;
	2200	+
	2201	+ shininessField.setFloat(material.shininess);
	2202	+ lightareaField.setFloat(material.lightarea);
	2203	+
	2204	+ materialtouched = true;
	2205	+ applySelf();
	2206	+ }
	2207	+ });
	2208	+ presetpanel.add(rough2);
	2209	+
	2210	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2211	+ shini0.setToolTipText("Shiny");
	2212	+ shini0.addMouseListener(new MouseAdapter()
	2213	+ {
	2214	+ public void mouseClicked(MouseEvent e)
	2215	+ {
	2216	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2217	+ cMaterial material = object.material;
	2218	+
	2219	+ shininessField.setFloat(material.shininess);
	2220	+ lightareaField.setFloat(material.lightarea);
	2221	+
	2222	+ materialtouched = true;
	2223	+ applySelf();
	2224	+ }
	2225	+ });
	2226	+ presetpanel.add(shini0);
	2227	+
	2228	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2229	+ shini1.setToolTipText("Shiny2");
	2230	+ shini1.addMouseListener(new MouseAdapter()
	2231	+ {
	2232	+ public void mouseClicked(MouseEvent e)
	2233	+ {
	2234	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2235	+ cMaterial material = object.material;
	2236	+
	2237	+ shininessField.setFloat(material.shininess);
	2238	+ lightareaField.setFloat(material.lightarea);
	2239	+
	2240	+ materialtouched = true;
	2241	+ applySelf();
	2242	+ }
	2243	+ });
	2244	+ presetpanel.add(shini1);
	2245	+
	2246	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2247	+ shini2.setToolTipText("Shiny3");
	2248	+ shini2.addMouseListener(new MouseAdapter()
	2249	+ {
	2250	+ public void mouseClicked(MouseEvent e)
	2251	+ {
	2252	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2253	+ cMaterial material = object.material;
	2254	+
	2255	+ shininessField.setFloat(material.shininess);
	2256	+ lightareaField.setFloat(material.lightarea);
	2257	+
	2258	+ materialtouched = true;
	2259	+ applySelf();
	2260	+ }
	2261	+ });
	2262	+ presetpanel.add(shini2);
	2263	+
	2264	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2265	+ aniso.setToolTipText("AnisoU");
	2266	+ aniso.addMouseListener(new MouseAdapter()
	2267	+ {
	2268	+ public void mouseClicked(MouseEvent e)
	2269	+ {
	2270	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2271	+ cMaterial material = object.material;
	2272	+
	2273	+ anisoField.setFloat(material.aniso);
	2274	+ anisoVField.setFloat(material.anisoV);
	2275	+
	2276	+ materialtouched = true;
	2277	+ applySelf();
	2278	+ }
	2279	+ });
	2280	+ presetpanel.add(aniso);
	2281	+
	2282	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2283	+ aniso2.setToolTipText("AnisoV");
	2284	+ aniso2.addMouseListener(new MouseAdapter()
	2285	+ {
	2286	+ public void mouseClicked(MouseEvent e)
	2287	+ {
	2288	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2289	+ cMaterial material = object.material;
	2290	+
	2291	+ anisoField.setFloat(material.aniso);
	2292	+ anisoVField.setFloat(material.anisoV);
	2293	+
	2294	+ materialtouched = true;
	2295	+ applySelf();
	2296	+ }
	2297	+ });
	2298	+ presetpanel.add(aniso2);
	2299	+
	2300	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2301	+ aniso3.setToolTipText("AnisoUV");
	2302	+ aniso3.addMouseListener(new MouseAdapter()
	2303	+ {
	2304	+ public void mouseClicked(MouseEvent e)
	2305	+ {
	2306	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2307	+ cMaterial material = object.material;
	2308	+
	2309	+ anisoField.setFloat(material.aniso);
	2310	+ anisoVField.setFloat(material.anisoV);
	2311	+
	2312	+ materialtouched = true;
	2313	+ applySelf();
	2314	+ }
	2315	+ });
	2316	+ presetpanel.add(aniso3);
	2317	+
	2318	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2319	+ velvet0.setToolTipText("Velvet");
	2320	+ velvet0.addMouseListener(new MouseAdapter()
	2321	+ {
	2322	+ public void mouseClicked(MouseEvent e)
	2323	+ {
	2324	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2325	+ cMaterial material = object.material;
	2326	+
	2327	+ diffusenessField.setFloat(material.factor);
	2328	+ selfshadowField.setFloat(material.diffuseness);
	2329	+ sheenField.setFloat(material.sheen);
	2330	+ shininessField.setFloat(material.shininess);
	2331	+ velvetField.setFloat(material.velvet);
	2332	+ shiftField.setFloat(material.shift);
	2333	+
	2334	+ materialtouched = true;
	2335	+ applySelf();
	2336	+ }
	2337	+ });
	2338	+ presetpanel.add(velvet0);
	2339	+
	2340	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2341	+ bump0.setToolTipText("Bump texture");
	2342	+ bump0.addMouseListener(new MouseAdapter()
	2343	+ {
	2344	+ public void mouseClicked(MouseEvent e)
	2345	+ {
	2346	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2347	+ cMaterial material = object.material;
	2348	+
	2349	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2350	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2351	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2352	+
	2353	+ materialtouched = true;
	2354	+ applySelf();
	2355	+ }
	2356	+ });
	2357	+ presetpanel.add(bump0);
	2358	+
	2359	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2360	+ borderShader.setToolTipText("Border fade");
	2361	+ borderShader.addMouseListener(new MouseAdapter()
	2362	+ {
	2363	+ public void mouseClicked(MouseEvent e)
	2364	+ {
	2365	+ borderfadeField.setFloat(0.4);
	2366	+ opacityField.setFloat(0.75);
	2367	+
	2368	+ materialtouched = true;
	2369	+ applySelf();
	2370	+ }
	2371	+ });
	2372	+ presetpanel.add(borderShader);
	2373	+
	2374	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2375	+ halo.setToolTipText("Halo");
	2376	+ halo.addMouseListener(new MouseAdapter()
	2377	+ {
	2378	+ public void mouseClicked(MouseEvent e)
	2379	+ {
	2380	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2381	+ cMaterial material = object.material;
	2382	+
	2383	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2384	+
	2385	+ materialtouched = true;
	2386	+ applySelf();
	2387	+ }
	2388	+ });
	2389	+ presetpanel.add(halo);
	2390	+
	2391	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2392	+ candle.setToolTipText("Candle");
	2393	+ candle.addMouseListener(new MouseAdapter()
	2394	+ {
	2395	+ public void mouseClicked(MouseEvent e)
	2396	+ {
	2397	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2398	+ cMaterial material = object.material;
	2399	+
	2400	+ subsurfaceField.setFloat(material.subsurface);
	2401	+ shadowbiasField.setFloat(material.shadowbias);
	2402	+ ambientField.setFloat(material.ambient);
	2403	+ specularField.setFloat(material.specular);
	2404	+ lightareaField.setFloat(material.lightarea);
	2405	+ shininessField.setFloat(material.shininess);
	2406	+
	2407	+ materialtouched = true;
	2408	+ applySelf();
	2409	+ }
	2410	+ });
	2411	+ presetpanel.add(candle);
	2412	+
	2413	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2414	+ shadowShader.setToolTipText("Shadow");
	2415	+ shadowShader.addMouseListener(new MouseAdapter()
	2416	+ {
	2417	+ public void mouseClicked(MouseEvent e)
	2418	+ {
	2419	+ diffuseField.setFloat(0.001);
	2420	+ ambientField.setFloat(0.001);
	2421	+ cameraField.setFloat(0.001);
	2422	+ specularField.setFloat(0.001);
	2423	+ fakedepthField.setFloat(0.001);
	2424	+ opacityField.setFloat(0.6);
	2425	+
	2426	+ materialtouched = true;
	2427	+ applySelf();
	2428	+ }
	2429	+ });
	2430	+ presetpanel.add(shadowShader);
	2431	+
	2432	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2433	+ para0.setToolTipText("No parallax");
	2434	+ para0.addMouseListener(new MouseAdapter()
	2435	+ {
	2436	+ public void mouseClicked(MouseEvent e)
	2437	+ {
	2438	+ parallaxField.setFloat(0.125);
	2439	+
	2440	+ materialtouched = true;
	2441	+ applySelf();
	2442	+ }
	2443	+ });
	2444	+ presetpanel.add(para0);
	2445	+
	2446	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2447	+ para1.setToolTipText("With parallax");
	2448	+ para1.addMouseListener(new MouseAdapter()
	2449	+ {
	2450	+ public void mouseClicked(MouseEvent e)
	2451	+ {
	2452	+ parallaxField.setFloat(0.13);
	2453	+
	2454	+ materialtouched = true;
	2455	+ applySelf();
	2456	+ }
	2457	+ });
	2458	+ presetpanel.add(para1);
	2459	+
	2460	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2461	+ para2.setToolTipText("Reset parallax");
	2462	+ para2.addMouseListener(new MouseAdapter()
	2463	+ {
	2464	+ public void mouseClicked(MouseEvent e)
	2465	+ {
	2466	+ parallaxField.setFloat(0.14);
	2467	+
	2468	+ materialtouched = true;
	2469	+ applySelf();
	2470	+ }
	2471	+ });
	2472	+ presetpanel.add(para2);
	2473	+
	2474	+ cGridBag panel = new cGridBag().setVertical(true);
	2475	+
	2476	+ presetpanel.preferredWidth = 1;
	2477	+
	2478	+ materialpanel.add(presetpanel);
	2479	+ materialpanel.add(panel);
	2480	+
	2481	+ panel.preferredWidth = 8;
	2482	+
	2483	+ /*
1371	2484	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	2485	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375		- */
	2486	+ */
1376	2487
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	2488	+ cGridBag editBar = new cGridBag().setVertical(false);
	2489	+
	2490	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
	2491	+ createMaterialButton.setToolTipText("Create material");
1382	2492
1383	2493	/*
1384	2494	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	2495	*/
1389	2496
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	2497	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
	2498	+ clearMaterialButton.setToolTipText("Clear material");
	2499	+
	2500	+ if (Globals.ADVANCED)
	2501	+ {
	2502	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
	2503	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2504	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2505	+ }
1392	2506
1393		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394		-
1395		- aConstraints.gridx += 1;
1396		-
1397		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398		-
1399		- aConstraints.gridx += 1;
1400		-
1401		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402		-
1403		- aConstraints.gridx = 0;
1404		- aConstraints.gridy += 1;
1405		- aConstraints.weighty = 0;
1406		- aConstraints.gridwidth = 1;
	2507	+ editBar.preferredHeight = 15;
	2508	+
	2509	+ panel.add(editBar);
	2510	+
1407	2511	/**/
1408	2512	//aConstraints.weighty = 0;
1409	2513	////aConstraints.weightx = 1;
1410	2514	//aConstraints.weighty = 1;
1411	2515	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	2516	//aConstraints.gridx += 1;
1413		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414		- aConstraints.weighty = 0;
1415		- aConstraints.gridx = 0;
1416		- aConstraints.gridy += 1;
1417		- aConstraints.gridwidth = 1;
	2517	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	2518
1419		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424		- //aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426		- aConstraints.gridx = 0;
1427		- aConstraints.gridy += 1;
1428		- aConstraints.gridwidth = 1;
	2519	+ cGridBag colorSection = new cGridBag().setVertical(true);
1429	2520
1430		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433		- aConstraints.gridx += 1;
1434		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436		- aConstraints.gridx = 0;
1437		- aConstraints.gridy += 1;
1438		- aConstraints.gridwidth = 1;
	2521	+ cGridBag huepanel = new cGridBag();
	2522	+ cGridBag huelabel = new cGridBag();
	2523	+ cLabel hue = GetLabel("icons/hue.png", false);
	2524	+ hue.fit = true;
	2525	+
	2526	+ hue.addMouseListener(new MouseAdapter()
	2527	+ {
	2528	+ public void mousePressed(MouseEvent e)
	2529	+ {
	2530	+ int x = e.getX();
	2531	+
	2532	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2533	+ }
	2534	+ });
	2535	+
	2536	+ huelabel.add(hue);
	2537	+ huelabel.preferredWidth = 20;
	2538	+ huepanel.add(new cGridBag()); // Label
	2539	+ huepanel.add(huelabel); // Field/slider
	2540	+
	2541	+ huepanel.preferredHeight = 7;
1439	2542
1440		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443		- aConstraints.gridx += 1;
1444		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	2543	+ colorSection.add(huepanel);
	2544	+
	2545	+ cGridBag color = new cGridBag();
	2546	+
	2547	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2548	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2549	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1449	2550
1450		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- aConstraints.gridwidth = 1;
	2551	+ //colorField.preferredWidth = 200;
	2552	+ colorSection.add(color);
1459	2553
1460		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.gridwidth = 1;
	2554	+ cGridBag modulation = new cGridBag();
	2555	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2556	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2557	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2558	+ colorSection.add(modulation);
1469	2559
1470		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473		- aConstraints.gridx += 1;
1474		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476		- aConstraints.gridx = 0;
1477		- aConstraints.gridy += 1;
1478		- aConstraints.gridwidth = 1;
	2560	+ cGridBag opacity = new cGridBag();
	2561	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2562	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2563	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2564	+ colorSection.add(opacity);
1479	2565
1480		- //aConstraints.weighty = 1;
1481		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482		- //aConstraints.gridx += 1;
1483		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484		- aConstraints.weighty = 0;
1485		- aConstraints.gridx = 0;
1486		- aConstraints.gridy += 1;
1487		- aConstraints.gridwidth = 1;
	2566	+ colorSection.add(GetSeparator());
	2567	+
	2568	+ cGridBag texture = new cGridBag();
	2569	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2570	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2571	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2572	+ colorSection.add(texture);
1488	2573
1489		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492		- aConstraints.gridx += 1;
1493		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495		- aConstraints.gridx = 0;
1496		- aConstraints.gridy += 1;
1497		- aConstraints.gridwidth = 1;
	2574	+ panel.add(GetSeparator());
	2575	+
	2576	+ panel.add(colorSection);
	2577	+
	2578	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2579	+
	2580	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2581	+
	2582	+ cGridBag diffuse = new cGridBag();
	2583	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2584	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2585	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2586	+ diffuseSection.add(diffuse);
1498	2587
1499		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502		- aConstraints.gridx += 1;
1503		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505		- aConstraints.gridx = 0;
1506		- aConstraints.gridy += 1;
1507		- aConstraints.gridwidth = 1;
	2588	+ cGridBag diffuseness = new cGridBag();
	2589	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2590	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2591	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2592	+ diffuseSection.add(diffuseness);
1508	2593
1509		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512		- aConstraints.gridx += 1;
1513		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515		- aConstraints.gridx = 0;
1516		- aConstraints.gridy += 1;
1517		- aConstraints.gridwidth = 1;
	2594	+ cGridBag selfshadow = new cGridBag();
	2595	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2596	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2597	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2598	+ diffuseSection.add(selfshadow);
1518	2599
1519		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522		- aConstraints.gridx += 1;
1523		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525		- aConstraints.gridx = 0;
1526		- aConstraints.gridy += 1;
1527		- aConstraints.gridwidth = 1;
	2600	+ cGridBag sheen = new cGridBag();
	2601	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2602	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2603	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2604	+ diffuseSection.add(sheen);
1528	2605
1529		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532		- aConstraints.gridx += 1;
1533		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535		- aConstraints.gridx = 0;
1536		- aConstraints.gridy += 1;
1537		- aConstraints.gridwidth = 1;
	2606	+ cGridBag subsurface = new cGridBag();
	2607	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2608	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2609	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2610	+ diffuseSection.add(subsurface);
1538	2611
1539		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542		- aConstraints.gridx += 1;
1543		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545		- aConstraints.gridx = 0;
1546		- aConstraints.gridy += 1;
1547		- aConstraints.gridwidth = 1;
	2612	+ cGridBag shadow = new cGridBag();
	2613	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2614	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2615	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2616	+ diffuseSection.add(shadow);
1548	2617
1549		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552		- aConstraints.gridx += 1;
1553		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555		- aConstraints.gridx = 0;
1556		- aConstraints.gridy += 1;
1557		- aConstraints.gridwidth = 1;
	2618	+ cGridBag fakedepth = new cGridBag();
	2619	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2620	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2621	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2622	+ diffuseSection.add(fakedepth);
1558	2623
1559		- //aConstraints.weighty = 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561		- //aConstraints.gridx += 1;
1562		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563		- aConstraints.weighty = 0;
1564		- aConstraints.gridx = 0;
1565		- aConstraints.gridy += 1;
1566		- aConstraints.gridwidth = 1;
	2624	+ cGridBag shadowbias = new cGridBag();
	2625	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2626	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2627	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2628	+ diffuseSection.add(shadowbias);
1567	2629
1568		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571		- aConstraints.gridx += 1;
1572		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574		- aConstraints.gridx = 0;
1575		- aConstraints.gridy += 1;
1576		- aConstraints.gridwidth = 1;
	2630	+ panel.add(GetSeparator());
	2631	+
	2632	+ panel.add(diffuseSection);
	2633	+
	2634	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2635	+
	2636	+ cGridBag specularSection = new cGridBag().setVertical(true);
1577	2637
1578		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581		- aConstraints.gridx += 1;
1582		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584		- aConstraints.gridx = 0;
1585		- aConstraints.gridy += 1;
1586		- aConstraints.gridwidth = 1;
	2638	+ cGridBag specular = new cGridBag();
	2639	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2640	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2641	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2642	+ specularSection.add(specular);
1587	2643
1588		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591		- aConstraints.gridx += 1;
1592		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594		- aConstraints.gridx = 0;
1595		- aConstraints.gridy += 1;
1596		- aConstraints.gridwidth = 1;
	2644	+ cGridBag lightarea = new cGridBag();
	2645	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2646	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2647	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2648	+ specularSection.add(lightarea);
1597	2649
1598		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601		- aConstraints.gridx += 1;
1602		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604		- aConstraints.gridx = 0;
1605		- aConstraints.gridy += 1;
1606		- aConstraints.gridwidth = 1;
	2650	+ cGridBag shininess = new cGridBag();
	2651	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2652	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2653	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2654	+ specularSection.add(shininess);
1607	2655
1608		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611		- aConstraints.gridx += 1;
1612		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614		- aConstraints.gridx = 0;
1615		- aConstraints.gridy += 1;
1616		- aConstraints.gridwidth = 1;
	2656	+ cGridBag metalness = new cGridBag();
	2657	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2658	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2659	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2660	+ specularSection.add(metalness);
1617	2661
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	2662	+ cGridBag velvet = new cGridBag();
	2663	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2664	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2665	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2666	+ specularSection.add(velvet);
	2667	+
	2668	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2669	+ //Return();
1620	2670	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	2671	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	2672	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +2677,105 @@
1627	2677	// aConstraints.gridy += 1;
1628	2678	// aConstraints.gridwidth = 1;
1629	2679
1630		- //aConstraints.weighty = 1;
1631		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632		- //aConstraints.gridx += 1;
1633		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634		- aConstraints.weighty = 0;
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
	2680	+ cGridBag anisoU = new cGridBag();
	2681	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2682	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2683	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2684	+ specularSection.add(anisoU);
1638	2685
1639		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
	2686	+ cGridBag anisoV = new cGridBag();
	2687	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2688	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2689	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2690	+ specularSection.add(anisoV);
1648	2691
1649		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- aConstraints.gridwidth = 1;
1658	2692
1659		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662		- aConstraints.gridx += 1;
1663		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665		- aConstraints.gridx = 0;
1666		- aConstraints.gridy += 1;
1667		- aConstraints.gridwidth = 1;
	2693	+ panel.add(GetSeparator());
	2694	+
	2695	+ panel.add(specularSection);
	2696	+
	2697	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2698	+
	2699	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1668	2700
1669		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672		- aConstraints.gridx += 1;
1673		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675		- aConstraints.gridx = 0;
1676		- aConstraints.gridy += 1;
1677		- aConstraints.gridwidth = 1;
1678		- aConstraints.weighty = 0;
	2701	+ cGridBag camera = new cGridBag();
	2702	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2703	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2704	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2705	+ colorSection.add(camera);
1679	2706
1680		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	2707	+ cGridBag ambient = new cGridBag();
	2708	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2709	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2710	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2711	+ colorSection.add(ambient);
1689	2712
1690		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
	2713	+ cGridBag backlit = new cGridBag();
	2714	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2715	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2716	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2717	+ colorSection.add(backlit);
1699	2718
1700		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
	2719	+ cGridBag parallax = new cGridBag();
	2720	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2721	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2722	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2723	+ colorSection.add(parallax);
	2724	+
	2725	+ //panel.add(new JSeparator());
	2726	+
	2727	+ //panel.add(globalSection);
	2728	+
	2729	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2730	+
	2731	+ cGridBag textureSection = new cGridBag().setVertical(true);
1709	2732
1710		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- aConstraints.gridwidth = 1;
	2733	+ cGridBag bump = new cGridBag();
	2734	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2735	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2736	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2737	+ textureSection.add(bump);
1719	2738
1720		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723		- aConstraints.gridx += 1;
1724		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726		- aConstraints.gridx = 0;
1727		- aConstraints.gridy += 1;
1728		- aConstraints.gridwidth = 1;
	2739	+ cGridBag noise = new cGridBag();
	2740	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2741	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2742	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2743	+ textureSection.add(noise);
1729	2744
1730		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733		- aConstraints.gridx += 1;
1734		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1736		- aConstraints.gridx = 0;
1737		- aConstraints.gridy += 1;
1738		- aConstraints.gridwidth = 1;
	2745	+ cGridBag power = new cGridBag();
	2746	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2747	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2748	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2749	+ textureSection.add(power);
1739	2750
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	2751	+ cGridBag borderfade = new cGridBag();
	2752	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2753	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2754	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2755	+ textureSection.add(borderfade);
1745	2756
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	2757	+ cGridBag fog = new cGridBag();
	2758	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2759	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2760	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2761	+ textureSection.add(fog);
	2762	+
	2763	+ cGridBag opacityPower = new cGridBag();
	2764	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2765	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2766	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2767	+ textureSection.add(opacityPower);
	2768	+
	2769	+ panel.add(GetSeparator());
	2770	+
	2771	+ panel.add(textureSection);
	2772	+
	2773	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	2774
1750	2775	SetMaterial(copy); // .GetMaterial());
1751	2776
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	2777	+ //colorField.addChangeListener(this);
	2778	+// modulationField.addChangeListener(this);
1754	2779	metalnessField.addChangeListener(this);
1755	2780	diffuseField.addChangeListener(this);
1756	2781	specularField.addChangeListener(this);
..	..	@@ -1780,12 +2805,15 @@
1780	2805	opacityPowerField.addChangeListener(this);
1781	2806	/**/
1782	2807
1783		- resetSlidersButton.addActionListener(this);
1784	2808	clearMaterialButton.addActionListener(this);
1785	2809	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	2810	+
	2811	+ if (Globals.ADVANCED)
	2812	+ {
	2813	+ resetSlidersButton.addActionListener(this);
	2814	+ propagateToggle.addItemListener(this);
	2815	+ multiplyToggle.addItemListener(this);
	2816	+ }
1789	2817	}
1790	2818
1791	2819	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1803,8 +2831,9 @@
1803	2831	// 3D models
1804	2832	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1805	2833	{
1806		- lastConverter = new com.jmex.model.converters.MaxToJme();
1807		- LoadFile(filename, lastConverter);
	2834	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2835	+ //LoadFile(filename, lastConverter);
	2836	+ LoadObjFile(filename); // New 3ds loader
1808	2837	continue;
1809	2838	}
1810	2839	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1859,19 +2888,21 @@
1859	2888	}
1860	2889
1861	2890	// Images/textures
1862		- if (textures
1863		- && (filename.toLowerCase().endsWith(".jpg")
1864		- \|\| filename.toLowerCase().endsWith(".jpeg")
1865		- \|\| filename.toLowerCase().endsWith(".gif")
1866		- \|\| filename.toLowerCase().endsWith(".png")
1867		- \|\| filename.toLowerCase().endsWith(".tre")
1868		- \|\| filename.toLowerCase().endsWith(".bmp")
1869		- \|\| filename.toLowerCase().endsWith(".tga")
1870		- \|\| filename.toLowerCase().endsWith(".sgi")
1871		- \|\| filename.toLowerCase().endsWith(".tif")
1872		- \|\| filename.toLowerCase().endsWith(".tiff")))
	2891	+ if (filename.toLowerCase().endsWith(".jpg")
	2892	+ \|\| filename.toLowerCase().endsWith(".jpeg")
	2893	+ \|\| filename.toLowerCase().endsWith(".gif")
	2894	+ \|\| filename.toLowerCase().endsWith(".png")
	2895	+ \|\| filename.toLowerCase().endsWith(".tre")
	2896	+ \|\| filename.toLowerCase().endsWith(".bmp")
	2897	+ \|\| filename.toLowerCase().endsWith(".tga")
	2898	+ \|\| filename.toLowerCase().endsWith(".sgi")
	2899	+ \|\| filename.toLowerCase().endsWith(".tif")
	2900	+ \|\| filename.toLowerCase().endsWith(".tiff"))
1873	2901	{
1874		- DropTexture(filename);
	2902	+ if (textures)
	2903	+ DropTexture(filename);
	2904	+ else
	2905	+ CreateBillboard(filename);
1875	2906	continue;
1876	2907	}
1877	2908
..	..	@@ -1880,6 +2911,60 @@
1880	2911	}
1881	2912
1882	2913	ResetModel();
	2914	+ }
	2915	+
	2916	+ void CreateBillboard(String filename)
	2917	+ {
	2918	+ Object3D source = null;
	2919	+ Object3D group = copy;
	2920	+
	2921	+ if (group.selection.size() > 0)
	2922	+ {
	2923	+ source = group.selection.get(0);
	2924	+ }
	2925	+
	2926	+ Grid grid = new Grid(1,1);
	2927	+ grid.material = null;
	2928	+
	2929	+ grid.toParent = LA.newMatrix();
	2930	+ grid.fromParent = LA.newMatrix();
	2931	+ LA.matYRotate(grid.toParent, Math.PI/2);
	2932	+ LA.matXRotate(grid.toParent, -Math.PI/2);
	2933	+ LA.matXRotate(grid.fromParent, Math.PI/2);
	2934	+ LA.matYRotate(grid.fromParent, -Math.PI/2);
	2935	+
	2936	+ BillboardNode bb = new BillboardNode();
	2937	+ bb.addChild(grid);
	2938	+
	2939	+ Object3D newgroup = new Object3D();
	2940	+ newgroup.CreateMaterial();
	2941	+
	2942	+ File file = new File(filename);
	2943	+ newgroup.name = file.getName();
	2944	+ newgroup.addChild(bb);
	2945	+
	2946	+ Object3D main = newgroup;
	2947	+
	2948	+ main.SetPigmentTexture(filename);
	2949	+
	2950	+ if (source != null)
	2951	+ {
	2952	+ main.material = new cMaterial(source.material);
	2953	+ if (main.projectedVertices.length < source.projectedVertices.length)
	2954	+ {
	2955	+ main.projectedVertices = new Object3D.cVector2[source.projectedVertices.length];
	2956	+ }
	2957	+
	2958	+ for (int i=0; i<source.projectedVertices.length; i++)
	2959	+ {
	2960	+ main.projectedVertices[i].x = source.projectedVertices[i].x;
	2961	+ main.projectedVertices[i].y = source.projectedVertices[i].y;
	2962	+ }
	2963	+
	2964	+ main.texres = source.texres;
	2965	+ }
	2966	+
	2967	+ makeSomething(newgroup, false);
1883	2968	}
1884	2969
1885	2970	Point location;
..	..	@@ -1900,7 +2985,7 @@
1900	2985
1901	2986	//? flashIt = false;
1902	2987	CameraPane pane = (CameraPane) cameraView;
1903		- pane.clickStart(location.x, location.y, 0);
	2988	+ pane.clickStart(location.x, location.y, 0, 0);
1904	2989	pane.clickEnd(location.x, location.y, 0, true);
1905	2990
1906	2991	if (group.selection.size() == 1)
..	..	@@ -1949,6 +3034,7 @@
1949	3034	e2.printStackTrace();
1950	3035	}
1951	3036	}
	3037	+
1952	3038	LoadJMEThread loadThread;
1953	3039
1954	3040	class LoadJMEThread extends Thread
..	..	@@ -2006,6 +3092,7 @@
2006	3092	//LoadFile0(filename, converter);
2007	3093	}
2008	3094	}
	3095	+
2009	3096	LoadOBJThread loadObjThread;
2010	3097
2011	3098	class LoadOBJThread extends Thread
..	..	@@ -2084,19 +3171,19 @@
2084	3171
2085	3172	void LoadObjFile(String fullname)
2086	3173	{
2087		- /*
	3174	+ System.out.println("Loading " + fullname);
	3175	+ /**/
2088	3176	//lastFilename = fullname;
2089	3177	if(loadObjThread == null)
2090	3178	{
2091		- loadObjThread = new LoadOBJThread();
2092		- loadObjThread.start();
	3179	+ loadObjThread = new LoadOBJThread();
	3180	+ loadObjThread.start();
2093	3181	}
2094	3182
2095	3183	loadObjThread.add(fullname);
2096		- */
	3184	+ /**/
2097	3185
2098		- System.out.println("Loading " + fullname);
2099		- makeSomething(new FileObject(fullname, true), true);
	3186	+ //makeSomething(new FileObject(fullname, true), true);
2100	3187	}
2101	3188
2102	3189	void LoadGFDFile(String fullname)
..	..	@@ -2138,6 +3225,8 @@
2138	3225	{
2139	3226	Mocap sel = (Mocap) copy.selection.get(0);
2140	3227
	3228	+ sel.SetCurrentBones(sel.frame);
	3229	+
2141	3230	sel.fullname = fullname;
2142	3231
2143	3232	if (changename)
..	..	@@ -2151,14 +3240,18 @@
2151	3240	sel.smoothed = false;
2152	3241
2153	3242	// if (!changename)
2154		- sel.SetPositionDelta(false, true, true, true/?/); // false
	3243	+ //sel.SetPositionDelta(false, true, true, true/?/); // false
	3244	+ sel.SetGlobalTransform();
	3245	+ sel.LoadData();
	3246	+ sel.Rewind();
	3247	+ sel.Fade();
2155	3248	// sel.setPose(0);
2156	3249	refreshContents();
2157	3250	} else
2158	3251	{
2159	3252	mocap.Reset();
2160	3253	// new skeleton
2161		- makeSomething(mocap, false); // true);
	3254	+ makeSomething(mocap, true); // true);
2162	3255	}
2163	3256	} catch (Exception e)
2164	3257	{
..	..	@@ -2185,6 +3278,8 @@
2185	3278	{
2186	3279	Mocap sel = (Mocap) select;
2187	3280
	3281	+ sel.SetCurrentBones(sel.frame);
	3282	+
2188	3283	File file = new File(fullname);
2189	3284
2190	3285	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2251,7 +3346,11 @@
2251	3346
2252	3347	if (!changename)
2253	3348	{
2254		- sel.SetPositionDelta(false, true, true, true/?/);
	3349	+ //sel.SetPositionDelta(false, true, true, true/?/);
	3350	+ sel.SetGlobalTransform();
	3351	+ sel.LoadData();
	3352	+ sel.Rewind();
	3353	+ sel.Fade();
2255	3354	}
2256	3355
2257	3356	// sel.setPose(0);
..	..	@@ -2345,11 +3444,11 @@
2345	3444
2346	3445	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	3446	{
2348		- if (GrafreeD.standAlone)
	3447	+ if (Grafreed.standAlone)
2349	3448	{
2350	3449	/**/
2351	3450	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	3451	+ browser.setVisible(true);
2353	3452	String filename = browser.getFile();
2354	3453	if (filename != null && filename.length() > 0)
2355	3454	{
..	..	@@ -2460,6 +3559,7 @@
2460	3559	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	3560	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	3561	}
	3562	+
2463	3563	//cJME.count++;
2464	3564	//cJME.count %= 12;
2465	3565	if (gc)
..	..	@@ -2494,6 +3594,7 @@
2494	3594	}
2495	3595	if (input == null)
2496	3596	{
	3597	+ new Exception().printStackTrace();
2497	3598	System.exit(0);
2498	3599	}
2499	3600
..	..	@@ -2642,6 +3743,7 @@
2642	3743	}
2643	3744	}
2644	3745	}
	3746	+
2645	3747	cFileSystemPane FSPane;
2646	3748
2647	3749	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2651,7 +3753,7 @@
2651	3753
2652	3754	freezematerial = true;
2653	3755	colorField.setFloat(mat.color);
2654		- modulationField.setFloat(mat.modulation);
	3756	+ saturationField.setFloat(mat.modulation);
2655	3757	metalnessField.setFloat(mat.metalness);
2656	3758	diffuseField.setFloat(mat.diffuse);
2657	3759	specularField.setFloat(mat.specular);
..	..	@@ -2671,6 +3773,7 @@
2671	3773	shadowField.setFloat(mat.shadow);
2672	3774	textureField.setFloat(mat.texture);
2673	3775	opacityField.setFloat(mat.opacity);
	3776	+ parallaxField.setFloat(mat.parallax + 0.125f);
2674	3777	fakedepthField.setFloat(mat.fakedepth);
2675	3778	shadowbiasField.setFloat(mat.shadowbias);
2676	3779	bumpField.setInteger(1); // dec 2013
..	..	@@ -2695,11 +3798,14 @@
2695	3798	}
2696	3799	}
2697	3800	}
	3801	+
2698	3802	freezematerial = false;
2699	3803	}
2700	3804
2701	3805	void SetMaterial(Object3D object)
2702	3806	{
	3807	+ latestObject = object;
	3808	+
2703	3809	cMaterial mat = object.material;
2704	3810
2705	3811	if (mat == null)
..	..	@@ -2708,33 +3814,10 @@
2708	3814	return;
2709	3815	}
2710	3816
2711		- multiplyToggle.setSelected(mat.multiply);
2712		-
2713		- assert (object.projectedVertices != null);
2714		-
2715		- if (object.projectedVertices.length <= 2)
2716		- {
2717		- // Side effect...
2718		- Object3D.cVector2[] keep = object.projectedVertices;
2719		- object.projectedVertices = new Object3D.cVector2[3];
2720		- for (int i = 0; i < 3; i++)
2721		- {
2722		- if (i < keep.length)
2723		- {
2724		- object.projectedVertices[i] = keep[i];
2725		- } else
2726		- {
2727		- object.projectedVertices[i] = new Object3D.cVector2();
2728		- }
2729		- /*
2730		- if(keep.length == 0)
2731		- object.projectedVertices[0] = new Object3D.cVector2();
2732		- else
2733		- object.projectedVertices[0] = keep[0];
2734		- object.projectedVertices[1] = new Object3D.cVector2();
2735		- */
2736		- }
2737		- }
	3817	+ if (multiplyToggle != null)
	3818	+ multiplyToggle.setSelected(mat.multiply);
	3819	+
	3820	+ AllocProjectedVertices(object);
2738	3821
2739	3822	SetMaterial(mat, object.projectedVertices);
2740	3823	}
..	..	@@ -2810,12 +3893,17 @@
2810	3893	// }
2811	3894
2812	3895	/**/
2813		- if (deselect)
	3896	+ if (deselect \|\| child == null)
2814	3897	{
2815	3898	//group.deselectAll();
2816	3899	//freeze = true;
2817	3900	GetTree().clearSelection();
2818	3901	//freeze = false;
	3902	+
	3903	+ if (child == null)
	3904	+ {
	3905	+ return;
	3906	+ }
2819	3907	}
2820	3908
2821	3909	//group.addSelectee(child);
..	..	@@ -2849,6 +3937,17 @@
2849	3937	public void itemStateChanged(ItemEvent event)
2850	3938	{
2851	3939	// System.out.println("Propagate = " + propagate);
	3940	+ if (event.getSource() == pinButton)
	3941	+ {
	3942	+ copy.pinned ^= true;
	3943	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3944	+ {
	3945	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3946	+ copy.CloseUI();
	3947	+ //copy.editWindow.refreshContents();
	3948	+ }
	3949	+ }
	3950	+ else
2852	3951	if (event.getSource() == propagateToggle)
2853	3952	{
2854	3953	propagate ^= true;
..	..	@@ -2884,31 +3983,48 @@
2884	3983	cameraView.ToggleDL();
2885	3984	cameraView.repaint();
2886	3985	return;
2887		- } else if (event.getSource() == toggleTextureItem)
	3986	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2888	3987	{
2889	3988	cameraView.ToggleTexture();
2890	3989	// june 2013 copy.HardTouch();
2891	3990	cameraView.repaint();
2892	3991	return;
2893		- } else if (event.getSource() == toggleFullItem)
	3992	+ } else if (event.getSource() == toggleTimelineItem)
2894	3993	{
2895		- if (CameraPane.FULLSCREEN)
	3994	+ timeline ^= true;
	3995	+
	3996	+ if (timeline)
2896	3997	{
2897		- frame.getContentPane().remove(/"Center",/bigThree);
2898		- framePanel.add(bigThree);
2899		- frame.getContentPane().add(/"Center",/framePanel);
2900		- } else
2901		- {
2902		- frame.getContentPane().remove(/"Center",/framePanel);
2903		- frame.getContentPane().add(/"Center",/bigThree);
	3998	+ centralPanel.remove(cameraView);
	3999	+ cameraPanel.add(cameraView);
	4000	+ centralPanel.add(cameraPanel);
	4001	+ frame.setJMenuBar(timelineMenubar);
	4002	+ wasFullScreen = CameraPane.FULLSCREEN;
	4003	+ if (!CameraPane.FULLSCREEN)
	4004	+ ToggleFullScreen();
	4005	+ toggleFullScreenItem.setEnabled(false);
2904	4006	}
	4007	+ else
	4008	+ {
	4009	+ centralPanel.remove(cameraPanel);
	4010	+ centralPanel.add(cameraView);
	4011	+ frame.setJMenuBar(null);
	4012	+ if (!wasFullScreen)
	4013	+ ToggleFullScreen();
	4014	+ toggleFullScreenItem.setEnabled(true);
	4015	+ }
	4016	+
2905	4017	frame.validate();
2906		- cameraView.ToggleFullScreen();
	4018	+ return;
	4019	+ } else if (event.getSource() == toggleFullScreenItem)
	4020	+ {
	4021	+ ToggleFullScreen();
	4022	+ frame.validate();
2907	4023
2908	4024	return;
2909		- } else if (event.getSource() == toggleRandomItem)
	4025	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2910	4026	{
2911		- cameraView.ToggleRandom();
	4027	+ cameraView.ToggleSwitch();
2912	4028	cameraView.repaint();
2913	4029	return;
2914	4030	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2936,12 +4052,17 @@
2936	4052	} else if (event.getSource() == liveCB)
2937	4053	{
2938	4054	copy.live ^= true;
	4055	+ objEditor.refreshContents(true); // To show item colors
	4056	+ return;
	4057	+ } else if (event.getSource() == selectableCB)
	4058	+ {
	4059	+ copy.dontselect ^= true;
2939	4060	return;
2940	4061	} else if (event.getSource() == hideCB)
2941	4062	{
2942	4063	copy.hide ^= true;
2943	4064	copy.Touch(); // display list issue
2944		- objEditor.refreshContents();
	4065	+ objEditor.refreshContents(true); // To show item colors
2945	4066	return;
2946	4067	} else if (event.getSource() == link2masterCB)
2947	4068	{
..	..	@@ -2951,6 +4072,7 @@
2951	4072	if (event.getSource() == randomCB)
2952	4073	{
2953	4074	copy.random ^= true;
	4075	+ objEditor.refreshContents();
2954	4076	return;
2955	4077	}
2956	4078	if (event.getSource() == speedupCB)
..	..	@@ -2974,8 +4096,9 @@
2974	4096
2975	4097	public void actionPerformed(ActionEvent event)
2976	4098	{
	4099	+ Object source = event.getSource();
2977	4100	// SCRIPT DIALOG
2978		- if (event.getSource() == okbutton)
	4101	+ if (source == okbutton)
2979	4102	{
2980	4103	textpanel.setVisible(false);
2981	4104	textpanel.remove(textarea);
..	..	@@ -2987,7 +4110,7 @@
2987	4110	textarea = null;
2988	4111	textpanel = null;
2989	4112	}
2990		- if (event.getSource() == cancelbutton)
	4113	+ if (source == cancelbutton)
2991	4114	{
2992	4115	textpanel.setVisible(false);
2993	4116	textpanel.remove(textarea);
..	..	@@ -2999,49 +4122,50 @@
2999	4122	//applySelf();
3000	4123	//client.refreshEditWindow();
3001	4124	//refreshContents();
3002		- if (event.getSource() == nameField)
	4125	+ if (source == nameField)
3003	4126	{
3004	4127	//System.out.println("ObjEditor " + event);
3005	4128	applySelf0(true);
3006	4129	//parent.applySelf();
3007		- objEditor.refreshContents();
3008		- } else if (event.getSource() == resetButton)
	4130	+ // conflicts with requestFocus objEditor.refreshContents();
	4131	+ } else if (source == resetButton)
3009	4132	{
3010	4133	CameraPane.fullreset = true;
3011	4134	copy.Reset(); // ResetMeshes();
3012	4135	copy.Touch();
3013	4136	objEditor.refreshContents();
3014		- } else if (event.getSource() == stepItem)
	4137	+ } else if (source == stepItem)
3015	4138	{
3016		- cameraView.ONESTEP = true;
	4139	+ //cameraView.ONESTEP = true;
	4140	+ Globals.ONESTEP = true;
3017	4141	cameraView.repaint();
3018	4142	return;
3019		- } else if (event.getSource() == stepButton)
	4143	+ } else if (source == stepButton)
3020	4144	{
3021	4145	copy.Step();
3022	4146	copy.Touch();
3023	4147	objEditor.refreshContents();
3024		- } else if (event.getSource() == slowerButton)
	4148	+ } else if (source == slowerButton)
3025	4149	{
3026	4150	copy.Slower();
3027	4151	copy.Touch();
3028	4152	objEditor.refreshContents();
3029		- } else if (event.getSource() == fasterButton)
	4153	+ } else if (source == fasterButton)
3030	4154	{
3031	4155	copy.Faster();
3032	4156	copy.Touch();
3033	4157	objEditor.refreshContents();
3034		- } else if (event.getSource() == remarkButton)
	4158	+ } else if (source == remarkButton)
3035	4159	{
3036	4160	copy.Remark();
3037	4161	copy.Touch();
3038	4162	objEditor.refreshContents();
3039		- } else if (event.getSource() == stepAllButton)
	4163	+ } else if (source == stepAllButton)
3040	4164	{
3041	4165	copy.StepAll();
3042	4166	copy.Touch();
3043	4167	objEditor.refreshContents();
3044		- } else if (event.getSource() == resetAllButton)
	4168	+ } else if (source == resetAllButton)
3045	4169	{
3046	4170	//CameraPane.fullreset = true;
3047	4171	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3074,53 +4198,79 @@
3074	4198	// Close();
3075	4199	// }
3076	4200	// else
3077		- if (event.getSource() == resetSlidersButton)
	4201	+ if (source == resetSlidersButton)
3078	4202	{
3079	4203	ResetSliders();
3080		- } else if (event.getSource() == clearMaterialButton)
	4204	+ } else if (source == clearMaterialButton)
3081	4205	{
3082	4206	ClearMaterial();
3083		- } else if (event.getSource() == createMaterialButton)
	4207	+ } else if (source == createMaterialButton)
3084	4208	{
3085	4209	CreateMaterial();
3086		- } else if (event.getSource() == clearPanelButton)
	4210	+ } else if (source == clearPanelButton)
3087	4211	{
3088	4212	copy.ClearUI();
3089	4213	refreshContents(true);
3090		- } /*
3091		- }
3092		-
3093		- public boolean action(Event event, Object arg)
3094		- {
3095		- */ else if (event.getSource() == closeItem)
	4214	+ } else if (source == importGFDItem)
	4215	+ {
	4216	+ ImportGFD();
	4217	+ } else
	4218	+ if (source == importVRMLX3DItem)
	4219	+ {
	4220	+ ImportVRMLX3D();
	4221	+ } else
	4222	+ if (source == import3DSItem)
	4223	+ {
	4224	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4225	+ } else
	4226	+ if (source == importOBJItem)
	4227	+ {
	4228	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4229	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4230	+ browser.setVisible(true);
	4231	+ String filename = browser.getFile();
	4232	+ if (filename != null && filename.length() > 0)
	4233	+ {
	4234	+ String fullname = browser.getDirectory() + filename;
	4235	+ makeSomething(ReadOBJ(fullname), true);
	4236	+ }
	4237	+ } else
	4238	+ if (source == closeItem)
3096	4239	{
3097	4240	Close();
3098	4241	//return true;
3099		- } else if (event.getSource() == loadItem)
	4242	+ } else if (source == openItem)
3100	4243	{
3101		- load();
	4244	+ Open();
3102	4245	//return true;
3103		- } else if (event.getSource() == saveItem)
	4246	+ } else if (source == newItem)
	4247	+ {
	4248	+ New();
	4249	+ } else if (source == saveItem)
3104	4250	{
3105	4251	save();
3106	4252	//return true;
3107		- } else if (event.getSource() == saveAsItem)
	4253	+ } else if (source == saveAsItem)
3108	4254	{
3109	4255	saveAs();
3110	4256	//return true;
3111		- } else if (event.getSource() == reexportItem)
	4257	+ } else if (source == reexportItem)
3112	4258	{
3113	4259	reexport();
3114	4260	//return true;
3115		- } else if (event.getSource() == exportAsItem)
	4261	+ } else if (source == exportAsItem)
3116	4262	{
3117	4263	export();
3118	4264	//return true;
3119		- } else if (event.getSource() == povItem)
	4265	+ } else if (source == povItem)
3120	4266	{
3121	4267	generatePOV();
3122	4268	//return true;
3123		- } else if (event.getSource() == zBufferItem)
	4269	+ } else if (event.getSource() == archiveItem)
	4270	+ {
	4271	+ cTools.Archive(frame);
	4272	+ return;
	4273	+ } else if (source == zBufferItem)
3124	4274	{
3125	4275	try
3126	4276	{
..	..	@@ -3142,21 +4292,8 @@
3142	4292	cameraView.repaint();
3143	4293	//return true;
3144	4294	}
3145		- */ else if (event.getSource() == editCameraItem)
3146		- {
3147		- cameraView.ProtectCamera();
3148		- cameraView.repaint();
3149		- return;
3150		- } else if (event.getSource() == revertCameraItem)
3151		- {
3152		- cameraView.RevertCamera();
3153		- cameraView.repaint();
3154		- return;
3155		- } else if (event.getSource() == textureButton)
3156		- {
3157		- return; // true;
3158		- } else // combos...
3159		- if (event.getSource() == texresMenu)
	4295	+ */ else // combos...
	4296	+ if (source == texresMenu)
3160	4297	{
3161	4298	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3162	4299	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3168,27 +4305,522 @@
3168	4305	}
3169	4306	}
3170	4307
3171		- void ToggleAnimation()
	4308	+ void New()
3172	4309	{
3173		- if (!CameraPane.ANIMATION)
	4310	+ while (copy.Size() > 0)
3174	4311	{
3175		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4312	+ copy.remove(0);
	4313	+ }
	4314	+
	4315	+ copy.selection.clear();
	4316	+
	4317	+ if (copy == Grafreed.grafreed.universe)
	4318	+ {
	4319	+ CreateCameras();
	4320	+ cameraView.SetCamera(GetCamera(copy, 0));
	4321	+ }
	4322	+ ResetModel();
	4323	+ objEditor.refreshContents();
	4324	+ }
	4325	+
	4326	+ static public byte[] Compress(Object3D o)
	4327	+ {
	4328	+ // Slower to actually compress.
	4329	+ try
	4330	+ {
	4331	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4332	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4333	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4334	+
	4335	+ Object3D parent = o.parent;
	4336	+ o.parent = null;
	4337	+
	4338	+ out.writeObject(o);
	4339	+
	4340	+ o.parent = parent;
	4341	+
	4342	+ out.flush();
	4343	+
	4344	+ baos //zstream
	4345	+ .close();
	4346	+ out.close();
	4347	+
	4348	+ byte[] bytes = baos.toByteArray();
	4349	+
	4350	+ System.out.println("save #bytes = " + bytes.length);
	4351	+ return bytes;
	4352	+ } catch (Exception e)
	4353	+ {
	4354	+ System.err.println(e);
	4355	+ return null;
	4356	+ }
	4357	+ }
	4358	+
	4359	+ static public Object Uncompress(byte[] bytes)
	4360	+ {
	4361	+ System.out.println("restore #bytes = " + bytes.length);
	4362	+ try
	4363	+ {
	4364	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4365	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4366	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4367	+ Object obj = in.readObject();
	4368	+
	4369	+ bais //istream
	4370	+ .close();
	4371	+ in.close();
	4372	+
	4373	+ return obj;
	4374	+ } catch (Exception e)
	4375	+ {
	4376	+ System.err.println(e);
	4377	+ return null;
	4378	+ }
	4379	+ }
	4380	+
	4381	+ static public Object clone(Object o)
	4382	+ {
	4383	+ try
	4384	+ {
	4385	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4386	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4387	+
	4388	+ out.writeObject(o);
	4389	+
	4390	+ out.flush();
	4391	+ out.close();
	4392	+
	4393	+ byte[] bytes = baos.toByteArray();
	4394	+
	4395	+ System.out.println("clone = " + bytes.length);
	4396	+
	4397	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4398	+ ObjectInputStream in = new ObjectInputStream(bais);
	4399	+ Object obj = in.readObject();
	4400	+ in.close();
	4401	+
	4402	+ return obj;
	4403	+ } catch (Exception e)
	4404	+ {
	4405	+ System.err.println(e);
	4406	+ return null;
	4407	+ }
	4408	+ }
	4409	+
	4410	+ cRadio GetCurrentTab()
	4411	+ {
	4412	+ cRadio ab;
	4413	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4414	+ {
	4415	+ ab = (cRadio)e.nextElement();
	4416	+ if(ab.GetObject() == copy)
	4417	+ {
	4418	+ return ab;
	4419	+ }
	4420	+ }
	4421	+
	4422	+ return null;
	4423	+ }
	4424	+
	4425	+
	4426	+ public void Save()
	4427	+ {
	4428	+ //Save(true);
	4429	+ Replace();
	4430	+ SetVersionStates();
	4431	+ }
	4432	+
	4433	+ private boolean Equal(byte[] compress, byte[] name)
	4434	+ {
	4435	+ if (compress.length != name.length)
	4436	+ {
	4437	+ return false;
	4438	+ }
	4439	+
	4440	+ for (int i=compress.length; --i>=0;)
	4441	+ {
	4442	+ if (compress[i] != name[i])
	4443	+ return false;
	4444	+ }
	4445	+
	4446	+ return true;
	4447	+ }
	4448	+
	4449	+ void DeleteVersion()
	4450	+ {
	4451	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4452	+ {
	4453	+ copy.versionlist[i] = copy.versionlist[i+1];
	4454	+ }
	4455	+
	4456	+ if (copy.versionlist[copy.versionindex] == null)
	4457	+ copy.versionindex -= 1;
	4458	+
	4459	+ if (copy.versionindex != -1)
	4460	+ CopyChanged();
	4461	+
	4462	+ SetVersionStates();
	4463	+ }
	4464	+
	4465	+ public boolean Save(boolean user)
	4466	+ {
	4467	+ System.err.println("Save");
	4468	+ Replace();
	4469	+
	4470	+ if (copy.versionlist == null)
	4471	+ {
	4472	+ copy.versionlist = new Object3D[100];
	4473	+ copy.versionindex = -1;
	4474	+ }
	4475	+
	4476	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4477	+
	4478	+ boolean thesame = false;
	4479	+
	4480	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4481	+// {
	4482	+// thesame = true;
	4483	+// }
	4484	+
	4485	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4486	+ if (!thesame)
	4487	+ {
	4488	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4489	+ {
	4490	+ copy.versionlist[i] = copy.versionlist[i-1];
	4491	+ }
	4492	+
	4493	+ //tab.user[tab.versionindex] = user;
	4494	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4495	+
	4496	+ copy.versionlist[++copy.versionindex] = compress;
	4497	+
	4498	+ // if (increment)
	4499	+ // tab.versionindex++;
	4500	+ }
	4501	+
	4502	+ //copy.RestoreBigData(versiontable);
	4503	+
	4504	+ //assert(hashtable.isEmpty());
	4505	+
	4506	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4507	+// {
	4508	+// //tab.user[i] = false;
	4509	+// copy.versionlist[i] = null;
	4510	+// }
	4511	+
	4512	+ SetVersionStates();
	4513	+
	4514	+ // test save
	4515	+ if (false)
	4516	+ {
	4517	+ try
	4518	+ {
	4519	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4520	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4521	+
	4522	+ p.writeObject(copy);
	4523	+
	4524	+ p.flush();
	4525	+
	4526	+ ostream.close();
	4527	+ } catch (Exception e)
	4528	+ {
	4529	+ e.printStackTrace();
	4530	+ }
	4531	+ }
	4532	+
	4533	+ return !thesame;
	4534	+ }
	4535	+
	4536	+ boolean flashIt = true;
	4537	+
	4538	+ void RefreshSelection()
	4539	+ {
	4540	+ Object3D selection = new Object3D();
	4541	+
	4542	+ for (int i = 0; i < copy.selection.size(); i++)
	4543	+ {
	4544	+ Object3D elem = copy.selection.elementAt(i);
	4545	+
	4546	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4547	+
	4548	+ if (obj == null)
	4549	+ {
	4550	+ copy.selection.remove(i--);
	4551	+ }
	4552	+ else
	4553	+ {
	4554	+ selection.add(obj);
	4555	+ copy.selection.setElementAt(obj, i);
	4556	+ }
	4557	+ }
	4558	+
	4559	+ flashIt = false;
	4560	+ GetTree().clearSelection();
	4561	+ for (int i = 0; i < selection.size(); i++)
	4562	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4563	+ flashIt = true;
	4564	+
	4565	+ //refreshContents(false);
	4566	+ }
	4567	+
	4568	+ void CopyChanged()
	4569	+ {
	4570	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4571	+
	4572	+ SetVersionStates();
	4573	+
	4574	+ boolean temp = CameraPane.SWITCH;
	4575	+ CameraPane.SWITCH = false;
	4576	+
	4577	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4578	+
	4579	+ copy.clear();
	4580	+
	4581	+ copy.skyboxname = obj.skyboxname;
	4582	+ copy.skyboxext = obj.skyboxext;
	4583	+
	4584	+ for (int i=0; i<obj.Size(); i++)
	4585	+ {
	4586	+ copy.add(obj.get(i));
	4587	+ }
	4588	+
	4589	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4590	+
	4591	+ CameraPane.SWITCH = temp;
	4592	+
	4593	+ RefreshSelection();
	4594	+ //assert(hashtable.isEmpty());
	4595	+
	4596	+ copy.Touch();
	4597	+
	4598	+ ResetModel();
	4599	+ copy.HardTouch(); // recompile?
	4600	+
	4601	+ cRadio ab;
	4602	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4603	+ {
	4604	+ ab = (cRadio)e.nextElement();
	4605	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4606	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4607	+ if (test != null)
	4608	+ {
	4609	+ test.editWindow = ab.object.editWindow;
	4610	+ ab.object = test;
	4611	+ }
	4612	+ }
	4613	+
	4614	+ refreshContents(true);
	4615	+ }
	4616	+
	4617	+ cButton previousVersionButton;
	4618	+ cButton restoreButton;
	4619	+ cButton replaceButton;
	4620	+ cButton nextVersionButton;
	4621	+ cButton saveVersionButton;
	4622	+ cButton deleteVersionButton;
	4623	+
	4624	+ boolean muteSlider;
	4625	+
	4626	+ int VersionCount()
	4627	+ {
	4628	+ int count = 0;
	4629	+
	4630	+ for (int i = copy.versionlist.length; --i >= 0;)
	4631	+ {
	4632	+ if (copy.versionlist[i] != null)
	4633	+ count++;
	4634	+ }
	4635	+
	4636	+ return count;
	4637	+ }
	4638	+
	4639	+ public cGridBag versionSliderPane;
	4640	+
	4641	+ void SetVersionStates()
	4642	+ {
	4643	+ //if (true)
	4644	+ // return;
	4645	+
	4646	+ //cRadio tab = GetCurrentTab();
	4647	+
	4648	+ if (copy.versionindex == -2)
	4649	+ {
	4650	+ saveVersionButton.setEnabled(false);
	4651	+ restoreButton.setEnabled(false);
	4652	+ replaceButton.setEnabled(false);
	4653	+ previousVersionButton.setEnabled(false);
	4654	+ nextVersionButton.setEnabled(false);
	4655	+ deleteVersionButton.setEnabled(false);
	4656	+ versionSliderPane.setVisible(false);
	4657	+ }
	4658	+ else
	4659	+ {
	4660	+ restoreButton.setEnabled(copy.versionindex != -1);
	4661	+ replaceButton.setEnabled(copy.versionindex != -1);
	4662	+
	4663	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4664	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4665	+
	4666	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4667	+ //copy.versionlist[copy.versionindex + 1] != null);
	4668	+
	4669	+ muteSlider = true;
	4670	+ versionSlider.setMinimum(0);
	4671	+ versionSlider.setMaximum(VersionCount() - 1);
	4672	+ versionSlider.setInteger(copy.versionindex);
	4673	+ versionSlider.setEnabled(copy.versionindex != -1);
	4674	+ muteSlider = false;
	4675	+
	4676	+ versionSliderPane.setVisible(true);
	4677	+ }
	4678	+ }
	4679	+
	4680	+ public boolean PreviousVersion()
	4681	+ {
	4682	+ // Option?
	4683	+ Replace();
	4684	+
	4685	+ System.err.println("Undo");
	4686	+
	4687	+ //cRadio tab = GetCurrentTab();
	4688	+
	4689	+ if (copy.versionindex == 0)
	4690	+ {
	4691	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4692	+ return false;
	4693	+ }
	4694	+
	4695	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4696	+// {
	4697	+// if (Save(false))
	4698	+// tab.versionindex -= 1;
	4699	+// else
	4700	+// {
	4701	+// if (tab.versionindex <= 0)
	4702	+// return false;
	4703	+// else
	4704	+// tab.versionindex -= 1;
	4705	+// }
	4706	+// }
	4707	+
	4708	+ copy.versionindex -= 1;
	4709	+
	4710	+ CopyChanged();
	4711	+
	4712	+ return true;
	4713	+ }
	4714	+
	4715	+ public boolean Restore()
	4716	+ {
	4717	+ System.err.println("Restore");
	4718	+
	4719	+ //cRadio tab = GetCurrentTab();
	4720	+
	4721	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4722	+ {
	4723	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4724	+ return false;
	4725	+ }
	4726	+
	4727	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4728	+ CopyChanged();
	4729	+
	4730	+ return true;
	4731	+ }
	4732	+
	4733	+ public boolean Replace()
	4734	+ {
	4735	+ //System.err.println("Replace");
	4736	+
	4737	+ //cRadio tab = GetCurrentTab();
	4738	+
	4739	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4740	+ {
	4741	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4742	+ return false;
	4743	+ }
	4744	+
	4745	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4746	+
	4747	+ return true;
	4748	+ }
	4749	+
	4750	+ public void NextVersion()
	4751	+ {
	4752	+ // Option?
	4753	+ Replace();
	4754	+
	4755	+ //cRadio tab = GetCurrentTab();
	4756	+
	4757	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4758	+ {
	4759	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4760	+ return;
	4761	+ }
	4762	+
	4763	+ copy.versionindex += 1;
	4764	+
	4765	+ CopyChanged();
	4766	+
	4767	+ //if (!tab.user[tab.versionindex])
	4768	+ // tab.graphs[tab.versionindex] = null;
	4769	+ }
	4770	+
	4771	+ void ImportGFD()
	4772	+ {
	4773	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3176	4774	browser.show();
3177	4775	String filename = browser.getFile();
3178	4776	if (filename != null && filename.length() > 0)
3179	4777	{
3180		- CameraPane.filename = browser.getDirectory() + filename;
	4778	+ String fullname = browser.getDirectory() + filename;
	4779	+
	4780	+ //Object3D readobj =
	4781	+ objEditor.ReadGFD(fullname, objEditor);
	4782	+ //makeSomething(readobj);
	4783	+ }
	4784	+ }
	4785	+
	4786	+ void ImportVRMLX3D()
	4787	+ {
	4788	+ if (Grafreed.standAlone)
	4789	+ {
	4790	+ /**/
	4791	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4792	+ browser.show();
	4793	+ String filename = browser.getFile();
	4794	+ if (filename != null && filename.length() > 0)
	4795	+ {
	4796	+ String fullname = browser.getDirectory() + filename;
	4797	+ LoadVRMLX3D(fullname);
	4798	+ }
	4799	+ /**/
	4800	+ }
	4801	+ }
	4802	+
	4803	+ void ToggleAnimation()
	4804	+ {
	4805	+ if (!Globals.ANIMATION)
	4806	+ {
	4807	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4808	+ browser.setVisible(true);
	4809	+ String filename = browser.getFile();
	4810	+ if (filename != null && filename.length() > 0)
	4811	+ {
	4812	+ Globals.filename = browser.getDirectory() + filename;
3181	4813	//CameraPane.framecount = 0;
3182		- CameraPane.imagecount = 0;
	4814	+ Globals.imagecount = 0;
3183	4815
3184		- CameraPane.ANIMATION ^= true;
	4816	+ Globals.ANIMATION ^= true;
3185	4817
3186		- GrafreeD.wav.cursor = 0;
3187		- GrafreeD.wav.loop = 0;
	4818	+ Grafreed.wav.cursor = 0;
	4819	+ Grafreed.wav.loop = 0;
3188	4820	}
3189	4821	} else
3190	4822	{
3191		- CameraPane.ANIMATION ^= true;
	4823	+ Globals.ANIMATION ^= true;
3192	4824	}
3193	4825	}
3194	4826
..	..	@@ -3234,7 +4866,7 @@
3234	4866	void CreateMaterial()
3235	4867	{
3236	4868	//copy.ClearMaterial(); // PATCH
3237		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4869	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3238	4870	if (copy.selection.size() > 0)
3239	4871	//SetMaterial(copy);
3240	4872	{
..	..	@@ -3285,7 +4917,7 @@
3285	4917	assert false;
3286	4918	}
3287	4919
3288		- void EditSelection()
	4920	+ void EditSelection(boolean newWindow)
3289	4921	{
3290	4922	}
3291	4923
..	..	@@ -3293,11 +4925,11 @@
3293	4925	{
3294	4926	copy.ResetBlockLoop(); // temporary problem
3295	4927
3296		- boolean random = CameraPane.RANDOM;
3297		- CameraPane.RANDOM = false; // parse everything
	4928	+ boolean random = CameraPane.SWITCH;
	4929	+ CameraPane.SWITCH = false; // parse everything
3298	4930	copy.ResetDisplayList();
3299	4931	copy.HardTouch();
3300		- CameraPane.RANDOM = random;
	4932	+ CameraPane.SWITCH = random;
3301	4933	}
3302	4934
3303	4935	// public void applySelf()
..	..	@@ -3327,6 +4959,12 @@
3327	4959	// else
3328	4960	// applySelf(true);
3329	4961	// }
	4962	+
	4963	+ boolean Equal(double a, double b)
	4964	+ {
	4965	+ return Math.abs(a - b) < 0.001;
	4966	+ }
	4967	+
3330	4968	void applySelf0(boolean name)
3331	4969	{
3332	4970	if (name)
..	..	@@ -3344,7 +4982,7 @@
3344	4982	//copy.material = new cMaterial(copy.GetMaterial());
3345	4983
3346	4984	current.color = (float) colorField.getFloat();
3347		- current.modulation = (float) modulationField.getFloat();
	4985	+ current.modulation = (float) saturationField.getFloat();
3348	4986	current.metalness = (float) metalnessField.getFloat();
3349	4987	current.diffuse = (float) diffuseField.getFloat();
3350	4988	current.specular = (float) specularField.getFloat();
..	..	@@ -3364,13 +5002,69 @@
3364	5002	current.shadow = (float) shadowField.getFloat();
3365	5003	current.texture = (float) textureField.getFloat();
3366	5004	current.opacity = (float) opacityField.getFloat();
	5005	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
3367	5006	current.fakedepth = (float) fakedepthField.getFloat();
3368	5007	current.shadowbias = (float) shadowbiasField.getFloat();
3369	5008
3370		- if (!NumberSlider.frozen)
	5009	+ if (!cNumberSlider.frozen)
3371	5010	{
3372	5011	//System.out.println("Propagate = " + propagate);
3373	5012	copy.UpdateMaterial(anchor, current, propagate);
	5013	+
	5014	+ if (copy.material != null)
	5015	+ {
	5016	+ cMaterial mat = copy.material;
	5017	+
	5018	+ if (!Equal(colorField.getFloat(), mat.color))
	5019	+ colorField.SetToolTipValue((mat.color));
	5020	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5021	+ saturationField.SetToolTipValue((mat.modulation));
	5022	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5023	+ metalnessField.SetToolTipValue((mat.metalness));
	5024	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5025	+ diffuseField.SetToolTipValue((mat.diffuse));
	5026	+ if (!Equal(specularField.getFloat(), mat.specular))
	5027	+ specularField.SetToolTipValue((mat.specular));
	5028	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5029	+ shininessField.SetToolTipValue((mat.shininess));
	5030	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5031	+ shiftField.SetToolTipValue((mat.shift));
	5032	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5033	+ ambientField.SetToolTipValue((mat.ambient));
	5034	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5035	+ lightareaField.SetToolTipValue((mat.lightarea));
	5036	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5037	+ diffusenessField.SetToolTipValue((mat.factor));
	5038	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5039	+ velvetField.SetToolTipValue((mat.velvet));
	5040	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5041	+ sheenField.SetToolTipValue((mat.sheen));
	5042	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5043	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5044	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5045	+ backlitField.SetToolTipValue((mat.bump));
	5046	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5047	+ anisoField.SetToolTipValue((mat.aniso));
	5048	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5049	+ anisoVField.SetToolTipValue((mat.anisoV));
	5050	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5051	+ cameraField.SetToolTipValue((mat.cameralight));
	5052	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5053	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5054	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5055	+ shadowField.SetToolTipValue((mat.shadow));
	5056	+ if (!Equal(textureField.getFloat(), mat.texture))
	5057	+ textureField.SetToolTipValue((mat.texture));
	5058	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5059	+ opacityField.SetToolTipValue((mat.opacity));
	5060	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5061	+ parallaxField.SetToolTipValue((mat.parallax));
	5062	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5063	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5064	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5065	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	5066	+ }
	5067	+
3374	5068	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3375	5069	{
3376	5070	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3399,9 +5093,28 @@
3399	5093	//copy.Touch();
3400	5094	}
3401	5095
	5096	+ cNumberSlider versionSlider;
	5097	+
3402	5098	public void stateChanged(ChangeEvent e)
3403	5099	{
3404		- // assert(false);
	5100	+ // assert(false);
	5101	+ if (e.getSource() == versionSlider)
	5102	+ {
	5103	+ if (muteSlider)
	5104	+ return;
	5105	+
	5106	+ Replace();
	5107	+
	5108	+ int version = versionSlider.getInteger();
	5109	+
	5110	+ if (version != -1 && copy.versionlist[version] != null)
	5111	+ {
	5112	+ copy.versionindex = version;
	5113	+ CopyChanged();
	5114	+ }
	5115	+
	5116	+ return;
	5117	+ }
3405	5118
3406	5119	if (freezematerial)
3407	5120	{
..	..	@@ -3415,6 +5128,7 @@
3415	5128	\|\| e.getSource() == apertureField
3416	5129	\|\| e.getSource() == shadowblurField)
3417	5130	{
	5131	+ new Exception().printStackTrace();
3418	5132	System.exit(0);
3419	5133	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3420	5134	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3436,12 +5150,24 @@
3436	5150	{
3437	5151	//System.out.println("stateChanged = " + this);
3438	5152	materialtouched = true;
	5153	+
	5154	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5155	+ {
	5156	+ saturationField.setFloat(1);
	5157	+ }
	5158	+
3439	5159	applySelf();
3440	5160	//System.out.println("this = " + this);
3441	5161	//System.out.println("PARENT = " + parent);
3442	5162	//if (parent != null)
3443	5163	// parent.applySelf();
3444		- refreshContents();
	5164	+ if (e.getSource() == normalpushField)
	5165	+ {
	5166	+ objEditor.refreshContents();
	5167	+ //Refresh();
	5168	+ }
	5169	+ else
	5170	+ refreshContents();
3445	5171	// ??? client.refreshEditWindow();
3446	5172	}
3447	5173	//else
..	..	@@ -3453,7 +5179,7 @@
3453	5179	//group.name = nameField.getText();
3454	5180	//objEditor.applySelf();
3455	5181
3456		- assert (objEditor == this);
	5182	+ // OCT2018: assert (objEditor == this);
3457	5183	if (copy.selection == null \|\| copy.selection.size() == 0)
3458	5184	//super.applySelf()
3459	5185	; else
..	..	@@ -3477,12 +5203,18 @@
3477	5203	objEditor.copy = keep;
3478	5204	}
3479	5205	}
	5206	+
	5207	+ if (normalpushField != null)
	5208	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3480	5209	}
3481	5210
3482	5211	void SnapObject()
3483	5212	{
3484		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3485		- SnapObject(obj);
	5213	+ if (copy.selection.size() > 0)
	5214	+ {
	5215	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	5216	+ SnapObject(obj);
	5217	+ }
3486	5218	}
3487	5219
3488	5220	void SnapObject(Object3D obj)
..	..	@@ -3596,7 +5328,7 @@
3596	5328
3597	5329	if (obj.parent != null)
3598	5330	{
3599		- obj.parent.TransformToWorld(interest);
	5331	+// obj.parent.TransformToWorld(interest);
3600	5332	}
3601	5333
3602	5334	if (!CameraPane.TRACK)
..	..	@@ -3723,20 +5455,28 @@
3723	5455	{
3724	5456	if (GetTree() != null)
3725	5457	{
	5458	+ GetTree().revalidate();
3726	5459	GetTree().repaint();
3727	5460	}
3728	5461
3729	5462	radioPanel.revalidate();
3730	5463	radioPanel.repaint();
3731		- ctrlPanel.revalidate(); // ? new
	5464	+ ctrlPanel.validate(); // ? new
3732	5465	ctrlPanel.repaint();
3733	5466	}
	5467	+
	5468	+ if (previousVersionButton != null && copy.versionlist != null)
	5469	+ SetVersionStates();
	5470	+
	5471	+ cameraView.requestFocusInWindow();
3734	5472	}
3735	5473
3736	5474	static TweenManager tweenManager = new TweenManager();
3737	5475
3738	5476	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3739	5477	{
	5478	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5479	+ Save();
3740	5480	//Tween.set(thing, 0).target(1).start(tweenManager);
3741	5481	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3742	5482	// if (thing instanceof GenericJointDemo)
..	..	@@ -3760,7 +5500,7 @@
3760	5500	// group = (Composite) group.get(0);
3761	5501	// }
3762	5502
3763		- System.out.println("makeSomething of " + thing);
	5503	+ //System.out.println("makeSomething of " + thing);
3764	5504
3765	5505	/*
3766	5506	if (deselect && jList != null)
..	..	@@ -3823,6 +5563,12 @@
3823	5563	{
3824	5564	ResetModel();
3825	5565	Select(thing.GetTreePath(), true, false); // unselect... false);
	5566	+
	5567	+ if (thing.Size() == 0)
	5568	+ {
	5569	+ //EditSelection(false);
	5570	+ }
	5571	+
3826	5572	refreshContents();
3827	5573	}
3828	5574
..	..	@@ -3940,6 +5686,7 @@
3940	5686	}
3941	5687	}
3942	5688	}
	5689	+
3943	5690	LoadGFDThread loadGFDThread;
3944	5691
3945	5692	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3959,8 +5706,10 @@
3959	5706
3960	5707	try
3961	5708	{
	5709	+ // Try compressed version first.
3962	5710	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3963		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5711	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5712	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3964	5713
3965	5714	readobj = (Object3D) p.readObject();
3966	5715	istream.close();
..	..	@@ -3968,7 +5717,22 @@
3968	5717	readobj.ResetDisplayList();
3969	5718	} catch (Exception e)
3970	5719	{
3971		- e.printStackTrace();
	5720	+ if (!e.toString().contains("GZIP"))
	5721	+ e.printStackTrace();
	5722	+
	5723	+ try
	5724	+ {
	5725	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5726	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5727	+
	5728	+ readobj = (Object3D) p.readObject();
	5729	+ istream.close();
	5730	+
	5731	+ readobj.ResetDisplayList();
	5732	+ } catch (Exception e2)
	5733	+ {
	5734	+ e2.printStackTrace();
	5735	+ }
3972	5736	}
3973	5737	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3974	5738	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4014,6 +5778,12 @@
4014	5778
4015	5779	void LoadIt(Object obj)
4016	5780	{
	5781	+ if (obj == null)
	5782	+ {
	5783	+ // Invalid file
	5784	+ return;
	5785	+ }
	5786	+
4017	5787	System.out.println("Loaded " + obj);
4018	5788	//new Exception().printStackTrace();
4019	5789	Object3D readobj = (Object3D) obj;
..	..	@@ -4023,10 +5793,14 @@
4023	5793
4024	5794	if (readobj != null)
4025	5795	{
	5796	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5797	+ // Save();
4026	5798	try
4027	5799	{
4028	5800	//readobj.deepCopySelf(copy);
4029	5801	copy.clear(); // june 2014
	5802	+ copy.skyboxname = readobj.skyboxname;
	5803	+ copy.skyboxext = readobj.skyboxext;
4030	5804	for (int i = 0; i < readobj.size(); i++)
4031	5805	{
4032	5806	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4067,6 +5841,7 @@
4067	5841	}
4068	5842	} catch (ClassCastException e)
4069	5843	{
	5844	+ e.printStackTrace();
4070	5845	assert (false);
4071	5846	Composite c = (Composite) copy;
4072	5847	c.children.clear();
..	..	@@ -4077,17 +5852,32 @@
4077	5852	c.addChild(csg);
4078	5853	}
4079	5854
	5855	+ copy.versionlist = readobj.versionlist;
	5856	+ copy.versionindex = readobj.versionindex;
	5857	+ copy.versiontable = readobj.versiontable;
	5858	+
	5859	+ if (copy.versionlist == null)
	5860	+ {
	5861	+ // Backward compatibility
	5862	+ copy.versionlist = new Object3D[100];
	5863	+ copy.versionindex = -1;
	5864	+
	5865	+ //Save(true);
	5866	+ }
	5867	+
	5868	+ //? SetUndoStates();
	5869	+
4080	5870	ResetModel();
4081	5871	copy.HardTouch(); // recompile?
4082	5872	refreshContents();
4083	5873	}
4084	5874	}
4085	5875
4086		- void load() // throws ClassNotFoundException
	5876	+ void Open() // throws ClassNotFoundException
4087	5877	{
4088		- if (GrafreeD.standAlone)
	5878	+ if (Grafreed.standAlone)
4089	5879	{
4090		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5880	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4091	5881	browser.show();
4092	5882	String filename = browser.getFile();
4093	5883	if (filename != null && filename.length() > 0)
..	..	@@ -4164,6 +5954,8 @@
4164	5954
4165	5955	void save()
4166	5956	{
	5957	+ Replace();
	5958	+
4167	5959	if (lastname == null)
4168	5960	{
4169	5961	return;
..	..	@@ -4172,11 +5964,13 @@
4172	5964	try
4173	5965	{
4174	5966	FileOutputStream ostream = new FileOutputStream(lastname);
4175		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5967	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5968	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4176	5969
4177	5970	p.writeObject(copy);
4178	5971	p.flush();
4179	5972
	5973	+ zstream.close();
4180	5974	ostream.close();
4181	5975
4182	5976	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4184,19 +5978,23 @@
4184	5978	//ps.print(buffer.toString());
4185	5979	} catch (IOException e)
4186	5980	{
	5981	+ e.printStackTrace();
4187	5982	}
4188	5983	}
	5984	+
4189	5985	String lastname;
4190	5986
4191	5987	void saveAs()
4192	5988	{
4193		- if (GrafreeD.standAlone)
	5989	+ if (Grafreed.standAlone)
4194	5990	{
4195	5991	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4196	5992	browser.setVisible(true);
4197	5993	String filename = browser.getFile();
4198	5994	if (filename != null && filename.length() > 0)
4199	5995	{
	5996	+ if (!filename.endsWith(".gfd"))
	5997	+ filename += ".gfd";
4200	5998	lastname = browser.getDirectory() + filename;
4201	5999	save();
4202	6000	}
..	..	@@ -4295,13 +6093,13 @@
4295	6093	try
4296	6094	{
4297	6095	FileOutputStream ostream = new FileOutputStream(filename);
4298		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4299		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	6096	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	6097	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4300	6098
4301	6099	Object3D objectparent = obj.parent;
4302	6100	obj.parent = null;
4303	6101
4304		- Object3D object = (Object3D) GrafreeD.clone(obj);
	6102	+ Object3D object = (Object3D) Grafreed.clone(obj);
4305	6103
4306	6104	obj.parent = objectparent;
4307	6105
..	..	@@ -4313,8 +6111,8 @@
4313	6111	p.writeObject(object);
4314	6112	p.flush();
4315	6113
	6114	+ zstream.close();
4316	6115	ostream.close();
4317		- // zstream.close();
4318	6116
4319	6117	// group.selection.get(0).parent = parent;
4320	6118	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4335,7 +6133,7 @@
4335	6133	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4336	6134	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4337	6135	copy.generatePOV(buffer);
4338		- if (GrafreeD.standAlone)
	6136	+ if (Grafreed.standAlone)
4339	6137	{
4340	6138	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4341	6139	browser.show();
..	..	@@ -4361,53 +6159,72 @@
4361	6159	Object3D client;
4362	6160	Object3D copy;
4363	6161	MenuBar menuBar;
4364		- Menu windowMenu;
4365		- MenuItem loadItem;
	6162	+ Menu fileMenu;
	6163	+ MenuItem newItem;
	6164	+ MenuItem openItem;
4366	6165	MenuItem saveItem;
4367	6166	MenuItem saveAsItem;
4368	6167	MenuItem exportAsItem;
4369	6168	MenuItem reexportItem;
4370	6169	MenuItem povItem;
4371	6170	MenuItem closeItem;
4372		- Menu cameraMenu;
	6171	+
4373	6172	CheckboxMenuItem zBufferItem;
4374	6173	//MenuItem normalLensItem;
4375		- MenuItem editCameraItem;
4376		- MenuItem revertCameraItem;
4377		- CheckboxMenuItem toggleLiveItem;
4378	6174	MenuItem stepItem;
4379		- CheckboxMenuItem toggleFullItem;
	6175	+ CheckboxMenuItem toggleLiveItem;
	6176	+ CheckboxMenuItem toggleFullScreenItem;
	6177	+ CheckboxMenuItem toggleTimelineItem;
4380	6178	CheckboxMenuItem toggleRenderItem;
4381	6179	CheckboxMenuItem toggleDebugItem;
4382	6180	CheckboxMenuItem toggleFrustumItem;
4383	6181	CheckboxMenuItem toggleFootContactItem;
4384	6182	CheckboxMenuItem toggleDLItem;
4385	6183	CheckboxMenuItem toggleTextureItem;
4386		- CheckboxMenuItem toggleRandomItem;
	6184	+ CheckboxMenuItem toggleSwitchItem;
4387	6185	CheckboxMenuItem toggleRootItem;
4388	6186	CheckboxMenuItem animationItem;
	6187	+ MenuItem archiveItem;
4389	6188	CheckboxMenuItem toggleHandleItem;
4390	6189	CheckboxMenuItem togglePaintItem;
4391	6190	JSplitPane mainPanel;
4392	6191	JScrollPane scrollpane;
	6192	+
4393	6193	JPanel toolbarPanel;
4394		- JPanel treePanel;
	6194	+
	6195	+ cGridBag treePanel;
	6196	+
4395	6197	JPanel radioPanel;
4396	6198	ButtonGroup buttonGroup;
4397		- JPanel ctrlPanel;
4398		- JPanel materialPanel;
	6199	+
	6200	+ cGridBag toolboxPanel;
	6201	+ cGridBag skyboxPanel;
	6202	+ cGridBag materialPanel;
	6203	+ cGridBag ctrlPanel;
	6204	+
4399	6205	JScrollPane infoPanel;
4400		- JPanel optionsPanel;
	6206	+
	6207	+ cGridBag optionsPanel;
	6208	+
4401	6209	JTabbedPane objectPanel;
4402		- JPanel XYZPanel;
	6210	+ boolean materialFlushed;
	6211	+ Object3D latestObject;
	6212	+
	6213	+ cGridBag transformPanel;
	6214	+ cGridBag XYZPanel;
	6215	+
4403	6216	JSplitPane gridPanel;
4404	6217	JSplitPane bigPanel;
4405		- JPanel bigThree;
4406		- JTabbedPane jtp;
4407		- JPanel cameraPanel;
	6218	+
	6219	+ cGridBag bigThree;
	6220	+ cGridBag scenePanel;
	6221	+ cGridBag centralPanel;
	6222	+ JSplitPane cameraPanel;
	6223	+ JPanel timelinePanel;
	6224	+ JMenuBar timelineMenubar;
4408	6225	JSplitPane framePanel;
4409	6226	JTextArea/Field/ nameField;
4410		- cButton textureButton;
	6227	+ //cButton textureButton;
4411	6228	cButton okButton;
4412	6229	cButton applyButton;
4413	6230	cButton cancelButton;
..	..	@@ -4454,65 +6271,76 @@
4454	6271	// MATERIAL
4455	6272	JLabel materialLabel;
4456	6273	JLabel colorLabel;
4457		- NumberSlider colorField;
	6274	+ cNumberSlider colorField;
4458	6275	JLabel modulationLabel;
4459		- NumberSlider modulationField;
	6276	+ cNumberSlider saturationField;
4460	6277	JLabel metalnessLabel;
4461		- NumberSlider metalnessField;
	6278	+ cNumberSlider metalnessField;
4462	6279	JLabel diffuseLabel;
4463		- NumberSlider diffuseField;
	6280	+ cNumberSlider diffuseField;
4464	6281	JLabel specularLabel;
4465		- NumberSlider specularField;
	6282	+ cNumberSlider specularField;
4466	6283	JLabel shininessLabel;
4467		- NumberSlider shininessField;
	6284	+ cNumberSlider shininessField;
4468	6285	JLabel shiftLabel;
4469		- NumberSlider shiftField;
	6286	+ cNumberSlider shiftField;
4470	6287	JLabel ambientLabel;
4471		- NumberSlider ambientField;
	6288	+ cNumberSlider ambientField;
4472	6289	JLabel lightareaLabel;
4473		- NumberSlider lightareaField;
	6290	+ cNumberSlider lightareaField;
4474	6291	JLabel diffusenessLabel;
4475		- NumberSlider diffusenessField;
	6292	+ cNumberSlider diffusenessField;
4476	6293	JLabel velvetLabel;
4477		- NumberSlider velvetField;
	6294	+ cNumberSlider velvetField;
4478	6295	JLabel sheenLabel;
4479		- NumberSlider sheenField;
	6296	+ cNumberSlider sheenField;
4480	6297	JLabel subsurfaceLabel;
4481		- NumberSlider subsurfaceField;
	6298	+ cNumberSlider subsurfaceField;
4482	6299	//JLabel bumpLabel;
4483	6300	//NumberSlider bumpField;
4484	6301	JLabel backlitLabel;
4485		- NumberSlider backlitField;
	6302	+ cNumberSlider backlitField;
4486	6303	JLabel anisoLabel;
4487		- NumberSlider anisoField;
	6304	+ cNumberSlider anisoField;
4488	6305	JLabel anisoVLabel;
4489		- NumberSlider anisoVField;
	6306	+ cNumberSlider anisoVField;
	6307	+
4490	6308	JLabel cameraLabel;
4491		- NumberSlider cameraField;
	6309	+ cNumberSlider cameraField;
4492	6310	JLabel selfshadowLabel;
4493		- NumberSlider selfshadowField;
	6311	+ cNumberSlider selfshadowField;
4494	6312	JLabel shadowLabel;
4495		- NumberSlider shadowField;
	6313	+ cNumberSlider shadowField;
4496	6314	JLabel textureLabel;
4497		- NumberSlider textureField;
	6315	+ cNumberSlider textureField;
4498	6316	JLabel opacityLabel;
4499		- NumberSlider opacityField;
	6317	+ cNumberSlider opacityField;
	6318	+ JLabel parallaxLabel;
	6319	+ cNumberSlider parallaxField;
4500	6320	JLabel fakedepthLabel;
4501		- NumberSlider fakedepthField;
	6321	+ cNumberSlider fakedepthField;
4502	6322	JLabel shadowbiasLabel;
4503		- NumberSlider shadowbiasField;
	6323	+ cNumberSlider shadowbiasField;
	6324	+
4504	6325	JLabel bumpLabel;
4505		- NumberSlider bumpField;
	6326	+ cNumberSlider bumpField;
4506	6327	JLabel noiseLabel;
4507		- NumberSlider noiseField;
	6328	+ cNumberSlider noiseField;
4508	6329	JLabel powerLabel;
4509		- NumberSlider powerField;
	6330	+ cNumberSlider powerField;
4510	6331	JLabel borderfadeLabel;
4511		- NumberSlider borderfadeField;
	6332	+ cNumberSlider borderfadeField;
4512	6333	JLabel fogLabel;
4513		- NumberSlider fogField;
	6334	+ cNumberSlider fogField;
4514	6335	JLabel opacityPowerLabel;
4515		- NumberSlider opacityPowerField;
4516		- JTree jTree;
	6336	+ cNumberSlider opacityPowerField;
	6337	+ cTree jTree;
4517	6338	//ObjectUI parent;
	6339	+
	6340	+ cNumberSlider normalpushField;
	6341	+
	6342	+ private MenuItem importGFDItem;
	6343	+ private MenuItem importVRMLX3DItem;
	6344	+ private MenuItem import3DSItem;
	6345	+ private MenuItem importOBJItem;
4518	6346	}