~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,64 @@
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	+ if (versionPanel != null)
	320	+ objEditor.ctrlPanel.remove(versionPanel);
	321	+ //objEditor.ctrlPanel.remove(fillPanel);
	322	+
	323	+ //Remove(normalpushField);
161	324	}
162	325
163	326	public ObjEditor GetEditor()
164	327	{
165	328	return objEditor; //.GetEditor();
166	329	}
	330	+
	331	+ // Sometimes myself, sometimes my callee's.
167	332	ObjEditor objEditor;
168	333
169	334	/*
..	..	@@ -199,6 +364,14 @@
199	364	client = inClient;
200	365	copy = client;
201	366
	367	+// if (copy.versionlist == null)
	368	+// {
	369	+// copy.versionlist = new Object3D[100];
	370	+// copy.versionindex = -1;
	371	+//
	372	+// callee.Save(true);
	373	+// }
	374	+
202	375	// "this" is not called: SetupUI2(objEditor);
203	376	}
204	377
..	..	@@ -226,23 +399,33 @@
226	399	//localCopy.parent = null;
227	400
228	401	frame = new JFrame();
	402	+ frame.setUndecorated(false);
229	403	objEditor = this;
230	404	this.callee = callee;
231	405
232	406	//parent = p;
233	407
234	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
235		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
236	411	//gd.setFullScreenWindow(this);
237	412	//setResizable(false);
238	413	//if (!isDisplayable())
239	414	//setUndecorated(true);
240	415
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	416	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	417	client = inClient;
243	418	copy = localCopy;
244	419	copy.editWindow = this;
245	420
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
	424	+// copy.versionindex = -1;
	425	+//
	426	+// Save(true);
	427	+// }
	428	+
246	429	SetupMenu();
247	430
248	431	//SetupName(objEditor); // new
..	..	@@ -256,28 +439,55 @@
256	439	return frame.action(event, obj);
257	440	}
258	441
	442	+ // Cannot work without static
	443	+ static boolean allparams = true;
	444	+
	445	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	446	+
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
259	450	void SetupMenu()
260	451	{
261	452	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..."));
	453	+ menuBar.add(fileMenu = new Menu("File"));
	454	+ fileMenu.add(newItem = new MenuItem("New"));
	455	+ fileMenu.add(openItem = new MenuItem("Open..."));
	456	+
	457	+ //oe.menuBar.add(menu = new Menu("Include"));
	458	+ Menu menu = new Menu("Import");
	459	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	460	+ importOBJItem.addActionListener(this);
	461	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	462	+ import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
	465	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	466	+ importVRMLX3DItem.addActionListener(this);
	467	+ }
	468	+ menu.add("-");
	469	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	470	+ importGFDItem.addActionListener(this);
	471	+ fileMenu.add(menu);
	472	+ fileMenu.add("-");
	473	+
	474	+ fileMenu.add(saveItem = new MenuItem("Save"));
	475	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	476	//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("-");
	477	+ fileMenu.add("-");
	478	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	479	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	480	+ fileMenu.add("-");
272	481	if (client.parent != null)
273	482	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	483	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	484	} else
276	485	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	486	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	487	}
279	488
280		- loadItem.addActionListener(this);
	489	+ newItem.addActionListener(this);
	490	+ openItem.addActionListener(this);
281	491	saveItem.addActionListener(this);
282	492	saveAsItem.addActionListener(this);
283	493	exportAsItem.addActionListener(this);
..	..	@@ -285,80 +495,103 @@
285	495	//povItem.addActionListener(this);
286	496	closeItem.addActionListener(this);
287	497
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	498	objectPanel = new JTabbedPane();
	499	+
	500	+ ChangeListener changeListener = new ChangeListener()
	501	+ {
	502	+ //String name;
	503	+
	504	+ public void stateChanged(ChangeEvent changeEvent)
	505	+ {
	506	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	507	+// {
	508	+// if (latestObject != null)
	509	+// {
	510	+// refreshContents(true);
	511	+// SetMaterial(latestObject);
	512	+// }
	513	+//
	514	+// materialFlushed = true;
	515	+// }
	516	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	517	+// {
	518	+// if (listUI.size() == 0)
	519	+// EditSelection(false);
	520	+// }
	521	+
	522	+// if (objectPanel.getSelectedIndex() == 4)
	523	+// {
	524	+// name = copy.skyboxname;
	525	+//
	526	+// if (name == null)
	527	+// {
	528	+// name = "";
	529	+// }
	530	+//
	531	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	532	+// copy.skyboxext = "jpg";
	533	+// }
	534	+// else
	535	+// {
	536	+// if (name != null)
	537	+// {
	538	+// if (name.equals(""))
	539	+// {
	540	+// copy.skyboxname = null;
	541	+// copy.skyboxext = null;
	542	+// }
	543	+// else
	544	+// {
	545	+// copy.skyboxname = name;
	546	+// }
	547	+// }
	548	+// }
	549	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	550	+
	551	+// refreshContents(false); // To refresh Info tab
	552	+ cameraView.repaint();
	553	+ }
	554	+ };
	555	+ objectPanel.addChangeListener(changeListener);
	556	+
342	557	toolbarPanel = new JPanel();
343	558	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	559	+
	560	+ treePanel = new cGridBag();
345	561	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
349		- materialPanel.setName("Material");
	562	+
	563	+ editPanel = new cGridBag().setVertical(true);
	564	+ //editPanel.setName("Edit");
	565	+
	566	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	567	+
	568	+ editCommandsPanel = new cGridBag();
	569	+ editPanel.add(editCommandsPanel);
	570	+ editPanel.add(ctrlPanel);
	571	+
	572	+ toolboxPanel = new cGridBag().setVertical(true);
	573	+ //toolboxPanel.setName("Toolbox");
	574	+
	575	+ skyboxPanel = new cGridBag().setVertical(true);
	576	+
	577	+ materialPanel = new cGridBag().setVertical(false);
	578	+ //materialPanel.setName("Material");
	579	+
350	580	/JTextPane/
351	581	infoarea = createTextPane();
	582	+ doc = infoarea.getStyledDocument();
	583	+
352	584	infoarea.setEditable(true);
353	585	SetText();
	586	+
354	587	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	588	// infoarea.setOpaque(false);
356	589	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	590	+// TEXTAREA infoarea.setLineWrap(true);
	591	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	592	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");
	593	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	594	+ //infoPanel.setName("Info");
362	595	//infoPanel.setLayout(new BorderLayout());
363	596	//infoPanel.add(createTextPane());
364	597
..	..	@@ -366,16 +599,23 @@
366	599	mainPanel.setName("Main");
367	600	mainPanel.setContinuousLayout(true);
368	601	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	602	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
372		-
	603	+ mainPanel.setDividerLocation(0.5); //1.0);
	604	+ mainPanel.setResizeWeight(0.5);
	605	+
	606	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	607	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	608	+ divider.setDividerSize(15);
	609	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	610	+
	611	+ mainPanel.setUI(new BasicSplitPaneUI());
	612	+
373	613	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	614	//mainPanel.setLayout(new GridBagLayout());
375	615	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	616	+// treePanel.setLayout(new GridBagLayout());
	617	+ //ctrlPanel.setLayout(new GridBagLayout());
	618	+ //materialPanel.setLayout(new GridBagLayout());
379	619
380	620	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	621	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +654,7 @@
414	654	static String newline = "\n";
415	655	protected static final String buttonString = "JButton";
416	656	StyledDocument doc;
417		- JTextArea infoarea;
	657	+ JTextPane infoarea;
418	658
419	659	void ClearInfo()
420	660	{
..	..	@@ -437,10 +677,10 @@
437	677	e.printStackTrace();
438	678	}
439	679
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();
	680	+// String selection = infoarea.getText();
	681	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	682	+// java.awt.datatransfer.Clipboard clipboard =
	683	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	684	//clipboard.setContents(data, data);
445	685	}
446	686
..	..	@@ -463,13 +703,13 @@
463	703	//SendInfo("Name:", "bold");
464	704	if (sel.GetTextures() != null \|\| debug)
465	705	{
466		- si.SendInfo(sel.toString(), "bold");
	706	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	707	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	708	if (sel.Size() > 0)
469	709	{
470	710	si.SendInfo("#children = " + sel.Size(), "regular");
471	711	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	712	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	713	if (debug)
474	714	{
475	715	try
..	..	@@ -481,7 +721,10 @@
481	721	}
482	722
483	723	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	724	+ {
	725	+ si.SendInfo(" BBox min: " + minima, "regular");
	726	+ si.SendInfo(" BBox max: " + maxima, "regular");
	727	+ }
485	728
486	729	if (sel.bRep != null)
487	730	{
..	..	@@ -508,7 +751,7 @@
508	751	}
509	752	if (sel.support != null)
510	753	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	754	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	755	}
513	756	if (sel.scriptnode != null)
514	757	{
..	..	@@ -522,18 +765,18 @@
522	765	maxima.y = sel.toParent[3][1];
523	766	maxima.z = sel.toParent[3][2];
524	767	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	768	maxima.x = sel.toParent[0][0];
531	769	maxima.y = sel.toParent[1][1];
532	770	maxima.z = sel.toParent[2][2];
533	771	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];
	772	+ maxima.x = sel.globalTransform[3][0];
	773	+ maxima.y = sel.globalTransform[3][1];
	774	+ maxima.z = sel.globalTransform[3][2];
	775	+ if (full)
	776	+ si.SendInfo(" Global Orig: " + maxima, "regular");
	777	+ maxima.x = sel.globalTransform[0][0];
	778	+ maxima.y = sel.globalTransform[1][1];
	779	+ maxima.z = sel.globalTransform[2][2];
537	780	if (full)
538	781	si.SendInfo(" Global Scale: " + maxima, "regular");
539	782	}
..	..	@@ -579,6 +822,9 @@
579	822	{
580	823	CameraPane.pointflow = (PointFlow) sel;
581	824	}
	825	+
	826	+ si.SendInfo("_____________________", "regular");
	827	+ si.SendInfo("", "regular");
582	828	}
583	829	}
584	830
..	..	@@ -594,52 +840,216 @@
594	840	}
595	841	}
596	842
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		- };
	843	+//static GraphicsDevice device = GraphicsEnvironment
	844	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	845
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	846	+ Rectangle keeprect;
	847	+ cRadio radio;
	848	+
	849	+cButton keepButton;
	850	+ cButton twoButton; // Full 3D
	851	+ cButton sixButton;
	852	+ cButton threeButton;
	853	+ cButton sevenButton;
	854	+ cButton fourButton; // full panel
	855	+ cButton oneButton; // full XYZ
	856	+ //cButton currentLayout;
	857	+
	858	+ boolean maximized;
	859	+
	860	+ cButton fullscreenLayout;
	861	+ cButton expandedLayout;
621	862
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	863	+ void Minimize()
628	864	{
629		- for (int j = 0; j < 2; j++)
	865	+ frame.setState(Frame.ICONIFIED);
	866	+ frame.validate();
	867	+ }
	868	+
	869	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	870	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	871	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	872	+ void Maximize()
	873	+ {
	874	+ if (CameraPane.FULLSCREEN)
630	875	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	876	+ ToggleFullScreen();
636	877	}
637		- } catch (BadLocationException ble)
	878	+
	879	+ if (maximized)
	880	+ {
	881	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	882	+ }
	883	+ else
	884	+ {
	885	+ keeprect = frame.getBounds();
	886	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	887	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	888	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	889	+// frame.setState(Frame.MAXIMIZED_BOTH);
	890	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	891	+ }
	892	+
	893	+ maximized ^= true;
	894	+
	895	+ frame.validate();
	896	+ }
	897	+
	898	+ cButton minButton;
	899	+ cButton maxButton;
	900	+ cButton fullButton;
	901	+ cButton collapseButton;
	902	+ cButton maximize3DButton;
	903	+
	904	+ void ToggleFullScreen()
638	905	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	906	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	907	+
	908	+ cameraView.ToggleFullScreen();
	909	+
	910	+ if (!CameraPane.FULLSCREEN)
	911	+ {
	912	+ device.setFullScreenWindow(null);
	913	+ frame.dispose();
	914	+ frame.setUndecorated(false);
	915	+ frame.validate();
	916	+ frame.setVisible(true);
	917	+
	918	+ //frame.setVisible(false);
	919	+// frame.removeNotify();
	920	+// frame.setUndecorated(false);
	921	+// frame.addNotify();
	922	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	923	+
	924	+// X frame.getContentPane().remove(/"Center",/bigThree);
	925	+// X framePanel.add(bigThree);
	926	+// X frame.getContentPane().add(/"Center",/framePanel);
	927	+// framePanel.setDividerLocation(46); // icons are 24x24
	928	+
	929	+ //frame.setVisible(true);
	930	+// radio.layout = keepButton;
	931	+ //theFrame = null;
	932	+ keepButton = null;
	933	+// radio.layout.doClick();
	934	+
	935	+ } else
	936	+ {
	937	+ keepButton = radio.layout;
	938	+ //keeprect = frame.getBounds();
	939	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	940	+// frame.getToolkit().getScreenSize().height);
	941	+ //frame.setVisible(false);
	942	+
	943	+ frame.dispose();
	944	+ frame.setUndecorated(true);
	945	+ device.setFullScreenWindow(frame);
	946	+ frame.validate();
	947	+ frame.setVisible(true);
	948	+// frame.removeNotify();
	949	+// frame.setUndecorated(true);
	950	+// frame.addNotify();
	951	+// X frame.getContentPane().remove(/"Center",/framePanel);
	952	+// X framePanel.remove(bigThree);
	953	+// X frame.getContentPane().add(/"Center",/bigThree);
	954	+// framePanel.setDividerLocation(0);
	955	+
	956	+// radio.layout = fullscreenLayout;
	957	+// radio.layout.doClick();
	958	+ //frame.setVisible(true);
	959	+ }
	960	+ frame.validate();
	961	+
	962	+ cameraView.requestFocusInWindow();
640	963	}
641	964
642		- return new JTextArea(); // textPane;
	965	+ void CollapseToolbar()
	966	+ {
	967	+ framePanel.setDividerLocation(0);
	968	+ //frame.validate();
	969	+
	970	+ cameraView.requestFocusInWindow();
	971	+ }
	972	+
	973	+ private Object3D Duplicate(Object3D object)
	974	+ {
	975	+ boolean temp = CameraPane.SWITCH;
	976	+ CameraPane.SWITCH = false;
	977	+
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	982	+ // if (copy == client)
	983	+
	984	+ Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	986	+ object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
	991	+
	992	+ //byte[] compress = Compress(copy);
	993	+ Object3D compress = (Object3D)Grafreed.clone(object);
	994	+
	995	+ object.parent = parent;
	996	+
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	1001	+
	1002	+ CameraPane.SWITCH = temp;
	1003	+
	1004	+ return compress;
	1005	+ }
	1006	+
	1007	+ private JTextPane createTextPane()
	1008	+ {
	1009	+// TEXTAREA String[] initString =
	1010	+// {
	1011	+// "This is an editable JTextPane, ", //regular
	1012	+// "another ", //italic
	1013	+// "styled ", //bold
	1014	+// "text ", //small
	1015	+// "component, ", //large
	1016	+// "which supports embedded components..." + newline,//regular
	1017	+// " " + newline, //button
	1018	+// "...and embedded icons..." + newline, //regular
	1019	+// " ", //icon
	1020	+// newline + "JTextPane is a subclass of JEditorPane that "
	1021	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	1022	+// + "cover methods for interacting with those objects."
	1023	+// };
	1024	+//
	1025	+// String[] initStyles =
	1026	+// {
	1027	+// "regular", "italic", "bold", "small", "large",
	1028	+// "regular", "button", "regular", "icon",
	1029	+// "regular"
	1030	+// };
	1031	+//
	1032	+// JTextPane textPane = new JTextPane();
	1033	+// textPane.setEditable(true);
	1034	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1035	+// addStylesToDocument(doc);
	1036	+//
	1037	+// try
	1038	+// {
	1039	+// for (int j = 0; j < 2; j++)
	1040	+// {
	1041	+// for (int i = 0; i < initString.length; i++)
	1042	+// {
	1043	+// doc.insertString(doc.getLength(), initString[i],
	1044	+// doc.getStyle(initStyles[i]));
	1045	+// }
	1046	+// }
	1047	+// } catch (BadLocationException ble)
	1048	+// {
	1049	+// System.err.println("Couldn't insert initial text into text pane.");
	1050	+// }
	1051	+
	1052	+ return new JTextPane(); // textPane;
643	1053	}
644	1054
645	1055	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +1102,7 @@
692	1102	protected static ImageIcon createImageIcon(String path,
693	1103	String description)
694	1104	{
695		- java.net.URL imgURL = GraphreeD.class.getResource(path);
	1105	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	1106	if (imgURL != null)
697	1107	{
698	1108	return new ImageIcon(imgURL, description);
..	..	@@ -715,6 +1125,7 @@
715	1125	{
716	1126	SetupMaterial(materialPanel);
717	1127	}
	1128	+
718	1129	//SetupName();
719	1130	//SetupViews();
720	1131	}
..	..	@@ -724,6 +1135,7 @@
724	1135	// NumberSlider vDivsField;
725	1136	// JCheckBox endcaps;
726	1137	JCheckBox liveCB;
	1138	+ JCheckBox selectableCB;
727	1139	JCheckBox hideCB;
728	1140	JCheckBox link2masterCB;
729	1141	JCheckBox markCB;
..	..	@@ -731,7 +1143,12 @@
731	1143	JCheckBox speedupCB;
732	1144	JCheckBox rewindCB;
733	1145	JCheckBox flipVCB;
	1146	+
	1147	+ cCheckBox toggleTextureCB;
	1148	+ cCheckBox toggleSwitchCB;
	1149	+
734	1150	JComboBox texresMenu;
	1151	+
735	1152	JButton resetButton;
736	1153	JButton stepButton;
737	1154	JButton stepAllButton;
..	..	@@ -739,115 +1156,88 @@
739	1156	JButton slowerButton;
740	1157	JButton fasterButton;
741	1158	JButton remarkButton;
	1159	+
	1160	+ cGridBag editPanel;
	1161	+ cGridBag editCommandsPanel;
	1162	+
	1163	+ cGridBag namePanel;
	1164	+ cGridBag setupPanel;
	1165	+ cGridBag setupPanel2;
	1166	+ cGridBag objectCommandsPanel;
	1167	+ cGridBag pushPanel;
	1168	+ cGridBag versionPanel;
	1169	+ cGridBag fillPanel;
742	1170
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1171	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	1172	{
745	1173	JCheckBox cb;
746	1174
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);
	1175	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	1176	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	1177
757	1178	return cb;
758	1179	}
759	1180
760		- cButton AddButton(ObjEditor oe, String label)
	1181	+ cButton AddButton(cGridBag panel, String label)
761	1182	{
762	1183	cButton cb;
763	1184
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);
	1185	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	1186	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	1187
774	1188	return cb;
775	1189	}
776	1190
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1191	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	1192	{
779	1193	JComboBox combo;
780	1194
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;
	1195	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	1196	combo.addActionListener(this);
785	1197
786	1198	return combo;
787	1199	}
788	1200
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1201	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	1202	{
791		- NumberSlider combo;
	1203	+ cGridBag control = new cGridBag();
	1204	+
	1205	+ cNumberSlider combo;
792	1206
793	1207	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	1208	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		-
	1209	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1210	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	1211	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	1212	+
	1213	+ panel.add(control);
	1214	+
	1215	+ return control;
813	1216	}
814	1217
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1218	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	1219	{
817		- NumberSlider combo;
	1220	+ cGridBag control = new cGridBag();
	1221	+
	1222	+ cNumberSlider combo;
818	1223
819	1224	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1225	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		-
	1226	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1227	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1228	combo.setInteger(current);
833	1229
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1230	+ panel.add(control);
	1231	+
	1232	+ return control;
839	1233	}
840	1234
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1235	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1236	{
843	1237	JTextArea text;
844	1238
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1239	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1240	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1241
852	1242	return text;
853	1243	}
..	..	@@ -877,9 +1267,16 @@
877	1267	objEditor.ctrlPanel.remove(j);
878	1268	}
879	1269
	1270	+ void Remove(cNumberSlider j)
	1271	+ {
	1272	+ j.removeChangeListener(this);
	1273	+ //objEditor.ctrlPanel.remove(j.label);
	1274	+ objEditor.ctrlPanel.remove(j);
	1275	+ }
	1276	+
880	1277	/*
881	1278	*/
882		- void Return() // ObjEditor oe)
	1279	+ void Return0() // ObjEditor oe)
883	1280	{
884	1281	aConstraints.gridy += 1;
885	1282	aConstraints.gridx = 0;
..	..	@@ -934,35 +1331,98 @@
934	1331
935	1332	void SetupUI2(ObjEditor oe)
936	1333	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1334	+ //SetupName(oe);
942	1335
943		- if (!GroupEditor.allparams)
	1336	+ namePanel = new cGridBag();
	1337	+
	1338	+ //if (copy.pinned)
	1339	+ {
	1340	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1341	+ pinButton.setSelected(copy.pinned);
	1342	+ cGridBag t = new cGridBag();
	1343	+ t.preferredWidth = 2;
	1344	+ t.add(pinButton);
	1345	+ namePanel.add(t);
	1346	+
	1347	+ pinButton.addItemListener(this);
	1348	+ }
	1349	+
	1350	+ nameField = AddText(namePanel, copy.GetName());
	1351	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1352	+ oe.ctrlPanel.add(namePanel);
	1353	+
	1354	+ oe.ctrlPanel.Return();
	1355	+
	1356	+ if (!allparams)
944	1357	return;
945	1358
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1359	+ setupPanel = new cGridBag().setVertical(false);
	1360	+
	1361	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1362	+ liveCB.setToolTipText("Animate object");
	1363	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1364	+ markCB.setToolTipText("Set target transform");
	1365	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1366	+ selectableCB.setToolTipText("Make object selectable");
949	1367	// 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");
	1368	+
	1369	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1370	+ hideCB.setToolTipText("Hide object");
	1371	+
	1372	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1373	+
	1374	+ setupPanel2 = new cGridBag().setVertical(false);
	1375	+
	1376	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1377	+ rewindCB.setToolTipText("Rewind animation");
	1378	+
	1379	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1380	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1381	+
	1382	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1383	+ link2masterCB.setToolTipText("Attach to support");
	1384	+
	1385	+ if (Globals.ADVANCED)
	1386	+ {
	1387	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1388	+ speedupCB.setToolTipText("Option motion capture");
	1389	+ }
	1390	+
	1391	+ oe.ctrlPanel.add(setupPanel);
	1392	+ oe.ctrlPanel.Return();
	1393	+ oe.ctrlPanel.add(setupPanel2);
	1394	+ oe.ctrlPanel.Return();
	1395	+
	1396	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1397	+
	1398	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1399	+ resetButton.setToolTipText("Jump to frame zero");
	1400	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1401	+ stepButton.setToolTipText("Step one frame");
956	1402	// resetAllButton = AddButton(oe, "Reset All");
957	1403	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1404	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1405	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1406	+ slowerButton.setToolTipText("Decrease animation speed");
	1407	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1408	+ fasterButton.setToolTipText("Increase animation speed");
	1409	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1410	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1411
964		- Return();
	1412	+ oe.ctrlPanel.add(objectCommandsPanel);
	1413	+ oe.ctrlPanel.Return();
965	1414
	1415	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH * 100, 1.1); // To have the buttons
	1416	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1417	+ if (false && copy.versionlist != null && copy.versionindex != -1)
	1418	+ {
	1419	+ oe.ctrlPanel.Return();
	1420	+ versionPanel = AddSlider(oe.ctrlPanel, "Version", 0, copy.VersionCount() - 1, copy.versionindex);
	1421	+ versionField = (cNumberSlider)versionPanel.getComponent(1);
	1422	+ }
	1423	+
	1424	+ oe.ctrlPanel.Return();
	1425	+
966	1426	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1427	// ObjEditor.aConstraints.gridx += 1;
968	1428
..	..	@@ -1056,7 +1516,7 @@
1056	1516	oe.aConstraints.gridwidth = 1;
1057	1517	/**/
1058	1518	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1519	+ oe.ctrlPanel.Return();
1060	1520
1061	1521	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1522	//textureButton.setEnabled(false);
..	..	@@ -1107,29 +1567,16 @@
1107	1567	//frontScroll.setLabel("------------------------------ XZ (front) ---------------------------------------------------");
1108	1568	//sideScroll.setLabel("------------------------------- YZ (side) ---------------------------------------------------");
1109	1569
1110		-// GridBagConstraints gbc = (GridBagConstraints) GraphreeD.clone(aConstraints);
	1570	+// GridBagConstraints gbc = (GridBagConstraints) GrafreeD.clone(aConstraints);
1111	1571	Camera cam = GetCamera(copy, 0);
1112	1572
1113	1573	Composite cams = null;
1114	1574
1115	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1116	1576	{
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);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1133	1580	} else
1134	1581	{
1135	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1158,10 +1605,28 @@
1158	1605	//JPanel worldPanel =
1159	1606	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1607	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1608	+ centralPanel = new cGridBag();
	1609	+ centralPanel.preferredWidth = 20;
	1610	+
	1611	+ if (Globals.ADVANCED)
	1612	+ {
	1613	+ timelinePanel = new JPanel(new BorderLayout());
	1614	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1615
	1616	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1617	+ cameraPanel.setContinuousLayout(true);
	1618	+ cameraPanel.setOneTouchExpandable(true);
	1619	+// cameraPanel.setDividerLocation(0.9);
	1620	+// cameraPanel.setDividerSize(9);
	1621	+ cameraPanel.setResizeWeight(1.0);
	1622	+
	1623	+ }
	1624	+
	1625	+ centralPanel.add(cameraView);
	1626	+ centralPanel.setFocusable(true);
	1627	+ //frame.setJMenuBar(timelineMenubar);
	1628	+ //centralPanel.add(timelinePanel);
	1629	+
1165	1630	//topView.camera = ;
1166	1631	//frontView.camera = new Camera(2);
1167	1632	//sideView.camera = new Camera(3);
..	..	@@ -1177,13 +1642,57 @@
1177	1642	//frontView.object = copy;
1178	1643	//sideView.object = copy;
1179	1644
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1645	+ transformPanel = new cGridBag().setVertical(true);
	1646	+
	1647	+ cGridBag resetTransformPanel = new cGridBag();
	1648	+
	1649	+ resetTransformPanel.preferredHeight = 2;
	1650	+
	1651	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1652	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1653	+ resetTransform.addMouseListener(new MouseAdapter()
	1654	+ {
	1655	+ public void mouseClicked(MouseEvent e)
	1656	+ {
	1657	+ ResetTransform();
	1658	+ }
	1659	+ });
	1660	+ resetTransformPanel.add(resetTransform);
	1661	+
	1662	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1663	+ resetTransform.setToolTipText("Reset Translation only");
	1664	+ resetTransform.addMouseListener(new MouseAdapter()
	1665	+ {
	1666	+ public void mouseClicked(MouseEvent e)
	1667	+ {
	1668	+ ResetTransform(1);
	1669	+ }
	1670	+ });
	1671	+ resetTransformPanel.add(resetTransform);
	1672	+
	1673	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1674	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1675	+ resetTransform.addMouseListener(new MouseAdapter()
	1676	+ {
	1677	+ public void mouseClicked(MouseEvent e)
	1678	+ {
	1679	+ ResetTransform(2);
	1680	+ }
	1681	+ });
	1682	+ resetTransformPanel.add(resetTransform);
	1683	+
	1684	+ XYZPanel = new cGridBag().setVertical(true);
	1685	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1686
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1687	+ XYZPanel.preferredWidth = 5;
	1688	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1689	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1690	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1691	+ //XYZPanel.setName("XYZ");
1186	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1187	1696	/*
1188	1697	gridPanel = new JPanel(); //new BorderLayout());
1189	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1191,12 +1700,12 @@
1191	1700	gridPanel.add(cameraView);
1192	1701	gridPanel.add(XYZPanel);
1193	1702	*/
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);
	1703	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1704	+// gridPanel.setContinuousLayout(true);
	1705	+// gridPanel.setOneTouchExpandable(true);
	1706	+// gridPanel.setDividerLocation(1.0);
	1707	+// gridPanel.setDividerSize(9);
	1708	+// gridPanel.setResizeWeight(0.85);
1200	1709
1201	1710	// aConstraints.weighty = 0;
1202	1711	//System.out.println("THIS = " + this);
..	..	@@ -1219,13 +1728,34 @@
1219	1728
1220	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1730	//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);
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
	1735	+ objectPanel.add(toolboxPanel);
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1228	1738
	1739	+ objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
	1743	+// JPanel north = new JPanel(new BorderLayout());
	1744	+// north.setName("Edit");
	1745	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1746	+// objectPanel.add(north);
	1747	+ objectPanel.add(editPanel);
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1749	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1750	+
	1751	+ objectPanel.add(transformPanel);
	1752	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1754	+
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1229	1759	/*
1230	1760	aConstraints.gridx = 0;
1231	1761	aConstraints.gridwidth = 1;
..	..	@@ -1233,7 +1763,7 @@
1233	1763	aConstraints.gridy += 1;
1234	1764	aConstraints.gridwidth = 1;
1235	1765	mainPanel.add(objectPanel, aConstraints);
1236		- */
	1766	+ */
1237	1767
1238	1768	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1239	1769	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1244,16 +1774,120 @@
1244	1774	scrollpane.setWheelScrollingEnabled(true);
1245	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1776
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1777	+ /JTabbedPane/ scenePanel = new cGridBag();
	1778	+ scenePanel.preferredWidth = 5;
	1779	+
	1780	+ JTabbedPane tabbedPane = new JTabbedPane();
	1781	+ tabbedPane.add(scrollpane);
1249	1782
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1783	+ optionsPanel = new cGridBag().setVertical(false);
1253	1784
1254	1785	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1786	+
	1787	+ AddOptions(optionsPanel); //, aConstraints);
	1788	+
	1789	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
	1793	+ scenePanel.add(tabbedPane);
	1794	+
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
	1797	+
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ objectPanel.add(infoPanel);
	1888	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1889	+ objectPanel.setToolTipTextAt(4, "Information");
	1890	+ }
1257	1891
1258	1892	/*
1259	1893	cTree jTree = new cTree(null);
..	..	@@ -1275,18 +1909,19 @@
1275	1909	jtp.add(tree);
1276	1910	*/
1277	1911
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");
	1912	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1913	+// bigPanel.setContinuousLayout(true);
	1914	+// bigPanel.setOneTouchExpandable(true);
	1915	+// bigPanel.setDividerLocation(0.8);
	1916	+// bigPanel.setDividerSize(15);
	1917	+// bigPanel.setResizeWeight(0.15);
	1918	+// bigPanel.setName("Scene");
1285	1919
1286	1920	//bigPanel.setLayout(new BorderLayout());
1287	1921	//bigPanel.setSize(new Dimension(10,10));
1288	1922	//bigPanel.add(ctrlPanel);
1289	1923	//bigPanel.add(gridPanel);
	1924	+ /**
1290	1925	bigThree = new JPanel();
1291	1926	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1927	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1932,26 @@
1297	1932	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1933	aWindowConstraints.weightx = 0;
1299	1934	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1935	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1936	aWindowConstraints.weightx = 1;
1302	1937	aWindowConstraints.gridwidth = 3;
1303	1938	// aConstraints.gridheight = 3;
1304	1939	aWindowConstraints.gridx = 1;
1305	1940	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1941	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1942	aWindowConstraints.weightx = 0;
1308	1943	aWindowConstraints.gridx = 4;
1309	1944	aWindowConstraints.gridwidth = 1;
1310	1945	// aConstraints.gridheight = 3;
1311	1946	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1947	bigThree.add(XYZPanel, aWindowConstraints);
	1948	+ /**/
1313	1949
	1950	+ bigThree = new cGridBag();
	1951	+ bigThree.addComponent(scenePanel);
	1952	+ bigThree.addComponent(centralPanel);
	1953	+ //bigThree.addComponent(XYZPanel);
	1954	+
1314	1955	// // SIDE EFFECT!!!
1315	1956	// aConstraints.gridx = 0;
1316	1957	// aConstraints.gridy = 0;
..	..	@@ -1318,33 +1959,55 @@
1318	1959	// aConstraints.gridheight = 1;
1319	1960
1320	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1321		- framePanel.setContinuousLayout(true);
1322		- framePanel.setOneTouchExpandable(true);
1323		- framePanel.setDividerLocation(0.8);
	1962	+
	1963	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1964	+ new java.beans.PropertyChangeListener()
	1965	+ {
	1966	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1967	+ {
	1968	+ if ((Integer)pce.getOldValue() == 1)
	1969	+ {
	1970	+ if (radio.layout != expandedLayout)
	1971	+ {
	1972	+ radio.layout = expandedLayout;
	1973	+ radio.layout.doClick();
	1974	+ }
	1975	+ }
	1976	+ }
	1977	+ });
	1978	+
	1979	+ framePanel.setContinuousLayout(false);
	1980	+ framePanel.setOneTouchExpandable(false);
	1981	+ //.setDividerLocation(0.8);
1324	1982	//framePanel.setDividerSize(15);
1325	1983	//framePanel.setResizeWeight(0.15);
1326	1984	framePanel.setName("Frame");
1327	1985
1328	1986	frame.getContentPane().setLayout(new BorderLayout());
1329	1987	/**/
1330		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1331	1989	//worldPane.add(bigPanel);
1332	1990	//worldPane.add(worldPanel);
1333	1991	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1992	+ //frame.getContentPane().add(/"Center",/framePanel);
	1993	+ frame.add(/"Center",/framePanel);
1335	1994	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1995
1337		-// aConstraints = gbc; // (GridBagConstraints) GraphreeD.clone(gbc);
	1996	+// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1997
1339		- frame.setSize(800, 600);
1340		- frame.show();
	1998	+ frame.setSize(1280, 860);
	1999	+
	2000	+ cameraView.requestFocusInWindow();
	2001	+
	2002	+// gridPanel.setDividerLocation(1.0);
	2003	+
	2004	+ frame.validate();
1341	2005
1342		- gridPanel.setDividerLocation(1.0);
	2006	+ frame.setVisible(true);
1343	2007
1344	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1345	2009	frame.addWindowListener(new WindowAdapter()
1346	2010	{
1347		-
1348	2011	public void windowClosing(WindowEvent e)
1349	2012	{
1350	2013	Close();
..	..	@@ -1352,6 +2015,10 @@
1352	2015	});
1353	2016	}
1354	2017
	2018	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	2019	+ {
	2020	+ }
	2021	+
1355	2022	JTree GetTree()
1356	2023	{
1357	2024	return objEditor.jTree;
..	..	@@ -1363,260 +2030,651 @@
1363	2030	ctrlPanel.removeAll();
1364	2031	}
1365	2032
1366		- void SetupMaterial(JPanel ctrlPanel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1367	2034	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	2035	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2036	+
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2038	+ skin.setToolTipText("Skin");
	2039	+ skin.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ // Skin
	2047	+ colorField.setFloat(material.color);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
	2057	+ subsurfaceField.setFloat(material.subsurface);
	2058	+ selfshadowField.setFloat(material.diffuseness);
	2059	+ diffusenessField.setFloat(material.factor);
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ shadowbiasField.setFloat(material.shadowbias);
	2062	+ diffuseField.setFloat(material.diffuse);
	2063	+ specularField.setFloat(material.specular);
	2064	+
	2065	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2066	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2067	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2068	+
	2069	+ materialtouched = true;
	2070	+ applySelf();
	2071	+ }
	2072	+ });
	2073	+ presetpanel.add(skin);
	2074	+
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2076	+ lambert.setToolTipText("Diffuse");
	2077	+ lambert.addMouseListener(new MouseAdapter()
	2078	+ {
	2079	+ public void mouseClicked(MouseEvent e)
	2080	+ {
	2081	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2082	+ cMaterial material = object.material;
	2083	+
	2084	+ diffusenessField.setFloat(material.factor);
	2085	+ selfshadowField.setFloat(material.diffuseness);
	2086	+
	2087	+ materialtouched = true;
	2088	+ applySelf();
	2089	+ }
	2090	+ });
	2091	+ presetpanel.add(lambert);
	2092	+
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2094	+ diffuse2.setToolTipText("Diffuse2");
	2095	+ diffuse2.addMouseListener(new MouseAdapter()
	2096	+ {
	2097	+ public void mouseClicked(MouseEvent e)
	2098	+ {
	2099	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2100	+ cMaterial material = object.material;
	2101	+
	2102	+ diffusenessField.setFloat(material.factor);
	2103	+ selfshadowField.setFloat(material.diffuseness);
	2104	+
	2105	+ materialtouched = true;
	2106	+ applySelf();
	2107	+ }
	2108	+ });
	2109	+ presetpanel.add(diffuse2);
	2110	+
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2112	+ diffusemoon.setToolTipText("Moon");
	2113	+ diffusemoon.addMouseListener(new MouseAdapter()
	2114	+ {
	2115	+ public void mouseClicked(MouseEvent e)
	2116	+ {
	2117	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2118	+ cMaterial material = object.material;
	2119	+
	2120	+ diffusenessField.setFloat(material.factor);
	2121	+ selfshadowField.setFloat(material.diffuseness);
	2122	+
	2123	+ materialtouched = true;
	2124	+ applySelf();
	2125	+ }
	2126	+ });
	2127	+ presetpanel.add(diffusemoon);
	2128	+
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2130	+ diffusemoon2.setToolTipText("Moon2");
	2131	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2132	+ {
	2133	+ public void mouseClicked(MouseEvent e)
	2134	+ {
	2135	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2136	+ cMaterial material = object.material;
	2137	+
	2138	+ diffusenessField.setFloat(material.factor);
	2139	+ selfshadowField.setFloat(material.diffuseness);
	2140	+
	2141	+ materialtouched = true;
	2142	+ applySelf();
	2143	+ }
	2144	+ });
	2145	+ presetpanel.add(diffusemoon2);
	2146	+
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2148	+ diffusemoon3.setToolTipText("Moon3");
	2149	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2150	+ {
	2151	+ public void mouseClicked(MouseEvent e)
	2152	+ {
	2153	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2154	+ cMaterial material = object.material;
	2155	+
	2156	+ diffusenessField.setFloat(material.factor);
	2157	+ selfshadowField.setFloat(material.diffuseness);
	2158	+
	2159	+ materialtouched = true;
	2160	+ applySelf();
	2161	+ }
	2162	+ });
	2163	+ presetpanel.add(diffusemoon3);
	2164	+
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2166	+ diffusesheen.setToolTipText("Sheen");
	2167	+ diffusesheen.addMouseListener(new MouseAdapter()
	2168	+ {
	2169	+ public void mouseClicked(MouseEvent e)
	2170	+ {
	2171	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2172	+ cMaterial material = object.material;
	2173	+
	2174	+ sheenField.setFloat(material.sheen);
	2175	+
	2176	+ materialtouched = true;
	2177	+ applySelf();
	2178	+ }
	2179	+ });
	2180	+ presetpanel.add(diffusesheen);
	2181	+
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2183	+ rough.setToolTipText("Rough metal");
	2184	+ rough.addMouseListener(new MouseAdapter()
	2185	+ {
	2186	+ public void mouseClicked(MouseEvent e)
	2187	+ {
	2188	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2189	+ cMaterial material = object.material;
	2190	+
	2191	+ shininessField.setFloat(material.shininess);
	2192	+ velvetField.setFloat(material.velvet);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(rough);
	2199	+
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2201	+ rough2.setToolTipText("Medium metal");
	2202	+ rough2.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2207	+ cMaterial material = object.material;
	2208	+
	2209	+ shininessField.setFloat(material.shininess);
	2210	+ lightareaField.setFloat(material.lightarea);
	2211	+
	2212	+ materialtouched = true;
	2213	+ applySelf();
	2214	+ }
	2215	+ });
	2216	+ presetpanel.add(rough2);
	2217	+
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2219	+ shini0.setToolTipText("Shiny");
	2220	+ shini0.addMouseListener(new MouseAdapter()
	2221	+ {
	2222	+ public void mouseClicked(MouseEvent e)
	2223	+ {
	2224	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2225	+ cMaterial material = object.material;
	2226	+
	2227	+ shininessField.setFloat(material.shininess);
	2228	+ lightareaField.setFloat(material.lightarea);
	2229	+
	2230	+ materialtouched = true;
	2231	+ applySelf();
	2232	+ }
	2233	+ });
	2234	+ presetpanel.add(shini0);
	2235	+
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2237	+ shini1.setToolTipText("Shiny2");
	2238	+ shini1.addMouseListener(new MouseAdapter()
	2239	+ {
	2240	+ public void mouseClicked(MouseEvent e)
	2241	+ {
	2242	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2243	+ cMaterial material = object.material;
	2244	+
	2245	+ shininessField.setFloat(material.shininess);
	2246	+ lightareaField.setFloat(material.lightarea);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(shini1);
	2253	+
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2255	+ shini2.setToolTipText("Shiny3");
	2256	+ shini2.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2261	+ cMaterial material = object.material;
	2262	+
	2263	+ shininessField.setFloat(material.shininess);
	2264	+ lightareaField.setFloat(material.lightarea);
	2265	+
	2266	+ materialtouched = true;
	2267	+ applySelf();
	2268	+ }
	2269	+ });
	2270	+ presetpanel.add(shini2);
	2271	+
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2273	+ aniso.setToolTipText("AnisoU");
	2274	+ aniso.addMouseListener(new MouseAdapter()
	2275	+ {
	2276	+ public void mouseClicked(MouseEvent e)
	2277	+ {
	2278	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2279	+ cMaterial material = object.material;
	2280	+
	2281	+ anisoField.setFloat(material.aniso);
	2282	+ anisoVField.setFloat(material.anisoV);
	2283	+
	2284	+ materialtouched = true;
	2285	+ applySelf();
	2286	+ }
	2287	+ });
	2288	+ presetpanel.add(aniso);
	2289	+
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2291	+ aniso2.setToolTipText("AnisoV");
	2292	+ aniso2.addMouseListener(new MouseAdapter()
	2293	+ {
	2294	+ public void mouseClicked(MouseEvent e)
	2295	+ {
	2296	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2297	+ cMaterial material = object.material;
	2298	+
	2299	+ anisoField.setFloat(material.aniso);
	2300	+ anisoVField.setFloat(material.anisoV);
	2301	+
	2302	+ materialtouched = true;
	2303	+ applySelf();
	2304	+ }
	2305	+ });
	2306	+ presetpanel.add(aniso2);
	2307	+
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2309	+ aniso3.setToolTipText("AnisoUV");
	2310	+ aniso3.addMouseListener(new MouseAdapter()
	2311	+ {
	2312	+ public void mouseClicked(MouseEvent e)
	2313	+ {
	2314	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2315	+ cMaterial material = object.material;
	2316	+
	2317	+ anisoField.setFloat(material.aniso);
	2318	+ anisoVField.setFloat(material.anisoV);
	2319	+
	2320	+ materialtouched = true;
	2321	+ applySelf();
	2322	+ }
	2323	+ });
	2324	+ presetpanel.add(aniso3);
	2325	+
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2327	+ velvet0.setToolTipText("Velvet");
	2328	+ velvet0.addMouseListener(new MouseAdapter()
	2329	+ {
	2330	+ public void mouseClicked(MouseEvent e)
	2331	+ {
	2332	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2333	+ cMaterial material = object.material;
	2334	+
	2335	+ diffusenessField.setFloat(material.factor);
	2336	+ selfshadowField.setFloat(material.diffuseness);
	2337	+ sheenField.setFloat(material.sheen);
	2338	+ shininessField.setFloat(material.shininess);
	2339	+ velvetField.setFloat(material.velvet);
	2340	+ shiftField.setFloat(material.shift);
	2341	+
	2342	+ materialtouched = true;
	2343	+ applySelf();
	2344	+ }
	2345	+ });
	2346	+ presetpanel.add(velvet0);
	2347	+
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2349	+ bump0.setToolTipText("Bump texture");
	2350	+ bump0.addMouseListener(new MouseAdapter()
	2351	+ {
	2352	+ public void mouseClicked(MouseEvent e)
	2353	+ {
	2354	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2355	+ cMaterial material = object.material;
	2356	+
	2357	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2358	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2359	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2360	+
	2361	+ materialtouched = true;
	2362	+ applySelf();
	2363	+ }
	2364	+ });
	2365	+ presetpanel.add(bump0);
	2366	+
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2368	+ borderShader.setToolTipText("Border fade");
	2369	+ borderShader.addMouseListener(new MouseAdapter()
	2370	+ {
	2371	+ public void mouseClicked(MouseEvent e)
	2372	+ {
	2373	+ borderfadeField.setFloat(0.4);
	2374	+ opacityField.setFloat(0.75);
	2375	+
	2376	+ materialtouched = true;
	2377	+ applySelf();
	2378	+ }
	2379	+ });
	2380	+ presetpanel.add(borderShader);
	2381	+
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2383	+ halo.setToolTipText("Halo");
	2384	+ halo.addMouseListener(new MouseAdapter()
	2385	+ {
	2386	+ public void mouseClicked(MouseEvent e)
	2387	+ {
	2388	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2389	+ cMaterial material = object.material;
	2390	+
	2391	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2392	+
	2393	+ materialtouched = true;
	2394	+ applySelf();
	2395	+ }
	2396	+ });
	2397	+ presetpanel.add(halo);
	2398	+
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2400	+ candle.setToolTipText("Candle");
	2401	+ candle.addMouseListener(new MouseAdapter()
	2402	+ {
	2403	+ public void mouseClicked(MouseEvent e)
	2404	+ {
	2405	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2406	+ cMaterial material = object.material;
	2407	+
	2408	+ subsurfaceField.setFloat(material.subsurface);
	2409	+ shadowbiasField.setFloat(material.shadowbias);
	2410	+ ambientField.setFloat(material.ambient);
	2411	+ specularField.setFloat(material.specular);
	2412	+ lightareaField.setFloat(material.lightarea);
	2413	+ shininessField.setFloat(material.shininess);
	2414	+
	2415	+ materialtouched = true;
	2416	+ applySelf();
	2417	+ }
	2418	+ });
	2419	+ presetpanel.add(candle);
	2420	+
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2422	+ shadowShader.setToolTipText("Shadow");
	2423	+ shadowShader.addMouseListener(new MouseAdapter()
	2424	+ {
	2425	+ public void mouseClicked(MouseEvent e)
	2426	+ {
	2427	+ diffuseField.setFloat(0.001);
	2428	+ ambientField.setFloat(0.001);
	2429	+ cameraField.setFloat(0.001);
	2430	+ specularField.setFloat(0.001);
	2431	+ fakedepthField.setFloat(0.001);
	2432	+ opacityField.setFloat(0.4);
	2433	+
	2434	+ materialtouched = true;
	2435	+ applySelf();
	2436	+ }
	2437	+ });
	2438	+ presetpanel.add(shadowShader);
	2439	+
	2440	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2441	+ para0.setToolTipText("No parallax");
	2442	+ para0.addMouseListener(new MouseAdapter()
	2443	+ {
	2444	+ public void mouseClicked(MouseEvent e)
	2445	+ {
	2446	+ parallaxField.setFloat(0.125);
	2447	+
	2448	+ materialtouched = true;
	2449	+ applySelf();
	2450	+ }
	2451	+ });
	2452	+ presetpanel.add(para0);
	2453	+
	2454	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2455	+ para1.setToolTipText("With parallax");
	2456	+ para1.addMouseListener(new MouseAdapter()
	2457	+ {
	2458	+ public void mouseClicked(MouseEvent e)
	2459	+ {
	2460	+ parallaxField.setFloat(0.13);
	2461	+
	2462	+ materialtouched = true;
	2463	+ applySelf();
	2464	+ }
	2465	+ });
	2466	+ presetpanel.add(para1);
	2467	+
	2468	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2469	+ para2.setToolTipText("Reset parallax");
	2470	+ para2.addMouseListener(new MouseAdapter()
	2471	+ {
	2472	+ public void mouseClicked(MouseEvent e)
	2473	+ {
	2474	+ parallaxField.setFloat(0.14);
	2475	+
	2476	+ materialtouched = true;
	2477	+ applySelf();
	2478	+ }
	2479	+ });
	2480	+ presetpanel.add(para2);
	2481	+
	2482	+ cGridBag panel = new cGridBag().setVertical(true);
	2483	+
	2484	+ presetpanel.preferredWidth = 1;
	2485	+
	2486	+ materialpanel.add(presetpanel);
	2487	+ materialpanel.add(panel);
	2488	+
	2489	+ panel.preferredWidth = 8;
	2490	+
	2491	+ /*
1371	2492	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	2493	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375		- */
	2494	+ */
1376	2495
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	2496	+ cGridBag editBar = new cGridBag().setVertical(false);
	2497	+
	2498	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
	2499	+ createMaterialButton.setToolTipText("Create material");
1382	2500
1383	2501	/*
1384	2502	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	2503	*/
1389	2504
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	2505	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
	2506	+ clearMaterialButton.setToolTipText("Clear material");
	2507	+
	2508	+ if (Globals.ADVANCED)
	2509	+ {
	2510	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
	2511	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2512	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2513	+ }
1392	2514
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;
	2515	+ editBar.preferredHeight = 15;
	2516	+
	2517	+ panel.add(editBar);
	2518	+
1407	2519	/**/
1408	2520	//aConstraints.weighty = 0;
1409	2521	////aConstraints.weightx = 1;
1410	2522	//aConstraints.weighty = 1;
1411	2523	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	2524	//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;
	2525	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	2526
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;
	2527	+ cGridBag colorSection = new cGridBag().setVertical(true);
1429	2528
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;
	2529	+ cGridBag huepanel = new cGridBag();
	2530	+ cGridBag huelabel = new cGridBag();
	2531	+ cLabel hue = GetLabel("icons/hue.png", false);
	2532	+ hue.fit = true;
	2533	+
	2534	+ hue.addMouseListener(new MouseAdapter()
	2535	+ {
	2536	+ public void mousePressed(MouseEvent e)
	2537	+ {
	2538	+ int x = e.getX();
	2539	+
	2540	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2541	+ }
	2542	+ });
	2543	+
	2544	+ huelabel.add(hue);
	2545	+ huelabel.preferredWidth = 20;
	2546	+ huepanel.add(new cGridBag()); // Label
	2547	+ huepanel.add(huelabel); // Field/slider
	2548	+
	2549	+ huepanel.preferredHeight = 7;
1439	2550
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;
	2551	+ colorSection.add(huepanel);
	2552	+
	2553	+ cGridBag color = new cGridBag();
	2554	+
	2555	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2556	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2557	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1449	2558
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;
	2559	+ //colorField.preferredWidth = 200;
	2560	+ colorSection.add(color);
1459	2561
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;
	2562	+ cGridBag modulation = new cGridBag();
	2563	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2564	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2565	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2566	+ colorSection.add(modulation);
1469	2567
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;
	2568	+ cGridBag opacity = new cGridBag();
	2569	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2570	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2571	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2572	+ colorSection.add(opacity);
1479	2573
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;
	2574	+ colorSection.add(GetSeparator());
	2575	+
	2576	+ cGridBag texture = new cGridBag();
	2577	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2578	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2579	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2580	+ colorSection.add(texture);
1488	2581
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;
	2582	+ panel.add(GetSeparator());
	2583	+
	2584	+ panel.add(colorSection);
	2585	+
	2586	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2587	+
	2588	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2589	+
	2590	+ cGridBag diffuse = new cGridBag();
	2591	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2592	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2593	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2594	+ diffuseSection.add(diffuse);
1498	2595
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;
	2596	+ cGridBag diffuseness = new cGridBag();
	2597	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2598	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2599	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2600	+ diffuseSection.add(diffuseness);
1508	2601
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;
	2602	+ cGridBag selfshadow = new cGridBag();
	2603	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2604	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2605	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2606	+ diffuseSection.add(selfshadow);
1518	2607
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;
	2608	+ cGridBag sheen = new cGridBag();
	2609	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2610	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2611	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2612	+ diffuseSection.add(sheen);
1528	2613
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;
	2614	+ cGridBag subsurface = new cGridBag();
	2615	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2616	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2617	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2618	+ diffuseSection.add(subsurface);
1538	2619
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;
	2620	+ cGridBag shadow = new cGridBag();
	2621	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2622	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2623	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2624	+ diffuseSection.add(shadow);
1548	2625
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;
	2626	+ cGridBag fakedepth = new cGridBag();
	2627	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2628	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2629	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2630	+ diffuseSection.add(fakedepth);
1558	2631
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;
	2632	+ cGridBag shadowbias = new cGridBag();
	2633	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2634	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2635	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2636	+ diffuseSection.add(shadowbias);
1567	2637
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;
	2638	+ panel.add(GetSeparator());
	2639	+
	2640	+ panel.add(diffuseSection);
	2641	+
	2642	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2643	+
	2644	+ cGridBag specularSection = new cGridBag().setVertical(true);
1577	2645
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;
	2646	+ cGridBag specular = new cGridBag();
	2647	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2648	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2649	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2650	+ specularSection.add(specular);
1587	2651
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;
	2652	+ cGridBag lightarea = new cGridBag();
	2653	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2654	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2655	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2656	+ specularSection.add(lightarea);
1597	2657
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;
	2658	+ cGridBag shininess = new cGridBag();
	2659	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2660	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2661	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2662	+ specularSection.add(shininess);
1607	2663
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;
	2664	+ cGridBag metalness = new cGridBag();
	2665	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2666	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2667	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2668	+ specularSection.add(metalness);
1617	2669
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	2670	+ cGridBag velvet = new cGridBag();
	2671	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2672	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2673	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2674	+ specularSection.add(velvet);
	2675	+
	2676	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2677	+ //Return();
1620	2678	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	2679	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	2680	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +2685,105 @@
1627	2685	// aConstraints.gridy += 1;
1628	2686	// aConstraints.gridwidth = 1;
1629	2687
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;
	2688	+ cGridBag anisoU = new cGridBag();
	2689	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2690	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2691	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2692	+ specularSection.add(anisoU);
1638	2693
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;
	2694	+ cGridBag anisoV = new cGridBag();
	2695	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2696	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2697	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2698	+ specularSection.add(anisoV);
1648	2699
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	2700
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;
	2701	+ panel.add(GetSeparator());
	2702	+
	2703	+ panel.add(specularSection);
	2704	+
	2705	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2706	+
	2707	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1668	2708
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;
	2709	+ cGridBag camera = new cGridBag();
	2710	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2711	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2712	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2713	+ colorSection.add(camera);
1679	2714
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;
	2715	+ cGridBag ambient = new cGridBag();
	2716	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2717	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2718	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2719	+ colorSection.add(ambient);
1689	2720
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;
	2721	+ cGridBag backlit = new cGridBag();
	2722	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2723	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2724	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2725	+ colorSection.add(backlit);
1699	2726
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;
	2727	+ cGridBag parallax = new cGridBag();
	2728	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2729	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2730	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2731	+ colorSection.add(parallax);
	2732	+
	2733	+ //panel.add(new JSeparator());
	2734	+
	2735	+ //panel.add(globalSection);
	2736	+
	2737	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2738	+
	2739	+ cGridBag textureSection = new cGridBag().setVertical(true);
1709	2740
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;
	2741	+ cGridBag bump = new cGridBag();
	2742	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2743	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2744	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2745	+ textureSection.add(bump);
1719	2746
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;
	2747	+ cGridBag noise = new cGridBag();
	2748	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2749	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2750	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2751	+ textureSection.add(noise);
1729	2752
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;
	2753	+ cGridBag power = new cGridBag();
	2754	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2755	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2756	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2757	+ textureSection.add(power);
1739	2758
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	2759	+ cGridBag borderfade = new cGridBag();
	2760	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2761	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2762	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2763	+ textureSection.add(borderfade);
1745	2764
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	2765	+ cGridBag fog = new cGridBag();
	2766	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2767	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2768	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2769	+ textureSection.add(fog);
	2770	+
	2771	+ cGridBag opacityPower = new cGridBag();
	2772	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2773	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2774	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2775	+ textureSection.add(opacityPower);
	2776	+
	2777	+ panel.add(GetSeparator());
	2778	+
	2779	+ panel.add(textureSection);
	2780	+
	2781	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	2782
1750	2783	SetMaterial(copy); // .GetMaterial());
1751	2784
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	2785	+ //colorField.addChangeListener(this);
	2786	+// modulationField.addChangeListener(this);
1754	2787	metalnessField.addChangeListener(this);
1755	2788	diffuseField.addChangeListener(this);
1756	2789	specularField.addChangeListener(this);
..	..	@@ -1780,12 +2813,15 @@
1780	2813	opacityPowerField.addChangeListener(this);
1781	2814	/**/
1782	2815
1783		- resetSlidersButton.addActionListener(this);
1784	2816	clearMaterialButton.addActionListener(this);
1785	2817	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	2818	+
	2819	+ if (Globals.ADVANCED)
	2820	+ {
	2821	+ resetSlidersButton.addActionListener(this);
	2822	+ propagateToggle.addItemListener(this);
	2823	+ multiplyToggle.addItemListener(this);
	2824	+ }
1789	2825	}
1790	2826
1791	2827	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1803,8 +2839,9 @@
1803	2839	// 3D models
1804	2840	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1805	2841	{
1806		- lastConverter = new com.jmex.model.converters.MaxToJme();
1807		- LoadFile(filename, lastConverter);
	2842	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2843	+ //LoadFile(filename, lastConverter);
	2844	+ LoadObjFile(filename); // New 3ds loader
1808	2845	continue;
1809	2846	}
1810	2847	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1859,19 +2896,21 @@
1859	2896	}
1860	2897
1861	2898	// 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")))
	2899	+ if (filename.toLowerCase().endsWith(".jpg")
	2900	+ \|\| filename.toLowerCase().endsWith(".jpeg")
	2901	+ \|\| filename.toLowerCase().endsWith(".gif")
	2902	+ \|\| filename.toLowerCase().endsWith(".png")
	2903	+ \|\| filename.toLowerCase().endsWith(".tre")
	2904	+ \|\| filename.toLowerCase().endsWith(".bmp")
	2905	+ \|\| filename.toLowerCase().endsWith(".tga")
	2906	+ \|\| filename.toLowerCase().endsWith(".sgi")
	2907	+ \|\| filename.toLowerCase().endsWith(".tif")
	2908	+ \|\| filename.toLowerCase().endsWith(".tiff"))
1873	2909	{
1874		- DropTexture(filename);
	2910	+ if (textures)
	2911	+ DropTexture(filename);
	2912	+ else
	2913	+ CreateBillboard(filename);
1875	2914	continue;
1876	2915	}
1877	2916
..	..	@@ -1880,6 +2919,60 @@
1880	2919	}
1881	2920
1882	2921	ResetModel();
	2922	+ }
	2923	+
	2924	+ void CreateBillboard(String filename)
	2925	+ {
	2926	+ Object3D source = null;
	2927	+ Object3D group = copy;
	2928	+
	2929	+ if (group.selection.size() > 0)
	2930	+ {
	2931	+ source = group.selection.get(0);
	2932	+ }
	2933	+
	2934	+ Grid grid = new Grid(1,1);
	2935	+ grid.material = null;
	2936	+
	2937	+ grid.toParent = LA.newMatrix();
	2938	+ grid.fromParent = LA.newMatrix();
	2939	+ LA.matYRotate(grid.toParent, Math.PI/2);
	2940	+ LA.matXRotate(grid.toParent, -Math.PI/2);
	2941	+ LA.matXRotate(grid.fromParent, Math.PI/2);
	2942	+ LA.matYRotate(grid.fromParent, -Math.PI/2);
	2943	+
	2944	+ BillboardNode bb = new BillboardNode();
	2945	+ bb.addChild(grid);
	2946	+
	2947	+ Object3D newgroup = new Object3D();
	2948	+ newgroup.CreateMaterial();
	2949	+
	2950	+ File file = new File(filename);
	2951	+ newgroup.name = file.getName();
	2952	+ newgroup.addChild(bb);
	2953	+
	2954	+ Object3D main = newgroup;
	2955	+
	2956	+ main.SetPigmentTexture(filename);
	2957	+
	2958	+ if (source != null)
	2959	+ {
	2960	+ main.material = new cMaterial(source.material);
	2961	+ if (main.projectedVertices.length < source.projectedVertices.length)
	2962	+ {
	2963	+ main.projectedVertices = new Object3D.cVector2[source.projectedVertices.length];
	2964	+ }
	2965	+
	2966	+ for (int i=0; i<source.projectedVertices.length; i++)
	2967	+ {
	2968	+ main.projectedVertices[i].x = source.projectedVertices[i].x;
	2969	+ main.projectedVertices[i].y = source.projectedVertices[i].y;
	2970	+ }
	2971	+
	2972	+ main.texres = source.texres;
	2973	+ }
	2974	+
	2975	+ makeSomething(newgroup, false);
1883	2976	}
1884	2977
1885	2978	Point location;
..	..	@@ -1900,7 +2993,7 @@
1900	2993
1901	2994	//? flashIt = false;
1902	2995	CameraPane pane = (CameraPane) cameraView;
1903		- pane.clickStart(location.x, location.y, 0);
	2996	+ pane.clickStart(location.x, location.y, 0, 0);
1904	2997	pane.clickEnd(location.x, location.y, 0, true);
1905	2998
1906	2999	if (group.selection.size() == 1)
..	..	@@ -1949,6 +3042,7 @@
1949	3042	e2.printStackTrace();
1950	3043	}
1951	3044	}
	3045	+
1952	3046	LoadJMEThread loadThread;
1953	3047
1954	3048	class LoadJMEThread extends Thread
..	..	@@ -2006,6 +3100,7 @@
2006	3100	//LoadFile0(filename, converter);
2007	3101	}
2008	3102	}
	3103	+
2009	3104	LoadOBJThread loadObjThread;
2010	3105
2011	3106	class LoadOBJThread extends Thread
..	..	@@ -2084,19 +3179,19 @@
2084	3179
2085	3180	void LoadObjFile(String fullname)
2086	3181	{
2087		- /*
	3182	+ System.out.println("Loading " + fullname);
	3183	+ /**/
2088	3184	//lastFilename = fullname;
2089	3185	if(loadObjThread == null)
2090	3186	{
2091		- loadObjThread = new LoadOBJThread();
2092		- loadObjThread.start();
	3187	+ loadObjThread = new LoadOBJThread();
	3188	+ loadObjThread.start();
2093	3189	}
2094	3190
2095	3191	loadObjThread.add(fullname);
2096		- */
	3192	+ /**/
2097	3193
2098		- System.out.println("Loading " + fullname);
2099		- makeSomething(new FileObject(fullname, true), true);
	3194	+ //makeSomething(new FileObject(fullname, true), true);
2100	3195	}
2101	3196
2102	3197	void LoadGFDFile(String fullname)
..	..	@@ -2138,6 +3233,8 @@
2138	3233	{
2139	3234	Mocap sel = (Mocap) copy.selection.get(0);
2140	3235
	3236	+ sel.SetCurrentBones(sel.frame);
	3237	+
2141	3238	sel.fullname = fullname;
2142	3239
2143	3240	if (changename)
..	..	@@ -2151,14 +3248,18 @@
2151	3248	sel.smoothed = false;
2152	3249
2153	3250	// if (!changename)
2154		- sel.SetPositionDelta(false, true, true, true/?/); // false
	3251	+ //sel.SetPositionDelta(false, true, true, true/?/); // false
	3252	+ sel.SetGlobalTransform();
	3253	+ sel.LoadData();
	3254	+ sel.Rewind();
	3255	+ sel.Fade();
2155	3256	// sel.setPose(0);
2156	3257	refreshContents();
2157	3258	} else
2158	3259	{
2159	3260	mocap.Reset();
2160	3261	// new skeleton
2161		- makeSomething(mocap, false); // true);
	3262	+ makeSomething(mocap, true); // true);
2162	3263	}
2163	3264	} catch (Exception e)
2164	3265	{
..	..	@@ -2185,6 +3286,8 @@
2185	3286	{
2186	3287	Mocap sel = (Mocap) select;
2187	3288
	3289	+ sel.SetCurrentBones(sel.frame);
	3290	+
2188	3291	File file = new File(fullname);
2189	3292
2190	3293	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2251,7 +3354,11 @@
2251	3354
2252	3355	if (!changename)
2253	3356	{
2254		- sel.SetPositionDelta(false, true, true, true/?/);
	3357	+ //sel.SetPositionDelta(false, true, true, true/?/);
	3358	+ sel.SetGlobalTransform();
	3359	+ sel.LoadData();
	3360	+ sel.Rewind();
	3361	+ sel.Fade();
2255	3362	}
2256	3363
2257	3364	// sel.setPose(0);
..	..	@@ -2345,11 +3452,11 @@
2345	3452
2346	3453	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	3454	{
2348		- if (GraphreeD.standAlone)
	3455	+ if (Grafreed.standAlone)
2349	3456	{
2350	3457	/**/
2351	3458	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	3459	+ browser.setVisible(true);
2353	3460	String filename = browser.getFile();
2354	3461	if (filename != null && filename.length() > 0)
2355	3462	{
..	..	@@ -2460,6 +3567,7 @@
2460	3567	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	3568	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	3569	}
	3570	+
2463	3571	//cJME.count++;
2464	3572	//cJME.count %= 12;
2465	3573	if (gc)
..	..	@@ -2494,6 +3602,7 @@
2494	3602	}
2495	3603	if (input == null)
2496	3604	{
	3605	+ new Exception().printStackTrace();
2497	3606	System.exit(0);
2498	3607	}
2499	3608
..	..	@@ -2642,6 +3751,7 @@
2642	3751	}
2643	3752	}
2644	3753	}
	3754	+
2645	3755	cFileSystemPane FSPane;
2646	3756
2647	3757	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2651,7 +3761,7 @@
2651	3761
2652	3762	freezematerial = true;
2653	3763	colorField.setFloat(mat.color);
2654		- modulationField.setFloat(mat.modulation);
	3764	+ saturationField.setFloat(mat.modulation);
2655	3765	metalnessField.setFloat(mat.metalness);
2656	3766	diffuseField.setFloat(mat.diffuse);
2657	3767	specularField.setFloat(mat.specular);
..	..	@@ -2671,6 +3781,7 @@
2671	3781	shadowField.setFloat(mat.shadow);
2672	3782	textureField.setFloat(mat.texture);
2673	3783	opacityField.setFloat(mat.opacity);
	3784	+ parallaxField.setFloat(mat.parallax + 0.125f);
2674	3785	fakedepthField.setFloat(mat.fakedepth);
2675	3786	shadowbiasField.setFloat(mat.shadowbias);
2676	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -2695,11 +3806,14 @@
2695	3806	}
2696	3807	}
2697	3808	}
	3809	+
2698	3810	freezematerial = false;
2699	3811	}
2700	3812
2701	3813	void SetMaterial(Object3D object)
2702	3814	{
	3815	+ latestObject = object;
	3816	+
2703	3817	cMaterial mat = object.material;
2704	3818
2705	3819	if (mat == null)
..	..	@@ -2708,33 +3822,10 @@
2708	3822	return;
2709	3823	}
2710	3824
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		- }
	3825	+ if (multiplyToggle != null)
	3826	+ multiplyToggle.setSelected(mat.multiply);
	3827	+
	3828	+ AllocProjectedVertices(object);
2738	3829
2739	3830	SetMaterial(mat, object.projectedVertices);
2740	3831	}
..	..	@@ -2810,12 +3901,17 @@
2810	3901	// }
2811	3902
2812	3903	/**/
2813		- if (deselect)
	3904	+ if (deselect \|\| child == null)
2814	3905	{
2815	3906	//group.deselectAll();
2816	3907	//freeze = true;
2817	3908	GetTree().clearSelection();
2818	3909	//freeze = false;
	3910	+
	3911	+ if (child == null)
	3912	+ {
	3913	+ return;
	3914	+ }
2819	3915	}
2820	3916
2821	3917	//group.addSelectee(child);
..	..	@@ -2849,6 +3945,17 @@
2849	3945	public void itemStateChanged(ItemEvent event)
2850	3946	{
2851	3947	// System.out.println("Propagate = " + propagate);
	3948	+ if (event.getSource() == pinButton)
	3949	+ {
	3950	+ copy.pinned ^= true;
	3951	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3952	+ {
	3953	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3954	+ copy.CloseUI();
	3955	+ //copy.editWindow.refreshContents();
	3956	+ }
	3957	+ }
	3958	+ else
2852	3959	if (event.getSource() == propagateToggle)
2853	3960	{
2854	3961	propagate ^= true;
..	..	@@ -2884,31 +3991,48 @@
2884	3991	cameraView.ToggleDL();
2885	3992	cameraView.repaint();
2886	3993	return;
2887		- } else if (event.getSource() == toggleTextureItem)
	3994	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2888	3995	{
2889	3996	cameraView.ToggleTexture();
2890	3997	// june 2013 copy.HardTouch();
2891	3998	cameraView.repaint();
2892	3999	return;
2893		- } else if (event.getSource() == toggleFullItem)
	4000	+ } else if (event.getSource() == toggleTimelineItem)
2894	4001	{
2895		- if (CameraPane.FULLSCREEN)
	4002	+ timeline ^= true;
	4003	+
	4004	+ if (timeline)
2896	4005	{
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);
	4006	+ centralPanel.remove(cameraView);
	4007	+ cameraPanel.add(cameraView);
	4008	+ centralPanel.add(cameraPanel);
	4009	+ frame.setJMenuBar(timelineMenubar);
	4010	+ wasFullScreen = CameraPane.FULLSCREEN;
	4011	+ if (!CameraPane.FULLSCREEN)
	4012	+ ToggleFullScreen();
	4013	+ toggleFullScreenItem.setEnabled(false);
2904	4014	}
	4015	+ else
	4016	+ {
	4017	+ centralPanel.remove(cameraPanel);
	4018	+ centralPanel.add(cameraView);
	4019	+ frame.setJMenuBar(null);
	4020	+ if (!wasFullScreen)
	4021	+ ToggleFullScreen();
	4022	+ toggleFullScreenItem.setEnabled(true);
	4023	+ }
	4024	+
2905	4025	frame.validate();
2906		- cameraView.ToggleFullScreen();
	4026	+ return;
	4027	+ } else if (event.getSource() == toggleFullScreenItem)
	4028	+ {
	4029	+ ToggleFullScreen();
	4030	+ frame.validate();
2907	4031
2908	4032	return;
2909		- } else if (event.getSource() == toggleRandomItem)
	4033	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2910	4034	{
2911		- cameraView.ToggleRandom();
	4035	+ cameraView.ToggleSwitch();
2912	4036	cameraView.repaint();
2913	4037	return;
2914	4038	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2936,21 +4060,28 @@
2936	4060	} else if (event.getSource() == liveCB)
2937	4061	{
2938	4062	copy.live ^= true;
	4063	+ objEditor.refreshContents(true); // To show item colors
	4064	+ return;
	4065	+ } else if (event.getSource() == selectableCB)
	4066	+ {
	4067	+ copy.dontselect ^= true;
2939	4068	return;
2940	4069	} else if (event.getSource() == hideCB)
2941	4070	{
2942	4071	copy.hide ^= true;
2943	4072	copy.Touch(); // display list issue
2944		- objEditor.refreshContents();
	4073	+ objEditor.refreshContents(true); // To show item colors
2945	4074	return;
2946	4075	} else if (event.getSource() == link2masterCB)
2947	4076	{
2948	4077	copy.link2master ^= true;
	4078	+ objEditor.refreshContents();
2949	4079	return;
2950	4080	}
2951	4081	if (event.getSource() == randomCB)
2952	4082	{
2953	4083	copy.random ^= true;
	4084	+ objEditor.refreshContents();
2954	4085	return;
2955	4086	}
2956	4087	if (event.getSource() == speedupCB)
..	..	@@ -2974,8 +4105,9 @@
2974	4105
2975	4106	public void actionPerformed(ActionEvent event)
2976	4107	{
	4108	+ Object source = event.getSource();
2977	4109	// SCRIPT DIALOG
2978		- if (event.getSource() == okbutton)
	4110	+ if (source == okbutton)
2979	4111	{
2980	4112	textpanel.setVisible(false);
2981	4113	textpanel.remove(textarea);
..	..	@@ -2987,7 +4119,7 @@
2987	4119	textarea = null;
2988	4120	textpanel = null;
2989	4121	}
2990		- if (event.getSource() == cancelbutton)
	4122	+ if (source == cancelbutton)
2991	4123	{
2992	4124	textpanel.setVisible(false);
2993	4125	textpanel.remove(textarea);
..	..	@@ -2999,49 +4131,50 @@
2999	4131	//applySelf();
3000	4132	//client.refreshEditWindow();
3001	4133	//refreshContents();
3002		- if (event.getSource() == nameField)
	4134	+ if (source == nameField)
3003	4135	{
3004	4136	//System.out.println("ObjEditor " + event);
3005	4137	applySelf0(true);
3006	4138	//parent.applySelf();
3007		- objEditor.refreshContents();
3008		- } else if (event.getSource() == resetButton)
	4139	+ // conflicts with requestFocus objEditor.refreshContents();
	4140	+ } else if (source == resetButton)
3009	4141	{
3010	4142	CameraPane.fullreset = true;
3011	4143	copy.Reset(); // ResetMeshes();
3012	4144	copy.Touch();
3013	4145	objEditor.refreshContents();
3014		- } else if (event.getSource() == stepItem)
	4146	+ } else if (source == stepItem)
3015	4147	{
3016		- cameraView.ONESTEP = true;
	4148	+ //cameraView.ONESTEP = true;
	4149	+ Globals.ONESTEP = true;
3017	4150	cameraView.repaint();
3018	4151	return;
3019		- } else if (event.getSource() == stepButton)
	4152	+ } else if (source == stepButton)
3020	4153	{
3021	4154	copy.Step();
3022	4155	copy.Touch();
3023	4156	objEditor.refreshContents();
3024		- } else if (event.getSource() == slowerButton)
	4157	+ } else if (source == slowerButton)
3025	4158	{
3026	4159	copy.Slower();
3027	4160	copy.Touch();
3028	4161	objEditor.refreshContents();
3029		- } else if (event.getSource() == fasterButton)
	4162	+ } else if (source == fasterButton)
3030	4163	{
3031	4164	copy.Faster();
3032	4165	copy.Touch();
3033	4166	objEditor.refreshContents();
3034		- } else if (event.getSource() == remarkButton)
	4167	+ } else if (source == remarkButton)
3035	4168	{
3036	4169	copy.Remark();
3037	4170	copy.Touch();
3038	4171	objEditor.refreshContents();
3039		- } else if (event.getSource() == stepAllButton)
	4172	+ } else if (source == stepAllButton)
3040	4173	{
3041	4174	copy.StepAll();
3042	4175	copy.Touch();
3043	4176	objEditor.refreshContents();
3044		- } else if (event.getSource() == resetAllButton)
	4177	+ } else if (source == resetAllButton)
3045	4178	{
3046	4179	//CameraPane.fullreset = true;
3047	4180	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3074,53 +4207,79 @@
3074	4207	// Close();
3075	4208	// }
3076	4209	// else
3077		- if (event.getSource() == resetSlidersButton)
	4210	+ if (source == resetSlidersButton)
3078	4211	{
3079	4212	ResetSliders();
3080		- } else if (event.getSource() == clearMaterialButton)
	4213	+ } else if (source == clearMaterialButton)
3081	4214	{
3082	4215	ClearMaterial();
3083		- } else if (event.getSource() == createMaterialButton)
	4216	+ } else if (source == createMaterialButton)
3084	4217	{
3085	4218	CreateMaterial();
3086		- } else if (event.getSource() == clearPanelButton)
	4219	+ } else if (source == clearPanelButton)
3087	4220	{
3088	4221	copy.ClearUI();
3089	4222	refreshContents(true);
3090		- } /*
3091		- }
3092		-
3093		- public boolean action(Event event, Object arg)
3094		- {
3095		- */ else if (event.getSource() == closeItem)
	4223	+ } else if (source == importGFDItem)
	4224	+ {
	4225	+ ImportGFD();
	4226	+ } else
	4227	+ if (source == importVRMLX3DItem)
	4228	+ {
	4229	+ ImportVRMLX3D();
	4230	+ } else
	4231	+ if (source == import3DSItem)
	4232	+ {
	4233	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4234	+ } else
	4235	+ if (source == importOBJItem)
	4236	+ {
	4237	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4238	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4239	+ browser.setVisible(true);
	4240	+ String filename = browser.getFile();
	4241	+ if (filename != null && filename.length() > 0)
	4242	+ {
	4243	+ String fullname = browser.getDirectory() + filename;
	4244	+ makeSomething(ReadOBJ(fullname), true);
	4245	+ }
	4246	+ } else
	4247	+ if (source == closeItem)
3096	4248	{
3097	4249	Close();
3098	4250	//return true;
3099		- } else if (event.getSource() == loadItem)
	4251	+ } else if (source == openItem)
3100	4252	{
3101		- load();
	4253	+ Open();
3102	4254	//return true;
3103		- } else if (event.getSource() == saveItem)
	4255	+ } else if (source == newItem)
	4256	+ {
	4257	+ New();
	4258	+ } else if (source == saveItem)
3104	4259	{
3105	4260	save();
3106	4261	//return true;
3107		- } else if (event.getSource() == saveAsItem)
	4262	+ } else if (source == saveAsItem)
3108	4263	{
3109	4264	saveAs();
3110	4265	//return true;
3111		- } else if (event.getSource() == reexportItem)
	4266	+ } else if (source == reexportItem)
3112	4267	{
3113	4268	reexport();
3114	4269	//return true;
3115		- } else if (event.getSource() == exportAsItem)
	4270	+ } else if (source == exportAsItem)
3116	4271	{
3117	4272	export();
3118	4273	//return true;
3119		- } else if (event.getSource() == povItem)
	4274	+ } else if (source == povItem)
3120	4275	{
3121	4276	generatePOV();
3122	4277	//return true;
3123		- } else if (event.getSource() == zBufferItem)
	4278	+ } else if (event.getSource() == archiveItem)
	4279	+ {
	4280	+ cTools.Archive(frame);
	4281	+ return;
	4282	+ } else if (source == zBufferItem)
3124	4283	{
3125	4284	try
3126	4285	{
..	..	@@ -3142,21 +4301,8 @@
3142	4301	cameraView.repaint();
3143	4302	//return true;
3144	4303	}
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)
	4304	+ */ else // combos...
	4305	+ if (source == texresMenu)
3160	4306	{
3161	4307	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3162	4308	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3168,27 +4314,519 @@
3168	4314	}
3169	4315	}
3170	4316
3171		- void ToggleAnimation()
	4317	+ void New()
3172	4318	{
3173		- if (!CameraPane.ANIMATION)
	4319	+ while (copy.Size() > 0)
3174	4320	{
3175		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4321	+ copy.remove(0);
	4322	+ }
	4323	+
	4324	+ copy.selection.clear();
	4325	+
	4326	+ if (copy == Grafreed.grafreed.universe)
	4327	+ {
	4328	+ CreateCameras();
	4329	+ cameraView.SetCamera(GetCamera(copy, 0));
	4330	+ }
	4331	+ ResetModel();
	4332	+ objEditor.refreshContents();
	4333	+ }
	4334	+
	4335	+ static public byte[] Compress(Object3D o)
	4336	+ {
	4337	+ // Slower to actually compress.
	4338	+ try
	4339	+ {
	4340	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4341	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4342	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4343	+
	4344	+ Object3D parent = o.parent;
	4345	+ o.parent = null;
	4346	+
	4347	+ out.writeObject(o);
	4348	+
	4349	+ o.parent = parent;
	4350	+
	4351	+ out.flush();
	4352	+
	4353	+ baos //zstream
	4354	+ .close();
	4355	+ out.close();
	4356	+
	4357	+ byte[] bytes = baos.toByteArray();
	4358	+
	4359	+ System.out.println("save #bytes = " + bytes.length);
	4360	+ return bytes;
	4361	+ } catch (Exception e)
	4362	+ {
	4363	+ System.err.println(e);
	4364	+ return null;
	4365	+ }
	4366	+ }
	4367	+
	4368	+ static public Object Uncompress(byte[] bytes)
	4369	+ {
	4370	+ System.out.println("restore #bytes = " + bytes.length);
	4371	+ try
	4372	+ {
	4373	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4374	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4375	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4376	+ Object obj = in.readObject();
	4377	+
	4378	+ bais //istream
	4379	+ .close();
	4380	+ in.close();
	4381	+
	4382	+ return obj;
	4383	+ } catch (Exception e)
	4384	+ {
	4385	+ System.err.println(e);
	4386	+ return null;
	4387	+ }
	4388	+ }
	4389	+
	4390	+ static public Object clone(Object o)
	4391	+ {
	4392	+ try
	4393	+ {
	4394	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4395	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4396	+
	4397	+ out.writeObject(o);
	4398	+
	4399	+ out.flush();
	4400	+ out.close();
	4401	+
	4402	+ byte[] bytes = baos.toByteArray();
	4403	+
	4404	+ System.out.println("clone = " + bytes.length);
	4405	+
	4406	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4407	+ ObjectInputStream in = new ObjectInputStream(bais);
	4408	+ Object obj = in.readObject();
	4409	+ in.close();
	4410	+
	4411	+ return obj;
	4412	+ } catch (Exception e)
	4413	+ {
	4414	+ System.err.println(e);
	4415	+ return null;
	4416	+ }
	4417	+ }
	4418	+
	4419	+ cRadio GetCurrentTab()
	4420	+ {
	4421	+ cRadio ab;
	4422	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4423	+ {
	4424	+ ab = (cRadio)e.nextElement();
	4425	+ if(ab.GetObject() == copy)
	4426	+ {
	4427	+ return ab;
	4428	+ }
	4429	+ }
	4430	+
	4431	+ return null;
	4432	+ }
	4433	+
	4434	+
	4435	+ public void Save()
	4436	+ {
	4437	+ //Save(true);
	4438	+ Replace();
	4439	+ SetVersionStates();
	4440	+ }
	4441	+
	4442	+ private boolean Equal(byte[] compress, byte[] name)
	4443	+ {
	4444	+ if (compress.length != name.length)
	4445	+ {
	4446	+ return false;
	4447	+ }
	4448	+
	4449	+ for (int i=compress.length; --i>=0;)
	4450	+ {
	4451	+ if (compress[i] != name[i])
	4452	+ return false;
	4453	+ }
	4454	+
	4455	+ return true;
	4456	+ }
	4457	+
	4458	+ void DeleteVersion()
	4459	+ {
	4460	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4461	+ {
	4462	+ copy.versionlist[i] = copy.versionlist[i+1];
	4463	+ }
	4464	+
	4465	+ if (copy.versionlist[copy.versionindex] == null)
	4466	+ copy.versionindex -= 1;
	4467	+
	4468	+ if (copy.versionindex != -1)
	4469	+ CopyChanged(copy);
	4470	+
	4471	+ SetVersionStates();
	4472	+ }
	4473	+
	4474	+ public boolean Save(boolean user)
	4475	+ {
	4476	+ System.err.println("Save");
	4477	+ Replace();
	4478	+
	4479	+ if (copy.versionlist == null)
	4480	+ {
	4481	+ copy.versionlist = new Object3D[100];
	4482	+ copy.versionindex = -1;
	4483	+ }
	4484	+
	4485	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4486	+
	4487	+ boolean thesame = false;
	4488	+
	4489	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4490	+// {
	4491	+// thesame = true;
	4492	+// }
	4493	+
	4494	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4495	+ if (!thesame)
	4496	+ {
	4497	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4498	+ {
	4499	+ copy.versionlist[i] = copy.versionlist[i-1];
	4500	+ }
	4501	+
	4502	+ //tab.user[tab.versionindex] = user;
	4503	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4504	+
	4505	+ copy.versionlist[++copy.versionindex] = compress;
	4506	+
	4507	+ // if (increment)
	4508	+ // tab.versionindex++;
	4509	+ }
	4510	+
	4511	+ //copy.RestoreBigData(versiontable);
	4512	+
	4513	+ //assert(hashtable.isEmpty());
	4514	+
	4515	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4516	+// {
	4517	+// //tab.user[i] = false;
	4518	+// copy.versionlist[i] = null;
	4519	+// }
	4520	+
	4521	+ SetVersionStates();
	4522	+
	4523	+ // test save
	4524	+ if (false)
	4525	+ {
	4526	+ try
	4527	+ {
	4528	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4529	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4530	+
	4531	+ p.writeObject(copy);
	4532	+
	4533	+ p.flush();
	4534	+
	4535	+ ostream.close();
	4536	+ } catch (Exception e)
	4537	+ {
	4538	+ e.printStackTrace();
	4539	+ }
	4540	+ }
	4541	+
	4542	+ return !thesame;
	4543	+ }
	4544	+
	4545	+ boolean flashIt = true;
	4546	+
	4547	+ void RefreshSelection()
	4548	+ {
	4549	+ Object3D selection = new Object3D();
	4550	+
	4551	+ for (int i = 0; i < objEditor.copy.selection.size(); i++)
	4552	+ {
	4553	+ Object3D elem = objEditor.copy.selection.elementAt(i);
	4554	+
	4555	+ Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
	4556	+
	4557	+ if (obj == null)
	4558	+ {
	4559	+ objEditor.copy.selection.remove(i--);
	4560	+ }
	4561	+ else
	4562	+ {
	4563	+ selection.add(obj);
	4564	+ objEditor.copy.selection.setElementAt(obj, i);
	4565	+ }
	4566	+ }
	4567	+
	4568	+ flashIt = false;
	4569	+ GetTree().clearSelection();
	4570	+ for (int i = 0; i < selection.size(); i++)
	4571	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4572	+ flashIt = true;
	4573	+
	4574	+ //refreshContents(false);
	4575	+ }
	4576	+
	4577	+ void CopyChanged(Object3D changed)
	4578	+ {
	4579	+ Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
	4580	+
	4581	+ boolean temp = CameraPane.SWITCH;
	4582	+ CameraPane.SWITCH = false;
	4583	+
	4584	+ changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4585	+
	4586	+ changed.clear();
	4587	+
	4588	+ changed.skyboxname = obj.skyboxname;
	4589	+ changed.skyboxext = obj.skyboxext;
	4590	+
	4591	+ for (int i=0; i<obj.Size(); i++)
	4592	+ {
	4593	+ changed.add(obj.get(i));
	4594	+ }
	4595	+
	4596	+ changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4597	+
	4598	+ CameraPane.SWITCH = temp;
	4599	+
	4600	+ if (objEditor == this)
	4601	+ RefreshSelection();
	4602	+ //assert(hashtable.isEmpty());
	4603	+
	4604	+ objEditor.copy.Touch();
	4605	+
	4606	+ ResetModel();
	4607	+ objEditor.copy.HardTouch(); // recompile?
	4608	+
	4609	+ cRadio ab;
	4610	+ for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
	4611	+ {
	4612	+ ab = (cRadio)e.nextElement();
	4613	+ Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
	4614	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4615	+ if (test != null)
	4616	+ {
	4617	+ test.editWindow = ab.object.editWindow;
	4618	+ ab.object = test;
	4619	+ }
	4620	+ }
	4621	+
	4622	+ objEditor.refreshContents(true);
	4623	+ }
	4624	+
	4625	+ cButton previousVersionButton;
	4626	+ cButton restoreButton;
	4627	+ cButton replaceButton;
	4628	+ cButton nextVersionButton;
	4629	+ cButton saveVersionButton;
	4630	+ cButton deleteVersionButton;
	4631	+
	4632	+ boolean muteSlider;
	4633	+
	4634	+ int VersionCount()
	4635	+ {
	4636	+ return copy.VersionCount();
	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(copy);
	4711	+
	4712	+ SetVersionStates();
	4713	+
	4714	+ return true;
	4715	+ }
	4716	+
	4717	+ public boolean Restore()
	4718	+ {
	4719	+ System.err.println("Restore");
	4720	+
	4721	+ //cRadio tab = GetCurrentTab();
	4722	+
	4723	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4724	+ {
	4725	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4726	+ return false;
	4727	+ }
	4728	+
	4729	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4730	+ CopyChanged(copy);
	4731	+
	4732	+ SetVersionStates();
	4733	+
	4734	+ return true;
	4735	+ }
	4736	+
	4737	+ public boolean Replace()
	4738	+ {
	4739	+ //System.err.println("Replace");
	4740	+
	4741	+ //cRadio tab = GetCurrentTab();
	4742	+
	4743	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4744	+ {
	4745	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4746	+ return false;
	4747	+ }
	4748	+
	4749	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4750	+
	4751	+ return true;
	4752	+ }
	4753	+
	4754	+ public void NextVersion()
	4755	+ {
	4756	+ // Option?
	4757	+ Replace();
	4758	+
	4759	+ //cRadio tab = GetCurrentTab();
	4760	+
	4761	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4762	+ {
	4763	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4764	+ return;
	4765	+ }
	4766	+
	4767	+ copy.versionindex += 1;
	4768	+
	4769	+ CopyChanged(copy);
	4770	+
	4771	+ //if (!tab.user[tab.versionindex])
	4772	+ // tab.graphs[tab.versionindex] = null;
	4773	+
	4774	+ SetVersionStates();
	4775	+ }
	4776	+
	4777	+ void ImportGFD()
	4778	+ {
	4779	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3176	4780	browser.show();
3177	4781	String filename = browser.getFile();
3178	4782	if (filename != null && filename.length() > 0)
3179	4783	{
3180		- CameraPane.filename = browser.getDirectory() + filename;
	4784	+ String fullname = browser.getDirectory() + filename;
	4785	+
	4786	+ //Object3D readobj =
	4787	+ objEditor.ReadGFD(fullname, objEditor);
	4788	+ //makeSomething(readobj);
	4789	+ }
	4790	+ }
	4791	+
	4792	+ void ImportVRMLX3D()
	4793	+ {
	4794	+ if (Grafreed.standAlone)
	4795	+ {
	4796	+ /**/
	4797	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4798	+ browser.show();
	4799	+ String filename = browser.getFile();
	4800	+ if (filename != null && filename.length() > 0)
	4801	+ {
	4802	+ String fullname = browser.getDirectory() + filename;
	4803	+ LoadVRMLX3D(fullname);
	4804	+ }
	4805	+ /**/
	4806	+ }
	4807	+ }
	4808	+
	4809	+ void ToggleAnimation()
	4810	+ {
	4811	+ if (!Globals.ANIMATION)
	4812	+ {
	4813	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4814	+ browser.setVisible(true);
	4815	+ String filename = browser.getFile();
	4816	+ if (filename != null && filename.length() > 0)
	4817	+ {
	4818	+ Globals.filename = browser.getDirectory() + filename;
3181	4819	//CameraPane.framecount = 0;
3182		- CameraPane.imagecount = 0;
	4820	+ Globals.imagecount = 0;
3183	4821
3184		- CameraPane.ANIMATION ^= true;
	4822	+ Globals.ANIMATION ^= true;
3185	4823
3186		- GraphreeD.wav.cursor = 0;
3187		- GraphreeD.wav.loop = 0;
	4824	+ Grafreed.wav.cursor = 0;
	4825	+ Grafreed.wav.loop = 0;
3188	4826	}
3189	4827	} else
3190	4828	{
3191		- CameraPane.ANIMATION ^= true;
	4829	+ Globals.ANIMATION ^= true;
3192	4830	}
3193	4831	}
3194	4832
..	..	@@ -3234,7 +4872,7 @@
3234	4872	void CreateMaterial()
3235	4873	{
3236	4874	//copy.ClearMaterial(); // PATCH
3237		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4875	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3238	4876	if (copy.selection.size() > 0)
3239	4877	//SetMaterial(copy);
3240	4878	{
..	..	@@ -3285,7 +4923,7 @@
3285	4923	assert false;
3286	4924	}
3287	4925
3288		- void EditSelection()
	4926	+ void EditSelection(boolean newWindow)
3289	4927	{
3290	4928	}
3291	4929
..	..	@@ -3293,11 +4931,11 @@
3293	4931	{
3294	4932	copy.ResetBlockLoop(); // temporary problem
3295	4933
3296		- boolean random = CameraPane.RANDOM;
3297		- CameraPane.RANDOM = false; // parse everything
	4934	+ boolean random = CameraPane.SWITCH;
	4935	+ CameraPane.SWITCH = false; // parse everything
3298	4936	copy.ResetDisplayList();
3299	4937	copy.HardTouch();
3300		- CameraPane.RANDOM = random;
	4938	+ CameraPane.SWITCH = random;
3301	4939	}
3302	4940
3303	4941	// public void applySelf()
..	..	@@ -3327,6 +4965,12 @@
3327	4965	// else
3328	4966	// applySelf(true);
3329	4967	// }
	4968	+
	4969	+ boolean Equal(double a, double b)
	4970	+ {
	4971	+ return Math.abs(a - b) < 0.001;
	4972	+ }
	4973	+
3330	4974	void applySelf0(boolean name)
3331	4975	{
3332	4976	if (name)
..	..	@@ -3344,7 +4988,7 @@
3344	4988	//copy.material = new cMaterial(copy.GetMaterial());
3345	4989
3346	4990	current.color = (float) colorField.getFloat();
3347		- current.modulation = (float) modulationField.getFloat();
	4991	+ current.modulation = (float) saturationField.getFloat();
3348	4992	current.metalness = (float) metalnessField.getFloat();
3349	4993	current.diffuse = (float) diffuseField.getFloat();
3350	4994	current.specular = (float) specularField.getFloat();
..	..	@@ -3364,13 +5008,69 @@
3364	5008	current.shadow = (float) shadowField.getFloat();
3365	5009	current.texture = (float) textureField.getFloat();
3366	5010	current.opacity = (float) opacityField.getFloat();
	5011	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
3367	5012	current.fakedepth = (float) fakedepthField.getFloat();
3368	5013	current.shadowbias = (float) shadowbiasField.getFloat();
3369	5014
3370		- if (!NumberSlider.frozen)
	5015	+ if (!cNumberSlider.frozen)
3371	5016	{
3372	5017	//System.out.println("Propagate = " + propagate);
3373	5018	copy.UpdateMaterial(anchor, current, propagate);
	5019	+
	5020	+ if (copy.material != null)
	5021	+ {
	5022	+ cMaterial mat = copy.material;
	5023	+
	5024	+ if (!Equal(colorField.getFloat(), mat.color))
	5025	+ colorField.SetToolTipValue((mat.color));
	5026	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5027	+ saturationField.SetToolTipValue((mat.modulation));
	5028	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5029	+ metalnessField.SetToolTipValue((mat.metalness));
	5030	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5031	+ diffuseField.SetToolTipValue((mat.diffuse));
	5032	+ if (!Equal(specularField.getFloat(), mat.specular))
	5033	+ specularField.SetToolTipValue((mat.specular));
	5034	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5035	+ shininessField.SetToolTipValue((mat.shininess));
	5036	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5037	+ shiftField.SetToolTipValue((mat.shift));
	5038	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5039	+ ambientField.SetToolTipValue((mat.ambient));
	5040	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5041	+ lightareaField.SetToolTipValue((mat.lightarea));
	5042	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5043	+ diffusenessField.SetToolTipValue((mat.factor));
	5044	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5045	+ velvetField.SetToolTipValue((mat.velvet));
	5046	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5047	+ sheenField.SetToolTipValue((mat.sheen));
	5048	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5049	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5050	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5051	+ backlitField.SetToolTipValue((mat.bump));
	5052	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5053	+ anisoField.SetToolTipValue((mat.aniso));
	5054	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5055	+ anisoVField.SetToolTipValue((mat.anisoV));
	5056	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5057	+ cameraField.SetToolTipValue((mat.cameralight));
	5058	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5059	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5060	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5061	+ shadowField.SetToolTipValue((mat.shadow));
	5062	+ if (!Equal(textureField.getFloat(), mat.texture))
	5063	+ textureField.SetToolTipValue((mat.texture));
	5064	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5065	+ opacityField.SetToolTipValue((mat.opacity));
	5066	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5067	+ parallaxField.SetToolTipValue((mat.parallax));
	5068	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5069	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5070	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5071	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	5072	+ }
	5073	+
3374	5074	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3375	5075	{
3376	5076	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3399,10 +5099,44 @@
3399	5099	//copy.Touch();
3400	5100	}
3401	5101
	5102	+ cNumberSlider versionSlider;
	5103	+ cNumberSlider versionField;
	5104	+
3402	5105	public void stateChanged(ChangeEvent e)
3403	5106	{
3404		- // assert(false);
	5107	+ // assert(false);
	5108	+ if (e.getSource() == versionSlider)
	5109	+ {
	5110	+ if (muteSlider)
	5111	+ return;
	5112	+
	5113	+ Replace();
	5114	+
	5115	+ int version = versionSlider.getInteger();
	5116	+
	5117	+ if (version != -1 && copy.versionlist[version] != null)
	5118	+ {
	5119	+ copy.versionindex = version;
	5120	+ CopyChanged(copy);
	5121	+ SetVersionStates();
	5122	+ }
	5123	+
	5124	+ return;
	5125	+ }
3405	5126
	5127	+ if (e.getSource() == versionField)
	5128	+ {
	5129	+ int version = versionField.getInteger();
	5130	+
	5131	+ if (version != -1 && copy.versionindex != version && copy.versionlist[version] != null)
	5132	+ {
	5133	+ copy.versionindex = version;
	5134	+ CopyChanged(copy);
	5135	+ }
	5136	+
	5137	+ return;
	5138	+ }
	5139	+
3406	5140	if (freezematerial)
3407	5141	{
3408	5142	return;
..	..	@@ -3415,6 +5149,7 @@
3415	5149	\|\| e.getSource() == apertureField
3416	5150	\|\| e.getSource() == shadowblurField)
3417	5151	{
	5152	+ new Exception().printStackTrace();
3418	5153	System.exit(0);
3419	5154	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3420	5155	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3436,12 +5171,24 @@
3436	5171	{
3437	5172	//System.out.println("stateChanged = " + this);
3438	5173	materialtouched = true;
	5174	+
	5175	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5176	+ {
	5177	+ saturationField.setFloat(1);
	5178	+ }
	5179	+
3439	5180	applySelf();
3440	5181	//System.out.println("this = " + this);
3441	5182	//System.out.println("PARENT = " + parent);
3442	5183	//if (parent != null)
3443	5184	// parent.applySelf();
3444		- refreshContents();
	5185	+ if (e.getSource() == normalpushField)
	5186	+ {
	5187	+ objEditor.refreshContents();
	5188	+ //Refresh();
	5189	+ }
	5190	+ else
	5191	+ refreshContents();
3445	5192	// ??? client.refreshEditWindow();
3446	5193	}
3447	5194	//else
..	..	@@ -3453,7 +5200,7 @@
3453	5200	//group.name = nameField.getText();
3454	5201	//objEditor.applySelf();
3455	5202
3456		- assert (objEditor == this);
	5203	+ // OCT2018: assert (objEditor == this);
3457	5204	if (copy.selection == null \|\| copy.selection.size() == 0)
3458	5205	//super.applySelf()
3459	5206	; else
..	..	@@ -3477,12 +5224,18 @@
3477	5224	objEditor.copy = keep;
3478	5225	}
3479	5226	}
	5227	+
	5228	+ if (normalpushField != null)
	5229	+ copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
3480	5230	}
3481	5231
3482	5232	void SnapObject()
3483	5233	{
3484		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3485		- SnapObject(obj);
	5234	+ if (copy.selection.size() > 0)
	5235	+ {
	5236	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	5237	+ SnapObject(obj);
	5238	+ }
3486	5239	}
3487	5240
3488	5241	void SnapObject(Object3D obj)
..	..	@@ -3596,7 +5349,7 @@
3596	5349
3597	5350	if (obj.parent != null)
3598	5351	{
3599		- obj.parent.TransformToWorld(interest);
	5352	+// obj.parent.TransformToWorld(interest);
3600	5353	}
3601	5354
3602	5355	if (!CameraPane.TRACK)
..	..	@@ -3723,20 +5476,28 @@
3723	5476	{
3724	5477	if (GetTree() != null)
3725	5478	{
	5479	+ GetTree().revalidate();
3726	5480	GetTree().repaint();
3727	5481	}
3728	5482
3729	5483	radioPanel.revalidate();
3730	5484	radioPanel.repaint();
3731		- ctrlPanel.revalidate(); // ? new
	5485	+ ctrlPanel.validate(); // ? new
3732	5486	ctrlPanel.repaint();
3733	5487	}
	5488	+
	5489	+ if (previousVersionButton != null && copy.versionlist != null)
	5490	+ SetVersionStates();
	5491	+
	5492	+ cameraView.requestFocusInWindow();
3734	5493	}
3735	5494
3736	5495	static TweenManager tweenManager = new TweenManager();
3737	5496
3738	5497	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3739	5498	{
	5499	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5500	+ Save();
3740	5501	//Tween.set(thing, 0).target(1).start(tweenManager);
3741	5502	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3742	5503	// if (thing instanceof GenericJointDemo)
..	..	@@ -3760,7 +5521,7 @@
3760	5521	// group = (Composite) group.get(0);
3761	5522	// }
3762	5523
3763		- System.out.println("makeSomething of " + thing);
	5524	+ //System.out.println("makeSomething of " + thing);
3764	5525
3765	5526	/*
3766	5527	if (deselect && jList != null)
..	..	@@ -3823,6 +5584,12 @@
3823	5584	{
3824	5585	ResetModel();
3825	5586	Select(thing.GetTreePath(), true, false); // unselect... false);
	5587	+
	5588	+ if (thing.Size() == 0)
	5589	+ {
	5590	+ //EditSelection(false);
	5591	+ }
	5592	+
3826	5593	refreshContents();
3827	5594	}
3828	5595
..	..	@@ -3833,7 +5600,7 @@
3833	5600	void ResetModel()
3834	5601	{
3835	5602	//assert(copy instanceof Composite);
3836		- Object3D /Composite/ group = (Object3D /Composite/) copy;
	5603	+ Object3D /Composite/ group = (Object3D /Composite/) objEditor.copy;
3837	5604
3838	5605	// necessary? group.selection = new Object3D(); // java.util.Vector();
3839	5606
..	..	@@ -3844,14 +5611,14 @@
3844	5611	//group.refreshEditWindow();
3845	5612	//refreshContents();
3846	5613
3847		- if (copy.selection == null)
	5614	+ if (objEditor.copy.selection == null)
3848	5615	{
3849		- copy.selection = new Object3D();
	5616	+ objEditor.copy.selection = new Object3D();
3850	5617	}
3851	5618
3852		- for (int j = 0; j < copy.selection.size(); j++)
	5619	+ for (int j = 0; j < objEditor.copy.selection.size(); j++)
3853	5620	{
3854		- Object3D item = copy.selection.get(j);
	5621	+ Object3D item = objEditor.copy.selection.get(j);
3855	5622
3856	5623	if (item instanceof cGroup && ((cGroup) item).transientlink)
3857	5624	{
..	..	@@ -3860,15 +5627,15 @@
3860	5627
3861	5628	if (item.count <= 1) // ??? == 0)
3862	5629	{
3863		- copy.selection.remove(item);
	5630	+ objEditor.copy.selection.remove(item);
3864	5631	}
3865	5632	}
3866	5633
3867	5634	boolean first = true;
3868	5635
3869		- for (int i = copy.selection.size(); --i >= 0;)
	5636	+ for (int i = objEditor.copy.selection.size(); --i >= 0;)
3870	5637	{
3871		- Object3D item = copy.selection.get(i);
	5638	+ Object3D item = objEditor.copy.selection.get(i);
3872	5639
3873	5640	if (item instanceof cGroup && ((cGroup) item).transientlink)
3874	5641	{
..	..	@@ -3940,6 +5707,7 @@
3940	5707	}
3941	5708	}
3942	5709	}
	5710	+
3943	5711	LoadGFDThread loadGFDThread;
3944	5712
3945	5713	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3959,8 +5727,10 @@
3959	5727
3960	5728	try
3961	5729	{
	5730	+ // Try compressed version first.
3962	5731	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3963		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5732	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5733	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3964	5734
3965	5735	readobj = (Object3D) p.readObject();
3966	5736	istream.close();
..	..	@@ -3968,7 +5738,22 @@
3968	5738	readobj.ResetDisplayList();
3969	5739	} catch (Exception e)
3970	5740	{
3971		- e.printStackTrace();
	5741	+ if (!e.toString().contains("GZIP"))
	5742	+ e.printStackTrace();
	5743	+
	5744	+ try
	5745	+ {
	5746	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5747	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5748	+
	5749	+ readobj = (Object3D) p.readObject();
	5750	+ istream.close();
	5751	+
	5752	+ readobj.ResetDisplayList();
	5753	+ } catch (Exception e2)
	5754	+ {
	5755	+ e2.printStackTrace();
	5756	+ }
3972	5757	}
3973	5758	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3974	5759	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4014,6 +5799,12 @@
4014	5799
4015	5800	void LoadIt(Object obj)
4016	5801	{
	5802	+ if (obj == null)
	5803	+ {
	5804	+ // Invalid file
	5805	+ return;
	5806	+ }
	5807	+
4017	5808	System.out.println("Loaded " + obj);
4018	5809	//new Exception().printStackTrace();
4019	5810	Object3D readobj = (Object3D) obj;
..	..	@@ -4023,10 +5814,14 @@
4023	5814
4024	5815	if (readobj != null)
4025	5816	{
	5817	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5818	+ // Save();
4026	5819	try
4027	5820	{
4028	5821	//readobj.deepCopySelf(copy);
4029	5822	copy.clear(); // june 2014
	5823	+ copy.skyboxname = readobj.skyboxname;
	5824	+ copy.skyboxext = readobj.skyboxext;
4030	5825	for (int i = 0; i < readobj.size(); i++)
4031	5826	{
4032	5827	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4067,6 +5862,7 @@
4067	5862	}
4068	5863	} catch (ClassCastException e)
4069	5864	{
	5865	+ e.printStackTrace();
4070	5866	assert (false);
4071	5867	Composite c = (Composite) copy;
4072	5868	c.children.clear();
..	..	@@ -4077,17 +5873,32 @@
4077	5873	c.addChild(csg);
4078	5874	}
4079	5875
	5876	+ copy.versionlist = readobj.versionlist;
	5877	+ copy.versionindex = readobj.versionindex;
	5878	+ copy.versiontable = readobj.versiontable;
	5879	+
	5880	+ if (copy.versionlist == null)
	5881	+ {
	5882	+ // Backward compatibility
	5883	+ copy.versionlist = new Object3D[100];
	5884	+ copy.versionindex = -1;
	5885	+
	5886	+ //Save(true);
	5887	+ }
	5888	+
	5889	+ //? SetUndoStates();
	5890	+
4080	5891	ResetModel();
4081	5892	copy.HardTouch(); // recompile?
4082	5893	refreshContents();
4083	5894	}
4084	5895	}
4085	5896
4086		- void load() // throws ClassNotFoundException
	5897	+ void Open() // throws ClassNotFoundException
4087	5898	{
4088		- if (GraphreeD.standAlone)
	5899	+ if (Grafreed.standAlone)
4089	5900	{
4090		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5901	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4091	5902	browser.show();
4092	5903	String filename = browser.getFile();
4093	5904	if (filename != null && filename.length() > 0)
..	..	@@ -4164,6 +5975,8 @@
4164	5975
4165	5976	void save()
4166	5977	{
	5978	+ Replace();
	5979	+
4167	5980	if (lastname == null)
4168	5981	{
4169	5982	return;
..	..	@@ -4172,11 +5985,13 @@
4172	5985	try
4173	5986	{
4174	5987	FileOutputStream ostream = new FileOutputStream(lastname);
4175		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5988	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5989	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4176	5990
4177	5991	p.writeObject(copy);
4178	5992	p.flush();
4179	5993
	5994	+ zstream.close();
4180	5995	ostream.close();
4181	5996
4182	5997	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4184,19 +5999,23 @@
4184	5999	//ps.print(buffer.toString());
4185	6000	} catch (IOException e)
4186	6001	{
	6002	+ e.printStackTrace();
4187	6003	}
4188	6004	}
	6005	+
4189	6006	String lastname;
4190	6007
4191	6008	void saveAs()
4192	6009	{
4193		- if (GraphreeD.standAlone)
	6010	+ if (Grafreed.standAlone)
4194	6011	{
4195	6012	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4196	6013	browser.setVisible(true);
4197	6014	String filename = browser.getFile();
4198	6015	if (filename != null && filename.length() > 0)
4199	6016	{
	6017	+ if (!filename.endsWith(".gfd"))
	6018	+ filename += ".gfd";
4200	6019	lastname = browser.getDirectory() + filename;
4201	6020	save();
4202	6021	}
..	..	@@ -4213,10 +6032,20 @@
4213	6032
4214	6033	Object3D object = copy.selection.get(0);
4215	6034
	6035	+ FileObject fileobj = null;
	6036	+
	6037	+ if (object instanceof FileObject)
	6038	+ fileobj = (FileObject)object;
	6039	+
4216	6040	if (object.fileparent != null)
4217	6041	{
4218		- FileObject fileobj = (FileObject) object.fileparent;
	6042	+ assert(fileobj == null);
4219	6043
	6044	+ fileobj = (FileObject) object.fileparent;
	6045	+ }
	6046	+
	6047	+ if (fileobj != null)
	6048	+ {
4220	6049	System.out.println("WriteObject " + object + " : " + fileobj.name);
4221	6050	WriteObject(object, fileobj.name);
4222	6051	}
..	..	@@ -4259,7 +6088,7 @@
4259	6088	}
4260	6089	}
4261	6090	else
4262		- //if (GraphreeD.standAlone)
	6091	+ //if (GrafreeD.standAlone)
4263	6092	{
4264	6093	FileDialog browser = new FileDialog(frame, "Export", FileDialog.SAVE);
4265	6094	browser.setVisible(true);
..	..	@@ -4285,13 +6114,13 @@
4285	6114	try
4286	6115	{
4287	6116	FileOutputStream ostream = new FileOutputStream(filename);
4288		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4289		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	6117	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	6118	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4290	6119
4291	6120	Object3D objectparent = obj.parent;
4292	6121	obj.parent = null;
4293	6122
4294		- Object3D object = (Object3D) GraphreeD.clone(obj);
	6123	+ Object3D object = (Object3D) Grafreed.clone(obj);
4295	6124
4296	6125	obj.parent = objectparent;
4297	6126
..	..	@@ -4303,8 +6132,8 @@
4303	6132	p.writeObject(object);
4304	6133	p.flush();
4305	6134
	6135	+ zstream.close();
4306	6136	ostream.close();
4307		- // zstream.close();
4308	6137
4309	6138	// group.selection.get(0).parent = parent;
4310	6139	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4325,7 +6154,7 @@
4325	6154	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4326	6155	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4327	6156	copy.generatePOV(buffer);
4328		- if (GraphreeD.standAlone)
	6157	+ if (Grafreed.standAlone)
4329	6158	{
4330	6159	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4331	6160	browser.show();
..	..	@@ -4351,53 +6180,72 @@
4351	6180	Object3D client;
4352	6181	Object3D copy;
4353	6182	MenuBar menuBar;
4354		- Menu windowMenu;
4355		- MenuItem loadItem;
	6183	+ Menu fileMenu;
	6184	+ MenuItem newItem;
	6185	+ MenuItem openItem;
4356	6186	MenuItem saveItem;
4357	6187	MenuItem saveAsItem;
4358	6188	MenuItem exportAsItem;
4359	6189	MenuItem reexportItem;
4360	6190	MenuItem povItem;
4361	6191	MenuItem closeItem;
4362		- Menu cameraMenu;
	6192	+
4363	6193	CheckboxMenuItem zBufferItem;
4364	6194	//MenuItem normalLensItem;
4365		- MenuItem editCameraItem;
4366		- MenuItem revertCameraItem;
4367		- CheckboxMenuItem toggleLiveItem;
4368	6195	MenuItem stepItem;
4369		- CheckboxMenuItem toggleFullItem;
	6196	+ CheckboxMenuItem toggleLiveItem;
	6197	+ CheckboxMenuItem toggleFullScreenItem;
	6198	+ CheckboxMenuItem toggleTimelineItem;
4370	6199	CheckboxMenuItem toggleRenderItem;
4371	6200	CheckboxMenuItem toggleDebugItem;
4372	6201	CheckboxMenuItem toggleFrustumItem;
4373	6202	CheckboxMenuItem toggleFootContactItem;
4374	6203	CheckboxMenuItem toggleDLItem;
4375	6204	CheckboxMenuItem toggleTextureItem;
4376		- CheckboxMenuItem toggleRandomItem;
	6205	+ CheckboxMenuItem toggleSwitchItem;
4377	6206	CheckboxMenuItem toggleRootItem;
4378	6207	CheckboxMenuItem animationItem;
	6208	+ MenuItem archiveItem;
4379	6209	CheckboxMenuItem toggleHandleItem;
4380	6210	CheckboxMenuItem togglePaintItem;
4381	6211	JSplitPane mainPanel;
4382	6212	JScrollPane scrollpane;
	6213	+
4383	6214	JPanel toolbarPanel;
4384		- JPanel treePanel;
	6215	+
	6216	+ cGridBag treePanel;
	6217	+
4385	6218	JPanel radioPanel;
4386	6219	ButtonGroup buttonGroup;
4387		- JPanel ctrlPanel;
4388		- JPanel materialPanel;
	6220	+
	6221	+ cGridBag toolboxPanel;
	6222	+ cGridBag skyboxPanel;
	6223	+ cGridBag materialPanel;
	6224	+ cGridBag ctrlPanel;
	6225	+
4389	6226	JScrollPane infoPanel;
4390		- JPanel optionsPanel;
	6227	+
	6228	+ cGridBag optionsPanel;
	6229	+
4391	6230	JTabbedPane objectPanel;
4392		- JPanel XYZPanel;
	6231	+ boolean materialFlushed;
	6232	+ Object3D latestObject;
	6233	+
	6234	+ cGridBag transformPanel;
	6235	+ cGridBag XYZPanel;
	6236	+
4393	6237	JSplitPane gridPanel;
4394	6238	JSplitPane bigPanel;
4395		- JPanel bigThree;
4396		- JTabbedPane jtp;
4397		- JPanel cameraPanel;
	6239	+
	6240	+ cGridBag bigThree;
	6241	+ cGridBag scenePanel;
	6242	+ cGridBag centralPanel;
	6243	+ JSplitPane cameraPanel;
	6244	+ JPanel timelinePanel;
	6245	+ JMenuBar timelineMenubar;
4398	6246	JSplitPane framePanel;
4399	6247	JTextArea/Field/ nameField;
4400		- cButton textureButton;
	6248	+ //cButton textureButton;
4401	6249	cButton okButton;
4402	6250	cButton applyButton;
4403	6251	cButton cancelButton;
..	..	@@ -4444,65 +6292,76 @@
4444	6292	// MATERIAL
4445	6293	JLabel materialLabel;
4446	6294	JLabel colorLabel;
4447		- NumberSlider colorField;
	6295	+ cNumberSlider colorField;
4448	6296	JLabel modulationLabel;
4449		- NumberSlider modulationField;
	6297	+ cNumberSlider saturationField;
4450	6298	JLabel metalnessLabel;
4451		- NumberSlider metalnessField;
	6299	+ cNumberSlider metalnessField;
4452	6300	JLabel diffuseLabel;
4453		- NumberSlider diffuseField;
	6301	+ cNumberSlider diffuseField;
4454	6302	JLabel specularLabel;
4455		- NumberSlider specularField;
	6303	+ cNumberSlider specularField;
4456	6304	JLabel shininessLabel;
4457		- NumberSlider shininessField;
	6305	+ cNumberSlider shininessField;
4458	6306	JLabel shiftLabel;
4459		- NumberSlider shiftField;
	6307	+ cNumberSlider shiftField;
4460	6308	JLabel ambientLabel;
4461		- NumberSlider ambientField;
	6309	+ cNumberSlider ambientField;
4462	6310	JLabel lightareaLabel;
4463		- NumberSlider lightareaField;
	6311	+ cNumberSlider lightareaField;
4464	6312	JLabel diffusenessLabel;
4465		- NumberSlider diffusenessField;
	6313	+ cNumberSlider diffusenessField;
4466	6314	JLabel velvetLabel;
4467		- NumberSlider velvetField;
	6315	+ cNumberSlider velvetField;
4468	6316	JLabel sheenLabel;
4469		- NumberSlider sheenField;
	6317	+ cNumberSlider sheenField;
4470	6318	JLabel subsurfaceLabel;
4471		- NumberSlider subsurfaceField;
	6319	+ cNumberSlider subsurfaceField;
4472	6320	//JLabel bumpLabel;
4473	6321	//NumberSlider bumpField;
4474	6322	JLabel backlitLabel;
4475		- NumberSlider backlitField;
	6323	+ cNumberSlider backlitField;
4476	6324	JLabel anisoLabel;
4477		- NumberSlider anisoField;
	6325	+ cNumberSlider anisoField;
4478	6326	JLabel anisoVLabel;
4479		- NumberSlider anisoVField;
	6327	+ cNumberSlider anisoVField;
	6328	+
4480	6329	JLabel cameraLabel;
4481		- NumberSlider cameraField;
	6330	+ cNumberSlider cameraField;
4482	6331	JLabel selfshadowLabel;
4483		- NumberSlider selfshadowField;
	6332	+ cNumberSlider selfshadowField;
4484	6333	JLabel shadowLabel;
4485		- NumberSlider shadowField;
	6334	+ cNumberSlider shadowField;
4486	6335	JLabel textureLabel;
4487		- NumberSlider textureField;
	6336	+ cNumberSlider textureField;
4488	6337	JLabel opacityLabel;
4489		- NumberSlider opacityField;
	6338	+ cNumberSlider opacityField;
	6339	+ JLabel parallaxLabel;
	6340	+ cNumberSlider parallaxField;
4490	6341	JLabel fakedepthLabel;
4491		- NumberSlider fakedepthField;
	6342	+ cNumberSlider fakedepthField;
4492	6343	JLabel shadowbiasLabel;
4493		- NumberSlider shadowbiasField;
	6344	+ cNumberSlider shadowbiasField;
	6345	+
4494	6346	JLabel bumpLabel;
4495		- NumberSlider bumpField;
	6347	+ cNumberSlider bumpField;
4496	6348	JLabel noiseLabel;
4497		- NumberSlider noiseField;
	6349	+ cNumberSlider noiseField;
4498	6350	JLabel powerLabel;
4499		- NumberSlider powerField;
	6351	+ cNumberSlider powerField;
4500	6352	JLabel borderfadeLabel;
4501		- NumberSlider borderfadeField;
	6353	+ cNumberSlider borderfadeField;
4502	6354	JLabel fogLabel;
4503		- NumberSlider fogField;
	6355	+ cNumberSlider fogField;
4504	6356	JLabel opacityPowerLabel;
4505		- NumberSlider opacityPowerField;
4506		- JTree jTree;
	6357	+ cNumberSlider opacityPowerField;
	6358	+ cTree jTree;
4507	6359	//ObjectUI parent;
	6360	+
	6361	+ cNumberSlider normalpushField;
	6362	+
	6363	+ private MenuItem importGFDItem;
	6364	+ private MenuItem importVRMLX3DItem;
	6365	+ private MenuItem import3DSItem;
	6366	+ private MenuItem importOBJItem;
4508	6367	}