~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -28,7 +34,153 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ public cToggleButton pinButton;
	38	+ boolean timeline;
	39	+ boolean wasFullScreen;
31	40
	41	+ GroupEditor callee;
	42	+ JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
	90	+ public cGridBag GetSeparator()
	91	+ {
	92	+ cGridBag separator = new cGridBag();
	93	+ separator.add(new JSeparator());
	94	+ separator.preferredHeight = 5;
	95	+ return separator;
	96	+ }
	97	+
	98	+ cButton GetButton(String name, boolean border)
	99	+ {
	100	+ ImageIcon icon = GetIcon(name);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
	111	+ }
	112	+
	113	+ cToggleButton GetToggleButton(String name, boolean border)
	114	+ {
	115	+ ImageIcon icon = GetIcon(name);
	116	+ return new cToggleButton(icon, border);
	117	+ }
	118	+
	119	+ cCheckBox GetCheckBox(String name, boolean border)
	120	+ {
	121	+ ImageIcon icon = GetIcon(name);
	122	+ return new cCheckBox(icon, border);
	123	+ }
	124	+
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
	128	+ {
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
	135	+ try
	136	+ {
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
	145	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	146	+// {
	147	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	148	+// Graphics2D g = resized.createGraphics();
	149	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	150	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	151	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	152	+// g.dispose();
	153	+//
	154	+// image = resized;
	155	+// }
	156	+
	157	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
	161	+ return icon;
	162	+ }
	163	+ catch (Exception e)
	164	+ {
	165	+ //icons.put(name, null);
	166	+ return null;
	167	+ }
	168	+ }
	169	+
	170	+ BufferedImage GetImage(String name)
	171	+ {
	172	+ try
	173	+ {
	174	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	175	+
	176	+ return image;
	177	+ }
	178	+ catch (Exception e)
	179	+ {
	180	+ return null;
	181	+ }
	182	+ }
	183	+
32	184	// SCRIPT
33	185
34	186	transient JFrame textpanel = null;
..	..	@@ -119,51 +271,62 @@
119	271	void keyPressed(int key, int modifiers)
120	272	{
121	273	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	274	+ Globals.theRenderer.keyPressed(key, modifiers);
123	275	}
124	276	*/
125	277
126	278	static GridBagConstraints aConstraints;
127	279	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	280	+
130	281	static int GRIDWIDTH = 100; // 4;
131	282
132	283	public void closeUI()
133	284	{
134	285	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	286	+// System.out.println("this = " + this);
	287	+// System.out.println("objEditor = " + objEditor);
137	288	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	289	+// objEditor.ctrlPanel.remove(nameField);
139	290
140		- if (!GroupEditor.allparams)
	291	+ objEditor.ctrlPanel.remove(namePanel);
	292	+
	293	+ if (!allparams)
141	294	return;
142	295
143		- objEditor.ctrlPanel.remove(liveCB);
144		- objEditor.ctrlPanel.remove(hideCB);
145		- objEditor.ctrlPanel.remove(markCB);
146		-
147		- objEditor.ctrlPanel.remove(randomCB);
148		- objEditor.ctrlPanel.remove(speedupCB);
149		- objEditor.ctrlPanel.remove(rewindCB);
150		-
151		- objEditor.ctrlPanel.remove(resetButton);
152		- objEditor.ctrlPanel.remove(stepButton);
153		-// objEditor.ctrlPanel.remove(stepAllButton);
154		-// objEditor.ctrlPanel.remove(resetAllButton);
155		- objEditor.ctrlPanel.remove(link2masterCB);
156		- //objEditor.ctrlPanel.remove(flipVCB);
157		- //objEditor.ctrlPanel.remove(texresMenu);
158		- objEditor.ctrlPanel.remove(slowerButton);
159		- objEditor.ctrlPanel.remove(fasterButton);
160		- objEditor.ctrlPanel.remove(remarkButton);
	296	+// objEditor.ctrlPanel.remove(liveCB);
	297	+// objEditor.ctrlPanel.remove(hideCB);
	298	+// objEditor.ctrlPanel.remove(markCB);
	299	+//
	300	+// objEditor.ctrlPanel.remove(randomCB);
	301	+// objEditor.ctrlPanel.remove(speedupCB);
	302	+// objEditor.ctrlPanel.remove(rewindCB);
	303	+//
	304	+// objEditor.ctrlPanel.remove(resetButton);
	305	+// objEditor.ctrlPanel.remove(stepButton);
	306	+//// objEditor.ctrlPanel.remove(stepAllButton);
	307	+//// objEditor.ctrlPanel.remove(resetAllButton);
	308	+// objEditor.ctrlPanel.remove(link2masterCB);
	309	+// //objEditor.ctrlPanel.remove(flipVCB);
	310	+// //objEditor.ctrlPanel.remove(texresMenu);
	311	+// objEditor.ctrlPanel.remove(slowerButton);
	312	+// objEditor.ctrlPanel.remove(fasterButton);
	313	+// objEditor.ctrlPanel.remove(remarkButton);
	314	+
	315	+ objEditor.ctrlPanel.remove(setupPanel);
	316	+ objEditor.ctrlPanel.remove(setupPanel2);
	317	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	318	+ objEditor.ctrlPanel.remove(pushPanel);
	319	+ //objEditor.ctrlPanel.remove(fillPanel);
	320	+
	321	+ //Remove(normalpushField);
161	322	}
162	323
163	324	public ObjEditor GetEditor()
164	325	{
165	326	return objEditor; //.GetEditor();
166	327	}
	328	+
	329	+ // Sometimes myself, sometimes my callee's.
167	330	ObjEditor objEditor;
168	331
169	332	/*
..	..	@@ -199,6 +362,14 @@
199	362	client = inClient;
200	363	copy = client;
201	364
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
	372	+
202	373	// "this" is not called: SetupUI2(objEditor);
203	374	}
204	375
..	..	@@ -212,6 +383,14 @@
212	383	client = inClient;
213	384	copy = client;
214	385
	386	+ if (copy.versionlist == null)
	387	+ {
	388	+ copy.versionlist = new Object3D[100];
	389	+ copy.versionindex = -1;
	390	+
	391	+// Save(true);
	392	+ }
	393	+
215	394	SetupUI2(callee.GetEditor());
216	395	}
217	396
..	..	@@ -226,23 +405,33 @@
226	405	//localCopy.parent = null;
227	406
228	407	frame = new JFrame();
	408	+ frame.setUndecorated(false);
229	409	objEditor = this;
230	410	this.callee = callee;
231	411
232	412	//parent = p;
233	413
234	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
235		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
236	417	//gd.setFullScreenWindow(this);
237	418	//setResizable(false);
238	419	//if (!isDisplayable())
239	420	//setUndecorated(true);
240	421
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	422	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	423	client = inClient;
243	424	copy = localCopy;
244	425	copy.editWindow = this;
245	426
	427	+// if (copy.versionlist == null)
	428	+// {
	429	+// copy.versionlist = new Object3D[100];
	430	+// copy.versionindex = -1;
	431	+//
	432	+// Save(true);
	433	+// }
	434	+
246	435	SetupMenu();
247	436
248	437	//SetupName(objEditor); // new
..	..	@@ -256,28 +445,55 @@
256	445	return frame.action(event, obj);
257	446	}
258	447
	448	+ // Cannot work without static
	449	+ static boolean allparams = true;
	450	+
	451	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	452	+
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
259	456	void SetupMenu()
260	457	{
261	458	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..."));
	459	+ menuBar.add(fileMenu = new Menu("File"));
	460	+ fileMenu.add(newItem = new MenuItem("New"));
	461	+ fileMenu.add(openItem = new MenuItem("Open..."));
	462	+
	463	+ //oe.menuBar.add(menu = new Menu("Include"));
	464	+ Menu menu = new Menu("Import");
	465	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	466	+ importOBJItem.addActionListener(this);
	467	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	468	+ import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
	471	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	472	+ importVRMLX3DItem.addActionListener(this);
	473	+ }
	474	+ menu.add("-");
	475	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	476	+ importGFDItem.addActionListener(this);
	477	+ fileMenu.add(menu);
	478	+ fileMenu.add("-");
	479	+
	480	+ fileMenu.add(saveItem = new MenuItem("Save"));
	481	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	482	//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("-");
	483	+ fileMenu.add("-");
	484	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	485	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	486	+ fileMenu.add("-");
272	487	if (client.parent != null)
273	488	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	489	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	490	} else
276	491	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	492	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	493	}
279	494
280		- loadItem.addActionListener(this);
	495	+ newItem.addActionListener(this);
	496	+ openItem.addActionListener(this);
281	497	saveItem.addActionListener(this);
282	498	saveAsItem.addActionListener(this);
283	499	exportAsItem.addActionListener(this);
..	..	@@ -285,82 +501,103 @@
285	501	//povItem.addActionListener(this);
286	502	closeItem.addActionListener(this);
287	503
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(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullScreenItem.addItemListener(this);
297		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
299		- toggleTimelineItem.addItemListener(this);
300		- cameraMenu.add("-");
301		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
302		- toggleTextureItem.addItemListener(this);
303		- toggleTextureItem.setState(CameraPane.textureon);
304		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
305		- toggleLiveItem.addItemListener(this);
306		- toggleLiveItem.setState(CameraPane.isLIVE());
307		- cameraMenu.add(stepItem = new MenuItem("Step"));
308		- stepItem.addActionListener(this);
309		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
310		-// toggleDLItem.addItemListener(this);
311		-// toggleDLItem.setState(false);
312		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
313		- toggleRenderItem.addItemListener(this);
314		- toggleRenderItem.setState(!CameraPane.frozen);
315		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
316		- toggleDebugItem.addItemListener(this);
317		- toggleDebugItem.setState(CameraPane.DEBUG);
318		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
319		- toggleFrustumItem.addItemListener(this);
320		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
321		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
322		- toggleFootContactItem.addItemListener(this);
323		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
324		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
325		- toggleRandomItem.addItemListener(this);
326		- toggleRandomItem.setState(CameraPane.RANDOM);
327		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
328		- toggleHandleItem.addItemListener(this);
329		- toggleHandleItem.setState(CameraPane.HANDLES);
330		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331		- togglePaintItem.addItemListener(this);
332		- togglePaintItem.setState(CameraPane.PAINTMODE);
333		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
334		-// toggleRootItem.addItemListener(this);
335		-// toggleRootItem.setState(false);
336		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
337		-// animationItem.addItemListener(this);
338		-// animationItem.setState(CameraPane.ANIMATION);
339		- cameraMenu.add("-");
340		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
341		- editCameraItem.addActionListener(this);
342		-
343	504	objectPanel = new JTabbedPane();
	505	+
	506	+ ChangeListener changeListener = new ChangeListener()
	507	+ {
	508	+ //String name;
	509	+
	510	+ public void stateChanged(ChangeEvent changeEvent)
	511	+ {
	512	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	513	+// {
	514	+// if (latestObject != null)
	515	+// {
	516	+// refreshContents(true);
	517	+// SetMaterial(latestObject);
	518	+// }
	519	+//
	520	+// materialFlushed = true;
	521	+// }
	522	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	523	+// {
	524	+// if (listUI.size() == 0)
	525	+// EditSelection(false);
	526	+// }
	527	+
	528	+// if (objectPanel.getSelectedIndex() == 4)
	529	+// {
	530	+// name = copy.skyboxname;
	531	+//
	532	+// if (name == null)
	533	+// {
	534	+// name = "";
	535	+// }
	536	+//
	537	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	538	+// copy.skyboxext = "jpg";
	539	+// }
	540	+// else
	541	+// {
	542	+// if (name != null)
	543	+// {
	544	+// if (name.equals(""))
	545	+// {
	546	+// copy.skyboxname = null;
	547	+// copy.skyboxext = null;
	548	+// }
	549	+// else
	550	+// {
	551	+// copy.skyboxname = name;
	552	+// }
	553	+// }
	554	+// }
	555	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	556	+
	557	+// refreshContents(false); // To refresh Info tab
	558	+ cameraView.repaint();
	559	+ }
	560	+ };
	561	+ objectPanel.addChangeListener(changeListener);
	562	+
344	563	toolbarPanel = new JPanel();
345	564	toolbarPanel.setName("Toolbar");
346		- treePanel = new JPanel();
	565	+
	566	+ treePanel = new cGridBag();
347	567	treePanel.setName("Tree");
348		- ctrlPanel = new JPanel(); // new GridBagLayout());
349		- ctrlPanel.setName("Edit");
350		- materialPanel = new JPanel();
351		- materialPanel.setName("Material");
	568	+
	569	+ editPanel = new cGridBag().setVertical(true);
	570	+ //editPanel.setName("Edit");
	571	+
	572	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	573	+
	574	+ editCommandsPanel = new cGridBag();
	575	+ editPanel.add(editCommandsPanel);
	576	+ editPanel.add(ctrlPanel);
	577	+
	578	+ toolboxPanel = new cGridBag().setVertical(true);
	579	+ //toolboxPanel.setName("Toolbox");
	580	+
	581	+ skyboxPanel = new cGridBag().setVertical(true);
	582	+
	583	+ materialPanel = new cGridBag().setVertical(false);
	584	+ //materialPanel.setName("Material");
	585	+
352	586	/JTextPane/
353	587	infoarea = createTextPane();
	588	+ doc = infoarea.getStyledDocument();
	589	+
354	590	infoarea.setEditable(true);
355	591	SetText();
	592	+
356	593	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
357	594	// infoarea.setOpaque(false);
358	595	// //infoarea.setForeground(textcolor);
359		- infoarea.setLineWrap(true);
360		- infoarea.setWrapStyleWord(true);
	596	+// TEXTAREA infoarea.setLineWrap(true);
	597	+// TEXTAREA infoarea.setWrapStyleWord(true);
361	598	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
362		- infoPanel.setPreferredSize(new Dimension(50, 200));
363		- infoPanel.setName("Info");
	599	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	600	+ //infoPanel.setName("Info");
364	601	//infoPanel.setLayout(new BorderLayout());
365	602	//infoPanel.add(createTextPane());
366	603
..	..	@@ -368,16 +605,23 @@
368	605	mainPanel.setName("Main");
369	606	mainPanel.setContinuousLayout(true);
370	607	mainPanel.setOneTouchExpandable(true);
371		- mainPanel.setDividerLocation(1.0);
372	608	mainPanel.setDividerSize(9);
373		- mainPanel.setResizeWeight(0);
374		-
	609	+ mainPanel.setDividerLocation(0.5); //1.0);
	610	+ mainPanel.setResizeWeight(0.5);
	611	+
	612	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	613	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	614	+ divider.setDividerSize(15);
	615	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	616	+
	617	+ mainPanel.setUI(new BasicSplitPaneUI());
	618	+
375	619	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
376	620	//mainPanel.setLayout(new GridBagLayout());
377	621	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
378		- treePanel.setLayout(new GridBagLayout());
379		- ctrlPanel.setLayout(new GridBagLayout());
380		- materialPanel.setLayout(new GridBagLayout());
	622	+// treePanel.setLayout(new GridBagLayout());
	623	+ //ctrlPanel.setLayout(new GridBagLayout());
	624	+ //materialPanel.setLayout(new GridBagLayout());
381	625
382	626	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
383	627	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -416,7 +660,7 @@
416	660	static String newline = "\n";
417	661	protected static final String buttonString = "JButton";
418	662	StyledDocument doc;
419		- JTextArea infoarea;
	663	+ JTextPane infoarea;
420	664
421	665	void ClearInfo()
422	666	{
..	..	@@ -439,10 +683,10 @@
439	683	e.printStackTrace();
440	684	}
441	685
442		- String selection = infoarea.getText();
443		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
444		- java.awt.datatransfer.Clipboard clipboard =
445		- Toolkit.getDefaultToolkit().getSystemClipboard();
	686	+// String selection = infoarea.getText();
	687	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	688	+// java.awt.datatransfer.Clipboard clipboard =
	689	+// Toolkit.getDefaultToolkit().getSystemClipboard();
446	690	//clipboard.setContents(data, data);
447	691	}
448	692
..	..	@@ -465,13 +709,13 @@
465	709	//SendInfo("Name:", "bold");
466	710	if (sel.GetTextures() != null \|\| debug)
467	711	{
468		- si.SendInfo(sel.toString(), "bold");
	712	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
469	713	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
470	714	if (sel.Size() > 0)
471	715	{
472	716	si.SendInfo("#children = " + sel.Size(), "regular");
473	717	}
474		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	718	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
475	719	if (debug)
476	720	{
477	721	try
..	..	@@ -483,7 +727,10 @@
483	727	}
484	728
485	729	if (full)
486		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	730	+ {
	731	+ si.SendInfo(" BBox min: " + minima, "regular");
	732	+ si.SendInfo(" BBox max: " + maxima, "regular");
	733	+ }
487	734
488	735	if (sel.bRep != null)
489	736	{
..	..	@@ -510,7 +757,7 @@
510	757	}
511	758	if (sel.support != null)
512	759	{
513		- si.SendInfo(" support: " + sel.support, "regular");
	760	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
514	761	}
515	762	if (sel.scriptnode != null)
516	763	{
..	..	@@ -581,6 +828,9 @@
581	828	{
582	829	CameraPane.pointflow = (PointFlow) sel;
583	830	}
	831	+
	832	+ si.SendInfo("_____________________", "regular");
	833	+ si.SendInfo("", "regular");
584	834	}
585	835	}
586	836
..	..	@@ -596,52 +846,216 @@
596	846	}
597	847	}
598	848
599		- private JTextArea createTextPane()
600		- {
601		- String[] initString =
602		- {
603		- "This is an editable JTextPane, ", //regular
604		- "another ", //italic
605		- "styled ", //bold
606		- "text ", //small
607		- "component, ", //large
608		- "which supports embedded components..." + newline,//regular
609		- " " + newline, //button
610		- "...and embedded icons..." + newline, //regular
611		- " ", //icon
612		- newline + "JTextPane is a subclass of JEditorPane that "
613		- + "uses a StyledEditorKit and StyledDocument, and provides "
614		- + "cover methods for interacting with those objects."
615		- };
	849	+//static GraphicsDevice device = GraphicsEnvironment
	850	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
616	851
617		- String[] initStyles =
618		- {
619		- "regular", "italic", "bold", "small", "large",
620		- "regular", "button", "regular", "icon",
621		- "regular"
622		- };
	852	+ Rectangle keeprect;
	853	+ cRadio radio;
	854	+
	855	+cButton keepButton;
	856	+ cButton twoButton; // Full 3D
	857	+ cButton sixButton;
	858	+ cButton threeButton;
	859	+ cButton sevenButton;
	860	+ cButton fourButton; // full panel
	861	+ cButton oneButton; // full XYZ
	862	+ //cButton currentLayout;
	863	+
	864	+ boolean maximized;
	865	+
	866	+ cButton fullscreenLayout;
	867	+ cButton expandedLayout;
623	868
624		- JTextPane textPane = new JTextPane();
625		- textPane.setEditable(true);
626		- /StyledDocument/ doc = textPane.getStyledDocument();
627		- addStylesToDocument(doc);
628		-
629		- try
	869	+ void Minimize()
630	870	{
631		- for (int j = 0; j < 2; j++)
	871	+ frame.setState(Frame.ICONIFIED);
	872	+ frame.validate();
	873	+ }
	874	+
	875	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	876	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	877	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	878	+ void Maximize()
	879	+ {
	880	+ if (CameraPane.FULLSCREEN)
632	881	{
633		- for (int i = 0; i < initString.length; i++)
634		- {
635		- doc.insertString(doc.getLength(), initString[i],
636		- doc.getStyle(initStyles[i]));
637		- }
	882	+ ToggleFullScreen();
638	883	}
639		- } catch (BadLocationException ble)
	884	+
	885	+ if (maximized)
	886	+ {
	887	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	888	+ }
	889	+ else
	890	+ {
	891	+ keeprect = frame.getBounds();
	892	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	893	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	894	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	895	+// frame.setState(Frame.MAXIMIZED_BOTH);
	896	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	897	+ }
	898	+
	899	+ maximized ^= true;
	900	+
	901	+ frame.validate();
	902	+ }
	903	+
	904	+ cButton minButton;
	905	+ cButton maxButton;
	906	+ cButton fullButton;
	907	+ cButton collapseButton;
	908	+ cButton maximize3DButton;
	909	+
	910	+ void ToggleFullScreen()
640	911	{
641		- System.err.println("Couldn't insert initial text into text pane.");
	912	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	913	+
	914	+ cameraView.ToggleFullScreen();
	915	+
	916	+ if (!CameraPane.FULLSCREEN)
	917	+ {
	918	+ device.setFullScreenWindow(null);
	919	+ frame.dispose();
	920	+ frame.setUndecorated(false);
	921	+ frame.validate();
	922	+ frame.setVisible(true);
	923	+
	924	+ //frame.setVisible(false);
	925	+// frame.removeNotify();
	926	+// frame.setUndecorated(false);
	927	+// frame.addNotify();
	928	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	929	+
	930	+// X frame.getContentPane().remove(/"Center",/bigThree);
	931	+// X framePanel.add(bigThree);
	932	+// X frame.getContentPane().add(/"Center",/framePanel);
	933	+// framePanel.setDividerLocation(46); // icons are 24x24
	934	+
	935	+ //frame.setVisible(true);
	936	+// radio.layout = keepButton;
	937	+ //theFrame = null;
	938	+ keepButton = null;
	939	+// radio.layout.doClick();
	940	+
	941	+ } else
	942	+ {
	943	+ keepButton = radio.layout;
	944	+ //keeprect = frame.getBounds();
	945	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	946	+// frame.getToolkit().getScreenSize().height);
	947	+ //frame.setVisible(false);
	948	+
	949	+ frame.dispose();
	950	+ frame.setUndecorated(true);
	951	+ device.setFullScreenWindow(frame);
	952	+ frame.validate();
	953	+ frame.setVisible(true);
	954	+// frame.removeNotify();
	955	+// frame.setUndecorated(true);
	956	+// frame.addNotify();
	957	+// X frame.getContentPane().remove(/"Center",/framePanel);
	958	+// X framePanel.remove(bigThree);
	959	+// X frame.getContentPane().add(/"Center",/bigThree);
	960	+// framePanel.setDividerLocation(0);
	961	+
	962	+// radio.layout = fullscreenLayout;
	963	+// radio.layout.doClick();
	964	+ //frame.setVisible(true);
	965	+ }
	966	+ frame.validate();
	967	+
	968	+ cameraView.requestFocusInWindow();
642	969	}
643	970
644		- return new JTextArea(); // textPane;
	971	+ void CollapseToolbar()
	972	+ {
	973	+ framePanel.setDividerLocation(0);
	974	+ //frame.validate();
	975	+
	976	+ cameraView.requestFocusInWindow();
	977	+ }
	978	+
	979	+ private Object3D Duplicate(Object3D object)
	980	+ {
	981	+ boolean temp = CameraPane.SWITCH;
	982	+ CameraPane.SWITCH = false;
	983	+
	984	+ if (Grafreed.grafreed.universe.versiontable == null)
	985	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	986	+
	987	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	988	+ // if (copy == client)
	989	+
	990	+ Object3D versions[] = object.versionlist;
	991	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	992	+ object.versionlist = null;
	993	+ object.versiontable = null;
	994	+
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
	997	+
	998	+ //byte[] compress = Compress(copy);
	999	+ Object3D compress = (Object3D)Grafreed.clone(object);
	1000	+
	1001	+ object.parent = parent;
	1002	+
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	1007	+
	1008	+ CameraPane.SWITCH = temp;
	1009	+
	1010	+ return compress;
	1011	+ }
	1012	+
	1013	+ private JTextPane createTextPane()
	1014	+ {
	1015	+// TEXTAREA String[] initString =
	1016	+// {
	1017	+// "This is an editable JTextPane, ", //regular
	1018	+// "another ", //italic
	1019	+// "styled ", //bold
	1020	+// "text ", //small
	1021	+// "component, ", //large
	1022	+// "which supports embedded components..." + newline,//regular
	1023	+// " " + newline, //button
	1024	+// "...and embedded icons..." + newline, //regular
	1025	+// " ", //icon
	1026	+// newline + "JTextPane is a subclass of JEditorPane that "
	1027	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	1028	+// + "cover methods for interacting with those objects."
	1029	+// };
	1030	+//
	1031	+// String[] initStyles =
	1032	+// {
	1033	+// "regular", "italic", "bold", "small", "large",
	1034	+// "regular", "button", "regular", "icon",
	1035	+// "regular"
	1036	+// };
	1037	+//
	1038	+// JTextPane textPane = new JTextPane();
	1039	+// textPane.setEditable(true);
	1040	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1041	+// addStylesToDocument(doc);
	1042	+//
	1043	+// try
	1044	+// {
	1045	+// for (int j = 0; j < 2; j++)
	1046	+// {
	1047	+// for (int i = 0; i < initString.length; i++)
	1048	+// {
	1049	+// doc.insertString(doc.getLength(), initString[i],
	1050	+// doc.getStyle(initStyles[i]));
	1051	+// }
	1052	+// }
	1053	+// } catch (BadLocationException ble)
	1054	+// {
	1055	+// System.err.println("Couldn't insert initial text into text pane.");
	1056	+// }
	1057	+
	1058	+ return new JTextPane(); // textPane;
645	1059	}
646	1060
647	1061	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -694,7 +1108,7 @@
694	1108	protected static ImageIcon createImageIcon(String path,
695	1109	String description)
696	1110	{
697		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1111	+ java.net.URL imgURL = Grafreed.class.getResource(path);
698	1112	if (imgURL != null)
699	1113	{
700	1114	return new ImageIcon(imgURL, description);
..	..	@@ -717,6 +1131,7 @@
717	1131	{
718	1132	SetupMaterial(materialPanel);
719	1133	}
	1134	+
720	1135	//SetupName();
721	1136	//SetupViews();
722	1137	}
..	..	@@ -726,6 +1141,7 @@
726	1141	// NumberSlider vDivsField;
727	1142	// JCheckBox endcaps;
728	1143	JCheckBox liveCB;
	1144	+ JCheckBox selectableCB;
729	1145	JCheckBox hideCB;
730	1146	JCheckBox link2masterCB;
731	1147	JCheckBox markCB;
..	..	@@ -733,7 +1149,12 @@
733	1149	JCheckBox speedupCB;
734	1150	JCheckBox rewindCB;
735	1151	JCheckBox flipVCB;
	1152	+
	1153	+ cCheckBox toggleTextureCB;
	1154	+ cCheckBox toggleSwitchCB;
	1155	+
736	1156	JComboBox texresMenu;
	1157	+
737	1158	JButton resetButton;
738	1159	JButton stepButton;
739	1160	JButton stepAllButton;
..	..	@@ -741,115 +1162,87 @@
741	1162	JButton slowerButton;
742	1163	JButton fasterButton;
743	1164	JButton remarkButton;
	1165	+
	1166	+ cGridBag editPanel;
	1167	+ cGridBag editCommandsPanel;
	1168	+
	1169	+ cGridBag namePanel;
	1170	+ cGridBag setupPanel;
	1171	+ cGridBag setupPanel2;
	1172	+ cGridBag objectCommandsPanel;
	1173	+ cGridBag pushPanel;
	1174	+ cGridBag fillPanel;
744	1175
745		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1176	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
746	1177	{
747	1178	JCheckBox cb;
748	1179
749		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
750		- oe.aConstraints.gridwidth = 1; // 3;
751		-// oe.aConstraints.weightx = 1;
752		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
753		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1180	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
754	1181	cb.addItemListener(this);
755		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
756		- oe.aConstraints.gridwidth = 1;
757		- oe.aConstraints.gridx += 1;
758	1182
759	1183	return cb;
760	1184	}
761	1185
762		- cButton AddButton(ObjEditor oe, String label)
	1186	+ cButton AddButton(cGridBag panel, String label)
763	1187	{
764	1188	cButton cb;
765	1189
766		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
767		- oe.aConstraints.gridwidth = 1;
768		-// oe.aConstraints.weightx = 1;
769		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
770		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1190	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
771	1191	cb.addActionListener(this);
772		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
773		- oe.aConstraints.gridwidth = 1;
774		- oe.aConstraints.gridx += 1;
775	1192
776	1193	return cb;
777	1194	}
778	1195
779		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1196	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
780	1197	{
781	1198	JComboBox combo;
782	1199
783		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
784		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
785		- oe.aConstraints.gridx += 1;
	1200	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
786	1201	combo.addActionListener(this);
787	1202
788	1203	return combo;
789	1204	}
790	1205
791		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1206	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
792	1207	{
793		- NumberSlider combo;
	1208	+ cGridBag control = new cGridBag();
	1209	+
	1210	+ cNumberSlider combo;
794	1211
795	1212	JLabel jlabel = new JLabel(label);
796		-
797		- aConstraints.fill = GridBagConstraints.VERTICAL;
798	1213	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
799		- aConstraints.gridwidth = 2;
800		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
801		- aConstraints.gridx += 1;
802		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
803		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
804		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
805		- aConstraints.gridx += 1;
806		- aConstraints.gridwidth = 1;
807		-
	1214	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1215	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	1216	combo.setFloat(current);
809		-
810		- combo.label = jlabel;
811		-
812		- combo.addChangeListener(this);
813		-
814		- return combo;
	1217	+
	1218	+ panel.add(control);
	1219	+
	1220	+ return control;
815	1221	}
816	1222
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1223	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
818	1224	{
819		- NumberSlider combo;
	1225	+ cGridBag control = new cGridBag();
	1226	+
	1227	+ cNumberSlider combo;
820	1228
821	1229	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	1230	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 2;
826		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
829		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	1231	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1232	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	1233	combo.setInteger(current);
835	1234
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	1235	+ panel.add(control);
	1236	+
	1237	+ return control;
841	1238	}
842	1239
843		- JTextArea AddText(JPanel ctrlPanel, String name)
	1240	+ JTextArea AddText(cGridBag ctrlPanel, String name)
844	1241	{
845	1242	JTextArea text;
846	1243
847		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
848		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
849		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1244	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
850	1245	text.addCaretListener(this);
851		- aConstraints.gridx += 1;
852		- aConstraints.gridwidth = 1;
853	1246
854	1247	return text;
855	1248	}
..	..	@@ -879,9 +1272,16 @@
879	1272	objEditor.ctrlPanel.remove(j);
880	1273	}
881	1274
	1275	+ void Remove(cNumberSlider j)
	1276	+ {
	1277	+ j.removeChangeListener(this);
	1278	+ //objEditor.ctrlPanel.remove(j.label);
	1279	+ objEditor.ctrlPanel.remove(j);
	1280	+ }
	1281	+
882	1282	/*
883	1283	*/
884		- void Return() // ObjEditor oe)
	1284	+ void Return0() // ObjEditor oe)
885	1285	{
886	1286	aConstraints.gridy += 1;
887	1287	aConstraints.gridx = 0;
..	..	@@ -936,35 +1336,93 @@
936	1336
937	1337	void SetupUI2(ObjEditor oe)
938	1338	{
939		-// oe.aConstraints.weightx = 0;
940		-// oe.aConstraints.weighty = 0;
941		-// oe.aConstraints.gridx = 0;
942		-// oe.aConstraints.gridy = 0;
943		- SetupName(oe);
	1339	+ //SetupName(oe);
944	1340
945		- if (!GroupEditor.allparams)
	1341	+ namePanel = new cGridBag();
	1342	+
	1343	+ //if (copy.pinned)
	1344	+ {
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1346	+ pinButton.setSelected(copy.pinned);
	1347	+ cGridBag t = new cGridBag();
	1348	+ t.preferredWidth = 2;
	1349	+ t.add(pinButton);
	1350	+ namePanel.add(t);
	1351	+
	1352	+ pinButton.addItemListener(this);
	1353	+ }
	1354	+
	1355	+ nameField = AddText(namePanel, copy.GetName());
	1356	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1357	+ oe.ctrlPanel.add(namePanel);
	1358	+
	1359	+ oe.ctrlPanel.Return();
	1360	+
	1361	+ if (!allparams)
946	1362	return;
947	1363
948		- liveCB = AddCheckBox(oe, "Live", copy.live);
949		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
950		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1364	+ setupPanel = new cGridBag().setVertical(false);
	1365	+
	1366	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1367	+ liveCB.setToolTipText("Animate object");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
	1370	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1371	+ selectableCB.setToolTipText("Make object selectable");
951	1372	// Return();
952		- markCB = AddCheckBox(oe, "Mark", copy.marked);
953		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
954		- randomCB = AddCheckBox(oe, "Rand", copy.random);
955		- Return();
956		- resetButton = AddButton(oe, "Reset");
957		- stepButton = AddButton(oe, "Step");
	1373	+
	1374	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1375	+ hideCB.setToolTipText("Hide object");
	1376	+
	1377	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1378	+
	1379	+ setupPanel2 = new cGridBag().setVertical(false);
	1380	+
	1381	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1382	+ rewindCB.setToolTipText("Rewind animation");
	1383	+
	1384	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1385	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1386	+
	1387	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1388	+ link2masterCB.setToolTipText("Attach to support");
	1389	+
	1390	+ if (Globals.ADVANCED)
	1391	+ {
	1392	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1393	+ speedupCB.setToolTipText("Option motion capture");
	1394	+ }
	1395	+
	1396	+ oe.ctrlPanel.add(setupPanel);
	1397	+ oe.ctrlPanel.Return();
	1398	+ oe.ctrlPanel.add(setupPanel2);
	1399	+ oe.ctrlPanel.Return();
	1400	+
	1401	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1402	+
	1403	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1404	+ resetButton.setToolTipText("Jump to frame zero");
	1405	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1406	+ stepButton.setToolTipText("Step one frame");
958	1407	// resetAllButton = AddButton(oe, "Reset All");
959	1408	// stepAllButton = AddButton(oe, "Step All");
960		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
961	1409	// Return();
962		- slowerButton = AddButton(oe, "Slow");
963		- fasterButton = AddButton(oe, "Fast");
964		- remarkButton = AddButton(oe, "Rem");
	1410	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1411	+ slowerButton.setToolTipText("Decrease animation speed");
	1412	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1413	+ fasterButton.setToolTipText("Increase animation speed");
	1414	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1415	+ remarkButton.setToolTipText("Set the current transform as the target");
965	1416
966		- Return();
	1417	+ oe.ctrlPanel.add(objectCommandsPanel);
	1418	+ oe.ctrlPanel.Return();
967	1419
	1420	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1421	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1422	+ //Return();
	1423	+
	1424	+ oe.ctrlPanel.Return();
	1425	+
968	1426	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
969	1427	// ObjEditor.aConstraints.gridx += 1;
970	1428
..	..	@@ -1058,7 +1516,7 @@
1058	1516	oe.aConstraints.gridwidth = 1;
1059	1517	/**/
1060	1518	nameField = AddText(oe.ctrlPanel, copy.GetName());
1061		- Return();
	1519	+ oe.ctrlPanel.Return();
1062	1520
1063	1521	//ctrlPanel.add(textureButton = new Button("Texture..."));
1064	1522	//textureButton.setEnabled(false);
..	..	@@ -1116,22 +1574,9 @@
1116	1574
1117	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1118	1576	{
1119		- System.out.println("CREATE CAMERAS");
1120		- cams = new cTemplate();
1121		- cams.name = "Cameras";
1122		- copy.insertElementAt(cams, 0);
1123		- //cams.parent = copy;
1124		-
1125		- cam = new Camera(); // LA.newVector(3, 2, 1));
1126		- cams.addChild(cam);
1127		- cam = new Camera(1);
1128		- cams.addChild(cam);
1129		- cam = new Camera(2);
1130		- cams.addChild(cam);
1131		- cam = new Camera(3);
1132		- cams.addChild(cam);
1133		- cam = new Camera(4); // Light
1134		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1135	1580	} else
1136	1581	{
1137	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1160,11 +1605,25 @@
1160	1605	//JPanel worldPanel =
1161	1606	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1162	1607	//worldPanel.setName("World");
1163		- centralPanel = new JPanel(new BorderLayout());
1164		- timelinePanel = new JPanel(new BorderLayout());
1165		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	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);
1166	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	+
1167	1625	centralPanel.add(cameraView);
	1626	+ centralPanel.setFocusable(true);
1168	1627	//frame.setJMenuBar(timelineMenubar);
1169	1628	//centralPanel.add(timelinePanel);
1170	1629
..	..	@@ -1183,13 +1642,57 @@
1183	1642	//frontView.object = copy;
1184	1643	//sideView.object = copy;
1185	1644
1186		- XYZPanel = new JPanel();
1187		- 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));
1188	1686
1189		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1190		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1191		- 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");
1192	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1193	1696	/*
1194	1697	gridPanel = new JPanel(); //new BorderLayout());
1195	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1197,12 +1700,12 @@
1197	1700	gridPanel.add(cameraView);
1198	1701	gridPanel.add(XYZPanel);
1199	1702	*/
1200		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1201		- gridPanel.setContinuousLayout(true);
1202		- gridPanel.setOneTouchExpandable(true);
1203		- gridPanel.setDividerLocation(1.0);
1204		- gridPanel.setDividerSize(9);
1205		- 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);
1206	1709
1207	1710	// aConstraints.weighty = 0;
1208	1711	//System.out.println("THIS = " + this);
..	..	@@ -1225,13 +1728,34 @@
1225	1728
1226	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1227	1730	//tmp.setName("Edit");
1228		- objectPanel.add(materialPanel);
1229		- JPanel north = new JPanel(new BorderLayout());
1230		- north.setName("Edit");
1231		- north.add(ctrlPanel, BorderLayout.NORTH);
1232		- objectPanel.add(north);
1233		- 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");
1234	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	+
1235	1759	/*
1236	1760	aConstraints.gridx = 0;
1237	1761	aConstraints.gridwidth = 1;
..	..	@@ -1239,7 +1763,7 @@
1239	1763	aConstraints.gridy += 1;
1240	1764	aConstraints.gridwidth = 1;
1241	1765	mainPanel.add(objectPanel, aConstraints);
1242		- */
	1766	+ */
1243	1767
1244	1768	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1245	1769	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1250,16 +1774,120 @@
1250	1774	scrollpane.setWheelScrollingEnabled(true);
1251	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1252	1776
1253		- /JTabbedPane/ scenePanel = new JTabbedPane();
1254		- scenePanel.add(scrollpane);
	1777	+ /JTabbedPane/ scenePanel = new cGridBag();
	1778	+ scenePanel.preferredWidth = 6;
	1779	+
	1780	+ JTabbedPane tabbedPane = new JTabbedPane();
	1781	+ tabbedPane.add(scrollpane);
1255	1782
1256		- scenePanel.add(FSPane = new cFileSystemPane(this));
1257		-
1258		- optionsPanel = new JPanel(new GridBagLayout());
	1783	+ optionsPanel = new cGridBag().setVertical(false);
1259	1784
1260	1785	optionsPanel.setName("Options");
1261		- scenePanel.add(optionsPanel);
	1786	+
	1787	+ AddOptions(optionsPanel); //, aConstraints);
	1788	+
	1789	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1262	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	+ tabbedPane.add(infoPanel);
	1888	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1889	+ tabbedPane.setToolTipTextAt(4, "Information");
	1890	+ }
1263	1891
1264	1892	/*
1265	1893	cTree jTree = new cTree(null);
..	..	@@ -1281,18 +1909,19 @@
1281	1909	jtp.add(tree);
1282	1910	*/
1283	1911
1284		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1285		- bigPanel.setContinuousLayout(true);
1286		- bigPanel.setOneTouchExpandable(true);
1287		- bigPanel.setDividerLocation(0.8);
1288		- bigPanel.setDividerSize(15);
1289		- bigPanel.setResizeWeight(0.15);
1290		- 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");
1291	1919
1292	1920	//bigPanel.setLayout(new BorderLayout());
1293	1921	//bigPanel.setSize(new Dimension(10,10));
1294	1922	//bigPanel.add(ctrlPanel);
1295	1923	//bigPanel.add(gridPanel);
	1924	+ /**
1296	1925	bigThree = new JPanel();
1297	1926	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1298	1927	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1316,7 +1945,13 @@
1316	1945	// aConstraints.gridheight = 3;
1317	1946	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1318	1947	bigThree.add(XYZPanel, aWindowConstraints);
	1948	+ /**/
1319	1949
	1950	+ bigThree = new cGridBag();
	1951	+ bigThree.addComponent(scenePanel);
	1952	+ bigThree.addComponent(centralPanel);
	1953	+ //bigThree.addComponent(XYZPanel);
	1954	+
1320	1955	// // SIDE EFFECT!!!
1321	1956	// aConstraints.gridx = 0;
1322	1957	// aConstraints.gridy = 0;
..	..	@@ -1324,33 +1959,55 @@
1324	1959	// aConstraints.gridheight = 1;
1325	1960
1326	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1327		- framePanel.setContinuousLayout(true);
1328		- framePanel.setOneTouchExpandable(true);
1329		- 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);
1330	1982	//framePanel.setDividerSize(15);
1331	1983	//framePanel.setResizeWeight(0.15);
1332	1984	framePanel.setName("Frame");
1333	1985
1334	1986	frame.getContentPane().setLayout(new BorderLayout());
1335	1987	/**/
1336		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1337	1989	//worldPane.add(bigPanel);
1338	1990	//worldPane.add(worldPanel);
1339	1991	/**/
1340		- frame.getContentPane().add(/"Center",/framePanel);
	1992	+ //frame.getContentPane().add(/"Center",/framePanel);
	1993	+ frame.add(/"Center",/framePanel);
1341	1994	//frame.getContentPane().add(/"Center",/ worldPane);
1342	1995
1343	1996	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1344	1997
1345		- frame.setSize(1024, 768);
1346		- frame.show();
	1998	+ frame.setSize(1280, 860);
	1999	+
	2000	+ cameraView.requestFocusInWindow();
	2001	+
	2002	+// gridPanel.setDividerLocation(1.0);
	2003	+
	2004	+ frame.validate();
1347	2005
1348		- gridPanel.setDividerLocation(1.0);
	2006	+ frame.setVisible(true);
1349	2007
1350	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1351	2009	frame.addWindowListener(new WindowAdapter()
1352	2010	{
1353		-
1354	2011	public void windowClosing(WindowEvent e)
1355	2012	{
1356	2013	Close();
..	..	@@ -1358,6 +2015,10 @@
1358	2015	});
1359	2016	}
1360	2017
	2018	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	2019	+ {
	2020	+ }
	2021	+
1361	2022	JTree GetTree()
1362	2023	{
1363	2024	return objEditor.jTree;
..	..	@@ -1369,260 +2030,609 @@
1369	2030	ctrlPanel.removeAll();
1370	2031	}
1371	2032
1372		- void SetupMaterial(JPanel ctrlPanel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1373	2034	{
1374		- aConstraints.weighty = 0;
1375		- //aConstraints.weightx = 1;
1376		- /*
	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.5);
	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.6);
	2433	+
	2434	+ materialtouched = true;
	2435	+ applySelf();
	2436	+ }
	2437	+ });
	2438	+ presetpanel.add(shadowShader);
	2439	+
	2440	+ cGridBag panel = new cGridBag().setVertical(true);
	2441	+
	2442	+ presetpanel.preferredWidth = 1;
	2443	+
	2444	+ materialpanel.add(presetpanel);
	2445	+ materialpanel.add(panel);
	2446	+
	2447	+ panel.preferredWidth = 8;
	2448	+
	2449	+ /*
1377	2450	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1378	2451	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1379		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1380		- aConstraints.gridx += 1;
1381		- */
	2452	+ */
1382	2453
1383		- aConstraints.gridwidth = 1;
1384		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
	2454	+ cGridBag editBar = new cGridBag().setVertical(false);
	2455	+
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
	2457	+ createMaterialButton.setToolTipText("Create material");
1388	2458
1389	2459	/*
1390	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1391		- aConstraints.gridx += 1;
1392		- aConstraints.weighty = 0;
1393		- aConstraints.gridwidth = 1;
1394	2461	*/
1395	2462
1396		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1397		- aConstraints.gridx += 1;
	2463	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
	2464	+ clearMaterialButton.setToolTipText("Clear material");
	2465	+
	2466	+ if (Globals.ADVANCED)
	2467	+ {
	2468	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
	2469	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2470	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2471	+ }
1398	2472
1399		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1400		-
1401		- aConstraints.gridx += 1;
1402		-
1403		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1404		-
1405		- aConstraints.gridx += 1;
1406		-
1407		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1408		-
1409		- aConstraints.gridx = 0;
1410		- aConstraints.gridy += 1;
1411		- aConstraints.weighty = 0;
1412		- aConstraints.gridwidth = 1;
	2473	+ editBar.preferredHeight = 15;
	2474	+
	2475	+ panel.add(editBar);
	2476	+
1413	2477	/**/
1414	2478	//aConstraints.weighty = 0;
1415	2479	////aConstraints.weightx = 1;
1416	2480	//aConstraints.weighty = 1;
1417	2481	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1418	2482	//aConstraints.gridx += 1;
1419		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1420		- aConstraints.weighty = 0;
1421		- aConstraints.gridx = 0;
1422		- aConstraints.gridy += 1;
1423		- aConstraints.gridwidth = 1;
	2483	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1424	2484
1425		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1426		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1427		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1428		- aConstraints.gridx += 1;
1429		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1430		- //aConstraints.weightx = 0;
1431		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1432		- aConstraints.gridx = 0;
1433		- aConstraints.gridy += 1;
1434		- aConstraints.gridwidth = 1;
	2485	+ cGridBag colorSection = new cGridBag().setVertical(true);
1435	2486
1436		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1437		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1438		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1439		- aConstraints.gridx += 1;
1440		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1441		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1442		- aConstraints.gridx = 0;
1443		- aConstraints.gridy += 1;
1444		- aConstraints.gridwidth = 1;
	2487	+ cGridBag huepanel = new cGridBag();
	2488	+ cGridBag huelabel = new cGridBag();
	2489	+ cLabel hue = GetLabel("icons/hue.png", false);
	2490	+ hue.fit = true;
	2491	+
	2492	+ hue.addMouseListener(new MouseAdapter()
	2493	+ {
	2494	+ public void mousePressed(MouseEvent e)
	2495	+ {
	2496	+ int x = e.getX();
	2497	+
	2498	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2499	+ }
	2500	+ });
	2501	+
	2502	+ huelabel.add(hue);
	2503	+ huelabel.preferredWidth = 20;
	2504	+ huepanel.add(new cGridBag()); // Label
	2505	+ huepanel.add(huelabel); // Field/slider
	2506	+
	2507	+ huepanel.preferredHeight = 7;
1445	2508
1446		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1447		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1448		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1449		- aConstraints.gridx += 1;
1450		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1451		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1452		- aConstraints.gridx = 0;
1453		- aConstraints.gridy += 1;
1454		- aConstraints.gridwidth = 1;
	2509	+ colorSection.add(huepanel);
	2510	+
	2511	+ cGridBag color = new cGridBag();
	2512	+
	2513	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2514	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2515	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1455	2516
1456		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1457		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1459		- aConstraints.gridx += 1;
1460		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1461		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1462		- aConstraints.gridx = 0;
1463		- aConstraints.gridy += 1;
1464		- aConstraints.gridwidth = 1;
	2517	+ //colorField.preferredWidth = 200;
	2518	+ colorSection.add(color);
1465	2519
1466		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1467		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1468		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1469		- aConstraints.gridx += 1;
1470		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1471		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1472		- aConstraints.gridx = 0;
1473		- aConstraints.gridy += 1;
1474		- aConstraints.gridwidth = 1;
	2520	+ cGridBag modulation = new cGridBag();
	2521	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2522	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2523	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2524	+ colorSection.add(modulation);
1475	2525
1476		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1477		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1479		- aConstraints.gridx += 1;
1480		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1481		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1482		- aConstraints.gridx = 0;
1483		- aConstraints.gridy += 1;
1484		- aConstraints.gridwidth = 1;
	2526	+ cGridBag opacity = new cGridBag();
	2527	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2528	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2529	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2530	+ colorSection.add(opacity);
1485	2531
1486		- //aConstraints.weighty = 1;
1487		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1488		- //aConstraints.gridx += 1;
1489		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1490		- aConstraints.weighty = 0;
1491		- aConstraints.gridx = 0;
1492		- aConstraints.gridy += 1;
1493		- aConstraints.gridwidth = 1;
	2532	+ colorSection.add(GetSeparator());
	2533	+
	2534	+ cGridBag texture = new cGridBag();
	2535	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2536	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2537	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2538	+ colorSection.add(texture);
1494	2539
1495		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1496		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1498		- aConstraints.gridx += 1;
1499		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1500		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1501		- aConstraints.gridx = 0;
1502		- aConstraints.gridy += 1;
1503		- aConstraints.gridwidth = 1;
	2540	+ panel.add(GetSeparator());
	2541	+
	2542	+ panel.add(colorSection);
	2543	+
	2544	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2545	+
	2546	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2547	+
	2548	+ cGridBag diffuse = new cGridBag();
	2549	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2550	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2551	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2552	+ diffuseSection.add(diffuse);
1504	2553
1505		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1506		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1507		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1508		- aConstraints.gridx += 1;
1509		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1510		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1511		- aConstraints.gridx = 0;
1512		- aConstraints.gridy += 1;
1513		- aConstraints.gridwidth = 1;
	2554	+ cGridBag diffuseness = new cGridBag();
	2555	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2556	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2557	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2558	+ diffuseSection.add(diffuseness);
1514	2559
1515		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1516		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1517		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1518		- aConstraints.gridx += 1;
1519		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1520		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1521		- aConstraints.gridx = 0;
1522		- aConstraints.gridy += 1;
1523		- aConstraints.gridwidth = 1;
	2560	+ cGridBag selfshadow = new cGridBag();
	2561	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2562	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2563	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2564	+ diffuseSection.add(selfshadow);
1524	2565
1525		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1526		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1527		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1528		- aConstraints.gridx += 1;
1529		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1530		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1531		- aConstraints.gridx = 0;
1532		- aConstraints.gridy += 1;
1533		- aConstraints.gridwidth = 1;
	2566	+ cGridBag sheen = new cGridBag();
	2567	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2568	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2569	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2570	+ diffuseSection.add(sheen);
1534	2571
1535		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1536		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1537		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1538		- aConstraints.gridx += 1;
1539		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1540		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1541		- aConstraints.gridx = 0;
1542		- aConstraints.gridy += 1;
1543		- aConstraints.gridwidth = 1;
	2572	+ cGridBag subsurface = new cGridBag();
	2573	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2574	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2575	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2576	+ diffuseSection.add(subsurface);
1544	2577
1545		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1546		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1548		- aConstraints.gridx += 1;
1549		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1550		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1551		- aConstraints.gridx = 0;
1552		- aConstraints.gridy += 1;
1553		- aConstraints.gridwidth = 1;
	2578	+ cGridBag shadow = new cGridBag();
	2579	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2580	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2581	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2582	+ diffuseSection.add(shadow);
1554	2583
1555		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1556		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1557		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1558		- aConstraints.gridx += 1;
1559		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1560		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1561		- aConstraints.gridx = 0;
1562		- aConstraints.gridy += 1;
1563		- aConstraints.gridwidth = 1;
	2584	+ cGridBag fakedepth = new cGridBag();
	2585	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2586	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2587	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2588	+ diffuseSection.add(fakedepth);
1564	2589
1565		- //aConstraints.weighty = 1;
1566		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1567		- //aConstraints.gridx += 1;
1568		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1569		- aConstraints.weighty = 0;
1570		- aConstraints.gridx = 0;
1571		- aConstraints.gridy += 1;
1572		- aConstraints.gridwidth = 1;
	2590	+ cGridBag shadowbias = new cGridBag();
	2591	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2592	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2593	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2594	+ diffuseSection.add(shadowbias);
1573	2595
1574		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1575		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1576		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1577		- aConstraints.gridx += 1;
1578		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1579		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1580		- aConstraints.gridx = 0;
1581		- aConstraints.gridy += 1;
1582		- aConstraints.gridwidth = 1;
	2596	+ panel.add(GetSeparator());
	2597	+
	2598	+ panel.add(diffuseSection);
	2599	+
	2600	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2601	+
	2602	+ cGridBag specularSection = new cGridBag().setVertical(true);
1583	2603
1584		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1585		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1586		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1587		- aConstraints.gridx += 1;
1588		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1589		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1590		- aConstraints.gridx = 0;
1591		- aConstraints.gridy += 1;
1592		- aConstraints.gridwidth = 1;
	2604	+ cGridBag specular = new cGridBag();
	2605	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2606	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2607	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2608	+ specularSection.add(specular);
1593	2609
1594		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1595		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1596		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1597		- aConstraints.gridx += 1;
1598		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1599		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1600		- aConstraints.gridx = 0;
1601		- aConstraints.gridy += 1;
1602		- aConstraints.gridwidth = 1;
	2610	+ cGridBag lightarea = new cGridBag();
	2611	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2612	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2613	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2614	+ specularSection.add(lightarea);
1603	2615
1604		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1605		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1607		- aConstraints.gridx += 1;
1608		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1609		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1610		- aConstraints.gridx = 0;
1611		- aConstraints.gridy += 1;
1612		- aConstraints.gridwidth = 1;
	2616	+ cGridBag shininess = new cGridBag();
	2617	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2618	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2619	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2620	+ specularSection.add(shininess);
1613	2621
1614		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1615		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1616		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1617		- aConstraints.gridx += 1;
1618		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1619		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1620		- aConstraints.gridx = 0;
1621		- aConstraints.gridy += 1;
1622		- aConstraints.gridwidth = 1;
	2622	+ cGridBag metalness = new cGridBag();
	2623	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2624	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2625	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2626	+ specularSection.add(metalness);
1623	2627
1624		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1625		- Return();
	2628	+ cGridBag velvet = new cGridBag();
	2629	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2630	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2631	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2632	+ specularSection.add(velvet);
	2633	+
	2634	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2635	+ //Return();
1626	2636	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1627	2637	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628	2638	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1633,130 +2643,105 @@
1633	2643	// aConstraints.gridy += 1;
1634	2644	// aConstraints.gridwidth = 1;
1635	2645
1636		- //aConstraints.weighty = 1;
1637		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1638		- //aConstraints.gridx += 1;
1639		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1640		- aConstraints.weighty = 0;
1641		- aConstraints.gridx = 0;
1642		- aConstraints.gridy += 1;
1643		- aConstraints.gridwidth = 1;
	2646	+ cGridBag anisoU = new cGridBag();
	2647	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2648	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2649	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2650	+ specularSection.add(anisoU);
1644	2651
1645		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1646		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1648		- aConstraints.gridx += 1;
1649		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1650		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1651		- aConstraints.gridx = 0;
1652		- aConstraints.gridy += 1;
1653		- aConstraints.gridwidth = 1;
	2652	+ cGridBag anisoV = new cGridBag();
	2653	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2654	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2655	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2656	+ specularSection.add(anisoV);
1654	2657
1655		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1656		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1658		- aConstraints.gridx += 1;
1659		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1660		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1661		- aConstraints.gridx = 0;
1662		- aConstraints.gridy += 1;
1663		- aConstraints.gridwidth = 1;
1664	2658
1665		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1666		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1667		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1668		- aConstraints.gridx += 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1670		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1671		- aConstraints.gridx = 0;
1672		- aConstraints.gridy += 1;
1673		- aConstraints.gridwidth = 1;
	2659	+ panel.add(GetSeparator());
	2660	+
	2661	+ panel.add(specularSection);
	2662	+
	2663	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2664	+
	2665	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1674	2666
1675		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1676		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1678		- aConstraints.gridx += 1;
1679		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1680		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1681		- aConstraints.gridx = 0;
1682		- aConstraints.gridy += 1;
1683		- aConstraints.gridwidth = 1;
1684		- aConstraints.weighty = 0;
	2667	+ cGridBag camera = new cGridBag();
	2668	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2669	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2670	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2671	+ colorSection.add(camera);
1685	2672
1686		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1687		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1689		- aConstraints.gridx += 1;
1690		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1691		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1692		- aConstraints.gridx = 0;
1693		- aConstraints.gridy += 1;
1694		- aConstraints.gridwidth = 1;
	2673	+ cGridBag ambient = new cGridBag();
	2674	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2675	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2676	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2677	+ colorSection.add(ambient);
1695	2678
1696		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1697		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1699		- aConstraints.gridx += 1;
1700		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1701		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1702		- aConstraints.gridx = 0;
1703		- aConstraints.gridy += 1;
1704		- aConstraints.gridwidth = 1;
	2679	+ cGridBag backlit = new cGridBag();
	2680	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2681	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2682	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2683	+ colorSection.add(backlit);
1705	2684
1706		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1707		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1709		- aConstraints.gridx += 1;
1710		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1711		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1712		- aConstraints.gridx = 0;
1713		- aConstraints.gridy += 1;
1714		- aConstraints.gridwidth = 1;
	2685	+ cGridBag parallax = new cGridBag();
	2686	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2687	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2688	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
	2689	+ colorSection.add(parallax);
	2690	+
	2691	+ //panel.add(new JSeparator());
	2692	+
	2693	+ //panel.add(globalSection);
	2694	+
	2695	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2696	+
	2697	+ cGridBag textureSection = new cGridBag().setVertical(true);
1715	2698
1716		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1717		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1718		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1719		- aConstraints.gridx += 1;
1720		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1721		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1722		- aConstraints.gridx = 0;
1723		- aConstraints.gridy += 1;
1724		- aConstraints.gridwidth = 1;
	2699	+ cGridBag bump = new cGridBag();
	2700	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2701	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2702	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2703	+ textureSection.add(bump);
1725	2704
1726		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1727		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1728		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1729		- aConstraints.gridx += 1;
1730		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1731		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1732		- aConstraints.gridx = 0;
1733		- aConstraints.gridy += 1;
1734		- aConstraints.gridwidth = 1;
	2705	+ cGridBag noise = new cGridBag();
	2706	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2707	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2708	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2709	+ textureSection.add(noise);
1735	2710
1736		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1737		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1738		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1739		- aConstraints.gridx += 1;
1740		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1741		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1742		- aConstraints.gridx = 0;
1743		- aConstraints.gridy += 1;
1744		- aConstraints.gridwidth = 1;
	2711	+ cGridBag power = new cGridBag();
	2712	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2713	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2714	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2715	+ textureSection.add(power);
1745	2716
1746		- //aConstraints.weighty = 1;
1747		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1748		- //aConstraints.gridx += 1;
1749		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1750		- aConstraints.weighty = 0;
	2717	+ cGridBag borderfade = new cGridBag();
	2718	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2719	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2720	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2721	+ textureSection.add(borderfade);
1751	2722
1752		- aConstraints.gridx = 0;
1753		- aConstraints.gridy = 0;
1754		- aConstraints.gridwidth = 1;
	2723	+ cGridBag fog = new cGridBag();
	2724	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2725	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2726	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2727	+ textureSection.add(fog);
	2728	+
	2729	+ cGridBag opacityPower = new cGridBag();
	2730	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2731	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2732	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2733	+ textureSection.add(opacityPower);
	2734	+
	2735	+ panel.add(GetSeparator());
	2736	+
	2737	+ panel.add(textureSection);
	2738	+
	2739	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1755	2740
1756	2741	SetMaterial(copy); // .GetMaterial());
1757	2742
1758		- colorField.addChangeListener(this);
1759		- modulationField.addChangeListener(this);
	2743	+ //colorField.addChangeListener(this);
	2744	+// modulationField.addChangeListener(this);
1760	2745	metalnessField.addChangeListener(this);
1761	2746	diffuseField.addChangeListener(this);
1762	2747	specularField.addChangeListener(this);
..	..	@@ -1786,12 +2771,15 @@
1786	2771	opacityPowerField.addChangeListener(this);
1787	2772	/**/
1788	2773
1789		- resetSlidersButton.addActionListener(this);
1790	2774	clearMaterialButton.addActionListener(this);
1791	2775	createMaterialButton.addActionListener(this);
1792		-
1793		- propagateToggle.addItemListener(this);
1794		- multiplyToggle.addItemListener(this);
	2776	+
	2777	+ if (Globals.ADVANCED)
	2778	+ {
	2779	+ resetSlidersButton.addActionListener(this);
	2780	+ propagateToggle.addItemListener(this);
	2781	+ multiplyToggle.addItemListener(this);
	2782	+ }
1795	2783	}
1796	2784
1797	2785	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1809,8 +2797,9 @@
1809	2797	// 3D models
1810	2798	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1811	2799	{
1812		- lastConverter = new com.jmex.model.converters.MaxToJme();
1813		- LoadFile(filename, lastConverter);
	2800	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2801	+ //LoadFile(filename, lastConverter);
	2802	+ LoadObjFile(filename); // New 3ds loader
1814	2803	continue;
1815	2804	}
1816	2805	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1962,7 +2951,7 @@
1962	2951
1963	2952	//? flashIt = false;
1964	2953	CameraPane pane = (CameraPane) cameraView;
1965		- pane.clickStart(location.x, location.y, 0);
	2954	+ pane.clickStart(location.x, location.y, 0, 0);
1966	2955	pane.clickEnd(location.x, location.y, 0, true);
1967	2956
1968	2957	if (group.selection.size() == 1)
..	..	@@ -2011,6 +3000,7 @@
2011	3000	e2.printStackTrace();
2012	3001	}
2013	3002	}
	3003	+
2014	3004	LoadJMEThread loadThread;
2015	3005
2016	3006	class LoadJMEThread extends Thread
..	..	@@ -2068,6 +3058,7 @@
2068	3058	//LoadFile0(filename, converter);
2069	3059	}
2070	3060	}
	3061	+
2071	3062	LoadOBJThread loadObjThread;
2072	3063
2073	3064	class LoadOBJThread extends Thread
..	..	@@ -2146,19 +3137,19 @@
2146	3137
2147	3138	void LoadObjFile(String fullname)
2148	3139	{
2149		- /*
	3140	+ System.out.println("Loading " + fullname);
	3141	+ /**/
2150	3142	//lastFilename = fullname;
2151	3143	if(loadObjThread == null)
2152	3144	{
2153		- loadObjThread = new LoadOBJThread();
2154		- loadObjThread.start();
	3145	+ loadObjThread = new LoadOBJThread();
	3146	+ loadObjThread.start();
2155	3147	}
2156	3148
2157	3149	loadObjThread.add(fullname);
2158		- */
	3150	+ /**/
2159	3151
2160		- System.out.println("Loading " + fullname);
2161		- makeSomething(new FileObject(fullname, true), true);
	3152	+ //makeSomething(new FileObject(fullname, true), true);
2162	3153	}
2163	3154
2164	3155	void LoadGFDFile(String fullname)
..	..	@@ -2419,11 +3410,11 @@
2419	3410
2420	3411	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2421	3412	{
2422		- if (GrafreeD.standAlone)
	3413	+ if (Grafreed.standAlone)
2423	3414	{
2424	3415	/**/
2425	3416	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2426		- browser.show();
	3417	+ browser.setVisible(true);
2427	3418	String filename = browser.getFile();
2428	3419	if (filename != null && filename.length() > 0)
2429	3420	{
..	..	@@ -2534,6 +3525,7 @@
2534	3525	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2535	3526	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2536	3527	}
	3528	+
2537	3529	//cJME.count++;
2538	3530	//cJME.count %= 12;
2539	3531	if (gc)
..	..	@@ -2568,6 +3560,7 @@
2568	3560	}
2569	3561	if (input == null)
2570	3562	{
	3563	+ new Exception().printStackTrace();
2571	3564	System.exit(0);
2572	3565	}
2573	3566
..	..	@@ -2716,6 +3709,7 @@
2716	3709	}
2717	3710	}
2718	3711	}
	3712	+
2719	3713	cFileSystemPane FSPane;
2720	3714
2721	3715	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2725,7 +3719,7 @@
2725	3719
2726	3720	freezematerial = true;
2727	3721	colorField.setFloat(mat.color);
2728		- modulationField.setFloat(mat.modulation);
	3722	+ saturationField.setFloat(mat.modulation);
2729	3723	metalnessField.setFloat(mat.metalness);
2730	3724	diffuseField.setFloat(mat.diffuse);
2731	3725	specularField.setFloat(mat.specular);
..	..	@@ -2745,6 +3739,7 @@
2745	3739	shadowField.setFloat(mat.shadow);
2746	3740	textureField.setFloat(mat.texture);
2747	3741	opacityField.setFloat(mat.opacity);
	3742	+ parallaxField.setFloat(mat.parallax + 0.25f);
2748	3743	fakedepthField.setFloat(mat.fakedepth);
2749	3744	shadowbiasField.setFloat(mat.shadowbias);
2750	3745	bumpField.setInteger(1); // dec 2013
..	..	@@ -2769,11 +3764,14 @@
2769	3764	}
2770	3765	}
2771	3766	}
	3767	+
2772	3768	freezematerial = false;
2773	3769	}
2774	3770
2775	3771	void SetMaterial(Object3D object)
2776	3772	{
	3773	+ latestObject = object;
	3774	+
2777	3775	cMaterial mat = object.material;
2778	3776
2779	3777	if (mat == null)
..	..	@@ -2782,33 +3780,10 @@
2782	3780	return;
2783	3781	}
2784	3782
2785		- multiplyToggle.setSelected(mat.multiply);
2786		-
2787		- assert (object.projectedVertices != null);
2788		-
2789		- if (object.projectedVertices.length <= 2)
2790		- {
2791		- // Side effect...
2792		- Object3D.cVector2[] keep = object.projectedVertices;
2793		- object.projectedVertices = new Object3D.cVector2[3];
2794		- for (int i = 0; i < 3; i++)
2795		- {
2796		- if (i < keep.length)
2797		- {
2798		- object.projectedVertices[i] = keep[i];
2799		- } else
2800		- {
2801		- object.projectedVertices[i] = new Object3D.cVector2();
2802		- }
2803		- /*
2804		- if(keep.length == 0)
2805		- object.projectedVertices[0] = new Object3D.cVector2();
2806		- else
2807		- object.projectedVertices[0] = keep[0];
2808		- object.projectedVertices[1] = new Object3D.cVector2();
2809		- */
2810		- }
2811		- }
	3783	+ if (multiplyToggle != null)
	3784	+ multiplyToggle.setSelected(mat.multiply);
	3785	+
	3786	+ AllocProjectedVertices(object);
2812	3787
2813	3788	SetMaterial(mat, object.projectedVertices);
2814	3789	}
..	..	@@ -2884,12 +3859,17 @@
2884	3859	// }
2885	3860
2886	3861	/**/
2887		- if (deselect)
	3862	+ if (deselect \|\| child == null)
2888	3863	{
2889	3864	//group.deselectAll();
2890	3865	//freeze = true;
2891	3866	GetTree().clearSelection();
2892	3867	//freeze = false;
	3868	+
	3869	+ if (child == null)
	3870	+ {
	3871	+ return;
	3872	+ }
2893	3873	}
2894	3874
2895	3875	//group.addSelectee(child);
..	..	@@ -2923,6 +3903,17 @@
2923	3903	public void itemStateChanged(ItemEvent event)
2924	3904	{
2925	3905	// System.out.println("Propagate = " + propagate);
	3906	+ if (event.getSource() == pinButton)
	3907	+ {
	3908	+ copy.pinned ^= true;
	3909	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3910	+ {
	3911	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3912	+ copy.CloseUI();
	3913	+ //copy.editWindow.refreshContents();
	3914	+ }
	3915	+ }
	3916	+ else
2926	3917	if (event.getSource() == propagateToggle)
2927	3918	{
2928	3919	propagate ^= true;
..	..	@@ -2958,7 +3949,7 @@
2958	3949	cameraView.ToggleDL();
2959	3950	cameraView.repaint();
2960	3951	return;
2961		- } else if (event.getSource() == toggleTextureItem)
	3952	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2962	3953	{
2963	3954	cameraView.ToggleTexture();
2964	3955	// june 2013 copy.HardTouch();
..	..	@@ -2966,42 +3957,40 @@
2966	3957	return;
2967	3958	} else if (event.getSource() == toggleTimelineItem)
2968	3959	{
2969		- copy.timeline ^= true;
	3960	+ timeline ^= true;
2970	3961
2971		- if (copy.timeline)
	3962	+ if (timeline)
2972	3963	{
2973	3964	centralPanel.remove(cameraView);
2974		- centralPanel.add(timelinePanel);
	3965	+ cameraPanel.add(cameraView);
	3966	+ centralPanel.add(cameraPanel);
2975	3967	frame.setJMenuBar(timelineMenubar);
	3968	+ wasFullScreen = CameraPane.FULLSCREEN;
	3969	+ if (!CameraPane.FULLSCREEN)
	3970	+ ToggleFullScreen();
	3971	+ toggleFullScreenItem.setEnabled(false);
2976	3972	}
2977	3973	else
2978	3974	{
2979		- centralPanel.remove(timelinePanel);
	3975	+ centralPanel.remove(cameraPanel);
2980	3976	centralPanel.add(cameraView);
2981	3977	frame.setJMenuBar(null);
	3978	+ if (!wasFullScreen)
	3979	+ ToggleFullScreen();
	3980	+ toggleFullScreenItem.setEnabled(true);
2982	3981	}
2983	3982
2984	3983	frame.validate();
2985	3984	return;
2986	3985	} else if (event.getSource() == toggleFullScreenItem)
2987	3986	{
2988		- if (CameraPane.FULLSCREEN)
2989		- {
2990		- frame.getContentPane().remove(/"Center",/bigThree);
2991		- framePanel.add(bigThree);
2992		- frame.getContentPane().add(/"Center",/framePanel);
2993		- } else
2994		- {
2995		- frame.getContentPane().remove(/"Center",/framePanel);
2996		- frame.getContentPane().add(/"Center",/bigThree);
2997		- }
	3987	+ ToggleFullScreen();
2998	3988	frame.validate();
2999		- cameraView.ToggleFullScreen();
3000	3989
3001	3990	return;
3002		- } else if (event.getSource() == toggleRandomItem)
	3991	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3003	3992	{
3004		- cameraView.ToggleRandom();
	3993	+ cameraView.ToggleSwitch();
3005	3994	cameraView.repaint();
3006	3995	return;
3007	3996	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3029,12 +4018,17 @@
3029	4018	} else if (event.getSource() == liveCB)
3030	4019	{
3031	4020	copy.live ^= true;
	4021	+ objEditor.refreshContents(true); // To show item colors
	4022	+ return;
	4023	+ } else if (event.getSource() == selectableCB)
	4024	+ {
	4025	+ copy.dontselect ^= true;
3032	4026	return;
3033	4027	} else if (event.getSource() == hideCB)
3034	4028	{
3035	4029	copy.hide ^= true;
3036	4030	copy.Touch(); // display list issue
3037		- objEditor.refreshContents();
	4031	+ objEditor.refreshContents(true); // To show item colors
3038	4032	return;
3039	4033	} else if (event.getSource() == link2masterCB)
3040	4034	{
..	..	@@ -3044,6 +4038,7 @@
3044	4038	if (event.getSource() == randomCB)
3045	4039	{
3046	4040	copy.random ^= true;
	4041	+ objEditor.refreshContents();
3047	4042	return;
3048	4043	}
3049	4044	if (event.getSource() == speedupCB)
..	..	@@ -3067,8 +4062,9 @@
3067	4062
3068	4063	public void actionPerformed(ActionEvent event)
3069	4064	{
	4065	+ Object source = event.getSource();
3070	4066	// SCRIPT DIALOG
3071		- if (event.getSource() == okbutton)
	4067	+ if (source == okbutton)
3072	4068	{
3073	4069	textpanel.setVisible(false);
3074	4070	textpanel.remove(textarea);
..	..	@@ -3080,7 +4076,7 @@
3080	4076	textarea = null;
3081	4077	textpanel = null;
3082	4078	}
3083		- if (event.getSource() == cancelbutton)
	4079	+ if (source == cancelbutton)
3084	4080	{
3085	4081	textpanel.setVisible(false);
3086	4082	textpanel.remove(textarea);
..	..	@@ -3092,49 +4088,50 @@
3092	4088	//applySelf();
3093	4089	//client.refreshEditWindow();
3094	4090	//refreshContents();
3095		- if (event.getSource() == nameField)
	4091	+ if (source == nameField)
3096	4092	{
3097	4093	//System.out.println("ObjEditor " + event);
3098	4094	applySelf0(true);
3099	4095	//parent.applySelf();
3100		- objEditor.refreshContents();
3101		- } else if (event.getSource() == resetButton)
	4096	+ // conflicts with requestFocus objEditor.refreshContents();
	4097	+ } else if (source == resetButton)
3102	4098	{
3103	4099	CameraPane.fullreset = true;
3104	4100	copy.Reset(); // ResetMeshes();
3105	4101	copy.Touch();
3106	4102	objEditor.refreshContents();
3107		- } else if (event.getSource() == stepItem)
	4103	+ } else if (source == stepItem)
3108	4104	{
3109		- cameraView.ONESTEP = true;
	4105	+ //cameraView.ONESTEP = true;
	4106	+ Globals.ONESTEP = true;
3110	4107	cameraView.repaint();
3111	4108	return;
3112		- } else if (event.getSource() == stepButton)
	4109	+ } else if (source == stepButton)
3113	4110	{
3114	4111	copy.Step();
3115	4112	copy.Touch();
3116	4113	objEditor.refreshContents();
3117		- } else if (event.getSource() == slowerButton)
	4114	+ } else if (source == slowerButton)
3118	4115	{
3119	4116	copy.Slower();
3120	4117	copy.Touch();
3121	4118	objEditor.refreshContents();
3122		- } else if (event.getSource() == fasterButton)
	4119	+ } else if (source == fasterButton)
3123	4120	{
3124	4121	copy.Faster();
3125	4122	copy.Touch();
3126	4123	objEditor.refreshContents();
3127		- } else if (event.getSource() == remarkButton)
	4124	+ } else if (source == remarkButton)
3128	4125	{
3129	4126	copy.Remark();
3130	4127	copy.Touch();
3131	4128	objEditor.refreshContents();
3132		- } else if (event.getSource() == stepAllButton)
	4129	+ } else if (source == stepAllButton)
3133	4130	{
3134	4131	copy.StepAll();
3135	4132	copy.Touch();
3136	4133	objEditor.refreshContents();
3137		- } else if (event.getSource() == resetAllButton)
	4134	+ } else if (source == resetAllButton)
3138	4135	{
3139	4136	//CameraPane.fullreset = true;
3140	4137	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3167,53 +4164,79 @@
3167	4164	// Close();
3168	4165	// }
3169	4166	// else
3170		- if (event.getSource() == resetSlidersButton)
	4167	+ if (source == resetSlidersButton)
3171	4168	{
3172	4169	ResetSliders();
3173		- } else if (event.getSource() == clearMaterialButton)
	4170	+ } else if (source == clearMaterialButton)
3174	4171	{
3175	4172	ClearMaterial();
3176		- } else if (event.getSource() == createMaterialButton)
	4173	+ } else if (source == createMaterialButton)
3177	4174	{
3178	4175	CreateMaterial();
3179		- } else if (event.getSource() == clearPanelButton)
	4176	+ } else if (source == clearPanelButton)
3180	4177	{
3181	4178	copy.ClearUI();
3182	4179	refreshContents(true);
3183		- } /*
3184		- }
3185		-
3186		- public boolean action(Event event, Object arg)
3187		- {
3188		- */ else if (event.getSource() == closeItem)
	4180	+ } else if (source == importGFDItem)
	4181	+ {
	4182	+ ImportGFD();
	4183	+ } else
	4184	+ if (source == importVRMLX3DItem)
	4185	+ {
	4186	+ ImportVRMLX3D();
	4187	+ } else
	4188	+ if (source == import3DSItem)
	4189	+ {
	4190	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4191	+ } else
	4192	+ if (source == importOBJItem)
	4193	+ {
	4194	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4195	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4196	+ browser.setVisible(true);
	4197	+ String filename = browser.getFile();
	4198	+ if (filename != null && filename.length() > 0)
	4199	+ {
	4200	+ String fullname = browser.getDirectory() + filename;
	4201	+ makeSomething(ReadOBJ(fullname), true);
	4202	+ }
	4203	+ } else
	4204	+ if (source == closeItem)
3189	4205	{
3190	4206	Close();
3191	4207	//return true;
3192		- } else if (event.getSource() == loadItem)
	4208	+ } else if (source == openItem)
3193	4209	{
3194		- load();
	4210	+ Open();
3195	4211	//return true;
3196		- } else if (event.getSource() == saveItem)
	4212	+ } else if (source == newItem)
	4213	+ {
	4214	+ New();
	4215	+ } else if (source == saveItem)
3197	4216	{
3198	4217	save();
3199	4218	//return true;
3200		- } else if (event.getSource() == saveAsItem)
	4219	+ } else if (source == saveAsItem)
3201	4220	{
3202	4221	saveAs();
3203	4222	//return true;
3204		- } else if (event.getSource() == reexportItem)
	4223	+ } else if (source == reexportItem)
3205	4224	{
3206	4225	reexport();
3207	4226	//return true;
3208		- } else if (event.getSource() == exportAsItem)
	4227	+ } else if (source == exportAsItem)
3209	4228	{
3210	4229	export();
3211	4230	//return true;
3212		- } else if (event.getSource() == povItem)
	4231	+ } else if (source == povItem)
3213	4232	{
3214	4233	generatePOV();
3215	4234	//return true;
3216		- } else if (event.getSource() == zBufferItem)
	4235	+ } else if (event.getSource() == archiveItem)
	4236	+ {
	4237	+ cTools.Archive(frame);
	4238	+ return;
	4239	+ } else if (source == zBufferItem)
3217	4240	{
3218	4241	try
3219	4242	{
..	..	@@ -3235,21 +4258,8 @@
3235	4258	cameraView.repaint();
3236	4259	//return true;
3237	4260	}
3238		- */ else if (event.getSource() == editCameraItem)
3239		- {
3240		- cameraView.ProtectCamera();
3241		- cameraView.repaint();
3242		- return;
3243		- } else if (event.getSource() == revertCameraItem)
3244		- {
3245		- cameraView.RevertCamera();
3246		- cameraView.repaint();
3247		- return;
3248		-// } else if (event.getSource() == textureButton)
3249		-// {
3250		-// return; // true;
3251		- } else // combos...
3252		- if (event.getSource() == texresMenu)
	4261	+ */ else // combos...
	4262	+ if (source == texresMenu)
3253	4263	{
3254	4264	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3255	4265	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3261,27 +4271,518 @@
3261	4271	}
3262	4272	}
3263	4273
3264		- void ToggleAnimation()
	4274	+ void New()
3265	4275	{
3266		- if (!CameraPane.ANIMATION)
	4276	+ while (copy.Size() > 0)
3267	4277	{
3268		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4278	+ copy.remove(0);
	4279	+ }
	4280	+
	4281	+ copy.selection.clear();
	4282	+
	4283	+ if (copy == Grafreed.grafreed.universe)
	4284	+ {
	4285	+ CreateCameras();
	4286	+ cameraView.SetCamera(GetCamera(copy, 0));
	4287	+ }
	4288	+ ResetModel();
	4289	+ objEditor.refreshContents();
	4290	+ }
	4291	+
	4292	+ static public byte[] Compress(Object3D o)
	4293	+ {
	4294	+ // Slower to actually compress.
	4295	+ try
	4296	+ {
	4297	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4298	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4299	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4300	+
	4301	+ Object3D parent = o.parent;
	4302	+ o.parent = null;
	4303	+
	4304	+ out.writeObject(o);
	4305	+
	4306	+ o.parent = parent;
	4307	+
	4308	+ out.flush();
	4309	+
	4310	+ baos //zstream
	4311	+ .close();
	4312	+ out.close();
	4313	+
	4314	+ byte[] bytes = baos.toByteArray();
	4315	+
	4316	+ System.out.println("save #bytes = " + bytes.length);
	4317	+ return bytes;
	4318	+ } catch (Exception e)
	4319	+ {
	4320	+ System.err.println(e);
	4321	+ return null;
	4322	+ }
	4323	+ }
	4324	+
	4325	+ static public Object Uncompress(byte[] bytes)
	4326	+ {
	4327	+ System.out.println("restore #bytes = " + bytes.length);
	4328	+ try
	4329	+ {
	4330	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4331	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4332	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4333	+ Object obj = in.readObject();
	4334	+
	4335	+ bais //istream
	4336	+ .close();
	4337	+ in.close();
	4338	+
	4339	+ return obj;
	4340	+ } catch (Exception e)
	4341	+ {
	4342	+ System.err.println(e);
	4343	+ return null;
	4344	+ }
	4345	+ }
	4346	+
	4347	+ static public Object clone(Object o)
	4348	+ {
	4349	+ try
	4350	+ {
	4351	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4352	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4353	+
	4354	+ out.writeObject(o);
	4355	+
	4356	+ out.flush();
	4357	+ out.close();
	4358	+
	4359	+ byte[] bytes = baos.toByteArray();
	4360	+
	4361	+ System.out.println("clone = " + bytes.length);
	4362	+
	4363	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4364	+ ObjectInputStream in = new ObjectInputStream(bais);
	4365	+ Object obj = in.readObject();
	4366	+ in.close();
	4367	+
	4368	+ return obj;
	4369	+ } catch (Exception e)
	4370	+ {
	4371	+ System.err.println(e);
	4372	+ return null;
	4373	+ }
	4374	+ }
	4375	+
	4376	+ cRadio GetCurrentTab()
	4377	+ {
	4378	+ cRadio ab;
	4379	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4380	+ {
	4381	+ ab = (cRadio)e.nextElement();
	4382	+ if(ab.GetObject() == copy)
	4383	+ {
	4384	+ return ab;
	4385	+ }
	4386	+ }
	4387	+
	4388	+ return null;
	4389	+ }
	4390	+
	4391	+
	4392	+ public void Save()
	4393	+ {
	4394	+ //Save(true);
	4395	+ Replace();
	4396	+ SetVersionStates();
	4397	+ }
	4398	+
	4399	+ private boolean Equal(byte[] compress, byte[] name)
	4400	+ {
	4401	+ if (compress.length != name.length)
	4402	+ {
	4403	+ return false;
	4404	+ }
	4405	+
	4406	+ for (int i=compress.length; --i>=0;)
	4407	+ {
	4408	+ if (compress[i] != name[i])
	4409	+ return false;
	4410	+ }
	4411	+
	4412	+ return true;
	4413	+ }
	4414	+
	4415	+ void DeleteVersion()
	4416	+ {
	4417	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4418	+ {
	4419	+ copy.versionlist[i] = copy.versionlist[i+1];
	4420	+ }
	4421	+
	4422	+ if (copy.versionlist[copy.versionindex] == null)
	4423	+ copy.versionindex -= 1;
	4424	+
	4425	+ if (copy.versionindex != -1)
	4426	+ CopyChanged();
	4427	+
	4428	+ SetVersionStates();
	4429	+ }
	4430	+
	4431	+ public boolean Save(boolean user)
	4432	+ {
	4433	+ System.err.println("Save");
	4434	+ Replace();
	4435	+
	4436	+ //cRadio tab = GetCurrentTab();
	4437	+
	4438	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4439	+
	4440	+ boolean thesame = false;
	4441	+
	4442	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4443	+// {
	4444	+// thesame = true;
	4445	+// }
	4446	+
	4447	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4448	+ if (!thesame)
	4449	+ {
	4450	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4451	+ {
	4452	+ copy.versionlist[i] = copy.versionlist[i-1];
	4453	+ }
	4454	+
	4455	+ //tab.user[tab.versionindex] = user;
	4456	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4457	+
	4458	+ copy.versionlist[++copy.versionindex] = compress;
	4459	+
	4460	+ // if (increment)
	4461	+ // tab.versionindex++;
	4462	+ }
	4463	+
	4464	+ //copy.RestoreBigData(versiontable);
	4465	+
	4466	+ //assert(hashtable.isEmpty());
	4467	+
	4468	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4469	+// {
	4470	+// //tab.user[i] = false;
	4471	+// copy.versionlist[i] = null;
	4472	+// }
	4473	+
	4474	+ SetVersionStates();
	4475	+
	4476	+ // test save
	4477	+ if (false)
	4478	+ {
	4479	+ try
	4480	+ {
	4481	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4482	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4483	+
	4484	+ p.writeObject(copy);
	4485	+
	4486	+ p.flush();
	4487	+
	4488	+ ostream.close();
	4489	+ } catch (Exception e)
	4490	+ {
	4491	+ e.printStackTrace();
	4492	+ }
	4493	+ }
	4494	+
	4495	+ return !thesame;
	4496	+ }
	4497	+
	4498	+ boolean flashIt = true;
	4499	+
	4500	+ void RefreshSelection()
	4501	+ {
	4502	+ Object3D selection = new Object3D();
	4503	+
	4504	+ for (int i = 0; i < copy.selection.size(); i++)
	4505	+ {
	4506	+ Object3D elem = copy.selection.elementAt(i);
	4507	+
	4508	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4509	+
	4510	+ if (obj == null)
	4511	+ {
	4512	+ copy.selection.remove(i--);
	4513	+ }
	4514	+ else
	4515	+ {
	4516	+ selection.add(obj);
	4517	+ copy.selection.setElementAt(obj, i);
	4518	+ }
	4519	+ }
	4520	+
	4521	+ flashIt = false;
	4522	+ GetTree().clearSelection();
	4523	+ for (int i = 0; i < selection.size(); i++)
	4524	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4525	+ flashIt = true;
	4526	+
	4527	+ //refreshContents(false);
	4528	+ }
	4529	+
	4530	+ void CopyChanged()
	4531	+ {
	4532	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4533	+
	4534	+ SetVersionStates();
	4535	+
	4536	+ boolean temp = CameraPane.SWITCH;
	4537	+ CameraPane.SWITCH = false;
	4538	+
	4539	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4540	+
	4541	+ copy.clear();
	4542	+
	4543	+ copy.skyboxname = obj.skyboxname;
	4544	+ copy.skyboxext = obj.skyboxext;
	4545	+
	4546	+ for (int i=0; i<obj.Size(); i++)
	4547	+ {
	4548	+ copy.add(obj.get(i));
	4549	+ }
	4550	+
	4551	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4552	+
	4553	+ CameraPane.SWITCH = temp;
	4554	+
	4555	+ RefreshSelection();
	4556	+ //assert(hashtable.isEmpty());
	4557	+
	4558	+ copy.Touch();
	4559	+
	4560	+ ResetModel();
	4561	+ copy.HardTouch(); // recompile?
	4562	+
	4563	+ cRadio ab;
	4564	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4565	+ {
	4566	+ ab = (cRadio)e.nextElement();
	4567	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4568	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4569	+ if (test != null)
	4570	+ {
	4571	+ test.editWindow = ab.object.editWindow;
	4572	+ ab.object = test;
	4573	+ }
	4574	+ }
	4575	+
	4576	+ refreshContents(true);
	4577	+ }
	4578	+
	4579	+ cButton previousVersionButton;
	4580	+ cButton restoreButton;
	4581	+ cButton replaceButton;
	4582	+ cButton nextVersionButton;
	4583	+ cButton saveVersionButton;
	4584	+ cButton deleteVersionButton;
	4585	+
	4586	+ boolean muteSlider;
	4587	+
	4588	+ int VersionCount()
	4589	+ {
	4590	+ int count = 0;
	4591	+
	4592	+ for (int i = copy.versionlist.length; --i >= 0;)
	4593	+ {
	4594	+ if (copy.versionlist[i] != null)
	4595	+ count++;
	4596	+ }
	4597	+
	4598	+ return count;
	4599	+ }
	4600	+
	4601	+ public cGridBag versionSliderPane;
	4602	+
	4603	+ void SetVersionStates()
	4604	+ {
	4605	+ //if (true)
	4606	+ // return;
	4607	+
	4608	+ //cRadio tab = GetCurrentTab();
	4609	+
	4610	+ if (copy.versionlist == null)
	4611	+ {
	4612	+ saveVersionButton.setEnabled(false);
	4613	+ restoreButton.setEnabled(false);
	4614	+ replaceButton.setEnabled(false);
	4615	+ previousVersionButton.setEnabled(false);
	4616	+ nextVersionButton.setEnabled(false);
	4617	+ deleteVersionButton.setEnabled(false);
	4618	+ versionSliderPane.setVisible(false);
	4619	+ }
	4620	+ else
	4621	+ {
	4622	+ restoreButton.setEnabled(copy.versionindex != -1);
	4623	+ replaceButton.setEnabled(copy.versionindex != -1);
	4624	+
	4625	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4626	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4627	+
	4628	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4629	+ //copy.versionlist[copy.versionindex + 1] != null);
	4630	+
	4631	+ muteSlider = true;
	4632	+ versionSlider.setMinimum(0);
	4633	+ versionSlider.setMaximum(VersionCount() - 1);
	4634	+ versionSlider.setInteger(copy.versionindex);
	4635	+ versionSlider.setEnabled(copy.versionindex != -1);
	4636	+ muteSlider = false;
	4637	+
	4638	+ versionSliderPane.setVisible(true);
	4639	+ }
	4640	+ }
	4641	+
	4642	+ public boolean PreviousVersion()
	4643	+ {
	4644	+ // Option?
	4645	+ Replace();
	4646	+
	4647	+ System.err.println("Undo");
	4648	+
	4649	+ //cRadio tab = GetCurrentTab();
	4650	+
	4651	+ if (copy.versionindex == 0)
	4652	+ {
	4653	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4654	+ return false;
	4655	+ }
	4656	+
	4657	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4658	+// {
	4659	+// if (Save(false))
	4660	+// tab.versionindex -= 1;
	4661	+// else
	4662	+// {
	4663	+// if (tab.versionindex <= 0)
	4664	+// return false;
	4665	+// else
	4666	+// tab.versionindex -= 1;
	4667	+// }
	4668	+// }
	4669	+
	4670	+ copy.versionindex -= 1;
	4671	+
	4672	+ CopyChanged();
	4673	+
	4674	+ return true;
	4675	+ }
	4676	+
	4677	+ public boolean Restore()
	4678	+ {
	4679	+ System.err.println("Restore");
	4680	+
	4681	+ //cRadio tab = GetCurrentTab();
	4682	+
	4683	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4684	+ {
	4685	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4686	+ return false;
	4687	+ }
	4688	+
	4689	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4690	+ CopyChanged();
	4691	+
	4692	+ return true;
	4693	+ }
	4694	+
	4695	+ public boolean Replace()
	4696	+ {
	4697	+ //System.err.println("Replace");
	4698	+
	4699	+ //cRadio tab = GetCurrentTab();
	4700	+
	4701	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4702	+ {
	4703	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4704	+ return false;
	4705	+ }
	4706	+
	4707	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4708	+
	4709	+ return true;
	4710	+ }
	4711	+
	4712	+ public void NextVersion()
	4713	+ {
	4714	+ // Option?
	4715	+ Replace();
	4716	+
	4717	+ //cRadio tab = GetCurrentTab();
	4718	+
	4719	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4720	+ {
	4721	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4722	+ return;
	4723	+ }
	4724	+
	4725	+ copy.versionindex += 1;
	4726	+
	4727	+ CopyChanged();
	4728	+
	4729	+ //if (!tab.user[tab.versionindex])
	4730	+ // tab.graphs[tab.versionindex] = null;
	4731	+ }
	4732	+
	4733	+ void ImportGFD()
	4734	+ {
	4735	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3269	4736	browser.show();
3270	4737	String filename = browser.getFile();
3271	4738	if (filename != null && filename.length() > 0)
3272	4739	{
3273		- CameraPane.filename = browser.getDirectory() + filename;
	4740	+ String fullname = browser.getDirectory() + filename;
	4741	+
	4742	+ //Object3D readobj =
	4743	+ objEditor.ReadGFD(fullname, objEditor);
	4744	+ //makeSomething(readobj);
	4745	+ }
	4746	+ }
	4747	+
	4748	+ void ImportVRMLX3D()
	4749	+ {
	4750	+ if (Grafreed.standAlone)
	4751	+ {
	4752	+ /**/
	4753	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4754	+ browser.show();
	4755	+ String filename = browser.getFile();
	4756	+ if (filename != null && filename.length() > 0)
	4757	+ {
	4758	+ String fullname = browser.getDirectory() + filename;
	4759	+ LoadVRMLX3D(fullname);
	4760	+ }
	4761	+ /**/
	4762	+ }
	4763	+ }
	4764	+
	4765	+ void ToggleAnimation()
	4766	+ {
	4767	+ if (!Globals.ANIMATION)
	4768	+ {
	4769	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4770	+ browser.setVisible(true);
	4771	+ String filename = browser.getFile();
	4772	+ if (filename != null && filename.length() > 0)
	4773	+ {
	4774	+ Globals.filename = browser.getDirectory() + filename;
3274	4775	//CameraPane.framecount = 0;
3275		- CameraPane.imagecount = 0;
	4776	+ Globals.imagecount = 0;
3276	4777
3277		- CameraPane.ANIMATION ^= true;
	4778	+ Globals.ANIMATION ^= true;
3278	4779
3279		- GrafreeD.wav.cursor = 0;
3280		- GrafreeD.wav.loop = 0;
	4780	+ Grafreed.wav.cursor = 0;
	4781	+ Grafreed.wav.loop = 0;
3281	4782	}
3282	4783	} else
3283	4784	{
3284		- CameraPane.ANIMATION ^= true;
	4785	+ Globals.ANIMATION ^= true;
3285	4786	}
3286	4787	}
3287	4788
..	..	@@ -3327,7 +4828,7 @@
3327	4828	void CreateMaterial()
3328	4829	{
3329	4830	//copy.ClearMaterial(); // PATCH
3330		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4831	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3331	4832	if (copy.selection.size() > 0)
3332	4833	//SetMaterial(copy);
3333	4834	{
..	..	@@ -3378,7 +4879,7 @@
3378	4879	assert false;
3379	4880	}
3380	4881
3381		- void EditSelection()
	4882	+ void EditSelection(boolean newWindow)
3382	4883	{
3383	4884	}
3384	4885
..	..	@@ -3386,11 +4887,11 @@
3386	4887	{
3387	4888	copy.ResetBlockLoop(); // temporary problem
3388	4889
3389		- boolean random = CameraPane.RANDOM;
3390		- CameraPane.RANDOM = false; // parse everything
	4890	+ boolean random = CameraPane.SWITCH;
	4891	+ CameraPane.SWITCH = false; // parse everything
3391	4892	copy.ResetDisplayList();
3392	4893	copy.HardTouch();
3393		- CameraPane.RANDOM = random;
	4894	+ CameraPane.SWITCH = random;
3394	4895	}
3395	4896
3396	4897	// public void applySelf()
..	..	@@ -3420,6 +4921,12 @@
3420	4921	// else
3421	4922	// applySelf(true);
3422	4923	// }
	4924	+
	4925	+ boolean Equal(double a, double b)
	4926	+ {
	4927	+ return Math.abs(a - b) < 0.001;
	4928	+ }
	4929	+
3423	4930	void applySelf0(boolean name)
3424	4931	{
3425	4932	if (name)
..	..	@@ -3437,7 +4944,7 @@
3437	4944	//copy.material = new cMaterial(copy.GetMaterial());
3438	4945
3439	4946	current.color = (float) colorField.getFloat();
3440		- current.modulation = (float) modulationField.getFloat();
	4947	+ current.modulation = (float) saturationField.getFloat();
3441	4948	current.metalness = (float) metalnessField.getFloat();
3442	4949	current.diffuse = (float) diffuseField.getFloat();
3443	4950	current.specular = (float) specularField.getFloat();
..	..	@@ -3457,13 +4964,69 @@
3457	4964	current.shadow = (float) shadowField.getFloat();
3458	4965	current.texture = (float) textureField.getFloat();
3459	4966	current.opacity = (float) opacityField.getFloat();
	4967	+ current.parallax = (float) parallaxField.getFloat() - 0.25f;
3460	4968	current.fakedepth = (float) fakedepthField.getFloat();
3461	4969	current.shadowbias = (float) shadowbiasField.getFloat();
3462	4970
3463		- if (!NumberSlider.frozen)
	4971	+ if (!cNumberSlider.frozen)
3464	4972	{
3465	4973	//System.out.println("Propagate = " + propagate);
3466	4974	copy.UpdateMaterial(anchor, current, propagate);
	4975	+
	4976	+ if (copy.material != null)
	4977	+ {
	4978	+ cMaterial mat = copy.material;
	4979	+
	4980	+ if (!Equal(colorField.getFloat(), mat.color))
	4981	+ colorField.SetToolTipValue((mat.color));
	4982	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4983	+ saturationField.SetToolTipValue((mat.modulation));
	4984	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4985	+ metalnessField.SetToolTipValue((mat.metalness));
	4986	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4987	+ diffuseField.SetToolTipValue((mat.diffuse));
	4988	+ if (!Equal(specularField.getFloat(), mat.specular))
	4989	+ specularField.SetToolTipValue((mat.specular));
	4990	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4991	+ shininessField.SetToolTipValue((mat.shininess));
	4992	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4993	+ shiftField.SetToolTipValue((mat.shift));
	4994	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4995	+ ambientField.SetToolTipValue((mat.ambient));
	4996	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4997	+ lightareaField.SetToolTipValue((mat.lightarea));
	4998	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4999	+ diffusenessField.SetToolTipValue((mat.factor));
	5000	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5001	+ velvetField.SetToolTipValue((mat.velvet));
	5002	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5003	+ sheenField.SetToolTipValue((mat.sheen));
	5004	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5005	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5006	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5007	+ backlitField.SetToolTipValue((mat.bump));
	5008	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5009	+ anisoField.SetToolTipValue((mat.aniso));
	5010	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5011	+ anisoVField.SetToolTipValue((mat.anisoV));
	5012	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5013	+ cameraField.SetToolTipValue((mat.cameralight));
	5014	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5015	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5016	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5017	+ shadowField.SetToolTipValue((mat.shadow));
	5018	+ if (!Equal(textureField.getFloat(), mat.texture))
	5019	+ textureField.SetToolTipValue((mat.texture));
	5020	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5021	+ opacityField.SetToolTipValue((mat.opacity));
	5022	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5023	+ parallaxField.SetToolTipValue((mat.parallax));
	5024	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5025	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5026	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5027	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	5028	+ }
	5029	+
3467	5030	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3468	5031	{
3469	5032	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3492,9 +5055,28 @@
3492	5055	//copy.Touch();
3493	5056	}
3494	5057
	5058	+ cNumberSlider versionSlider;
	5059	+
3495	5060	public void stateChanged(ChangeEvent e)
3496	5061	{
3497		- // assert(false);
	5062	+ // assert(false);
	5063	+ if (e.getSource() == versionSlider)
	5064	+ {
	5065	+ if (muteSlider)
	5066	+ return;
	5067	+
	5068	+ Replace();
	5069	+
	5070	+ int version = versionSlider.getInteger();
	5071	+
	5072	+ if (version != -1 && copy.versionlist[version] != null)
	5073	+ {
	5074	+ copy.versionindex = version;
	5075	+ CopyChanged();
	5076	+ }
	5077	+
	5078	+ return;
	5079	+ }
3498	5080
3499	5081	if (freezematerial)
3500	5082	{
..	..	@@ -3508,6 +5090,7 @@
3508	5090	\|\| e.getSource() == apertureField
3509	5091	\|\| e.getSource() == shadowblurField)
3510	5092	{
	5093	+ new Exception().printStackTrace();
3511	5094	System.exit(0);
3512	5095	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3513	5096	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3529,12 +5112,24 @@
3529	5112	{
3530	5113	//System.out.println("stateChanged = " + this);
3531	5114	materialtouched = true;
	5115	+
	5116	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5117	+ {
	5118	+ saturationField.setFloat(1);
	5119	+ }
	5120	+
3532	5121	applySelf();
3533	5122	//System.out.println("this = " + this);
3534	5123	//System.out.println("PARENT = " + parent);
3535	5124	//if (parent != null)
3536	5125	// parent.applySelf();
3537		- refreshContents();
	5126	+ if (e.getSource() == normalpushField)
	5127	+ {
	5128	+ objEditor.refreshContents();
	5129	+ //Refresh();
	5130	+ }
	5131	+ else
	5132	+ refreshContents();
3538	5133	// ??? client.refreshEditWindow();
3539	5134	}
3540	5135	//else
..	..	@@ -3546,7 +5141,7 @@
3546	5141	//group.name = nameField.getText();
3547	5142	//objEditor.applySelf();
3548	5143
3549		- assert (objEditor == this);
	5144	+ // OCT2018: assert (objEditor == this);
3550	5145	if (copy.selection == null \|\| copy.selection.size() == 0)
3551	5146	//super.applySelf()
3552	5147	; else
..	..	@@ -3570,12 +5165,18 @@
3570	5165	objEditor.copy = keep;
3571	5166	}
3572	5167	}
	5168	+
	5169	+ if (normalpushField != null)
	5170	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3573	5171	}
3574	5172
3575	5173	void SnapObject()
3576	5174	{
3577		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3578		- SnapObject(obj);
	5175	+ if (copy.selection.size() > 0)
	5176	+ {
	5177	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	5178	+ SnapObject(obj);
	5179	+ }
3579	5180	}
3580	5181
3581	5182	void SnapObject(Object3D obj)
..	..	@@ -3816,20 +5417,28 @@
3816	5417	{
3817	5418	if (GetTree() != null)
3818	5419	{
	5420	+ GetTree().revalidate();
3819	5421	GetTree().repaint();
3820	5422	}
3821	5423
3822	5424	radioPanel.revalidate();
3823	5425	radioPanel.repaint();
3824		- ctrlPanel.revalidate(); // ? new
	5426	+ ctrlPanel.validate(); // ? new
3825	5427	ctrlPanel.repaint();
3826	5428	}
	5429	+
	5430	+ if (previousVersionButton != null && copy.versionlist != null)
	5431	+ SetVersionStates();
	5432	+
	5433	+ cameraView.requestFocusInWindow();
3827	5434	}
3828	5435
3829	5436	static TweenManager tweenManager = new TweenManager();
3830	5437
3831	5438	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3832	5439	{
	5440	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5441	+ Save();
3833	5442	//Tween.set(thing, 0).target(1).start(tweenManager);
3834	5443	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3835	5444	// if (thing instanceof GenericJointDemo)
..	..	@@ -3853,7 +5462,7 @@
3853	5462	// group = (Composite) group.get(0);
3854	5463	// }
3855	5464
3856		- System.out.println("makeSomething of " + thing);
	5465	+ //System.out.println("makeSomething of " + thing);
3857	5466
3858	5467	/*
3859	5468	if (deselect && jList != null)
..	..	@@ -3916,6 +5525,12 @@
3916	5525	{
3917	5526	ResetModel();
3918	5527	Select(thing.GetTreePath(), true, false); // unselect... false);
	5528	+
	5529	+ if (thing.Size() == 0)
	5530	+ {
	5531	+ //EditSelection(false);
	5532	+ }
	5533	+
3919	5534	refreshContents();
3920	5535	}
3921	5536
..	..	@@ -4033,6 +5648,7 @@
4033	5648	}
4034	5649	}
4035	5650	}
	5651	+
4036	5652	LoadGFDThread loadGFDThread;
4037	5653
4038	5654	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4052,8 +5668,10 @@
4052	5668
4053	5669	try
4054	5670	{
	5671	+ // Try compressed version first.
4055	5672	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4056		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5673	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5674	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4057	5675
4058	5676	readobj = (Object3D) p.readObject();
4059	5677	istream.close();
..	..	@@ -4061,7 +5679,22 @@
4061	5679	readobj.ResetDisplayList();
4062	5680	} catch (Exception e)
4063	5681	{
4064		- e.printStackTrace();
	5682	+ if (!e.toString().contains("GZIP"))
	5683	+ e.printStackTrace();
	5684	+
	5685	+ try
	5686	+ {
	5687	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5688	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5689	+
	5690	+ readobj = (Object3D) p.readObject();
	5691	+ istream.close();
	5692	+
	5693	+ readobj.ResetDisplayList();
	5694	+ } catch (Exception e2)
	5695	+ {
	5696	+ e2.printStackTrace();
	5697	+ }
4065	5698	}
4066	5699	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4067	5700	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4107,6 +5740,12 @@
4107	5740
4108	5741	void LoadIt(Object obj)
4109	5742	{
	5743	+ if (obj == null)
	5744	+ {
	5745	+ // Invalid file
	5746	+ return;
	5747	+ }
	5748	+
4110	5749	System.out.println("Loaded " + obj);
4111	5750	//new Exception().printStackTrace();
4112	5751	Object3D readobj = (Object3D) obj;
..	..	@@ -4116,10 +5755,14 @@
4116	5755
4117	5756	if (readobj != null)
4118	5757	{
	5758	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5759	+ // Save();
4119	5760	try
4120	5761	{
4121	5762	//readobj.deepCopySelf(copy);
4122	5763	copy.clear(); // june 2014
	5764	+ copy.skyboxname = readobj.skyboxname;
	5765	+ copy.skyboxext = readobj.skyboxext;
4123	5766	for (int i = 0; i < readobj.size(); i++)
4124	5767	{
4125	5768	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4160,6 +5803,7 @@
4160	5803	}
4161	5804	} catch (ClassCastException e)
4162	5805	{
	5806	+ e.printStackTrace();
4163	5807	assert (false);
4164	5808	Composite c = (Composite) copy;
4165	5809	c.children.clear();
..	..	@@ -4170,17 +5814,32 @@
4170	5814	c.addChild(csg);
4171	5815	}
4172	5816
	5817	+ copy.versionlist = readobj.versionlist;
	5818	+ copy.versionindex = readobj.versionindex;
	5819	+ copy.versiontable = readobj.versiontable;
	5820	+
	5821	+ if (copy.versionlist == null)
	5822	+ {
	5823	+ // Backward compatibility
	5824	+ copy.versionlist = new Object3D[100];
	5825	+ copy.versionindex = -1;
	5826	+
	5827	+ //Save(true);
	5828	+ }
	5829	+
	5830	+ //? SetUndoStates();
	5831	+
4173	5832	ResetModel();
4174	5833	copy.HardTouch(); // recompile?
4175	5834	refreshContents();
4176	5835	}
4177	5836	}
4178	5837
4179		- void load() // throws ClassNotFoundException
	5838	+ void Open() // throws ClassNotFoundException
4180	5839	{
4181		- if (GrafreeD.standAlone)
	5840	+ if (Grafreed.standAlone)
4182	5841	{
4183		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5842	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4184	5843	browser.show();
4185	5844	String filename = browser.getFile();
4186	5845	if (filename != null && filename.length() > 0)
..	..	@@ -4257,6 +5916,8 @@
4257	5916
4258	5917	void save()
4259	5918	{
	5919	+ Replace();
	5920	+
4260	5921	if (lastname == null)
4261	5922	{
4262	5923	return;
..	..	@@ -4265,11 +5926,13 @@
4265	5926	try
4266	5927	{
4267	5928	FileOutputStream ostream = new FileOutputStream(lastname);
4268		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5929	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5930	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4269	5931
4270	5932	p.writeObject(copy);
4271	5933	p.flush();
4272	5934
	5935	+ zstream.close();
4273	5936	ostream.close();
4274	5937
4275	5938	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4277,19 +5940,23 @@
4277	5940	//ps.print(buffer.toString());
4278	5941	} catch (IOException e)
4279	5942	{
	5943	+ e.printStackTrace();
4280	5944	}
4281	5945	}
	5946	+
4282	5947	String lastname;
4283	5948
4284	5949	void saveAs()
4285	5950	{
4286		- if (GrafreeD.standAlone)
	5951	+ if (Grafreed.standAlone)
4287	5952	{
4288	5953	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4289	5954	browser.setVisible(true);
4290	5955	String filename = browser.getFile();
4291	5956	if (filename != null && filename.length() > 0)
4292	5957	{
	5958	+ if (!filename.endsWith(".gfd"))
	5959	+ filename += ".gfd";
4293	5960	lastname = browser.getDirectory() + filename;
4294	5961	save();
4295	5962	}
..	..	@@ -4388,13 +6055,13 @@
4388	6055	try
4389	6056	{
4390	6057	FileOutputStream ostream = new FileOutputStream(filename);
4391		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4392		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	6058	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	6059	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4393	6060
4394	6061	Object3D objectparent = obj.parent;
4395	6062	obj.parent = null;
4396	6063
4397		- Object3D object = (Object3D) GrafreeD.clone(obj);
	6064	+ Object3D object = (Object3D) Grafreed.clone(obj);
4398	6065
4399	6066	obj.parent = objectparent;
4400	6067
..	..	@@ -4406,8 +6073,8 @@
4406	6073	p.writeObject(object);
4407	6074	p.flush();
4408	6075
	6076	+ zstream.close();
4409	6077	ostream.close();
4410		- // zstream.close();
4411	6078
4412	6079	// group.selection.get(0).parent = parent;
4413	6080	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4428,7 +6095,7 @@
4428	6095	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4429	6096	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4430	6097	copy.generatePOV(buffer);
4431		- if (GrafreeD.standAlone)
	6098	+ if (Grafreed.standAlone)
4432	6099	{
4433	6100	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4434	6101	browser.show();
..	..	@@ -4454,21 +6121,20 @@
4454	6121	Object3D client;
4455	6122	Object3D copy;
4456	6123	MenuBar menuBar;
4457		- Menu windowMenu;
4458		- MenuItem loadItem;
	6124	+ Menu fileMenu;
	6125	+ MenuItem newItem;
	6126	+ MenuItem openItem;
4459	6127	MenuItem saveItem;
4460	6128	MenuItem saveAsItem;
4461	6129	MenuItem exportAsItem;
4462	6130	MenuItem reexportItem;
4463	6131	MenuItem povItem;
4464	6132	MenuItem closeItem;
4465		- Menu cameraMenu;
	6133	+
4466	6134	CheckboxMenuItem zBufferItem;
4467	6135	//MenuItem normalLensItem;
4468		- MenuItem editCameraItem;
4469		- MenuItem revertCameraItem;
4470		- CheckboxMenuItem toggleLiveItem;
4471	6136	MenuItem stepItem;
	6137	+ CheckboxMenuItem toggleLiveItem;
4472	6138	CheckboxMenuItem toggleFullScreenItem;
4473	6139	CheckboxMenuItem toggleTimelineItem;
4474	6140	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4477,28 +6143,45 @@
4477	6143	CheckboxMenuItem toggleFootContactItem;
4478	6144	CheckboxMenuItem toggleDLItem;
4479	6145	CheckboxMenuItem toggleTextureItem;
4480		- CheckboxMenuItem toggleRandomItem;
	6146	+ CheckboxMenuItem toggleSwitchItem;
4481	6147	CheckboxMenuItem toggleRootItem;
4482	6148	CheckboxMenuItem animationItem;
	6149	+ MenuItem archiveItem;
4483	6150	CheckboxMenuItem toggleHandleItem;
4484	6151	CheckboxMenuItem togglePaintItem;
4485	6152	JSplitPane mainPanel;
4486	6153	JScrollPane scrollpane;
	6154	+
4487	6155	JPanel toolbarPanel;
4488		- JPanel treePanel;
	6156	+
	6157	+ cGridBag treePanel;
	6158	+
4489	6159	JPanel radioPanel;
4490	6160	ButtonGroup buttonGroup;
4491		- JPanel ctrlPanel;
4492		- JPanel materialPanel;
	6161	+
	6162	+ cGridBag toolboxPanel;
	6163	+ cGridBag skyboxPanel;
	6164	+ cGridBag materialPanel;
	6165	+ cGridBag ctrlPanel;
	6166	+
4493	6167	JScrollPane infoPanel;
4494		- JPanel optionsPanel;
	6168	+
	6169	+ cGridBag optionsPanel;
	6170	+
4495	6171	JTabbedPane objectPanel;
4496		- JPanel XYZPanel;
	6172	+ boolean materialFlushed;
	6173	+ Object3D latestObject;
	6174	+
	6175	+ cGridBag transformPanel;
	6176	+ cGridBag XYZPanel;
	6177	+
4497	6178	JSplitPane gridPanel;
4498	6179	JSplitPane bigPanel;
4499		- JPanel bigThree;
4500		- JTabbedPane scenePanel;
4501		- JPanel centralPanel;
	6180	+
	6181	+ cGridBag bigThree;
	6182	+ cGridBag scenePanel;
	6183	+ cGridBag centralPanel;
	6184	+ JSplitPane cameraPanel;
4502	6185	JPanel timelinePanel;
4503	6186	JMenuBar timelineMenubar;
4504	6187	JSplitPane framePanel;
..	..	@@ -4550,65 +6233,76 @@
4550	6233	// MATERIAL
4551	6234	JLabel materialLabel;
4552	6235	JLabel colorLabel;
4553		- NumberSlider colorField;
	6236	+ cNumberSlider colorField;
4554	6237	JLabel modulationLabel;
4555		- NumberSlider modulationField;
	6238	+ cNumberSlider saturationField;
4556	6239	JLabel metalnessLabel;
4557		- NumberSlider metalnessField;
	6240	+ cNumberSlider metalnessField;
4558	6241	JLabel diffuseLabel;
4559		- NumberSlider diffuseField;
	6242	+ cNumberSlider diffuseField;
4560	6243	JLabel specularLabel;
4561		- NumberSlider specularField;
	6244	+ cNumberSlider specularField;
4562	6245	JLabel shininessLabel;
4563		- NumberSlider shininessField;
	6246	+ cNumberSlider shininessField;
4564	6247	JLabel shiftLabel;
4565		- NumberSlider shiftField;
	6248	+ cNumberSlider shiftField;
4566	6249	JLabel ambientLabel;
4567		- NumberSlider ambientField;
	6250	+ cNumberSlider ambientField;
4568	6251	JLabel lightareaLabel;
4569		- NumberSlider lightareaField;
	6252	+ cNumberSlider lightareaField;
4570	6253	JLabel diffusenessLabel;
4571		- NumberSlider diffusenessField;
	6254	+ cNumberSlider diffusenessField;
4572	6255	JLabel velvetLabel;
4573		- NumberSlider velvetField;
	6256	+ cNumberSlider velvetField;
4574	6257	JLabel sheenLabel;
4575		- NumberSlider sheenField;
	6258	+ cNumberSlider sheenField;
4576	6259	JLabel subsurfaceLabel;
4577		- NumberSlider subsurfaceField;
	6260	+ cNumberSlider subsurfaceField;
4578	6261	//JLabel bumpLabel;
4579	6262	//NumberSlider bumpField;
4580	6263	JLabel backlitLabel;
4581		- NumberSlider backlitField;
	6264	+ cNumberSlider backlitField;
4582	6265	JLabel anisoLabel;
4583		- NumberSlider anisoField;
	6266	+ cNumberSlider anisoField;
4584	6267	JLabel anisoVLabel;
4585		- NumberSlider anisoVField;
	6268	+ cNumberSlider anisoVField;
	6269	+
4586	6270	JLabel cameraLabel;
4587		- NumberSlider cameraField;
	6271	+ cNumberSlider cameraField;
4588	6272	JLabel selfshadowLabel;
4589		- NumberSlider selfshadowField;
	6273	+ cNumberSlider selfshadowField;
4590	6274	JLabel shadowLabel;
4591		- NumberSlider shadowField;
	6275	+ cNumberSlider shadowField;
4592	6276	JLabel textureLabel;
4593		- NumberSlider textureField;
	6277	+ cNumberSlider textureField;
4594	6278	JLabel opacityLabel;
4595		- NumberSlider opacityField;
	6279	+ cNumberSlider opacityField;
	6280	+ JLabel parallaxLabel;
	6281	+ cNumberSlider parallaxField;
4596	6282	JLabel fakedepthLabel;
4597		- NumberSlider fakedepthField;
	6283	+ cNumberSlider fakedepthField;
4598	6284	JLabel shadowbiasLabel;
4599		- NumberSlider shadowbiasField;
	6285	+ cNumberSlider shadowbiasField;
	6286	+
4600	6287	JLabel bumpLabel;
4601		- NumberSlider bumpField;
	6288	+ cNumberSlider bumpField;
4602	6289	JLabel noiseLabel;
4603		- NumberSlider noiseField;
	6290	+ cNumberSlider noiseField;
4604	6291	JLabel powerLabel;
4605		- NumberSlider powerField;
	6292	+ cNumberSlider powerField;
4606	6293	JLabel borderfadeLabel;
4607		- NumberSlider borderfadeField;
	6294	+ cNumberSlider borderfadeField;
4608	6295	JLabel fogLabel;
4609		- NumberSlider fogField;
	6296	+ cNumberSlider fogField;
4610	6297	JLabel opacityPowerLabel;
4611		- NumberSlider opacityPowerField;
4612		- JTree jTree;
	6298	+ cNumberSlider opacityPowerField;
	6299	+ cTree jTree;
4613	6300	//ObjectUI parent;
	6301	+
	6302	+ cNumberSlider normalpushField;
	6303	+
	6304	+ private MenuItem importGFDItem;
	6305	+ private MenuItem importVRMLX3DItem;
	6306	+ private MenuItem import3DSItem;
	6307	+ private MenuItem importOBJItem;
4614	6308	}