~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,44 @@
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	+ if (versionPanel != null)
	320	+ objEditor.ctrlPanel.remove(versionPanel);
	321	+ //objEditor.ctrlPanel.remove(fillPanel);
	322	+
	323	+ //Remove(normalpushField);
169	324	}
170	325
171	326	public ObjEditor GetEditor()
..	..	@@ -209,6 +364,14 @@
209	364	client = inClient;
210	365	copy = client;
211	366
	367	+// if (copy.versionlist == null)
	368	+// {
	369	+// copy.versionlist = new Object3D[100];
	370	+// copy.versionindex = -1;
	371	+//
	372	+// callee.Save(true);
	373	+// }
	374	+
212	375	// "this" is not called: SetupUI2(objEditor);
213	376	}
214	377
..	..	@@ -236,13 +399,15 @@
236	399	//localCopy.parent = null;
237	400
238	401	frame = new JFrame();
	402	+ frame.setUndecorated(false);
239	403	objEditor = this;
240	404	this.callee = callee;
241	405
242	406	//parent = p;
243	407
244	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
245		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
246	411	//gd.setFullScreenWindow(this);
247	412	//setResizable(false);
248	413	//if (!isDisplayable())
..	..	@@ -253,6 +418,14 @@
253	418	copy = localCopy;
254	419	copy.editWindow = this;
255	420
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
	424	+// copy.versionindex = -1;
	425	+//
	426	+// Save(true);
	427	+// }
	428	+
256	429	SetupMenu();
257	430
258	431	//SetupName(objEditor); // new
..	..	@@ -266,28 +439,55 @@
266	439	return frame.action(event, obj);
267	440	}
268	441
	442	+ // Cannot work without static
	443	+ static boolean allparams = true;
	444	+
	445	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	446	+
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
269	450	void SetupMenu()
270	451	{
271	452	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..."));
	453	+ menuBar.add(fileMenu = new Menu("File"));
	454	+ fileMenu.add(newItem = new MenuItem("New"));
	455	+ fileMenu.add(openItem = new MenuItem("Open..."));
	456	+
	457	+ //oe.menuBar.add(menu = new Menu("Include"));
	458	+ Menu menu = new Menu("Import");
	459	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	460	+ importOBJItem.addActionListener(this);
	461	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	462	+ import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
	465	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	466	+ importVRMLX3DItem.addActionListener(this);
	467	+ }
	468	+ menu.add("-");
	469	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	470	+ importGFDItem.addActionListener(this);
	471	+ fileMenu.add(menu);
	472	+ fileMenu.add("-");
	473	+
	474	+ fileMenu.add(saveItem = new MenuItem("Save"));
	475	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	476	//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("-");
	477	+ fileMenu.add("-");
	478	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	479	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	480	+ fileMenu.add("-");
282	481	if (client.parent != null)
283	482	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	483	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	484	} else
286	485	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	486	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	487	}
289	488
290		- loadItem.addActionListener(this);
	489	+ newItem.addActionListener(this);
	490	+ openItem.addActionListener(this);
291	491	saveItem.addActionListener(this);
292	492	saveAsItem.addActionListener(this);
293	493	exportAsItem.addActionListener(this);
..	..	@@ -295,82 +495,103 @@
295	495	//povItem.addActionListener(this);
296	496	closeItem.addActionListener(this);
297	497
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	498	objectPanel = new JTabbedPane();
	499	+
	500	+ ChangeListener changeListener = new ChangeListener()
	501	+ {
	502	+ //String name;
	503	+
	504	+ public void stateChanged(ChangeEvent changeEvent)
	505	+ {
	506	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	507	+// {
	508	+// if (latestObject != null)
	509	+// {
	510	+// refreshContents(true);
	511	+// SetMaterial(latestObject);
	512	+// }
	513	+//
	514	+// materialFlushed = true;
	515	+// }
	516	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	517	+// {
	518	+// if (listUI.size() == 0)
	519	+// EditSelection(false);
	520	+// }
	521	+
	522	+// if (objectPanel.getSelectedIndex() == 4)
	523	+// {
	524	+// name = copy.skyboxname;
	525	+//
	526	+// if (name == null)
	527	+// {
	528	+// name = "";
	529	+// }
	530	+//
	531	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	532	+// copy.skyboxext = "jpg";
	533	+// }
	534	+// else
	535	+// {
	536	+// if (name != null)
	537	+// {
	538	+// if (name.equals(""))
	539	+// {
	540	+// copy.skyboxname = null;
	541	+// copy.skyboxext = null;
	542	+// }
	543	+// else
	544	+// {
	545	+// copy.skyboxname = name;
	546	+// }
	547	+// }
	548	+// }
	549	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	550	+
	551	+// refreshContents(false); // To refresh Info tab
	552	+ cameraView.repaint();
	553	+ }
	554	+ };
	555	+ objectPanel.addChangeListener(changeListener);
	556	+
354	557	toolbarPanel = new JPanel();
355	558	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	559	+
	560	+ treePanel = new cGridBag();
357	561	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- materialPanel = new JPanel();
361		- materialPanel.setName("Material");
	562	+
	563	+ editPanel = new cGridBag().setVertical(true);
	564	+ //editPanel.setName("Edit");
	565	+
	566	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	567	+
	568	+ editCommandsPanel = new cGridBag();
	569	+ editPanel.add(editCommandsPanel);
	570	+ editPanel.add(ctrlPanel);
	571	+
	572	+ toolboxPanel = new cGridBag().setVertical(true);
	573	+ //toolboxPanel.setName("Toolbox");
	574	+
	575	+ skyboxPanel = new cGridBag().setVertical(true);
	576	+
	577	+ materialPanel = new cGridBag().setVertical(false);
	578	+ //materialPanel.setName("Material");
	579	+
362	580	/JTextPane/
363	581	infoarea = createTextPane();
	582	+ doc = infoarea.getStyledDocument();
	583	+
364	584	infoarea.setEditable(true);
365	585	SetText();
	586	+
366	587	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	588	// infoarea.setOpaque(false);
368	589	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	590	+// TEXTAREA infoarea.setLineWrap(true);
	591	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	592	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");
	593	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	594	+ //infoPanel.setName("Info");
374	595	//infoPanel.setLayout(new BorderLayout());
375	596	//infoPanel.add(createTextPane());
376	597
..	..	@@ -378,16 +599,23 @@
378	599	mainPanel.setName("Main");
379	600	mainPanel.setContinuousLayout(true);
380	601	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	602	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	603	+ mainPanel.setDividerLocation(0.5); //1.0);
	604	+ mainPanel.setResizeWeight(0.5);
	605	+
	606	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	607	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	608	+ divider.setDividerSize(15);
	609	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	610	+
	611	+ mainPanel.setUI(new BasicSplitPaneUI());
	612	+
385	613	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	614	//mainPanel.setLayout(new GridBagLayout());
387	615	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	616	+// treePanel.setLayout(new GridBagLayout());
	617	+ //ctrlPanel.setLayout(new GridBagLayout());
	618	+ //materialPanel.setLayout(new GridBagLayout());
391	619
392	620	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	621	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +654,7 @@
426	654	static String newline = "\n";
427	655	protected static final String buttonString = "JButton";
428	656	StyledDocument doc;
429		- JTextArea infoarea;
	657	+ JTextPane infoarea;
430	658
431	659	void ClearInfo()
432	660	{
..	..	@@ -449,10 +677,10 @@
449	677	e.printStackTrace();
450	678	}
451	679
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();
	680	+// String selection = infoarea.getText();
	681	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	682	+// java.awt.datatransfer.Clipboard clipboard =
	683	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	684	//clipboard.setContents(data, data);
457	685	}
458	686
..	..	@@ -475,13 +703,13 @@
475	703	//SendInfo("Name:", "bold");
476	704	if (sel.GetTextures() != null \|\| debug)
477	705	{
478		- si.SendInfo(sel.toString(), "bold");
	706	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	707	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	708	if (sel.Size() > 0)
481	709	{
482	710	si.SendInfo("#children = " + sel.Size(), "regular");
483	711	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	712	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	713	if (debug)
486	714	{
487	715	try
..	..	@@ -493,7 +721,10 @@
493	721	}
494	722
495	723	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	724	+ {
	725	+ si.SendInfo(" BBox min: " + minima, "regular");
	726	+ si.SendInfo(" BBox max: " + maxima, "regular");
	727	+ }
497	728
498	729	if (sel.bRep != null)
499	730	{
..	..	@@ -520,7 +751,7 @@
520	751	}
521	752	if (sel.support != null)
522	753	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	754	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	755	}
525	756	if (sel.scriptnode != null)
526	757	{
..	..	@@ -591,6 +822,9 @@
591	822	{
592	823	CameraPane.pointflow = (PointFlow) sel;
593	824	}
	825	+
	826	+ si.SendInfo("_____________________", "regular");
	827	+ si.SendInfo("", "regular");
594	828	}
595	829	}
596	830
..	..	@@ -606,68 +840,216 @@
606	840	}
607	841	}
608	842
	843	+//static GraphicsDevice device = GraphicsEnvironment
	844	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	845	+
	846	+ Rectangle keeprect;
	847	+ cRadio radio;
	848	+
	849	+cButton keepButton;
	850	+ cButton twoButton; // Full 3D
	851	+ cButton sixButton;
	852	+ cButton threeButton;
	853	+ cButton sevenButton;
	854	+ cButton fourButton; // full panel
	855	+ cButton oneButton; // full XYZ
	856	+ //cButton currentLayout;
	857	+
	858	+ boolean maximized;
	859	+
	860	+ cButton fullscreenLayout;
	861	+ cButton expandedLayout;
	862	+
	863	+ void Minimize()
	864	+ {
	865	+ frame.setState(Frame.ICONIFIED);
	866	+ frame.validate();
	867	+ }
	868	+
	869	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	870	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	871	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	872	+ void Maximize()
	873	+ {
	874	+ if (CameraPane.FULLSCREEN)
	875	+ {
	876	+ ToggleFullScreen();
	877	+ }
	878	+
	879	+ if (maximized)
	880	+ {
	881	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	882	+ }
	883	+ else
	884	+ {
	885	+ keeprect = frame.getBounds();
	886	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	887	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	888	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	889	+// frame.setState(Frame.MAXIMIZED_BOTH);
	890	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	891	+ }
	892	+
	893	+ maximized ^= true;
	894	+
	895	+ frame.validate();
	896	+ }
	897	+
	898	+ cButton minButton;
	899	+ cButton maxButton;
	900	+ cButton fullButton;
	901	+ cButton collapseButton;
	902	+ cButton maximize3DButton;
	903	+
609	904	void ToggleFullScreen()
610	905	{
611		- if (CameraPane.FULLSCREEN)
	906	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	907	+
	908	+ cameraView.ToggleFullScreen();
	909	+
	910	+ if (!CameraPane.FULLSCREEN)
612	911	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	912	+ device.setFullScreenWindow(null);
	913	+ frame.dispose();
	914	+ frame.setUndecorated(false);
	915	+ frame.validate();
	916	+ frame.setVisible(true);
	917	+
	918	+ //frame.setVisible(false);
	919	+// frame.removeNotify();
	920	+// frame.setUndecorated(false);
	921	+// frame.addNotify();
	922	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	923	+
	924	+// X frame.getContentPane().remove(/"Center",/bigThree);
	925	+// X framePanel.add(bigThree);
	926	+// X frame.getContentPane().add(/"Center",/framePanel);
	927	+// framePanel.setDividerLocation(46); // icons are 24x24
	928	+
	929	+ //frame.setVisible(true);
	930	+// radio.layout = keepButton;
	931	+ //theFrame = null;
	932	+ keepButton = null;
	933	+// radio.layout.doClick();
	934	+
616	935	} else
617	936	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	937	+ keepButton = radio.layout;
	938	+ //keeprect = frame.getBounds();
	939	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	940	+// frame.getToolkit().getScreenSize().height);
	941	+ //frame.setVisible(false);
	942	+
	943	+ frame.dispose();
	944	+ frame.setUndecorated(true);
	945	+ device.setFullScreenWindow(frame);
	946	+ frame.validate();
	947	+ frame.setVisible(true);
	948	+// frame.removeNotify();
	949	+// frame.setUndecorated(true);
	950	+// frame.addNotify();
	951	+// X frame.getContentPane().remove(/"Center",/framePanel);
	952	+// X framePanel.remove(bigThree);
	953	+// X frame.getContentPane().add(/"Center",/bigThree);
	954	+// framePanel.setDividerLocation(0);
	955	+
	956	+// radio.layout = fullscreenLayout;
	957	+// radio.layout.doClick();
	958	+ //frame.setVisible(true);
621	959	}
622		- cameraView.ToggleFullScreen();
	960	+ frame.validate();
	961	+
	962	+ cameraView.requestFocusInWindow();
623	963	}
624	964
625		- private JTextArea createTextPane()
	965	+ void CollapseToolbar()
	966	+ {
	967	+ framePanel.setDividerLocation(0);
	968	+ //frame.validate();
	969	+
	970	+ cameraView.requestFocusInWindow();
	971	+ }
	972	+
	973	+ private Object3D Duplicate(Object3D object)
626	974	{
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		- };
	975	+ boolean temp = CameraPane.SWITCH;
	976	+ CameraPane.SWITCH = false;
	977	+
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	982	+ // if (copy == client)
	983	+
	984	+ Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	986	+ object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
	991	+
	992	+ //byte[] compress = Compress(copy);
	993	+ Object3D compress = (Object3D)Grafreed.clone(object);
	994	+
	995	+ object.parent = parent;
	996	+
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	1001	+
	1002	+ CameraPane.SWITCH = temp;
	1003	+
	1004	+ return compress;
	1005	+ }
642	1006
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
	1007	+ private JTextPane createTextPane()
	1008	+ {
	1009	+// TEXTAREA String[] initString =
	1010	+// {
	1011	+// "This is an editable JTextPane, ", //regular
	1012	+// "another ", //italic
	1013	+// "styled ", //bold
	1014	+// "text ", //small
	1015	+// "component, ", //large
	1016	+// "which supports embedded components..." + newline,//regular
	1017	+// " " + newline, //button
	1018	+// "...and embedded icons..." + newline, //regular
	1019	+// " ", //icon
	1020	+// newline + "JTextPane is a subclass of JEditorPane that "
	1021	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	1022	+// + "cover methods for interacting with those objects."
	1023	+// };
	1024	+//
	1025	+// String[] initStyles =
	1026	+// {
	1027	+// "regular", "italic", "bold", "small", "large",
	1028	+// "regular", "button", "regular", "icon",
	1029	+// "regular"
	1030	+// };
	1031	+//
	1032	+// JTextPane textPane = new JTextPane();
	1033	+// textPane.setEditable(true);
	1034	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1035	+// addStylesToDocument(doc);
	1036	+//
	1037	+// try
	1038	+// {
	1039	+// for (int j = 0; j < 2; j++)
	1040	+// {
	1041	+// for (int i = 0; i < initString.length; i++)
	1042	+// {
	1043	+// doc.insertString(doc.getLength(), initString[i],
	1044	+// doc.getStyle(initStyles[i]));
	1045	+// }
	1046	+// }
	1047	+// } catch (BadLocationException ble)
	1048	+// {
	1049	+// System.err.println("Couldn't insert initial text into text pane.");
	1050	+// }
649	1051
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;
	1052	+ return new JTextPane(); // textPane;
671	1053	}
672	1054
673	1055	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +1102,7 @@
720	1102	protected static ImageIcon createImageIcon(String path,
721	1103	String description)
722	1104	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1105	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	1106	if (imgURL != null)
725	1107	{
726	1108	return new ImageIcon(imgURL, description);
..	..	@@ -743,6 +1125,7 @@
743	1125	{
744	1126	SetupMaterial(materialPanel);
745	1127	}
	1128	+
746	1129	//SetupName();
747	1130	//SetupViews();
748	1131	}
..	..	@@ -752,6 +1135,7 @@
752	1135	// NumberSlider vDivsField;
753	1136	// JCheckBox endcaps;
754	1137	JCheckBox liveCB;
	1138	+ JCheckBox selectableCB;
755	1139	JCheckBox hideCB;
756	1140	JCheckBox link2masterCB;
757	1141	JCheckBox markCB;
..	..	@@ -759,7 +1143,12 @@
759	1143	JCheckBox speedupCB;
760	1144	JCheckBox rewindCB;
761	1145	JCheckBox flipVCB;
	1146	+
	1147	+ cCheckBox toggleTextureCB;
	1148	+ cCheckBox toggleSwitchCB;
	1149	+
762	1150	JComboBox texresMenu;
	1151	+
763	1152	JButton resetButton;
764	1153	JButton stepButton;
765	1154	JButton stepAllButton;
..	..	@@ -767,115 +1156,88 @@
767	1156	JButton slowerButton;
768	1157	JButton fasterButton;
769	1158	JButton remarkButton;
	1159	+
	1160	+ cGridBag editPanel;
	1161	+ cGridBag editCommandsPanel;
	1162	+
	1163	+ cGridBag namePanel;
	1164	+ cGridBag setupPanel;
	1165	+ cGridBag setupPanel2;
	1166	+ cGridBag objectCommandsPanel;
	1167	+ cGridBag pushPanel;
	1168	+ cGridBag versionPanel;
	1169	+ cGridBag fillPanel;
770	1170
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1171	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	1172	{
773	1173	JCheckBox cb;
774	1174
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);
	1175	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	1176	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	1177
785	1178	return cb;
786	1179	}
787	1180
788		- cButton AddButton(ObjEditor oe, String label)
	1181	+ cButton AddButton(cGridBag panel, String label)
789	1182	{
790	1183	cButton cb;
791	1184
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);
	1185	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	1186	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	1187
802	1188	return cb;
803	1189	}
804	1190
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1191	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1192	{
807	1193	JComboBox combo;
808	1194
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;
	1195	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1196	combo.addActionListener(this);
813	1197
814	1198	return combo;
815	1199	}
816	1200
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1201	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1202	{
819		- NumberSlider combo;
	1203	+ cGridBag control = new cGridBag();
	1204	+
	1205	+ cNumberSlider combo;
820	1206
821	1207	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	1208	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		-
	1209	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1210	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	1211	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	1212	+
	1213	+ panel.add(control);
	1214	+
	1215	+ return control;
841	1216	}
842	1217
843		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1218	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
844	1219	{
845		- NumberSlider combo;
	1220	+ cGridBag control = new cGridBag();
	1221	+
	1222	+ cNumberSlider combo;
846	1223
847	1224	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	1225	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		-
	1226	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1227	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	1228	combo.setInteger(current);
861	1229
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	1230	+ panel.add(control);
	1231	+
	1232	+ return control;
867	1233	}
868	1234
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	1235	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	1236	{
871	1237	JTextArea text;
872	1238
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1239	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	1240	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	1241
880	1242	return text;
881	1243	}
..	..	@@ -905,9 +1267,16 @@
905	1267	objEditor.ctrlPanel.remove(j);
906	1268	}
907	1269
	1270	+ void Remove(cNumberSlider j)
	1271	+ {
	1272	+ j.removeChangeListener(this);
	1273	+ //objEditor.ctrlPanel.remove(j.label);
	1274	+ objEditor.ctrlPanel.remove(j);
	1275	+ }
	1276	+
908	1277	/*
909	1278	*/
910		- void Return() // ObjEditor oe)
	1279	+ void Return0() // ObjEditor oe)
911	1280	{
912	1281	aConstraints.gridy += 1;
913	1282	aConstraints.gridx = 0;
..	..	@@ -962,37 +1331,97 @@
962	1331
963	1332	void SetupUI2(ObjEditor oe)
964	1333	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	1334	+ //SetupName(oe);
970	1335
971		- if (!GroupEditor.allparams)
	1336	+ namePanel = new cGridBag();
	1337	+
	1338	+ //if (copy.pinned)
	1339	+ {
	1340	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1341	+ pinButton.setSelected(copy.pinned);
	1342	+ cGridBag t = new cGridBag();
	1343	+ t.preferredWidth = 2;
	1344	+ t.add(pinButton);
	1345	+ namePanel.add(t);
	1346	+
	1347	+ pinButton.addItemListener(this);
	1348	+ }
	1349	+
	1350	+ nameField = AddText(namePanel, copy.GetName());
	1351	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1352	+ oe.ctrlPanel.add(namePanel);
	1353	+
	1354	+ oe.ctrlPanel.Return();
	1355	+
	1356	+ if (!allparams)
972	1357	return;
973	1358
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1359	+ setupPanel = new cGridBag().setVertical(false);
	1360	+
	1361	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1362	+ liveCB.setToolTipText("Animate object");
	1363	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1364	+ markCB.setToolTipText("Set target transform");
	1365	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1366	+ selectableCB.setToolTipText("Make object selectable");
977	1367	// 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");
	1368	+
	1369	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1370	+ hideCB.setToolTipText("Hide object");
	1371	+
	1372	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1373	+
	1374	+ setupPanel2 = new cGridBag().setVertical(false);
	1375	+
	1376	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1377	+ rewindCB.setToolTipText("Rewind animation");
	1378	+
	1379	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1380	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1381	+
	1382	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1383	+ link2masterCB.setToolTipText("Attach to support");
	1384	+
	1385	+ if (Globals.ADVANCED)
	1386	+ {
	1387	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1388	+ speedupCB.setToolTipText("Option motion capture");
	1389	+ }
	1390	+
	1391	+ oe.ctrlPanel.add(setupPanel);
	1392	+ oe.ctrlPanel.Return();
	1393	+ oe.ctrlPanel.add(setupPanel2);
	1394	+ oe.ctrlPanel.Return();
	1395	+
	1396	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1397	+
	1398	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1399	+ resetButton.setToolTipText("Jump to frame zero");
	1400	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1401	+ stepButton.setToolTipText("Step one frame");
984	1402	// resetAllButton = AddButton(oe, "Reset All");
985	1403	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1404	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	1405	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1406	+ slowerButton.setToolTipText("Decrease animation speed");
	1407	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1408	+ fasterButton.setToolTipText("Increase animation speed");
	1409	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1410	+ remarkButton.setToolTipText("Set the current transform as the target");
991	1411
992		- Return();
	1412	+ oe.ctrlPanel.add(objectCommandsPanel);
	1413	+ oe.ctrlPanel.Return();
993	1414
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	1415	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH * 100, 1.1); // To have the buttons
	1416	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1417	+ if (false && copy.versionlist != null && copy.versionindex != -1)
	1418	+ {
	1419	+ oe.ctrlPanel.Return();
	1420	+ versionPanel = AddSlider(oe.ctrlPanel, "Version", 0, copy.VersionCount() - 1, copy.versionindex);
	1421	+ versionField = (cNumberSlider)versionPanel.getComponent(1);
	1422	+ }
	1423	+
	1424	+ oe.ctrlPanel.Return();
996	1425
997	1426	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	1427	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1516,7 @@
1087	1516	oe.aConstraints.gridwidth = 1;
1088	1517	/**/
1089	1518	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1519	+ oe.ctrlPanel.Return();
1091	1520
1092	1521	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1522	//textureButton.setEnabled(false);
..	..	@@ -1145,22 +1574,9 @@
1145	1574
1146	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1147	1576	{
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);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1164	1580	} else
1165	1581	{
1166	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1191,8 +1607,11 @@
1191	1607	//worldPanel.setName("World");
1192	1608	centralPanel = new cGridBag();
1193	1609	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1610	+
	1611	+ if (Globals.ADVANCED)
	1612	+ {
	1613	+ timelinePanel = new JPanel(new BorderLayout());
	1614	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1615
1197	1616	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1617	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1620,10 @@
1201	1620	// cameraPanel.setDividerSize(9);
1202	1621	cameraPanel.setResizeWeight(1.0);
1203	1622
	1623	+ }
	1624	+
1204	1625	centralPanel.add(cameraView);
	1626	+ centralPanel.setFocusable(true);
1205	1627	//frame.setJMenuBar(timelineMenubar);
1206	1628	//centralPanel.add(timelinePanel);
1207	1629
..	..	@@ -1220,6 +1642,45 @@
1220	1642	//frontView.object = copy;
1221	1643	//sideView.object = copy;
1222	1644
	1645	+ transformPanel = new cGridBag().setVertical(true);
	1646	+
	1647	+ cGridBag resetTransformPanel = new cGridBag();
	1648	+
	1649	+ resetTransformPanel.preferredHeight = 2;
	1650	+
	1651	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1652	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1653	+ resetTransform.addMouseListener(new MouseAdapter()
	1654	+ {
	1655	+ public void mouseClicked(MouseEvent e)
	1656	+ {
	1657	+ ResetTransform();
	1658	+ }
	1659	+ });
	1660	+ resetTransformPanel.add(resetTransform);
	1661	+
	1662	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1663	+ resetTransform.setToolTipText("Reset Translation only");
	1664	+ resetTransform.addMouseListener(new MouseAdapter()
	1665	+ {
	1666	+ public void mouseClicked(MouseEvent e)
	1667	+ {
	1668	+ ResetTransform(1);
	1669	+ }
	1670	+ });
	1671	+ resetTransformPanel.add(resetTransform);
	1672	+
	1673	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1674	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1675	+ resetTransform.addMouseListener(new MouseAdapter()
	1676	+ {
	1677	+ public void mouseClicked(MouseEvent e)
	1678	+ {
	1679	+ ResetTransform(2);
	1680	+ }
	1681	+ });
	1682	+ resetTransformPanel.add(resetTransform);
	1683	+
1223	1684	XYZPanel = new cGridBag().setVertical(true);
1224	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1225	1686
..	..	@@ -1227,7 +1688,11 @@
1227	1688	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1228	1689	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1229	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1691	+ //XYZPanel.setName("XYZ");
1230	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1231	1696	/*
1232	1697	gridPanel = new JPanel(); //new BorderLayout());
1233	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1235,12 +1700,12 @@
1235	1700	gridPanel.add(cameraView);
1236	1701	gridPanel.add(XYZPanel);
1237	1702	*/
1238		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1239		- gridPanel.setContinuousLayout(true);
1240		- gridPanel.setOneTouchExpandable(true);
1241		- gridPanel.setDividerLocation(1.0);
1242		- gridPanel.setDividerSize(9);
1243		- gridPanel.setResizeWeight(0.85);
	1703	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1704	+// gridPanel.setContinuousLayout(true);
	1705	+// gridPanel.setOneTouchExpandable(true);
	1706	+// gridPanel.setDividerLocation(1.0);
	1707	+// gridPanel.setDividerSize(9);
	1708	+// gridPanel.setResizeWeight(0.85);
1244	1709
1245	1710	// aConstraints.weighty = 0;
1246	1711	//System.out.println("THIS = " + this);
..	..	@@ -1263,13 +1728,34 @@
1263	1728
1264	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1730	//tmp.setName("Edit");
1266		- objectPanel.add(materialPanel);
1267		- JPanel north = new JPanel(new BorderLayout());
1268		- north.setName("Edit");
1269		- north.add(ctrlPanel, BorderLayout.NORTH);
1270		- objectPanel.add(north);
1271		- objectPanel.add(infoPanel);
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
	1735	+ objectPanel.add(toolboxPanel);
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1272	1738
	1739	+ objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
	1743	+// JPanel north = new JPanel(new BorderLayout());
	1744	+// north.setName("Edit");
	1745	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1746	+// objectPanel.add(north);
	1747	+ objectPanel.add(editPanel);
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1749	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1750	+
	1751	+ objectPanel.add(transformPanel);
	1752	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1754	+
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1273	1759	/*
1274	1760	aConstraints.gridx = 0;
1275	1761	aConstraints.gridwidth = 1;
..	..	@@ -1277,7 +1763,7 @@
1277	1763	aConstraints.gridy += 1;
1278	1764	aConstraints.gridwidth = 1;
1279	1765	mainPanel.add(objectPanel, aConstraints);
1280		- */
	1766	+ */
1281	1767
1282	1768	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1283	1769	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1289,22 +1775,119 @@
1289	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1290	1776
1291	1777	/JTabbedPane/ scenePanel = new cGridBag();
1292		- scenePanel.preferredWidth = 7;
	1778	+ scenePanel.preferredWidth = 5;
1293	1779
1294	1780	JTabbedPane tabbedPane = new JTabbedPane();
1295	1781	tabbedPane.add(scrollpane);
1296	1782
1297		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1298		-
1299		- optionsPanel = new JPanel(new GridBagLayout());
	1783	+ optionsPanel = new cGridBag().setVertical(false);
1300	1784
1301	1785	optionsPanel.setName("Options");
1302	1786
1303		- AddOptions(optionsPanel, aConstraints);
	1787	+ AddOptions(optionsPanel); //, aConstraints);
1304	1788
	1789	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1790	+
1305	1791	tabbedPane.add(optionsPanel);
1306	1792
1307	1793	scenePanel.add(tabbedPane);
	1794	+
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
	1797	+
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ objectPanel.add(infoPanel);
	1888	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1889	+ objectPanel.setToolTipTextAt(4, "Information");
	1890	+ }
1308	1891
1309	1892	/*
1310	1893	cTree jTree = new cTree(null);
..	..	@@ -1326,13 +1909,13 @@
1326	1909	jtp.add(tree);
1327	1910	*/
1328	1911
1329		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1330		- bigPanel.setContinuousLayout(true);
1331		- bigPanel.setOneTouchExpandable(true);
1332		- bigPanel.setDividerLocation(0.8);
1333		- bigPanel.setDividerSize(15);
1334		- bigPanel.setResizeWeight(0.15);
1335		- bigPanel.setName("Scene");
	1912	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1913	+// bigPanel.setContinuousLayout(true);
	1914	+// bigPanel.setOneTouchExpandable(true);
	1915	+// bigPanel.setDividerLocation(0.8);
	1916	+// bigPanel.setDividerSize(15);
	1917	+// bigPanel.setResizeWeight(0.15);
	1918	+// bigPanel.setName("Scene");
1336	1919
1337	1920	//bigPanel.setLayout(new BorderLayout());
1338	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1367,7 +1950,7 @@
1367	1950	bigThree = new cGridBag();
1368	1951	bigThree.addComponent(scenePanel);
1369	1952	bigThree.addComponent(centralPanel);
1370		- bigThree.addComponent(XYZPanel);
	1953	+ //bigThree.addComponent(XYZPanel);
1371	1954
1372	1955	// // SIDE EFFECT!!!
1373	1956	// aConstraints.gridx = 0;
..	..	@@ -1376,16 +1959,33 @@
1376	1959	// aConstraints.gridheight = 1;
1377	1960
1378	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1379		- framePanel.setContinuousLayout(true);
1380		- framePanel.setOneTouchExpandable(true);
1381		- framePanel.setDividerLocation(0.8);
	1962	+
	1963	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1964	+ new java.beans.PropertyChangeListener()
	1965	+ {
	1966	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1967	+ {
	1968	+ if ((Integer)pce.getOldValue() == 1)
	1969	+ {
	1970	+ if (radio.layout != expandedLayout)
	1971	+ {
	1972	+ radio.layout = expandedLayout;
	1973	+ radio.layout.doClick();
	1974	+ }
	1975	+ }
	1976	+ }
	1977	+ });
	1978	+
	1979	+ framePanel.setContinuousLayout(false);
	1980	+ framePanel.setOneTouchExpandable(false);
	1981	+ //.setDividerLocation(0.8);
1382	1982	//framePanel.setDividerSize(15);
1383	1983	//framePanel.setResizeWeight(0.15);
1384	1984	framePanel.setName("Frame");
1385	1985
1386	1986	frame.getContentPane().setLayout(new BorderLayout());
1387	1987	/**/
1388		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1389	1989	//worldPane.add(bigPanel);
1390	1990	//worldPane.add(worldPanel);
1391	1991	/**/
..	..	@@ -1395,15 +1995,19 @@
1395	1995
1396	1996	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1397	1997
1398		- frame.setSize(1024, 768);
1399		- frame.show();
	1998	+ frame.setSize(1280, 860);
	1999	+
	2000	+ cameraView.requestFocusInWindow();
	2001	+
	2002	+// gridPanel.setDividerLocation(1.0);
	2003	+
	2004	+ frame.validate();
1400	2005
1401		- gridPanel.setDividerLocation(1.0);
	2006	+ frame.setVisible(true);
1402	2007
1403	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1404	2009	frame.addWindowListener(new WindowAdapter()
1405	2010	{
1406		-
1407	2011	public void windowClosing(WindowEvent e)
1408	2012	{
1409	2013	Close();
..	..	@@ -1411,7 +2015,7 @@
1411	2015	});
1412	2016	}
1413	2017
1414		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	2018	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1415	2019	{
1416	2020	}
1417	2021
..	..	@@ -1426,260 +2030,651 @@
1426	2030	ctrlPanel.removeAll();
1427	2031	}
1428	2032
1429		- void SetupMaterial(JPanel ctrlPanel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1430	2034	{
1431		- aConstraints.weighty = 0;
1432		- //aConstraints.weightx = 1;
1433		- /*
	2035	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2036	+
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2038	+ skin.setToolTipText("Skin");
	2039	+ skin.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ // Skin
	2047	+ colorField.setFloat(material.color);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
	2057	+ subsurfaceField.setFloat(material.subsurface);
	2058	+ selfshadowField.setFloat(material.diffuseness);
	2059	+ diffusenessField.setFloat(material.factor);
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ shadowbiasField.setFloat(material.shadowbias);
	2062	+ diffuseField.setFloat(material.diffuse);
	2063	+ specularField.setFloat(material.specular);
	2064	+
	2065	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2066	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2067	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2068	+
	2069	+ materialtouched = true;
	2070	+ applySelf();
	2071	+ }
	2072	+ });
	2073	+ presetpanel.add(skin);
	2074	+
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2076	+ lambert.setToolTipText("Diffuse");
	2077	+ lambert.addMouseListener(new MouseAdapter()
	2078	+ {
	2079	+ public void mouseClicked(MouseEvent e)
	2080	+ {
	2081	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2082	+ cMaterial material = object.material;
	2083	+
	2084	+ diffusenessField.setFloat(material.factor);
	2085	+ selfshadowField.setFloat(material.diffuseness);
	2086	+
	2087	+ materialtouched = true;
	2088	+ applySelf();
	2089	+ }
	2090	+ });
	2091	+ presetpanel.add(lambert);
	2092	+
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2094	+ diffuse2.setToolTipText("Diffuse2");
	2095	+ diffuse2.addMouseListener(new MouseAdapter()
	2096	+ {
	2097	+ public void mouseClicked(MouseEvent e)
	2098	+ {
	2099	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2100	+ cMaterial material = object.material;
	2101	+
	2102	+ diffusenessField.setFloat(material.factor);
	2103	+ selfshadowField.setFloat(material.diffuseness);
	2104	+
	2105	+ materialtouched = true;
	2106	+ applySelf();
	2107	+ }
	2108	+ });
	2109	+ presetpanel.add(diffuse2);
	2110	+
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2112	+ diffusemoon.setToolTipText("Moon");
	2113	+ diffusemoon.addMouseListener(new MouseAdapter()
	2114	+ {
	2115	+ public void mouseClicked(MouseEvent e)
	2116	+ {
	2117	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2118	+ cMaterial material = object.material;
	2119	+
	2120	+ diffusenessField.setFloat(material.factor);
	2121	+ selfshadowField.setFloat(material.diffuseness);
	2122	+
	2123	+ materialtouched = true;
	2124	+ applySelf();
	2125	+ }
	2126	+ });
	2127	+ presetpanel.add(diffusemoon);
	2128	+
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2130	+ diffusemoon2.setToolTipText("Moon2");
	2131	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2132	+ {
	2133	+ public void mouseClicked(MouseEvent e)
	2134	+ {
	2135	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2136	+ cMaterial material = object.material;
	2137	+
	2138	+ diffusenessField.setFloat(material.factor);
	2139	+ selfshadowField.setFloat(material.diffuseness);
	2140	+
	2141	+ materialtouched = true;
	2142	+ applySelf();
	2143	+ }
	2144	+ });
	2145	+ presetpanel.add(diffusemoon2);
	2146	+
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2148	+ diffusemoon3.setToolTipText("Moon3");
	2149	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2150	+ {
	2151	+ public void mouseClicked(MouseEvent e)
	2152	+ {
	2153	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2154	+ cMaterial material = object.material;
	2155	+
	2156	+ diffusenessField.setFloat(material.factor);
	2157	+ selfshadowField.setFloat(material.diffuseness);
	2158	+
	2159	+ materialtouched = true;
	2160	+ applySelf();
	2161	+ }
	2162	+ });
	2163	+ presetpanel.add(diffusemoon3);
	2164	+
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2166	+ diffusesheen.setToolTipText("Sheen");
	2167	+ diffusesheen.addMouseListener(new MouseAdapter()
	2168	+ {
	2169	+ public void mouseClicked(MouseEvent e)
	2170	+ {
	2171	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2172	+ cMaterial material = object.material;
	2173	+
	2174	+ sheenField.setFloat(material.sheen);
	2175	+
	2176	+ materialtouched = true;
	2177	+ applySelf();
	2178	+ }
	2179	+ });
	2180	+ presetpanel.add(diffusesheen);
	2181	+
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2183	+ rough.setToolTipText("Rough metal");
	2184	+ rough.addMouseListener(new MouseAdapter()
	2185	+ {
	2186	+ public void mouseClicked(MouseEvent e)
	2187	+ {
	2188	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2189	+ cMaterial material = object.material;
	2190	+
	2191	+ shininessField.setFloat(material.shininess);
	2192	+ velvetField.setFloat(material.velvet);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(rough);
	2199	+
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2201	+ rough2.setToolTipText("Medium metal");
	2202	+ rough2.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2207	+ cMaterial material = object.material;
	2208	+
	2209	+ shininessField.setFloat(material.shininess);
	2210	+ lightareaField.setFloat(material.lightarea);
	2211	+
	2212	+ materialtouched = true;
	2213	+ applySelf();
	2214	+ }
	2215	+ });
	2216	+ presetpanel.add(rough2);
	2217	+
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2219	+ shini0.setToolTipText("Shiny");
	2220	+ shini0.addMouseListener(new MouseAdapter()
	2221	+ {
	2222	+ public void mouseClicked(MouseEvent e)
	2223	+ {
	2224	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2225	+ cMaterial material = object.material;
	2226	+
	2227	+ shininessField.setFloat(material.shininess);
	2228	+ lightareaField.setFloat(material.lightarea);
	2229	+
	2230	+ materialtouched = true;
	2231	+ applySelf();
	2232	+ }
	2233	+ });
	2234	+ presetpanel.add(shini0);
	2235	+
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2237	+ shini1.setToolTipText("Shiny2");
	2238	+ shini1.addMouseListener(new MouseAdapter()
	2239	+ {
	2240	+ public void mouseClicked(MouseEvent e)
	2241	+ {
	2242	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2243	+ cMaterial material = object.material;
	2244	+
	2245	+ shininessField.setFloat(material.shininess);
	2246	+ lightareaField.setFloat(material.lightarea);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(shini1);
	2253	+
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2255	+ shini2.setToolTipText("Shiny3");
	2256	+ shini2.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2261	+ cMaterial material = object.material;
	2262	+
	2263	+ shininessField.setFloat(material.shininess);
	2264	+ lightareaField.setFloat(material.lightarea);
	2265	+
	2266	+ materialtouched = true;
	2267	+ applySelf();
	2268	+ }
	2269	+ });
	2270	+ presetpanel.add(shini2);
	2271	+
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2273	+ aniso.setToolTipText("AnisoU");
	2274	+ aniso.addMouseListener(new MouseAdapter()
	2275	+ {
	2276	+ public void mouseClicked(MouseEvent e)
	2277	+ {
	2278	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2279	+ cMaterial material = object.material;
	2280	+
	2281	+ anisoField.setFloat(material.aniso);
	2282	+ anisoVField.setFloat(material.anisoV);
	2283	+
	2284	+ materialtouched = true;
	2285	+ applySelf();
	2286	+ }
	2287	+ });
	2288	+ presetpanel.add(aniso);
	2289	+
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2291	+ aniso2.setToolTipText("AnisoV");
	2292	+ aniso2.addMouseListener(new MouseAdapter()
	2293	+ {
	2294	+ public void mouseClicked(MouseEvent e)
	2295	+ {
	2296	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2297	+ cMaterial material = object.material;
	2298	+
	2299	+ anisoField.setFloat(material.aniso);
	2300	+ anisoVField.setFloat(material.anisoV);
	2301	+
	2302	+ materialtouched = true;
	2303	+ applySelf();
	2304	+ }
	2305	+ });
	2306	+ presetpanel.add(aniso2);
	2307	+
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2309	+ aniso3.setToolTipText("AnisoUV");
	2310	+ aniso3.addMouseListener(new MouseAdapter()
	2311	+ {
	2312	+ public void mouseClicked(MouseEvent e)
	2313	+ {
	2314	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2315	+ cMaterial material = object.material;
	2316	+
	2317	+ anisoField.setFloat(material.aniso);
	2318	+ anisoVField.setFloat(material.anisoV);
	2319	+
	2320	+ materialtouched = true;
	2321	+ applySelf();
	2322	+ }
	2323	+ });
	2324	+ presetpanel.add(aniso3);
	2325	+
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2327	+ velvet0.setToolTipText("Velvet");
	2328	+ velvet0.addMouseListener(new MouseAdapter()
	2329	+ {
	2330	+ public void mouseClicked(MouseEvent e)
	2331	+ {
	2332	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2333	+ cMaterial material = object.material;
	2334	+
	2335	+ diffusenessField.setFloat(material.factor);
	2336	+ selfshadowField.setFloat(material.diffuseness);
	2337	+ sheenField.setFloat(material.sheen);
	2338	+ shininessField.setFloat(material.shininess);
	2339	+ velvetField.setFloat(material.velvet);
	2340	+ shiftField.setFloat(material.shift);
	2341	+
	2342	+ materialtouched = true;
	2343	+ applySelf();
	2344	+ }
	2345	+ });
	2346	+ presetpanel.add(velvet0);
	2347	+
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2349	+ bump0.setToolTipText("Bump texture");
	2350	+ bump0.addMouseListener(new MouseAdapter()
	2351	+ {
	2352	+ public void mouseClicked(MouseEvent e)
	2353	+ {
	2354	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2355	+ cMaterial material = object.material;
	2356	+
	2357	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2358	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2359	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2360	+
	2361	+ materialtouched = true;
	2362	+ applySelf();
	2363	+ }
	2364	+ });
	2365	+ presetpanel.add(bump0);
	2366	+
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2368	+ borderShader.setToolTipText("Border fade");
	2369	+ borderShader.addMouseListener(new MouseAdapter()
	2370	+ {
	2371	+ public void mouseClicked(MouseEvent e)
	2372	+ {
	2373	+ borderfadeField.setFloat(0.4);
	2374	+ opacityField.setFloat(0.75);
	2375	+
	2376	+ materialtouched = true;
	2377	+ applySelf();
	2378	+ }
	2379	+ });
	2380	+ presetpanel.add(borderShader);
	2381	+
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2383	+ halo.setToolTipText("Halo");
	2384	+ halo.addMouseListener(new MouseAdapter()
	2385	+ {
	2386	+ public void mouseClicked(MouseEvent e)
	2387	+ {
	2388	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2389	+ cMaterial material = object.material;
	2390	+
	2391	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2392	+
	2393	+ materialtouched = true;
	2394	+ applySelf();
	2395	+ }
	2396	+ });
	2397	+ presetpanel.add(halo);
	2398	+
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2400	+ candle.setToolTipText("Candle");
	2401	+ candle.addMouseListener(new MouseAdapter()
	2402	+ {
	2403	+ public void mouseClicked(MouseEvent e)
	2404	+ {
	2405	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2406	+ cMaterial material = object.material;
	2407	+
	2408	+ subsurfaceField.setFloat(material.subsurface);
	2409	+ shadowbiasField.setFloat(material.shadowbias);
	2410	+ ambientField.setFloat(material.ambient);
	2411	+ specularField.setFloat(material.specular);
	2412	+ lightareaField.setFloat(material.lightarea);
	2413	+ shininessField.setFloat(material.shininess);
	2414	+
	2415	+ materialtouched = true;
	2416	+ applySelf();
	2417	+ }
	2418	+ });
	2419	+ presetpanel.add(candle);
	2420	+
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2422	+ shadowShader.setToolTipText("Shadow");
	2423	+ shadowShader.addMouseListener(new MouseAdapter()
	2424	+ {
	2425	+ public void mouseClicked(MouseEvent e)
	2426	+ {
	2427	+ diffuseField.setFloat(0.001);
	2428	+ ambientField.setFloat(0.001);
	2429	+ cameraField.setFloat(0.001);
	2430	+ specularField.setFloat(0.001);
	2431	+ fakedepthField.setFloat(0.001);
	2432	+ opacityField.setFloat(0.4);
	2433	+
	2434	+ materialtouched = true;
	2435	+ applySelf();
	2436	+ }
	2437	+ });
	2438	+ presetpanel.add(shadowShader);
	2439	+
	2440	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2441	+ para0.setToolTipText("No parallax");
	2442	+ para0.addMouseListener(new MouseAdapter()
	2443	+ {
	2444	+ public void mouseClicked(MouseEvent e)
	2445	+ {
	2446	+ parallaxField.setFloat(0.125);
	2447	+
	2448	+ materialtouched = true;
	2449	+ applySelf();
	2450	+ }
	2451	+ });
	2452	+ presetpanel.add(para0);
	2453	+
	2454	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2455	+ para1.setToolTipText("With parallax");
	2456	+ para1.addMouseListener(new MouseAdapter()
	2457	+ {
	2458	+ public void mouseClicked(MouseEvent e)
	2459	+ {
	2460	+ parallaxField.setFloat(0.13);
	2461	+
	2462	+ materialtouched = true;
	2463	+ applySelf();
	2464	+ }
	2465	+ });
	2466	+ presetpanel.add(para1);
	2467	+
	2468	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2469	+ para2.setToolTipText("Reset parallax");
	2470	+ para2.addMouseListener(new MouseAdapter()
	2471	+ {
	2472	+ public void mouseClicked(MouseEvent e)
	2473	+ {
	2474	+ parallaxField.setFloat(0.14);
	2475	+
	2476	+ materialtouched = true;
	2477	+ applySelf();
	2478	+ }
	2479	+ });
	2480	+ presetpanel.add(para2);
	2481	+
	2482	+ cGridBag panel = new cGridBag().setVertical(true);
	2483	+
	2484	+ presetpanel.preferredWidth = 1;
	2485	+
	2486	+ materialpanel.add(presetpanel);
	2487	+ materialpanel.add(panel);
	2488	+
	2489	+ panel.preferredWidth = 8;
	2490	+
	2491	+ /*
1434	2492	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1435	2493	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1436		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1437		- aConstraints.gridx += 1;
1438		- */
	2494	+ */
1439	2495
1440		- aConstraints.gridwidth = 1;
1441		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
	2496	+ cGridBag editBar = new cGridBag().setVertical(false);
	2497	+
	2498	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
	2499	+ createMaterialButton.setToolTipText("Create material");
1445	2500
1446	2501	/*
1447	2502	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1448		- aConstraints.gridx += 1;
1449		- aConstraints.weighty = 0;
1450		- aConstraints.gridwidth = 1;
1451	2503	*/
1452	2504
1453		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1454		- aConstraints.gridx += 1;
	2505	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
	2506	+ clearMaterialButton.setToolTipText("Clear material");
	2507	+
	2508	+ if (Globals.ADVANCED)
	2509	+ {
	2510	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
	2511	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2512	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2513	+ }
1455	2514
1456		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1457		-
1458		- aConstraints.gridx += 1;
1459		-
1460		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1461		-
1462		- aConstraints.gridx += 1;
1463		-
1464		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1465		-
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.weighty = 0;
1469		- aConstraints.gridwidth = 1;
	2515	+ editBar.preferredHeight = 15;
	2516	+
	2517	+ panel.add(editBar);
	2518	+
1470	2519	/**/
1471	2520	//aConstraints.weighty = 0;
1472	2521	////aConstraints.weightx = 1;
1473	2522	//aConstraints.weighty = 1;
1474	2523	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1475	2524	//aConstraints.gridx += 1;
1476		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1477		- aConstraints.weighty = 0;
1478		- aConstraints.gridx = 0;
1479		- aConstraints.gridy += 1;
1480		- aConstraints.gridwidth = 1;
	2525	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1481	2526
1482		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1483		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1485		- aConstraints.gridx += 1;
1486		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1487		- //aConstraints.weightx = 0;
1488		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1489		- aConstraints.gridx = 0;
1490		- aConstraints.gridy += 1;
1491		- aConstraints.gridwidth = 1;
	2527	+ cGridBag colorSection = new cGridBag().setVertical(true);
1492	2528
1493		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1494		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1495		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1496		- aConstraints.gridx += 1;
1497		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1498		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1499		- aConstraints.gridx = 0;
1500		- aConstraints.gridy += 1;
1501		- aConstraints.gridwidth = 1;
	2529	+ cGridBag huepanel = new cGridBag();
	2530	+ cGridBag huelabel = new cGridBag();
	2531	+ cLabel hue = GetLabel("icons/hue.png", false);
	2532	+ hue.fit = true;
	2533	+
	2534	+ hue.addMouseListener(new MouseAdapter()
	2535	+ {
	2536	+ public void mousePressed(MouseEvent e)
	2537	+ {
	2538	+ int x = e.getX();
	2539	+
	2540	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2541	+ }
	2542	+ });
	2543	+
	2544	+ huelabel.add(hue);
	2545	+ huelabel.preferredWidth = 20;
	2546	+ huepanel.add(new cGridBag()); // Label
	2547	+ huepanel.add(huelabel); // Field/slider
	2548	+
	2549	+ huepanel.preferredHeight = 7;
1502	2550
1503		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1504		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1505		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1506		- aConstraints.gridx += 1;
1507		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1508		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	2551	+ colorSection.add(huepanel);
	2552	+
	2553	+ cGridBag color = new cGridBag();
	2554	+
	2555	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2556	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2557	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1512	2558
1513		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1514		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	2559	+ //colorField.preferredWidth = 200;
	2560	+ colorSection.add(color);
1522	2561
1523		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1524		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	2562	+ cGridBag modulation = new cGridBag();
	2563	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2564	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2565	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2566	+ colorSection.add(modulation);
1532	2567
1533		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1534		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	2568	+ cGridBag opacity = new cGridBag();
	2569	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2570	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2571	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2572	+ colorSection.add(opacity);
1542	2573
1543		- //aConstraints.weighty = 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1545		- //aConstraints.gridx += 1;
1546		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1547		- aConstraints.weighty = 0;
1548		- aConstraints.gridx = 0;
1549		- aConstraints.gridy += 1;
1550		- aConstraints.gridwidth = 1;
	2574	+ colorSection.add(GetSeparator());
	2575	+
	2576	+ cGridBag texture = new cGridBag();
	2577	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2578	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2579	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2580	+ colorSection.add(texture);
1551	2581
1552		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1553		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1555		- aConstraints.gridx += 1;
1556		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1557		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1558		- aConstraints.gridx = 0;
1559		- aConstraints.gridy += 1;
1560		- aConstraints.gridwidth = 1;
	2582	+ panel.add(GetSeparator());
	2583	+
	2584	+ panel.add(colorSection);
	2585	+
	2586	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2587	+
	2588	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2589	+
	2590	+ cGridBag diffuse = new cGridBag();
	2591	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2592	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2593	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2594	+ diffuseSection.add(diffuse);
1561	2595
1562		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1563		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1564		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1565		- aConstraints.gridx += 1;
1566		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1567		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1568		- aConstraints.gridx = 0;
1569		- aConstraints.gridy += 1;
1570		- aConstraints.gridwidth = 1;
	2596	+ cGridBag diffuseness = new cGridBag();
	2597	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2598	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2599	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2600	+ diffuseSection.add(diffuseness);
1571	2601
1572		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1573		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1574		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1575		- aConstraints.gridx += 1;
1576		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1577		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1578		- aConstraints.gridx = 0;
1579		- aConstraints.gridy += 1;
1580		- aConstraints.gridwidth = 1;
	2602	+ cGridBag selfshadow = new cGridBag();
	2603	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2604	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2605	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2606	+ diffuseSection.add(selfshadow);
1581	2607
1582		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1583		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1585		- aConstraints.gridx += 1;
1586		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1587		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	2608	+ cGridBag sheen = new cGridBag();
	2609	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2610	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2611	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2612	+ diffuseSection.add(sheen);
1591	2613
1592		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1593		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	2614	+ cGridBag subsurface = new cGridBag();
	2615	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2616	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2617	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2618	+ diffuseSection.add(subsurface);
1601	2619
1602		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1603		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	2620	+ cGridBag shadow = new cGridBag();
	2621	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2622	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2623	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2624	+ diffuseSection.add(shadow);
1611	2625
1612		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1613		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
	2626	+ cGridBag fakedepth = new cGridBag();
	2627	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2628	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2629	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2630	+ diffuseSection.add(fakedepth);
1621	2631
1622		- //aConstraints.weighty = 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1624		- //aConstraints.gridx += 1;
1625		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1626		- aConstraints.weighty = 0;
1627		- aConstraints.gridx = 0;
1628		- aConstraints.gridy += 1;
1629		- aConstraints.gridwidth = 1;
	2632	+ cGridBag shadowbias = new cGridBag();
	2633	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2634	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2635	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2636	+ diffuseSection.add(shadowbias);
1630	2637
1631		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1632		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1633		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1634		- aConstraints.gridx += 1;
1635		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1636		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1637		- aConstraints.gridx = 0;
1638		- aConstraints.gridy += 1;
1639		- aConstraints.gridwidth = 1;
	2638	+ panel.add(GetSeparator());
	2639	+
	2640	+ panel.add(diffuseSection);
	2641	+
	2642	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2643	+
	2644	+ cGridBag specularSection = new cGridBag().setVertical(true);
1640	2645
1641		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1642		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1643		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1644		- aConstraints.gridx += 1;
1645		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1646		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1647		- aConstraints.gridx = 0;
1648		- aConstraints.gridy += 1;
1649		- aConstraints.gridwidth = 1;
	2646	+ cGridBag specular = new cGridBag();
	2647	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2648	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2649	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2650	+ specularSection.add(specular);
1650	2651
1651		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1652		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1654		- aConstraints.gridx += 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1656		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1657		- aConstraints.gridx = 0;
1658		- aConstraints.gridy += 1;
1659		- aConstraints.gridwidth = 1;
	2652	+ cGridBag lightarea = new cGridBag();
	2653	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2654	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2655	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2656	+ specularSection.add(lightarea);
1660	2657
1661		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1662		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1664		- aConstraints.gridx += 1;
1665		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1666		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1667		- aConstraints.gridx = 0;
1668		- aConstraints.gridy += 1;
1669		- aConstraints.gridwidth = 1;
	2658	+ cGridBag shininess = new cGridBag();
	2659	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2660	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2661	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2662	+ specularSection.add(shininess);
1670	2663
1671		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1672		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1673		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1674		- aConstraints.gridx += 1;
1675		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1676		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1677		- aConstraints.gridx = 0;
1678		- aConstraints.gridy += 1;
1679		- aConstraints.gridwidth = 1;
	2664	+ cGridBag metalness = new cGridBag();
	2665	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2666	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2667	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2668	+ specularSection.add(metalness);
1680	2669
1681		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1682		- Return();
	2670	+ cGridBag velvet = new cGridBag();
	2671	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2672	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2673	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2674	+ specularSection.add(velvet);
	2675	+
	2676	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2677	+ //Return();
1683	2678	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1684	2679	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685	2680	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1690,130 +2685,105 @@
1690	2685	// aConstraints.gridy += 1;
1691	2686	// aConstraints.gridwidth = 1;
1692	2687
1693		- //aConstraints.weighty = 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1695		- //aConstraints.gridx += 1;
1696		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1697		- aConstraints.weighty = 0;
1698		- aConstraints.gridx = 0;
1699		- aConstraints.gridy += 1;
1700		- aConstraints.gridwidth = 1;
	2688	+ cGridBag anisoU = new cGridBag();
	2689	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2690	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2691	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2692	+ specularSection.add(anisoU);
1701	2693
1702		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1703		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1704		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1705		- aConstraints.gridx += 1;
1706		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1707		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1708		- aConstraints.gridx = 0;
1709		- aConstraints.gridy += 1;
1710		- aConstraints.gridwidth = 1;
	2694	+ cGridBag anisoV = new cGridBag();
	2695	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2696	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2697	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2698	+ specularSection.add(anisoV);
1711	2699
1712		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1713		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1715		- aConstraints.gridx += 1;
1716		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1717		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1718		- aConstraints.gridx = 0;
1719		- aConstraints.gridy += 1;
1720		- aConstraints.gridwidth = 1;
1721	2700
1722		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1723		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1724		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1725		- aConstraints.gridx += 1;
1726		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1727		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1728		- aConstraints.gridx = 0;
1729		- aConstraints.gridy += 1;
1730		- aConstraints.gridwidth = 1;
	2701	+ panel.add(GetSeparator());
	2702	+
	2703	+ panel.add(specularSection);
	2704	+
	2705	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2706	+
	2707	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1731	2708
1732		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1733		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1734		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1735		- aConstraints.gridx += 1;
1736		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1737		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1738		- aConstraints.gridx = 0;
1739		- aConstraints.gridy += 1;
1740		- aConstraints.gridwidth = 1;
1741		- aConstraints.weighty = 0;
	2709	+ cGridBag camera = new cGridBag();
	2710	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2711	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2712	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2713	+ colorSection.add(camera);
1742	2714
1743		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1744		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1745		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1746		- aConstraints.gridx += 1;
1747		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1748		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1749		- aConstraints.gridx = 0;
1750		- aConstraints.gridy += 1;
1751		- aConstraints.gridwidth = 1;
	2715	+ cGridBag ambient = new cGridBag();
	2716	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2717	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2718	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2719	+ colorSection.add(ambient);
1752	2720
1753		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1754		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1755		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1756		- aConstraints.gridx += 1;
1757		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1758		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1759		- aConstraints.gridx = 0;
1760		- aConstraints.gridy += 1;
1761		- aConstraints.gridwidth = 1;
	2721	+ cGridBag backlit = new cGridBag();
	2722	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2723	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2724	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2725	+ colorSection.add(backlit);
1762	2726
1763		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1764		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1765		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1766		- aConstraints.gridx += 1;
1767		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1768		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1769		- aConstraints.gridx = 0;
1770		- aConstraints.gridy += 1;
1771		- aConstraints.gridwidth = 1;
	2727	+ cGridBag parallax = new cGridBag();
	2728	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2729	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2730	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2731	+ colorSection.add(parallax);
	2732	+
	2733	+ //panel.add(new JSeparator());
	2734	+
	2735	+ //panel.add(globalSection);
	2736	+
	2737	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2738	+
	2739	+ cGridBag textureSection = new cGridBag().setVertical(true);
1772	2740
1773		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1774		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1775		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1776		- aConstraints.gridx += 1;
1777		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1778		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1779		- aConstraints.gridx = 0;
1780		- aConstraints.gridy += 1;
1781		- aConstraints.gridwidth = 1;
	2741	+ cGridBag bump = new cGridBag();
	2742	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2743	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2744	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2745	+ textureSection.add(bump);
1782	2746
1783		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1784		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1785		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1786		- aConstraints.gridx += 1;
1787		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1788		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1789		- aConstraints.gridx = 0;
1790		- aConstraints.gridy += 1;
1791		- aConstraints.gridwidth = 1;
	2747	+ cGridBag noise = new cGridBag();
	2748	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2749	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2750	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2751	+ textureSection.add(noise);
1792	2752
1793		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1794		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1795		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1796		- aConstraints.gridx += 1;
1797		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1798		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1799		- aConstraints.gridx = 0;
1800		- aConstraints.gridy += 1;
1801		- aConstraints.gridwidth = 1;
	2753	+ cGridBag power = new cGridBag();
	2754	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2755	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2756	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2757	+ textureSection.add(power);
1802	2758
1803		- //aConstraints.weighty = 1;
1804		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1805		- //aConstraints.gridx += 1;
1806		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1807		- aConstraints.weighty = 0;
	2759	+ cGridBag borderfade = new cGridBag();
	2760	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2761	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2762	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2763	+ textureSection.add(borderfade);
1808	2764
1809		- aConstraints.gridx = 0;
1810		- aConstraints.gridy = 0;
1811		- aConstraints.gridwidth = 1;
	2765	+ cGridBag fog = new cGridBag();
	2766	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2767	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2768	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2769	+ textureSection.add(fog);
	2770	+
	2771	+ cGridBag opacityPower = new cGridBag();
	2772	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2773	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2774	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2775	+ textureSection.add(opacityPower);
	2776	+
	2777	+ panel.add(GetSeparator());
	2778	+
	2779	+ panel.add(textureSection);
	2780	+
	2781	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1812	2782
1813	2783	SetMaterial(copy); // .GetMaterial());
1814	2784
1815		- colorField.addChangeListener(this);
1816		- modulationField.addChangeListener(this);
	2785	+ //colorField.addChangeListener(this);
	2786	+// modulationField.addChangeListener(this);
1817	2787	metalnessField.addChangeListener(this);
1818	2788	diffuseField.addChangeListener(this);
1819	2789	specularField.addChangeListener(this);
..	..	@@ -1843,12 +2813,15 @@
1843	2813	opacityPowerField.addChangeListener(this);
1844	2814	/**/
1845	2815
1846		- resetSlidersButton.addActionListener(this);
1847	2816	clearMaterialButton.addActionListener(this);
1848	2817	createMaterialButton.addActionListener(this);
1849		-
1850		- propagateToggle.addItemListener(this);
1851		- multiplyToggle.addItemListener(this);
	2818	+
	2819	+ if (Globals.ADVANCED)
	2820	+ {
	2821	+ resetSlidersButton.addActionListener(this);
	2822	+ propagateToggle.addItemListener(this);
	2823	+ multiplyToggle.addItemListener(this);
	2824	+ }
1852	2825	}
1853	2826
1854	2827	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1866,8 +2839,9 @@
1866	2839	// 3D models
1867	2840	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1868	2841	{
1869		- lastConverter = new com.jmex.model.converters.MaxToJme();
1870		- LoadFile(filename, lastConverter);
	2842	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2843	+ //LoadFile(filename, lastConverter);
	2844	+ LoadObjFile(filename); // New 3ds loader
1871	2845	continue;
1872	2846	}
1873	2847	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2019,7 +2993,7 @@
2019	2993
2020	2994	//? flashIt = false;
2021	2995	CameraPane pane = (CameraPane) cameraView;
2022		- pane.clickStart(location.x, location.y, 0);
	2996	+ pane.clickStart(location.x, location.y, 0, 0);
2023	2997	pane.clickEnd(location.x, location.y, 0, true);
2024	2998
2025	2999	if (group.selection.size() == 1)
..	..	@@ -2068,6 +3042,7 @@
2068	3042	e2.printStackTrace();
2069	3043	}
2070	3044	}
	3045	+
2071	3046	LoadJMEThread loadThread;
2072	3047
2073	3048	class LoadJMEThread extends Thread
..	..	@@ -2125,6 +3100,7 @@
2125	3100	//LoadFile0(filename, converter);
2126	3101	}
2127	3102	}
	3103	+
2128	3104	LoadOBJThread loadObjThread;
2129	3105
2130	3106	class LoadOBJThread extends Thread
..	..	@@ -2203,19 +3179,19 @@
2203	3179
2204	3180	void LoadObjFile(String fullname)
2205	3181	{
2206		- /*
	3182	+ System.out.println("Loading " + fullname);
	3183	+ /**/
2207	3184	//lastFilename = fullname;
2208	3185	if(loadObjThread == null)
2209	3186	{
2210		- loadObjThread = new LoadOBJThread();
2211		- loadObjThread.start();
	3187	+ loadObjThread = new LoadOBJThread();
	3188	+ loadObjThread.start();
2212	3189	}
2213	3190
2214	3191	loadObjThread.add(fullname);
2215		- */
	3192	+ /**/
2216	3193
2217		- System.out.println("Loading " + fullname);
2218		- makeSomething(new FileObject(fullname, true), true);
	3194	+ //makeSomething(new FileObject(fullname, true), true);
2219	3195	}
2220	3196
2221	3197	void LoadGFDFile(String fullname)
..	..	@@ -2476,11 +3452,11 @@
2476	3452
2477	3453	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2478	3454	{
2479		- if (GrafreeD.standAlone)
	3455	+ if (Grafreed.standAlone)
2480	3456	{
2481	3457	/**/
2482	3458	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2483		- browser.show();
	3459	+ browser.setVisible(true);
2484	3460	String filename = browser.getFile();
2485	3461	if (filename != null && filename.length() > 0)
2486	3462	{
..	..	@@ -2591,6 +3567,7 @@
2591	3567	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2592	3568	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2593	3569	}
	3570	+
2594	3571	//cJME.count++;
2595	3572	//cJME.count %= 12;
2596	3573	if (gc)
..	..	@@ -2625,6 +3602,7 @@
2625	3602	}
2626	3603	if (input == null)
2627	3604	{
	3605	+ new Exception().printStackTrace();
2628	3606	System.exit(0);
2629	3607	}
2630	3608
..	..	@@ -2773,6 +3751,7 @@
2773	3751	}
2774	3752	}
2775	3753	}
	3754	+
2776	3755	cFileSystemPane FSPane;
2777	3756
2778	3757	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2782,7 +3761,7 @@
2782	3761
2783	3762	freezematerial = true;
2784	3763	colorField.setFloat(mat.color);
2785		- modulationField.setFloat(mat.modulation);
	3764	+ saturationField.setFloat(mat.modulation);
2786	3765	metalnessField.setFloat(mat.metalness);
2787	3766	diffuseField.setFloat(mat.diffuse);
2788	3767	specularField.setFloat(mat.specular);
..	..	@@ -2802,6 +3781,7 @@
2802	3781	shadowField.setFloat(mat.shadow);
2803	3782	textureField.setFloat(mat.texture);
2804	3783	opacityField.setFloat(mat.opacity);
	3784	+ parallaxField.setFloat(mat.parallax + 0.125f);
2805	3785	fakedepthField.setFloat(mat.fakedepth);
2806	3786	shadowbiasField.setFloat(mat.shadowbias);
2807	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -2826,11 +3806,14 @@
2826	3806	}
2827	3807	}
2828	3808	}
	3809	+
2829	3810	freezematerial = false;
2830	3811	}
2831	3812
2832	3813	void SetMaterial(Object3D object)
2833	3814	{
	3815	+ latestObject = object;
	3816	+
2834	3817	cMaterial mat = object.material;
2835	3818
2836	3819	if (mat == null)
..	..	@@ -2839,33 +3822,10 @@
2839	3822	return;
2840	3823	}
2841	3824
2842		- multiplyToggle.setSelected(mat.multiply);
2843		-
2844		- assert (object.projectedVertices != null);
2845		-
2846		- if (object.projectedVertices.length <= 2)
2847		- {
2848		- // Side effect...
2849		- Object3D.cVector2[] keep = object.projectedVertices;
2850		- object.projectedVertices = new Object3D.cVector2[3];
2851		- for (int i = 0; i < 3; i++)
2852		- {
2853		- if (i < keep.length)
2854		- {
2855		- object.projectedVertices[i] = keep[i];
2856		- } else
2857		- {
2858		- object.projectedVertices[i] = new Object3D.cVector2();
2859		- }
2860		- /*
2861		- if(keep.length == 0)
2862		- object.projectedVertices[0] = new Object3D.cVector2();
2863		- else
2864		- object.projectedVertices[0] = keep[0];
2865		- object.projectedVertices[1] = new Object3D.cVector2();
2866		- */
2867		- }
2868		- }
	3825	+ if (multiplyToggle != null)
	3826	+ multiplyToggle.setSelected(mat.multiply);
	3827	+
	3828	+ AllocProjectedVertices(object);
2869	3829
2870	3830	SetMaterial(mat, object.projectedVertices);
2871	3831	}
..	..	@@ -2941,12 +3901,17 @@
2941	3901	// }
2942	3902
2943	3903	/**/
2944		- if (deselect)
	3904	+ if (deselect \|\| child == null)
2945	3905	{
2946	3906	//group.deselectAll();
2947	3907	//freeze = true;
2948	3908	GetTree().clearSelection();
2949	3909	//freeze = false;
	3910	+
	3911	+ if (child == null)
	3912	+ {
	3913	+ return;
	3914	+ }
2950	3915	}
2951	3916
2952	3917	//group.addSelectee(child);
..	..	@@ -2980,6 +3945,17 @@
2980	3945	public void itemStateChanged(ItemEvent event)
2981	3946	{
2982	3947	// System.out.println("Propagate = " + propagate);
	3948	+ if (event.getSource() == pinButton)
	3949	+ {
	3950	+ copy.pinned ^= true;
	3951	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3952	+ {
	3953	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3954	+ copy.CloseUI();
	3955	+ //copy.editWindow.refreshContents();
	3956	+ }
	3957	+ }
	3958	+ else
2983	3959	if (event.getSource() == propagateToggle)
2984	3960	{
2985	3961	propagate ^= true;
..	..	@@ -3015,7 +3991,7 @@
3015	3991	cameraView.ToggleDL();
3016	3992	cameraView.repaint();
3017	3993	return;
3018		- } else if (event.getSource() == toggleTextureItem)
	3994	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3019	3995	{
3020	3996	cameraView.ToggleTexture();
3021	3997	// june 2013 copy.HardTouch();
..	..	@@ -3054,9 +4030,9 @@
3054	4030	frame.validate();
3055	4031
3056	4032	return;
3057		- } else if (event.getSource() == toggleRandomItem)
	4033	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3058	4034	{
3059		- cameraView.ToggleRandom();
	4035	+ cameraView.ToggleSwitch();
3060	4036	cameraView.repaint();
3061	4037	return;
3062	4038	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3084,21 +4060,28 @@
3084	4060	} else if (event.getSource() == liveCB)
3085	4061	{
3086	4062	copy.live ^= true;
	4063	+ objEditor.refreshContents(true); // To show item colors
	4064	+ return;
	4065	+ } else if (event.getSource() == selectableCB)
	4066	+ {
	4067	+ copy.dontselect ^= true;
3087	4068	return;
3088	4069	} else if (event.getSource() == hideCB)
3089	4070	{
3090	4071	copy.hide ^= true;
3091	4072	copy.Touch(); // display list issue
3092		- objEditor.refreshContents();
	4073	+ objEditor.refreshContents(true); // To show item colors
3093	4074	return;
3094	4075	} else if (event.getSource() == link2masterCB)
3095	4076	{
3096	4077	copy.link2master ^= true;
	4078	+ objEditor.refreshContents();
3097	4079	return;
3098	4080	}
3099	4081	if (event.getSource() == randomCB)
3100	4082	{
3101	4083	copy.random ^= true;
	4084	+ objEditor.refreshContents();
3102	4085	return;
3103	4086	}
3104	4087	if (event.getSource() == speedupCB)
..	..	@@ -3122,8 +4105,9 @@
3122	4105
3123	4106	public void actionPerformed(ActionEvent event)
3124	4107	{
	4108	+ Object source = event.getSource();
3125	4109	// SCRIPT DIALOG
3126		- if (event.getSource() == okbutton)
	4110	+ if (source == okbutton)
3127	4111	{
3128	4112	textpanel.setVisible(false);
3129	4113	textpanel.remove(textarea);
..	..	@@ -3135,7 +4119,7 @@
3135	4119	textarea = null;
3136	4120	textpanel = null;
3137	4121	}
3138		- if (event.getSource() == cancelbutton)
	4122	+ if (source == cancelbutton)
3139	4123	{
3140	4124	textpanel.setVisible(false);
3141	4125	textpanel.remove(textarea);
..	..	@@ -3147,50 +4131,50 @@
3147	4131	//applySelf();
3148	4132	//client.refreshEditWindow();
3149	4133	//refreshContents();
3150		- if (event.getSource() == nameField)
	4134	+ if (source == nameField)
3151	4135	{
3152	4136	//System.out.println("ObjEditor " + event);
3153	4137	applySelf0(true);
3154	4138	//parent.applySelf();
3155		- objEditor.refreshContents();
3156		- } else if (event.getSource() == resetButton)
	4139	+ // conflicts with requestFocus objEditor.refreshContents();
	4140	+ } else if (source == resetButton)
3157	4141	{
3158	4142	CameraPane.fullreset = true;
3159	4143	copy.Reset(); // ResetMeshes();
3160	4144	copy.Touch();
3161	4145	objEditor.refreshContents();
3162		- } else if (event.getSource() == stepItem)
	4146	+ } else if (source == stepItem)
3163	4147	{
3164	4148	//cameraView.ONESTEP = true;
3165	4149	Globals.ONESTEP = true;
3166	4150	cameraView.repaint();
3167	4151	return;
3168		- } else if (event.getSource() == stepButton)
	4152	+ } else if (source == stepButton)
3169	4153	{
3170	4154	copy.Step();
3171	4155	copy.Touch();
3172	4156	objEditor.refreshContents();
3173		- } else if (event.getSource() == slowerButton)
	4157	+ } else if (source == slowerButton)
3174	4158	{
3175	4159	copy.Slower();
3176	4160	copy.Touch();
3177	4161	objEditor.refreshContents();
3178		- } else if (event.getSource() == fasterButton)
	4162	+ } else if (source == fasterButton)
3179	4163	{
3180	4164	copy.Faster();
3181	4165	copy.Touch();
3182	4166	objEditor.refreshContents();
3183		- } else if (event.getSource() == remarkButton)
	4167	+ } else if (source == remarkButton)
3184	4168	{
3185	4169	copy.Remark();
3186	4170	copy.Touch();
3187	4171	objEditor.refreshContents();
3188		- } else if (event.getSource() == stepAllButton)
	4172	+ } else if (source == stepAllButton)
3189	4173	{
3190	4174	copy.StepAll();
3191	4175	copy.Touch();
3192	4176	objEditor.refreshContents();
3193		- } else if (event.getSource() == resetAllButton)
	4177	+ } else if (source == resetAllButton)
3194	4178	{
3195	4179	//CameraPane.fullreset = true;
3196	4180	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3223,53 +4207,79 @@
3223	4207	// Close();
3224	4208	// }
3225	4209	// else
3226		- if (event.getSource() == resetSlidersButton)
	4210	+ if (source == resetSlidersButton)
3227	4211	{
3228	4212	ResetSliders();
3229		- } else if (event.getSource() == clearMaterialButton)
	4213	+ } else if (source == clearMaterialButton)
3230	4214	{
3231	4215	ClearMaterial();
3232		- } else if (event.getSource() == createMaterialButton)
	4216	+ } else if (source == createMaterialButton)
3233	4217	{
3234	4218	CreateMaterial();
3235		- } else if (event.getSource() == clearPanelButton)
	4219	+ } else if (source == clearPanelButton)
3236	4220	{
3237	4221	copy.ClearUI();
3238	4222	refreshContents(true);
3239		- } /*
3240		- }
3241		-
3242		- public boolean action(Event event, Object arg)
3243		- {
3244		- */ else if (event.getSource() == closeItem)
	4223	+ } else if (source == importGFDItem)
	4224	+ {
	4225	+ ImportGFD();
	4226	+ } else
	4227	+ if (source == importVRMLX3DItem)
	4228	+ {
	4229	+ ImportVRMLX3D();
	4230	+ } else
	4231	+ if (source == import3DSItem)
	4232	+ {
	4233	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4234	+ } else
	4235	+ if (source == importOBJItem)
	4236	+ {
	4237	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4238	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4239	+ browser.setVisible(true);
	4240	+ String filename = browser.getFile();
	4241	+ if (filename != null && filename.length() > 0)
	4242	+ {
	4243	+ String fullname = browser.getDirectory() + filename;
	4244	+ makeSomething(ReadOBJ(fullname), true);
	4245	+ }
	4246	+ } else
	4247	+ if (source == closeItem)
3245	4248	{
3246	4249	Close();
3247	4250	//return true;
3248		- } else if (event.getSource() == loadItem)
	4251	+ } else if (source == openItem)
3249	4252	{
3250		- load();
	4253	+ Open();
3251	4254	//return true;
3252		- } else if (event.getSource() == saveItem)
	4255	+ } else if (source == newItem)
	4256	+ {
	4257	+ New();
	4258	+ } else if (source == saveItem)
3253	4259	{
3254	4260	save();
3255	4261	//return true;
3256		- } else if (event.getSource() == saveAsItem)
	4262	+ } else if (source == saveAsItem)
3257	4263	{
3258	4264	saveAs();
3259	4265	//return true;
3260		- } else if (event.getSource() == reexportItem)
	4266	+ } else if (source == reexportItem)
3261	4267	{
3262	4268	reexport();
3263	4269	//return true;
3264		- } else if (event.getSource() == exportAsItem)
	4270	+ } else if (source == exportAsItem)
3265	4271	{
3266	4272	export();
3267	4273	//return true;
3268		- } else if (event.getSource() == povItem)
	4274	+ } else if (source == povItem)
3269	4275	{
3270	4276	generatePOV();
3271	4277	//return true;
3272		- } else if (event.getSource() == zBufferItem)
	4278	+ } else if (event.getSource() == archiveItem)
	4279	+ {
	4280	+ cTools.Archive(frame);
	4281	+ return;
	4282	+ } else if (source == zBufferItem)
3273	4283	{
3274	4284	try
3275	4285	{
..	..	@@ -3291,21 +4301,8 @@
3291	4301	cameraView.repaint();
3292	4302	//return true;
3293	4303	}
3294		- */ else if (event.getSource() == editCameraItem)
3295		- {
3296		- cameraView.ProtectCamera();
3297		- cameraView.repaint();
3298		- return;
3299		- } else if (event.getSource() == revertCameraItem)
3300		- {
3301		- cameraView.RevertCamera();
3302		- cameraView.repaint();
3303		- return;
3304		-// } else if (event.getSource() == textureButton)
3305		-// {
3306		-// return; // true;
3307		- } else // combos...
3308		- if (event.getSource() == texresMenu)
	4304	+ */ else // combos...
	4305	+ if (source == texresMenu)
3309	4306	{
3310	4307	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3311	4308	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3317,12 +4314,504 @@
3317	4314	}
3318	4315	}
3319	4316
	4317	+ void New()
	4318	+ {
	4319	+ while (copy.Size() > 0)
	4320	+ {
	4321	+ copy.remove(0);
	4322	+ }
	4323	+
	4324	+ copy.selection.clear();
	4325	+
	4326	+ if (copy == Grafreed.grafreed.universe)
	4327	+ {
	4328	+ CreateCameras();
	4329	+ cameraView.SetCamera(GetCamera(copy, 0));
	4330	+ }
	4331	+ ResetModel();
	4332	+ objEditor.refreshContents();
	4333	+ }
	4334	+
	4335	+ static public byte[] Compress(Object3D o)
	4336	+ {
	4337	+ // Slower to actually compress.
	4338	+ try
	4339	+ {
	4340	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4341	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4342	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4343	+
	4344	+ Object3D parent = o.parent;
	4345	+ o.parent = null;
	4346	+
	4347	+ out.writeObject(o);
	4348	+
	4349	+ o.parent = parent;
	4350	+
	4351	+ out.flush();
	4352	+
	4353	+ baos //zstream
	4354	+ .close();
	4355	+ out.close();
	4356	+
	4357	+ byte[] bytes = baos.toByteArray();
	4358	+
	4359	+ System.out.println("save #bytes = " + bytes.length);
	4360	+ return bytes;
	4361	+ } catch (Exception e)
	4362	+ {
	4363	+ System.err.println(e);
	4364	+ return null;
	4365	+ }
	4366	+ }
	4367	+
	4368	+ static public Object Uncompress(byte[] bytes)
	4369	+ {
	4370	+ System.out.println("restore #bytes = " + bytes.length);
	4371	+ try
	4372	+ {
	4373	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4374	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4375	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4376	+ Object obj = in.readObject();
	4377	+
	4378	+ bais //istream
	4379	+ .close();
	4380	+ in.close();
	4381	+
	4382	+ return obj;
	4383	+ } catch (Exception e)
	4384	+ {
	4385	+ System.err.println(e);
	4386	+ return null;
	4387	+ }
	4388	+ }
	4389	+
	4390	+ static public Object clone(Object o)
	4391	+ {
	4392	+ try
	4393	+ {
	4394	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4395	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4396	+
	4397	+ out.writeObject(o);
	4398	+
	4399	+ out.flush();
	4400	+ out.close();
	4401	+
	4402	+ byte[] bytes = baos.toByteArray();
	4403	+
	4404	+ System.out.println("clone = " + bytes.length);
	4405	+
	4406	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4407	+ ObjectInputStream in = new ObjectInputStream(bais);
	4408	+ Object obj = in.readObject();
	4409	+ in.close();
	4410	+
	4411	+ return obj;
	4412	+ } catch (Exception e)
	4413	+ {
	4414	+ System.err.println(e);
	4415	+ return null;
	4416	+ }
	4417	+ }
	4418	+
	4419	+ cRadio GetCurrentTab()
	4420	+ {
	4421	+ cRadio ab;
	4422	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4423	+ {
	4424	+ ab = (cRadio)e.nextElement();
	4425	+ if(ab.GetObject() == copy)
	4426	+ {
	4427	+ return ab;
	4428	+ }
	4429	+ }
	4430	+
	4431	+ return null;
	4432	+ }
	4433	+
	4434	+
	4435	+ public void Save()
	4436	+ {
	4437	+ //Save(true);
	4438	+ Replace();
	4439	+ SetVersionStates();
	4440	+ }
	4441	+
	4442	+ private boolean Equal(byte[] compress, byte[] name)
	4443	+ {
	4444	+ if (compress.length != name.length)
	4445	+ {
	4446	+ return false;
	4447	+ }
	4448	+
	4449	+ for (int i=compress.length; --i>=0;)
	4450	+ {
	4451	+ if (compress[i] != name[i])
	4452	+ return false;
	4453	+ }
	4454	+
	4455	+ return true;
	4456	+ }
	4457	+
	4458	+ void DeleteVersion()
	4459	+ {
	4460	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4461	+ {
	4462	+ copy.versionlist[i] = copy.versionlist[i+1];
	4463	+ }
	4464	+
	4465	+ if (copy.versionlist[copy.versionindex] == null)
	4466	+ copy.versionindex -= 1;
	4467	+
	4468	+ if (copy.versionindex != -1)
	4469	+ CopyChanged(copy);
	4470	+
	4471	+ SetVersionStates();
	4472	+ }
	4473	+
	4474	+ public boolean Save(boolean user)
	4475	+ {
	4476	+ System.err.println("Save");
	4477	+ Replace();
	4478	+
	4479	+ if (copy.versionlist == null)
	4480	+ {
	4481	+ copy.versionlist = new Object3D[100];
	4482	+ copy.versionindex = -1;
	4483	+ }
	4484	+
	4485	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4486	+
	4487	+ boolean thesame = false;
	4488	+
	4489	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4490	+// {
	4491	+// thesame = true;
	4492	+// }
	4493	+
	4494	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4495	+ if (!thesame)
	4496	+ {
	4497	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4498	+ {
	4499	+ copy.versionlist[i] = copy.versionlist[i-1];
	4500	+ }
	4501	+
	4502	+ //tab.user[tab.versionindex] = user;
	4503	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4504	+
	4505	+ copy.versionlist[++copy.versionindex] = compress;
	4506	+
	4507	+ // if (increment)
	4508	+ // tab.versionindex++;
	4509	+ }
	4510	+
	4511	+ //copy.RestoreBigData(versiontable);
	4512	+
	4513	+ //assert(hashtable.isEmpty());
	4514	+
	4515	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4516	+// {
	4517	+// //tab.user[i] = false;
	4518	+// copy.versionlist[i] = null;
	4519	+// }
	4520	+
	4521	+ SetVersionStates();
	4522	+
	4523	+ // test save
	4524	+ if (false)
	4525	+ {
	4526	+ try
	4527	+ {
	4528	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4529	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4530	+
	4531	+ p.writeObject(copy);
	4532	+
	4533	+ p.flush();
	4534	+
	4535	+ ostream.close();
	4536	+ } catch (Exception e)
	4537	+ {
	4538	+ e.printStackTrace();
	4539	+ }
	4540	+ }
	4541	+
	4542	+ return !thesame;
	4543	+ }
	4544	+
	4545	+ boolean flashIt = true;
	4546	+
	4547	+ void RefreshSelection()
	4548	+ {
	4549	+ Object3D selection = new Object3D();
	4550	+
	4551	+ for (int i = 0; i < objEditor.copy.selection.size(); i++)
	4552	+ {
	4553	+ Object3D elem = objEditor.copy.selection.elementAt(i);
	4554	+
	4555	+ Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
	4556	+
	4557	+ if (obj == null)
	4558	+ {
	4559	+ objEditor.copy.selection.remove(i--);
	4560	+ }
	4561	+ else
	4562	+ {
	4563	+ selection.add(obj);
	4564	+ objEditor.copy.selection.setElementAt(obj, i);
	4565	+ }
	4566	+ }
	4567	+
	4568	+ flashIt = false;
	4569	+ GetTree().clearSelection();
	4570	+ for (int i = 0; i < selection.size(); i++)
	4571	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4572	+ flashIt = true;
	4573	+
	4574	+ //refreshContents(false);
	4575	+ }
	4576	+
	4577	+ void CopyChanged(Object3D changed)
	4578	+ {
	4579	+ Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
	4580	+
	4581	+ boolean temp = CameraPane.SWITCH;
	4582	+ CameraPane.SWITCH = false;
	4583	+
	4584	+ changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4585	+
	4586	+ changed.clear();
	4587	+
	4588	+ changed.skyboxname = obj.skyboxname;
	4589	+ changed.skyboxext = obj.skyboxext;
	4590	+
	4591	+ for (int i=0; i<obj.Size(); i++)
	4592	+ {
	4593	+ changed.add(obj.get(i));
	4594	+ }
	4595	+
	4596	+ changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4597	+
	4598	+ CameraPane.SWITCH = temp;
	4599	+
	4600	+ if (objEditor == this)
	4601	+ RefreshSelection();
	4602	+ //assert(hashtable.isEmpty());
	4603	+
	4604	+ objEditor.copy.Touch();
	4605	+
	4606	+ ResetModel();
	4607	+ objEditor.copy.HardTouch(); // recompile?
	4608	+
	4609	+ cRadio ab;
	4610	+ for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
	4611	+ {
	4612	+ ab = (cRadio)e.nextElement();
	4613	+ Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
	4614	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4615	+ if (test != null)
	4616	+ {
	4617	+ test.editWindow = ab.object.editWindow;
	4618	+ ab.object = test;
	4619	+ }
	4620	+ }
	4621	+
	4622	+ objEditor.refreshContents(true);
	4623	+ }
	4624	+
	4625	+ cButton previousVersionButton;
	4626	+ cButton restoreButton;
	4627	+ cButton replaceButton;
	4628	+ cButton nextVersionButton;
	4629	+ cButton saveVersionButton;
	4630	+ cButton deleteVersionButton;
	4631	+
	4632	+ boolean muteSlider;
	4633	+
	4634	+ int VersionCount()
	4635	+ {
	4636	+ return copy.VersionCount();
	4637	+ }
	4638	+
	4639	+ public cGridBag versionSliderPane;
	4640	+
	4641	+ void SetVersionStates()
	4642	+ {
	4643	+ //if (true)
	4644	+ // return;
	4645	+
	4646	+ //cRadio tab = GetCurrentTab();
	4647	+
	4648	+ if (copy.versionindex == -2)
	4649	+ {
	4650	+ saveVersionButton.setEnabled(false);
	4651	+ restoreButton.setEnabled(false);
	4652	+ replaceButton.setEnabled(false);
	4653	+ previousVersionButton.setEnabled(false);
	4654	+ nextVersionButton.setEnabled(false);
	4655	+ deleteVersionButton.setEnabled(false);
	4656	+ versionSliderPane.setVisible(false);
	4657	+ }
	4658	+ else
	4659	+ {
	4660	+ restoreButton.setEnabled(copy.versionindex != -1);
	4661	+ replaceButton.setEnabled(copy.versionindex != -1);
	4662	+
	4663	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4664	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4665	+
	4666	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4667	+ //copy.versionlist[copy.versionindex + 1] != null);
	4668	+
	4669	+ muteSlider = true;
	4670	+ versionSlider.setMinimum(0);
	4671	+ versionSlider.setMaximum(VersionCount() - 1);
	4672	+ versionSlider.setInteger(copy.versionindex);
	4673	+ versionSlider.setEnabled(copy.versionindex != -1);
	4674	+ muteSlider = false;
	4675	+
	4676	+ versionSliderPane.setVisible(true);
	4677	+ }
	4678	+ }
	4679	+
	4680	+ public boolean PreviousVersion()
	4681	+ {
	4682	+ // Option?
	4683	+ Replace();
	4684	+
	4685	+ System.err.println("Undo");
	4686	+
	4687	+ //cRadio tab = GetCurrentTab();
	4688	+
	4689	+ if (copy.versionindex == 0)
	4690	+ {
	4691	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4692	+ return false;
	4693	+ }
	4694	+
	4695	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4696	+// {
	4697	+// if (Save(false))
	4698	+// tab.versionindex -= 1;
	4699	+// else
	4700	+// {
	4701	+// if (tab.versionindex <= 0)
	4702	+// return false;
	4703	+// else
	4704	+// tab.versionindex -= 1;
	4705	+// }
	4706	+// }
	4707	+
	4708	+ copy.versionindex -= 1;
	4709	+
	4710	+ CopyChanged(copy);
	4711	+
	4712	+ SetVersionStates();
	4713	+
	4714	+ return true;
	4715	+ }
	4716	+
	4717	+ public boolean Restore()
	4718	+ {
	4719	+ System.err.println("Restore");
	4720	+
	4721	+ //cRadio tab = GetCurrentTab();
	4722	+
	4723	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4724	+ {
	4725	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4726	+ return false;
	4727	+ }
	4728	+
	4729	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4730	+ CopyChanged(copy);
	4731	+
	4732	+ SetVersionStates();
	4733	+
	4734	+ return true;
	4735	+ }
	4736	+
	4737	+ public boolean Replace()
	4738	+ {
	4739	+ //System.err.println("Replace");
	4740	+
	4741	+ //cRadio tab = GetCurrentTab();
	4742	+
	4743	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4744	+ {
	4745	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4746	+ return false;
	4747	+ }
	4748	+
	4749	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4750	+
	4751	+ return true;
	4752	+ }
	4753	+
	4754	+ public void NextVersion()
	4755	+ {
	4756	+ // Option?
	4757	+ Replace();
	4758	+
	4759	+ //cRadio tab = GetCurrentTab();
	4760	+
	4761	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4762	+ {
	4763	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4764	+ return;
	4765	+ }
	4766	+
	4767	+ copy.versionindex += 1;
	4768	+
	4769	+ CopyChanged(copy);
	4770	+
	4771	+ //if (!tab.user[tab.versionindex])
	4772	+ // tab.graphs[tab.versionindex] = null;
	4773	+
	4774	+ SetVersionStates();
	4775	+ }
	4776	+
	4777	+ void ImportGFD()
	4778	+ {
	4779	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4780	+ browser.show();
	4781	+ String filename = browser.getFile();
	4782	+ if (filename != null && filename.length() > 0)
	4783	+ {
	4784	+ String fullname = browser.getDirectory() + filename;
	4785	+
	4786	+ //Object3D readobj =
	4787	+ objEditor.ReadGFD(fullname, objEditor);
	4788	+ //makeSomething(readobj);
	4789	+ }
	4790	+ }
	4791	+
	4792	+ void ImportVRMLX3D()
	4793	+ {
	4794	+ if (Grafreed.standAlone)
	4795	+ {
	4796	+ /**/
	4797	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4798	+ browser.show();
	4799	+ String filename = browser.getFile();
	4800	+ if (filename != null && filename.length() > 0)
	4801	+ {
	4802	+ String fullname = browser.getDirectory() + filename;
	4803	+ LoadVRMLX3D(fullname);
	4804	+ }
	4805	+ /**/
	4806	+ }
	4807	+ }
	4808	+
3320	4809	void ToggleAnimation()
3321	4810	{
3322	4811	if (!Globals.ANIMATION)
3323	4812	{
3324	4813	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3325		- browser.show();
	4814	+ browser.setVisible(true);
3326	4815	String filename = browser.getFile();
3327	4816	if (filename != null && filename.length() > 0)
3328	4817	{
..	..	@@ -3332,8 +4821,8 @@
3332	4821
3333	4822	Globals.ANIMATION ^= true;
3334	4823
3335		- GrafreeD.wav.cursor = 0;
3336		- GrafreeD.wav.loop = 0;
	4824	+ Grafreed.wav.cursor = 0;
	4825	+ Grafreed.wav.loop = 0;
3337	4826	}
3338	4827	} else
3339	4828	{
..	..	@@ -3383,7 +4872,7 @@
3383	4872	void CreateMaterial()
3384	4873	{
3385	4874	//copy.ClearMaterial(); // PATCH
3386		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4875	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3387	4876	if (copy.selection.size() > 0)
3388	4877	//SetMaterial(copy);
3389	4878	{
..	..	@@ -3434,7 +4923,7 @@
3434	4923	assert false;
3435	4924	}
3436	4925
3437		- void EditSelection()
	4926	+ void EditSelection(boolean newWindow)
3438	4927	{
3439	4928	}
3440	4929
..	..	@@ -3442,11 +4931,11 @@
3442	4931	{
3443	4932	copy.ResetBlockLoop(); // temporary problem
3444	4933
3445		- boolean random = CameraPane.RANDOM;
3446		- CameraPane.RANDOM = false; // parse everything
	4934	+ boolean random = CameraPane.SWITCH;
	4935	+ CameraPane.SWITCH = false; // parse everything
3447	4936	copy.ResetDisplayList();
3448	4937	copy.HardTouch();
3449		- CameraPane.RANDOM = random;
	4938	+ CameraPane.SWITCH = random;
3450	4939	}
3451	4940
3452	4941	// public void applySelf()
..	..	@@ -3476,6 +4965,12 @@
3476	4965	// else
3477	4966	// applySelf(true);
3478	4967	// }
	4968	+
	4969	+ boolean Equal(double a, double b)
	4970	+ {
	4971	+ return Math.abs(a - b) < 0.001;
	4972	+ }
	4973	+
3479	4974	void applySelf0(boolean name)
3480	4975	{
3481	4976	if (name)
..	..	@@ -3493,7 +4988,7 @@
3493	4988	//copy.material = new cMaterial(copy.GetMaterial());
3494	4989
3495	4990	current.color = (float) colorField.getFloat();
3496		- current.modulation = (float) modulationField.getFloat();
	4991	+ current.modulation = (float) saturationField.getFloat();
3497	4992	current.metalness = (float) metalnessField.getFloat();
3498	4993	current.diffuse = (float) diffuseField.getFloat();
3499	4994	current.specular = (float) specularField.getFloat();
..	..	@@ -3513,13 +5008,69 @@
3513	5008	current.shadow = (float) shadowField.getFloat();
3514	5009	current.texture = (float) textureField.getFloat();
3515	5010	current.opacity = (float) opacityField.getFloat();
	5011	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
3516	5012	current.fakedepth = (float) fakedepthField.getFloat();
3517	5013	current.shadowbias = (float) shadowbiasField.getFloat();
3518	5014
3519		- if (!NumberSlider.frozen)
	5015	+ if (!cNumberSlider.frozen)
3520	5016	{
3521	5017	//System.out.println("Propagate = " + propagate);
3522	5018	copy.UpdateMaterial(anchor, current, propagate);
	5019	+
	5020	+ if (copy.material != null)
	5021	+ {
	5022	+ cMaterial mat = copy.material;
	5023	+
	5024	+ if (!Equal(colorField.getFloat(), mat.color))
	5025	+ colorField.SetToolTipValue((mat.color));
	5026	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5027	+ saturationField.SetToolTipValue((mat.modulation));
	5028	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5029	+ metalnessField.SetToolTipValue((mat.metalness));
	5030	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5031	+ diffuseField.SetToolTipValue((mat.diffuse));
	5032	+ if (!Equal(specularField.getFloat(), mat.specular))
	5033	+ specularField.SetToolTipValue((mat.specular));
	5034	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5035	+ shininessField.SetToolTipValue((mat.shininess));
	5036	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5037	+ shiftField.SetToolTipValue((mat.shift));
	5038	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5039	+ ambientField.SetToolTipValue((mat.ambient));
	5040	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5041	+ lightareaField.SetToolTipValue((mat.lightarea));
	5042	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5043	+ diffusenessField.SetToolTipValue((mat.factor));
	5044	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5045	+ velvetField.SetToolTipValue((mat.velvet));
	5046	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5047	+ sheenField.SetToolTipValue((mat.sheen));
	5048	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5049	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5050	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5051	+ backlitField.SetToolTipValue((mat.bump));
	5052	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5053	+ anisoField.SetToolTipValue((mat.aniso));
	5054	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5055	+ anisoVField.SetToolTipValue((mat.anisoV));
	5056	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5057	+ cameraField.SetToolTipValue((mat.cameralight));
	5058	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5059	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5060	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5061	+ shadowField.SetToolTipValue((mat.shadow));
	5062	+ if (!Equal(textureField.getFloat(), mat.texture))
	5063	+ textureField.SetToolTipValue((mat.texture));
	5064	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5065	+ opacityField.SetToolTipValue((mat.opacity));
	5066	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5067	+ parallaxField.SetToolTipValue((mat.parallax));
	5068	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5069	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5070	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5071	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	5072	+ }
	5073	+
3523	5074	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3524	5075	{
3525	5076	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3548,10 +5099,44 @@
3548	5099	//copy.Touch();
3549	5100	}
3550	5101
	5102	+ cNumberSlider versionSlider;
	5103	+ cNumberSlider versionField;
	5104	+
3551	5105	public void stateChanged(ChangeEvent e)
3552	5106	{
3553		- // assert(false);
	5107	+ // assert(false);
	5108	+ if (e.getSource() == versionSlider)
	5109	+ {
	5110	+ if (muteSlider)
	5111	+ return;
	5112	+
	5113	+ Replace();
	5114	+
	5115	+ int version = versionSlider.getInteger();
	5116	+
	5117	+ if (version != -1 && copy.versionlist[version] != null)
	5118	+ {
	5119	+ copy.versionindex = version;
	5120	+ CopyChanged(copy);
	5121	+ SetVersionStates();
	5122	+ }
	5123	+
	5124	+ return;
	5125	+ }
3554	5126
	5127	+ if (e.getSource() == versionField)
	5128	+ {
	5129	+ int version = versionField.getInteger();
	5130	+
	5131	+ if (version != -1 && copy.versionindex != version && copy.versionlist[version] != null)
	5132	+ {
	5133	+ copy.versionindex = version;
	5134	+ CopyChanged(copy);
	5135	+ }
	5136	+
	5137	+ return;
	5138	+ }
	5139	+
3555	5140	if (freezematerial)
3556	5141	{
3557	5142	return;
..	..	@@ -3564,6 +5149,7 @@
3564	5149	\|\| e.getSource() == apertureField
3565	5150	\|\| e.getSource() == shadowblurField)
3566	5151	{
	5152	+ new Exception().printStackTrace();
3567	5153	System.exit(0);
3568	5154	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3569	5155	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3585,6 +5171,12 @@
3585	5171	{
3586	5172	//System.out.println("stateChanged = " + this);
3587	5173	materialtouched = true;
	5174	+
	5175	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5176	+ {
	5177	+ saturationField.setFloat(1);
	5178	+ }
	5179	+
3588	5180	applySelf();
3589	5181	//System.out.println("this = " + this);
3590	5182	//System.out.println("PARENT = " + parent);
..	..	@@ -3634,7 +5226,7 @@
3634	5226	}
3635	5227
3636	5228	if (normalpushField != null)
3637		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	5229	+ copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
3638	5230	}
3639	5231
3640	5232	void SnapObject()
..	..	@@ -3884,20 +5476,28 @@
3884	5476	{
3885	5477	if (GetTree() != null)
3886	5478	{
	5479	+ GetTree().revalidate();
3887	5480	GetTree().repaint();
3888	5481	}
3889	5482
3890	5483	radioPanel.revalidate();
3891	5484	radioPanel.repaint();
3892		- ctrlPanel.revalidate(); // ? new
	5485	+ ctrlPanel.validate(); // ? new
3893	5486	ctrlPanel.repaint();
3894	5487	}
	5488	+
	5489	+ if (previousVersionButton != null && copy.versionlist != null)
	5490	+ SetVersionStates();
	5491	+
	5492	+ cameraView.requestFocusInWindow();
3895	5493	}
3896	5494
3897	5495	static TweenManager tweenManager = new TweenManager();
3898	5496
3899	5497	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3900	5498	{
	5499	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5500	+ Save();
3901	5501	//Tween.set(thing, 0).target(1).start(tweenManager);
3902	5502	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3903	5503	// if (thing instanceof GenericJointDemo)
..	..	@@ -3921,7 +5521,7 @@
3921	5521	// group = (Composite) group.get(0);
3922	5522	// }
3923	5523
3924		- System.out.println("makeSomething of " + thing);
	5524	+ //System.out.println("makeSomething of " + thing);
3925	5525
3926	5526	/*
3927	5527	if (deselect && jList != null)
..	..	@@ -3984,6 +5584,12 @@
3984	5584	{
3985	5585	ResetModel();
3986	5586	Select(thing.GetTreePath(), true, false); // unselect... false);
	5587	+
	5588	+ if (thing.Size() == 0)
	5589	+ {
	5590	+ //EditSelection(false);
	5591	+ }
	5592	+
3987	5593	refreshContents();
3988	5594	}
3989	5595
..	..	@@ -3994,7 +5600,7 @@
3994	5600	void ResetModel()
3995	5601	{
3996	5602	//assert(copy instanceof Composite);
3997		- Object3D /Composite/ group = (Object3D /Composite/) copy;
	5603	+ Object3D /Composite/ group = (Object3D /Composite/) objEditor.copy;
3998	5604
3999	5605	// necessary? group.selection = new Object3D(); // java.util.Vector();
4000	5606
..	..	@@ -4005,14 +5611,14 @@
4005	5611	//group.refreshEditWindow();
4006	5612	//refreshContents();
4007	5613
4008		- if (copy.selection == null)
	5614	+ if (objEditor.copy.selection == null)
4009	5615	{
4010		- copy.selection = new Object3D();
	5616	+ objEditor.copy.selection = new Object3D();
4011	5617	}
4012	5618
4013		- for (int j = 0; j < copy.selection.size(); j++)
	5619	+ for (int j = 0; j < objEditor.copy.selection.size(); j++)
4014	5620	{
4015		- Object3D item = copy.selection.get(j);
	5621	+ Object3D item = objEditor.copy.selection.get(j);
4016	5622
4017	5623	if (item instanceof cGroup && ((cGroup) item).transientlink)
4018	5624	{
..	..	@@ -4021,15 +5627,15 @@
4021	5627
4022	5628	if (item.count <= 1) // ??? == 0)
4023	5629	{
4024		- copy.selection.remove(item);
	5630	+ objEditor.copy.selection.remove(item);
4025	5631	}
4026	5632	}
4027	5633
4028	5634	boolean first = true;
4029	5635
4030		- for (int i = copy.selection.size(); --i >= 0;)
	5636	+ for (int i = objEditor.copy.selection.size(); --i >= 0;)
4031	5637	{
4032		- Object3D item = copy.selection.get(i);
	5638	+ Object3D item = objEditor.copy.selection.get(i);
4033	5639
4034	5640	if (item instanceof cGroup && ((cGroup) item).transientlink)
4035	5641	{
..	..	@@ -4101,6 +5707,7 @@
4101	5707	}
4102	5708	}
4103	5709	}
	5710	+
4104	5711	LoadGFDThread loadGFDThread;
4105	5712
4106	5713	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4120,8 +5727,10 @@
4120	5727
4121	5728	try
4122	5729	{
	5730	+ // Try compressed version first.
4123	5731	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4124		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5732	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5733	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4125	5734
4126	5735	readobj = (Object3D) p.readObject();
4127	5736	istream.close();
..	..	@@ -4129,7 +5738,22 @@
4129	5738	readobj.ResetDisplayList();
4130	5739	} catch (Exception e)
4131	5740	{
4132		- e.printStackTrace();
	5741	+ if (!e.toString().contains("GZIP"))
	5742	+ e.printStackTrace();
	5743	+
	5744	+ try
	5745	+ {
	5746	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5747	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5748	+
	5749	+ readobj = (Object3D) p.readObject();
	5750	+ istream.close();
	5751	+
	5752	+ readobj.ResetDisplayList();
	5753	+ } catch (Exception e2)
	5754	+ {
	5755	+ e2.printStackTrace();
	5756	+ }
4133	5757	}
4134	5758	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4135	5759	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4175,6 +5799,12 @@
4175	5799
4176	5800	void LoadIt(Object obj)
4177	5801	{
	5802	+ if (obj == null)
	5803	+ {
	5804	+ // Invalid file
	5805	+ return;
	5806	+ }
	5807	+
4178	5808	System.out.println("Loaded " + obj);
4179	5809	//new Exception().printStackTrace();
4180	5810	Object3D readobj = (Object3D) obj;
..	..	@@ -4184,10 +5814,14 @@
4184	5814
4185	5815	if (readobj != null)
4186	5816	{
	5817	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5818	+ // Save();
4187	5819	try
4188	5820	{
4189	5821	//readobj.deepCopySelf(copy);
4190	5822	copy.clear(); // june 2014
	5823	+ copy.skyboxname = readobj.skyboxname;
	5824	+ copy.skyboxext = readobj.skyboxext;
4191	5825	for (int i = 0; i < readobj.size(); i++)
4192	5826	{
4193	5827	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4228,6 +5862,7 @@
4228	5862	}
4229	5863	} catch (ClassCastException e)
4230	5864	{
	5865	+ e.printStackTrace();
4231	5866	assert (false);
4232	5867	Composite c = (Composite) copy;
4233	5868	c.children.clear();
..	..	@@ -4238,17 +5873,32 @@
4238	5873	c.addChild(csg);
4239	5874	}
4240	5875
	5876	+ copy.versionlist = readobj.versionlist;
	5877	+ copy.versionindex = readobj.versionindex;
	5878	+ copy.versiontable = readobj.versiontable;
	5879	+
	5880	+ if (copy.versionlist == null)
	5881	+ {
	5882	+ // Backward compatibility
	5883	+ copy.versionlist = new Object3D[100];
	5884	+ copy.versionindex = -1;
	5885	+
	5886	+ //Save(true);
	5887	+ }
	5888	+
	5889	+ //? SetUndoStates();
	5890	+
4241	5891	ResetModel();
4242	5892	copy.HardTouch(); // recompile?
4243	5893	refreshContents();
4244	5894	}
4245	5895	}
4246	5896
4247		- void load() // throws ClassNotFoundException
	5897	+ void Open() // throws ClassNotFoundException
4248	5898	{
4249		- if (GrafreeD.standAlone)
	5899	+ if (Grafreed.standAlone)
4250	5900	{
4251		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5901	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4252	5902	browser.show();
4253	5903	String filename = browser.getFile();
4254	5904	if (filename != null && filename.length() > 0)
..	..	@@ -4325,6 +5975,8 @@
4325	5975
4326	5976	void save()
4327	5977	{
	5978	+ Replace();
	5979	+
4328	5980	if (lastname == null)
4329	5981	{
4330	5982	return;
..	..	@@ -4333,11 +5985,13 @@
4333	5985	try
4334	5986	{
4335	5987	FileOutputStream ostream = new FileOutputStream(lastname);
4336		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5988	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5989	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4337	5990
4338	5991	p.writeObject(copy);
4339	5992	p.flush();
4340	5993
	5994	+ zstream.close();
4341	5995	ostream.close();
4342	5996
4343	5997	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4345,19 +5999,23 @@
4345	5999	//ps.print(buffer.toString());
4346	6000	} catch (IOException e)
4347	6001	{
	6002	+ e.printStackTrace();
4348	6003	}
4349	6004	}
	6005	+
4350	6006	String lastname;
4351	6007
4352	6008	void saveAs()
4353	6009	{
4354		- if (GrafreeD.standAlone)
	6010	+ if (Grafreed.standAlone)
4355	6011	{
4356	6012	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4357	6013	browser.setVisible(true);
4358	6014	String filename = browser.getFile();
4359	6015	if (filename != null && filename.length() > 0)
4360	6016	{
	6017	+ if (!filename.endsWith(".gfd"))
	6018	+ filename += ".gfd";
4361	6019	lastname = browser.getDirectory() + filename;
4362	6020	save();
4363	6021	}
..	..	@@ -4456,13 +6114,13 @@
4456	6114	try
4457	6115	{
4458	6116	FileOutputStream ostream = new FileOutputStream(filename);
4459		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4460		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	6117	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	6118	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4461	6119
4462	6120	Object3D objectparent = obj.parent;
4463	6121	obj.parent = null;
4464	6122
4465		- Object3D object = (Object3D) GrafreeD.clone(obj);
	6123	+ Object3D object = (Object3D) Grafreed.clone(obj);
4466	6124
4467	6125	obj.parent = objectparent;
4468	6126
..	..	@@ -4474,8 +6132,8 @@
4474	6132	p.writeObject(object);
4475	6133	p.flush();
4476	6134
	6135	+ zstream.close();
4477	6136	ostream.close();
4478		- // zstream.close();
4479	6137
4480	6138	// group.selection.get(0).parent = parent;
4481	6139	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4496,7 +6154,7 @@
4496	6154	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4497	6155	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4498	6156	copy.generatePOV(buffer);
4499		- if (GrafreeD.standAlone)
	6157	+ if (Grafreed.standAlone)
4500	6158	{
4501	6159	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4502	6160	browser.show();
..	..	@@ -4522,21 +6180,20 @@
4522	6180	Object3D client;
4523	6181	Object3D copy;
4524	6182	MenuBar menuBar;
4525		- Menu windowMenu;
4526		- MenuItem loadItem;
	6183	+ Menu fileMenu;
	6184	+ MenuItem newItem;
	6185	+ MenuItem openItem;
4527	6186	MenuItem saveItem;
4528	6187	MenuItem saveAsItem;
4529	6188	MenuItem exportAsItem;
4530	6189	MenuItem reexportItem;
4531	6190	MenuItem povItem;
4532	6191	MenuItem closeItem;
4533		- Menu cameraMenu;
	6192	+
4534	6193	CheckboxMenuItem zBufferItem;
4535	6194	//MenuItem normalLensItem;
4536		- MenuItem editCameraItem;
4537		- MenuItem revertCameraItem;
4538		- CheckboxMenuItem toggleLiveItem;
4539	6195	MenuItem stepItem;
	6196	+ CheckboxMenuItem toggleLiveItem;
4540	6197	CheckboxMenuItem toggleFullScreenItem;
4541	6198	CheckboxMenuItem toggleTimelineItem;
4542	6199	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4545,25 +6202,41 @@
4545	6202	CheckboxMenuItem toggleFootContactItem;
4546	6203	CheckboxMenuItem toggleDLItem;
4547	6204	CheckboxMenuItem toggleTextureItem;
4548		- CheckboxMenuItem toggleRandomItem;
	6205	+ CheckboxMenuItem toggleSwitchItem;
4549	6206	CheckboxMenuItem toggleRootItem;
4550	6207	CheckboxMenuItem animationItem;
	6208	+ MenuItem archiveItem;
4551	6209	CheckboxMenuItem toggleHandleItem;
4552	6210	CheckboxMenuItem togglePaintItem;
4553	6211	JSplitPane mainPanel;
4554	6212	JScrollPane scrollpane;
	6213	+
4555	6214	JPanel toolbarPanel;
4556		- JPanel treePanel;
	6215	+
	6216	+ cGridBag treePanel;
	6217	+
4557	6218	JPanel radioPanel;
4558	6219	ButtonGroup buttonGroup;
4559		- JPanel ctrlPanel;
4560		- JPanel materialPanel;
	6220	+
	6221	+ cGridBag toolboxPanel;
	6222	+ cGridBag skyboxPanel;
	6223	+ cGridBag materialPanel;
	6224	+ cGridBag ctrlPanel;
	6225	+
4561	6226	JScrollPane infoPanel;
4562		- JPanel optionsPanel;
	6227	+
	6228	+ cGridBag optionsPanel;
	6229	+
4563	6230	JTabbedPane objectPanel;
	6231	+ boolean materialFlushed;
	6232	+ Object3D latestObject;
	6233	+
	6234	+ cGridBag transformPanel;
4564	6235	cGridBag XYZPanel;
	6236	+
4565	6237	JSplitPane gridPanel;
4566	6238	JSplitPane bigPanel;
	6239	+
4567	6240	cGridBag bigThree;
4568	6241	cGridBag scenePanel;
4569	6242	cGridBag centralPanel;
..	..	@@ -4619,67 +6292,76 @@
4619	6292	// MATERIAL
4620	6293	JLabel materialLabel;
4621	6294	JLabel colorLabel;
4622		- NumberSlider colorField;
	6295	+ cNumberSlider colorField;
4623	6296	JLabel modulationLabel;
4624		- NumberSlider modulationField;
	6297	+ cNumberSlider saturationField;
4625	6298	JLabel metalnessLabel;
4626		- NumberSlider metalnessField;
	6299	+ cNumberSlider metalnessField;
4627	6300	JLabel diffuseLabel;
4628		- NumberSlider diffuseField;
	6301	+ cNumberSlider diffuseField;
4629	6302	JLabel specularLabel;
4630		- NumberSlider specularField;
	6303	+ cNumberSlider specularField;
4631	6304	JLabel shininessLabel;
4632		- NumberSlider shininessField;
	6305	+ cNumberSlider shininessField;
4633	6306	JLabel shiftLabel;
4634		- NumberSlider shiftField;
	6307	+ cNumberSlider shiftField;
4635	6308	JLabel ambientLabel;
4636		- NumberSlider ambientField;
	6309	+ cNumberSlider ambientField;
4637	6310	JLabel lightareaLabel;
4638		- NumberSlider lightareaField;
	6311	+ cNumberSlider lightareaField;
4639	6312	JLabel diffusenessLabel;
4640		- NumberSlider diffusenessField;
	6313	+ cNumberSlider diffusenessField;
4641	6314	JLabel velvetLabel;
4642		- NumberSlider velvetField;
	6315	+ cNumberSlider velvetField;
4643	6316	JLabel sheenLabel;
4644		- NumberSlider sheenField;
	6317	+ cNumberSlider sheenField;
4645	6318	JLabel subsurfaceLabel;
4646		- NumberSlider subsurfaceField;
	6319	+ cNumberSlider subsurfaceField;
4647	6320	//JLabel bumpLabel;
4648	6321	//NumberSlider bumpField;
4649	6322	JLabel backlitLabel;
4650		- NumberSlider backlitField;
	6323	+ cNumberSlider backlitField;
4651	6324	JLabel anisoLabel;
4652		- NumberSlider anisoField;
	6325	+ cNumberSlider anisoField;
4653	6326	JLabel anisoVLabel;
4654		- NumberSlider anisoVField;
	6327	+ cNumberSlider anisoVField;
	6328	+
4655	6329	JLabel cameraLabel;
4656		- NumberSlider cameraField;
	6330	+ cNumberSlider cameraField;
4657	6331	JLabel selfshadowLabel;
4658		- NumberSlider selfshadowField;
	6332	+ cNumberSlider selfshadowField;
4659	6333	JLabel shadowLabel;
4660		- NumberSlider shadowField;
	6334	+ cNumberSlider shadowField;
4661	6335	JLabel textureLabel;
4662		- NumberSlider textureField;
	6336	+ cNumberSlider textureField;
4663	6337	JLabel opacityLabel;
4664		- NumberSlider opacityField;
	6338	+ cNumberSlider opacityField;
	6339	+ JLabel parallaxLabel;
	6340	+ cNumberSlider parallaxField;
4665	6341	JLabel fakedepthLabel;
4666		- NumberSlider fakedepthField;
	6342	+ cNumberSlider fakedepthField;
4667	6343	JLabel shadowbiasLabel;
4668		- NumberSlider shadowbiasField;
	6344	+ cNumberSlider shadowbiasField;
	6345	+
4669	6346	JLabel bumpLabel;
4670		- NumberSlider bumpField;
	6347	+ cNumberSlider bumpField;
4671	6348	JLabel noiseLabel;
4672		- NumberSlider noiseField;
	6349	+ cNumberSlider noiseField;
4673	6350	JLabel powerLabel;
4674		- NumberSlider powerField;
	6351	+ cNumberSlider powerField;
4675	6352	JLabel borderfadeLabel;
4676		- NumberSlider borderfadeField;
	6353	+ cNumberSlider borderfadeField;
4677	6354	JLabel fogLabel;
4678		- NumberSlider fogField;
	6355	+ cNumberSlider fogField;
4679	6356	JLabel opacityPowerLabel;
4680		- NumberSlider opacityPowerField;
4681		- JTree jTree;
	6357	+ cNumberSlider opacityPowerField;
	6358	+ cTree jTree;
4682	6359	//ObjectUI parent;
4683	6360
4684		- NumberSlider normalpushField;
	6361	+ cNumberSlider normalpushField;
	6362	+
	6363	+ private MenuItem importGFDItem;
	6364	+ private MenuItem importVRMLX3DItem;
	6365	+ private MenuItem import3DSItem;
	6366	+ private MenuItem importOBJItem;
4685	6367	}