~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,131 @@
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 cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
	82	+
	83	+ cButton GetButton(String name, boolean border)
	84	+ {
	85	+ ImageIcon icon = GetIcon(name);
	86	+ if (icon != null)
	87	+ return new cButton(icon, border);
	88	+ else
	89	+ return new cButton(name, border);
	90	+ }
	91	+
	92	+ cLabel GetLabel(String name, boolean border)
	93	+ {
	94	+ //ImageIcon icon = GetIcon(name);
	95	+ return new cLabel(GetImage(name), border);
	96	+ }
	97	+
	98	+ cToggleButton GetToggleButton(String name, boolean border)
	99	+ {
	100	+ ImageIcon icon = GetIcon(name);
	101	+ return new cToggleButton(icon, border);
	102	+ }
	103	+
	104	+ cCheckBox GetCheckBox(String name, boolean border)
	105	+ {
	106	+ ImageIcon icon = GetIcon(name);
	107	+ return new cCheckBox(icon, border);
	108	+ }
	109	+
	110	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	111	+
	112	+ static ImageIcon GetIcon(String name)
	113	+ {
	114	+ javax.swing.ImageIcon iconCache = icons.get(name);
	115	+ if (iconCache != null)
	116	+ {
	117	+ return iconCache;
	118	+ }
	119	+
	120	+ try
	121	+ {
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	123	+
	124	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	125	+// {
	126	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	127	+// Graphics2D g = resized.createGraphics();
	128	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	129	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	130	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	131	+// g.dispose();
	132	+//
	133	+// image = resized;
	134	+// }
	135	+
	136	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	137	+
	138	+ icons.put(name, icon);
	139	+
	140	+ return icon;
	141	+ }
	142	+ catch (Exception e)
	143	+ {
	144	+ //icons.put(name, null);
	145	+ return null;
	146	+ }
	147	+ }
	148	+
	149	+ BufferedImage GetImage(String name)
	150	+ {
	151	+ try
	152	+ {
	153	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	154	+
	155	+ return image;
	156	+ }
	157	+ catch (Exception e)
	158	+ {
	159	+ return null;
	160	+ }
	161	+ }
38	162
39	163	// SCRIPT
40	164
..	..	@@ -138,34 +262,42 @@
138	262	public void closeUI()
139	263	{
140	264	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	265	+// System.out.println("this = " + this);
	266	+// System.out.println("objEditor = " + objEditor);
143	267	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	268	+// objEditor.ctrlPanel.remove(nameField);
145	269
146		- if (!GroupEditor.allparams)
	270	+ objEditor.ctrlPanel.remove(namePanel);
	271	+
	272	+ if (!allparams)
147	273	return;
148	274
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);
	275	+// objEditor.ctrlPanel.remove(liveCB);
	276	+// objEditor.ctrlPanel.remove(hideCB);
	277	+// objEditor.ctrlPanel.remove(markCB);
	278	+//
	279	+// objEditor.ctrlPanel.remove(randomCB);
	280	+// objEditor.ctrlPanel.remove(speedupCB);
	281	+// objEditor.ctrlPanel.remove(rewindCB);
	282	+//
	283	+// objEditor.ctrlPanel.remove(resetButton);
	284	+// objEditor.ctrlPanel.remove(stepButton);
	285	+//// objEditor.ctrlPanel.remove(stepAllButton);
	286	+//// objEditor.ctrlPanel.remove(resetAllButton);
	287	+// objEditor.ctrlPanel.remove(link2masterCB);
	288	+// //objEditor.ctrlPanel.remove(flipVCB);
	289	+// //objEditor.ctrlPanel.remove(texresMenu);
	290	+// objEditor.ctrlPanel.remove(slowerButton);
	291	+// objEditor.ctrlPanel.remove(fasterButton);
	292	+// objEditor.ctrlPanel.remove(remarkButton);
167	293
168		- Remove(normalpushField);
	294	+ objEditor.ctrlPanel.remove(setupPanel);
	295	+ objEditor.ctrlPanel.remove(setupPanel2);
	296	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	297	+ objEditor.ctrlPanel.remove(pushPanel);
	298	+ //objEditor.ctrlPanel.remove(fillPanel);
	299	+
	300	+ //Remove(normalpushField);
169	301	}
170	302
171	303	public ObjEditor GetEditor()
..	..	@@ -209,6 +341,14 @@
209	341	client = inClient;
210	342	copy = client;
211	343
	344	+// if (copy.versionlist == null)
	345	+// {
	346	+// copy.versionlist = new Object3D[100];
	347	+// copy.versionindex = -1;
	348	+//
	349	+// callee.Save(true);
	350	+// }
	351	+
212	352	// "this" is not called: SetupUI2(objEditor);
213	353	}
214	354
..	..	@@ -222,6 +362,14 @@
222	362	client = inClient;
223	363	copy = client;
224	364
	365	+ if (copy.versionlist == null)
	366	+ {
	367	+ copy.versionlist = new Object3D[100];
	368	+ copy.versionindex = -1;
	369	+
	370	+// Save(true);
	371	+ }
	372	+
225	373	SetupUI2(callee.GetEditor());
226	374	}
227	375
..	..	@@ -236,13 +384,15 @@
236	384	//localCopy.parent = null;
237	385
238	386	frame = new JFrame();
	387	+ frame.setUndecorated(false);
239	388	objEditor = this;
240	389	this.callee = callee;
241	390
242	391	//parent = p;
243	392
244	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
245		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
246	396	//gd.setFullScreenWindow(this);
247	397	//setResizable(false);
248	398	//if (!isDisplayable())
..	..	@@ -253,6 +403,14 @@
253	403	copy = localCopy;
254	404	copy.editWindow = this;
255	405
	406	+// if (copy.versionlist == null)
	407	+// {
	408	+// copy.versionlist = new Object3D[100];
	409	+// copy.versionindex = -1;
	410	+//
	411	+// Save(true);
	412	+// }
	413	+
256	414	SetupMenu();
257	415
258	416	//SetupName(objEditor); // new
..	..	@@ -266,28 +424,52 @@
266	424	return frame.action(event, obj);
267	425	}
268	426
	427	+ // Cannot work without static
	428	+ static boolean allparams = true;
	429	+
	430	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	431	+
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
269	435	void SetupMenu()
270	436	{
271	437	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..."));
	438	+ menuBar.add(fileMenu = new Menu("File"));
	439	+ fileMenu.add(newItem = new MenuItem("New"));
	440	+ fileMenu.add(openItem = new MenuItem("Open..."));
	441	+
	442	+ //oe.menuBar.add(menu = new Menu("Include"));
	443	+ Menu menu = new Menu("Import");
	444	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	445	+ importOBJItem.addActionListener(this);
	446	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	447	+ import3DSItem.addActionListener(this);
	448	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	449	+ importVRMLX3DItem.addActionListener(this);
	450	+ menu.add("-");
	451	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	452	+ importGFDItem.addActionListener(this);
	453	+ fileMenu.add(menu);
	454	+ fileMenu.add("-");
	455	+
	456	+ fileMenu.add(saveItem = new MenuItem("Save"));
	457	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	458	//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("-");
	459	+ fileMenu.add("-");
	460	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	461	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	462	+ fileMenu.add("-");
282	463	if (client.parent != null)
283	464	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	465	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	466	} else
286	467	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	468	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	469	}
289	470
290		- loadItem.addActionListener(this);
	471	+ newItem.addActionListener(this);
	472	+ openItem.addActionListener(this);
291	473	saveItem.addActionListener(this);
292	474	saveAsItem.addActionListener(this);
293	475	exportAsItem.addActionListener(this);
..	..	@@ -295,82 +477,103 @@
295	477	//povItem.addActionListener(this);
296	478	closeItem.addActionListener(this);
297	479
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	480	objectPanel = new JTabbedPane();
	481	+
	482	+ ChangeListener changeListener = new ChangeListener()
	483	+ {
	484	+ //String name;
	485	+
	486	+ public void stateChanged(ChangeEvent changeEvent)
	487	+ {
	488	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	489	+// {
	490	+// if (latestObject != null)
	491	+// {
	492	+// refreshContents(true);
	493	+// SetMaterial(latestObject);
	494	+// }
	495	+//
	496	+// materialFlushed = true;
	497	+// }
	498	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	499	+// {
	500	+// if (listUI.size() == 0)
	501	+// EditSelection(false);
	502	+// }
	503	+
	504	+// if (objectPanel.getSelectedIndex() == 4)
	505	+// {
	506	+// name = copy.skyboxname;
	507	+//
	508	+// if (name == null)
	509	+// {
	510	+// name = "";
	511	+// }
	512	+//
	513	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	514	+// copy.skyboxext = "jpg";
	515	+// }
	516	+// else
	517	+// {
	518	+// if (name != null)
	519	+// {
	520	+// if (name.equals(""))
	521	+// {
	522	+// copy.skyboxname = null;
	523	+// copy.skyboxext = null;
	524	+// }
	525	+// else
	526	+// {
	527	+// copy.skyboxname = name;
	528	+// }
	529	+// }
	530	+// }
	531	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	532	+
	533	+// refreshContents(false); // To refresh Info tab
	534	+ cameraView.repaint();
	535	+ }
	536	+ };
	537	+ objectPanel.addChangeListener(changeListener);
	538	+
354	539	toolbarPanel = new JPanel();
355	540	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	541	+
	542	+ treePanel = new cGridBag();
357	543	treePanel.setName("Tree");
358		- ctrlPanel = new cGridBag(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- materialPanel = new cGridBag().setVertical(true);
361		- materialPanel.setName("Material");
	544	+
	545	+ editPanel = new cGridBag().setVertical(true);
	546	+ //editPanel.setName("Edit");
	547	+
	548	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	549	+
	550	+ editCommandsPanel = new cGridBag();
	551	+ editPanel.add(editCommandsPanel);
	552	+ editPanel.add(ctrlPanel);
	553	+
	554	+ toolboxPanel = new cGridBag().setVertical(true);
	555	+ //toolboxPanel.setName("Toolbox");
	556	+
	557	+ skyboxPanel = new cGridBag().setVertical(true);
	558	+
	559	+ materialPanel = new cGridBag().setVertical(false);
	560	+ //materialPanel.setName("Material");
	561	+
362	562	/JTextPane/
363	563	infoarea = createTextPane();
	564	+ doc = infoarea.getStyledDocument();
	565	+
364	566	infoarea.setEditable(true);
365	567	SetText();
	568	+
366	569	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	570	// infoarea.setOpaque(false);
368	571	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	572	+// TEXTAREA infoarea.setLineWrap(true);
	573	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	574	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");
	575	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	576	+ //infoPanel.setName("Info");
374	577	//infoPanel.setLayout(new BorderLayout());
375	578	//infoPanel.add(createTextPane());
376	579
..	..	@@ -378,15 +581,22 @@
378	581	mainPanel.setName("Main");
379	582	mainPanel.setContinuousLayout(true);
380	583	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	584	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	585	+ mainPanel.setDividerLocation(0.5); //1.0);
	586	+ mainPanel.setResizeWeight(0.5);
	587	+
	588	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	589	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	590	+ divider.setDividerSize(15);
	591	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	592	+
	593	+ mainPanel.setUI(new BasicSplitPaneUI());
	594	+
385	595	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	596	//mainPanel.setLayout(new GridBagLayout());
387	597	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
	598	+// treePanel.setLayout(new GridBagLayout());
	599	+ //ctrlPanel.setLayout(new GridBagLayout());
390	600	//materialPanel.setLayout(new GridBagLayout());
391	601
392	602	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
..	..	@@ -426,7 +636,7 @@
426	636	static String newline = "\n";
427	637	protected static final String buttonString = "JButton";
428	638	StyledDocument doc;
429		- JTextArea infoarea;
	639	+ JTextPane infoarea;
430	640
431	641	void ClearInfo()
432	642	{
..	..	@@ -449,10 +659,10 @@
449	659	e.printStackTrace();
450	660	}
451	661
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();
	662	+// String selection = infoarea.getText();
	663	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	664	+// java.awt.datatransfer.Clipboard clipboard =
	665	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	666	//clipboard.setContents(data, data);
457	667	}
458	668
..	..	@@ -475,13 +685,13 @@
475	685	//SendInfo("Name:", "bold");
476	686	if (sel.GetTextures() != null \|\| debug)
477	687	{
478		- si.SendInfo(sel.toString(), "bold");
	688	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	689	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	690	if (sel.Size() > 0)
481	691	{
482	692	si.SendInfo("#children = " + sel.Size(), "regular");
483	693	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	694	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	695	if (debug)
486	696	{
487	697	try
..	..	@@ -493,7 +703,10 @@
493	703	}
494	704
495	705	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	706	+ {
	707	+ si.SendInfo(" BBox min: " + minima, "regular");
	708	+ si.SendInfo(" BBox max: " + maxima, "regular");
	709	+ }
497	710
498	711	if (sel.bRep != null)
499	712	{
..	..	@@ -520,7 +733,7 @@
520	733	}
521	734	if (sel.support != null)
522	735	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	736	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	737	}
525	738	if (sel.scriptnode != null)
526	739	{
..	..	@@ -591,6 +804,9 @@
591	804	{
592	805	CameraPane.pointflow = (PointFlow) sel;
593	806	}
	807	+
	808	+ si.SendInfo("_____________________", "regular");
	809	+ si.SendInfo("", "regular");
594	810	}
595	811	}
596	812
..	..	@@ -606,68 +822,216 @@
606	822	}
607	823	}
608	824
	825	+//static GraphicsDevice device = GraphicsEnvironment
	826	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	827	+
	828	+ Rectangle keeprect;
	829	+ cRadio radio;
	830	+
	831	+cButton keepButton;
	832	+ cButton twoButton; // Full 3D
	833	+ cButton sixButton;
	834	+ cButton threeButton;
	835	+ cButton sevenButton;
	836	+ cButton fourButton; // full panel
	837	+ cButton oneButton; // full XYZ
	838	+ //cButton currentLayout;
	839	+
	840	+ boolean maximized;
	841	+
	842	+ cButton fullscreenLayout;
	843	+ cButton expandedLayout;
	844	+
	845	+ void Minimize()
	846	+ {
	847	+ frame.setState(Frame.ICONIFIED);
	848	+ frame.validate();
	849	+ }
	850	+
	851	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	852	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	853	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	854	+ void Maximize()
	855	+ {
	856	+ if (CameraPane.FULLSCREEN)
	857	+ {
	858	+ ToggleFullScreen();
	859	+ }
	860	+
	861	+ if (maximized)
	862	+ {
	863	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	864	+ }
	865	+ else
	866	+ {
	867	+ keeprect = frame.getBounds();
	868	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	869	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	870	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	871	+// frame.setState(Frame.MAXIMIZED_BOTH);
	872	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	873	+ }
	874	+
	875	+ maximized ^= true;
	876	+
	877	+ frame.validate();
	878	+ }
	879	+
	880	+ cButton minButton;
	881	+ cButton maxButton;
	882	+ cButton fullButton;
	883	+ cButton collapseButton;
	884	+ cButton maximize3DButton;
	885	+
609	886	void ToggleFullScreen()
610	887	{
611		- if (CameraPane.FULLSCREEN)
	888	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	889	+
	890	+ cameraView.ToggleFullScreen();
	891	+
	892	+ if (!CameraPane.FULLSCREEN)
612	893	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	894	+ device.setFullScreenWindow(null);
	895	+ frame.dispose();
	896	+ frame.setUndecorated(false);
	897	+ frame.validate();
	898	+ frame.setVisible(true);
	899	+
	900	+ //frame.setVisible(false);
	901	+// frame.removeNotify();
	902	+// frame.setUndecorated(false);
	903	+// frame.addNotify();
	904	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	905	+
	906	+// X frame.getContentPane().remove(/"Center",/bigThree);
	907	+// X framePanel.add(bigThree);
	908	+// X frame.getContentPane().add(/"Center",/framePanel);
	909	+// framePanel.setDividerLocation(46); // icons are 24x24
	910	+
	911	+ //frame.setVisible(true);
	912	+// radio.layout = keepButton;
	913	+ //theFrame = null;
	914	+ keepButton = null;
	915	+// radio.layout.doClick();
	916	+
616	917	} else
617	918	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	919	+ keepButton = radio.layout;
	920	+ //keeprect = frame.getBounds();
	921	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	922	+// frame.getToolkit().getScreenSize().height);
	923	+ //frame.setVisible(false);
	924	+
	925	+ frame.dispose();
	926	+ frame.setUndecorated(true);
	927	+ device.setFullScreenWindow(frame);
	928	+ frame.validate();
	929	+ frame.setVisible(true);
	930	+// frame.removeNotify();
	931	+// frame.setUndecorated(true);
	932	+// frame.addNotify();
	933	+// X frame.getContentPane().remove(/"Center",/framePanel);
	934	+// X framePanel.remove(bigThree);
	935	+// X frame.getContentPane().add(/"Center",/bigThree);
	936	+// framePanel.setDividerLocation(0);
	937	+
	938	+// radio.layout = fullscreenLayout;
	939	+// radio.layout.doClick();
	940	+ //frame.setVisible(true);
621	941	}
622		- cameraView.ToggleFullScreen();
	942	+ frame.validate();
	943	+
	944	+ cameraView.requestFocusInWindow();
623	945	}
624	946
625		- private JTextArea createTextPane()
	947	+ void CollapseToolbar()
	948	+ {
	949	+ framePanel.setDividerLocation(0);
	950	+ //frame.validate();
	951	+
	952	+ cameraView.requestFocusInWindow();
	953	+ }
	954	+
	955	+ private Object3D Duplicate(Object3D object)
626	956	{
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		- };
	957	+ boolean temp = CameraPane.SWITCH;
	958	+ CameraPane.SWITCH = false;
	959	+
	960	+ if (Grafreed.grafreed.universe.versiontable == null)
	961	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	962	+
	963	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	964	+ // if (copy == client)
	965	+
	966	+ Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	968	+ object.versionlist = null;
	969	+ object.versiontable = null;
	970	+
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
	973	+
	974	+ //byte[] compress = Compress(copy);
	975	+ Object3D compress = (Object3D)Grafreed.clone(object);
	976	+
	977	+ object.parent = parent;
	978	+
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	983	+
	984	+ CameraPane.SWITCH = temp;
	985	+
	986	+ return compress;
	987	+ }
642	988
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
	989	+ private JTextPane createTextPane()
	990	+ {
	991	+// TEXTAREA String[] initString =
	992	+// {
	993	+// "This is an editable JTextPane, ", //regular
	994	+// "another ", //italic
	995	+// "styled ", //bold
	996	+// "text ", //small
	997	+// "component, ", //large
	998	+// "which supports embedded components..." + newline,//regular
	999	+// " " + newline, //button
	1000	+// "...and embedded icons..." + newline, //regular
	1001	+// " ", //icon
	1002	+// newline + "JTextPane is a subclass of JEditorPane that "
	1003	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	1004	+// + "cover methods for interacting with those objects."
	1005	+// };
	1006	+//
	1007	+// String[] initStyles =
	1008	+// {
	1009	+// "regular", "italic", "bold", "small", "large",
	1010	+// "regular", "button", "regular", "icon",
	1011	+// "regular"
	1012	+// };
	1013	+//
	1014	+// JTextPane textPane = new JTextPane();
	1015	+// textPane.setEditable(true);
	1016	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1017	+// addStylesToDocument(doc);
	1018	+//
	1019	+// try
	1020	+// {
	1021	+// for (int j = 0; j < 2; j++)
	1022	+// {
	1023	+// for (int i = 0; i < initString.length; i++)
	1024	+// {
	1025	+// doc.insertString(doc.getLength(), initString[i],
	1026	+// doc.getStyle(initStyles[i]));
	1027	+// }
	1028	+// }
	1029	+// } catch (BadLocationException ble)
	1030	+// {
	1031	+// System.err.println("Couldn't insert initial text into text pane.");
	1032	+// }
649	1033
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;
	1034	+ return new JTextPane(); // textPane;
671	1035	}
672	1036
673	1037	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +1084,7 @@
720	1084	protected static ImageIcon createImageIcon(String path,
721	1085	String description)
722	1086	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1087	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	1088	if (imgURL != null)
725	1089	{
726	1090	return new ImageIcon(imgURL, description);
..	..	@@ -743,6 +1107,7 @@
743	1107	{
744	1108	SetupMaterial(materialPanel);
745	1109	}
	1110	+
746	1111	//SetupName();
747	1112	//SetupViews();
748	1113	}
..	..	@@ -752,6 +1117,7 @@
752	1117	// NumberSlider vDivsField;
753	1118	// JCheckBox endcaps;
754	1119	JCheckBox liveCB;
	1120	+ JCheckBox selectableCB;
755	1121	JCheckBox hideCB;
756	1122	JCheckBox link2masterCB;
757	1123	JCheckBox markCB;
..	..	@@ -759,7 +1125,12 @@
759	1125	JCheckBox speedupCB;
760	1126	JCheckBox rewindCB;
761	1127	JCheckBox flipVCB;
	1128	+
	1129	+ cCheckBox toggleTextureCB;
	1130	+ cCheckBox toggleSwitchCB;
	1131	+
762	1132	JComboBox texresMenu;
	1133	+
763	1134	JButton resetButton;
764	1135	JButton stepButton;
765	1136	JButton stepAllButton;
..	..	@@ -767,54 +1138,48 @@
767	1138	JButton slowerButton;
768	1139	JButton fasterButton;
769	1140	JButton remarkButton;
	1141	+
	1142	+ cGridBag editPanel;
	1143	+ cGridBag editCommandsPanel;
	1144	+
	1145	+ cGridBag namePanel;
	1146	+ cGridBag setupPanel;
	1147	+ cGridBag setupPanel2;
	1148	+ cGridBag objectCommandsPanel;
	1149	+ cGridBag pushPanel;
	1150	+ cGridBag fillPanel;
770	1151
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1152	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	1153	{
773	1154	JCheckBox cb;
774	1155
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);
	1156	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	1157	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	1158
785	1159	return cb;
786	1160	}
787	1161
788		- cButton AddButton(ObjEditor oe, String label)
	1162	+ cButton AddButton(cGridBag panel, String label)
789	1163	{
790	1164	cButton cb;
791	1165
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);
	1166	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	1167	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	1168
802	1169	return cb;
803	1170	}
804	1171
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1172	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1173	{
807	1174	JComboBox combo;
808	1175
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;
	1176	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1177	combo.addActionListener(this);
813	1178
814	1179	return combo;
815	1180	}
816	1181
817		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
	1182	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1183	{
819	1184	cGridBag control = new cGridBag();
820	1185
..	..	@@ -826,12 +1191,12 @@
826	1191	control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827	1192	combo.setFloat(current);
828	1193
829		- ctrlPanel.add(control);
	1194	+ panel.add(control);
830	1195
831		- return combo;
	1196	+ return control;
832	1197	}
833	1198
834		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
	1199	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835	1200	{
836	1201	cGridBag control = new cGridBag();
837	1202
..	..	@@ -839,25 +1204,21 @@
839	1204
840	1205	JLabel jlabel = new JLabel(label);
841	1206	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);
	1207	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1208	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844	1209	combo.setInteger(current);
845	1210
846		- ctrlPanel.add(control);
	1211	+ panel.add(control);
847	1212
848		- return combo;
	1213	+ return control;
849	1214	}
850	1215
851	1216	JTextArea AddText(cGridBag ctrlPanel, String name)
852	1217	{
853	1218	JTextArea text;
854	1219
855		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857	1220	ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1221	text.addCaretListener(this);
859		- aConstraints.gridx += 1;
860		- aConstraints.gridwidth = 1;
861	1222
862	1223	return text;
863	1224	}
..	..	@@ -896,7 +1257,7 @@
896	1257
897	1258	/*
898	1259	*/
899		- void Return() // ObjEditor oe)
	1260	+ void Return0() // ObjEditor oe)
900	1261	{
901	1262	aConstraints.gridy += 1;
902	1263	aConstraints.gridx = 0;
..	..	@@ -951,37 +1312,92 @@
951	1312
952	1313	void SetupUI2(ObjEditor oe)
953	1314	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958		- SetupName(oe);
	1315	+ //SetupName(oe);
959	1316
960		- if (!GroupEditor.allparams)
	1317	+ namePanel = new cGridBag();
	1318	+
	1319	+ //if (copy.pinned)
	1320	+ {
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1322	+ pinButton.setSelected(copy.pinned);
	1323	+ cGridBag t = new cGridBag();
	1324	+ t.preferredWidth = 2;
	1325	+ t.add(pinButton);
	1326	+ namePanel.add(t);
	1327	+
	1328	+ pinButton.addItemListener(this);
	1329	+ }
	1330	+
	1331	+ nameField = AddText(namePanel, copy.GetName());
	1332	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1333	+ oe.ctrlPanel.add(namePanel);
	1334	+
	1335	+ oe.ctrlPanel.Return();
	1336	+
	1337	+ if (!allparams)
961	1338	return;
962	1339
963		- liveCB = AddCheckBox(oe, "Live", copy.live);
964		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1340	+ setupPanel = new cGridBag().setVertical(false);
	1341	+
	1342	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1343	+ liveCB.setToolTipText("Animate object");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
	1346	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1347	+ selectableCB.setToolTipText("Make object selectable");
966	1348	// 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");
	1349	+
	1350	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1351	+ hideCB.setToolTipText("Hide object");
	1352	+
	1353	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1354	+
	1355	+ setupPanel2 = new cGridBag().setVertical(false);
	1356	+
	1357	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1358	+ rewindCB.setToolTipText("Rewind animation");
	1359	+
	1360	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1361	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1362	+
	1363	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1364	+ link2masterCB.setToolTipText("Attach to support");
	1365	+
	1366	+ if (Globals.ADVANCED)
	1367	+ {
	1368	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1369	+ speedupCB.setToolTipText("Option motion capture");
	1370	+ }
	1371	+
	1372	+ oe.ctrlPanel.add(setupPanel);
	1373	+ oe.ctrlPanel.Return();
	1374	+ oe.ctrlPanel.add(setupPanel2);
	1375	+ oe.ctrlPanel.Return();
	1376	+
	1377	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1378	+
	1379	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1380	+ resetButton.setToolTipText("Jump to frame zero");
	1381	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1382	+ stepButton.setToolTipText("Step one frame");
973	1383	// resetAllButton = AddButton(oe, "Reset All");
974	1384	// stepAllButton = AddButton(oe, "Step All");
975		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
976	1385	// Return();
977		- slowerButton = AddButton(oe, "Slow");
978		- fasterButton = AddButton(oe, "Fast");
979		- remarkButton = AddButton(oe, "Rem");
	1386	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1387	+ slowerButton.setToolTipText("Decrease animation speed");
	1388	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1389	+ fasterButton.setToolTipText("Increase animation speed");
	1390	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1391	+ remarkButton.setToolTipText("Set the current transform as the target");
980	1392
981		- Return();
	1393	+ oe.ctrlPanel.add(objectCommandsPanel);
	1394	+ oe.ctrlPanel.Return();
982	1395
983		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984		- Return();
	1396	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1397	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1398	+ //Return();
	1399	+
	1400	+ oe.ctrlPanel.Return();
985	1401
986	1402	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1403	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1076,7 +1492,7 @@
1076	1492	oe.aConstraints.gridwidth = 1;
1077	1493	/**/
1078	1494	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1495	+ oe.ctrlPanel.Return();
1080	1496
1081	1497	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1498	//textureButton.setEnabled(false);
..	..	@@ -1134,6 +1550,7 @@
1134	1550
1135	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1136	1552	{
	1553	+ if (Globals.DEBUG)
1137	1554	System.out.println("CREATE CAMERAS");
1138	1555	cams = new cTemplate();
1139	1556	cams.name = "Cameras";
..	..	@@ -1180,8 +1597,11 @@
1180	1597	//worldPanel.setName("World");
1181	1598	centralPanel = new cGridBag();
1182	1599	centralPanel.preferredWidth = 20;
1183		- timelinePanel = new JPanel(new BorderLayout());
1184		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1600	+
	1601	+ if (Globals.ADVANCED)
	1602	+ {
	1603	+ timelinePanel = new JPanel(new BorderLayout());
	1604	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1185	1605
1186	1606	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1187	1607	cameraPanel.setContinuousLayout(true);
..	..	@@ -1190,7 +1610,10 @@
1190	1610	// cameraPanel.setDividerSize(9);
1191	1611	cameraPanel.setResizeWeight(1.0);
1192	1612
	1613	+ }
	1614	+
1193	1615	centralPanel.add(cameraView);
	1616	+ centralPanel.setFocusable(true);
1194	1617	//frame.setJMenuBar(timelineMenubar);
1195	1618	//centralPanel.add(timelinePanel);
1196	1619
..	..	@@ -1209,6 +1632,42 @@
1209	1632	//frontView.object = copy;
1210	1633	//sideView.object = copy;
1211	1634
	1635	+ transformPanel = new cGridBag().setVertical(true);
	1636	+
	1637	+ cGridBag resetTransformPanel = new cGridBag();
	1638	+
	1639	+ resetTransformPanel.preferredHeight = 2;
	1640	+
	1641	+ cButton resetTransform = GetButton("Reset all", !Grafreed.NIMBUSLAF);
	1642	+ resetTransform.addMouseListener(new MouseAdapter()
	1643	+ {
	1644	+ public void mouseClicked(MouseEvent e)
	1645	+ {
	1646	+ ResetTransform();
	1647	+ }
	1648	+ });
	1649	+ resetTransformPanel.add(resetTransform);
	1650	+
	1651	+ resetTransform = GetButton("T only", !Grafreed.NIMBUSLAF);
	1652	+ resetTransform.addMouseListener(new MouseAdapter()
	1653	+ {
	1654	+ public void mouseClicked(MouseEvent e)
	1655	+ {
	1656	+ ResetTransform(1);
	1657	+ }
	1658	+ });
	1659	+ resetTransformPanel.add(resetTransform);
	1660	+
	1661	+ resetTransform = GetButton("RS only", !Grafreed.NIMBUSLAF);
	1662	+ resetTransform.addMouseListener(new MouseAdapter()
	1663	+ {
	1664	+ public void mouseClicked(MouseEvent e)
	1665	+ {
	1666	+ ResetTransform(2);
	1667	+ }
	1668	+ });
	1669	+ resetTransformPanel.add(resetTransform);
	1670	+
1212	1671	XYZPanel = new cGridBag().setVertical(true);
1213	1672	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1214	1673
..	..	@@ -1216,7 +1675,11 @@
1216	1675	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1217	1676	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1218	1677	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1678	+ //XYZPanel.setName("XYZ");
1219	1679
	1680	+ transformPanel.add(resetTransformPanel);
	1681	+ transformPanel.add(XYZPanel);
	1682	+
1220	1683	/*
1221	1684	gridPanel = new JPanel(); //new BorderLayout());
1222	1685	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1224,12 +1687,12 @@
1224	1687	gridPanel.add(cameraView);
1225	1688	gridPanel.add(XYZPanel);
1226	1689	*/
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);
	1690	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1691	+// gridPanel.setContinuousLayout(true);
	1692	+// gridPanel.setOneTouchExpandable(true);
	1693	+// gridPanel.setDividerLocation(1.0);
	1694	+// gridPanel.setDividerSize(9);
	1695	+// gridPanel.setResizeWeight(0.85);
1233	1696
1234	1697	// aConstraints.weighty = 0;
1235	1698	//System.out.println("THIS = " + this);
..	..	@@ -1252,13 +1715,34 @@
1252	1715
1253	1716	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254	1717	//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);
	1718	+ objectPanel.add(toolboxPanel);
	1719	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1720	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1261	1721
	1722	+ objectPanel.add(materialPanel);
	1723	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1724	+ objectPanel.setToolTipTextAt(1, "Material");
	1725	+
	1726	+ objectPanel.add(skyboxPanel);
	1727	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1728	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1729	+
	1730	+// JPanel north = new JPanel(new BorderLayout());
	1731	+// north.setName("Edit");
	1732	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1733	+// objectPanel.add(north);
	1734	+ objectPanel.add(editPanel);
	1735	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1736	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1737	+
	1738	+ objectPanel.add(transformPanel);
	1739	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1740	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1741	+
	1742	+ patchMaterial = true;
	1743	+ cameraView.patchMaterial = this;
	1744	+ objectPanel.setSelectedIndex(1);
	1745	+
1262	1746	/*
1263	1747	aConstraints.gridx = 0;
1264	1748	aConstraints.gridwidth = 1;
..	..	@@ -1266,7 +1750,7 @@
1266	1750	aConstraints.gridy += 1;
1267	1751	aConstraints.gridwidth = 1;
1268	1752	mainPanel.add(objectPanel, aConstraints);
1269		- */
	1753	+ */
1270	1754
1271	1755	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1272	1756	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1278,14 +1762,12 @@
1278	1762	scrollpane.addMouseWheelListener(this); // Default not fast enough
1279	1763
1280	1764	/JTabbedPane/ scenePanel = new cGridBag();
1281		- scenePanel.preferredWidth = 7;
	1765	+ scenePanel.preferredWidth = 6;
1282	1766
1283	1767	JTabbedPane tabbedPane = new JTabbedPane();
1284	1768	tabbedPane.add(scrollpane);
1285	1769
1286		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287		-
1288		- optionsPanel = new cGridBag().setVertical(true);
	1770	+ optionsPanel = new cGridBag().setVertical(false);
1289	1771
1290	1772	optionsPanel.setName("Options");
1291	1773
..	..	@@ -1293,8 +1775,15 @@
1293	1775
1294	1776	tabbedPane.add(optionsPanel);
1295	1777
	1778	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1779	+
1296	1780	scenePanel.add(tabbedPane);
1297	1781
	1782	+ //if (Globals.ADVANCED)
	1783	+// tabbedPane.add(infoPanel);
	1784	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1785	+// tabbedPane.setToolTipTextAt(3, "Information");
	1786	+
1298	1787	/*
1299	1788	cTree jTree = new cTree(null);
1300	1789	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1315,13 +1804,13 @@
1315	1804	jtp.add(tree);
1316	1805	*/
1317	1806
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");
	1807	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1808	+// bigPanel.setContinuousLayout(true);
	1809	+// bigPanel.setOneTouchExpandable(true);
	1810	+// bigPanel.setDividerLocation(0.8);
	1811	+// bigPanel.setDividerSize(15);
	1812	+// bigPanel.setResizeWeight(0.15);
	1813	+// bigPanel.setName("Scene");
1325	1814
1326	1815	//bigPanel.setLayout(new BorderLayout());
1327	1816	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1356,7 +1845,7 @@
1356	1845	bigThree = new cGridBag();
1357	1846	bigThree.addComponent(scenePanel);
1358	1847	bigThree.addComponent(centralPanel);
1359		- bigThree.addComponent(XYZPanel);
	1848	+ //bigThree.addComponent(XYZPanel);
1360	1849
1361	1850	// // SIDE EFFECT!!!
1362	1851	// aConstraints.gridx = 0;
..	..	@@ -1365,16 +1854,33 @@
1365	1854	// aConstraints.gridheight = 1;
1366	1855
1367	1856	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1368		- framePanel.setContinuousLayout(true);
1369		- framePanel.setOneTouchExpandable(true);
1370		- framePanel.setDividerLocation(0.8);
	1857	+
	1858	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1859	+ new java.beans.PropertyChangeListener()
	1860	+ {
	1861	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1862	+ {
	1863	+ if ((Integer)pce.getOldValue() == 1)
	1864	+ {
	1865	+ if (radio.layout != expandedLayout)
	1866	+ {
	1867	+ radio.layout = expandedLayout;
	1868	+ radio.layout.doClick();
	1869	+ }
	1870	+ }
	1871	+ }
	1872	+ });
	1873	+
	1874	+ framePanel.setContinuousLayout(false);
	1875	+ framePanel.setOneTouchExpandable(false);
	1876	+ //.setDividerLocation(0.8);
1371	1877	//framePanel.setDividerSize(15);
1372	1878	//framePanel.setResizeWeight(0.15);
1373	1879	framePanel.setName("Frame");
1374	1880
1375	1881	frame.getContentPane().setLayout(new BorderLayout());
1376	1882	/**/
1377		- JTabbedPane worldPane = new JTabbedPane();
	1883	+ //JTabbedPane worldPane = new JTabbedPane();
1378	1884	//worldPane.add(bigPanel);
1379	1885	//worldPane.add(worldPanel);
1380	1886	/**/
..	..	@@ -1384,15 +1890,19 @@
1384	1890
1385	1891	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1386	1892
1387		- frame.setSize(1024, 768);
1388		- frame.show();
	1893	+ frame.setSize(1280, 860);
	1894	+
	1895	+ cameraView.requestFocusInWindow();
	1896	+
	1897	+// gridPanel.setDividerLocation(1.0);
	1898	+
	1899	+ frame.validate();
1389	1900
1390		- gridPanel.setDividerLocation(1.0);
	1901	+ frame.setVisible(true);
1391	1902
1392	1903	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1393	1904	frame.addWindowListener(new WindowAdapter()
1394	1905	{
1395		-
1396	1906	public void windowClosing(WindowEvent e)
1397	1907	{
1398	1908	Close();
..	..	@@ -1415,27 +1925,449 @@
1415	1925	ctrlPanel.removeAll();
1416	1926	}
1417	1927
1418		- void SetupMaterial(cGridBag ctrlPanel)
	1928	+ void SetupMaterial(cGridBag materialpanel)
1419	1929	{
1420		- /*
	1930	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1931	+
	1932	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1933	+ skin.setToolTipText("Skin");
	1934	+ skin.addMouseListener(new MouseAdapter()
	1935	+ {
	1936	+ public void mouseClicked(MouseEvent e)
	1937	+ {
	1938	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1939	+ cMaterial material = object.material;
	1940	+
	1941	+ // Skin
	1942	+ colorField.setFloat(material.color);
	1943	+ float saturation = material.modulation;
	1944	+
	1945	+ if (!cameraView.Skinshader)
	1946	+ {
	1947	+ saturation /= 1.5;
	1948	+ }
	1949	+
	1950	+ saturationField.setFloat(saturation);
	1951	+
	1952	+ subsurfaceField.setFloat(material.subsurface);
	1953	+ selfshadowField.setFloat(material.diffuseness);
	1954	+ diffusenessField.setFloat(material.factor);
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ shadowbiasField.setFloat(material.shadowbias);
	1957	+ diffuseField.setFloat(material.diffuse);
	1958	+ specularField.setFloat(material.specular);
	1959	+
	1960	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1961	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1962	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1963	+
	1964	+ materialtouched = true;
	1965	+ applySelf();
	1966	+ }
	1967	+ });
	1968	+ presetpanel.add(skin);
	1969	+
	1970	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1971	+ lambert.setToolTipText("Diffuse");
	1972	+ lambert.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ diffusenessField.setFloat(material.factor);
	1980	+ selfshadowField.setFloat(material.diffuseness);
	1981	+
	1982	+ materialtouched = true;
	1983	+ applySelf();
	1984	+ }
	1985	+ });
	1986	+ presetpanel.add(lambert);
	1987	+
	1988	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1989	+ diffuse2.setToolTipText("Diffuse2");
	1990	+ diffuse2.addMouseListener(new MouseAdapter()
	1991	+ {
	1992	+ public void mouseClicked(MouseEvent e)
	1993	+ {
	1994	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1995	+ cMaterial material = object.material;
	1996	+
	1997	+ diffusenessField.setFloat(material.factor);
	1998	+ selfshadowField.setFloat(material.diffuseness);
	1999	+
	2000	+ materialtouched = true;
	2001	+ applySelf();
	2002	+ }
	2003	+ });
	2004	+ presetpanel.add(diffuse2);
	2005	+
	2006	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2007	+ diffusemoon.setToolTipText("Moon");
	2008	+ diffusemoon.addMouseListener(new MouseAdapter()
	2009	+ {
	2010	+ public void mouseClicked(MouseEvent e)
	2011	+ {
	2012	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2013	+ cMaterial material = object.material;
	2014	+
	2015	+ diffusenessField.setFloat(material.factor);
	2016	+ selfshadowField.setFloat(material.diffuseness);
	2017	+
	2018	+ materialtouched = true;
	2019	+ applySelf();
	2020	+ }
	2021	+ });
	2022	+ presetpanel.add(diffusemoon);
	2023	+
	2024	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2025	+ diffusemoon2.setToolTipText("Moon2");
	2026	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2027	+ {
	2028	+ public void mouseClicked(MouseEvent e)
	2029	+ {
	2030	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2031	+ cMaterial material = object.material;
	2032	+
	2033	+ diffusenessField.setFloat(material.factor);
	2034	+ selfshadowField.setFloat(material.diffuseness);
	2035	+
	2036	+ materialtouched = true;
	2037	+ applySelf();
	2038	+ }
	2039	+ });
	2040	+ presetpanel.add(diffusemoon2);
	2041	+
	2042	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2043	+ diffusemoon3.setToolTipText("Moon3");
	2044	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2045	+ {
	2046	+ public void mouseClicked(MouseEvent e)
	2047	+ {
	2048	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2049	+ cMaterial material = object.material;
	2050	+
	2051	+ diffusenessField.setFloat(material.factor);
	2052	+ selfshadowField.setFloat(material.diffuseness);
	2053	+
	2054	+ materialtouched = true;
	2055	+ applySelf();
	2056	+ }
	2057	+ });
	2058	+ presetpanel.add(diffusemoon3);
	2059	+
	2060	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2061	+ diffusesheen.setToolTipText("Sheen");
	2062	+ diffusesheen.addMouseListener(new MouseAdapter()
	2063	+ {
	2064	+ public void mouseClicked(MouseEvent e)
	2065	+ {
	2066	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2067	+ cMaterial material = object.material;
	2068	+
	2069	+ sheenField.setFloat(material.sheen);
	2070	+
	2071	+ materialtouched = true;
	2072	+ applySelf();
	2073	+ }
	2074	+ });
	2075	+ presetpanel.add(diffusesheen);
	2076	+
	2077	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2078	+ rough.setToolTipText("Rough metal");
	2079	+ rough.addMouseListener(new MouseAdapter()
	2080	+ {
	2081	+ public void mouseClicked(MouseEvent e)
	2082	+ {
	2083	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2084	+ cMaterial material = object.material;
	2085	+
	2086	+ shininessField.setFloat(material.shininess);
	2087	+ velvetField.setFloat(material.velvet);
	2088	+
	2089	+ materialtouched = true;
	2090	+ applySelf();
	2091	+ }
	2092	+ });
	2093	+ presetpanel.add(rough);
	2094	+
	2095	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2096	+ rough2.setToolTipText("Medium metal");
	2097	+ rough2.addMouseListener(new MouseAdapter()
	2098	+ {
	2099	+ public void mouseClicked(MouseEvent e)
	2100	+ {
	2101	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2102	+ cMaterial material = object.material;
	2103	+
	2104	+ shininessField.setFloat(material.shininess);
	2105	+ lightareaField.setFloat(material.lightarea);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(rough2);
	2112	+
	2113	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2114	+ shini0.setToolTipText("Shiny");
	2115	+ shini0.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ shininessField.setFloat(material.shininess);
	2123	+ lightareaField.setFloat(material.lightarea);
	2124	+
	2125	+ materialtouched = true;
	2126	+ applySelf();
	2127	+ }
	2128	+ });
	2129	+ presetpanel.add(shini0);
	2130	+
	2131	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2132	+ shini1.setToolTipText("Shiny2");
	2133	+ shini1.addMouseListener(new MouseAdapter()
	2134	+ {
	2135	+ public void mouseClicked(MouseEvent e)
	2136	+ {
	2137	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2138	+ cMaterial material = object.material;
	2139	+
	2140	+ shininessField.setFloat(material.shininess);
	2141	+ lightareaField.setFloat(material.lightarea);
	2142	+
	2143	+ materialtouched = true;
	2144	+ applySelf();
	2145	+ }
	2146	+ });
	2147	+ presetpanel.add(shini1);
	2148	+
	2149	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2150	+ shini2.setToolTipText("Shiny3");
	2151	+ shini2.addMouseListener(new MouseAdapter()
	2152	+ {
	2153	+ public void mouseClicked(MouseEvent e)
	2154	+ {
	2155	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2156	+ cMaterial material = object.material;
	2157	+
	2158	+ shininessField.setFloat(material.shininess);
	2159	+ lightareaField.setFloat(material.lightarea);
	2160	+
	2161	+ materialtouched = true;
	2162	+ applySelf();
	2163	+ }
	2164	+ });
	2165	+ presetpanel.add(shini2);
	2166	+
	2167	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2168	+ aniso.setToolTipText("AnisoU");
	2169	+ aniso.addMouseListener(new MouseAdapter()
	2170	+ {
	2171	+ public void mouseClicked(MouseEvent e)
	2172	+ {
	2173	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2174	+ cMaterial material = object.material;
	2175	+
	2176	+ anisoField.setFloat(material.aniso);
	2177	+ anisoVField.setFloat(material.anisoV);
	2178	+
	2179	+ materialtouched = true;
	2180	+ applySelf();
	2181	+ }
	2182	+ });
	2183	+ presetpanel.add(aniso);
	2184	+
	2185	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2186	+ aniso2.setToolTipText("AnisoV");
	2187	+ aniso2.addMouseListener(new MouseAdapter()
	2188	+ {
	2189	+ public void mouseClicked(MouseEvent e)
	2190	+ {
	2191	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2192	+ cMaterial material = object.material;
	2193	+
	2194	+ anisoField.setFloat(material.aniso);
	2195	+ anisoVField.setFloat(material.anisoV);
	2196	+
	2197	+ materialtouched = true;
	2198	+ applySelf();
	2199	+ }
	2200	+ });
	2201	+ presetpanel.add(aniso2);
	2202	+
	2203	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2204	+ aniso3.setToolTipText("AnisoUV");
	2205	+ aniso3.addMouseListener(new MouseAdapter()
	2206	+ {
	2207	+ public void mouseClicked(MouseEvent e)
	2208	+ {
	2209	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2210	+ cMaterial material = object.material;
	2211	+
	2212	+ anisoField.setFloat(material.aniso);
	2213	+ anisoVField.setFloat(material.anisoV);
	2214	+
	2215	+ materialtouched = true;
	2216	+ applySelf();
	2217	+ }
	2218	+ });
	2219	+ presetpanel.add(aniso3);
	2220	+
	2221	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2222	+ velvet0.setToolTipText("Velvet");
	2223	+ velvet0.addMouseListener(new MouseAdapter()
	2224	+ {
	2225	+ public void mouseClicked(MouseEvent e)
	2226	+ {
	2227	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2228	+ cMaterial material = object.material;
	2229	+
	2230	+ diffusenessField.setFloat(material.factor);
	2231	+ selfshadowField.setFloat(material.diffuseness);
	2232	+ sheenField.setFloat(material.sheen);
	2233	+ shininessField.setFloat(material.shininess);
	2234	+ velvetField.setFloat(material.velvet);
	2235	+ shiftField.setFloat(material.shift);
	2236	+
	2237	+ materialtouched = true;
	2238	+ applySelf();
	2239	+ }
	2240	+ });
	2241	+ presetpanel.add(velvet0);
	2242	+
	2243	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2244	+ bump0.setToolTipText("Bump texture");
	2245	+ bump0.addMouseListener(new MouseAdapter()
	2246	+ {
	2247	+ public void mouseClicked(MouseEvent e)
	2248	+ {
	2249	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2250	+ cMaterial material = object.material;
	2251	+
	2252	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2253	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2254	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2255	+
	2256	+ materialtouched = true;
	2257	+ applySelf();
	2258	+ }
	2259	+ });
	2260	+ presetpanel.add(bump0);
	2261	+
	2262	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2263	+ borderShader.setToolTipText("Border fade");
	2264	+ borderShader.addMouseListener(new MouseAdapter()
	2265	+ {
	2266	+ public void mouseClicked(MouseEvent e)
	2267	+ {
	2268	+ borderfadeField.setFloat(0.5);
	2269	+ opacityField.setFloat(0.75);
	2270	+
	2271	+ materialtouched = true;
	2272	+ applySelf();
	2273	+ }
	2274	+ });
	2275	+ presetpanel.add(borderShader);
	2276	+
	2277	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2278	+ halo.setToolTipText("Halo");
	2279	+ halo.addMouseListener(new MouseAdapter()
	2280	+ {
	2281	+ public void mouseClicked(MouseEvent e)
	2282	+ {
	2283	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2284	+ cMaterial material = object.material;
	2285	+
	2286	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2287	+
	2288	+ materialtouched = true;
	2289	+ applySelf();
	2290	+ }
	2291	+ });
	2292	+ presetpanel.add(halo);
	2293	+
	2294	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2295	+ candle.setToolTipText("Candle");
	2296	+ candle.addMouseListener(new MouseAdapter()
	2297	+ {
	2298	+ public void mouseClicked(MouseEvent e)
	2299	+ {
	2300	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2301	+ cMaterial material = object.material;
	2302	+
	2303	+ subsurfaceField.setFloat(material.subsurface);
	2304	+ shadowbiasField.setFloat(material.shadowbias);
	2305	+ ambientField.setFloat(material.ambient);
	2306	+ specularField.setFloat(material.specular);
	2307	+ lightareaField.setFloat(material.lightarea);
	2308	+ shininessField.setFloat(material.shininess);
	2309	+
	2310	+ materialtouched = true;
	2311	+ applySelf();
	2312	+ }
	2313	+ });
	2314	+ presetpanel.add(candle);
	2315	+
	2316	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2317	+ shadowShader.setToolTipText("Shadow");
	2318	+ shadowShader.addMouseListener(new MouseAdapter()
	2319	+ {
	2320	+ public void mouseClicked(MouseEvent e)
	2321	+ {
	2322	+ diffuseField.setFloat(0.001);
	2323	+ ambientField.setFloat(0.001);
	2324	+ cameraField.setFloat(0.001);
	2325	+ specularField.setFloat(0.001);
	2326	+ fakedepthField.setFloat(0.001);
	2327	+ opacityField.setFloat(0.6);
	2328	+
	2329	+ materialtouched = true;
	2330	+ applySelf();
	2331	+ }
	2332	+ });
	2333	+ presetpanel.add(shadowShader);
	2334	+
	2335	+ cGridBag panel = new cGridBag().setVertical(true);
	2336	+
	2337	+ presetpanel.preferredWidth = 1;
	2338	+
	2339	+ materialpanel.add(presetpanel);
	2340	+ materialpanel.add(panel);
	2341	+
	2342	+ panel.preferredWidth = 8;
	2343	+
	2344	+ /*
1421	2345	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1422	2346	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1423		- */
	2347	+ */
1424	2348
1425	2349	cGridBag editBar = new cGridBag().setVertical(false);
1426	2350
1427		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	2351	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2352	+ createMaterialButton.setToolTipText("Create material");
1428	2353
1429	2354	/*
1430	2355	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	2356	*/
1432	2357
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);
	2358	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2359	+ clearMaterialButton.setToolTipText("Clear material");
	2360	+
	2361	+ if (Globals.ADVANCED)
	2362	+ {
	2363	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2364	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2365	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2366	+ }
1437	2367
1438		- ctrlPanel.add(editBar);
	2368	+ editBar.preferredHeight = 15;
	2369	+
	2370	+ panel.add(editBar);
1439	2371
1440	2372	/**/
1441	2373	//aConstraints.weighty = 0;
..	..	@@ -1445,59 +2377,68 @@
1445	2377	//aConstraints.gridx += 1;
1446	2378	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1447	2379
1448		- JPanel colorPanel = new JPanel(new BorderLayout());
1449		- colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450		-
1451	2380	cGridBag colorSection = new cGridBag().setVertical(true);
	2381	+
	2382	+ cGridBag huepanel = new cGridBag();
	2383	+ cGridBag huelabel = new cGridBag();
	2384	+ cLabel hue = GetLabel("icons/hue.png", false);
	2385	+ hue.fit = true;
1452	2386
1453		- colorPanel.add(colorSection);
	2387	+ hue.addMouseListener(new MouseAdapter()
	2388	+ {
	2389	+ public void mousePressed(MouseEvent e)
	2390	+ {
	2391	+ int x = e.getX();
	2392	+
	2393	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2394	+ }
	2395	+ });
	2396	+
	2397	+ huelabel.add(hue);
	2398	+ huelabel.preferredWidth = 20;
	2399	+ huepanel.add(new cGridBag()); // Label
	2400	+ huepanel.add(huelabel); // Field/slider
	2401	+
	2402	+ huepanel.preferredHeight = 7;
	2403	+
	2404	+ colorSection.add(huepanel);
1454	2405
1455	2406	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);
	2407	+
	2408	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2409	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2410	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2411	+
	2412	+ //colorField.preferredWidth = 200;
1459	2413	colorSection.add(color);
1460	2414
1461	2415	cGridBag modulation = new cGridBag();
1462	2416	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1463	2417	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1464		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2418	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1465	2419	colorSection.add(modulation);
1466	2420
	2421	+ cGridBag opacity = new cGridBag();
	2422	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2423	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2424	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2425	+ colorSection.add(opacity);
	2426	+
	2427	+ colorSection.add(GetSeparator());
	2428	+
1467	2429	cGridBag texture = new cGridBag();
1468	2430	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1469	2431	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1470	2432	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1471	2433	colorSection.add(texture);
1472	2434
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);
	2435	+ panel.add(GetSeparator());
	2436	+
	2437	+ panel.add(colorSection);
1492	2438
1493	2439	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1494	2440
1495		- JPanel diffusePanel = new JPanel(new BorderLayout());
1496		- diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497		-
1498	2441	cGridBag diffuseSection = new cGridBag().setVertical(true);
1499		-
1500		- diffusePanel.add(diffuseSection);
1501	2442
1502	2443	cGridBag diffuse = new cGridBag();
1503	2444	diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
..	..	@@ -1541,16 +2482,19 @@
1541	2482	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	2483	diffuseSection.add(fakedepth);
1543	2484
1544		- ctrlPanel.add(diffusePanel);
	2485	+ cGridBag shadowbias = new cGridBag();
	2486	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2487	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2488	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2489	+ diffuseSection.add(shadowbias);
	2490	+
	2491	+ panel.add(GetSeparator());
	2492	+
	2493	+ panel.add(diffuseSection);
1545	2494
1546	2495	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1547	2496
1548		- JPanel specularPanel = new JPanel(new BorderLayout());
1549		- specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550		-
1551	2497	cGridBag specularSection = new cGridBag().setVertical(true);
1552		-
1553		- specularPanel.add(specularSection);
1554	2498
1555	2499	cGridBag specular = new cGridBag();
1556	2500	specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
..	..	@@ -1582,7 +2526,7 @@
1582	2526	velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1583	2527	specularSection.add(velvet);
1584	2528
1585		- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	2529	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1586	2530	//Return();
1587	2531	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1588	2532	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..	..	@@ -1594,52 +2538,52 @@
1594	2538	// aConstraints.gridy += 1;
1595	2539	// aConstraints.gridwidth = 1;
1596	2540
	2541	+ cGridBag anisoU = new cGridBag();
	2542	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2543	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2544	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2545	+ specularSection.add(anisoU);
1597	2546
1598		- ctrlPanel.add(specularPanel);
	2547	+ cGridBag anisoV = new cGridBag();
	2548	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2549	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2550	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2551	+ specularSection.add(anisoV);
	2552	+
	2553	+
	2554	+ panel.add(GetSeparator());
	2555	+
	2556	+ panel.add(specularSection);
1599	2557
1600	2558	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1601	2559
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);
	2560	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	2561
1609	2562	cGridBag camera = new cGridBag();
1610	2563	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	2564	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	2565	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	2566	+ colorSection.add(camera);
1614	2567
1615	2568	cGridBag ambient = new cGridBag();
1616	2569	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	2570	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	2571	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	2572	+ colorSection.add(ambient);
1620	2573
1621	2574	cGridBag backlit = new cGridBag();
1622	2575	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	2576	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	2577	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	2578	+ colorSection.add(backlit);
1626	2579
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);
	2580	+ //panel.add(new JSeparator());
	2581	+
	2582	+ //panel.add(globalSection);
1634	2583
1635	2584	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1636	2585
1637		- JPanel texturePanel = new JPanel(new BorderLayout());
1638		- texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639		-
1640	2586	cGridBag textureSection = new cGridBag().setVertical(true);
1641		-
1642		- texturePanel.add(textureSection);
1643	2587
1644	2588	cGridBag bump = new cGridBag();
1645	2589	bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
..	..	@@ -1677,7 +2621,9 @@
1677	2621	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1678	2622	textureSection.add(opacityPower);
1679	2623
1680		- ctrlPanel.add(texturePanel);
	2624	+ panel.add(GetSeparator());
	2625	+
	2626	+ panel.add(textureSection);
1681	2627
1682	2628	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1683	2629
..	..	@@ -1714,12 +2660,15 @@
1714	2660	opacityPowerField.addChangeListener(this);
1715	2661	/**/
1716	2662
1717		- resetSlidersButton.addActionListener(this);
1718	2663	clearMaterialButton.addActionListener(this);
1719	2664	createMaterialButton.addActionListener(this);
1720		-
1721		- propagateToggle.addItemListener(this);
1722		- multiplyToggle.addItemListener(this);
	2665	+
	2666	+ if (Globals.ADVANCED)
	2667	+ {
	2668	+ resetSlidersButton.addActionListener(this);
	2669	+ propagateToggle.addItemListener(this);
	2670	+ multiplyToggle.addItemListener(this);
	2671	+ }
1723	2672	}
1724	2673
1725	2674	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1737,8 +2686,9 @@
1737	2686	// 3D models
1738	2687	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1739	2688	{
1740		- lastConverter = new com.jmex.model.converters.MaxToJme();
1741		- LoadFile(filename, lastConverter);
	2689	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2690	+ //LoadFile(filename, lastConverter);
	2691	+ LoadObjFile(filename); // New 3ds loader
1742	2692	continue;
1743	2693	}
1744	2694	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1890,7 +2840,7 @@
1890	2840
1891	2841	//? flashIt = false;
1892	2842	CameraPane pane = (CameraPane) cameraView;
1893		- pane.clickStart(location.x, location.y, 0);
	2843	+ pane.clickStart(location.x, location.y, 0, 0);
1894	2844	pane.clickEnd(location.x, location.y, 0, true);
1895	2845
1896	2846	if (group.selection.size() == 1)
..	..	@@ -1939,6 +2889,7 @@
1939	2889	e2.printStackTrace();
1940	2890	}
1941	2891	}
	2892	+
1942	2893	LoadJMEThread loadThread;
1943	2894
1944	2895	class LoadJMEThread extends Thread
..	..	@@ -1996,6 +2947,7 @@
1996	2947	//LoadFile0(filename, converter);
1997	2948	}
1998	2949	}
	2950	+
1999	2951	LoadOBJThread loadObjThread;
2000	2952
2001	2953	class LoadOBJThread extends Thread
..	..	@@ -2074,19 +3026,19 @@
2074	3026
2075	3027	void LoadObjFile(String fullname)
2076	3028	{
2077		- /*
	3029	+ System.out.println("Loading " + fullname);
	3030	+ /**/
2078	3031	//lastFilename = fullname;
2079	3032	if(loadObjThread == null)
2080	3033	{
2081		- loadObjThread = new LoadOBJThread();
2082		- loadObjThread.start();
	3034	+ loadObjThread = new LoadOBJThread();
	3035	+ loadObjThread.start();
2083	3036	}
2084	3037
2085	3038	loadObjThread.add(fullname);
2086		- */
	3039	+ /**/
2087	3040
2088		- System.out.println("Loading " + fullname);
2089		- makeSomething(new FileObject(fullname, true), true);
	3041	+ //makeSomething(new FileObject(fullname, true), true);
2090	3042	}
2091	3043
2092	3044	void LoadGFDFile(String fullname)
..	..	@@ -2347,11 +3299,11 @@
2347	3299
2348	3300	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2349	3301	{
2350		- if (GrafreeD.standAlone)
	3302	+ if (Grafreed.standAlone)
2351	3303	{
2352	3304	/**/
2353	3305	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2354		- browser.show();
	3306	+ browser.setVisible(true);
2355	3307	String filename = browser.getFile();
2356	3308	if (filename != null && filename.length() > 0)
2357	3309	{
..	..	@@ -2462,6 +3414,7 @@
2462	3414	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2463	3415	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2464	3416	}
	3417	+
2465	3418	//cJME.count++;
2466	3419	//cJME.count %= 12;
2467	3420	if (gc)
..	..	@@ -2496,6 +3449,7 @@
2496	3449	}
2497	3450	if (input == null)
2498	3451	{
	3452	+ new Exception().printStackTrace();
2499	3453	System.exit(0);
2500	3454	}
2501	3455
..	..	@@ -2644,6 +3598,7 @@
2644	3598	}
2645	3599	}
2646	3600	}
	3601	+
2647	3602	cFileSystemPane FSPane;
2648	3603
2649	3604	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2653,7 +3608,7 @@
2653	3608
2654	3609	freezematerial = true;
2655	3610	colorField.setFloat(mat.color);
2656		- modulationField.setFloat(mat.modulation);
	3611	+ saturationField.setFloat(mat.modulation);
2657	3612	metalnessField.setFloat(mat.metalness);
2658	3613	diffuseField.setFloat(mat.diffuse);
2659	3614	specularField.setFloat(mat.specular);
..	..	@@ -2697,11 +3652,14 @@
2697	3652	}
2698	3653	}
2699	3654	}
	3655	+
2700	3656	freezematerial = false;
2701	3657	}
2702	3658
2703	3659	void SetMaterial(Object3D object)
2704	3660	{
	3661	+ latestObject = object;
	3662	+
2705	3663	cMaterial mat = object.material;
2706	3664
2707	3665	if (mat == null)
..	..	@@ -2710,33 +3668,10 @@
2710	3668	return;
2711	3669	}
2712	3670
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		- }
	3671	+ if (multiplyToggle != null)
	3672	+ multiplyToggle.setSelected(mat.multiply);
	3673	+
	3674	+ AllocProjectedVertices(object);
2740	3675
2741	3676	SetMaterial(mat, object.projectedVertices);
2742	3677	}
..	..	@@ -2812,12 +3747,17 @@
2812	3747	// }
2813	3748
2814	3749	/**/
2815		- if (deselect)
	3750	+ if (deselect \|\| child == null)
2816	3751	{
2817	3752	//group.deselectAll();
2818	3753	//freeze = true;
2819	3754	GetTree().clearSelection();
2820	3755	//freeze = false;
	3756	+
	3757	+ if (child == null)
	3758	+ {
	3759	+ return;
	3760	+ }
2821	3761	}
2822	3762
2823	3763	//group.addSelectee(child);
..	..	@@ -2851,6 +3791,17 @@
2851	3791	public void itemStateChanged(ItemEvent event)
2852	3792	{
2853	3793	// System.out.println("Propagate = " + propagate);
	3794	+ if (event.getSource() == pinButton)
	3795	+ {
	3796	+ copy.pinned ^= true;
	3797	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3798	+ {
	3799	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3800	+ copy.CloseUI();
	3801	+ //copy.editWindow.refreshContents();
	3802	+ }
	3803	+ }
	3804	+ else
2854	3805	if (event.getSource() == propagateToggle)
2855	3806	{
2856	3807	propagate ^= true;
..	..	@@ -2886,7 +3837,7 @@
2886	3837	cameraView.ToggleDL();
2887	3838	cameraView.repaint();
2888	3839	return;
2889		- } else if (event.getSource() == toggleTextureItem)
	3840	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2890	3841	{
2891	3842	cameraView.ToggleTexture();
2892	3843	// june 2013 copy.HardTouch();
..	..	@@ -2925,9 +3876,9 @@
2925	3876	frame.validate();
2926	3877
2927	3878	return;
2928		- } else if (event.getSource() == toggleRandomItem)
	3879	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2929	3880	{
2930		- cameraView.ToggleRandom();
	3881	+ cameraView.ToggleSwitch();
2931	3882	cameraView.repaint();
2932	3883	return;
2933	3884	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,12 +3906,17 @@
2955	3906	} else if (event.getSource() == liveCB)
2956	3907	{
2957	3908	copy.live ^= true;
	3909	+ objEditor.refreshContents(true); // To show item colors
	3910	+ return;
	3911	+ } else if (event.getSource() == selectableCB)
	3912	+ {
	3913	+ copy.dontselect ^= true;
2958	3914	return;
2959	3915	} else if (event.getSource() == hideCB)
2960	3916	{
2961	3917	copy.hide ^= true;
2962	3918	copy.Touch(); // display list issue
2963		- objEditor.refreshContents();
	3919	+ objEditor.refreshContents(true); // To show item colors
2964	3920	return;
2965	3921	} else if (event.getSource() == link2masterCB)
2966	3922	{
..	..	@@ -2970,6 +3926,7 @@
2970	3926	if (event.getSource() == randomCB)
2971	3927	{
2972	3928	copy.random ^= true;
	3929	+ objEditor.refreshContents();
2973	3930	return;
2974	3931	}
2975	3932	if (event.getSource() == speedupCB)
..	..	@@ -2993,8 +3950,9 @@
2993	3950
2994	3951	public void actionPerformed(ActionEvent event)
2995	3952	{
	3953	+ Object source = event.getSource();
2996	3954	// SCRIPT DIALOG
2997		- if (event.getSource() == okbutton)
	3955	+ if (source == okbutton)
2998	3956	{
2999	3957	textpanel.setVisible(false);
3000	3958	textpanel.remove(textarea);
..	..	@@ -3006,7 +3964,7 @@
3006	3964	textarea = null;
3007	3965	textpanel = null;
3008	3966	}
3009		- if (event.getSource() == cancelbutton)
	3967	+ if (source == cancelbutton)
3010	3968	{
3011	3969	textpanel.setVisible(false);
3012	3970	textpanel.remove(textarea);
..	..	@@ -3018,50 +3976,50 @@
3018	3976	//applySelf();
3019	3977	//client.refreshEditWindow();
3020	3978	//refreshContents();
3021		- if (event.getSource() == nameField)
	3979	+ if (source == nameField)
3022	3980	{
3023	3981	//System.out.println("ObjEditor " + event);
3024	3982	applySelf0(true);
3025	3983	//parent.applySelf();
3026		- objEditor.refreshContents();
3027		- } else if (event.getSource() == resetButton)
	3984	+ // conflicts with requestFocus objEditor.refreshContents();
	3985	+ } else if (source == resetButton)
3028	3986	{
3029	3987	CameraPane.fullreset = true;
3030	3988	copy.Reset(); // ResetMeshes();
3031	3989	copy.Touch();
3032	3990	objEditor.refreshContents();
3033		- } else if (event.getSource() == stepItem)
	3991	+ } else if (source == stepItem)
3034	3992	{
3035	3993	//cameraView.ONESTEP = true;
3036	3994	Globals.ONESTEP = true;
3037	3995	cameraView.repaint();
3038	3996	return;
3039		- } else if (event.getSource() == stepButton)
	3997	+ } else if (source == stepButton)
3040	3998	{
3041	3999	copy.Step();
3042	4000	copy.Touch();
3043	4001	objEditor.refreshContents();
3044		- } else if (event.getSource() == slowerButton)
	4002	+ } else if (source == slowerButton)
3045	4003	{
3046	4004	copy.Slower();
3047	4005	copy.Touch();
3048	4006	objEditor.refreshContents();
3049		- } else if (event.getSource() == fasterButton)
	4007	+ } else if (source == fasterButton)
3050	4008	{
3051	4009	copy.Faster();
3052	4010	copy.Touch();
3053	4011	objEditor.refreshContents();
3054		- } else if (event.getSource() == remarkButton)
	4012	+ } else if (source == remarkButton)
3055	4013	{
3056	4014	copy.Remark();
3057	4015	copy.Touch();
3058	4016	objEditor.refreshContents();
3059		- } else if (event.getSource() == stepAllButton)
	4017	+ } else if (source == stepAllButton)
3060	4018	{
3061	4019	copy.StepAll();
3062	4020	copy.Touch();
3063	4021	objEditor.refreshContents();
3064		- } else if (event.getSource() == resetAllButton)
	4022	+ } else if (source == resetAllButton)
3065	4023	{
3066	4024	//CameraPane.fullreset = true;
3067	4025	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3094,53 +4052,79 @@
3094	4052	// Close();
3095	4053	// }
3096	4054	// else
3097		- if (event.getSource() == resetSlidersButton)
	4055	+ if (source == resetSlidersButton)
3098	4056	{
3099	4057	ResetSliders();
3100		- } else if (event.getSource() == clearMaterialButton)
	4058	+ } else if (source == clearMaterialButton)
3101	4059	{
3102	4060	ClearMaterial();
3103		- } else if (event.getSource() == createMaterialButton)
	4061	+ } else if (source == createMaterialButton)
3104	4062	{
3105	4063	CreateMaterial();
3106		- } else if (event.getSource() == clearPanelButton)
	4064	+ } else if (source == clearPanelButton)
3107	4065	{
3108	4066	copy.ClearUI();
3109	4067	refreshContents(true);
3110		- } /*
3111		- }
3112		-
3113		- public boolean action(Event event, Object arg)
3114		- {
3115		- */ else if (event.getSource() == closeItem)
	4068	+ } else if (source == importGFDItem)
	4069	+ {
	4070	+ ImportGFD();
	4071	+ } else
	4072	+ if (source == importVRMLX3DItem)
	4073	+ {
	4074	+ ImportVRMLX3D();
	4075	+ } else
	4076	+ if (source == import3DSItem)
	4077	+ {
	4078	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4079	+ } else
	4080	+ if (source == importOBJItem)
	4081	+ {
	4082	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4083	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4084	+ browser.setVisible(true);
	4085	+ String filename = browser.getFile();
	4086	+ if (filename != null && filename.length() > 0)
	4087	+ {
	4088	+ String fullname = browser.getDirectory() + filename;
	4089	+ makeSomething(ReadOBJ(fullname), true);
	4090	+ }
	4091	+ } else
	4092	+ if (source == closeItem)
3116	4093	{
3117	4094	Close();
3118	4095	//return true;
3119		- } else if (event.getSource() == loadItem)
	4096	+ } else if (source == openItem)
3120	4097	{
3121		- load();
	4098	+ Open();
3122	4099	//return true;
3123		- } else if (event.getSource() == saveItem)
	4100	+ } else if (source == newItem)
	4101	+ {
	4102	+ New();
	4103	+ } else if (source == saveItem)
3124	4104	{
3125	4105	save();
3126	4106	//return true;
3127		- } else if (event.getSource() == saveAsItem)
	4107	+ } else if (source == saveAsItem)
3128	4108	{
3129	4109	saveAs();
3130	4110	//return true;
3131		- } else if (event.getSource() == reexportItem)
	4111	+ } else if (source == reexportItem)
3132	4112	{
3133	4113	reexport();
3134	4114	//return true;
3135		- } else if (event.getSource() == exportAsItem)
	4115	+ } else if (source == exportAsItem)
3136	4116	{
3137	4117	export();
3138	4118	//return true;
3139		- } else if (event.getSource() == povItem)
	4119	+ } else if (source == povItem)
3140	4120	{
3141	4121	generatePOV();
3142	4122	//return true;
3143		- } else if (event.getSource() == zBufferItem)
	4123	+ } else if (event.getSource() == archiveItem)
	4124	+ {
	4125	+ cTools.Archive(frame);
	4126	+ return;
	4127	+ } else if (source == zBufferItem)
3144	4128	{
3145	4129	try
3146	4130	{
..	..	@@ -3162,21 +4146,8 @@
3162	4146	cameraView.repaint();
3163	4147	//return true;
3164	4148	}
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)
	4149	+ */ else // combos...
	4150	+ if (source == texresMenu)
3180	4151	{
3181	4152	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3182	4153	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3188,12 +4159,496 @@
3188	4159	}
3189	4160	}
3190	4161
	4162	+ void New()
	4163	+ {
	4164	+ while (copy.Size() > 1)
	4165	+ {
	4166	+ copy.remove(1);
	4167	+ }
	4168	+
	4169	+ ResetModel();
	4170	+ objEditor.refreshContents();
	4171	+ }
	4172	+
	4173	+ static public byte[] Compress(Object3D o)
	4174	+ {
	4175	+ // Slower to actually compress.
	4176	+ try
	4177	+ {
	4178	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4179	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4180	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4181	+
	4182	+ Object3D parent = o.parent;
	4183	+ o.parent = null;
	4184	+
	4185	+ out.writeObject(o);
	4186	+
	4187	+ o.parent = parent;
	4188	+
	4189	+ out.flush();
	4190	+
	4191	+ baos //zstream
	4192	+ .close();
	4193	+ out.close();
	4194	+
	4195	+ byte[] bytes = baos.toByteArray();
	4196	+
	4197	+ System.out.println("save #bytes = " + bytes.length);
	4198	+ return bytes;
	4199	+ } catch (Exception e)
	4200	+ {
	4201	+ System.err.println(e);
	4202	+ return null;
	4203	+ }
	4204	+ }
	4205	+
	4206	+ static public Object Uncompress(byte[] bytes)
	4207	+ {
	4208	+ System.out.println("restore #bytes = " + bytes.length);
	4209	+ try
	4210	+ {
	4211	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4212	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4213	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4214	+ Object obj = in.readObject();
	4215	+
	4216	+ bais //istream
	4217	+ .close();
	4218	+ in.close();
	4219	+
	4220	+ return obj;
	4221	+ } catch (Exception e)
	4222	+ {
	4223	+ System.err.println(e);
	4224	+ return null;
	4225	+ }
	4226	+ }
	4227	+
	4228	+ static public Object clone(Object o)
	4229	+ {
	4230	+ try
	4231	+ {
	4232	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4233	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4234	+
	4235	+ out.writeObject(o);
	4236	+
	4237	+ out.flush();
	4238	+ out.close();
	4239	+
	4240	+ byte[] bytes = baos.toByteArray();
	4241	+
	4242	+ System.out.println("clone = " + bytes.length);
	4243	+
	4244	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4245	+ ObjectInputStream in = new ObjectInputStream(bais);
	4246	+ Object obj = in.readObject();
	4247	+ in.close();
	4248	+
	4249	+ return obj;
	4250	+ } catch (Exception e)
	4251	+ {
	4252	+ System.err.println(e);
	4253	+ return null;
	4254	+ }
	4255	+ }
	4256	+
	4257	+ cRadio GetCurrentTab()
	4258	+ {
	4259	+ cRadio ab;
	4260	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4261	+ {
	4262	+ ab = (cRadio)e.nextElement();
	4263	+ if(ab.GetObject() == copy)
	4264	+ {
	4265	+ return ab;
	4266	+ }
	4267	+ }
	4268	+
	4269	+ return null;
	4270	+ }
	4271	+
	4272	+
	4273	+ public void Save()
	4274	+ {
	4275	+ //Save(true);
	4276	+ Replace();
	4277	+ SetVersionStates();
	4278	+ }
	4279	+
	4280	+ private boolean Equal(byte[] compress, byte[] name)
	4281	+ {
	4282	+ if (compress.length != name.length)
	4283	+ {
	4284	+ return false;
	4285	+ }
	4286	+
	4287	+ for (int i=compress.length; --i>=0;)
	4288	+ {
	4289	+ if (compress[i] != name[i])
	4290	+ return false;
	4291	+ }
	4292	+
	4293	+ return true;
	4294	+ }
	4295	+
	4296	+ void DeleteVersion()
	4297	+ {
	4298	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4299	+ {
	4300	+ copy.versionlist[i] = copy.versionlist[i+1];
	4301	+ }
	4302	+
	4303	+ if (copy.versionlist[copy.versionindex] == null)
	4304	+ copy.versionindex -= 1;
	4305	+
	4306	+ if (copy.versionindex != -1)
	4307	+ CopyChanged();
	4308	+
	4309	+ SetVersionStates();
	4310	+ }
	4311	+
	4312	+ public boolean Save(boolean user)
	4313	+ {
	4314	+ System.err.println("Save");
	4315	+ Replace();
	4316	+
	4317	+ //cRadio tab = GetCurrentTab();
	4318	+
	4319	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4320	+
	4321	+ boolean thesame = false;
	4322	+
	4323	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4324	+// {
	4325	+// thesame = true;
	4326	+// }
	4327	+
	4328	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4329	+ if (!thesame)
	4330	+ {
	4331	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4332	+ {
	4333	+ copy.versionlist[i] = copy.versionlist[i-1];
	4334	+ }
	4335	+
	4336	+ //tab.user[tab.versionindex] = user;
	4337	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4338	+
	4339	+ copy.versionlist[++copy.versionindex] = compress;
	4340	+
	4341	+ // if (increment)
	4342	+ // tab.versionindex++;
	4343	+ }
	4344	+
	4345	+ //copy.RestoreBigData(versiontable);
	4346	+
	4347	+ //assert(hashtable.isEmpty());
	4348	+
	4349	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4350	+// {
	4351	+// //tab.user[i] = false;
	4352	+// copy.versionlist[i] = null;
	4353	+// }
	4354	+
	4355	+ SetVersionStates();
	4356	+
	4357	+ // test save
	4358	+ if (false)
	4359	+ {
	4360	+ try
	4361	+ {
	4362	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4363	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4364	+
	4365	+ p.writeObject(copy);
	4366	+
	4367	+ p.flush();
	4368	+
	4369	+ ostream.close();
	4370	+ } catch (Exception e)
	4371	+ {
	4372	+ e.printStackTrace();
	4373	+ }
	4374	+ }
	4375	+
	4376	+ return !thesame;
	4377	+ }
	4378	+
	4379	+ boolean flashIt = true;
	4380	+
	4381	+ void RefreshSelection()
	4382	+ {
	4383	+ Object3D selection = new Object3D();
	4384	+
	4385	+ for (int i = 0; i < copy.selection.size(); i++)
	4386	+ {
	4387	+ Object3D elem = copy.selection.elementAt(i);
	4388	+
	4389	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4390	+
	4391	+ if (obj == null)
	4392	+ {
	4393	+ copy.selection.remove(i--);
	4394	+ }
	4395	+ else
	4396	+ {
	4397	+ selection.add(obj);
	4398	+ copy.selection.setElementAt(obj, i);
	4399	+ }
	4400	+ }
	4401	+
	4402	+ flashIt = false;
	4403	+ GetTree().clearSelection();
	4404	+ for (int i = 0; i < selection.size(); i++)
	4405	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4406	+ flashIt = true;
	4407	+
	4408	+ //refreshContents(false);
	4409	+ }
	4410	+
	4411	+ void CopyChanged()
	4412	+ {
	4413	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4414	+
	4415	+ SetVersionStates();
	4416	+
	4417	+ boolean temp = CameraPane.SWITCH;
	4418	+ CameraPane.SWITCH = false;
	4419	+
	4420	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4421	+
	4422	+ copy.clear();
	4423	+
	4424	+ copy.skyboxname = obj.skyboxname;
	4425	+ copy.skyboxext = obj.skyboxext;
	4426	+
	4427	+ for (int i=0; i<obj.Size(); i++)
	4428	+ {
	4429	+ copy.add(obj.get(i));
	4430	+ }
	4431	+
	4432	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4433	+
	4434	+ CameraPane.SWITCH = temp;
	4435	+
	4436	+ RefreshSelection();
	4437	+ //assert(hashtable.isEmpty());
	4438	+
	4439	+ copy.Touch();
	4440	+
	4441	+ ResetModel();
	4442	+ copy.HardTouch(); // recompile?
	4443	+
	4444	+ cRadio ab;
	4445	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4446	+ {
	4447	+ ab = (cRadio)e.nextElement();
	4448	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4449	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4450	+ if (test != null)
	4451	+ {
	4452	+ test.editWindow = ab.object.editWindow;
	4453	+ ab.object = test;
	4454	+ }
	4455	+ }
	4456	+
	4457	+ refreshContents(true);
	4458	+ }
	4459	+
	4460	+ cButton previousVersionButton;
	4461	+ cButton restoreButton;
	4462	+ cButton replaceButton;
	4463	+ cButton nextVersionButton;
	4464	+ cButton saveVersionButton;
	4465	+ cButton deleteVersionButton;
	4466	+
	4467	+ boolean muteSlider;
	4468	+
	4469	+ int VersionCount()
	4470	+ {
	4471	+ int count = 0;
	4472	+
	4473	+ for (int i = copy.versionlist.length; --i >= 0;)
	4474	+ {
	4475	+ if (copy.versionlist[i] != null)
	4476	+ count++;
	4477	+ }
	4478	+
	4479	+ return count;
	4480	+ }
	4481	+
	4482	+ public cGridBag versionSliderPane;
	4483	+
	4484	+ void SetVersionStates()
	4485	+ {
	4486	+ //if (true)
	4487	+ // return;
	4488	+
	4489	+ //cRadio tab = GetCurrentTab();
	4490	+
	4491	+ if (copy.versionlist == null)
	4492	+ {
	4493	+ saveVersionButton.setEnabled(false);
	4494	+ restoreButton.setEnabled(false);
	4495	+ replaceButton.setEnabled(false);
	4496	+ previousVersionButton.setEnabled(false);
	4497	+ nextVersionButton.setEnabled(false);
	4498	+ deleteVersionButton.setEnabled(false);
	4499	+ versionSliderPane.setVisible(false);
	4500	+ }
	4501	+ else
	4502	+ {
	4503	+ restoreButton.setEnabled(copy.versionindex != -1);
	4504	+ replaceButton.setEnabled(copy.versionindex != -1);
	4505	+
	4506	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4507	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4508	+
	4509	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4510	+ //copy.versionlist[copy.versionindex + 1] != null);
	4511	+
	4512	+ muteSlider = true;
	4513	+ versionSlider.setMinimum(0);
	4514	+ versionSlider.setMaximum(VersionCount() - 1);
	4515	+ versionSlider.setInteger(copy.versionindex);
	4516	+ versionSlider.setEnabled(copy.versionindex != -1);
	4517	+ muteSlider = false;
	4518	+
	4519	+ versionSliderPane.setVisible(true);
	4520	+ }
	4521	+ }
	4522	+
	4523	+ public boolean PreviousVersion()
	4524	+ {
	4525	+ // Option?
	4526	+ Replace();
	4527	+
	4528	+ System.err.println("Undo");
	4529	+
	4530	+ //cRadio tab = GetCurrentTab();
	4531	+
	4532	+ if (copy.versionindex == 0)
	4533	+ {
	4534	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4535	+ return false;
	4536	+ }
	4537	+
	4538	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4539	+// {
	4540	+// if (Save(false))
	4541	+// tab.versionindex -= 1;
	4542	+// else
	4543	+// {
	4544	+// if (tab.versionindex <= 0)
	4545	+// return false;
	4546	+// else
	4547	+// tab.versionindex -= 1;
	4548	+// }
	4549	+// }
	4550	+
	4551	+ copy.versionindex -= 1;
	4552	+
	4553	+ CopyChanged();
	4554	+
	4555	+ return true;
	4556	+ }
	4557	+
	4558	+ public boolean Restore()
	4559	+ {
	4560	+ System.err.println("Restore");
	4561	+
	4562	+ //cRadio tab = GetCurrentTab();
	4563	+
	4564	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4565	+ {
	4566	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4567	+ return false;
	4568	+ }
	4569	+
	4570	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4571	+ CopyChanged();
	4572	+
	4573	+ return true;
	4574	+ }
	4575	+
	4576	+ public boolean Replace()
	4577	+ {
	4578	+ //System.err.println("Replace");
	4579	+
	4580	+ //cRadio tab = GetCurrentTab();
	4581	+
	4582	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4583	+ {
	4584	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4585	+ return false;
	4586	+ }
	4587	+
	4588	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4589	+
	4590	+ return true;
	4591	+ }
	4592	+
	4593	+ public void NextVersion()
	4594	+ {
	4595	+ // Option?
	4596	+ Replace();
	4597	+
	4598	+ //cRadio tab = GetCurrentTab();
	4599	+
	4600	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4601	+ {
	4602	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4603	+ return;
	4604	+ }
	4605	+
	4606	+ copy.versionindex += 1;
	4607	+
	4608	+ CopyChanged();
	4609	+
	4610	+ //if (!tab.user[tab.versionindex])
	4611	+ // tab.graphs[tab.versionindex] = null;
	4612	+ }
	4613	+
	4614	+ void ImportGFD()
	4615	+ {
	4616	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4617	+ browser.show();
	4618	+ String filename = browser.getFile();
	4619	+ if (filename != null && filename.length() > 0)
	4620	+ {
	4621	+ String fullname = browser.getDirectory() + filename;
	4622	+
	4623	+ //Object3D readobj =
	4624	+ objEditor.ReadGFD(fullname, objEditor);
	4625	+ //makeSomething(readobj);
	4626	+ }
	4627	+ }
	4628	+
	4629	+ void ImportVRMLX3D()
	4630	+ {
	4631	+ if (Grafreed.standAlone)
	4632	+ {
	4633	+ /**/
	4634	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4635	+ browser.show();
	4636	+ String filename = browser.getFile();
	4637	+ if (filename != null && filename.length() > 0)
	4638	+ {
	4639	+ String fullname = browser.getDirectory() + filename;
	4640	+ LoadVRMLX3D(fullname);
	4641	+ }
	4642	+ /**/
	4643	+ }
	4644	+ }
	4645	+
3191	4646	void ToggleAnimation()
3192	4647	{
3193	4648	if (!Globals.ANIMATION)
3194	4649	{
3195	4650	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3196		- browser.show();
	4651	+ browser.setVisible(true);
3197	4652	String filename = browser.getFile();
3198	4653	if (filename != null && filename.length() > 0)
3199	4654	{
..	..	@@ -3203,8 +4658,8 @@
3203	4658
3204	4659	Globals.ANIMATION ^= true;
3205	4660
3206		- GrafreeD.wav.cursor = 0;
3207		- GrafreeD.wav.loop = 0;
	4661	+ Grafreed.wav.cursor = 0;
	4662	+ Grafreed.wav.loop = 0;
3208	4663	}
3209	4664	} else
3210	4665	{
..	..	@@ -3254,7 +4709,7 @@
3254	4709	void CreateMaterial()
3255	4710	{
3256	4711	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4712	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	4713	if (copy.selection.size() > 0)
3259	4714	//SetMaterial(copy);
3260	4715	{
..	..	@@ -3305,7 +4760,7 @@
3305	4760	assert false;
3306	4761	}
3307	4762
3308		- void EditSelection()
	4763	+ void EditSelection(boolean newWindow)
3309	4764	{
3310	4765	}
3311	4766
..	..	@@ -3313,11 +4768,11 @@
3313	4768	{
3314	4769	copy.ResetBlockLoop(); // temporary problem
3315	4770
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	4771	+ boolean random = CameraPane.SWITCH;
	4772	+ CameraPane.SWITCH = false; // parse everything
3318	4773	copy.ResetDisplayList();
3319	4774	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	4775	+ CameraPane.SWITCH = random;
3321	4776	}
3322	4777
3323	4778	// public void applySelf()
..	..	@@ -3347,6 +4802,12 @@
3347	4802	// else
3348	4803	// applySelf(true);
3349	4804	// }
	4805	+
	4806	+ boolean Equal(double a, double b)
	4807	+ {
	4808	+ return Math.abs(a - b) < 0.001;
	4809	+ }
	4810	+
3350	4811	void applySelf0(boolean name)
3351	4812	{
3352	4813	if (name)
..	..	@@ -3364,7 +4825,7 @@
3364	4825	//copy.material = new cMaterial(copy.GetMaterial());
3365	4826
3366	4827	current.color = (float) colorField.getFloat();
3367		- current.modulation = (float) modulationField.getFloat();
	4828	+ current.modulation = (float) saturationField.getFloat();
3368	4829	current.metalness = (float) metalnessField.getFloat();
3369	4830	current.diffuse = (float) diffuseField.getFloat();
3370	4831	current.specular = (float) specularField.getFloat();
..	..	@@ -3391,6 +4852,59 @@
3391	4852	{
3392	4853	//System.out.println("Propagate = " + propagate);
3393	4854	copy.UpdateMaterial(anchor, current, propagate);
	4855	+
	4856	+ if (copy.material != null)
	4857	+ {
	4858	+ cMaterial mat = copy.material;
	4859	+
	4860	+ if (!Equal(colorField.getFloat(), mat.color))
	4861	+ colorField.SetToolTipValue((mat.color));
	4862	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4863	+ saturationField.SetToolTipValue((mat.modulation));
	4864	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4865	+ metalnessField.SetToolTipValue((mat.metalness));
	4866	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4867	+ diffuseField.SetToolTipValue((mat.diffuse));
	4868	+ if (!Equal(specularField.getFloat(), mat.specular))
	4869	+ specularField.SetToolTipValue((mat.specular));
	4870	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4871	+ shininessField.SetToolTipValue((mat.shininess));
	4872	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4873	+ shiftField.SetToolTipValue((mat.shift));
	4874	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4875	+ ambientField.SetToolTipValue((mat.ambient));
	4876	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4877	+ lightareaField.SetToolTipValue((mat.lightarea));
	4878	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4879	+ diffusenessField.SetToolTipValue((mat.factor));
	4880	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4881	+ velvetField.SetToolTipValue((mat.velvet));
	4882	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4883	+ sheenField.SetToolTipValue((mat.sheen));
	4884	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4885	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4886	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4887	+ backlitField.SetToolTipValue((mat.bump));
	4888	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4889	+ anisoField.SetToolTipValue((mat.aniso));
	4890	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4891	+ anisoVField.SetToolTipValue((mat.anisoV));
	4892	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4893	+ cameraField.SetToolTipValue((mat.cameralight));
	4894	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4895	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4896	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4897	+ shadowField.SetToolTipValue((mat.shadow));
	4898	+ if (!Equal(textureField.getFloat(), mat.texture))
	4899	+ textureField.SetToolTipValue((mat.texture));
	4900	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4901	+ opacityField.SetToolTipValue((mat.opacity));
	4902	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4903	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4904	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4905	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4906	+ }
	4907	+
3394	4908	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	4909	{
3396	4910	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3419,9 +4933,28 @@
3419	4933	//copy.Touch();
3420	4934	}
3421	4935
	4936	+ cNumberSlider versionSlider;
	4937	+
3422	4938	public void stateChanged(ChangeEvent e)
3423	4939	{
3424		- // assert(false);
	4940	+ // assert(false);
	4941	+ if (e.getSource() == versionSlider)
	4942	+ {
	4943	+ if (muteSlider)
	4944	+ return;
	4945	+
	4946	+ Replace();
	4947	+
	4948	+ int version = versionSlider.getInteger();
	4949	+
	4950	+ if (version != -1 && copy.versionlist[version] != null)
	4951	+ {
	4952	+ copy.versionindex = version;
	4953	+ CopyChanged();
	4954	+ }
	4955	+
	4956	+ return;
	4957	+ }
3425	4958
3426	4959	if (freezematerial)
3427	4960	{
..	..	@@ -3435,6 +4968,7 @@
3435	4968	\|\| e.getSource() == apertureField
3436	4969	\|\| e.getSource() == shadowblurField)
3437	4970	{
	4971	+ new Exception().printStackTrace();
3438	4972	System.exit(0);
3439	4973	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3440	4974	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3456,6 +4990,12 @@
3456	4990	{
3457	4991	//System.out.println("stateChanged = " + this);
3458	4992	materialtouched = true;
	4993	+
	4994	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4995	+ {
	4996	+ saturationField.setFloat(1);
	4997	+ }
	4998	+
3459	4999	applySelf();
3460	5000	//System.out.println("this = " + this);
3461	5001	//System.out.println("PARENT = " + parent);
..	..	@@ -3505,7 +5045,7 @@
3505	5045	}
3506	5046
3507	5047	if (normalpushField != null)
3508		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	5048	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3509	5049	}
3510	5050
3511	5051	void SnapObject()
..	..	@@ -3755,6 +5295,7 @@
3755	5295	{
3756	5296	if (GetTree() != null)
3757	5297	{
	5298	+ GetTree().revalidate();
3758	5299	GetTree().repaint();
3759	5300	}
3760	5301
..	..	@@ -3763,12 +5304,19 @@
3763	5304	ctrlPanel.validate(); // ? new
3764	5305	ctrlPanel.repaint();
3765	5306	}
	5307	+
	5308	+ if (previousVersionButton != null && copy.versionlist != null)
	5309	+ SetVersionStates();
	5310	+
	5311	+ cameraView.requestFocusInWindow();
3766	5312	}
3767	5313
3768	5314	static TweenManager tweenManager = new TweenManager();
3769	5315
3770	5316	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3771	5317	{
	5318	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5319	+ Save();
3772	5320	//Tween.set(thing, 0).target(1).start(tweenManager);
3773	5321	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3774	5322	// if (thing instanceof GenericJointDemo)
..	..	@@ -3792,7 +5340,7 @@
3792	5340	// group = (Composite) group.get(0);
3793	5341	// }
3794	5342
3795		- System.out.println("makeSomething of " + thing);
	5343	+ //System.out.println("makeSomething of " + thing);
3796	5344
3797	5345	/*
3798	5346	if (deselect && jList != null)
..	..	@@ -3855,6 +5403,12 @@
3855	5403	{
3856	5404	ResetModel();
3857	5405	Select(thing.GetTreePath(), true, false); // unselect... false);
	5406	+
	5407	+ if (thing.Size() == 0)
	5408	+ {
	5409	+ //EditSelection(false);
	5410	+ }
	5411	+
3858	5412	refreshContents();
3859	5413	}
3860	5414
..	..	@@ -3972,6 +5526,7 @@
3972	5526	}
3973	5527	}
3974	5528	}
	5529	+
3975	5530	LoadGFDThread loadGFDThread;
3976	5531
3977	5532	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3991,8 +5546,10 @@
3991	5546
3992	5547	try
3993	5548	{
	5549	+ // Try compressed version first.
3994	5550	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3995		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5551	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5552	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3996	5553
3997	5554	readobj = (Object3D) p.readObject();
3998	5555	istream.close();
..	..	@@ -4000,7 +5557,22 @@
4000	5557	readobj.ResetDisplayList();
4001	5558	} catch (Exception e)
4002	5559	{
4003		- e.printStackTrace();
	5560	+ if (!e.toString().contains("GZIP"))
	5561	+ e.printStackTrace();
	5562	+
	5563	+ try
	5564	+ {
	5565	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5566	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5567	+
	5568	+ readobj = (Object3D) p.readObject();
	5569	+ istream.close();
	5570	+
	5571	+ readobj.ResetDisplayList();
	5572	+ } catch (Exception e2)
	5573	+ {
	5574	+ e2.printStackTrace();
	5575	+ }
4004	5576	}
4005	5577	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4006	5578	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4046,6 +5618,12 @@
4046	5618
4047	5619	void LoadIt(Object obj)
4048	5620	{
	5621	+ if (obj == null)
	5622	+ {
	5623	+ // Invalid file
	5624	+ return;
	5625	+ }
	5626	+
4049	5627	System.out.println("Loaded " + obj);
4050	5628	//new Exception().printStackTrace();
4051	5629	Object3D readobj = (Object3D) obj;
..	..	@@ -4055,10 +5633,14 @@
4055	5633
4056	5634	if (readobj != null)
4057	5635	{
	5636	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5637	+ // Save();
4058	5638	try
4059	5639	{
4060	5640	//readobj.deepCopySelf(copy);
4061	5641	copy.clear(); // june 2014
	5642	+ copy.skyboxname = readobj.skyboxname;
	5643	+ copy.skyboxext = readobj.skyboxext;
4062	5644	for (int i = 0; i < readobj.size(); i++)
4063	5645	{
4064	5646	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4099,6 +5681,7 @@
4099	5681	}
4100	5682	} catch (ClassCastException e)
4101	5683	{
	5684	+ e.printStackTrace();
4102	5685	assert (false);
4103	5686	Composite c = (Composite) copy;
4104	5687	c.children.clear();
..	..	@@ -4109,17 +5692,32 @@
4109	5692	c.addChild(csg);
4110	5693	}
4111	5694
	5695	+ copy.versionlist = readobj.versionlist;
	5696	+ copy.versionindex = readobj.versionindex;
	5697	+ copy.versiontable = readobj.versiontable;
	5698	+
	5699	+ if (copy.versionlist == null)
	5700	+ {
	5701	+ // Backward compatibility
	5702	+ copy.versionlist = new Object3D[100];
	5703	+ copy.versionindex = -1;
	5704	+
	5705	+ //Save(true);
	5706	+ }
	5707	+
	5708	+ //? SetUndoStates();
	5709	+
4112	5710	ResetModel();
4113	5711	copy.HardTouch(); // recompile?
4114	5712	refreshContents();
4115	5713	}
4116	5714	}
4117	5715
4118		- void load() // throws ClassNotFoundException
	5716	+ void Open() // throws ClassNotFoundException
4119	5717	{
4120		- if (GrafreeD.standAlone)
	5718	+ if (Grafreed.standAlone)
4121	5719	{
4122		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5720	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4123	5721	browser.show();
4124	5722	String filename = browser.getFile();
4125	5723	if (filename != null && filename.length() > 0)
..	..	@@ -4196,6 +5794,8 @@
4196	5794
4197	5795	void save()
4198	5796	{
	5797	+ Replace();
	5798	+
4199	5799	if (lastname == null)
4200	5800	{
4201	5801	return;
..	..	@@ -4204,11 +5804,13 @@
4204	5804	try
4205	5805	{
4206	5806	FileOutputStream ostream = new FileOutputStream(lastname);
4207		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5807	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5808	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4208	5809
4209	5810	p.writeObject(copy);
4210	5811	p.flush();
4211	5812
	5813	+ zstream.close();
4212	5814	ostream.close();
4213	5815
4214	5816	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4216,19 +5818,23 @@
4216	5818	//ps.print(buffer.toString());
4217	5819	} catch (IOException e)
4218	5820	{
	5821	+ e.printStackTrace();
4219	5822	}
4220	5823	}
	5824	+
4221	5825	String lastname;
4222	5826
4223	5827	void saveAs()
4224	5828	{
4225		- if (GrafreeD.standAlone)
	5829	+ if (Grafreed.standAlone)
4226	5830	{
4227	5831	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4228	5832	browser.setVisible(true);
4229	5833	String filename = browser.getFile();
4230	5834	if (filename != null && filename.length() > 0)
4231	5835	{
	5836	+ if (!filename.endsWith(".gfd"))
	5837	+ filename += ".gfd";
4232	5838	lastname = browser.getDirectory() + filename;
4233	5839	save();
4234	5840	}
..	..	@@ -4327,13 +5933,13 @@
4327	5933	try
4328	5934	{
4329	5935	FileOutputStream ostream = new FileOutputStream(filename);
4330		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4331		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5936	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5937	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4332	5938
4333	5939	Object3D objectparent = obj.parent;
4334	5940	obj.parent = null;
4335	5941
4336		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5942	+ Object3D object = (Object3D) Grafreed.clone(obj);
4337	5943
4338	5944	obj.parent = objectparent;
4339	5945
..	..	@@ -4345,8 +5951,8 @@
4345	5951	p.writeObject(object);
4346	5952	p.flush();
4347	5953
	5954	+ zstream.close();
4348	5955	ostream.close();
4349		- // zstream.close();
4350	5956
4351	5957	// group.selection.get(0).parent = parent;
4352	5958	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4367,7 +5973,7 @@
4367	5973	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4368	5974	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4369	5975	copy.generatePOV(buffer);
4370		- if (GrafreeD.standAlone)
	5976	+ if (Grafreed.standAlone)
4371	5977	{
4372	5978	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4373	5979	browser.show();
..	..	@@ -4393,21 +5999,20 @@
4393	5999	Object3D client;
4394	6000	Object3D copy;
4395	6001	MenuBar menuBar;
4396		- Menu windowMenu;
4397		- MenuItem loadItem;
	6002	+ Menu fileMenu;
	6003	+ MenuItem newItem;
	6004	+ MenuItem openItem;
4398	6005	MenuItem saveItem;
4399	6006	MenuItem saveAsItem;
4400	6007	MenuItem exportAsItem;
4401	6008	MenuItem reexportItem;
4402	6009	MenuItem povItem;
4403	6010	MenuItem closeItem;
4404		- Menu cameraMenu;
	6011	+
4405	6012	CheckboxMenuItem zBufferItem;
4406	6013	//MenuItem normalLensItem;
4407		- MenuItem editCameraItem;
4408		- MenuItem revertCameraItem;
4409		- CheckboxMenuItem toggleLiveItem;
4410	6014	MenuItem stepItem;
	6015	+ CheckboxMenuItem toggleLiveItem;
4411	6016	CheckboxMenuItem toggleFullScreenItem;
4412	6017	CheckboxMenuItem toggleTimelineItem;
4413	6018	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4416,25 +6021,41 @@
4416	6021	CheckboxMenuItem toggleFootContactItem;
4417	6022	CheckboxMenuItem toggleDLItem;
4418	6023	CheckboxMenuItem toggleTextureItem;
4419		- CheckboxMenuItem toggleRandomItem;
	6024	+ CheckboxMenuItem toggleSwitchItem;
4420	6025	CheckboxMenuItem toggleRootItem;
4421	6026	CheckboxMenuItem animationItem;
	6027	+ MenuItem archiveItem;
4422	6028	CheckboxMenuItem toggleHandleItem;
4423	6029	CheckboxMenuItem togglePaintItem;
4424	6030	JSplitPane mainPanel;
4425	6031	JScrollPane scrollpane;
	6032	+
4426	6033	JPanel toolbarPanel;
4427		- JPanel treePanel;
	6034	+
	6035	+ cGridBag treePanel;
	6036	+
4428	6037	JPanel radioPanel;
4429	6038	ButtonGroup buttonGroup;
4430		- cGridBag ctrlPanel;
	6039	+
	6040	+ cGridBag toolboxPanel;
	6041	+ cGridBag skyboxPanel;
4431	6042	cGridBag materialPanel;
	6043	+ cGridBag ctrlPanel;
	6044	+
4432	6045	JScrollPane infoPanel;
	6046	+
4433	6047	cGridBag optionsPanel;
	6048	+
4434	6049	JTabbedPane objectPanel;
	6050	+ boolean materialFlushed;
	6051	+ Object3D latestObject;
	6052	+
	6053	+ cGridBag transformPanel;
4435	6054	cGridBag XYZPanel;
	6055	+
4436	6056	JSplitPane gridPanel;
4437	6057	JSplitPane bigPanel;
	6058	+
4438	6059	cGridBag bigThree;
4439	6060	cGridBag scenePanel;
4440	6061	cGridBag centralPanel;
..	..	@@ -4492,7 +6113,7 @@
4492	6113	JLabel colorLabel;
4493	6114	cNumberSlider colorField;
4494	6115	JLabel modulationLabel;
4495		- cNumberSlider modulationField;
	6116	+ cNumberSlider saturationField;
4496	6117	JLabel metalnessLabel;
4497	6118	cNumberSlider metalnessField;
4498	6119	JLabel diffuseLabel;
..	..	@@ -4523,6 +6144,7 @@
4523	6144	cNumberSlider anisoField;
4524	6145	JLabel anisoVLabel;
4525	6146	cNumberSlider anisoVField;
	6147	+
4526	6148	JLabel cameraLabel;
4527	6149	cNumberSlider cameraField;
4528	6150	JLabel selfshadowLabel;
..	..	@@ -4537,6 +6159,7 @@
4537	6159	cNumberSlider fakedepthField;
4538	6160	JLabel shadowbiasLabel;
4539	6161	cNumberSlider shadowbiasField;
	6162	+
4540	6163	JLabel bumpLabel;
4541	6164	cNumberSlider bumpField;
4542	6165	JLabel noiseLabel;
..	..	@@ -4549,8 +6172,13 @@
4549	6172	cNumberSlider fogField;
4550	6173	JLabel opacityPowerLabel;
4551	6174	cNumberSlider opacityPowerField;
4552		- JTree jTree;
	6175	+ cTree jTree;
4553	6176	//ObjectUI parent;
4554	6177
4555	6178	cNumberSlider normalpushField;
	6179	+
	6180	+ private MenuItem importGFDItem;
	6181	+ private MenuItem importVRMLX3DItem;
	6182	+ private MenuItem import3DSItem;
	6183	+ private MenuItem importOBJItem;
4556	6184	}