~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 cGridBag(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- materialPanel = new cGridBag().setVertical(true);
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,15 +605,22 @@
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());
	622	+// treePanel.setLayout(new GridBagLayout());
	623	+ //ctrlPanel.setLayout(new GridBagLayout());
390	624	//materialPanel.setLayout(new GridBagLayout());
391	625
392	626	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.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,54 +1162,48 @@
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		- cNumberSlider AddSlider(cGridBag 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	1208	cGridBag control = new cGridBag();
820	1209
..	..	@@ -826,12 +1215,12 @@
826	1215	control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827	1216	combo.setFloat(current);
828	1217
829		- ctrlPanel.add(control);
	1218	+ panel.add(control);
830	1219
831		- return combo;
	1220	+ return control;
832	1221	}
833	1222
834		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
	1223	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835	1224	{
836	1225	cGridBag control = new cGridBag();
837	1226
..	..	@@ -839,25 +1228,21 @@
839	1228
840	1229	JLabel jlabel = new JLabel(label);
841	1230	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
842		- ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843		- ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1231	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1232	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844	1233	combo.setInteger(current);
845	1234
846		- ctrlPanel.add(control);
	1235	+ panel.add(control);
847	1236
848		- return combo;
	1237	+ return control;
849	1238	}
850	1239
851	1240	JTextArea AddText(cGridBag ctrlPanel, String name)
852	1241	{
853	1242	JTextArea text;
854	1243
855		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857	1244	ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1245	text.addCaretListener(this);
859		- aConstraints.gridx += 1;
860		- aConstraints.gridwidth = 1;
861	1246
862	1247	return text;
863	1248	}
..	..	@@ -896,7 +1281,7 @@
896	1281
897	1282	/*
898	1283	*/
899		- void Return() // ObjEditor oe)
	1284	+ void Return0() // ObjEditor oe)
900	1285	{
901	1286	aConstraints.gridy += 1;
902	1287	aConstraints.gridx = 0;
..	..	@@ -951,37 +1336,92 @@
951	1336
952	1337	void SetupUI2(ObjEditor oe)
953	1338	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958		- SetupName(oe);
	1339	+ //SetupName(oe);
959	1340
960		- 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)
961	1362	return;
962	1363
963		- liveCB = AddCheckBox(oe, "Live", copy.live);
964		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965		- 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");
966	1372	// Return();
967		- markCB = AddCheckBox(oe, "Mark", copy.marked);
968		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
969		- randomCB = AddCheckBox(oe, "Rand", copy.random);
970		- Return();
971		- resetButton = AddButton(oe, "Reset");
972		- 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");
973	1407	// resetAllButton = AddButton(oe, "Reset All");
974	1408	// stepAllButton = AddButton(oe, "Step All");
975		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
976	1409	// Return();
977		- slowerButton = AddButton(oe, "Slow");
978		- fasterButton = AddButton(oe, "Fast");
979		- 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");
980	1416
981		- Return();
	1417	+ oe.ctrlPanel.add(objectCommandsPanel);
	1418	+ oe.ctrlPanel.Return();
982	1419
983		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984		- 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();
985	1425
986	1426	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1427	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1076,7 +1516,7 @@
1076	1516	oe.aConstraints.gridwidth = 1;
1077	1517	/**/
1078	1518	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1519	+ oe.ctrlPanel.Return();
1080	1520
1081	1521	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1522	//textureButton.setEnabled(false);
..	..	@@ -1134,22 +1574,9 @@
1134	1574
1135	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1136	1576	{
1137		- System.out.println("CREATE CAMERAS");
1138		- cams = new cTemplate();
1139		- cams.name = "Cameras";
1140		- copy.insertElementAt(cams, 0);
1141		- //cams.parent = copy;
1142		-
1143		- cam = new Camera(); // LA.newVector(3, 2, 1));
1144		- cams.addChild(cam);
1145		- cam = new Camera(1);
1146		- cams.addChild(cam);
1147		- cam = new Camera(2);
1148		- cams.addChild(cam);
1149		- cam = new Camera(3);
1150		- cams.addChild(cam);
1151		- cam = new Camera(4); // Light
1152		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1153	1580	} else
1154	1581	{
1155	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1180,8 +1607,11 @@
1180	1607	//worldPanel.setName("World");
1181	1608	centralPanel = new cGridBag();
1182	1609	centralPanel.preferredWidth = 20;
1183		- timelinePanel = new JPanel(new BorderLayout());
1184		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1610	+
	1611	+ if (Globals.ADVANCED)
	1612	+ {
	1613	+ timelinePanel = new JPanel(new BorderLayout());
	1614	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1185	1615
1186	1616	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1187	1617	cameraPanel.setContinuousLayout(true);
..	..	@@ -1190,7 +1620,10 @@
1190	1620	// cameraPanel.setDividerSize(9);
1191	1621	cameraPanel.setResizeWeight(1.0);
1192	1622
	1623	+ }
	1624	+
1193	1625	centralPanel.add(cameraView);
	1626	+ centralPanel.setFocusable(true);
1194	1627	//frame.setJMenuBar(timelineMenubar);
1195	1628	//centralPanel.add(timelinePanel);
1196	1629
..	..	@@ -1209,6 +1642,45 @@
1209	1642	//frontView.object = copy;
1210	1643	//sideView.object = copy;
1211	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	+
1212	1684	XYZPanel = new cGridBag().setVertical(true);
1213	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1214	1686
..	..	@@ -1216,7 +1688,11 @@
1216	1688	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1217	1689	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1218	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1691	+ //XYZPanel.setName("XYZ");
1219	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1220	1696	/*
1221	1697	gridPanel = new JPanel(); //new BorderLayout());
1222	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1224,12 +1700,12 @@
1224	1700	gridPanel.add(cameraView);
1225	1701	gridPanel.add(XYZPanel);
1226	1702	*/
1227		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1228		- gridPanel.setContinuousLayout(true);
1229		- gridPanel.setOneTouchExpandable(true);
1230		- gridPanel.setDividerLocation(1.0);
1231		- gridPanel.setDividerSize(9);
1232		- 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);
1233	1709
1234	1710	// aConstraints.weighty = 0;
1235	1711	//System.out.println("THIS = " + this);
..	..	@@ -1252,13 +1728,34 @@
1252	1728
1253	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254	1730	//tmp.setName("Edit");
1255		- objectPanel.add(materialPanel);
1256		- JPanel north = new JPanel(new BorderLayout());
1257		- north.setName("Edit");
1258		- north.add(ctrlPanel, BorderLayout.NORTH);
1259		- objectPanel.add(north);
1260		- 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");
1261	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	+
1262	1759	/*
1263	1760	aConstraints.gridx = 0;
1264	1761	aConstraints.gridwidth = 1;
..	..	@@ -1266,7 +1763,7 @@
1266	1763	aConstraints.gridy += 1;
1267	1764	aConstraints.gridwidth = 1;
1268	1765	mainPanel.add(objectPanel, aConstraints);
1269		- */
	1766	+ */
1270	1767
1271	1768	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1272	1769	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1278,22 +1775,119 @@
1278	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1279	1776
1280	1777	/JTabbedPane/ scenePanel = new cGridBag();
1281		- scenePanel.preferredWidth = 7;
	1778	+ scenePanel.preferredWidth = 6;
1282	1779
1283	1780	JTabbedPane tabbedPane = new JTabbedPane();
1284	1781	tabbedPane.add(scrollpane);
1285	1782
1286		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287		-
1288		- optionsPanel = new cGridBag().setVertical(true);
	1783	+ optionsPanel = new cGridBag().setVertical(false);
1289	1784
1290	1785	optionsPanel.setName("Options");
1291	1786
1292	1787	AddOptions(optionsPanel); //, aConstraints);
1293	1788
	1789	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1790	+
1294	1791	tabbedPane.add(optionsPanel);
1295	1792
1296	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	+ }
1297	1891
1298	1892	/*
1299	1893	cTree jTree = new cTree(null);
..	..	@@ -1315,13 +1909,13 @@
1315	1909	jtp.add(tree);
1316	1910	*/
1317	1911
1318		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1319		- bigPanel.setContinuousLayout(true);
1320		- bigPanel.setOneTouchExpandable(true);
1321		- bigPanel.setDividerLocation(0.8);
1322		- bigPanel.setDividerSize(15);
1323		- bigPanel.setResizeWeight(0.15);
1324		- 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");
1325	1919
1326	1920	//bigPanel.setLayout(new BorderLayout());
1327	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1356,7 +1950,7 @@
1356	1950	bigThree = new cGridBag();
1357	1951	bigThree.addComponent(scenePanel);
1358	1952	bigThree.addComponent(centralPanel);
1359		- bigThree.addComponent(XYZPanel);
	1953	+ //bigThree.addComponent(XYZPanel);
1360	1954
1361	1955	// // SIDE EFFECT!!!
1362	1956	// aConstraints.gridx = 0;
..	..	@@ -1365,16 +1959,33 @@
1365	1959	// aConstraints.gridheight = 1;
1366	1960
1367	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1368		- framePanel.setContinuousLayout(true);
1369		- framePanel.setOneTouchExpandable(true);
1370		- 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);
1371	1982	//framePanel.setDividerSize(15);
1372	1983	//framePanel.setResizeWeight(0.15);
1373	1984	framePanel.setName("Frame");
1374	1985
1375	1986	frame.getContentPane().setLayout(new BorderLayout());
1376	1987	/**/
1377		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1378	1989	//worldPane.add(bigPanel);
1379	1990	//worldPane.add(worldPanel);
1380	1991	/**/
..	..	@@ -1384,15 +1995,19 @@
1384	1995
1385	1996	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1386	1997
1387		- frame.setSize(1024, 768);
1388		- frame.show();
	1998	+ frame.setSize(1280, 860);
	1999	+
	2000	+ cameraView.requestFocusInWindow();
	2001	+
	2002	+// gridPanel.setDividerLocation(1.0);
	2003	+
	2004	+ frame.validate();
1389	2005
1390		- gridPanel.setDividerLocation(1.0);
	2006	+ frame.setVisible(true);
1391	2007
1392	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1393	2009	frame.addWindowListener(new WindowAdapter()
1394	2010	{
1395		-
1396	2011	public void windowClosing(WindowEvent e)
1397	2012	{
1398	2013	Close();
..	..	@@ -1415,27 +2030,449 @@
1415	2030	ctrlPanel.removeAll();
1416	2031	}
1417	2032
1418		- void SetupMaterial(cGridBag ctrlPanel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1419	2034	{
1420		- /*
	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	+ /*
1421	2450	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1422	2451	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1423		- */
	2452	+ */
1424	2453
1425	2454	cGridBag editBar = new cGridBag().setVertical(false);
1426	2455
1427		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
	2457	+ createMaterialButton.setToolTipText("Create material");
1428	2458
1429	2459	/*
1430	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	2461	*/
1432	2462
1433		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1434		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1435		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1436		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	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	+ }
1437	2472
1438		- ctrlPanel.add(editBar);
	2473	+ editBar.preferredHeight = 15;
	2474	+
	2475	+ panel.add(editBar);
1439	2476
1440	2477	/**/
1441	2478	//aConstraints.weighty = 0;
..	..	@@ -1445,59 +2482,68 @@
1445	2482	//aConstraints.gridx += 1;
1446	2483	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1447	2484
1448		- JPanel colorPanel = new JPanel(new BorderLayout());
1449		- colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450		-
1451	2485	cGridBag colorSection = new cGridBag().setVertical(true);
	2486	+
	2487	+ cGridBag huepanel = new cGridBag();
	2488	+ cGridBag huelabel = new cGridBag();
	2489	+ cLabel hue = GetLabel("icons/hue.png", false);
	2490	+ hue.fit = true;
1452	2491
1453		- colorPanel.add(colorSection);
	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;
	2508	+
	2509	+ colorSection.add(huepanel);
1454	2510
1455	2511	cGridBag color = new cGridBag();
1456		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1457		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	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);
	2516	+
	2517	+ //colorField.preferredWidth = 200;
1459	2518	colorSection.add(color);
1460	2519
1461	2520	cGridBag modulation = new cGridBag();
1462	2521	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1463	2522	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1464		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2523	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1465	2524	colorSection.add(modulation);
1466	2525
	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);
	2531	+
	2532	+ colorSection.add(GetSeparator());
	2533	+
1467	2534	cGridBag texture = new cGridBag();
1468	2535	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1469	2536	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1470	2537	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1471	2538	colorSection.add(texture);
1472	2539
1473		- cGridBag anisoU = new cGridBag();
1474		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1477		- colorSection.add(anisoU);
1478		-
1479		- cGridBag anisoV = new cGridBag();
1480		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1481		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1482		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1483		- colorSection.add(anisoV);
1484		-
1485		- cGridBag shadowbias = new cGridBag();
1486		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1487		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1488		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1489		- colorSection.add(shadowbias);
1490		-
1491		- ctrlPanel.add(colorPanel);
	2540	+ panel.add(GetSeparator());
	2541	+
	2542	+ panel.add(colorSection);
1492	2543
1493	2544	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1494	2545
1495		- JPanel diffusePanel = new JPanel(new BorderLayout());
1496		- diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497		-
1498	2546	cGridBag diffuseSection = new cGridBag().setVertical(true);
1499		-
1500		- diffusePanel.add(diffuseSection);
1501	2547
1502	2548	cGridBag diffuse = new cGridBag();
1503	2549	diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
..	..	@@ -1541,16 +2587,19 @@
1541	2587	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	2588	diffuseSection.add(fakedepth);
1543	2589
1544		- ctrlPanel.add(diffusePanel);
	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);
	2595	+
	2596	+ panel.add(GetSeparator());
	2597	+
	2598	+ panel.add(diffuseSection);
1545	2599
1546	2600	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1547	2601
1548		- JPanel specularPanel = new JPanel(new BorderLayout());
1549		- specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550		-
1551	2602	cGridBag specularSection = new cGridBag().setVertical(true);
1552		-
1553		- specularPanel.add(specularSection);
1554	2603
1555	2604	cGridBag specular = new cGridBag();
1556	2605	specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
..	..	@@ -1582,7 +2631,7 @@
1582	2631	velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1583	2632	specularSection.add(velvet);
1584	2633
1585		- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	2634	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1586	2635	//Return();
1587	2636	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1588	2637	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..	..	@@ -1594,52 +2643,58 @@
1594	2643	// aConstraints.gridy += 1;
1595	2644	// aConstraints.gridwidth = 1;
1596	2645
	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);
1597	2651
1598		- ctrlPanel.add(specularPanel);
	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);
	2657	+
	2658	+
	2659	+ panel.add(GetSeparator());
	2660	+
	2661	+ panel.add(specularSection);
1599	2662
1600	2663	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1601	2664
1602		- JPanel globalPanel = new JPanel(new BorderLayout());
1603		- globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1604		-
1605		- cGridBag globalSection = new cGridBag().setVertical(true);
1606		-
1607		- globalPanel.add(globalSection);
	2665	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	2666
1609	2667	cGridBag camera = new cGridBag();
1610	2668	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	2669	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	2670	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	2671	+ colorSection.add(camera);
1614	2672
1615	2673	cGridBag ambient = new cGridBag();
1616	2674	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	2675	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	2676	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	2677	+ colorSection.add(ambient);
1620	2678
1621	2679	cGridBag backlit = new cGridBag();
1622	2680	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	2681	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	2682	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	2683	+ colorSection.add(backlit);
1626	2684
1627		- cGridBag opacity = new cGridBag();
1628		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631		- globalSection.add(opacity);
1632		-
1633		- ctrlPanel.add(globalPanel);
	2685	+ cGridBag parallax = new cGridBag();
	2686	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2687	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2688	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
	2689	+ colorSection.add(parallax);
	2690	+
	2691	+ //panel.add(new JSeparator());
	2692	+
	2693	+ //panel.add(globalSection);
1634	2694
1635	2695	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1636	2696
1637		- JPanel texturePanel = new JPanel(new BorderLayout());
1638		- texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639		-
1640	2697	cGridBag textureSection = new cGridBag().setVertical(true);
1641		-
1642		- texturePanel.add(textureSection);
1643	2698
1644	2699	cGridBag bump = new cGridBag();
1645	2700	bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
..	..	@@ -1677,7 +2732,9 @@
1677	2732	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1678	2733	textureSection.add(opacityPower);
1679	2734
1680		- ctrlPanel.add(texturePanel);
	2735	+ panel.add(GetSeparator());
	2736	+
	2737	+ panel.add(textureSection);
1681	2738
1682	2739	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1683	2740
..	..	@@ -1714,12 +2771,15 @@
1714	2771	opacityPowerField.addChangeListener(this);
1715	2772	/**/
1716	2773
1717		- resetSlidersButton.addActionListener(this);
1718	2774	clearMaterialButton.addActionListener(this);
1719	2775	createMaterialButton.addActionListener(this);
1720		-
1721		- propagateToggle.addItemListener(this);
1722		- multiplyToggle.addItemListener(this);
	2776	+
	2777	+ if (Globals.ADVANCED)
	2778	+ {
	2779	+ resetSlidersButton.addActionListener(this);
	2780	+ propagateToggle.addItemListener(this);
	2781	+ multiplyToggle.addItemListener(this);
	2782	+ }
1723	2783	}
1724	2784
1725	2785	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1737,8 +2797,9 @@
1737	2797	// 3D models
1738	2798	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1739	2799	{
1740		- lastConverter = new com.jmex.model.converters.MaxToJme();
1741		- LoadFile(filename, lastConverter);
	2800	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2801	+ //LoadFile(filename, lastConverter);
	2802	+ LoadObjFile(filename); // New 3ds loader
1742	2803	continue;
1743	2804	}
1744	2805	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1890,7 +2951,7 @@
1890	2951
1891	2952	//? flashIt = false;
1892	2953	CameraPane pane = (CameraPane) cameraView;
1893		- pane.clickStart(location.x, location.y, 0);
	2954	+ pane.clickStart(location.x, location.y, 0, 0);
1894	2955	pane.clickEnd(location.x, location.y, 0, true);
1895	2956
1896	2957	if (group.selection.size() == 1)
..	..	@@ -1939,6 +3000,7 @@
1939	3000	e2.printStackTrace();
1940	3001	}
1941	3002	}
	3003	+
1942	3004	LoadJMEThread loadThread;
1943	3005
1944	3006	class LoadJMEThread extends Thread
..	..	@@ -1996,6 +3058,7 @@
1996	3058	//LoadFile0(filename, converter);
1997	3059	}
1998	3060	}
	3061	+
1999	3062	LoadOBJThread loadObjThread;
2000	3063
2001	3064	class LoadOBJThread extends Thread
..	..	@@ -2074,19 +3137,19 @@
2074	3137
2075	3138	void LoadObjFile(String fullname)
2076	3139	{
2077		- /*
	3140	+ System.out.println("Loading " + fullname);
	3141	+ /**/
2078	3142	//lastFilename = fullname;
2079	3143	if(loadObjThread == null)
2080	3144	{
2081		- loadObjThread = new LoadOBJThread();
2082		- loadObjThread.start();
	3145	+ loadObjThread = new LoadOBJThread();
	3146	+ loadObjThread.start();
2083	3147	}
2084	3148
2085	3149	loadObjThread.add(fullname);
2086		- */
	3150	+ /**/
2087	3151
2088		- System.out.println("Loading " + fullname);
2089		- makeSomething(new FileObject(fullname, true), true);
	3152	+ //makeSomething(new FileObject(fullname, true), true);
2090	3153	}
2091	3154
2092	3155	void LoadGFDFile(String fullname)
..	..	@@ -2347,11 +3410,11 @@
2347	3410
2348	3411	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2349	3412	{
2350		- if (GrafreeD.standAlone)
	3413	+ if (Grafreed.standAlone)
2351	3414	{
2352	3415	/**/
2353	3416	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2354		- browser.show();
	3417	+ browser.setVisible(true);
2355	3418	String filename = browser.getFile();
2356	3419	if (filename != null && filename.length() > 0)
2357	3420	{
..	..	@@ -2462,6 +3525,7 @@
2462	3525	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2463	3526	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2464	3527	}
	3528	+
2465	3529	//cJME.count++;
2466	3530	//cJME.count %= 12;
2467	3531	if (gc)
..	..	@@ -2496,6 +3560,7 @@
2496	3560	}
2497	3561	if (input == null)
2498	3562	{
	3563	+ new Exception().printStackTrace();
2499	3564	System.exit(0);
2500	3565	}
2501	3566
..	..	@@ -2644,6 +3709,7 @@
2644	3709	}
2645	3710	}
2646	3711	}
	3712	+
2647	3713	cFileSystemPane FSPane;
2648	3714
2649	3715	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2653,7 +3719,7 @@
2653	3719
2654	3720	freezematerial = true;
2655	3721	colorField.setFloat(mat.color);
2656		- modulationField.setFloat(mat.modulation);
	3722	+ saturationField.setFloat(mat.modulation);
2657	3723	metalnessField.setFloat(mat.metalness);
2658	3724	diffuseField.setFloat(mat.diffuse);
2659	3725	specularField.setFloat(mat.specular);
..	..	@@ -2673,6 +3739,7 @@
2673	3739	shadowField.setFloat(mat.shadow);
2674	3740	textureField.setFloat(mat.texture);
2675	3741	opacityField.setFloat(mat.opacity);
	3742	+ parallaxField.setFloat(mat.parallax + 0.25f);
2676	3743	fakedepthField.setFloat(mat.fakedepth);
2677	3744	shadowbiasField.setFloat(mat.shadowbias);
2678	3745	bumpField.setInteger(1); // dec 2013
..	..	@@ -2697,11 +3764,14 @@
2697	3764	}
2698	3765	}
2699	3766	}
	3767	+
2700	3768	freezematerial = false;
2701	3769	}
2702	3770
2703	3771	void SetMaterial(Object3D object)
2704	3772	{
	3773	+ latestObject = object;
	3774	+
2705	3775	cMaterial mat = object.material;
2706	3776
2707	3777	if (mat == null)
..	..	@@ -2710,33 +3780,10 @@
2710	3780	return;
2711	3781	}
2712	3782
2713		- multiplyToggle.setSelected(mat.multiply);
2714		-
2715		- assert (object.projectedVertices != null);
2716		-
2717		- if (object.projectedVertices.length <= 2)
2718		- {
2719		- // Side effect...
2720		- Object3D.cVector2[] keep = object.projectedVertices;
2721		- object.projectedVertices = new Object3D.cVector2[3];
2722		- for (int i = 0; i < 3; i++)
2723		- {
2724		- if (i < keep.length)
2725		- {
2726		- object.projectedVertices[i] = keep[i];
2727		- } else
2728		- {
2729		- object.projectedVertices[i] = new Object3D.cVector2();
2730		- }
2731		- /*
2732		- if(keep.length == 0)
2733		- object.projectedVertices[0] = new Object3D.cVector2();
2734		- else
2735		- object.projectedVertices[0] = keep[0];
2736		- object.projectedVertices[1] = new Object3D.cVector2();
2737		- */
2738		- }
2739		- }
	3783	+ if (multiplyToggle != null)
	3784	+ multiplyToggle.setSelected(mat.multiply);
	3785	+
	3786	+ AllocProjectedVertices(object);
2740	3787
2741	3788	SetMaterial(mat, object.projectedVertices);
2742	3789	}
..	..	@@ -2812,12 +3859,17 @@
2812	3859	// }
2813	3860
2814	3861	/**/
2815		- if (deselect)
	3862	+ if (deselect \|\| child == null)
2816	3863	{
2817	3864	//group.deselectAll();
2818	3865	//freeze = true;
2819	3866	GetTree().clearSelection();
2820	3867	//freeze = false;
	3868	+
	3869	+ if (child == null)
	3870	+ {
	3871	+ return;
	3872	+ }
2821	3873	}
2822	3874
2823	3875	//group.addSelectee(child);
..	..	@@ -2851,6 +3903,17 @@
2851	3903	public void itemStateChanged(ItemEvent event)
2852	3904	{
2853	3905	// System.out.println("Propagate = " + propagate);
	3906	+ if (event.getSource() == pinButton)
	3907	+ {
	3908	+ copy.pinned ^= true;
	3909	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3910	+ {
	3911	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3912	+ copy.CloseUI();
	3913	+ //copy.editWindow.refreshContents();
	3914	+ }
	3915	+ }
	3916	+ else
2854	3917	if (event.getSource() == propagateToggle)
2855	3918	{
2856	3919	propagate ^= true;
..	..	@@ -2886,7 +3949,7 @@
2886	3949	cameraView.ToggleDL();
2887	3950	cameraView.repaint();
2888	3951	return;
2889		- } else if (event.getSource() == toggleTextureItem)
	3952	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2890	3953	{
2891	3954	cameraView.ToggleTexture();
2892	3955	// june 2013 copy.HardTouch();
..	..	@@ -2925,9 +3988,9 @@
2925	3988	frame.validate();
2926	3989
2927	3990	return;
2928		- } else if (event.getSource() == toggleRandomItem)
	3991	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2929	3992	{
2930		- cameraView.ToggleRandom();
	3993	+ cameraView.ToggleSwitch();
2931	3994	cameraView.repaint();
2932	3995	return;
2933	3996	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,12 +4018,17 @@
2955	4018	} else if (event.getSource() == liveCB)
2956	4019	{
2957	4020	copy.live ^= true;
	4021	+ objEditor.refreshContents(true); // To show item colors
	4022	+ return;
	4023	+ } else if (event.getSource() == selectableCB)
	4024	+ {
	4025	+ copy.dontselect ^= true;
2958	4026	return;
2959	4027	} else if (event.getSource() == hideCB)
2960	4028	{
2961	4029	copy.hide ^= true;
2962	4030	copy.Touch(); // display list issue
2963		- objEditor.refreshContents();
	4031	+ objEditor.refreshContents(true); // To show item colors
2964	4032	return;
2965	4033	} else if (event.getSource() == link2masterCB)
2966	4034	{
..	..	@@ -2970,6 +4038,7 @@
2970	4038	if (event.getSource() == randomCB)
2971	4039	{
2972	4040	copy.random ^= true;
	4041	+ objEditor.refreshContents();
2973	4042	return;
2974	4043	}
2975	4044	if (event.getSource() == speedupCB)
..	..	@@ -2993,8 +4062,9 @@
2993	4062
2994	4063	public void actionPerformed(ActionEvent event)
2995	4064	{
	4065	+ Object source = event.getSource();
2996	4066	// SCRIPT DIALOG
2997		- if (event.getSource() == okbutton)
	4067	+ if (source == okbutton)
2998	4068	{
2999	4069	textpanel.setVisible(false);
3000	4070	textpanel.remove(textarea);
..	..	@@ -3006,7 +4076,7 @@
3006	4076	textarea = null;
3007	4077	textpanel = null;
3008	4078	}
3009		- if (event.getSource() == cancelbutton)
	4079	+ if (source == cancelbutton)
3010	4080	{
3011	4081	textpanel.setVisible(false);
3012	4082	textpanel.remove(textarea);
..	..	@@ -3018,50 +4088,50 @@
3018	4088	//applySelf();
3019	4089	//client.refreshEditWindow();
3020	4090	//refreshContents();
3021		- if (event.getSource() == nameField)
	4091	+ if (source == nameField)
3022	4092	{
3023	4093	//System.out.println("ObjEditor " + event);
3024	4094	applySelf0(true);
3025	4095	//parent.applySelf();
3026		- objEditor.refreshContents();
3027		- } else if (event.getSource() == resetButton)
	4096	+ // conflicts with requestFocus objEditor.refreshContents();
	4097	+ } else if (source == resetButton)
3028	4098	{
3029	4099	CameraPane.fullreset = true;
3030	4100	copy.Reset(); // ResetMeshes();
3031	4101	copy.Touch();
3032	4102	objEditor.refreshContents();
3033		- } else if (event.getSource() == stepItem)
	4103	+ } else if (source == stepItem)
3034	4104	{
3035	4105	//cameraView.ONESTEP = true;
3036	4106	Globals.ONESTEP = true;
3037	4107	cameraView.repaint();
3038	4108	return;
3039		- } else if (event.getSource() == stepButton)
	4109	+ } else if (source == stepButton)
3040	4110	{
3041	4111	copy.Step();
3042	4112	copy.Touch();
3043	4113	objEditor.refreshContents();
3044		- } else if (event.getSource() == slowerButton)
	4114	+ } else if (source == slowerButton)
3045	4115	{
3046	4116	copy.Slower();
3047	4117	copy.Touch();
3048	4118	objEditor.refreshContents();
3049		- } else if (event.getSource() == fasterButton)
	4119	+ } else if (source == fasterButton)
3050	4120	{
3051	4121	copy.Faster();
3052	4122	copy.Touch();
3053	4123	objEditor.refreshContents();
3054		- } else if (event.getSource() == remarkButton)
	4124	+ } else if (source == remarkButton)
3055	4125	{
3056	4126	copy.Remark();
3057	4127	copy.Touch();
3058	4128	objEditor.refreshContents();
3059		- } else if (event.getSource() == stepAllButton)
	4129	+ } else if (source == stepAllButton)
3060	4130	{
3061	4131	copy.StepAll();
3062	4132	copy.Touch();
3063	4133	objEditor.refreshContents();
3064		- } else if (event.getSource() == resetAllButton)
	4134	+ } else if (source == resetAllButton)
3065	4135	{
3066	4136	//CameraPane.fullreset = true;
3067	4137	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3094,53 +4164,79 @@
3094	4164	// Close();
3095	4165	// }
3096	4166	// else
3097		- if (event.getSource() == resetSlidersButton)
	4167	+ if (source == resetSlidersButton)
3098	4168	{
3099	4169	ResetSliders();
3100		- } else if (event.getSource() == clearMaterialButton)
	4170	+ } else if (source == clearMaterialButton)
3101	4171	{
3102	4172	ClearMaterial();
3103		- } else if (event.getSource() == createMaterialButton)
	4173	+ } else if (source == createMaterialButton)
3104	4174	{
3105	4175	CreateMaterial();
3106		- } else if (event.getSource() == clearPanelButton)
	4176	+ } else if (source == clearPanelButton)
3107	4177	{
3108	4178	copy.ClearUI();
3109	4179	refreshContents(true);
3110		- } /*
3111		- }
3112		-
3113		- public boolean action(Event event, Object arg)
3114		- {
3115		- */ else if (event.getSource() == closeItem)
	4180	+ } else if (source == importGFDItem)
	4181	+ {
	4182	+ ImportGFD();
	4183	+ } else
	4184	+ if (source == importVRMLX3DItem)
	4185	+ {
	4186	+ ImportVRMLX3D();
	4187	+ } else
	4188	+ if (source == import3DSItem)
	4189	+ {
	4190	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4191	+ } else
	4192	+ if (source == importOBJItem)
	4193	+ {
	4194	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4195	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4196	+ browser.setVisible(true);
	4197	+ String filename = browser.getFile();
	4198	+ if (filename != null && filename.length() > 0)
	4199	+ {
	4200	+ String fullname = browser.getDirectory() + filename;
	4201	+ makeSomething(ReadOBJ(fullname), true);
	4202	+ }
	4203	+ } else
	4204	+ if (source == closeItem)
3116	4205	{
3117	4206	Close();
3118	4207	//return true;
3119		- } else if (event.getSource() == loadItem)
	4208	+ } else if (source == openItem)
3120	4209	{
3121		- load();
	4210	+ Open();
3122	4211	//return true;
3123		- } else if (event.getSource() == saveItem)
	4212	+ } else if (source == newItem)
	4213	+ {
	4214	+ New();
	4215	+ } else if (source == saveItem)
3124	4216	{
3125	4217	save();
3126	4218	//return true;
3127		- } else if (event.getSource() == saveAsItem)
	4219	+ } else if (source == saveAsItem)
3128	4220	{
3129	4221	saveAs();
3130	4222	//return true;
3131		- } else if (event.getSource() == reexportItem)
	4223	+ } else if (source == reexportItem)
3132	4224	{
3133	4225	reexport();
3134	4226	//return true;
3135		- } else if (event.getSource() == exportAsItem)
	4227	+ } else if (source == exportAsItem)
3136	4228	{
3137	4229	export();
3138	4230	//return true;
3139		- } else if (event.getSource() == povItem)
	4231	+ } else if (source == povItem)
3140	4232	{
3141	4233	generatePOV();
3142	4234	//return true;
3143		- } else if (event.getSource() == zBufferItem)
	4235	+ } else if (event.getSource() == archiveItem)
	4236	+ {
	4237	+ cTools.Archive(frame);
	4238	+ return;
	4239	+ } else if (source == zBufferItem)
3144	4240	{
3145	4241	try
3146	4242	{
..	..	@@ -3162,21 +4258,8 @@
3162	4258	cameraView.repaint();
3163	4259	//return true;
3164	4260	}
3165		- */ else if (event.getSource() == editCameraItem)
3166		- {
3167		- cameraView.ProtectCamera();
3168		- cameraView.repaint();
3169		- return;
3170		- } else if (event.getSource() == revertCameraItem)
3171		- {
3172		- cameraView.RevertCamera();
3173		- cameraView.repaint();
3174		- return;
3175		-// } else if (event.getSource() == textureButton)
3176		-// {
3177		-// return; // true;
3178		- } else // combos...
3179		- if (event.getSource() == texresMenu)
	4261	+ */ else // combos...
	4262	+ if (source == texresMenu)
3180	4263	{
3181	4264	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3182	4265	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3188,12 +4271,503 @@
3188	4271	}
3189	4272	}
3190	4273
	4274	+ void New()
	4275	+ {
	4276	+ while (copy.Size() > 0)
	4277	+ {
	4278	+ copy.remove(0);
	4279	+ }
	4280	+
	4281	+ copy.selection.clear();
	4282	+
	4283	+ if (copy == Grafreed.grafreed.universe)
	4284	+ {
	4285	+ CreateCameras();
	4286	+ cameraView.SetCamera(GetCamera(copy, 0));
	4287	+ }
	4288	+ ResetModel();
	4289	+ objEditor.refreshContents();
	4290	+ }
	4291	+
	4292	+ static public byte[] Compress(Object3D o)
	4293	+ {
	4294	+ // Slower to actually compress.
	4295	+ try
	4296	+ {
	4297	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4298	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4299	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4300	+
	4301	+ Object3D parent = o.parent;
	4302	+ o.parent = null;
	4303	+
	4304	+ out.writeObject(o);
	4305	+
	4306	+ o.parent = parent;
	4307	+
	4308	+ out.flush();
	4309	+
	4310	+ baos //zstream
	4311	+ .close();
	4312	+ out.close();
	4313	+
	4314	+ byte[] bytes = baos.toByteArray();
	4315	+
	4316	+ System.out.println("save #bytes = " + bytes.length);
	4317	+ return bytes;
	4318	+ } catch (Exception e)
	4319	+ {
	4320	+ System.err.println(e);
	4321	+ return null;
	4322	+ }
	4323	+ }
	4324	+
	4325	+ static public Object Uncompress(byte[] bytes)
	4326	+ {
	4327	+ System.out.println("restore #bytes = " + bytes.length);
	4328	+ try
	4329	+ {
	4330	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4331	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4332	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4333	+ Object obj = in.readObject();
	4334	+
	4335	+ bais //istream
	4336	+ .close();
	4337	+ in.close();
	4338	+
	4339	+ return obj;
	4340	+ } catch (Exception e)
	4341	+ {
	4342	+ System.err.println(e);
	4343	+ return null;
	4344	+ }
	4345	+ }
	4346	+
	4347	+ static public Object clone(Object o)
	4348	+ {
	4349	+ try
	4350	+ {
	4351	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4352	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4353	+
	4354	+ out.writeObject(o);
	4355	+
	4356	+ out.flush();
	4357	+ out.close();
	4358	+
	4359	+ byte[] bytes = baos.toByteArray();
	4360	+
	4361	+ System.out.println("clone = " + bytes.length);
	4362	+
	4363	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4364	+ ObjectInputStream in = new ObjectInputStream(bais);
	4365	+ Object obj = in.readObject();
	4366	+ in.close();
	4367	+
	4368	+ return obj;
	4369	+ } catch (Exception e)
	4370	+ {
	4371	+ System.err.println(e);
	4372	+ return null;
	4373	+ }
	4374	+ }
	4375	+
	4376	+ cRadio GetCurrentTab()
	4377	+ {
	4378	+ cRadio ab;
	4379	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4380	+ {
	4381	+ ab = (cRadio)e.nextElement();
	4382	+ if(ab.GetObject() == copy)
	4383	+ {
	4384	+ return ab;
	4385	+ }
	4386	+ }
	4387	+
	4388	+ return null;
	4389	+ }
	4390	+
	4391	+
	4392	+ public void Save()
	4393	+ {
	4394	+ //Save(true);
	4395	+ Replace();
	4396	+ SetVersionStates();
	4397	+ }
	4398	+
	4399	+ private boolean Equal(byte[] compress, byte[] name)
	4400	+ {
	4401	+ if (compress.length != name.length)
	4402	+ {
	4403	+ return false;
	4404	+ }
	4405	+
	4406	+ for (int i=compress.length; --i>=0;)
	4407	+ {
	4408	+ if (compress[i] != name[i])
	4409	+ return false;
	4410	+ }
	4411	+
	4412	+ return true;
	4413	+ }
	4414	+
	4415	+ void DeleteVersion()
	4416	+ {
	4417	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4418	+ {
	4419	+ copy.versionlist[i] = copy.versionlist[i+1];
	4420	+ }
	4421	+
	4422	+ if (copy.versionlist[copy.versionindex] == null)
	4423	+ copy.versionindex -= 1;
	4424	+
	4425	+ if (copy.versionindex != -1)
	4426	+ CopyChanged();
	4427	+
	4428	+ SetVersionStates();
	4429	+ }
	4430	+
	4431	+ public boolean Save(boolean user)
	4432	+ {
	4433	+ System.err.println("Save");
	4434	+ Replace();
	4435	+
	4436	+ //cRadio tab = GetCurrentTab();
	4437	+
	4438	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4439	+
	4440	+ boolean thesame = false;
	4441	+
	4442	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4443	+// {
	4444	+// thesame = true;
	4445	+// }
	4446	+
	4447	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4448	+ if (!thesame)
	4449	+ {
	4450	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4451	+ {
	4452	+ copy.versionlist[i] = copy.versionlist[i-1];
	4453	+ }
	4454	+
	4455	+ //tab.user[tab.versionindex] = user;
	4456	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4457	+
	4458	+ copy.versionlist[++copy.versionindex] = compress;
	4459	+
	4460	+ // if (increment)
	4461	+ // tab.versionindex++;
	4462	+ }
	4463	+
	4464	+ //copy.RestoreBigData(versiontable);
	4465	+
	4466	+ //assert(hashtable.isEmpty());
	4467	+
	4468	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4469	+// {
	4470	+// //tab.user[i] = false;
	4471	+// copy.versionlist[i] = null;
	4472	+// }
	4473	+
	4474	+ SetVersionStates();
	4475	+
	4476	+ // test save
	4477	+ if (false)
	4478	+ {
	4479	+ try
	4480	+ {
	4481	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4482	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4483	+
	4484	+ p.writeObject(copy);
	4485	+
	4486	+ p.flush();
	4487	+
	4488	+ ostream.close();
	4489	+ } catch (Exception e)
	4490	+ {
	4491	+ e.printStackTrace();
	4492	+ }
	4493	+ }
	4494	+
	4495	+ return !thesame;
	4496	+ }
	4497	+
	4498	+ boolean flashIt = true;
	4499	+
	4500	+ void RefreshSelection()
	4501	+ {
	4502	+ Object3D selection = new Object3D();
	4503	+
	4504	+ for (int i = 0; i < copy.selection.size(); i++)
	4505	+ {
	4506	+ Object3D elem = copy.selection.elementAt(i);
	4507	+
	4508	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4509	+
	4510	+ if (obj == null)
	4511	+ {
	4512	+ copy.selection.remove(i--);
	4513	+ }
	4514	+ else
	4515	+ {
	4516	+ selection.add(obj);
	4517	+ copy.selection.setElementAt(obj, i);
	4518	+ }
	4519	+ }
	4520	+
	4521	+ flashIt = false;
	4522	+ GetTree().clearSelection();
	4523	+ for (int i = 0; i < selection.size(); i++)
	4524	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4525	+ flashIt = true;
	4526	+
	4527	+ //refreshContents(false);
	4528	+ }
	4529	+
	4530	+ void CopyChanged()
	4531	+ {
	4532	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4533	+
	4534	+ SetVersionStates();
	4535	+
	4536	+ boolean temp = CameraPane.SWITCH;
	4537	+ CameraPane.SWITCH = false;
	4538	+
	4539	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4540	+
	4541	+ copy.clear();
	4542	+
	4543	+ copy.skyboxname = obj.skyboxname;
	4544	+ copy.skyboxext = obj.skyboxext;
	4545	+
	4546	+ for (int i=0; i<obj.Size(); i++)
	4547	+ {
	4548	+ copy.add(obj.get(i));
	4549	+ }
	4550	+
	4551	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4552	+
	4553	+ CameraPane.SWITCH = temp;
	4554	+
	4555	+ RefreshSelection();
	4556	+ //assert(hashtable.isEmpty());
	4557	+
	4558	+ copy.Touch();
	4559	+
	4560	+ ResetModel();
	4561	+ copy.HardTouch(); // recompile?
	4562	+
	4563	+ cRadio ab;
	4564	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4565	+ {
	4566	+ ab = (cRadio)e.nextElement();
	4567	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4568	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4569	+ if (test != null)
	4570	+ {
	4571	+ test.editWindow = ab.object.editWindow;
	4572	+ ab.object = test;
	4573	+ }
	4574	+ }
	4575	+
	4576	+ refreshContents(true);
	4577	+ }
	4578	+
	4579	+ cButton previousVersionButton;
	4580	+ cButton restoreButton;
	4581	+ cButton replaceButton;
	4582	+ cButton nextVersionButton;
	4583	+ cButton saveVersionButton;
	4584	+ cButton deleteVersionButton;
	4585	+
	4586	+ boolean muteSlider;
	4587	+
	4588	+ int VersionCount()
	4589	+ {
	4590	+ int count = 0;
	4591	+
	4592	+ for (int i = copy.versionlist.length; --i >= 0;)
	4593	+ {
	4594	+ if (copy.versionlist[i] != null)
	4595	+ count++;
	4596	+ }
	4597	+
	4598	+ return count;
	4599	+ }
	4600	+
	4601	+ public cGridBag versionSliderPane;
	4602	+
	4603	+ void SetVersionStates()
	4604	+ {
	4605	+ //if (true)
	4606	+ // return;
	4607	+
	4608	+ //cRadio tab = GetCurrentTab();
	4609	+
	4610	+ if (copy.versionlist == null)
	4611	+ {
	4612	+ saveVersionButton.setEnabled(false);
	4613	+ restoreButton.setEnabled(false);
	4614	+ replaceButton.setEnabled(false);
	4615	+ previousVersionButton.setEnabled(false);
	4616	+ nextVersionButton.setEnabled(false);
	4617	+ deleteVersionButton.setEnabled(false);
	4618	+ versionSliderPane.setVisible(false);
	4619	+ }
	4620	+ else
	4621	+ {
	4622	+ restoreButton.setEnabled(copy.versionindex != -1);
	4623	+ replaceButton.setEnabled(copy.versionindex != -1);
	4624	+
	4625	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4626	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4627	+
	4628	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4629	+ //copy.versionlist[copy.versionindex + 1] != null);
	4630	+
	4631	+ muteSlider = true;
	4632	+ versionSlider.setMinimum(0);
	4633	+ versionSlider.setMaximum(VersionCount() - 1);
	4634	+ versionSlider.setInteger(copy.versionindex);
	4635	+ versionSlider.setEnabled(copy.versionindex != -1);
	4636	+ muteSlider = false;
	4637	+
	4638	+ versionSliderPane.setVisible(true);
	4639	+ }
	4640	+ }
	4641	+
	4642	+ public boolean PreviousVersion()
	4643	+ {
	4644	+ // Option?
	4645	+ Replace();
	4646	+
	4647	+ System.err.println("Undo");
	4648	+
	4649	+ //cRadio tab = GetCurrentTab();
	4650	+
	4651	+ if (copy.versionindex == 0)
	4652	+ {
	4653	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4654	+ return false;
	4655	+ }
	4656	+
	4657	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4658	+// {
	4659	+// if (Save(false))
	4660	+// tab.versionindex -= 1;
	4661	+// else
	4662	+// {
	4663	+// if (tab.versionindex <= 0)
	4664	+// return false;
	4665	+// else
	4666	+// tab.versionindex -= 1;
	4667	+// }
	4668	+// }
	4669	+
	4670	+ copy.versionindex -= 1;
	4671	+
	4672	+ CopyChanged();
	4673	+
	4674	+ return true;
	4675	+ }
	4676	+
	4677	+ public boolean Restore()
	4678	+ {
	4679	+ System.err.println("Restore");
	4680	+
	4681	+ //cRadio tab = GetCurrentTab();
	4682	+
	4683	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4684	+ {
	4685	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4686	+ return false;
	4687	+ }
	4688	+
	4689	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4690	+ CopyChanged();
	4691	+
	4692	+ return true;
	4693	+ }
	4694	+
	4695	+ public boolean Replace()
	4696	+ {
	4697	+ //System.err.println("Replace");
	4698	+
	4699	+ //cRadio tab = GetCurrentTab();
	4700	+
	4701	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4702	+ {
	4703	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4704	+ return false;
	4705	+ }
	4706	+
	4707	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4708	+
	4709	+ return true;
	4710	+ }
	4711	+
	4712	+ public void NextVersion()
	4713	+ {
	4714	+ // Option?
	4715	+ Replace();
	4716	+
	4717	+ //cRadio tab = GetCurrentTab();
	4718	+
	4719	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4720	+ {
	4721	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4722	+ return;
	4723	+ }
	4724	+
	4725	+ copy.versionindex += 1;
	4726	+
	4727	+ CopyChanged();
	4728	+
	4729	+ //if (!tab.user[tab.versionindex])
	4730	+ // tab.graphs[tab.versionindex] = null;
	4731	+ }
	4732	+
	4733	+ void ImportGFD()
	4734	+ {
	4735	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4736	+ browser.show();
	4737	+ String filename = browser.getFile();
	4738	+ if (filename != null && filename.length() > 0)
	4739	+ {
	4740	+ String fullname = browser.getDirectory() + filename;
	4741	+
	4742	+ //Object3D readobj =
	4743	+ objEditor.ReadGFD(fullname, objEditor);
	4744	+ //makeSomething(readobj);
	4745	+ }
	4746	+ }
	4747	+
	4748	+ void ImportVRMLX3D()
	4749	+ {
	4750	+ if (Grafreed.standAlone)
	4751	+ {
	4752	+ /**/
	4753	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4754	+ browser.show();
	4755	+ String filename = browser.getFile();
	4756	+ if (filename != null && filename.length() > 0)
	4757	+ {
	4758	+ String fullname = browser.getDirectory() + filename;
	4759	+ LoadVRMLX3D(fullname);
	4760	+ }
	4761	+ /**/
	4762	+ }
	4763	+ }
	4764	+
3191	4765	void ToggleAnimation()
3192	4766	{
3193	4767	if (!Globals.ANIMATION)
3194	4768	{
3195	4769	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3196		- browser.show();
	4770	+ browser.setVisible(true);
3197	4771	String filename = browser.getFile();
3198	4772	if (filename != null && filename.length() > 0)
3199	4773	{
..	..	@@ -3203,8 +4777,8 @@
3203	4777
3204	4778	Globals.ANIMATION ^= true;
3205	4779
3206		- GrafreeD.wav.cursor = 0;
3207		- GrafreeD.wav.loop = 0;
	4780	+ Grafreed.wav.cursor = 0;
	4781	+ Grafreed.wav.loop = 0;
3208	4782	}
3209	4783	} else
3210	4784	{
..	..	@@ -3254,7 +4828,7 @@
3254	4828	void CreateMaterial()
3255	4829	{
3256	4830	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4831	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	4832	if (copy.selection.size() > 0)
3259	4833	//SetMaterial(copy);
3260	4834	{
..	..	@@ -3305,7 +4879,7 @@
3305	4879	assert false;
3306	4880	}
3307	4881
3308		- void EditSelection()
	4882	+ void EditSelection(boolean newWindow)
3309	4883	{
3310	4884	}
3311	4885
..	..	@@ -3313,11 +4887,11 @@
3313	4887	{
3314	4888	copy.ResetBlockLoop(); // temporary problem
3315	4889
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	4890	+ boolean random = CameraPane.SWITCH;
	4891	+ CameraPane.SWITCH = false; // parse everything
3318	4892	copy.ResetDisplayList();
3319	4893	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	4894	+ CameraPane.SWITCH = random;
3321	4895	}
3322	4896
3323	4897	// public void applySelf()
..	..	@@ -3347,6 +4921,12 @@
3347	4921	// else
3348	4922	// applySelf(true);
3349	4923	// }
	4924	+
	4925	+ boolean Equal(double a, double b)
	4926	+ {
	4927	+ return Math.abs(a - b) < 0.001;
	4928	+ }
	4929	+
3350	4930	void applySelf0(boolean name)
3351	4931	{
3352	4932	if (name)
..	..	@@ -3364,7 +4944,7 @@
3364	4944	//copy.material = new cMaterial(copy.GetMaterial());
3365	4945
3366	4946	current.color = (float) colorField.getFloat();
3367		- current.modulation = (float) modulationField.getFloat();
	4947	+ current.modulation = (float) saturationField.getFloat();
3368	4948	current.metalness = (float) metalnessField.getFloat();
3369	4949	current.diffuse = (float) diffuseField.getFloat();
3370	4950	current.specular = (float) specularField.getFloat();
..	..	@@ -3384,6 +4964,7 @@
3384	4964	current.shadow = (float) shadowField.getFloat();
3385	4965	current.texture = (float) textureField.getFloat();
3386	4966	current.opacity = (float) opacityField.getFloat();
	4967	+ current.parallax = (float) parallaxField.getFloat() - 0.25f;
3387	4968	current.fakedepth = (float) fakedepthField.getFloat();
3388	4969	current.shadowbias = (float) shadowbiasField.getFloat();
3389	4970
..	..	@@ -3391,6 +4972,61 @@
3391	4972	{
3392	4973	//System.out.println("Propagate = " + propagate);
3393	4974	copy.UpdateMaterial(anchor, current, propagate);
	4975	+
	4976	+ if (copy.material != null)
	4977	+ {
	4978	+ cMaterial mat = copy.material;
	4979	+
	4980	+ if (!Equal(colorField.getFloat(), mat.color))
	4981	+ colorField.SetToolTipValue((mat.color));
	4982	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4983	+ saturationField.SetToolTipValue((mat.modulation));
	4984	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4985	+ metalnessField.SetToolTipValue((mat.metalness));
	4986	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4987	+ diffuseField.SetToolTipValue((mat.diffuse));
	4988	+ if (!Equal(specularField.getFloat(), mat.specular))
	4989	+ specularField.SetToolTipValue((mat.specular));
	4990	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4991	+ shininessField.SetToolTipValue((mat.shininess));
	4992	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4993	+ shiftField.SetToolTipValue((mat.shift));
	4994	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4995	+ ambientField.SetToolTipValue((mat.ambient));
	4996	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4997	+ lightareaField.SetToolTipValue((mat.lightarea));
	4998	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4999	+ diffusenessField.SetToolTipValue((mat.factor));
	5000	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5001	+ velvetField.SetToolTipValue((mat.velvet));
	5002	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5003	+ sheenField.SetToolTipValue((mat.sheen));
	5004	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5005	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5006	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5007	+ backlitField.SetToolTipValue((mat.bump));
	5008	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5009	+ anisoField.SetToolTipValue((mat.aniso));
	5010	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5011	+ anisoVField.SetToolTipValue((mat.anisoV));
	5012	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5013	+ cameraField.SetToolTipValue((mat.cameralight));
	5014	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5015	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5016	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5017	+ shadowField.SetToolTipValue((mat.shadow));
	5018	+ if (!Equal(textureField.getFloat(), mat.texture))
	5019	+ textureField.SetToolTipValue((mat.texture));
	5020	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5021	+ opacityField.SetToolTipValue((mat.opacity));
	5022	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5023	+ parallaxField.SetToolTipValue((mat.parallax));
	5024	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5025	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5026	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5027	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	5028	+ }
	5029	+
3394	5030	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	5031	{
3396	5032	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3419,9 +5055,28 @@
3419	5055	//copy.Touch();
3420	5056	}
3421	5057
	5058	+ cNumberSlider versionSlider;
	5059	+
3422	5060	public void stateChanged(ChangeEvent e)
3423	5061	{
3424		- // assert(false);
	5062	+ // assert(false);
	5063	+ if (e.getSource() == versionSlider)
	5064	+ {
	5065	+ if (muteSlider)
	5066	+ return;
	5067	+
	5068	+ Replace();
	5069	+
	5070	+ int version = versionSlider.getInteger();
	5071	+
	5072	+ if (version != -1 && copy.versionlist[version] != null)
	5073	+ {
	5074	+ copy.versionindex = version;
	5075	+ CopyChanged();
	5076	+ }
	5077	+
	5078	+ return;
	5079	+ }
3425	5080
3426	5081	if (freezematerial)
3427	5082	{
..	..	@@ -3435,6 +5090,7 @@
3435	5090	\|\| e.getSource() == apertureField
3436	5091	\|\| e.getSource() == shadowblurField)
3437	5092	{
	5093	+ new Exception().printStackTrace();
3438	5094	System.exit(0);
3439	5095	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3440	5096	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3456,6 +5112,12 @@
3456	5112	{
3457	5113	//System.out.println("stateChanged = " + this);
3458	5114	materialtouched = true;
	5115	+
	5116	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5117	+ {
	5118	+ saturationField.setFloat(1);
	5119	+ }
	5120	+
3459	5121	applySelf();
3460	5122	//System.out.println("this = " + this);
3461	5123	//System.out.println("PARENT = " + parent);
..	..	@@ -3505,7 +5167,7 @@
3505	5167	}
3506	5168
3507	5169	if (normalpushField != null)
3508		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	5170	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3509	5171	}
3510	5172
3511	5173	void SnapObject()
..	..	@@ -3755,6 +5417,7 @@
3755	5417	{
3756	5418	if (GetTree() != null)
3757	5419	{
	5420	+ GetTree().revalidate();
3758	5421	GetTree().repaint();
3759	5422	}
3760	5423
..	..	@@ -3763,12 +5426,19 @@
3763	5426	ctrlPanel.validate(); // ? new
3764	5427	ctrlPanel.repaint();
3765	5428	}
	5429	+
	5430	+ if (previousVersionButton != null && copy.versionlist != null)
	5431	+ SetVersionStates();
	5432	+
	5433	+ cameraView.requestFocusInWindow();
3766	5434	}
3767	5435
3768	5436	static TweenManager tweenManager = new TweenManager();
3769	5437
3770	5438	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3771	5439	{
	5440	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5441	+ Save();
3772	5442	//Tween.set(thing, 0).target(1).start(tweenManager);
3773	5443	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3774	5444	// if (thing instanceof GenericJointDemo)
..	..	@@ -3792,7 +5462,7 @@
3792	5462	// group = (Composite) group.get(0);
3793	5463	// }
3794	5464
3795		- System.out.println("makeSomething of " + thing);
	5465	+ //System.out.println("makeSomething of " + thing);
3796	5466
3797	5467	/*
3798	5468	if (deselect && jList != null)
..	..	@@ -3855,6 +5525,12 @@
3855	5525	{
3856	5526	ResetModel();
3857	5527	Select(thing.GetTreePath(), true, false); // unselect... false);
	5528	+
	5529	+ if (thing.Size() == 0)
	5530	+ {
	5531	+ //EditSelection(false);
	5532	+ }
	5533	+
3858	5534	refreshContents();
3859	5535	}
3860	5536
..	..	@@ -3972,6 +5648,7 @@
3972	5648	}
3973	5649	}
3974	5650	}
	5651	+
3975	5652	LoadGFDThread loadGFDThread;
3976	5653
3977	5654	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3991,8 +5668,10 @@
3991	5668
3992	5669	try
3993	5670	{
	5671	+ // Try compressed version first.
3994	5672	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3995		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5673	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5674	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3996	5675
3997	5676	readobj = (Object3D) p.readObject();
3998	5677	istream.close();
..	..	@@ -4000,7 +5679,22 @@
4000	5679	readobj.ResetDisplayList();
4001	5680	} catch (Exception e)
4002	5681	{
4003		- e.printStackTrace();
	5682	+ if (!e.toString().contains("GZIP"))
	5683	+ e.printStackTrace();
	5684	+
	5685	+ try
	5686	+ {
	5687	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5688	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5689	+
	5690	+ readobj = (Object3D) p.readObject();
	5691	+ istream.close();
	5692	+
	5693	+ readobj.ResetDisplayList();
	5694	+ } catch (Exception e2)
	5695	+ {
	5696	+ e2.printStackTrace();
	5697	+ }
4004	5698	}
4005	5699	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4006	5700	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4046,6 +5740,12 @@
4046	5740
4047	5741	void LoadIt(Object obj)
4048	5742	{
	5743	+ if (obj == null)
	5744	+ {
	5745	+ // Invalid file
	5746	+ return;
	5747	+ }
	5748	+
4049	5749	System.out.println("Loaded " + obj);
4050	5750	//new Exception().printStackTrace();
4051	5751	Object3D readobj = (Object3D) obj;
..	..	@@ -4055,10 +5755,14 @@
4055	5755
4056	5756	if (readobj != null)
4057	5757	{
	5758	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5759	+ // Save();
4058	5760	try
4059	5761	{
4060	5762	//readobj.deepCopySelf(copy);
4061	5763	copy.clear(); // june 2014
	5764	+ copy.skyboxname = readobj.skyboxname;
	5765	+ copy.skyboxext = readobj.skyboxext;
4062	5766	for (int i = 0; i < readobj.size(); i++)
4063	5767	{
4064	5768	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4099,6 +5803,7 @@
4099	5803	}
4100	5804	} catch (ClassCastException e)
4101	5805	{
	5806	+ e.printStackTrace();
4102	5807	assert (false);
4103	5808	Composite c = (Composite) copy;
4104	5809	c.children.clear();
..	..	@@ -4109,17 +5814,32 @@
4109	5814	c.addChild(csg);
4110	5815	}
4111	5816
	5817	+ copy.versionlist = readobj.versionlist;
	5818	+ copy.versionindex = readobj.versionindex;
	5819	+ copy.versiontable = readobj.versiontable;
	5820	+
	5821	+ if (copy.versionlist == null)
	5822	+ {
	5823	+ // Backward compatibility
	5824	+ copy.versionlist = new Object3D[100];
	5825	+ copy.versionindex = -1;
	5826	+
	5827	+ //Save(true);
	5828	+ }
	5829	+
	5830	+ //? SetUndoStates();
	5831	+
4112	5832	ResetModel();
4113	5833	copy.HardTouch(); // recompile?
4114	5834	refreshContents();
4115	5835	}
4116	5836	}
4117	5837
4118		- void load() // throws ClassNotFoundException
	5838	+ void Open() // throws ClassNotFoundException
4119	5839	{
4120		- if (GrafreeD.standAlone)
	5840	+ if (Grafreed.standAlone)
4121	5841	{
4122		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5842	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4123	5843	browser.show();
4124	5844	String filename = browser.getFile();
4125	5845	if (filename != null && filename.length() > 0)
..	..	@@ -4196,6 +5916,8 @@
4196	5916
4197	5917	void save()
4198	5918	{
	5919	+ Replace();
	5920	+
4199	5921	if (lastname == null)
4200	5922	{
4201	5923	return;
..	..	@@ -4204,11 +5926,13 @@
4204	5926	try
4205	5927	{
4206	5928	FileOutputStream ostream = new FileOutputStream(lastname);
4207		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5929	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5930	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4208	5931
4209	5932	p.writeObject(copy);
4210	5933	p.flush();
4211	5934
	5935	+ zstream.close();
4212	5936	ostream.close();
4213	5937
4214	5938	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4216,19 +5940,23 @@
4216	5940	//ps.print(buffer.toString());
4217	5941	} catch (IOException e)
4218	5942	{
	5943	+ e.printStackTrace();
4219	5944	}
4220	5945	}
	5946	+
4221	5947	String lastname;
4222	5948
4223	5949	void saveAs()
4224	5950	{
4225		- if (GrafreeD.standAlone)
	5951	+ if (Grafreed.standAlone)
4226	5952	{
4227	5953	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4228	5954	browser.setVisible(true);
4229	5955	String filename = browser.getFile();
4230	5956	if (filename != null && filename.length() > 0)
4231	5957	{
	5958	+ if (!filename.endsWith(".gfd"))
	5959	+ filename += ".gfd";
4232	5960	lastname = browser.getDirectory() + filename;
4233	5961	save();
4234	5962	}
..	..	@@ -4327,13 +6055,13 @@
4327	6055	try
4328	6056	{
4329	6057	FileOutputStream ostream = new FileOutputStream(filename);
4330		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4331		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	6058	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	6059	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4332	6060
4333	6061	Object3D objectparent = obj.parent;
4334	6062	obj.parent = null;
4335	6063
4336		- Object3D object = (Object3D) GrafreeD.clone(obj);
	6064	+ Object3D object = (Object3D) Grafreed.clone(obj);
4337	6065
4338	6066	obj.parent = objectparent;
4339	6067
..	..	@@ -4345,8 +6073,8 @@
4345	6073	p.writeObject(object);
4346	6074	p.flush();
4347	6075
	6076	+ zstream.close();
4348	6077	ostream.close();
4349		- // zstream.close();
4350	6078
4351	6079	// group.selection.get(0).parent = parent;
4352	6080	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4367,7 +6095,7 @@
4367	6095	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4368	6096	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4369	6097	copy.generatePOV(buffer);
4370		- if (GrafreeD.standAlone)
	6098	+ if (Grafreed.standAlone)
4371	6099	{
4372	6100	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4373	6101	browser.show();
..	..	@@ -4393,21 +6121,20 @@
4393	6121	Object3D client;
4394	6122	Object3D copy;
4395	6123	MenuBar menuBar;
4396		- Menu windowMenu;
4397		- MenuItem loadItem;
	6124	+ Menu fileMenu;
	6125	+ MenuItem newItem;
	6126	+ MenuItem openItem;
4398	6127	MenuItem saveItem;
4399	6128	MenuItem saveAsItem;
4400	6129	MenuItem exportAsItem;
4401	6130	MenuItem reexportItem;
4402	6131	MenuItem povItem;
4403	6132	MenuItem closeItem;
4404		- Menu cameraMenu;
	6133	+
4405	6134	CheckboxMenuItem zBufferItem;
4406	6135	//MenuItem normalLensItem;
4407		- MenuItem editCameraItem;
4408		- MenuItem revertCameraItem;
4409		- CheckboxMenuItem toggleLiveItem;
4410	6136	MenuItem stepItem;
	6137	+ CheckboxMenuItem toggleLiveItem;
4411	6138	CheckboxMenuItem toggleFullScreenItem;
4412	6139	CheckboxMenuItem toggleTimelineItem;
4413	6140	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4416,25 +6143,41 @@
4416	6143	CheckboxMenuItem toggleFootContactItem;
4417	6144	CheckboxMenuItem toggleDLItem;
4418	6145	CheckboxMenuItem toggleTextureItem;
4419		- CheckboxMenuItem toggleRandomItem;
	6146	+ CheckboxMenuItem toggleSwitchItem;
4420	6147	CheckboxMenuItem toggleRootItem;
4421	6148	CheckboxMenuItem animationItem;
	6149	+ MenuItem archiveItem;
4422	6150	CheckboxMenuItem toggleHandleItem;
4423	6151	CheckboxMenuItem togglePaintItem;
4424	6152	JSplitPane mainPanel;
4425	6153	JScrollPane scrollpane;
	6154	+
4426	6155	JPanel toolbarPanel;
4427		- JPanel treePanel;
	6156	+
	6157	+ cGridBag treePanel;
	6158	+
4428	6159	JPanel radioPanel;
4429	6160	ButtonGroup buttonGroup;
4430		- cGridBag ctrlPanel;
	6161	+
	6162	+ cGridBag toolboxPanel;
	6163	+ cGridBag skyboxPanel;
4431	6164	cGridBag materialPanel;
	6165	+ cGridBag ctrlPanel;
	6166	+
4432	6167	JScrollPane infoPanel;
	6168	+
4433	6169	cGridBag optionsPanel;
	6170	+
4434	6171	JTabbedPane objectPanel;
	6172	+ boolean materialFlushed;
	6173	+ Object3D latestObject;
	6174	+
	6175	+ cGridBag transformPanel;
4435	6176	cGridBag XYZPanel;
	6177	+
4436	6178	JSplitPane gridPanel;
4437	6179	JSplitPane bigPanel;
	6180	+
4438	6181	cGridBag bigThree;
4439	6182	cGridBag scenePanel;
4440	6183	cGridBag centralPanel;
..	..	@@ -4492,7 +6235,7 @@
4492	6235	JLabel colorLabel;
4493	6236	cNumberSlider colorField;
4494	6237	JLabel modulationLabel;
4495		- cNumberSlider modulationField;
	6238	+ cNumberSlider saturationField;
4496	6239	JLabel metalnessLabel;
4497	6240	cNumberSlider metalnessField;
4498	6241	JLabel diffuseLabel;
..	..	@@ -4523,6 +6266,7 @@
4523	6266	cNumberSlider anisoField;
4524	6267	JLabel anisoVLabel;
4525	6268	cNumberSlider anisoVField;
	6269	+
4526	6270	JLabel cameraLabel;
4527	6271	cNumberSlider cameraField;
4528	6272	JLabel selfshadowLabel;
..	..	@@ -4533,10 +6277,13 @@
4533	6277	cNumberSlider textureField;
4534	6278	JLabel opacityLabel;
4535	6279	cNumberSlider opacityField;
	6280	+ JLabel parallaxLabel;
	6281	+ cNumberSlider parallaxField;
4536	6282	JLabel fakedepthLabel;
4537	6283	cNumberSlider fakedepthField;
4538	6284	JLabel shadowbiasLabel;
4539	6285	cNumberSlider shadowbiasField;
	6286	+
4540	6287	JLabel bumpLabel;
4541	6288	cNumberSlider bumpField;
4542	6289	JLabel noiseLabel;
..	..	@@ -4549,8 +6296,13 @@
4549	6296	cNumberSlider fogField;
4550	6297	JLabel opacityPowerLabel;
4551	6298	cNumberSlider opacityPowerField;
4552		- JTree jTree;
	6299	+ cTree jTree;
4553	6300	//ObjectUI parent;
4554	6301
4555	6302	cNumberSlider normalpushField;
	6303	+
	6304	+ private MenuItem importGFDItem;
	6305	+ private MenuItem importVRMLX3DItem;
	6306	+ private MenuItem import3DSItem;
	6307	+ private MenuItem importOBJItem;
4556	6308	}