~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -30,11 +34,152 @@
30	34	iSendInfo
31	35	//KeyListener
32	36	{
	37	+ public cToggleButton pinButton;
33	38	boolean timeline;
34	39	boolean wasFullScreen;
35	40
36	41	GroupEditor callee;
37	42	JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
	90	+ public cGridBag GetSeparator()
	91	+ {
	92	+ cGridBag separator = new cGridBag();
	93	+ separator.add(new JSeparator());
	94	+ separator.preferredHeight = 5;
	95	+ return separator;
	96	+ }
	97	+
	98	+ cButton GetButton(String name, boolean border)
	99	+ {
	100	+ ImageIcon icon = GetIcon(name);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
	111	+ }
	112	+
	113	+ cToggleButton GetToggleButton(String name, boolean border)
	114	+ {
	115	+ ImageIcon icon = GetIcon(name);
	116	+ return new cToggleButton(icon, border);
	117	+ }
	118	+
	119	+ cCheckBox GetCheckBox(String name, boolean border)
	120	+ {
	121	+ ImageIcon icon = GetIcon(name);
	122	+ return new cCheckBox(icon, border);
	123	+ }
	124	+
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
	128	+ {
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
	135	+ try
	136	+ {
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
	145	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	146	+// {
	147	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	148	+// Graphics2D g = resized.createGraphics();
	149	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	150	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	151	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	152	+// g.dispose();
	153	+//
	154	+// image = resized;
	155	+// }
	156	+
	157	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
	161	+ return icon;
	162	+ }
	163	+ catch (Exception e)
	164	+ {
	165	+ //icons.put(name, null);
	166	+ return null;
	167	+ }
	168	+ }
	169	+
	170	+ BufferedImage GetImage(String name)
	171	+ {
	172	+ try
	173	+ {
	174	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	175	+
	176	+ return image;
	177	+ }
	178	+ catch (Exception e)
	179	+ {
	180	+ return null;
	181	+ }
	182	+ }
38	183
39	184	// SCRIPT
40	185
..	..	@@ -138,34 +283,42 @@
138	283	public void closeUI()
139	284	{
140	285	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	286	+// System.out.println("this = " + this);
	287	+// System.out.println("objEditor = " + objEditor);
143	288	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	289	+// objEditor.ctrlPanel.remove(nameField);
145	290
146		- if (!GroupEditor.allparams)
	291	+ objEditor.ctrlPanel.remove(namePanel);
	292	+
	293	+ if (!allparams)
147	294	return;
148	295
149		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- objEditor.ctrlPanel.remove(remarkButton);
	296	+// objEditor.ctrlPanel.remove(liveCB);
	297	+// objEditor.ctrlPanel.remove(hideCB);
	298	+// objEditor.ctrlPanel.remove(markCB);
	299	+//
	300	+// objEditor.ctrlPanel.remove(randomCB);
	301	+// objEditor.ctrlPanel.remove(speedupCB);
	302	+// objEditor.ctrlPanel.remove(rewindCB);
	303	+//
	304	+// objEditor.ctrlPanel.remove(resetButton);
	305	+// objEditor.ctrlPanel.remove(stepButton);
	306	+//// objEditor.ctrlPanel.remove(stepAllButton);
	307	+//// objEditor.ctrlPanel.remove(resetAllButton);
	308	+// objEditor.ctrlPanel.remove(link2masterCB);
	309	+// //objEditor.ctrlPanel.remove(flipVCB);
	310	+// //objEditor.ctrlPanel.remove(texresMenu);
	311	+// objEditor.ctrlPanel.remove(slowerButton);
	312	+// objEditor.ctrlPanel.remove(fasterButton);
	313	+// objEditor.ctrlPanel.remove(remarkButton);
167	314
168		- Remove(normalpushField);
	315	+ objEditor.ctrlPanel.remove(setupPanel);
	316	+ objEditor.ctrlPanel.remove(setupPanel2);
	317	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	318	+ objEditor.ctrlPanel.remove(pushPanel);
	319	+ //objEditor.ctrlPanel.remove(fillPanel);
	320	+
	321	+ //Remove(normalpushField);
169	322	}
170	323
171	324	public ObjEditor GetEditor()
..	..	@@ -209,6 +362,14 @@
209	362	client = inClient;
210	363	copy = client;
211	364
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
	372	+
212	373	// "this" is not called: SetupUI2(objEditor);
213	374	}
214	375
..	..	@@ -222,6 +383,14 @@
222	383	client = inClient;
223	384	copy = client;
224	385
	386	+ if (copy.versionlist == null)
	387	+ {
	388	+ copy.versionlist = new Object3D[100];
	389	+ copy.versionindex = -1;
	390	+
	391	+// Save(true);
	392	+ }
	393	+
225	394	SetupUI2(callee.GetEditor());
226	395	}
227	396
..	..	@@ -236,13 +405,15 @@
236	405	//localCopy.parent = null;
237	406
238	407	frame = new JFrame();
	408	+ frame.setUndecorated(false);
239	409	objEditor = this;
240	410	this.callee = callee;
241	411
242	412	//parent = p;
243	413
244	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
245		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
246	417	//gd.setFullScreenWindow(this);
247	418	//setResizable(false);
248	419	//if (!isDisplayable())
..	..	@@ -253,6 +424,14 @@
253	424	copy = localCopy;
254	425	copy.editWindow = this;
255	426
	427	+// if (copy.versionlist == null)
	428	+// {
	429	+// copy.versionlist = new Object3D[100];
	430	+// copy.versionindex = -1;
	431	+//
	432	+// Save(true);
	433	+// }
	434	+
256	435	SetupMenu();
257	436
258	437	//SetupName(objEditor); // new
..	..	@@ -266,28 +445,55 @@
266	445	return frame.action(event, obj);
267	446	}
268	447
	448	+ // Cannot work without static
	449	+ static boolean allparams = true;
	450	+
	451	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	452	+
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
269	456	void SetupMenu()
270	457	{
271	458	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..."));
	459	+ menuBar.add(fileMenu = new Menu("File"));
	460	+ fileMenu.add(newItem = new MenuItem("New"));
	461	+ fileMenu.add(openItem = new MenuItem("Open..."));
	462	+
	463	+ //oe.menuBar.add(menu = new Menu("Include"));
	464	+ Menu menu = new Menu("Import");
	465	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	466	+ importOBJItem.addActionListener(this);
	467	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	468	+ import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
	471	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	472	+ importVRMLX3DItem.addActionListener(this);
	473	+ }
	474	+ menu.add("-");
	475	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	476	+ importGFDItem.addActionListener(this);
	477	+ fileMenu.add(menu);
	478	+ fileMenu.add("-");
	479	+
	480	+ fileMenu.add(saveItem = new MenuItem("Save"));
	481	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	482	//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("-");
	483	+ fileMenu.add("-");
	484	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	485	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	486	+ fileMenu.add("-");
282	487	if (client.parent != null)
283	488	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	489	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	490	} else
286	491	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	492	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	493	}
289	494
290		- loadItem.addActionListener(this);
	495	+ newItem.addActionListener(this);
	496	+ openItem.addActionListener(this);
291	497	saveItem.addActionListener(this);
292	498	saveAsItem.addActionListener(this);
293	499	exportAsItem.addActionListener(this);
..	..	@@ -295,82 +501,103 @@
295	501	//povItem.addActionListener(this);
296	502	closeItem.addActionListener(this);
297	503
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	504	objectPanel = new JTabbedPane();
	505	+
	506	+ ChangeListener changeListener = new ChangeListener()
	507	+ {
	508	+ //String name;
	509	+
	510	+ public void stateChanged(ChangeEvent changeEvent)
	511	+ {
	512	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	513	+// {
	514	+// if (latestObject != null)
	515	+// {
	516	+// refreshContents(true);
	517	+// SetMaterial(latestObject);
	518	+// }
	519	+//
	520	+// materialFlushed = true;
	521	+// }
	522	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	523	+// {
	524	+// if (listUI.size() == 0)
	525	+// EditSelection(false);
	526	+// }
	527	+
	528	+// if (objectPanel.getSelectedIndex() == 4)
	529	+// {
	530	+// name = copy.skyboxname;
	531	+//
	532	+// if (name == null)
	533	+// {
	534	+// name = "";
	535	+// }
	536	+//
	537	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	538	+// copy.skyboxext = "jpg";
	539	+// }
	540	+// else
	541	+// {
	542	+// if (name != null)
	543	+// {
	544	+// if (name.equals(""))
	545	+// {
	546	+// copy.skyboxname = null;
	547	+// copy.skyboxext = null;
	548	+// }
	549	+// else
	550	+// {
	551	+// copy.skyboxname = name;
	552	+// }
	553	+// }
	554	+// }
	555	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	556	+
	557	+// refreshContents(false); // To refresh Info tab
	558	+ cameraView.repaint();
	559	+ }
	560	+ };
	561	+ objectPanel.addChangeListener(changeListener);
	562	+
354	563	toolbarPanel = new JPanel();
355	564	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	565	+
	566	+ treePanel = new cGridBag();
357	567	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- materialPanel = new JPanel();
361		- materialPanel.setName("Material");
	568	+
	569	+ editPanel = new cGridBag().setVertical(true);
	570	+ //editPanel.setName("Edit");
	571	+
	572	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	573	+
	574	+ editCommandsPanel = new cGridBag();
	575	+ editPanel.add(editCommandsPanel);
	576	+ editPanel.add(ctrlPanel);
	577	+
	578	+ toolboxPanel = new cGridBag().setVertical(true);
	579	+ //toolboxPanel.setName("Toolbox");
	580	+
	581	+ skyboxPanel = new cGridBag().setVertical(true);
	582	+
	583	+ materialPanel = new cGridBag().setVertical(false);
	584	+ //materialPanel.setName("Material");
	585	+
362	586	/JTextPane/
363	587	infoarea = createTextPane();
	588	+ doc = infoarea.getStyledDocument();
	589	+
364	590	infoarea.setEditable(true);
365	591	SetText();
	592	+
366	593	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	594	// infoarea.setOpaque(false);
368	595	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	596	+// TEXTAREA infoarea.setLineWrap(true);
	597	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	598	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");
	599	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	600	+ //infoPanel.setName("Info");
374	601	//infoPanel.setLayout(new BorderLayout());
375	602	//infoPanel.add(createTextPane());
376	603
..	..	@@ -378,16 +605,23 @@
378	605	mainPanel.setName("Main");
379	606	mainPanel.setContinuousLayout(true);
380	607	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	608	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	609	+ mainPanel.setDividerLocation(0.5); //1.0);
	610	+ mainPanel.setResizeWeight(0.5);
	611	+
	612	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	613	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	614	+ divider.setDividerSize(15);
	615	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	616	+
	617	+ mainPanel.setUI(new BasicSplitPaneUI());
	618	+
385	619	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	620	//mainPanel.setLayout(new GridBagLayout());
387	621	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	622	+// treePanel.setLayout(new GridBagLayout());
	623	+ //ctrlPanel.setLayout(new GridBagLayout());
	624	+ //materialPanel.setLayout(new GridBagLayout());
391	625
392	626	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	627	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +660,7 @@
426	660	static String newline = "\n";
427	661	protected static final String buttonString = "JButton";
428	662	StyledDocument doc;
429		- JTextArea infoarea;
	663	+ JTextPane infoarea;
430	664
431	665	void ClearInfo()
432	666	{
..	..	@@ -449,10 +683,10 @@
449	683	e.printStackTrace();
450	684	}
451	685
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();
	686	+// String selection = infoarea.getText();
	687	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	688	+// java.awt.datatransfer.Clipboard clipboard =
	689	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	690	//clipboard.setContents(data, data);
457	691	}
458	692
..	..	@@ -475,13 +709,13 @@
475	709	//SendInfo("Name:", "bold");
476	710	if (sel.GetTextures() != null \|\| debug)
477	711	{
478		- si.SendInfo(sel.toString(), "bold");
	712	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	713	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	714	if (sel.Size() > 0)
481	715	{
482	716	si.SendInfo("#children = " + sel.Size(), "regular");
483	717	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	718	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	719	if (debug)
486	720	{
487	721	try
..	..	@@ -493,7 +727,10 @@
493	727	}
494	728
495	729	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	730	+ {
	731	+ si.SendInfo(" BBox min: " + minima, "regular");
	732	+ si.SendInfo(" BBox max: " + maxima, "regular");
	733	+ }
497	734
498	735	if (sel.bRep != null)
499	736	{
..	..	@@ -520,7 +757,7 @@
520	757	}
521	758	if (sel.support != null)
522	759	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	760	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	761	}
525	762	if (sel.scriptnode != null)
526	763	{
..	..	@@ -591,6 +828,9 @@
591	828	{
592	829	CameraPane.pointflow = (PointFlow) sel;
593	830	}
	831	+
	832	+ si.SendInfo("_____________________", "regular");
	833	+ si.SendInfo("", "regular");
594	834	}
595	835	}
596	836
..	..	@@ -606,68 +846,216 @@
606	846	}
607	847	}
608	848
	849	+//static GraphicsDevice device = GraphicsEnvironment
	850	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	851	+
	852	+ Rectangle keeprect;
	853	+ cRadio radio;
	854	+
	855	+cButton keepButton;
	856	+ cButton twoButton; // Full 3D
	857	+ cButton sixButton;
	858	+ cButton threeButton;
	859	+ cButton sevenButton;
	860	+ cButton fourButton; // full panel
	861	+ cButton oneButton; // full XYZ
	862	+ //cButton currentLayout;
	863	+
	864	+ boolean maximized;
	865	+
	866	+ cButton fullscreenLayout;
	867	+ cButton expandedLayout;
	868	+
	869	+ void Minimize()
	870	+ {
	871	+ frame.setState(Frame.ICONIFIED);
	872	+ frame.validate();
	873	+ }
	874	+
	875	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	876	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	877	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	878	+ void Maximize()
	879	+ {
	880	+ if (CameraPane.FULLSCREEN)
	881	+ {
	882	+ ToggleFullScreen();
	883	+ }
	884	+
	885	+ if (maximized)
	886	+ {
	887	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	888	+ }
	889	+ else
	890	+ {
	891	+ keeprect = frame.getBounds();
	892	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	893	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	894	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	895	+// frame.setState(Frame.MAXIMIZED_BOTH);
	896	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	897	+ }
	898	+
	899	+ maximized ^= true;
	900	+
	901	+ frame.validate();
	902	+ }
	903	+
	904	+ cButton minButton;
	905	+ cButton maxButton;
	906	+ cButton fullButton;
	907	+ cButton collapseButton;
	908	+ cButton maximize3DButton;
	909	+
609	910	void ToggleFullScreen()
610	911	{
611		- if (CameraPane.FULLSCREEN)
	912	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	913	+
	914	+ cameraView.ToggleFullScreen();
	915	+
	916	+ if (!CameraPane.FULLSCREEN)
612	917	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	918	+ device.setFullScreenWindow(null);
	919	+ frame.dispose();
	920	+ frame.setUndecorated(false);
	921	+ frame.validate();
	922	+ frame.setVisible(true);
	923	+
	924	+ //frame.setVisible(false);
	925	+// frame.removeNotify();
	926	+// frame.setUndecorated(false);
	927	+// frame.addNotify();
	928	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	929	+
	930	+// X frame.getContentPane().remove(/"Center",/bigThree);
	931	+// X framePanel.add(bigThree);
	932	+// X frame.getContentPane().add(/"Center",/framePanel);
	933	+// framePanel.setDividerLocation(46); // icons are 24x24
	934	+
	935	+ //frame.setVisible(true);
	936	+// radio.layout = keepButton;
	937	+ //theFrame = null;
	938	+ keepButton = null;
	939	+// radio.layout.doClick();
	940	+
616	941	} else
617	942	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	943	+ keepButton = radio.layout;
	944	+ //keeprect = frame.getBounds();
	945	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	946	+// frame.getToolkit().getScreenSize().height);
	947	+ //frame.setVisible(false);
	948	+
	949	+ frame.dispose();
	950	+ frame.setUndecorated(true);
	951	+ device.setFullScreenWindow(frame);
	952	+ frame.validate();
	953	+ frame.setVisible(true);
	954	+// frame.removeNotify();
	955	+// frame.setUndecorated(true);
	956	+// frame.addNotify();
	957	+// X frame.getContentPane().remove(/"Center",/framePanel);
	958	+// X framePanel.remove(bigThree);
	959	+// X frame.getContentPane().add(/"Center",/bigThree);
	960	+// framePanel.setDividerLocation(0);
	961	+
	962	+// radio.layout = fullscreenLayout;
	963	+// radio.layout.doClick();
	964	+ //frame.setVisible(true);
621	965	}
622		- cameraView.ToggleFullScreen();
	966	+ frame.validate();
	967	+
	968	+ cameraView.requestFocusInWindow();
623	969	}
624	970
625		- private JTextArea createTextPane()
	971	+ void CollapseToolbar()
	972	+ {
	973	+ framePanel.setDividerLocation(0);
	974	+ //frame.validate();
	975	+
	976	+ cameraView.requestFocusInWindow();
	977	+ }
	978	+
	979	+ private Object3D Duplicate(Object3D object)
626	980	{
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		- };
	981	+ boolean temp = CameraPane.SWITCH;
	982	+ CameraPane.SWITCH = false;
	983	+
	984	+ if (Grafreed.grafreed.universe.versiontable == null)
	985	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	986	+
	987	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	988	+ // if (copy == client)
	989	+
	990	+ Object3D versions[] = object.versionlist;
	991	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	992	+ object.versionlist = null;
	993	+ object.versiontable = null;
	994	+
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
	997	+
	998	+ //byte[] compress = Compress(copy);
	999	+ Object3D compress = (Object3D)Grafreed.clone(object);
	1000	+
	1001	+ object.parent = parent;
	1002	+
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	1007	+
	1008	+ CameraPane.SWITCH = temp;
	1009	+
	1010	+ return compress;
	1011	+ }
642	1012
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
	1013	+ private JTextPane createTextPane()
	1014	+ {
	1015	+// TEXTAREA String[] initString =
	1016	+// {
	1017	+// "This is an editable JTextPane, ", //regular
	1018	+// "another ", //italic
	1019	+// "styled ", //bold
	1020	+// "text ", //small
	1021	+// "component, ", //large
	1022	+// "which supports embedded components..." + newline,//regular
	1023	+// " " + newline, //button
	1024	+// "...and embedded icons..." + newline, //regular
	1025	+// " ", //icon
	1026	+// newline + "JTextPane is a subclass of JEditorPane that "
	1027	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	1028	+// + "cover methods for interacting with those objects."
	1029	+// };
	1030	+//
	1031	+// String[] initStyles =
	1032	+// {
	1033	+// "regular", "italic", "bold", "small", "large",
	1034	+// "regular", "button", "regular", "icon",
	1035	+// "regular"
	1036	+// };
	1037	+//
	1038	+// JTextPane textPane = new JTextPane();
	1039	+// textPane.setEditable(true);
	1040	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1041	+// addStylesToDocument(doc);
	1042	+//
	1043	+// try
	1044	+// {
	1045	+// for (int j = 0; j < 2; j++)
	1046	+// {
	1047	+// for (int i = 0; i < initString.length; i++)
	1048	+// {
	1049	+// doc.insertString(doc.getLength(), initString[i],
	1050	+// doc.getStyle(initStyles[i]));
	1051	+// }
	1052	+// }
	1053	+// } catch (BadLocationException ble)
	1054	+// {
	1055	+// System.err.println("Couldn't insert initial text into text pane.");
	1056	+// }
649	1057
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;
	1058	+ return new JTextPane(); // textPane;
671	1059	}
672	1060
673	1061	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +1108,7 @@
720	1108	protected static ImageIcon createImageIcon(String path,
721	1109	String description)
722	1110	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1111	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	1112	if (imgURL != null)
725	1113	{
726	1114	return new ImageIcon(imgURL, description);
..	..	@@ -743,6 +1131,7 @@
743	1131	{
744	1132	SetupMaterial(materialPanel);
745	1133	}
	1134	+
746	1135	//SetupName();
747	1136	//SetupViews();
748	1137	}
..	..	@@ -752,6 +1141,7 @@
752	1141	// NumberSlider vDivsField;
753	1142	// JCheckBox endcaps;
754	1143	JCheckBox liveCB;
	1144	+ JCheckBox selectableCB;
755	1145	JCheckBox hideCB;
756	1146	JCheckBox link2masterCB;
757	1147	JCheckBox markCB;
..	..	@@ -759,7 +1149,12 @@
759	1149	JCheckBox speedupCB;
760	1150	JCheckBox rewindCB;
761	1151	JCheckBox flipVCB;
	1152	+
	1153	+ cCheckBox toggleTextureCB;
	1154	+ cCheckBox toggleSwitchCB;
	1155	+
762	1156	JComboBox texresMenu;
	1157	+
763	1158	JButton resetButton;
764	1159	JButton stepButton;
765	1160	JButton stepAllButton;
..	..	@@ -767,115 +1162,87 @@
767	1162	JButton slowerButton;
768	1163	JButton fasterButton;
769	1164	JButton remarkButton;
	1165	+
	1166	+ cGridBag editPanel;
	1167	+ cGridBag editCommandsPanel;
	1168	+
	1169	+ cGridBag namePanel;
	1170	+ cGridBag setupPanel;
	1171	+ cGridBag setupPanel2;
	1172	+ cGridBag objectCommandsPanel;
	1173	+ cGridBag pushPanel;
	1174	+ cGridBag fillPanel;
770	1175
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1176	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	1177	{
773	1178	JCheckBox cb;
774	1179
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);
	1180	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	1181	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	1182
785	1183	return cb;
786	1184	}
787	1185
788		- cButton AddButton(ObjEditor oe, String label)
	1186	+ cButton AddButton(cGridBag panel, String label)
789	1187	{
790	1188	cButton cb;
791	1189
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);
	1190	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	1191	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	1192
802	1193	return cb;
803	1194	}
804	1195
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1196	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1197	{
807	1198	JComboBox combo;
808	1199
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;
	1200	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1201	combo.addActionListener(this);
813	1202
814	1203	return combo;
815	1204	}
816	1205
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1206	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1207	{
819		- NumberSlider combo;
	1208	+ cGridBag control = new cGridBag();
	1209	+
	1210	+ cNumberSlider combo;
820	1211
821	1212	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	1213	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		-
	1214	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1215	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	1216	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	1217	+
	1218	+ panel.add(control);
	1219	+
	1220	+ return control;
841	1221	}
842	1222
843		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1223	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
844	1224	{
845		- NumberSlider combo;
	1225	+ cGridBag control = new cGridBag();
	1226	+
	1227	+ cNumberSlider combo;
846	1228
847	1229	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	1230	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		-
	1231	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1232	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	1233	combo.setInteger(current);
861	1234
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	1235	+ panel.add(control);
	1236	+
	1237	+ return control;
867	1238	}
868	1239
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	1240	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	1241	{
871	1242	JTextArea text;
872	1243
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1244	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	1245	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	1246
880	1247	return text;
881	1248	}
..	..	@@ -905,9 +1272,16 @@
905	1272	objEditor.ctrlPanel.remove(j);
906	1273	}
907	1274
	1275	+ void Remove(cNumberSlider j)
	1276	+ {
	1277	+ j.removeChangeListener(this);
	1278	+ //objEditor.ctrlPanel.remove(j.label);
	1279	+ objEditor.ctrlPanel.remove(j);
	1280	+ }
	1281	+
908	1282	/*
909	1283	*/
910		- void Return() // ObjEditor oe)
	1284	+ void Return0() // ObjEditor oe)
911	1285	{
912	1286	aConstraints.gridy += 1;
913	1287	aConstraints.gridx = 0;
..	..	@@ -962,37 +1336,92 @@
962	1336
963	1337	void SetupUI2(ObjEditor oe)
964	1338	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	1339	+ //SetupName(oe);
970	1340
971		- if (!GroupEditor.allparams)
	1341	+ namePanel = new cGridBag();
	1342	+
	1343	+ //if (copy.pinned)
	1344	+ {
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1346	+ pinButton.setSelected(copy.pinned);
	1347	+ cGridBag t = new cGridBag();
	1348	+ t.preferredWidth = 2;
	1349	+ t.add(pinButton);
	1350	+ namePanel.add(t);
	1351	+
	1352	+ pinButton.addItemListener(this);
	1353	+ }
	1354	+
	1355	+ nameField = AddText(namePanel, copy.GetName());
	1356	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1357	+ oe.ctrlPanel.add(namePanel);
	1358	+
	1359	+ oe.ctrlPanel.Return();
	1360	+
	1361	+ if (!allparams)
972	1362	return;
973	1363
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1364	+ setupPanel = new cGridBag().setVertical(false);
	1365	+
	1366	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1367	+ liveCB.setToolTipText("Animate object");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
	1370	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1371	+ selectableCB.setToolTipText("Make object selectable");
977	1372	// 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");
	1373	+
	1374	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1375	+ hideCB.setToolTipText("Hide object");
	1376	+
	1377	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1378	+
	1379	+ setupPanel2 = new cGridBag().setVertical(false);
	1380	+
	1381	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1382	+ rewindCB.setToolTipText("Rewind animation");
	1383	+
	1384	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1385	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1386	+
	1387	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1388	+ link2masterCB.setToolTipText("Attach to support");
	1389	+
	1390	+ if (Globals.ADVANCED)
	1391	+ {
	1392	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1393	+ speedupCB.setToolTipText("Option motion capture");
	1394	+ }
	1395	+
	1396	+ oe.ctrlPanel.add(setupPanel);
	1397	+ oe.ctrlPanel.Return();
	1398	+ oe.ctrlPanel.add(setupPanel2);
	1399	+ oe.ctrlPanel.Return();
	1400	+
	1401	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1402	+
	1403	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1404	+ resetButton.setToolTipText("Jump to frame zero");
	1405	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1406	+ stepButton.setToolTipText("Step one frame");
984	1407	// resetAllButton = AddButton(oe, "Reset All");
985	1408	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1409	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	1410	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1411	+ slowerButton.setToolTipText("Decrease animation speed");
	1412	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1413	+ fasterButton.setToolTipText("Increase animation speed");
	1414	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1415	+ remarkButton.setToolTipText("Set the current transform as the target");
991	1416
992		- Return();
	1417	+ oe.ctrlPanel.add(objectCommandsPanel);
	1418	+ oe.ctrlPanel.Return();
993	1419
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	1420	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1421	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1422	+ //Return();
	1423	+
	1424	+ oe.ctrlPanel.Return();
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);
..	..	@@ -1189,9 +1605,13 @@
1189	1605	//JPanel worldPanel =
1190	1606	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1191	1607	//worldPanel.setName("World");
1192		- centralPanel = new JPanel(new BorderLayout());
1193		- timelinePanel = new JPanel(new BorderLayout());
1194		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1608	+ centralPanel = new cGridBag();
	1609	+ centralPanel.preferredWidth = 20;
	1610	+
	1611	+ if (Globals.ADVANCED)
	1612	+ {
	1613	+ timelinePanel = new JPanel(new BorderLayout());
	1614	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1195	1615
1196	1616	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1197	1617	cameraPanel.setContinuousLayout(true);
..	..	@@ -1200,7 +1620,10 @@
1200	1620	// cameraPanel.setDividerSize(9);
1201	1621	cameraPanel.setResizeWeight(1.0);
1202	1622
	1623	+ }
	1624	+
1203	1625	centralPanel.add(cameraView);
	1626	+ centralPanel.setFocusable(true);
1204	1627	//frame.setJMenuBar(timelineMenubar);
1205	1628	//centralPanel.add(timelinePanel);
1206	1629
..	..	@@ -1219,13 +1642,57 @@
1219	1642	//frontView.object = copy;
1220	1643	//sideView.object = copy;
1221	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	+
1222	1684	XYZPanel = new cGridBag().setVertical(true);
1223	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1224	1686
	1687	+ XYZPanel.preferredWidth = 5;
1225	1688	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1226	1689	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1227	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1691	+ //XYZPanel.setName("XYZ");
1228	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1229	1696	/*
1230	1697	gridPanel = new JPanel(); //new BorderLayout());
1231	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1233,12 +1700,12 @@
1233	1700	gridPanel.add(cameraView);
1234	1701	gridPanel.add(XYZPanel);
1235	1702	*/
1236		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1237		- gridPanel.setContinuousLayout(true);
1238		- gridPanel.setOneTouchExpandable(true);
1239		- gridPanel.setDividerLocation(1.0);
1240		- gridPanel.setDividerSize(9);
1241		- gridPanel.setResizeWeight(0.85);
	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);
1242	1709
1243	1710	// aConstraints.weighty = 0;
1244	1711	//System.out.println("THIS = " + this);
..	..	@@ -1261,13 +1728,34 @@
1261	1728
1262	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1263	1730	//tmp.setName("Edit");
1264		- objectPanel.add(materialPanel);
1265		- JPanel north = new JPanel(new BorderLayout());
1266		- north.setName("Edit");
1267		- north.add(ctrlPanel, BorderLayout.NORTH);
1268		- objectPanel.add(north);
1269		- objectPanel.add(infoPanel);
	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");
1270	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	+
1271	1759	/*
1272	1760	aConstraints.gridx = 0;
1273	1761	aConstraints.gridwidth = 1;
..	..	@@ -1275,7 +1763,7 @@
1275	1763	aConstraints.gridy += 1;
1276	1764	aConstraints.gridwidth = 1;
1277	1765	mainPanel.add(objectPanel, aConstraints);
1278		- */
	1766	+ */
1279	1767
1280	1768	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1281	1769	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1286,19 +1774,120 @@
1286	1774	scrollpane.setWheelScrollingEnabled(true);
1287	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1288	1776
1289		- /JTabbedPane/ scenePanel = new JTabbedPane();
1290		- scenePanel.add(scrollpane);
	1777	+ /JTabbedPane/ scenePanel = new cGridBag();
	1778	+ scenePanel.preferredWidth = 6;
	1779	+
	1780	+ JTabbedPane tabbedPane = new JTabbedPane();
	1781	+ tabbedPane.add(scrollpane);
1291	1782
1292		- scenePanel.add(FSPane = new cFileSystemPane(this));
1293		-
1294		- optionsPanel = new JPanel(new GridBagLayout());
	1783	+ optionsPanel = new cGridBag().setVertical(false);
1295	1784
1296	1785	optionsPanel.setName("Options");
1297	1786
1298		- AddOptions(optionsPanel, aConstraints);
	1787	+ AddOptions(optionsPanel); //, aConstraints);
1299	1788
1300		- scenePanel.add(optionsPanel);
	1789	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1301	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
	1793	+ scenePanel.add(tabbedPane);
	1794	+
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
	1797	+
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ tabbedPane.add(infoPanel);
	1888	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1889	+ tabbedPane.setToolTipTextAt(4, "Information");
	1890	+ }
1302	1891
1303	1892	/*
1304	1893	cTree jTree = new cTree(null);
..	..	@@ -1320,13 +1909,13 @@
1320	1909	jtp.add(tree);
1321	1910	*/
1322	1911
1323		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1324		- bigPanel.setContinuousLayout(true);
1325		- bigPanel.setOneTouchExpandable(true);
1326		- bigPanel.setDividerLocation(0.8);
1327		- bigPanel.setDividerSize(15);
1328		- bigPanel.setResizeWeight(0.15);
1329		- bigPanel.setName("Scene");
	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");
1330	1919
1331	1920	//bigPanel.setLayout(new BorderLayout());
1332	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1361,7 +1950,7 @@
1361	1950	bigThree = new cGridBag();
1362	1951	bigThree.addComponent(scenePanel);
1363	1952	bigThree.addComponent(centralPanel);
1364		- bigThree.addComponent(XYZPanel);
	1953	+ //bigThree.addComponent(XYZPanel);
1365	1954
1366	1955	// // SIDE EFFECT!!!
1367	1956	// aConstraints.gridx = 0;
..	..	@@ -1370,16 +1959,33 @@
1370	1959	// aConstraints.gridheight = 1;
1371	1960
1372	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1373		- framePanel.setContinuousLayout(true);
1374		- framePanel.setOneTouchExpandable(true);
1375		- 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);
1376	1982	//framePanel.setDividerSize(15);
1377	1983	//framePanel.setResizeWeight(0.15);
1378	1984	framePanel.setName("Frame");
1379	1985
1380	1986	frame.getContentPane().setLayout(new BorderLayout());
1381	1987	/**/
1382		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1383	1989	//worldPane.add(bigPanel);
1384	1990	//worldPane.add(worldPanel);
1385	1991	/**/
..	..	@@ -1389,15 +1995,19 @@
1389	1995
1390	1996	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1997
1392		- frame.setSize(1024, 768);
1393		- frame.show();
	1998	+ frame.setSize(1280, 860);
	1999	+
	2000	+ cameraView.requestFocusInWindow();
	2001	+
	2002	+// gridPanel.setDividerLocation(1.0);
	2003	+
	2004	+ frame.validate();
1394	2005
1395		- gridPanel.setDividerLocation(1.0);
	2006	+ frame.setVisible(true);
1396	2007
1397	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1398	2009	frame.addWindowListener(new WindowAdapter()
1399	2010	{
1400		-
1401	2011	public void windowClosing(WindowEvent e)
1402	2012	{
1403	2013	Close();
..	..	@@ -1405,7 +2015,7 @@
1405	2015	});
1406	2016	}
1407	2017
1408		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	2018	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1409	2019	{
1410	2020	}
1411	2021
..	..	@@ -1420,260 +2030,609 @@
1420	2030	ctrlPanel.removeAll();
1421	2031	}
1422	2032
1423		- void SetupMaterial(JPanel ctrlPanel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1424	2034	{
1425		- aConstraints.weighty = 0;
1426		- //aConstraints.weightx = 1;
1427		- /*
	2035	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2036	+
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2038	+ skin.setToolTipText("Skin");
	2039	+ skin.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ // Skin
	2047	+ colorField.setFloat(material.color);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
	2057	+ subsurfaceField.setFloat(material.subsurface);
	2058	+ selfshadowField.setFloat(material.diffuseness);
	2059	+ diffusenessField.setFloat(material.factor);
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ shadowbiasField.setFloat(material.shadowbias);
	2062	+ diffuseField.setFloat(material.diffuse);
	2063	+ specularField.setFloat(material.specular);
	2064	+
	2065	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2066	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2067	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2068	+
	2069	+ materialtouched = true;
	2070	+ applySelf();
	2071	+ }
	2072	+ });
	2073	+ presetpanel.add(skin);
	2074	+
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2076	+ lambert.setToolTipText("Diffuse");
	2077	+ lambert.addMouseListener(new MouseAdapter()
	2078	+ {
	2079	+ public void mouseClicked(MouseEvent e)
	2080	+ {
	2081	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2082	+ cMaterial material = object.material;
	2083	+
	2084	+ diffusenessField.setFloat(material.factor);
	2085	+ selfshadowField.setFloat(material.diffuseness);
	2086	+
	2087	+ materialtouched = true;
	2088	+ applySelf();
	2089	+ }
	2090	+ });
	2091	+ presetpanel.add(lambert);
	2092	+
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2094	+ diffuse2.setToolTipText("Diffuse2");
	2095	+ diffuse2.addMouseListener(new MouseAdapter()
	2096	+ {
	2097	+ public void mouseClicked(MouseEvent e)
	2098	+ {
	2099	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2100	+ cMaterial material = object.material;
	2101	+
	2102	+ diffusenessField.setFloat(material.factor);
	2103	+ selfshadowField.setFloat(material.diffuseness);
	2104	+
	2105	+ materialtouched = true;
	2106	+ applySelf();
	2107	+ }
	2108	+ });
	2109	+ presetpanel.add(diffuse2);
	2110	+
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2112	+ diffusemoon.setToolTipText("Moon");
	2113	+ diffusemoon.addMouseListener(new MouseAdapter()
	2114	+ {
	2115	+ public void mouseClicked(MouseEvent e)
	2116	+ {
	2117	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2118	+ cMaterial material = object.material;
	2119	+
	2120	+ diffusenessField.setFloat(material.factor);
	2121	+ selfshadowField.setFloat(material.diffuseness);
	2122	+
	2123	+ materialtouched = true;
	2124	+ applySelf();
	2125	+ }
	2126	+ });
	2127	+ presetpanel.add(diffusemoon);
	2128	+
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2130	+ diffusemoon2.setToolTipText("Moon2");
	2131	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2132	+ {
	2133	+ public void mouseClicked(MouseEvent e)
	2134	+ {
	2135	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2136	+ cMaterial material = object.material;
	2137	+
	2138	+ diffusenessField.setFloat(material.factor);
	2139	+ selfshadowField.setFloat(material.diffuseness);
	2140	+
	2141	+ materialtouched = true;
	2142	+ applySelf();
	2143	+ }
	2144	+ });
	2145	+ presetpanel.add(diffusemoon2);
	2146	+
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2148	+ diffusemoon3.setToolTipText("Moon3");
	2149	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2150	+ {
	2151	+ public void mouseClicked(MouseEvent e)
	2152	+ {
	2153	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2154	+ cMaterial material = object.material;
	2155	+
	2156	+ diffusenessField.setFloat(material.factor);
	2157	+ selfshadowField.setFloat(material.diffuseness);
	2158	+
	2159	+ materialtouched = true;
	2160	+ applySelf();
	2161	+ }
	2162	+ });
	2163	+ presetpanel.add(diffusemoon3);
	2164	+
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2166	+ diffusesheen.setToolTipText("Sheen");
	2167	+ diffusesheen.addMouseListener(new MouseAdapter()
	2168	+ {
	2169	+ public void mouseClicked(MouseEvent e)
	2170	+ {
	2171	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2172	+ cMaterial material = object.material;
	2173	+
	2174	+ sheenField.setFloat(material.sheen);
	2175	+
	2176	+ materialtouched = true;
	2177	+ applySelf();
	2178	+ }
	2179	+ });
	2180	+ presetpanel.add(diffusesheen);
	2181	+
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2183	+ rough.setToolTipText("Rough metal");
	2184	+ rough.addMouseListener(new MouseAdapter()
	2185	+ {
	2186	+ public void mouseClicked(MouseEvent e)
	2187	+ {
	2188	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2189	+ cMaterial material = object.material;
	2190	+
	2191	+ shininessField.setFloat(material.shininess);
	2192	+ velvetField.setFloat(material.velvet);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(rough);
	2199	+
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2201	+ rough2.setToolTipText("Medium metal");
	2202	+ rough2.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2207	+ cMaterial material = object.material;
	2208	+
	2209	+ shininessField.setFloat(material.shininess);
	2210	+ lightareaField.setFloat(material.lightarea);
	2211	+
	2212	+ materialtouched = true;
	2213	+ applySelf();
	2214	+ }
	2215	+ });
	2216	+ presetpanel.add(rough2);
	2217	+
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2219	+ shini0.setToolTipText("Shiny");
	2220	+ shini0.addMouseListener(new MouseAdapter()
	2221	+ {
	2222	+ public void mouseClicked(MouseEvent e)
	2223	+ {
	2224	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2225	+ cMaterial material = object.material;
	2226	+
	2227	+ shininessField.setFloat(material.shininess);
	2228	+ lightareaField.setFloat(material.lightarea);
	2229	+
	2230	+ materialtouched = true;
	2231	+ applySelf();
	2232	+ }
	2233	+ });
	2234	+ presetpanel.add(shini0);
	2235	+
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2237	+ shini1.setToolTipText("Shiny2");
	2238	+ shini1.addMouseListener(new MouseAdapter()
	2239	+ {
	2240	+ public void mouseClicked(MouseEvent e)
	2241	+ {
	2242	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2243	+ cMaterial material = object.material;
	2244	+
	2245	+ shininessField.setFloat(material.shininess);
	2246	+ lightareaField.setFloat(material.lightarea);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(shini1);
	2253	+
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2255	+ shini2.setToolTipText("Shiny3");
	2256	+ shini2.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2261	+ cMaterial material = object.material;
	2262	+
	2263	+ shininessField.setFloat(material.shininess);
	2264	+ lightareaField.setFloat(material.lightarea);
	2265	+
	2266	+ materialtouched = true;
	2267	+ applySelf();
	2268	+ }
	2269	+ });
	2270	+ presetpanel.add(shini2);
	2271	+
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2273	+ aniso.setToolTipText("AnisoU");
	2274	+ aniso.addMouseListener(new MouseAdapter()
	2275	+ {
	2276	+ public void mouseClicked(MouseEvent e)
	2277	+ {
	2278	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2279	+ cMaterial material = object.material;
	2280	+
	2281	+ anisoField.setFloat(material.aniso);
	2282	+ anisoVField.setFloat(material.anisoV);
	2283	+
	2284	+ materialtouched = true;
	2285	+ applySelf();
	2286	+ }
	2287	+ });
	2288	+ presetpanel.add(aniso);
	2289	+
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2291	+ aniso2.setToolTipText("AnisoV");
	2292	+ aniso2.addMouseListener(new MouseAdapter()
	2293	+ {
	2294	+ public void mouseClicked(MouseEvent e)
	2295	+ {
	2296	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2297	+ cMaterial material = object.material;
	2298	+
	2299	+ anisoField.setFloat(material.aniso);
	2300	+ anisoVField.setFloat(material.anisoV);
	2301	+
	2302	+ materialtouched = true;
	2303	+ applySelf();
	2304	+ }
	2305	+ });
	2306	+ presetpanel.add(aniso2);
	2307	+
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2309	+ aniso3.setToolTipText("AnisoUV");
	2310	+ aniso3.addMouseListener(new MouseAdapter()
	2311	+ {
	2312	+ public void mouseClicked(MouseEvent e)
	2313	+ {
	2314	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2315	+ cMaterial material = object.material;
	2316	+
	2317	+ anisoField.setFloat(material.aniso);
	2318	+ anisoVField.setFloat(material.anisoV);
	2319	+
	2320	+ materialtouched = true;
	2321	+ applySelf();
	2322	+ }
	2323	+ });
	2324	+ presetpanel.add(aniso3);
	2325	+
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2327	+ velvet0.setToolTipText("Velvet");
	2328	+ velvet0.addMouseListener(new MouseAdapter()
	2329	+ {
	2330	+ public void mouseClicked(MouseEvent e)
	2331	+ {
	2332	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2333	+ cMaterial material = object.material;
	2334	+
	2335	+ diffusenessField.setFloat(material.factor);
	2336	+ selfshadowField.setFloat(material.diffuseness);
	2337	+ sheenField.setFloat(material.sheen);
	2338	+ shininessField.setFloat(material.shininess);
	2339	+ velvetField.setFloat(material.velvet);
	2340	+ shiftField.setFloat(material.shift);
	2341	+
	2342	+ materialtouched = true;
	2343	+ applySelf();
	2344	+ }
	2345	+ });
	2346	+ presetpanel.add(velvet0);
	2347	+
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2349	+ bump0.setToolTipText("Bump texture");
	2350	+ bump0.addMouseListener(new MouseAdapter()
	2351	+ {
	2352	+ public void mouseClicked(MouseEvent e)
	2353	+ {
	2354	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2355	+ cMaterial material = object.material;
	2356	+
	2357	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2358	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2359	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2360	+
	2361	+ materialtouched = true;
	2362	+ applySelf();
	2363	+ }
	2364	+ });
	2365	+ presetpanel.add(bump0);
	2366	+
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2368	+ borderShader.setToolTipText("Border fade");
	2369	+ borderShader.addMouseListener(new MouseAdapter()
	2370	+ {
	2371	+ public void mouseClicked(MouseEvent e)
	2372	+ {
	2373	+ borderfadeField.setFloat(0.5);
	2374	+ opacityField.setFloat(0.75);
	2375	+
	2376	+ materialtouched = true;
	2377	+ applySelf();
	2378	+ }
	2379	+ });
	2380	+ presetpanel.add(borderShader);
	2381	+
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2383	+ halo.setToolTipText("Halo");
	2384	+ halo.addMouseListener(new MouseAdapter()
	2385	+ {
	2386	+ public void mouseClicked(MouseEvent e)
	2387	+ {
	2388	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2389	+ cMaterial material = object.material;
	2390	+
	2391	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2392	+
	2393	+ materialtouched = true;
	2394	+ applySelf();
	2395	+ }
	2396	+ });
	2397	+ presetpanel.add(halo);
	2398	+
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2400	+ candle.setToolTipText("Candle");
	2401	+ candle.addMouseListener(new MouseAdapter()
	2402	+ {
	2403	+ public void mouseClicked(MouseEvent e)
	2404	+ {
	2405	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2406	+ cMaterial material = object.material;
	2407	+
	2408	+ subsurfaceField.setFloat(material.subsurface);
	2409	+ shadowbiasField.setFloat(material.shadowbias);
	2410	+ ambientField.setFloat(material.ambient);
	2411	+ specularField.setFloat(material.specular);
	2412	+ lightareaField.setFloat(material.lightarea);
	2413	+ shininessField.setFloat(material.shininess);
	2414	+
	2415	+ materialtouched = true;
	2416	+ applySelf();
	2417	+ }
	2418	+ });
	2419	+ presetpanel.add(candle);
	2420	+
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2422	+ shadowShader.setToolTipText("Shadow");
	2423	+ shadowShader.addMouseListener(new MouseAdapter()
	2424	+ {
	2425	+ public void mouseClicked(MouseEvent e)
	2426	+ {
	2427	+ diffuseField.setFloat(0.001);
	2428	+ ambientField.setFloat(0.001);
	2429	+ cameraField.setFloat(0.001);
	2430	+ specularField.setFloat(0.001);
	2431	+ fakedepthField.setFloat(0.001);
	2432	+ opacityField.setFloat(0.6);
	2433	+
	2434	+ materialtouched = true;
	2435	+ applySelf();
	2436	+ }
	2437	+ });
	2438	+ presetpanel.add(shadowShader);
	2439	+
	2440	+ cGridBag panel = new cGridBag().setVertical(true);
	2441	+
	2442	+ presetpanel.preferredWidth = 1;
	2443	+
	2444	+ materialpanel.add(presetpanel);
	2445	+ materialpanel.add(panel);
	2446	+
	2447	+ panel.preferredWidth = 8;
	2448	+
	2449	+ /*
1428	2450	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1429	2451	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1430		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1431		- aConstraints.gridx += 1;
1432		- */
	2452	+ */
1433	2453
1434		- aConstraints.gridwidth = 1;
1435		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1436		- aConstraints.gridx += 1;
1437		- aConstraints.weighty = 0;
1438		- aConstraints.gridwidth = 1;
	2454	+ cGridBag editBar = new cGridBag().setVertical(false);
	2455	+
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
	2457	+ createMaterialButton.setToolTipText("Create material");
1439	2458
1440	2459	/*
1441	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
1445	2461	*/
1446	2462
1447		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1448		- aConstraints.gridx += 1;
	2463	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
	2464	+ clearMaterialButton.setToolTipText("Clear material");
	2465	+
	2466	+ if (Globals.ADVANCED)
	2467	+ {
	2468	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
	2469	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2470	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2471	+ }
1449	2472
1450		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1451		-
1452		- aConstraints.gridx += 1;
1453		-
1454		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1455		-
1456		- aConstraints.gridx += 1;
1457		-
1458		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1459		-
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.weighty = 0;
1463		- aConstraints.gridwidth = 1;
	2473	+ editBar.preferredHeight = 15;
	2474	+
	2475	+ panel.add(editBar);
	2476	+
1464	2477	/**/
1465	2478	//aConstraints.weighty = 0;
1466	2479	////aConstraints.weightx = 1;
1467	2480	//aConstraints.weighty = 1;
1468	2481	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1469	2482	//aConstraints.gridx += 1;
1470		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1471		- aConstraints.weighty = 0;
1472		- aConstraints.gridx = 0;
1473		- aConstraints.gridy += 1;
1474		- aConstraints.gridwidth = 1;
	2483	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1475	2484
1476		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1477		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1479		- aConstraints.gridx += 1;
1480		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1481		- //aConstraints.weightx = 0;
1482		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1483		- aConstraints.gridx = 0;
1484		- aConstraints.gridy += 1;
1485		- aConstraints.gridwidth = 1;
	2485	+ cGridBag colorSection = new cGridBag().setVertical(true);
1486	2486
1487		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1488		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1489		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1490		- aConstraints.gridx += 1;
1491		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1492		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1493		- aConstraints.gridx = 0;
1494		- aConstraints.gridy += 1;
1495		- aConstraints.gridwidth = 1;
	2487	+ cGridBag huepanel = new cGridBag();
	2488	+ cGridBag huelabel = new cGridBag();
	2489	+ cLabel hue = GetLabel("icons/hue.png", false);
	2490	+ hue.fit = true;
	2491	+
	2492	+ hue.addMouseListener(new MouseAdapter()
	2493	+ {
	2494	+ public void mousePressed(MouseEvent e)
	2495	+ {
	2496	+ int x = e.getX();
	2497	+
	2498	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2499	+ }
	2500	+ });
	2501	+
	2502	+ huelabel.add(hue);
	2503	+ huelabel.preferredWidth = 20;
	2504	+ huepanel.add(new cGridBag()); // Label
	2505	+ huepanel.add(huelabel); // Field/slider
	2506	+
	2507	+ huepanel.preferredHeight = 7;
1496	2508
1497		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1498		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1499		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1500		- aConstraints.gridx += 1;
1501		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1502		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1503		- aConstraints.gridx = 0;
1504		- aConstraints.gridy += 1;
1505		- aConstraints.gridwidth = 1;
	2509	+ colorSection.add(huepanel);
	2510	+
	2511	+ cGridBag color = new cGridBag();
	2512	+
	2513	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2514	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2515	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1506	2516
1507		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1508		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1510		- aConstraints.gridx += 1;
1511		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1512		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1513		- aConstraints.gridx = 0;
1514		- aConstraints.gridy += 1;
1515		- aConstraints.gridwidth = 1;
	2517	+ //colorField.preferredWidth = 200;
	2518	+ colorSection.add(color);
1516	2519
1517		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1518		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1519		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1520		- aConstraints.gridx += 1;
1521		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1522		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1523		- aConstraints.gridx = 0;
1524		- aConstraints.gridy += 1;
1525		- aConstraints.gridwidth = 1;
	2520	+ cGridBag modulation = new cGridBag();
	2521	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2522	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2523	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2524	+ colorSection.add(modulation);
1526	2525
1527		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1528		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1530		- aConstraints.gridx += 1;
1531		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1532		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	2526	+ cGridBag opacity = new cGridBag();
	2527	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2528	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2529	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2530	+ colorSection.add(opacity);
1536	2531
1537		- //aConstraints.weighty = 1;
1538		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1539		- //aConstraints.gridx += 1;
1540		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1541		- aConstraints.weighty = 0;
1542		- aConstraints.gridx = 0;
1543		- aConstraints.gridy += 1;
1544		- aConstraints.gridwidth = 1;
	2532	+ colorSection.add(GetSeparator());
	2533	+
	2534	+ cGridBag texture = new cGridBag();
	2535	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2536	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2537	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2538	+ colorSection.add(texture);
1545	2539
1546		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1547		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1548		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1549		- aConstraints.gridx += 1;
1550		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1551		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1552		- aConstraints.gridx = 0;
1553		- aConstraints.gridy += 1;
1554		- aConstraints.gridwidth = 1;
	2540	+ panel.add(GetSeparator());
	2541	+
	2542	+ panel.add(colorSection);
	2543	+
	2544	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2545	+
	2546	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2547	+
	2548	+ cGridBag diffuse = new cGridBag();
	2549	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2550	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2551	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2552	+ diffuseSection.add(diffuse);
1555	2553
1556		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1557		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1558		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1559		- aConstraints.gridx += 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1561		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1562		- aConstraints.gridx = 0;
1563		- aConstraints.gridy += 1;
1564		- aConstraints.gridwidth = 1;
	2554	+ cGridBag diffuseness = new cGridBag();
	2555	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2556	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2557	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2558	+ diffuseSection.add(diffuseness);
1565	2559
1566		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1567		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1568		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1569		- aConstraints.gridx += 1;
1570		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1571		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1572		- aConstraints.gridx = 0;
1573		- aConstraints.gridy += 1;
1574		- aConstraints.gridwidth = 1;
	2560	+ cGridBag selfshadow = new cGridBag();
	2561	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2562	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2563	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2564	+ diffuseSection.add(selfshadow);
1575	2565
1576		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1577		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1579		- aConstraints.gridx += 1;
1580		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1581		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1582		- aConstraints.gridx = 0;
1583		- aConstraints.gridy += 1;
1584		- aConstraints.gridwidth = 1;
	2566	+ cGridBag sheen = new cGridBag();
	2567	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2568	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2569	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2570	+ diffuseSection.add(sheen);
1585	2571
1586		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1587		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1588		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1589		- aConstraints.gridx += 1;
1590		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1591		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1592		- aConstraints.gridx = 0;
1593		- aConstraints.gridy += 1;
1594		- aConstraints.gridwidth = 1;
	2572	+ cGridBag subsurface = new cGridBag();
	2573	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2574	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2575	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2576	+ diffuseSection.add(subsurface);
1595	2577
1596		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1597		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1598		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1599		- aConstraints.gridx += 1;
1600		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1601		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1602		- aConstraints.gridx = 0;
1603		- aConstraints.gridy += 1;
1604		- aConstraints.gridwidth = 1;
	2578	+ cGridBag shadow = new cGridBag();
	2579	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2580	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2581	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2582	+ diffuseSection.add(shadow);
1605	2583
1606		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1607		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1608		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1609		- aConstraints.gridx += 1;
1610		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1611		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	2584	+ cGridBag fakedepth = new cGridBag();
	2585	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2586	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2587	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2588	+ diffuseSection.add(fakedepth);
1615	2589
1616		- //aConstraints.weighty = 1;
1617		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1618		- //aConstraints.gridx += 1;
1619		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1620		- aConstraints.weighty = 0;
1621		- aConstraints.gridx = 0;
1622		- aConstraints.gridy += 1;
1623		- aConstraints.gridwidth = 1;
	2590	+ cGridBag shadowbias = new cGridBag();
	2591	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2592	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2593	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2594	+ diffuseSection.add(shadowbias);
1624	2595
1625		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1626		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1627		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1628		- aConstraints.gridx += 1;
1629		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1630		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1631		- aConstraints.gridx = 0;
1632		- aConstraints.gridy += 1;
1633		- aConstraints.gridwidth = 1;
	2596	+ panel.add(GetSeparator());
	2597	+
	2598	+ panel.add(diffuseSection);
	2599	+
	2600	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2601	+
	2602	+ cGridBag specularSection = new cGridBag().setVertical(true);
1634	2603
1635		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1636		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1638		- aConstraints.gridx += 1;
1639		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1640		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1641		- aConstraints.gridx = 0;
1642		- aConstraints.gridy += 1;
1643		- aConstraints.gridwidth = 1;
	2604	+ cGridBag specular = new cGridBag();
	2605	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2606	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2607	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2608	+ specularSection.add(specular);
1644	2609
1645		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1646		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1648		- aConstraints.gridx += 1;
1649		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1650		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1651		- aConstraints.gridx = 0;
1652		- aConstraints.gridy += 1;
1653		- aConstraints.gridwidth = 1;
	2610	+ cGridBag lightarea = new cGridBag();
	2611	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2612	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2613	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2614	+ specularSection.add(lightarea);
1654	2615
1655		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1656		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1658		- aConstraints.gridx += 1;
1659		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1660		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1661		- aConstraints.gridx = 0;
1662		- aConstraints.gridy += 1;
1663		- aConstraints.gridwidth = 1;
	2616	+ cGridBag shininess = new cGridBag();
	2617	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2618	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2619	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2620	+ specularSection.add(shininess);
1664	2621
1665		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1666		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1667		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1668		- aConstraints.gridx += 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1670		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1671		- aConstraints.gridx = 0;
1672		- aConstraints.gridy += 1;
1673		- aConstraints.gridwidth = 1;
	2622	+ cGridBag metalness = new cGridBag();
	2623	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2624	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2625	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2626	+ specularSection.add(metalness);
1674	2627
1675		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1676		- Return();
	2628	+ cGridBag velvet = new cGridBag();
	2629	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2630	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2631	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2632	+ specularSection.add(velvet);
	2633	+
	2634	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2635	+ //Return();
1677	2636	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1678	2637	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679	2638	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1684,130 +2643,99 @@
1684	2643	// aConstraints.gridy += 1;
1685	2644	// aConstraints.gridwidth = 1;
1686	2645
1687		- //aConstraints.weighty = 1;
1688		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1689		- //aConstraints.gridx += 1;
1690		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1691		- aConstraints.weighty = 0;
1692		- aConstraints.gridx = 0;
1693		- aConstraints.gridy += 1;
1694		- aConstraints.gridwidth = 1;
	2646	+ cGridBag anisoU = new cGridBag();
	2647	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2648	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2649	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2650	+ specularSection.add(anisoU);
1695	2651
1696		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1697		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1699		- aConstraints.gridx += 1;
1700		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1701		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1702		- aConstraints.gridx = 0;
1703		- aConstraints.gridy += 1;
1704		- aConstraints.gridwidth = 1;
	2652	+ cGridBag anisoV = new cGridBag();
	2653	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2654	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2655	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2656	+ specularSection.add(anisoV);
1705	2657
1706		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1707		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1709		- aConstraints.gridx += 1;
1710		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1711		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1712		- aConstraints.gridx = 0;
1713		- aConstraints.gridy += 1;
1714		- aConstraints.gridwidth = 1;
1715	2658
1716		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1717		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1718		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1719		- aConstraints.gridx += 1;
1720		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1721		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1722		- aConstraints.gridx = 0;
1723		- aConstraints.gridy += 1;
1724		- aConstraints.gridwidth = 1;
	2659	+ panel.add(GetSeparator());
	2660	+
	2661	+ panel.add(specularSection);
	2662	+
	2663	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2664	+
	2665	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1725	2666
1726		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1727		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1728		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1729		- aConstraints.gridx += 1;
1730		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1731		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1732		- aConstraints.gridx = 0;
1733		- aConstraints.gridy += 1;
1734		- aConstraints.gridwidth = 1;
1735		- aConstraints.weighty = 0;
	2667	+ cGridBag camera = new cGridBag();
	2668	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2669	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2670	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2671	+ colorSection.add(camera);
1736	2672
1737		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1738		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1739		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1740		- aConstraints.gridx += 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1742		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1743		- aConstraints.gridx = 0;
1744		- aConstraints.gridy += 1;
1745		- aConstraints.gridwidth = 1;
	2673	+ cGridBag ambient = new cGridBag();
	2674	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2675	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2676	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2677	+ colorSection.add(ambient);
1746	2678
1747		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1748		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1749		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1750		- aConstraints.gridx += 1;
1751		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1752		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1753		- aConstraints.gridx = 0;
1754		- aConstraints.gridy += 1;
1755		- aConstraints.gridwidth = 1;
	2679	+ cGridBag backlit = new cGridBag();
	2680	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2681	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2682	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2683	+ colorSection.add(backlit);
1756	2684
1757		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1758		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1759		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1760		- aConstraints.gridx += 1;
1761		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1762		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1763		- aConstraints.gridx = 0;
1764		- aConstraints.gridy += 1;
1765		- aConstraints.gridwidth = 1;
	2685	+ //panel.add(new JSeparator());
	2686	+
	2687	+ //panel.add(globalSection);
	2688	+
	2689	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2690	+
	2691	+ cGridBag textureSection = new cGridBag().setVertical(true);
1766	2692
1767		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1768		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1769		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1770		- aConstraints.gridx += 1;
1771		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1772		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1773		- aConstraints.gridx = 0;
1774		- aConstraints.gridy += 1;
1775		- aConstraints.gridwidth = 1;
	2693	+ cGridBag bump = new cGridBag();
	2694	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2695	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2696	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2697	+ textureSection.add(bump);
1776	2698
1777		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1778		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1779		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1780		- aConstraints.gridx += 1;
1781		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1782		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1783		- aConstraints.gridx = 0;
1784		- aConstraints.gridy += 1;
1785		- aConstraints.gridwidth = 1;
	2699	+ cGridBag noise = new cGridBag();
	2700	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2701	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2702	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2703	+ textureSection.add(noise);
1786	2704
1787		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1788		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1790		- aConstraints.gridx += 1;
1791		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1792		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1793		- aConstraints.gridx = 0;
1794		- aConstraints.gridy += 1;
1795		- aConstraints.gridwidth = 1;
	2705	+ cGridBag power = new cGridBag();
	2706	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2707	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2708	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2709	+ textureSection.add(power);
1796	2710
1797		- //aConstraints.weighty = 1;
1798		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1799		- //aConstraints.gridx += 1;
1800		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1801		- aConstraints.weighty = 0;
	2711	+ cGridBag borderfade = new cGridBag();
	2712	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2713	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2714	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2715	+ textureSection.add(borderfade);
1802	2716
1803		- aConstraints.gridx = 0;
1804		- aConstraints.gridy = 0;
1805		- aConstraints.gridwidth = 1;
	2717	+ cGridBag fog = new cGridBag();
	2718	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2719	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2720	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2721	+ textureSection.add(fog);
	2722	+
	2723	+ cGridBag opacityPower = new cGridBag();
	2724	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2725	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2726	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2727	+ textureSection.add(opacityPower);
	2728	+
	2729	+ panel.add(GetSeparator());
	2730	+
	2731	+ panel.add(textureSection);
	2732	+
	2733	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1806	2734
1807	2735	SetMaterial(copy); // .GetMaterial());
1808	2736
1809		- colorField.addChangeListener(this);
1810		- modulationField.addChangeListener(this);
	2737	+ //colorField.addChangeListener(this);
	2738	+// modulationField.addChangeListener(this);
1811	2739	metalnessField.addChangeListener(this);
1812	2740	diffuseField.addChangeListener(this);
1813	2741	specularField.addChangeListener(this);
..	..	@@ -1837,12 +2765,15 @@
1837	2765	opacityPowerField.addChangeListener(this);
1838	2766	/**/
1839	2767
1840		- resetSlidersButton.addActionListener(this);
1841	2768	clearMaterialButton.addActionListener(this);
1842	2769	createMaterialButton.addActionListener(this);
1843		-
1844		- propagateToggle.addItemListener(this);
1845		- multiplyToggle.addItemListener(this);
	2770	+
	2771	+ if (Globals.ADVANCED)
	2772	+ {
	2773	+ resetSlidersButton.addActionListener(this);
	2774	+ propagateToggle.addItemListener(this);
	2775	+ multiplyToggle.addItemListener(this);
	2776	+ }
1846	2777	}
1847	2778
1848	2779	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1860,8 +2791,9 @@
1860	2791	// 3D models
1861	2792	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1862	2793	{
1863		- lastConverter = new com.jmex.model.converters.MaxToJme();
1864		- LoadFile(filename, lastConverter);
	2794	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2795	+ //LoadFile(filename, lastConverter);
	2796	+ LoadObjFile(filename); // New 3ds loader
1865	2797	continue;
1866	2798	}
1867	2799	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2013,7 +2945,7 @@
2013	2945
2014	2946	//? flashIt = false;
2015	2947	CameraPane pane = (CameraPane) cameraView;
2016		- pane.clickStart(location.x, location.y, 0);
	2948	+ pane.clickStart(location.x, location.y, 0, 0);
2017	2949	pane.clickEnd(location.x, location.y, 0, true);
2018	2950
2019	2951	if (group.selection.size() == 1)
..	..	@@ -2062,6 +2994,7 @@
2062	2994	e2.printStackTrace();
2063	2995	}
2064	2996	}
	2997	+
2065	2998	LoadJMEThread loadThread;
2066	2999
2067	3000	class LoadJMEThread extends Thread
..	..	@@ -2119,6 +3052,7 @@
2119	3052	//LoadFile0(filename, converter);
2120	3053	}
2121	3054	}
	3055	+
2122	3056	LoadOBJThread loadObjThread;
2123	3057
2124	3058	class LoadOBJThread extends Thread
..	..	@@ -2197,19 +3131,19 @@
2197	3131
2198	3132	void LoadObjFile(String fullname)
2199	3133	{
2200		- /*
	3134	+ System.out.println("Loading " + fullname);
	3135	+ /**/
2201	3136	//lastFilename = fullname;
2202	3137	if(loadObjThread == null)
2203	3138	{
2204		- loadObjThread = new LoadOBJThread();
2205		- loadObjThread.start();
	3139	+ loadObjThread = new LoadOBJThread();
	3140	+ loadObjThread.start();
2206	3141	}
2207	3142
2208	3143	loadObjThread.add(fullname);
2209		- */
	3144	+ /**/
2210	3145
2211		- System.out.println("Loading " + fullname);
2212		- makeSomething(new FileObject(fullname, true), true);
	3146	+ //makeSomething(new FileObject(fullname, true), true);
2213	3147	}
2214	3148
2215	3149	void LoadGFDFile(String fullname)
..	..	@@ -2470,11 +3404,11 @@
2470	3404
2471	3405	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2472	3406	{
2473		- if (GrafreeD.standAlone)
	3407	+ if (Grafreed.standAlone)
2474	3408	{
2475	3409	/**/
2476	3410	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2477		- browser.show();
	3411	+ browser.setVisible(true);
2478	3412	String filename = browser.getFile();
2479	3413	if (filename != null && filename.length() > 0)
2480	3414	{
..	..	@@ -2585,6 +3519,7 @@
2585	3519	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2586	3520	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2587	3521	}
	3522	+
2588	3523	//cJME.count++;
2589	3524	//cJME.count %= 12;
2590	3525	if (gc)
..	..	@@ -2619,6 +3554,7 @@
2619	3554	}
2620	3555	if (input == null)
2621	3556	{
	3557	+ new Exception().printStackTrace();
2622	3558	System.exit(0);
2623	3559	}
2624	3560
..	..	@@ -2767,6 +3703,7 @@
2767	3703	}
2768	3704	}
2769	3705	}
	3706	+
2770	3707	cFileSystemPane FSPane;
2771	3708
2772	3709	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2776,7 +3713,7 @@
2776	3713
2777	3714	freezematerial = true;
2778	3715	colorField.setFloat(mat.color);
2779		- modulationField.setFloat(mat.modulation);
	3716	+ saturationField.setFloat(mat.modulation);
2780	3717	metalnessField.setFloat(mat.metalness);
2781	3718	diffuseField.setFloat(mat.diffuse);
2782	3719	specularField.setFloat(mat.specular);
..	..	@@ -2820,11 +3757,14 @@
2820	3757	}
2821	3758	}
2822	3759	}
	3760	+
2823	3761	freezematerial = false;
2824	3762	}
2825	3763
2826	3764	void SetMaterial(Object3D object)
2827	3765	{
	3766	+ latestObject = object;
	3767	+
2828	3768	cMaterial mat = object.material;
2829	3769
2830	3770	if (mat == null)
..	..	@@ -2833,33 +3773,10 @@
2833	3773	return;
2834	3774	}
2835	3775
2836		- multiplyToggle.setSelected(mat.multiply);
2837		-
2838		- assert (object.projectedVertices != null);
2839		-
2840		- if (object.projectedVertices.length <= 2)
2841		- {
2842		- // Side effect...
2843		- Object3D.cVector2[] keep = object.projectedVertices;
2844		- object.projectedVertices = new Object3D.cVector2[3];
2845		- for (int i = 0; i < 3; i++)
2846		- {
2847		- if (i < keep.length)
2848		- {
2849		- object.projectedVertices[i] = keep[i];
2850		- } else
2851		- {
2852		- object.projectedVertices[i] = new Object3D.cVector2();
2853		- }
2854		- /*
2855		- if(keep.length == 0)
2856		- object.projectedVertices[0] = new Object3D.cVector2();
2857		- else
2858		- object.projectedVertices[0] = keep[0];
2859		- object.projectedVertices[1] = new Object3D.cVector2();
2860		- */
2861		- }
2862		- }
	3776	+ if (multiplyToggle != null)
	3777	+ multiplyToggle.setSelected(mat.multiply);
	3778	+
	3779	+ AllocProjectedVertices(object);
2863	3780
2864	3781	SetMaterial(mat, object.projectedVertices);
2865	3782	}
..	..	@@ -2935,12 +3852,17 @@
2935	3852	// }
2936	3853
2937	3854	/**/
2938		- if (deselect)
	3855	+ if (deselect \|\| child == null)
2939	3856	{
2940	3857	//group.deselectAll();
2941	3858	//freeze = true;
2942	3859	GetTree().clearSelection();
2943	3860	//freeze = false;
	3861	+
	3862	+ if (child == null)
	3863	+ {
	3864	+ return;
	3865	+ }
2944	3866	}
2945	3867
2946	3868	//group.addSelectee(child);
..	..	@@ -2974,6 +3896,17 @@
2974	3896	public void itemStateChanged(ItemEvent event)
2975	3897	{
2976	3898	// System.out.println("Propagate = " + propagate);
	3899	+ if (event.getSource() == pinButton)
	3900	+ {
	3901	+ copy.pinned ^= true;
	3902	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3903	+ {
	3904	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3905	+ copy.CloseUI();
	3906	+ //copy.editWindow.refreshContents();
	3907	+ }
	3908	+ }
	3909	+ else
2977	3910	if (event.getSource() == propagateToggle)
2978	3911	{
2979	3912	propagate ^= true;
..	..	@@ -3009,7 +3942,7 @@
3009	3942	cameraView.ToggleDL();
3010	3943	cameraView.repaint();
3011	3944	return;
3012		- } else if (event.getSource() == toggleTextureItem)
	3945	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3013	3946	{
3014	3947	cameraView.ToggleTexture();
3015	3948	// june 2013 copy.HardTouch();
..	..	@@ -3048,9 +3981,9 @@
3048	3981	frame.validate();
3049	3982
3050	3983	return;
3051		- } else if (event.getSource() == toggleRandomItem)
	3984	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3052	3985	{
3053		- cameraView.ToggleRandom();
	3986	+ cameraView.ToggleSwitch();
3054	3987	cameraView.repaint();
3055	3988	return;
3056	3989	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3078,12 +4011,17 @@
3078	4011	} else if (event.getSource() == liveCB)
3079	4012	{
3080	4013	copy.live ^= true;
	4014	+ objEditor.refreshContents(true); // To show item colors
	4015	+ return;
	4016	+ } else if (event.getSource() == selectableCB)
	4017	+ {
	4018	+ copy.dontselect ^= true;
3081	4019	return;
3082	4020	} else if (event.getSource() == hideCB)
3083	4021	{
3084	4022	copy.hide ^= true;
3085	4023	copy.Touch(); // display list issue
3086		- objEditor.refreshContents();
	4024	+ objEditor.refreshContents(true); // To show item colors
3087	4025	return;
3088	4026	} else if (event.getSource() == link2masterCB)
3089	4027	{
..	..	@@ -3093,6 +4031,7 @@
3093	4031	if (event.getSource() == randomCB)
3094	4032	{
3095	4033	copy.random ^= true;
	4034	+ objEditor.refreshContents();
3096	4035	return;
3097	4036	}
3098	4037	if (event.getSource() == speedupCB)
..	..	@@ -3116,8 +4055,9 @@
3116	4055
3117	4056	public void actionPerformed(ActionEvent event)
3118	4057	{
	4058	+ Object source = event.getSource();
3119	4059	// SCRIPT DIALOG
3120		- if (event.getSource() == okbutton)
	4060	+ if (source == okbutton)
3121	4061	{
3122	4062	textpanel.setVisible(false);
3123	4063	textpanel.remove(textarea);
..	..	@@ -3129,7 +4069,7 @@
3129	4069	textarea = null;
3130	4070	textpanel = null;
3131	4071	}
3132		- if (event.getSource() == cancelbutton)
	4072	+ if (source == cancelbutton)
3133	4073	{
3134	4074	textpanel.setVisible(false);
3135	4075	textpanel.remove(textarea);
..	..	@@ -3141,50 +4081,50 @@
3141	4081	//applySelf();
3142	4082	//client.refreshEditWindow();
3143	4083	//refreshContents();
3144		- if (event.getSource() == nameField)
	4084	+ if (source == nameField)
3145	4085	{
3146	4086	//System.out.println("ObjEditor " + event);
3147	4087	applySelf0(true);
3148	4088	//parent.applySelf();
3149		- objEditor.refreshContents();
3150		- } else if (event.getSource() == resetButton)
	4089	+ // conflicts with requestFocus objEditor.refreshContents();
	4090	+ } else if (source == resetButton)
3151	4091	{
3152	4092	CameraPane.fullreset = true;
3153	4093	copy.Reset(); // ResetMeshes();
3154	4094	copy.Touch();
3155	4095	objEditor.refreshContents();
3156		- } else if (event.getSource() == stepItem)
	4096	+ } else if (source == stepItem)
3157	4097	{
3158	4098	//cameraView.ONESTEP = true;
3159	4099	Globals.ONESTEP = true;
3160	4100	cameraView.repaint();
3161	4101	return;
3162		- } else if (event.getSource() == stepButton)
	4102	+ } else if (source == stepButton)
3163	4103	{
3164	4104	copy.Step();
3165	4105	copy.Touch();
3166	4106	objEditor.refreshContents();
3167		- } else if (event.getSource() == slowerButton)
	4107	+ } else if (source == slowerButton)
3168	4108	{
3169	4109	copy.Slower();
3170	4110	copy.Touch();
3171	4111	objEditor.refreshContents();
3172		- } else if (event.getSource() == fasterButton)
	4112	+ } else if (source == fasterButton)
3173	4113	{
3174	4114	copy.Faster();
3175	4115	copy.Touch();
3176	4116	objEditor.refreshContents();
3177		- } else if (event.getSource() == remarkButton)
	4117	+ } else if (source == remarkButton)
3178	4118	{
3179	4119	copy.Remark();
3180	4120	copy.Touch();
3181	4121	objEditor.refreshContents();
3182		- } else if (event.getSource() == stepAllButton)
	4122	+ } else if (source == stepAllButton)
3183	4123	{
3184	4124	copy.StepAll();
3185	4125	copy.Touch();
3186	4126	objEditor.refreshContents();
3187		- } else if (event.getSource() == resetAllButton)
	4127	+ } else if (source == resetAllButton)
3188	4128	{
3189	4129	//CameraPane.fullreset = true;
3190	4130	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3217,53 +4157,79 @@
3217	4157	// Close();
3218	4158	// }
3219	4159	// else
3220		- if (event.getSource() == resetSlidersButton)
	4160	+ if (source == resetSlidersButton)
3221	4161	{
3222	4162	ResetSliders();
3223		- } else if (event.getSource() == clearMaterialButton)
	4163	+ } else if (source == clearMaterialButton)
3224	4164	{
3225	4165	ClearMaterial();
3226		- } else if (event.getSource() == createMaterialButton)
	4166	+ } else if (source == createMaterialButton)
3227	4167	{
3228	4168	CreateMaterial();
3229		- } else if (event.getSource() == clearPanelButton)
	4169	+ } else if (source == clearPanelButton)
3230	4170	{
3231	4171	copy.ClearUI();
3232	4172	refreshContents(true);
3233		- } /*
3234		- }
3235		-
3236		- public boolean action(Event event, Object arg)
3237		- {
3238		- */ else if (event.getSource() == closeItem)
	4173	+ } else if (source == importGFDItem)
	4174	+ {
	4175	+ ImportGFD();
	4176	+ } else
	4177	+ if (source == importVRMLX3DItem)
	4178	+ {
	4179	+ ImportVRMLX3D();
	4180	+ } else
	4181	+ if (source == import3DSItem)
	4182	+ {
	4183	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4184	+ } else
	4185	+ if (source == importOBJItem)
	4186	+ {
	4187	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4188	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4189	+ browser.setVisible(true);
	4190	+ String filename = browser.getFile();
	4191	+ if (filename != null && filename.length() > 0)
	4192	+ {
	4193	+ String fullname = browser.getDirectory() + filename;
	4194	+ makeSomething(ReadOBJ(fullname), true);
	4195	+ }
	4196	+ } else
	4197	+ if (source == closeItem)
3239	4198	{
3240	4199	Close();
3241	4200	//return true;
3242		- } else if (event.getSource() == loadItem)
	4201	+ } else if (source == openItem)
3243	4202	{
3244		- load();
	4203	+ Open();
3245	4204	//return true;
3246		- } else if (event.getSource() == saveItem)
	4205	+ } else if (source == newItem)
	4206	+ {
	4207	+ New();
	4208	+ } else if (source == saveItem)
3247	4209	{
3248	4210	save();
3249	4211	//return true;
3250		- } else if (event.getSource() == saveAsItem)
	4212	+ } else if (source == saveAsItem)
3251	4213	{
3252	4214	saveAs();
3253	4215	//return true;
3254		- } else if (event.getSource() == reexportItem)
	4216	+ } else if (source == reexportItem)
3255	4217	{
3256	4218	reexport();
3257	4219	//return true;
3258		- } else if (event.getSource() == exportAsItem)
	4220	+ } else if (source == exportAsItem)
3259	4221	{
3260	4222	export();
3261	4223	//return true;
3262		- } else if (event.getSource() == povItem)
	4224	+ } else if (source == povItem)
3263	4225	{
3264	4226	generatePOV();
3265	4227	//return true;
3266		- } else if (event.getSource() == zBufferItem)
	4228	+ } else if (event.getSource() == archiveItem)
	4229	+ {
	4230	+ cTools.Archive(frame);
	4231	+ return;
	4232	+ } else if (source == zBufferItem)
3267	4233	{
3268	4234	try
3269	4235	{
..	..	@@ -3285,21 +4251,8 @@
3285	4251	cameraView.repaint();
3286	4252	//return true;
3287	4253	}
3288		- */ else if (event.getSource() == editCameraItem)
3289		- {
3290		- cameraView.ProtectCamera();
3291		- cameraView.repaint();
3292		- return;
3293		- } else if (event.getSource() == revertCameraItem)
3294		- {
3295		- cameraView.RevertCamera();
3296		- cameraView.repaint();
3297		- return;
3298		-// } else if (event.getSource() == textureButton)
3299		-// {
3300		-// return; // true;
3301		- } else // combos...
3302		- if (event.getSource() == texresMenu)
	4254	+ */ else // combos...
	4255	+ if (source == texresMenu)
3303	4256	{
3304	4257	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3305	4258	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3311,12 +4264,503 @@
3311	4264	}
3312	4265	}
3313	4266
	4267	+ void New()
	4268	+ {
	4269	+ while (copy.Size() > 0)
	4270	+ {
	4271	+ copy.remove(0);
	4272	+ }
	4273	+
	4274	+ copy.selection.clear();
	4275	+
	4276	+ if (copy == Grafreed.grafreed.universe)
	4277	+ {
	4278	+ CreateCameras();
	4279	+ cameraView.SetCamera(GetCamera(copy, 0));
	4280	+ }
	4281	+ ResetModel();
	4282	+ objEditor.refreshContents();
	4283	+ }
	4284	+
	4285	+ static public byte[] Compress(Object3D o)
	4286	+ {
	4287	+ // Slower to actually compress.
	4288	+ try
	4289	+ {
	4290	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4291	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4292	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4293	+
	4294	+ Object3D parent = o.parent;
	4295	+ o.parent = null;
	4296	+
	4297	+ out.writeObject(o);
	4298	+
	4299	+ o.parent = parent;
	4300	+
	4301	+ out.flush();
	4302	+
	4303	+ baos //zstream
	4304	+ .close();
	4305	+ out.close();
	4306	+
	4307	+ byte[] bytes = baos.toByteArray();
	4308	+
	4309	+ System.out.println("save #bytes = " + bytes.length);
	4310	+ return bytes;
	4311	+ } catch (Exception e)
	4312	+ {
	4313	+ System.err.println(e);
	4314	+ return null;
	4315	+ }
	4316	+ }
	4317	+
	4318	+ static public Object Uncompress(byte[] bytes)
	4319	+ {
	4320	+ System.out.println("restore #bytes = " + bytes.length);
	4321	+ try
	4322	+ {
	4323	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4324	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4325	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4326	+ Object obj = in.readObject();
	4327	+
	4328	+ bais //istream
	4329	+ .close();
	4330	+ in.close();
	4331	+
	4332	+ return obj;
	4333	+ } catch (Exception e)
	4334	+ {
	4335	+ System.err.println(e);
	4336	+ return null;
	4337	+ }
	4338	+ }
	4339	+
	4340	+ static public Object clone(Object o)
	4341	+ {
	4342	+ try
	4343	+ {
	4344	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4345	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4346	+
	4347	+ out.writeObject(o);
	4348	+
	4349	+ out.flush();
	4350	+ out.close();
	4351	+
	4352	+ byte[] bytes = baos.toByteArray();
	4353	+
	4354	+ System.out.println("clone = " + bytes.length);
	4355	+
	4356	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4357	+ ObjectInputStream in = new ObjectInputStream(bais);
	4358	+ Object obj = in.readObject();
	4359	+ in.close();
	4360	+
	4361	+ return obj;
	4362	+ } catch (Exception e)
	4363	+ {
	4364	+ System.err.println(e);
	4365	+ return null;
	4366	+ }
	4367	+ }
	4368	+
	4369	+ cRadio GetCurrentTab()
	4370	+ {
	4371	+ cRadio ab;
	4372	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4373	+ {
	4374	+ ab = (cRadio)e.nextElement();
	4375	+ if(ab.GetObject() == copy)
	4376	+ {
	4377	+ return ab;
	4378	+ }
	4379	+ }
	4380	+
	4381	+ return null;
	4382	+ }
	4383	+
	4384	+
	4385	+ public void Save()
	4386	+ {
	4387	+ //Save(true);
	4388	+ Replace();
	4389	+ SetVersionStates();
	4390	+ }
	4391	+
	4392	+ private boolean Equal(byte[] compress, byte[] name)
	4393	+ {
	4394	+ if (compress.length != name.length)
	4395	+ {
	4396	+ return false;
	4397	+ }
	4398	+
	4399	+ for (int i=compress.length; --i>=0;)
	4400	+ {
	4401	+ if (compress[i] != name[i])
	4402	+ return false;
	4403	+ }
	4404	+
	4405	+ return true;
	4406	+ }
	4407	+
	4408	+ void DeleteVersion()
	4409	+ {
	4410	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4411	+ {
	4412	+ copy.versionlist[i] = copy.versionlist[i+1];
	4413	+ }
	4414	+
	4415	+ if (copy.versionlist[copy.versionindex] == null)
	4416	+ copy.versionindex -= 1;
	4417	+
	4418	+ if (copy.versionindex != -1)
	4419	+ CopyChanged();
	4420	+
	4421	+ SetVersionStates();
	4422	+ }
	4423	+
	4424	+ public boolean Save(boolean user)
	4425	+ {
	4426	+ System.err.println("Save");
	4427	+ Replace();
	4428	+
	4429	+ //cRadio tab = GetCurrentTab();
	4430	+
	4431	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4432	+
	4433	+ boolean thesame = false;
	4434	+
	4435	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4436	+// {
	4437	+// thesame = true;
	4438	+// }
	4439	+
	4440	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4441	+ if (!thesame)
	4442	+ {
	4443	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4444	+ {
	4445	+ copy.versionlist[i] = copy.versionlist[i-1];
	4446	+ }
	4447	+
	4448	+ //tab.user[tab.versionindex] = user;
	4449	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4450	+
	4451	+ copy.versionlist[++copy.versionindex] = compress;
	4452	+
	4453	+ // if (increment)
	4454	+ // tab.versionindex++;
	4455	+ }
	4456	+
	4457	+ //copy.RestoreBigData(versiontable);
	4458	+
	4459	+ //assert(hashtable.isEmpty());
	4460	+
	4461	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4462	+// {
	4463	+// //tab.user[i] = false;
	4464	+// copy.versionlist[i] = null;
	4465	+// }
	4466	+
	4467	+ SetVersionStates();
	4468	+
	4469	+ // test save
	4470	+ if (false)
	4471	+ {
	4472	+ try
	4473	+ {
	4474	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4475	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4476	+
	4477	+ p.writeObject(copy);
	4478	+
	4479	+ p.flush();
	4480	+
	4481	+ ostream.close();
	4482	+ } catch (Exception e)
	4483	+ {
	4484	+ e.printStackTrace();
	4485	+ }
	4486	+ }
	4487	+
	4488	+ return !thesame;
	4489	+ }
	4490	+
	4491	+ boolean flashIt = true;
	4492	+
	4493	+ void RefreshSelection()
	4494	+ {
	4495	+ Object3D selection = new Object3D();
	4496	+
	4497	+ for (int i = 0; i < copy.selection.size(); i++)
	4498	+ {
	4499	+ Object3D elem = copy.selection.elementAt(i);
	4500	+
	4501	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4502	+
	4503	+ if (obj == null)
	4504	+ {
	4505	+ copy.selection.remove(i--);
	4506	+ }
	4507	+ else
	4508	+ {
	4509	+ selection.add(obj);
	4510	+ copy.selection.setElementAt(obj, i);
	4511	+ }
	4512	+ }
	4513	+
	4514	+ flashIt = false;
	4515	+ GetTree().clearSelection();
	4516	+ for (int i = 0; i < selection.size(); i++)
	4517	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4518	+ flashIt = true;
	4519	+
	4520	+ //refreshContents(false);
	4521	+ }
	4522	+
	4523	+ void CopyChanged()
	4524	+ {
	4525	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4526	+
	4527	+ SetVersionStates();
	4528	+
	4529	+ boolean temp = CameraPane.SWITCH;
	4530	+ CameraPane.SWITCH = false;
	4531	+
	4532	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4533	+
	4534	+ copy.clear();
	4535	+
	4536	+ copy.skyboxname = obj.skyboxname;
	4537	+ copy.skyboxext = obj.skyboxext;
	4538	+
	4539	+ for (int i=0; i<obj.Size(); i++)
	4540	+ {
	4541	+ copy.add(obj.get(i));
	4542	+ }
	4543	+
	4544	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4545	+
	4546	+ CameraPane.SWITCH = temp;
	4547	+
	4548	+ RefreshSelection();
	4549	+ //assert(hashtable.isEmpty());
	4550	+
	4551	+ copy.Touch();
	4552	+
	4553	+ ResetModel();
	4554	+ copy.HardTouch(); // recompile?
	4555	+
	4556	+ cRadio ab;
	4557	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4558	+ {
	4559	+ ab = (cRadio)e.nextElement();
	4560	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4561	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4562	+ if (test != null)
	4563	+ {
	4564	+ test.editWindow = ab.object.editWindow;
	4565	+ ab.object = test;
	4566	+ }
	4567	+ }
	4568	+
	4569	+ refreshContents(true);
	4570	+ }
	4571	+
	4572	+ cButton previousVersionButton;
	4573	+ cButton restoreButton;
	4574	+ cButton replaceButton;
	4575	+ cButton nextVersionButton;
	4576	+ cButton saveVersionButton;
	4577	+ cButton deleteVersionButton;
	4578	+
	4579	+ boolean muteSlider;
	4580	+
	4581	+ int VersionCount()
	4582	+ {
	4583	+ int count = 0;
	4584	+
	4585	+ for (int i = copy.versionlist.length; --i >= 0;)
	4586	+ {
	4587	+ if (copy.versionlist[i] != null)
	4588	+ count++;
	4589	+ }
	4590	+
	4591	+ return count;
	4592	+ }
	4593	+
	4594	+ public cGridBag versionSliderPane;
	4595	+
	4596	+ void SetVersionStates()
	4597	+ {
	4598	+ //if (true)
	4599	+ // return;
	4600	+
	4601	+ //cRadio tab = GetCurrentTab();
	4602	+
	4603	+ if (copy.versionlist == null)
	4604	+ {
	4605	+ saveVersionButton.setEnabled(false);
	4606	+ restoreButton.setEnabled(false);
	4607	+ replaceButton.setEnabled(false);
	4608	+ previousVersionButton.setEnabled(false);
	4609	+ nextVersionButton.setEnabled(false);
	4610	+ deleteVersionButton.setEnabled(false);
	4611	+ versionSliderPane.setVisible(false);
	4612	+ }
	4613	+ else
	4614	+ {
	4615	+ restoreButton.setEnabled(copy.versionindex != -1);
	4616	+ replaceButton.setEnabled(copy.versionindex != -1);
	4617	+
	4618	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4619	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4620	+
	4621	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4622	+ //copy.versionlist[copy.versionindex + 1] != null);
	4623	+
	4624	+ muteSlider = true;
	4625	+ versionSlider.setMinimum(0);
	4626	+ versionSlider.setMaximum(VersionCount() - 1);
	4627	+ versionSlider.setInteger(copy.versionindex);
	4628	+ versionSlider.setEnabled(copy.versionindex != -1);
	4629	+ muteSlider = false;
	4630	+
	4631	+ versionSliderPane.setVisible(true);
	4632	+ }
	4633	+ }
	4634	+
	4635	+ public boolean PreviousVersion()
	4636	+ {
	4637	+ // Option?
	4638	+ Replace();
	4639	+
	4640	+ System.err.println("Undo");
	4641	+
	4642	+ //cRadio tab = GetCurrentTab();
	4643	+
	4644	+ if (copy.versionindex == 0)
	4645	+ {
	4646	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4647	+ return false;
	4648	+ }
	4649	+
	4650	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4651	+// {
	4652	+// if (Save(false))
	4653	+// tab.versionindex -= 1;
	4654	+// else
	4655	+// {
	4656	+// if (tab.versionindex <= 0)
	4657	+// return false;
	4658	+// else
	4659	+// tab.versionindex -= 1;
	4660	+// }
	4661	+// }
	4662	+
	4663	+ copy.versionindex -= 1;
	4664	+
	4665	+ CopyChanged();
	4666	+
	4667	+ return true;
	4668	+ }
	4669	+
	4670	+ public boolean Restore()
	4671	+ {
	4672	+ System.err.println("Restore");
	4673	+
	4674	+ //cRadio tab = GetCurrentTab();
	4675	+
	4676	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4677	+ {
	4678	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4679	+ return false;
	4680	+ }
	4681	+
	4682	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4683	+ CopyChanged();
	4684	+
	4685	+ return true;
	4686	+ }
	4687	+
	4688	+ public boolean Replace()
	4689	+ {
	4690	+ //System.err.println("Replace");
	4691	+
	4692	+ //cRadio tab = GetCurrentTab();
	4693	+
	4694	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4695	+ {
	4696	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4697	+ return false;
	4698	+ }
	4699	+
	4700	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4701	+
	4702	+ return true;
	4703	+ }
	4704	+
	4705	+ public void NextVersion()
	4706	+ {
	4707	+ // Option?
	4708	+ Replace();
	4709	+
	4710	+ //cRadio tab = GetCurrentTab();
	4711	+
	4712	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4713	+ {
	4714	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4715	+ return;
	4716	+ }
	4717	+
	4718	+ copy.versionindex += 1;
	4719	+
	4720	+ CopyChanged();
	4721	+
	4722	+ //if (!tab.user[tab.versionindex])
	4723	+ // tab.graphs[tab.versionindex] = null;
	4724	+ }
	4725	+
	4726	+ void ImportGFD()
	4727	+ {
	4728	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4729	+ browser.show();
	4730	+ String filename = browser.getFile();
	4731	+ if (filename != null && filename.length() > 0)
	4732	+ {
	4733	+ String fullname = browser.getDirectory() + filename;
	4734	+
	4735	+ //Object3D readobj =
	4736	+ objEditor.ReadGFD(fullname, objEditor);
	4737	+ //makeSomething(readobj);
	4738	+ }
	4739	+ }
	4740	+
	4741	+ void ImportVRMLX3D()
	4742	+ {
	4743	+ if (Grafreed.standAlone)
	4744	+ {
	4745	+ /**/
	4746	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4747	+ browser.show();
	4748	+ String filename = browser.getFile();
	4749	+ if (filename != null && filename.length() > 0)
	4750	+ {
	4751	+ String fullname = browser.getDirectory() + filename;
	4752	+ LoadVRMLX3D(fullname);
	4753	+ }
	4754	+ /**/
	4755	+ }
	4756	+ }
	4757	+
3314	4758	void ToggleAnimation()
3315	4759	{
3316	4760	if (!Globals.ANIMATION)
3317	4761	{
3318	4762	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3319		- browser.show();
	4763	+ browser.setVisible(true);
3320	4764	String filename = browser.getFile();
3321	4765	if (filename != null && filename.length() > 0)
3322	4766	{
..	..	@@ -3326,8 +4770,8 @@
3326	4770
3327	4771	Globals.ANIMATION ^= true;
3328	4772
3329		- GrafreeD.wav.cursor = 0;
3330		- GrafreeD.wav.loop = 0;
	4773	+ Grafreed.wav.cursor = 0;
	4774	+ Grafreed.wav.loop = 0;
3331	4775	}
3332	4776	} else
3333	4777	{
..	..	@@ -3377,7 +4821,7 @@
3377	4821	void CreateMaterial()
3378	4822	{
3379	4823	//copy.ClearMaterial(); // PATCH
3380		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4824	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3381	4825	if (copy.selection.size() > 0)
3382	4826	//SetMaterial(copy);
3383	4827	{
..	..	@@ -3428,7 +4872,7 @@
3428	4872	assert false;
3429	4873	}
3430	4874
3431		- void EditSelection()
	4875	+ void EditSelection(boolean newWindow)
3432	4876	{
3433	4877	}
3434	4878
..	..	@@ -3436,11 +4880,11 @@
3436	4880	{
3437	4881	copy.ResetBlockLoop(); // temporary problem
3438	4882
3439		- boolean random = CameraPane.RANDOM;
3440		- CameraPane.RANDOM = false; // parse everything
	4883	+ boolean random = CameraPane.SWITCH;
	4884	+ CameraPane.SWITCH = false; // parse everything
3441	4885	copy.ResetDisplayList();
3442	4886	copy.HardTouch();
3443		- CameraPane.RANDOM = random;
	4887	+ CameraPane.SWITCH = random;
3444	4888	}
3445	4889
3446	4890	// public void applySelf()
..	..	@@ -3470,6 +4914,12 @@
3470	4914	// else
3471	4915	// applySelf(true);
3472	4916	// }
	4917	+
	4918	+ boolean Equal(double a, double b)
	4919	+ {
	4920	+ return Math.abs(a - b) < 0.001;
	4921	+ }
	4922	+
3473	4923	void applySelf0(boolean name)
3474	4924	{
3475	4925	if (name)
..	..	@@ -3487,7 +4937,7 @@
3487	4937	//copy.material = new cMaterial(copy.GetMaterial());
3488	4938
3489	4939	current.color = (float) colorField.getFloat();
3490		- current.modulation = (float) modulationField.getFloat();
	4940	+ current.modulation = (float) saturationField.getFloat();
3491	4941	current.metalness = (float) metalnessField.getFloat();
3492	4942	current.diffuse = (float) diffuseField.getFloat();
3493	4943	current.specular = (float) specularField.getFloat();
..	..	@@ -3510,10 +4960,63 @@
3510	4960	current.fakedepth = (float) fakedepthField.getFloat();
3511	4961	current.shadowbias = (float) shadowbiasField.getFloat();
3512	4962
3513		- if (!NumberSlider.frozen)
	4963	+ if (!cNumberSlider.frozen)
3514	4964	{
3515	4965	//System.out.println("Propagate = " + propagate);
3516	4966	copy.UpdateMaterial(anchor, current, propagate);
	4967	+
	4968	+ if (copy.material != null)
	4969	+ {
	4970	+ cMaterial mat = copy.material;
	4971	+
	4972	+ if (!Equal(colorField.getFloat(), mat.color))
	4973	+ colorField.SetToolTipValue((mat.color));
	4974	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4975	+ saturationField.SetToolTipValue((mat.modulation));
	4976	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4977	+ metalnessField.SetToolTipValue((mat.metalness));
	4978	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4979	+ diffuseField.SetToolTipValue((mat.diffuse));
	4980	+ if (!Equal(specularField.getFloat(), mat.specular))
	4981	+ specularField.SetToolTipValue((mat.specular));
	4982	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4983	+ shininessField.SetToolTipValue((mat.shininess));
	4984	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4985	+ shiftField.SetToolTipValue((mat.shift));
	4986	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4987	+ ambientField.SetToolTipValue((mat.ambient));
	4988	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4989	+ lightareaField.SetToolTipValue((mat.lightarea));
	4990	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4991	+ diffusenessField.SetToolTipValue((mat.factor));
	4992	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4993	+ velvetField.SetToolTipValue((mat.velvet));
	4994	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4995	+ sheenField.SetToolTipValue((mat.sheen));
	4996	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4997	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4998	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4999	+ backlitField.SetToolTipValue((mat.bump));
	5000	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5001	+ anisoField.SetToolTipValue((mat.aniso));
	5002	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5003	+ anisoVField.SetToolTipValue((mat.anisoV));
	5004	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5005	+ cameraField.SetToolTipValue((mat.cameralight));
	5006	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5007	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5008	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5009	+ shadowField.SetToolTipValue((mat.shadow));
	5010	+ if (!Equal(textureField.getFloat(), mat.texture))
	5011	+ textureField.SetToolTipValue((mat.texture));
	5012	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5013	+ opacityField.SetToolTipValue((mat.opacity));
	5014	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5015	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5016	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5017	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	5018	+ }
	5019	+
3517	5020	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3518	5021	{
3519	5022	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3542,9 +5045,28 @@
3542	5045	//copy.Touch();
3543	5046	}
3544	5047
	5048	+ cNumberSlider versionSlider;
	5049	+
3545	5050	public void stateChanged(ChangeEvent e)
3546	5051	{
3547		- // assert(false);
	5052	+ // assert(false);
	5053	+ if (e.getSource() == versionSlider)
	5054	+ {
	5055	+ if (muteSlider)
	5056	+ return;
	5057	+
	5058	+ Replace();
	5059	+
	5060	+ int version = versionSlider.getInteger();
	5061	+
	5062	+ if (version != -1 && copy.versionlist[version] != null)
	5063	+ {
	5064	+ copy.versionindex = version;
	5065	+ CopyChanged();
	5066	+ }
	5067	+
	5068	+ return;
	5069	+ }
3548	5070
3549	5071	if (freezematerial)
3550	5072	{
..	..	@@ -3558,6 +5080,7 @@
3558	5080	\|\| e.getSource() == apertureField
3559	5081	\|\| e.getSource() == shadowblurField)
3560	5082	{
	5083	+ new Exception().printStackTrace();
3561	5084	System.exit(0);
3562	5085	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3563	5086	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3579,6 +5102,12 @@
3579	5102	{
3580	5103	//System.out.println("stateChanged = " + this);
3581	5104	materialtouched = true;
	5105	+
	5106	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5107	+ {
	5108	+ saturationField.setFloat(1);
	5109	+ }
	5110	+
3582	5111	applySelf();
3583	5112	//System.out.println("this = " + this);
3584	5113	//System.out.println("PARENT = " + parent);
..	..	@@ -3628,7 +5157,7 @@
3628	5157	}
3629	5158
3630	5159	if (normalpushField != null)
3631		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	5160	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3632	5161	}
3633	5162
3634	5163	void SnapObject()
..	..	@@ -3878,20 +5407,28 @@
3878	5407	{
3879	5408	if (GetTree() != null)
3880	5409	{
	5410	+ GetTree().revalidate();
3881	5411	GetTree().repaint();
3882	5412	}
3883	5413
3884	5414	radioPanel.revalidate();
3885	5415	radioPanel.repaint();
3886		- ctrlPanel.revalidate(); // ? new
	5416	+ ctrlPanel.validate(); // ? new
3887	5417	ctrlPanel.repaint();
3888	5418	}
	5419	+
	5420	+ if (previousVersionButton != null && copy.versionlist != null)
	5421	+ SetVersionStates();
	5422	+
	5423	+ cameraView.requestFocusInWindow();
3889	5424	}
3890	5425
3891	5426	static TweenManager tweenManager = new TweenManager();
3892	5427
3893	5428	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3894	5429	{
	5430	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5431	+ Save();
3895	5432	//Tween.set(thing, 0).target(1).start(tweenManager);
3896	5433	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3897	5434	// if (thing instanceof GenericJointDemo)
..	..	@@ -3915,7 +5452,7 @@
3915	5452	// group = (Composite) group.get(0);
3916	5453	// }
3917	5454
3918		- System.out.println("makeSomething of " + thing);
	5455	+ //System.out.println("makeSomething of " + thing);
3919	5456
3920	5457	/*
3921	5458	if (deselect && jList != null)
..	..	@@ -3978,6 +5515,12 @@
3978	5515	{
3979	5516	ResetModel();
3980	5517	Select(thing.GetTreePath(), true, false); // unselect... false);
	5518	+
	5519	+ if (thing.Size() == 0)
	5520	+ {
	5521	+ //EditSelection(false);
	5522	+ }
	5523	+
3981	5524	refreshContents();
3982	5525	}
3983	5526
..	..	@@ -4095,6 +5638,7 @@
4095	5638	}
4096	5639	}
4097	5640	}
	5641	+
4098	5642	LoadGFDThread loadGFDThread;
4099	5643
4100	5644	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4114,8 +5658,10 @@
4114	5658
4115	5659	try
4116	5660	{
	5661	+ // Try compressed version first.
4117	5662	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4118		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5663	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5664	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4119	5665
4120	5666	readobj = (Object3D) p.readObject();
4121	5667	istream.close();
..	..	@@ -4123,7 +5669,22 @@
4123	5669	readobj.ResetDisplayList();
4124	5670	} catch (Exception e)
4125	5671	{
4126		- e.printStackTrace();
	5672	+ if (!e.toString().contains("GZIP"))
	5673	+ e.printStackTrace();
	5674	+
	5675	+ try
	5676	+ {
	5677	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5678	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5679	+
	5680	+ readobj = (Object3D) p.readObject();
	5681	+ istream.close();
	5682	+
	5683	+ readobj.ResetDisplayList();
	5684	+ } catch (Exception e2)
	5685	+ {
	5686	+ e2.printStackTrace();
	5687	+ }
4127	5688	}
4128	5689	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4129	5690	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4169,6 +5730,12 @@
4169	5730
4170	5731	void LoadIt(Object obj)
4171	5732	{
	5733	+ if (obj == null)
	5734	+ {
	5735	+ // Invalid file
	5736	+ return;
	5737	+ }
	5738	+
4172	5739	System.out.println("Loaded " + obj);
4173	5740	//new Exception().printStackTrace();
4174	5741	Object3D readobj = (Object3D) obj;
..	..	@@ -4178,10 +5745,14 @@
4178	5745
4179	5746	if (readobj != null)
4180	5747	{
	5748	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5749	+ // Save();
4181	5750	try
4182	5751	{
4183	5752	//readobj.deepCopySelf(copy);
4184	5753	copy.clear(); // june 2014
	5754	+ copy.skyboxname = readobj.skyboxname;
	5755	+ copy.skyboxext = readobj.skyboxext;
4185	5756	for (int i = 0; i < readobj.size(); i++)
4186	5757	{
4187	5758	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4222,6 +5793,7 @@
4222	5793	}
4223	5794	} catch (ClassCastException e)
4224	5795	{
	5796	+ e.printStackTrace();
4225	5797	assert (false);
4226	5798	Composite c = (Composite) copy;
4227	5799	c.children.clear();
..	..	@@ -4232,17 +5804,32 @@
4232	5804	c.addChild(csg);
4233	5805	}
4234	5806
	5807	+ copy.versionlist = readobj.versionlist;
	5808	+ copy.versionindex = readobj.versionindex;
	5809	+ copy.versiontable = readobj.versiontable;
	5810	+
	5811	+ if (copy.versionlist == null)
	5812	+ {
	5813	+ // Backward compatibility
	5814	+ copy.versionlist = new Object3D[100];
	5815	+ copy.versionindex = -1;
	5816	+
	5817	+ //Save(true);
	5818	+ }
	5819	+
	5820	+ //? SetUndoStates();
	5821	+
4235	5822	ResetModel();
4236	5823	copy.HardTouch(); // recompile?
4237	5824	refreshContents();
4238	5825	}
4239	5826	}
4240	5827
4241		- void load() // throws ClassNotFoundException
	5828	+ void Open() // throws ClassNotFoundException
4242	5829	{
4243		- if (GrafreeD.standAlone)
	5830	+ if (Grafreed.standAlone)
4244	5831	{
4245		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5832	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4246	5833	browser.show();
4247	5834	String filename = browser.getFile();
4248	5835	if (filename != null && filename.length() > 0)
..	..	@@ -4319,6 +5906,8 @@
4319	5906
4320	5907	void save()
4321	5908	{
	5909	+ Replace();
	5910	+
4322	5911	if (lastname == null)
4323	5912	{
4324	5913	return;
..	..	@@ -4327,11 +5916,13 @@
4327	5916	try
4328	5917	{
4329	5918	FileOutputStream ostream = new FileOutputStream(lastname);
4330		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5919	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5920	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4331	5921
4332	5922	p.writeObject(copy);
4333	5923	p.flush();
4334	5924
	5925	+ zstream.close();
4335	5926	ostream.close();
4336	5927
4337	5928	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4339,19 +5930,23 @@
4339	5930	//ps.print(buffer.toString());
4340	5931	} catch (IOException e)
4341	5932	{
	5933	+ e.printStackTrace();
4342	5934	}
4343	5935	}
	5936	+
4344	5937	String lastname;
4345	5938
4346	5939	void saveAs()
4347	5940	{
4348		- if (GrafreeD.standAlone)
	5941	+ if (Grafreed.standAlone)
4349	5942	{
4350	5943	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4351	5944	browser.setVisible(true);
4352	5945	String filename = browser.getFile();
4353	5946	if (filename != null && filename.length() > 0)
4354	5947	{
	5948	+ if (!filename.endsWith(".gfd"))
	5949	+ filename += ".gfd";
4355	5950	lastname = browser.getDirectory() + filename;
4356	5951	save();
4357	5952	}
..	..	@@ -4450,13 +6045,13 @@
4450	6045	try
4451	6046	{
4452	6047	FileOutputStream ostream = new FileOutputStream(filename);
4453		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4454		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	6048	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	6049	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4455	6050
4456	6051	Object3D objectparent = obj.parent;
4457	6052	obj.parent = null;
4458	6053
4459		- Object3D object = (Object3D) GrafreeD.clone(obj);
	6054	+ Object3D object = (Object3D) Grafreed.clone(obj);
4460	6055
4461	6056	obj.parent = objectparent;
4462	6057
..	..	@@ -4468,8 +6063,8 @@
4468	6063	p.writeObject(object);
4469	6064	p.flush();
4470	6065
	6066	+ zstream.close();
4471	6067	ostream.close();
4472		- // zstream.close();
4473	6068
4474	6069	// group.selection.get(0).parent = parent;
4475	6070	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4490,7 +6085,7 @@
4490	6085	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4491	6086	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4492	6087	copy.generatePOV(buffer);
4493		- if (GrafreeD.standAlone)
	6088	+ if (Grafreed.standAlone)
4494	6089	{
4495	6090	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4496	6091	browser.show();
..	..	@@ -4516,21 +6111,20 @@
4516	6111	Object3D client;
4517	6112	Object3D copy;
4518	6113	MenuBar menuBar;
4519		- Menu windowMenu;
4520		- MenuItem loadItem;
	6114	+ Menu fileMenu;
	6115	+ MenuItem newItem;
	6116	+ MenuItem openItem;
4521	6117	MenuItem saveItem;
4522	6118	MenuItem saveAsItem;
4523	6119	MenuItem exportAsItem;
4524	6120	MenuItem reexportItem;
4525	6121	MenuItem povItem;
4526	6122	MenuItem closeItem;
4527		- Menu cameraMenu;
	6123	+
4528	6124	CheckboxMenuItem zBufferItem;
4529	6125	//MenuItem normalLensItem;
4530		- MenuItem editCameraItem;
4531		- MenuItem revertCameraItem;
4532		- CheckboxMenuItem toggleLiveItem;
4533	6126	MenuItem stepItem;
	6127	+ CheckboxMenuItem toggleLiveItem;
4534	6128	CheckboxMenuItem toggleFullScreenItem;
4535	6129	CheckboxMenuItem toggleTimelineItem;
4536	6130	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4539,28 +6133,44 @@
4539	6133	CheckboxMenuItem toggleFootContactItem;
4540	6134	CheckboxMenuItem toggleDLItem;
4541	6135	CheckboxMenuItem toggleTextureItem;
4542		- CheckboxMenuItem toggleRandomItem;
	6136	+ CheckboxMenuItem toggleSwitchItem;
4543	6137	CheckboxMenuItem toggleRootItem;
4544	6138	CheckboxMenuItem animationItem;
	6139	+ MenuItem archiveItem;
4545	6140	CheckboxMenuItem toggleHandleItem;
4546	6141	CheckboxMenuItem togglePaintItem;
4547	6142	JSplitPane mainPanel;
4548	6143	JScrollPane scrollpane;
	6144	+
4549	6145	JPanel toolbarPanel;
4550		- JPanel treePanel;
	6146	+
	6147	+ cGridBag treePanel;
	6148	+
4551	6149	JPanel radioPanel;
4552	6150	ButtonGroup buttonGroup;
4553		- JPanel ctrlPanel;
4554		- JPanel materialPanel;
	6151	+
	6152	+ cGridBag toolboxPanel;
	6153	+ cGridBag skyboxPanel;
	6154	+ cGridBag materialPanel;
	6155	+ cGridBag ctrlPanel;
	6156	+
4555	6157	JScrollPane infoPanel;
4556		- JPanel optionsPanel;
	6158	+
	6159	+ cGridBag optionsPanel;
	6160	+
4557	6161	JTabbedPane objectPanel;
	6162	+ boolean materialFlushed;
	6163	+ Object3D latestObject;
	6164	+
	6165	+ cGridBag transformPanel;
4558	6166	cGridBag XYZPanel;
	6167	+
4559	6168	JSplitPane gridPanel;
4560	6169	JSplitPane bigPanel;
	6170	+
4561	6171	cGridBag bigThree;
4562		- JTabbedPane scenePanel;
4563		- JPanel centralPanel;
	6172	+ cGridBag scenePanel;
	6173	+ cGridBag centralPanel;
4564	6174	JSplitPane cameraPanel;
4565	6175	JPanel timelinePanel;
4566	6176	JMenuBar timelineMenubar;
..	..	@@ -4613,67 +6223,74 @@
4613	6223	// MATERIAL
4614	6224	JLabel materialLabel;
4615	6225	JLabel colorLabel;
4616		- NumberSlider colorField;
	6226	+ cNumberSlider colorField;
4617	6227	JLabel modulationLabel;
4618		- NumberSlider modulationField;
	6228	+ cNumberSlider saturationField;
4619	6229	JLabel metalnessLabel;
4620		- NumberSlider metalnessField;
	6230	+ cNumberSlider metalnessField;
4621	6231	JLabel diffuseLabel;
4622		- NumberSlider diffuseField;
	6232	+ cNumberSlider diffuseField;
4623	6233	JLabel specularLabel;
4624		- NumberSlider specularField;
	6234	+ cNumberSlider specularField;
4625	6235	JLabel shininessLabel;
4626		- NumberSlider shininessField;
	6236	+ cNumberSlider shininessField;
4627	6237	JLabel shiftLabel;
4628		- NumberSlider shiftField;
	6238	+ cNumberSlider shiftField;
4629	6239	JLabel ambientLabel;
4630		- NumberSlider ambientField;
	6240	+ cNumberSlider ambientField;
4631	6241	JLabel lightareaLabel;
4632		- NumberSlider lightareaField;
	6242	+ cNumberSlider lightareaField;
4633	6243	JLabel diffusenessLabel;
4634		- NumberSlider diffusenessField;
	6244	+ cNumberSlider diffusenessField;
4635	6245	JLabel velvetLabel;
4636		- NumberSlider velvetField;
	6246	+ cNumberSlider velvetField;
4637	6247	JLabel sheenLabel;
4638		- NumberSlider sheenField;
	6248	+ cNumberSlider sheenField;
4639	6249	JLabel subsurfaceLabel;
4640		- NumberSlider subsurfaceField;
	6250	+ cNumberSlider subsurfaceField;
4641	6251	//JLabel bumpLabel;
4642	6252	//NumberSlider bumpField;
4643	6253	JLabel backlitLabel;
4644		- NumberSlider backlitField;
	6254	+ cNumberSlider backlitField;
4645	6255	JLabel anisoLabel;
4646		- NumberSlider anisoField;
	6256	+ cNumberSlider anisoField;
4647	6257	JLabel anisoVLabel;
4648		- NumberSlider anisoVField;
	6258	+ cNumberSlider anisoVField;
	6259	+
4649	6260	JLabel cameraLabel;
4650		- NumberSlider cameraField;
	6261	+ cNumberSlider cameraField;
4651	6262	JLabel selfshadowLabel;
4652		- NumberSlider selfshadowField;
	6263	+ cNumberSlider selfshadowField;
4653	6264	JLabel shadowLabel;
4654		- NumberSlider shadowField;
	6265	+ cNumberSlider shadowField;
4655	6266	JLabel textureLabel;
4656		- NumberSlider textureField;
	6267	+ cNumberSlider textureField;
4657	6268	JLabel opacityLabel;
4658		- NumberSlider opacityField;
	6269	+ cNumberSlider opacityField;
4659	6270	JLabel fakedepthLabel;
4660		- NumberSlider fakedepthField;
	6271	+ cNumberSlider fakedepthField;
4661	6272	JLabel shadowbiasLabel;
4662		- NumberSlider shadowbiasField;
	6273	+ cNumberSlider shadowbiasField;
	6274	+
4663	6275	JLabel bumpLabel;
4664		- NumberSlider bumpField;
	6276	+ cNumberSlider bumpField;
4665	6277	JLabel noiseLabel;
4666		- NumberSlider noiseField;
	6278	+ cNumberSlider noiseField;
4667	6279	JLabel powerLabel;
4668		- NumberSlider powerField;
	6280	+ cNumberSlider powerField;
4669	6281	JLabel borderfadeLabel;
4670		- NumberSlider borderfadeField;
	6282	+ cNumberSlider borderfadeField;
4671	6283	JLabel fogLabel;
4672		- NumberSlider fogField;
	6284	+ cNumberSlider fogField;
4673	6285	JLabel opacityPowerLabel;
4674		- NumberSlider opacityPowerField;
4675		- JTree jTree;
	6286	+ cNumberSlider opacityPowerField;
	6287	+ cTree jTree;
4676	6288	//ObjectUI parent;
4677	6289
4678		- NumberSlider normalpushField;
	6290	+ cNumberSlider normalpushField;
	6291	+
	6292	+ private MenuItem importGFDItem;
	6293	+ private MenuItem importVRMLX3DItem;
	6294	+ private MenuItem import3DSItem;
	6295	+ private MenuItem importOBJItem;
4679	6296	}