~nbriere/GrafreeD.git - Noware Git Repository

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