~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,128 @@
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	+ return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
	93	+ }
	94	+
	95	+ cToggleButton GetToggleButton(String name, boolean border)
	96	+ {
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
	99	+ }
	100	+
	101	+ cCheckBox GetCheckBox(String name, boolean border)
	102	+ {
	103	+ ImageIcon icon = GetIcon(name);
	104	+ return new cCheckBox(icon, border);
	105	+ }
	106	+
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
	109	+ ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
	117	+ try
	118	+ {
	119	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	120	+
	121	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	122	+// {
	123	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	124	+// Graphics2D g = resized.createGraphics();
	125	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	126	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	127	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	128	+// g.dispose();
	129	+//
	130	+// image = resized;
	131	+// }
	132	+
	133	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
	137	+ return icon;
	138	+ }
	139	+ catch (Exception e)
	140	+ {
	141	+ //icons.put(name, null);
	142	+ return null;
	143	+ }
	144	+ }
	145	+
	146	+ BufferedImage GetImage(String name)
	147	+ {
	148	+ try
	149	+ {
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
	153	+ }
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
	158	+ }
38	159
39	160	// SCRIPT
40	161
..	..	@@ -138,34 +259,42 @@
138	259	public void closeUI()
139	260	{
140	261	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	262	+// System.out.println("this = " + this);
	263	+// System.out.println("objEditor = " + objEditor);
143	264	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	265	+// objEditor.ctrlPanel.remove(nameField);
145	266
146		- if (!GroupEditor.allparams)
	267	+ objEditor.ctrlPanel.remove(namePanel);
	268	+
	269	+ if (!allparams)
147	270	return;
148	271
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);
	272	+// objEditor.ctrlPanel.remove(liveCB);
	273	+// objEditor.ctrlPanel.remove(hideCB);
	274	+// objEditor.ctrlPanel.remove(markCB);
	275	+//
	276	+// objEditor.ctrlPanel.remove(randomCB);
	277	+// objEditor.ctrlPanel.remove(speedupCB);
	278	+// objEditor.ctrlPanel.remove(rewindCB);
	279	+//
	280	+// objEditor.ctrlPanel.remove(resetButton);
	281	+// objEditor.ctrlPanel.remove(stepButton);
	282	+//// objEditor.ctrlPanel.remove(stepAllButton);
	283	+//// objEditor.ctrlPanel.remove(resetAllButton);
	284	+// objEditor.ctrlPanel.remove(link2masterCB);
	285	+// //objEditor.ctrlPanel.remove(flipVCB);
	286	+// //objEditor.ctrlPanel.remove(texresMenu);
	287	+// objEditor.ctrlPanel.remove(slowerButton);
	288	+// objEditor.ctrlPanel.remove(fasterButton);
	289	+// objEditor.ctrlPanel.remove(remarkButton);
167	290
168		- Remove(normalpushField);
	291	+ objEditor.ctrlPanel.remove(setupPanel);
	292	+ objEditor.ctrlPanel.remove(setupPanel2);
	293	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	294	+ objEditor.ctrlPanel.remove(pushPanel);
	295	+ //objEditor.ctrlPanel.remove(fillPanel);
	296	+
	297	+ //Remove(normalpushField);
169	298	}
170	299
171	300	public ObjEditor GetEditor()
..	..	@@ -209,6 +338,14 @@
209	338	client = inClient;
210	339	copy = client;
211	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
212	349	// "this" is not called: SetupUI2(objEditor);
213	350	}
214	351
..	..	@@ -222,6 +359,14 @@
222	359	client = inClient;
223	360	copy = client;
224	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
225	370	SetupUI2(callee.GetEditor());
226	371	}
227	372
..	..	@@ -236,6 +381,7 @@
236	381	//localCopy.parent = null;
237	382
238	383	frame = new JFrame();
	384	+ frame.setUndecorated(false);
239	385	objEditor = this;
240	386	this.callee = callee;
241	387
..	..	@@ -253,6 +399,14 @@
253	399	copy = localCopy;
254	400	copy.editWindow = this;
255	401
	402	+// if (copy.versionlist == null)
	403	+// {
	404	+// copy.versionlist = new Object3D[100];
	405	+// copy.versionindex = -1;
	406	+//
	407	+// Save(true);
	408	+// }
	409	+
256	410	SetupMenu();
257	411
258	412	//SetupName(objEditor); // new
..	..	@@ -266,28 +420,49 @@
266	420	return frame.action(event, obj);
267	421	}
268	422
	423	+ // Cannot work without static
	424	+ static boolean allparams = true;
	425	+
	426	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	427	+
269	428	void SetupMenu()
270	429	{
271	430	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..."));
	431	+ menuBar.add(fileMenu = new Menu("File"));
	432	+ fileMenu.add(newItem = new MenuItem("New"));
	433	+ fileMenu.add(openItem = new MenuItem("Open..."));
	434	+
	435	+ //oe.menuBar.add(menu = new Menu("Include"));
	436	+ Menu menu = new Menu("Import");
	437	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	438	+ importOBJItem.addActionListener(this);
	439	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	440	+ import3DSItem.addActionListener(this);
	441	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	442	+ importVRMLX3DItem.addActionListener(this);
	443	+ menu.add("-");
	444	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	445	+ importGFDItem.addActionListener(this);
	446	+ fileMenu.add(menu);
	447	+ fileMenu.add("-");
	448	+
	449	+ fileMenu.add(saveItem = new MenuItem("Save"));
	450	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	451	//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("-");
	452	+ fileMenu.add("-");
	453	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	454	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	455	+ fileMenu.add("-");
282	456	if (client.parent != null)
283	457	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	458	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	459	} else
286	460	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	461	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	462	}
289	463
290		- loadItem.addActionListener(this);
	464	+ newItem.addActionListener(this);
	465	+ openItem.addActionListener(this);
291	466	saveItem.addActionListener(this);
292	467	saveAsItem.addActionListener(this);
293	468	exportAsItem.addActionListener(this);
..	..	@@ -295,82 +470,103 @@
295	470	//povItem.addActionListener(this);
296	471	closeItem.addActionListener(this);
297	472
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	473	objectPanel = new JTabbedPane();
	474	+
	475	+ ChangeListener changeListener = new ChangeListener()
	476	+ {
	477	+ //String name;
	478	+
	479	+ public void stateChanged(ChangeEvent changeEvent)
	480	+ {
	481	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	482	+// {
	483	+// if (latestObject != null)
	484	+// {
	485	+// refreshContents(true);
	486	+// SetMaterial(latestObject);
	487	+// }
	488	+//
	489	+// materialFlushed = true;
	490	+// }
	491	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	492	+// {
	493	+// if (listUI.size() == 0)
	494	+// EditSelection(false);
	495	+// }
	496	+
	497	+// if (objectPanel.getSelectedIndex() == 4)
	498	+// {
	499	+// name = copy.skyboxname;
	500	+//
	501	+// if (name == null)
	502	+// {
	503	+// name = "";
	504	+// }
	505	+//
	506	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	507	+// copy.skyboxext = "jpg";
	508	+// }
	509	+// else
	510	+// {
	511	+// if (name != null)
	512	+// {
	513	+// if (name.equals(""))
	514	+// {
	515	+// copy.skyboxname = null;
	516	+// copy.skyboxext = null;
	517	+// }
	518	+// else
	519	+// {
	520	+// copy.skyboxname = name;
	521	+// }
	522	+// }
	523	+// }
	524	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	525	+
	526	+// refreshContents(false); // To refresh Info tab
	527	+ cameraView.repaint();
	528	+ }
	529	+ };
	530	+ objectPanel.addChangeListener(changeListener);
	531	+
354	532	toolbarPanel = new JPanel();
355	533	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	534	+
	535	+ treePanel = new cGridBag();
357	536	treePanel.setName("Tree");
358		- ctrlPanel = new cGridBag(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- materialPanel = new cGridBag().setVertical(true);
361		- materialPanel.setName("Material");
	537	+
	538	+ editPanel = new cGridBag().setVertical(true);
	539	+ //editPanel.setName("Edit");
	540	+
	541	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	542	+
	543	+ editCommandsPanel = new cGridBag();
	544	+ editPanel.add(editCommandsPanel);
	545	+ editPanel.add(ctrlPanel);
	546	+
	547	+ toolboxPanel = new cGridBag().setVertical(true);
	548	+ //toolboxPanel.setName("Toolbox");
	549	+
	550	+ skyboxPanel = new cGridBag().setVertical(true);
	551	+
	552	+ materialPanel = new cGridBag().setVertical(false);
	553	+ //materialPanel.setName("Material");
	554	+
362	555	/JTextPane/
363	556	infoarea = createTextPane();
	557	+ doc = infoarea.getStyledDocument();
	558	+
364	559	infoarea.setEditable(true);
365	560	SetText();
	561	+
366	562	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	563	// infoarea.setOpaque(false);
368	564	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	565	+// TEXTAREA infoarea.setLineWrap(true);
	566	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	567	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");
	568	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	569	+ //infoPanel.setName("Info");
374	570	//infoPanel.setLayout(new BorderLayout());
375	571	//infoPanel.add(createTextPane());
376	572
..	..	@@ -378,15 +574,22 @@
378	574	mainPanel.setName("Main");
379	575	mainPanel.setContinuousLayout(true);
380	576	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	577	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	578	+ mainPanel.setDividerLocation(0.5); //1.0);
	579	+ mainPanel.setResizeWeight(0.5);
	580	+
	581	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	582	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	583	+ divider.setDividerSize(15);
	584	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	585	+
	586	+ mainPanel.setUI(new BasicSplitPaneUI());
	587	+
385	588	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	589	//mainPanel.setLayout(new GridBagLayout());
387	590	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
	591	+// treePanel.setLayout(new GridBagLayout());
	592	+ //ctrlPanel.setLayout(new GridBagLayout());
390	593	//materialPanel.setLayout(new GridBagLayout());
391	594
392	595	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
..	..	@@ -426,7 +629,7 @@
426	629	static String newline = "\n";
427	630	protected static final String buttonString = "JButton";
428	631	StyledDocument doc;
429		- JTextArea infoarea;
	632	+ JTextPane infoarea;
430	633
431	634	void ClearInfo()
432	635	{
..	..	@@ -449,10 +652,10 @@
449	652	e.printStackTrace();
450	653	}
451	654
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();
	655	+// String selection = infoarea.getText();
	656	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	657	+// java.awt.datatransfer.Clipboard clipboard =
	658	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	659	//clipboard.setContents(data, data);
457	660	}
458	661
..	..	@@ -475,13 +678,13 @@
475	678	//SendInfo("Name:", "bold");
476	679	if (sel.GetTextures() != null \|\| debug)
477	680	{
478		- si.SendInfo(sel.toString(), "bold");
	681	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	682	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	683	if (sel.Size() > 0)
481	684	{
482	685	si.SendInfo("#children = " + sel.Size(), "regular");
483	686	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	687	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	688	if (debug)
486	689	{
487	690	try
..	..	@@ -493,7 +696,10 @@
493	696	}
494	697
495	698	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	699	+ {
	700	+ si.SendInfo(" BBox min: " + minima, "regular");
	701	+ si.SendInfo(" BBox max: " + maxima, "regular");
	702	+ }
497	703
498	704	if (sel.bRep != null)
499	705	{
..	..	@@ -520,7 +726,7 @@
520	726	}
521	727	if (sel.support != null)
522	728	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	729	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	730	}
525	731	if (sel.scriptnode != null)
526	732	{
..	..	@@ -591,6 +797,9 @@
591	797	{
592	798	CameraPane.pointflow = (PointFlow) sel;
593	799	}
	800	+
	801	+ si.SendInfo("_____________________", "regular");
	802	+ si.SendInfo("", "regular");
594	803	}
595	804	}
596	805
..	..	@@ -606,68 +815,205 @@
606	815	}
607	816	}
608	817
	818	+//static GraphicsDevice device = GraphicsEnvironment
	819	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	820	+
	821	+ Rectangle keeprect;
	822	+ cRadio radio;
	823	+
	824	+cButton keepButton;
	825	+ cButton twoButton; // Full 3D
	826	+ cButton sixButton;
	827	+ cButton threeButton;
	828	+ cButton sevenButton;
	829	+ cButton fourButton; // full panel
	830	+ cButton oneButton; // full XYZ
	831	+ //cButton currentLayout;
	832	+
	833	+ boolean maximized;
	834	+
	835	+ cButton fullscreenLayout;
	836	+ cButton expandedLayout;
	837	+
	838	+ void Minimize()
	839	+ {
	840	+ frame.setState(Frame.ICONIFIED);
	841	+ frame.validate();
	842	+ }
	843	+
	844	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	845	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	846	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	847	+ void Maximize()
	848	+ {
	849	+ if (CameraPane.FULLSCREEN)
	850	+ {
	851	+ ToggleFullScreen();
	852	+ }
	853	+
	854	+ if (maximized)
	855	+ {
	856	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	857	+ }
	858	+ else
	859	+ {
	860	+ keeprect = frame.getBounds();
	861	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	862	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	863	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	864	+// frame.setState(Frame.MAXIMIZED_BOTH);
	865	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	866	+ }
	867	+
	868	+ maximized ^= true;
	869	+
	870	+ frame.validate();
	871	+ }
	872	+
	873	+ cButton minButton;
	874	+ cButton maxButton;
	875	+ cButton fullButton;
	876	+ cButton collapseButton;
	877	+ cButton maximize3DButton;
	878	+
609	879	void ToggleFullScreen()
610	880	{
611		- if (CameraPane.FULLSCREEN)
	881	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	882	+
	883	+ cameraView.ToggleFullScreen();
	884	+
	885	+ if (!CameraPane.FULLSCREEN)
612	886	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	887	+ device.setFullScreenWindow(null);
	888	+ frame.dispose();
	889	+ frame.setUndecorated(false);
	890	+ frame.validate();
	891	+ frame.setVisible(true);
	892	+
	893	+ //frame.setVisible(false);
	894	+// frame.removeNotify();
	895	+// frame.setUndecorated(false);
	896	+// frame.addNotify();
	897	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	898	+
	899	+// X frame.getContentPane().remove(/"Center",/bigThree);
	900	+// X framePanel.add(bigThree);
	901	+// X frame.getContentPane().add(/"Center",/framePanel);
	902	+// framePanel.setDividerLocation(46); // icons are 24x24
	903	+
	904	+ //frame.setVisible(true);
	905	+// radio.layout = keepButton;
	906	+ //theFrame = null;
	907	+ keepButton = null;
	908	+// radio.layout.doClick();
	909	+
616	910	} else
617	911	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	912	+ keepButton = radio.layout;
	913	+ //keeprect = frame.getBounds();
	914	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	915	+// frame.getToolkit().getScreenSize().height);
	916	+ //frame.setVisible(false);
	917	+
	918	+ frame.dispose();
	919	+ frame.setUndecorated(true);
	920	+ device.setFullScreenWindow(frame);
	921	+ frame.validate();
	922	+ frame.setVisible(true);
	923	+// frame.removeNotify();
	924	+// frame.setUndecorated(true);
	925	+// frame.addNotify();
	926	+// X frame.getContentPane().remove(/"Center",/framePanel);
	927	+// X framePanel.remove(bigThree);
	928	+// X frame.getContentPane().add(/"Center",/bigThree);
	929	+// framePanel.setDividerLocation(0);
	930	+
	931	+// radio.layout = fullscreenLayout;
	932	+// radio.layout.doClick();
	933	+ //frame.setVisible(true);
621	934	}
622		- cameraView.ToggleFullScreen();
	935	+ frame.validate();
	936	+
	937	+ cameraView.requestFocusInWindow();
623	938	}
624	939
625		- private JTextArea createTextPane()
	940	+ void CollapseToolbar()
	941	+ {
	942	+ framePanel.setDividerLocation(0);
	943	+ //frame.validate();
	944	+
	945	+ cameraView.requestFocusInWindow();
	946	+ }
	947	+
	948	+ private Object3D Duplicate(Object3D object)
626	949	{
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		- };
	950	+ boolean temp = CameraPane.SWITCH;
	951	+ CameraPane.SWITCH = false;
	952	+
	953	+ object.ExtractBigData(versiontable);
	954	+ // if (copy == client)
	955	+
	956	+ Object3D versions[] = object.versionlist;
	957	+ object.versionlist = null;
	958	+
	959	+ //byte[] compress = Compress(copy);
	960	+ Object3D compress = (Object3D)Grafreed.clone(object);
	961	+
	962	+ object.versionlist = versions;
	963	+
	964	+ object.RestoreBigData(versiontable);
	965	+
	966	+ CameraPane.SWITCH = temp;
	967	+
	968	+ return compress;
	969	+ }
642	970
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
	971	+ private JTextPane createTextPane()
	972	+ {
	973	+// TEXTAREA String[] initString =
	974	+// {
	975	+// "This is an editable JTextPane, ", //regular
	976	+// "another ", //italic
	977	+// "styled ", //bold
	978	+// "text ", //small
	979	+// "component, ", //large
	980	+// "which supports embedded components..." + newline,//regular
	981	+// " " + newline, //button
	982	+// "...and embedded icons..." + newline, //regular
	983	+// " ", //icon
	984	+// newline + "JTextPane is a subclass of JEditorPane that "
	985	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	986	+// + "cover methods for interacting with those objects."
	987	+// };
	988	+//
	989	+// String[] initStyles =
	990	+// {
	991	+// "regular", "italic", "bold", "small", "large",
	992	+// "regular", "button", "regular", "icon",
	993	+// "regular"
	994	+// };
	995	+//
	996	+// JTextPane textPane = new JTextPane();
	997	+// textPane.setEditable(true);
	998	+// /StyledDocument/ doc = textPane.getStyledDocument();
	999	+// addStylesToDocument(doc);
	1000	+//
	1001	+// try
	1002	+// {
	1003	+// for (int j = 0; j < 2; j++)
	1004	+// {
	1005	+// for (int i = 0; i < initString.length; i++)
	1006	+// {
	1007	+// doc.insertString(doc.getLength(), initString[i],
	1008	+// doc.getStyle(initStyles[i]));
	1009	+// }
	1010	+// }
	1011	+// } catch (BadLocationException ble)
	1012	+// {
	1013	+// System.err.println("Couldn't insert initial text into text pane.");
	1014	+// }
649	1015
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;
	1016	+ return new JTextPane(); // textPane;
671	1017	}
672	1018
673	1019	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +1066,7 @@
720	1066	protected static ImageIcon createImageIcon(String path,
721	1067	String description)
722	1068	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1069	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	1070	if (imgURL != null)
725	1071	{
726	1072	return new ImageIcon(imgURL, description);
..	..	@@ -743,6 +1089,7 @@
743	1089	{
744	1090	SetupMaterial(materialPanel);
745	1091	}
	1092	+
746	1093	//SetupName();
747	1094	//SetupViews();
748	1095	}
..	..	@@ -752,6 +1099,7 @@
752	1099	// NumberSlider vDivsField;
753	1100	// JCheckBox endcaps;
754	1101	JCheckBox liveCB;
	1102	+ JCheckBox selectableCB;
755	1103	JCheckBox hideCB;
756	1104	JCheckBox link2masterCB;
757	1105	JCheckBox markCB;
..	..	@@ -759,7 +1107,12 @@
759	1107	JCheckBox speedupCB;
760	1108	JCheckBox rewindCB;
761	1109	JCheckBox flipVCB;
	1110	+
	1111	+ cCheckBox toggleTextureCB;
	1112	+ cCheckBox toggleSwitchCB;
	1113	+
762	1114	JComboBox texresMenu;
	1115	+
763	1116	JButton resetButton;
764	1117	JButton stepButton;
765	1118	JButton stepAllButton;
..	..	@@ -767,54 +1120,48 @@
767	1120	JButton slowerButton;
768	1121	JButton fasterButton;
769	1122	JButton remarkButton;
	1123	+
	1124	+ cGridBag editPanel;
	1125	+ cGridBag editCommandsPanel;
	1126	+
	1127	+ cGridBag namePanel;
	1128	+ cGridBag setupPanel;
	1129	+ cGridBag setupPanel2;
	1130	+ cGridBag objectCommandsPanel;
	1131	+ cGridBag pushPanel;
	1132	+ cGridBag fillPanel;
770	1133
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1134	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	1135	{
773	1136	JCheckBox cb;
774	1137
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);
	1138	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	1139	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	1140
785	1141	return cb;
786	1142	}
787	1143
788		- cButton AddButton(ObjEditor oe, String label)
	1144	+ cButton AddButton(cGridBag panel, String label)
789	1145	{
790	1146	cButton cb;
791	1147
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);
	1148	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	1149	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	1150
802	1151	return cb;
803	1152	}
804	1153
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1154	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1155	{
807	1156	JComboBox combo;
808	1157
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;
	1158	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1159	combo.addActionListener(this);
813	1160
814	1161	return combo;
815	1162	}
816	1163
817		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
	1164	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1165	{
819	1166	cGridBag control = new cGridBag();
820	1167
..	..	@@ -826,12 +1173,12 @@
826	1173	control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827	1174	combo.setFloat(current);
828	1175
829		- ctrlPanel.add(control);
	1176	+ panel.add(control);
830	1177
831		- return combo;
	1178	+ return control;
832	1179	}
833	1180
834		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
	1181	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835	1182	{
836	1183	cGridBag control = new cGridBag();
837	1184
..	..	@@ -839,25 +1186,21 @@
839	1186
840	1187	JLabel jlabel = new JLabel(label);
841	1188	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);
	1189	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1190	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844	1191	combo.setInteger(current);
845	1192
846		- ctrlPanel.add(control);
	1193	+ panel.add(control);
847	1194
848		- return combo;
	1195	+ return control;
849	1196	}
850	1197
851	1198	JTextArea AddText(cGridBag ctrlPanel, String name)
852	1199	{
853	1200	JTextArea text;
854	1201
855		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857	1202	ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1203	text.addCaretListener(this);
859		- aConstraints.gridx += 1;
860		- aConstraints.gridwidth = 1;
861	1204
862	1205	return text;
863	1206	}
..	..	@@ -896,7 +1239,7 @@
896	1239
897	1240	/*
898	1241	*/
899		- void Return() // ObjEditor oe)
	1242	+ void Return0() // ObjEditor oe)
900	1243	{
901	1244	aConstraints.gridy += 1;
902	1245	aConstraints.gridx = 0;
..	..	@@ -951,37 +1294,92 @@
951	1294
952	1295	void SetupUI2(ObjEditor oe)
953	1296	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958		- SetupName(oe);
	1297	+ //SetupName(oe);
959	1298
960		- if (!GroupEditor.allparams)
	1299	+ namePanel = new cGridBag();
	1300	+
	1301	+ //if (copy.pinned)
	1302	+ {
	1303	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1304	+ pinButton.setSelected(copy.pinned);
	1305	+ cGridBag t = new cGridBag();
	1306	+ t.preferredWidth = 2;
	1307	+ t.add(pinButton);
	1308	+ namePanel.add(t);
	1309	+
	1310	+ pinButton.addItemListener(this);
	1311	+ }
	1312	+
	1313	+ nameField = AddText(namePanel, copy.GetName());
	1314	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1315	+ oe.ctrlPanel.add(namePanel);
	1316	+
	1317	+ oe.ctrlPanel.Return();
	1318	+
	1319	+ if (!allparams)
961	1320	return;
962	1321
963		- liveCB = AddCheckBox(oe, "Live", copy.live);
964		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1322	+ setupPanel = new cGridBag().setVertical(false);
	1323	+
	1324	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1325	+ liveCB.setToolTipText("Animate object");
	1326	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1327	+ selectableCB.setToolTipText("Make object selectable");
966	1328	// 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");
	1329	+
	1330	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1331	+ hideCB.setToolTipText("Hide object");
	1332	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1333	+ markCB.setToolTipText("As animation target transform");
	1334	+
	1335	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1336	+
	1337	+ setupPanel2 = new cGridBag().setVertical(false);
	1338	+
	1339	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1340	+ rewindCB.setToolTipText("Rewind animation");
	1341	+
	1342	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1343	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1344	+
	1345	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1346	+ link2masterCB.setToolTipText("Attach to support");
	1347	+
	1348	+ if (Globals.ADVANCED)
	1349	+ {
	1350	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1351	+ speedupCB.setToolTipText("Option motion capture");
	1352	+ }
	1353	+
	1354	+ oe.ctrlPanel.add(setupPanel);
	1355	+ oe.ctrlPanel.Return();
	1356	+ oe.ctrlPanel.add(setupPanel2);
	1357	+ oe.ctrlPanel.Return();
	1358	+
	1359	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1360	+
	1361	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1362	+ resetButton.setToolTipText("Jump to frame zero");
	1363	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1364	+ stepButton.setToolTipText("Step one frame");
973	1365	// resetAllButton = AddButton(oe, "Reset All");
974	1366	// stepAllButton = AddButton(oe, "Step All");
975		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
976	1367	// Return();
977		- slowerButton = AddButton(oe, "Slow");
978		- fasterButton = AddButton(oe, "Fast");
979		- remarkButton = AddButton(oe, "Rem");
	1368	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1369	+ slowerButton.setToolTipText("Decrease animation speed");
	1370	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1371	+ fasterButton.setToolTipText("Increase animation speed");
	1372	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1373	+ remarkButton.setToolTipText("Set the current transform as the target");
980	1374
981		- //Return();
	1375	+ oe.ctrlPanel.add(objectCommandsPanel);
	1376	+ oe.ctrlPanel.Return();
982	1377
983		- //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
	1378	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1379	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
984	1380	//Return();
	1381	+
	1382	+ oe.ctrlPanel.Return();
985	1383
986	1384	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1385	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1076,7 +1474,7 @@
1076	1474	oe.aConstraints.gridwidth = 1;
1077	1475	/**/
1078	1476	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1477	+ oe.ctrlPanel.Return();
1080	1478
1081	1479	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1480	//textureButton.setEnabled(false);
..	..	@@ -1180,8 +1578,11 @@
1180	1578	//worldPanel.setName("World");
1181	1579	centralPanel = new cGridBag();
1182	1580	centralPanel.preferredWidth = 20;
1183		- timelinePanel = new JPanel(new BorderLayout());
1184		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1581	+
	1582	+ if (Globals.ADVANCED)
	1583	+ {
	1584	+ timelinePanel = new JPanel(new BorderLayout());
	1585	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1185	1586
1186	1587	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1187	1588	cameraPanel.setContinuousLayout(true);
..	..	@@ -1190,7 +1591,10 @@
1190	1591	// cameraPanel.setDividerSize(9);
1191	1592	cameraPanel.setResizeWeight(1.0);
1192	1593
	1594	+ }
	1595	+
1193	1596	centralPanel.add(cameraView);
	1597	+ centralPanel.setFocusable(true);
1194	1598	//frame.setJMenuBar(timelineMenubar);
1195	1599	//centralPanel.add(timelinePanel);
1196	1600
..	..	@@ -1216,6 +1620,7 @@
1216	1620	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1217	1621	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1218	1622	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1623	+ //XYZPanel.setName("XYZ");
1219	1624
1220	1625	/*
1221	1626	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1253,12 +1658,29 @@
1253	1658	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254	1659	//tmp.setName("Edit");
1255	1660	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);
	1661	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1662	+ objectPanel.setToolTipTextAt(0, "Material");
	1663	+
	1664	+ objectPanel.add(toolboxPanel);
	1665	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1666	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1261	1667
	1668	+ objectPanel.add(skyboxPanel);
	1669	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1670	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1671	+
	1672	+// JPanel north = new JPanel(new BorderLayout());
	1673	+// north.setName("Edit");
	1674	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1675	+// objectPanel.add(north);
	1676	+ objectPanel.add(editPanel);
	1677	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1678	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1679	+
	1680	+ objectPanel.add(XYZPanel);
	1681	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1682	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1683	+
1262	1684	/*
1263	1685	aConstraints.gridx = 0;
1264	1686	aConstraints.gridwidth = 1;
..	..	@@ -1266,7 +1688,7 @@
1266	1688	aConstraints.gridy += 1;
1267	1689	aConstraints.gridwidth = 1;
1268	1690	mainPanel.add(objectPanel, aConstraints);
1269		- */
	1691	+ */
1270	1692
1271	1693	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1272	1694	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1278,14 +1700,12 @@
1278	1700	scrollpane.addMouseWheelListener(this); // Default not fast enough
1279	1701
1280	1702	/JTabbedPane/ scenePanel = new cGridBag();
1281		- scenePanel.preferredWidth = 7;
	1703	+ scenePanel.preferredWidth = 5;
1282	1704
1283	1705	JTabbedPane tabbedPane = new JTabbedPane();
1284	1706	tabbedPane.add(scrollpane);
1285	1707
1286		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287		-
1288		- optionsPanel = new cGridBag().setVertical(true);
	1708	+ optionsPanel = new cGridBag().setVertical(false);
1289	1709
1290	1710	optionsPanel.setName("Options");
1291	1711
..	..	@@ -1293,8 +1713,15 @@
1293	1713
1294	1714	tabbedPane.add(optionsPanel);
1295	1715
	1716	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1717	+
1296	1718	scenePanel.add(tabbedPane);
1297	1719
	1720	+ //if (Globals.ADVANCED)
	1721	+// tabbedPane.add(infoPanel);
	1722	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1723	+// tabbedPane.setToolTipTextAt(3, "Information");
	1724	+
1298	1725	/*
1299	1726	cTree jTree = new cTree(null);
1300	1727	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1356,7 +1783,7 @@
1356	1783	bigThree = new cGridBag();
1357	1784	bigThree.addComponent(scenePanel);
1358	1785	bigThree.addComponent(centralPanel);
1359		- bigThree.addComponent(XYZPanel);
	1786	+ //bigThree.addComponent(XYZPanel);
1360	1787
1361	1788	// // SIDE EFFECT!!!
1362	1789	// aConstraints.gridx = 0;
..	..	@@ -1365,16 +1792,33 @@
1365	1792	// aConstraints.gridheight = 1;
1366	1793
1367	1794	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1368		- framePanel.setContinuousLayout(true);
1369		- framePanel.setOneTouchExpandable(true);
1370		- framePanel.setDividerLocation(0.8);
	1795	+
	1796	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1797	+ new java.beans.PropertyChangeListener()
	1798	+ {
	1799	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1800	+ {
	1801	+ if ((Integer)pce.getOldValue() == 1)
	1802	+ {
	1803	+ if (radio.layout != expandedLayout)
	1804	+ {
	1805	+ radio.layout = expandedLayout;
	1806	+ radio.layout.doClick();
	1807	+ }
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
	1812	+ framePanel.setContinuousLayout(false);
	1813	+ framePanel.setOneTouchExpandable(false);
	1814	+ //.setDividerLocation(0.8);
1371	1815	//framePanel.setDividerSize(15);
1372	1816	//framePanel.setResizeWeight(0.15);
1373	1817	framePanel.setName("Frame");
1374	1818
1375	1819	frame.getContentPane().setLayout(new BorderLayout());
1376	1820	/**/
1377		- JTabbedPane worldPane = new JTabbedPane();
	1821	+ //JTabbedPane worldPane = new JTabbedPane();
1378	1822	//worldPane.add(bigPanel);
1379	1823	//worldPane.add(worldPanel);
1380	1824	/**/
..	..	@@ -1384,15 +1828,19 @@
1384	1828
1385	1829	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1386	1830
1387		- frame.setSize(1024, 768);
1388		- frame.show();
1389		-
	1831	+ frame.setSize(1280, 860);
	1832	+
	1833	+ cameraView.requestFocusInWindow();
	1834	+
1390	1835	gridPanel.setDividerLocation(1.0);
	1836	+
	1837	+ frame.validate();
	1838	+
	1839	+ frame.setVisible(true);
1391	1840
1392	1841	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1393	1842	frame.addWindowListener(new WindowAdapter()
1394	1843	{
1395		-
1396	1844	public void windowClosing(WindowEvent e)
1397	1845	{
1398	1846	Close();
..	..	@@ -1415,27 +1863,441 @@
1415	1863	ctrlPanel.removeAll();
1416	1864	}
1417	1865
1418		- void SetupMaterial(cGridBag ctrlPanel)
	1866	+ void SetupMaterial(cGridBag materialpanel)
1419	1867	{
1420		- /*
	1868	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1869	+
	1870	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1871	+ skin.setToolTipText("Skin");
	1872	+ skin.addMouseListener(new MouseAdapter()
	1873	+ {
	1874	+ public void mouseClicked(MouseEvent e)
	1875	+ {
	1876	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1877	+ cMaterial material = object.material;
	1878	+
	1879	+ // Skin
	1880	+ colorField.setFloat(material.color);
	1881	+ saturationField.setFloat(material.modulation);
	1882	+ subsurfaceField.setFloat(material.subsurface);
	1883	+ selfshadowField.setFloat(material.diffuseness);
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ shininessField.setFloat(material.shininess);
	1886	+ shadowbiasField.setFloat(material.shadowbias);
	1887	+ diffuseField.setFloat(material.diffuse);
	1888	+ specularField.setFloat(material.specular);
	1889	+
	1890	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1891	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1892	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1893	+
	1894	+ materialtouched = true;
	1895	+ applySelf();
	1896	+ }
	1897	+ });
	1898	+ presetpanel.add(skin);
	1899	+
	1900	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1901	+ lambert.setToolTipText("Diffuse");
	1902	+ lambert.addMouseListener(new MouseAdapter()
	1903	+ {
	1904	+ public void mouseClicked(MouseEvent e)
	1905	+ {
	1906	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1907	+ cMaterial material = object.material;
	1908	+
	1909	+ diffusenessField.setFloat(material.factor);
	1910	+ selfshadowField.setFloat(material.diffuseness);
	1911	+
	1912	+ materialtouched = true;
	1913	+ applySelf();
	1914	+ }
	1915	+ });
	1916	+ presetpanel.add(lambert);
	1917	+
	1918	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1919	+ diffuse2.setToolTipText("Diffuse2");
	1920	+ diffuse2.addMouseListener(new MouseAdapter()
	1921	+ {
	1922	+ public void mouseClicked(MouseEvent e)
	1923	+ {
	1924	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1925	+ cMaterial material = object.material;
	1926	+
	1927	+ diffusenessField.setFloat(material.factor);
	1928	+ selfshadowField.setFloat(material.diffuseness);
	1929	+
	1930	+ materialtouched = true;
	1931	+ applySelf();
	1932	+ }
	1933	+ });
	1934	+ presetpanel.add(diffuse2);
	1935	+
	1936	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1937	+ diffusemoon.setToolTipText("Moon");
	1938	+ diffusemoon.addMouseListener(new MouseAdapter()
	1939	+ {
	1940	+ public void mouseClicked(MouseEvent e)
	1941	+ {
	1942	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1943	+ cMaterial material = object.material;
	1944	+
	1945	+ diffusenessField.setFloat(material.factor);
	1946	+ selfshadowField.setFloat(material.diffuseness);
	1947	+
	1948	+ materialtouched = true;
	1949	+ applySelf();
	1950	+ }
	1951	+ });
	1952	+ presetpanel.add(diffusemoon);
	1953	+
	1954	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1955	+ diffusemoon2.setToolTipText("Moon2");
	1956	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1957	+ {
	1958	+ public void mouseClicked(MouseEvent e)
	1959	+ {
	1960	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1961	+ cMaterial material = object.material;
	1962	+
	1963	+ diffusenessField.setFloat(material.factor);
	1964	+ selfshadowField.setFloat(material.diffuseness);
	1965	+
	1966	+ materialtouched = true;
	1967	+ applySelf();
	1968	+ }
	1969	+ });
	1970	+ presetpanel.add(diffusemoon2);
	1971	+
	1972	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1973	+ diffusemoon3.setToolTipText("Moon3");
	1974	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1975	+ {
	1976	+ public void mouseClicked(MouseEvent e)
	1977	+ {
	1978	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1979	+ cMaterial material = object.material;
	1980	+
	1981	+ diffusenessField.setFloat(material.factor);
	1982	+ selfshadowField.setFloat(material.diffuseness);
	1983	+
	1984	+ materialtouched = true;
	1985	+ applySelf();
	1986	+ }
	1987	+ });
	1988	+ presetpanel.add(diffusemoon3);
	1989	+
	1990	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1991	+ diffusesheen.setToolTipText("Sheen");
	1992	+ diffusesheen.addMouseListener(new MouseAdapter()
	1993	+ {
	1994	+ public void mouseClicked(MouseEvent e)
	1995	+ {
	1996	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1997	+ cMaterial material = object.material;
	1998	+
	1999	+ sheenField.setFloat(material.sheen);
	2000	+
	2001	+ materialtouched = true;
	2002	+ applySelf();
	2003	+ }
	2004	+ });
	2005	+ presetpanel.add(diffusesheen);
	2006	+
	2007	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2008	+ rough.setToolTipText("Rough metal");
	2009	+ rough.addMouseListener(new MouseAdapter()
	2010	+ {
	2011	+ public void mouseClicked(MouseEvent e)
	2012	+ {
	2013	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2014	+ cMaterial material = object.material;
	2015	+
	2016	+ shininessField.setFloat(material.shininess);
	2017	+ velvetField.setFloat(material.velvet);
	2018	+
	2019	+ materialtouched = true;
	2020	+ applySelf();
	2021	+ }
	2022	+ });
	2023	+ presetpanel.add(rough);
	2024	+
	2025	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2026	+ rough2.setToolTipText("Medium metal");
	2027	+ rough2.addMouseListener(new MouseAdapter()
	2028	+ {
	2029	+ public void mouseClicked(MouseEvent e)
	2030	+ {
	2031	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2032	+ cMaterial material = object.material;
	2033	+
	2034	+ shininessField.setFloat(material.shininess);
	2035	+ lightareaField.setFloat(material.lightarea);
	2036	+
	2037	+ materialtouched = true;
	2038	+ applySelf();
	2039	+ }
	2040	+ });
	2041	+ presetpanel.add(rough2);
	2042	+
	2043	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2044	+ shini0.setToolTipText("Shiny");
	2045	+ shini0.addMouseListener(new MouseAdapter()
	2046	+ {
	2047	+ public void mouseClicked(MouseEvent e)
	2048	+ {
	2049	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2050	+ cMaterial material = object.material;
	2051	+
	2052	+ shininessField.setFloat(material.shininess);
	2053	+ lightareaField.setFloat(material.lightarea);
	2054	+
	2055	+ materialtouched = true;
	2056	+ applySelf();
	2057	+ }
	2058	+ });
	2059	+ presetpanel.add(shini0);
	2060	+
	2061	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2062	+ shini1.setToolTipText("Shiny2");
	2063	+ shini1.addMouseListener(new MouseAdapter()
	2064	+ {
	2065	+ public void mouseClicked(MouseEvent e)
	2066	+ {
	2067	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2068	+ cMaterial material = object.material;
	2069	+
	2070	+ shininessField.setFloat(material.shininess);
	2071	+ lightareaField.setFloat(material.lightarea);
	2072	+
	2073	+ materialtouched = true;
	2074	+ applySelf();
	2075	+ }
	2076	+ });
	2077	+ presetpanel.add(shini1);
	2078	+
	2079	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2080	+ shini2.setToolTipText("Shiny3");
	2081	+ shini2.addMouseListener(new MouseAdapter()
	2082	+ {
	2083	+ public void mouseClicked(MouseEvent e)
	2084	+ {
	2085	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2086	+ cMaterial material = object.material;
	2087	+
	2088	+ shininessField.setFloat(material.shininess);
	2089	+ lightareaField.setFloat(material.lightarea);
	2090	+
	2091	+ materialtouched = true;
	2092	+ applySelf();
	2093	+ }
	2094	+ });
	2095	+ presetpanel.add(shini2);
	2096	+
	2097	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2098	+ aniso.setToolTipText("AnisoU");
	2099	+ aniso.addMouseListener(new MouseAdapter()
	2100	+ {
	2101	+ public void mouseClicked(MouseEvent e)
	2102	+ {
	2103	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2104	+ cMaterial material = object.material;
	2105	+
	2106	+ anisoField.setFloat(material.aniso);
	2107	+ anisoVField.setFloat(material.anisoV);
	2108	+
	2109	+ materialtouched = true;
	2110	+ applySelf();
	2111	+ }
	2112	+ });
	2113	+ presetpanel.add(aniso);
	2114	+
	2115	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2116	+ aniso2.setToolTipText("AnisoV");
	2117	+ aniso2.addMouseListener(new MouseAdapter()
	2118	+ {
	2119	+ public void mouseClicked(MouseEvent e)
	2120	+ {
	2121	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2122	+ cMaterial material = object.material;
	2123	+
	2124	+ anisoField.setFloat(material.aniso);
	2125	+ anisoVField.setFloat(material.anisoV);
	2126	+
	2127	+ materialtouched = true;
	2128	+ applySelf();
	2129	+ }
	2130	+ });
	2131	+ presetpanel.add(aniso2);
	2132	+
	2133	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2134	+ aniso3.setToolTipText("AnisoUV");
	2135	+ aniso3.addMouseListener(new MouseAdapter()
	2136	+ {
	2137	+ public void mouseClicked(MouseEvent e)
	2138	+ {
	2139	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2140	+ cMaterial material = object.material;
	2141	+
	2142	+ anisoField.setFloat(material.aniso);
	2143	+ anisoVField.setFloat(material.anisoV);
	2144	+
	2145	+ materialtouched = true;
	2146	+ applySelf();
	2147	+ }
	2148	+ });
	2149	+ presetpanel.add(aniso3);
	2150	+
	2151	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2152	+ velvet0.setToolTipText("Velvet");
	2153	+ velvet0.addMouseListener(new MouseAdapter()
	2154	+ {
	2155	+ public void mouseClicked(MouseEvent e)
	2156	+ {
	2157	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2158	+ cMaterial material = object.material;
	2159	+
	2160	+ diffusenessField.setFloat(material.factor);
	2161	+ selfshadowField.setFloat(material.diffuseness);
	2162	+ sheenField.setFloat(material.sheen);
	2163	+ shininessField.setFloat(material.shininess);
	2164	+ velvetField.setFloat(material.velvet);
	2165	+ shiftField.setFloat(material.shift);
	2166	+
	2167	+ materialtouched = true;
	2168	+ applySelf();
	2169	+ }
	2170	+ });
	2171	+ presetpanel.add(velvet0);
	2172	+
	2173	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2174	+ bump0.setToolTipText("Bump texture");
	2175	+ bump0.addMouseListener(new MouseAdapter()
	2176	+ {
	2177	+ public void mouseClicked(MouseEvent e)
	2178	+ {
	2179	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2180	+ cMaterial material = object.material;
	2181	+
	2182	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2183	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2184	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2185	+
	2186	+ materialtouched = true;
	2187	+ applySelf();
	2188	+ }
	2189	+ });
	2190	+ presetpanel.add(bump0);
	2191	+
	2192	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2193	+ borderShader.setToolTipText("Border fade");
	2194	+ borderShader.addMouseListener(new MouseAdapter()
	2195	+ {
	2196	+ public void mouseClicked(MouseEvent e)
	2197	+ {
	2198	+ borderfadeField.setFloat(0.5);
	2199	+ opacityField.setFloat(0.6);
	2200	+
	2201	+ materialtouched = true;
	2202	+ applySelf();
	2203	+ }
	2204	+ });
	2205	+ presetpanel.add(borderShader);
	2206	+
	2207	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2208	+ halo.setToolTipText("Halo");
	2209	+ halo.addMouseListener(new MouseAdapter()
	2210	+ {
	2211	+ public void mouseClicked(MouseEvent e)
	2212	+ {
	2213	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2214	+ cMaterial material = object.material;
	2215	+
	2216	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2217	+
	2218	+ materialtouched = true;
	2219	+ applySelf();
	2220	+ }
	2221	+ });
	2222	+ presetpanel.add(halo);
	2223	+
	2224	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2225	+ candle.setToolTipText("Candle");
	2226	+ candle.addMouseListener(new MouseAdapter()
	2227	+ {
	2228	+ public void mouseClicked(MouseEvent e)
	2229	+ {
	2230	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2231	+ cMaterial material = object.material;
	2232	+
	2233	+ subsurfaceField.setFloat(material.subsurface);
	2234	+ shadowbiasField.setFloat(material.shadowbias);
	2235	+ ambientField.setFloat(material.ambient);
	2236	+ specularField.setFloat(material.specular);
	2237	+ lightareaField.setFloat(material.lightarea);
	2238	+ shininessField.setFloat(material.shininess);
	2239	+
	2240	+ materialtouched = true;
	2241	+ applySelf();
	2242	+ }
	2243	+ });
	2244	+ presetpanel.add(candle);
	2245	+
	2246	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2247	+ shadowShader.setToolTipText("Shadow");
	2248	+ shadowShader.addMouseListener(new MouseAdapter()
	2249	+ {
	2250	+ public void mouseClicked(MouseEvent e)
	2251	+ {
	2252	+ diffuseField.setFloat(0.001);
	2253	+ ambientField.setFloat(0.001);
	2254	+ cameraField.setFloat(0.001);
	2255	+ specularField.setFloat(0.001);
	2256	+ fakedepthField.setFloat(0.001);
	2257	+ opacityField.setFloat(0.6);
	2258	+
	2259	+ materialtouched = true;
	2260	+ applySelf();
	2261	+ }
	2262	+ });
	2263	+ presetpanel.add(shadowShader);
	2264	+
	2265	+ cGridBag panel = new cGridBag().setVertical(true);
	2266	+
	2267	+ presetpanel.preferredWidth = 1;
	2268	+
	2269	+ materialpanel.add(presetpanel);
	2270	+ materialpanel.add(panel);
	2271	+
	2272	+ panel.preferredWidth = 8;
	2273	+
	2274	+ /*
1421	2275	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1422	2276	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1423		- */
	2277	+ */
1424	2278
1425	2279	cGridBag editBar = new cGridBag().setVertical(false);
1426	2280
1427		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	2281	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2282	+ createMaterialButton.setToolTipText("Create material");
1428	2283
1429	2284	/*
1430	2285	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	2286	*/
1432	2287
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);
	2288	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2289	+ clearMaterialButton.setToolTipText("Clear material");
	2290	+
	2291	+ if (Globals.ADVANCED)
	2292	+ {
	2293	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2294	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2295	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2296	+ }
1437	2297
1438		- ctrlPanel.add(editBar);
	2298	+ editBar.preferredHeight = 15;
	2299	+
	2300	+ panel.add(editBar);
1439	2301
1440	2302	/**/
1441	2303	//aConstraints.weighty = 0;
..	..	@@ -1446,47 +2308,52 @@
1446	2308	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1447	2309
1448	2310	cGridBag colorSection = new cGridBag().setVertical(true);
	2311	+
	2312	+ cGridBag huepanel = new cGridBag();
	2313	+ cGridBag huelabel = new cGridBag();
	2314	+ skin = GetLabel("icons/hue.png", false);
	2315	+ skin.fit = true;
	2316	+ huelabel.add(skin);
	2317	+ huelabel.preferredWidth = 20;
	2318	+ huepanel.add(new cGridBag()); // Label
	2319	+ huepanel.add(huelabel); // Field/slider
	2320	+
	2321	+ huepanel.preferredHeight = 7;
	2322	+
	2323	+ colorSection.add(huepanel);
1449	2324
1450	2325	cGridBag color = new cGridBag();
1451		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1452		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1453		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2326	+
	2327	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2328	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2329	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2330	+
1454	2331	//colorField.preferredWidth = 200;
1455	2332	colorSection.add(color);
1456	2333
1457	2334	cGridBag modulation = new cGridBag();
1458	2335	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1459	2336	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1460		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2337	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1461	2338	colorSection.add(modulation);
1462	2339
	2340	+ cGridBag opacity = new cGridBag();
	2341	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2342	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2343	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2344	+ colorSection.add(opacity);
	2345	+
	2346	+ colorSection.add(GetSeparator());
	2347	+
1463	2348	cGridBag texture = new cGridBag();
1464	2349	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1465	2350	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466	2351	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1467	2352	colorSection.add(texture);
1468	2353
1469		- cGridBag anisoU = new cGridBag();
1470		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1471		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1473		- colorSection.add(anisoU);
1474		-
1475		- cGridBag anisoV = new cGridBag();
1476		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1477		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479		- colorSection.add(anisoV);
1480		-
1481		- cGridBag shadowbias = new cGridBag();
1482		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1483		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1485		- colorSection.add(shadowbias);
1486		-
1487		- ctrlPanel.add(new JSeparator());
	2354	+ panel.add(GetSeparator());
1488	2355
1489		- ctrlPanel.add(colorSection);
	2356	+ panel.add(colorSection);
1490	2357
1491	2358	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1492	2359
..	..	@@ -1534,9 +2401,15 @@
1534	2401	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1535	2402	diffuseSection.add(fakedepth);
1536	2403
1537		- ctrlPanel.add(new JSeparator());
	2404	+ cGridBag shadowbias = new cGridBag();
	2405	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2406	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2407	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2408	+ diffuseSection.add(shadowbias);
	2409	+
	2410	+ panel.add(GetSeparator());
1538	2411
1539		- ctrlPanel.add(diffuseSection);
	2412	+ panel.add(diffuseSection);
1540	2413
1541	2414	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1542	2415
..	..	@@ -1572,7 +2445,7 @@
1572	2445	velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1573	2446	specularSection.add(velvet);
1574	2447
1575		- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	2448	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1576	2449	//Return();
1577	2450	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1578	2451	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..	..	@@ -1584,42 +2457,48 @@
1584	2457	// aConstraints.gridy += 1;
1585	2458	// aConstraints.gridwidth = 1;
1586	2459
	2460	+ cGridBag anisoU = new cGridBag();
	2461	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2462	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2463	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2464	+ specularSection.add(anisoU);
1587	2465
1588		- ctrlPanel.add(new JSeparator());
	2466	+ cGridBag anisoV = new cGridBag();
	2467	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2468	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2469	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2470	+ specularSection.add(anisoV);
	2471	+
	2472	+
	2473	+ panel.add(GetSeparator());
1589	2474
1590		- ctrlPanel.add(specularSection);
	2475	+ panel.add(specularSection);
1591	2476
1592	2477	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1593	2478
1594		- cGridBag globalSection = new cGridBag().setVertical(true);
	2479	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1595	2480
1596	2481	cGridBag camera = new cGridBag();
1597	2482	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1598	2483	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1599	2484	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1600		- globalSection.add(camera);
	2485	+ colorSection.add(camera);
1601	2486
1602	2487	cGridBag ambient = new cGridBag();
1603	2488	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1604	2489	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1605	2490	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1606		- globalSection.add(ambient);
	2491	+ colorSection.add(ambient);
1607	2492
1608	2493	cGridBag backlit = new cGridBag();
1609	2494	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1610	2495	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611	2496	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612		- globalSection.add(backlit);
	2497	+ colorSection.add(backlit);
1613	2498
1614		- cGridBag opacity = new cGridBag();
1615		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1616		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1618		- globalSection.add(opacity);
1619		-
1620		- ctrlPanel.add(new JSeparator());
	2499	+ //panel.add(new JSeparator());
1621	2500
1622		- ctrlPanel.add(globalSection);
	2501	+ //panel.add(globalSection);
1623	2502
1624	2503	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1625	2504
..	..	@@ -1661,9 +2540,9 @@
1661	2540	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1662	2541	textureSection.add(opacityPower);
1663	2542
1664		- ctrlPanel.add(new JSeparator());
	2543	+ panel.add(GetSeparator());
1665	2544
1666		- ctrlPanel.add(textureSection);
	2545	+ panel.add(textureSection);
1667	2546
1668	2547	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1669	2548
..	..	@@ -1700,12 +2579,15 @@
1700	2579	opacityPowerField.addChangeListener(this);
1701	2580	/**/
1702	2581
1703		- resetSlidersButton.addActionListener(this);
1704	2582	clearMaterialButton.addActionListener(this);
1705	2583	createMaterialButton.addActionListener(this);
1706		-
1707		- propagateToggle.addItemListener(this);
1708		- multiplyToggle.addItemListener(this);
	2584	+
	2585	+ if (Globals.ADVANCED)
	2586	+ {
	2587	+ resetSlidersButton.addActionListener(this);
	2588	+ propagateToggle.addItemListener(this);
	2589	+ multiplyToggle.addItemListener(this);
	2590	+ }
1709	2591	}
1710	2592
1711	2593	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1723,8 +2605,9 @@
1723	2605	// 3D models
1724	2606	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1725	2607	{
1726		- lastConverter = new com.jmex.model.converters.MaxToJme();
1727		- LoadFile(filename, lastConverter);
	2608	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2609	+ //LoadFile(filename, lastConverter);
	2610	+ LoadObjFile(filename); // New 3ds loader
1728	2611	continue;
1729	2612	}
1730	2613	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1876,7 +2759,7 @@
1876	2759
1877	2760	//? flashIt = false;
1878	2761	CameraPane pane = (CameraPane) cameraView;
1879		- pane.clickStart(location.x, location.y, 0);
	2762	+ pane.clickStart(location.x, location.y, 0, 0);
1880	2763	pane.clickEnd(location.x, location.y, 0, true);
1881	2764
1882	2765	if (group.selection.size() == 1)
..	..	@@ -1925,6 +2808,7 @@
1925	2808	e2.printStackTrace();
1926	2809	}
1927	2810	}
	2811	+
1928	2812	LoadJMEThread loadThread;
1929	2813
1930	2814	class LoadJMEThread extends Thread
..	..	@@ -1982,6 +2866,7 @@
1982	2866	//LoadFile0(filename, converter);
1983	2867	}
1984	2868	}
	2869	+
1985	2870	LoadOBJThread loadObjThread;
1986	2871
1987	2872	class LoadOBJThread extends Thread
..	..	@@ -2060,19 +2945,19 @@
2060	2945
2061	2946	void LoadObjFile(String fullname)
2062	2947	{
2063		- /*
	2948	+ System.out.println("Loading " + fullname);
	2949	+ /**/
2064	2950	//lastFilename = fullname;
2065	2951	if(loadObjThread == null)
2066	2952	{
2067		- loadObjThread = new LoadOBJThread();
2068		- loadObjThread.start();
	2953	+ loadObjThread = new LoadOBJThread();
	2954	+ loadObjThread.start();
2069	2955	}
2070	2956
2071	2957	loadObjThread.add(fullname);
2072		- */
	2958	+ /**/
2073	2959
2074		- System.out.println("Loading " + fullname);
2075		- makeSomething(new FileObject(fullname, true), true);
	2960	+ //makeSomething(new FileObject(fullname, true), true);
2076	2961	}
2077	2962
2078	2963	void LoadGFDFile(String fullname)
..	..	@@ -2333,11 +3218,11 @@
2333	3218
2334	3219	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2335	3220	{
2336		- if (GrafreeD.standAlone)
	3221	+ if (Grafreed.standAlone)
2337	3222	{
2338	3223	/**/
2339	3224	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2340		- browser.show();
	3225	+ browser.setVisible(true);
2341	3226	String filename = browser.getFile();
2342	3227	if (filename != null && filename.length() > 0)
2343	3228	{
..	..	@@ -2448,6 +3333,7 @@
2448	3333	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2449	3334	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2450	3335	}
	3336	+
2451	3337	//cJME.count++;
2452	3338	//cJME.count %= 12;
2453	3339	if (gc)
..	..	@@ -2482,6 +3368,7 @@
2482	3368	}
2483	3369	if (input == null)
2484	3370	{
	3371	+ new Exception().printStackTrace();
2485	3372	System.exit(0);
2486	3373	}
2487	3374
..	..	@@ -2630,6 +3517,7 @@
2630	3517	}
2631	3518	}
2632	3519	}
	3520	+
2633	3521	cFileSystemPane FSPane;
2634	3522
2635	3523	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2639,7 +3527,7 @@
2639	3527
2640	3528	freezematerial = true;
2641	3529	colorField.setFloat(mat.color);
2642		- modulationField.setFloat(mat.modulation);
	3530	+ saturationField.setFloat(mat.modulation);
2643	3531	metalnessField.setFloat(mat.metalness);
2644	3532	diffuseField.setFloat(mat.diffuse);
2645	3533	specularField.setFloat(mat.specular);
..	..	@@ -2683,11 +3571,14 @@
2683	3571	}
2684	3572	}
2685	3573	}
	3574	+
2686	3575	freezematerial = false;
2687	3576	}
2688	3577
2689	3578	void SetMaterial(Object3D object)
2690	3579	{
	3580	+ latestObject = object;
	3581	+
2691	3582	cMaterial mat = object.material;
2692	3583
2693	3584	if (mat == null)
..	..	@@ -2696,33 +3587,10 @@
2696	3587	return;
2697	3588	}
2698	3589
2699		- multiplyToggle.setSelected(mat.multiply);
2700		-
2701		- assert (object.projectedVertices != null);
2702		-
2703		- if (object.projectedVertices.length <= 2)
2704		- {
2705		- // Side effect...
2706		- Object3D.cVector2[] keep = object.projectedVertices;
2707		- object.projectedVertices = new Object3D.cVector2[3];
2708		- for (int i = 0; i < 3; i++)
2709		- {
2710		- if (i < keep.length)
2711		- {
2712		- object.projectedVertices[i] = keep[i];
2713		- } else
2714		- {
2715		- object.projectedVertices[i] = new Object3D.cVector2();
2716		- }
2717		- /*
2718		- if(keep.length == 0)
2719		- object.projectedVertices[0] = new Object3D.cVector2();
2720		- else
2721		- object.projectedVertices[0] = keep[0];
2722		- object.projectedVertices[1] = new Object3D.cVector2();
2723		- */
2724		- }
2725		- }
	3590	+ if (multiplyToggle != null)
	3591	+ multiplyToggle.setSelected(mat.multiply);
	3592	+
	3593	+ AllocProjectedVertices(object);
2726	3594
2727	3595	SetMaterial(mat, object.projectedVertices);
2728	3596	}
..	..	@@ -2798,12 +3666,17 @@
2798	3666	// }
2799	3667
2800	3668	/**/
2801		- if (deselect)
	3669	+ if (deselect \|\| child == null)
2802	3670	{
2803	3671	//group.deselectAll();
2804	3672	//freeze = true;
2805	3673	GetTree().clearSelection();
2806	3674	//freeze = false;
	3675	+
	3676	+ if (child == null)
	3677	+ {
	3678	+ return;
	3679	+ }
2807	3680	}
2808	3681
2809	3682	//group.addSelectee(child);
..	..	@@ -2837,6 +3710,17 @@
2837	3710	public void itemStateChanged(ItemEvent event)
2838	3711	{
2839	3712	// System.out.println("Propagate = " + propagate);
	3713	+ if (event.getSource() == pinButton)
	3714	+ {
	3715	+ copy.pinned ^= true;
	3716	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3717	+ {
	3718	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3719	+ copy.CloseUI();
	3720	+ //copy.editWindow.refreshContents();
	3721	+ }
	3722	+ }
	3723	+ else
2840	3724	if (event.getSource() == propagateToggle)
2841	3725	{
2842	3726	propagate ^= true;
..	..	@@ -2872,7 +3756,7 @@
2872	3756	cameraView.ToggleDL();
2873	3757	cameraView.repaint();
2874	3758	return;
2875		- } else if (event.getSource() == toggleTextureItem)
	3759	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2876	3760	{
2877	3761	cameraView.ToggleTexture();
2878	3762	// june 2013 copy.HardTouch();
..	..	@@ -2911,9 +3795,9 @@
2911	3795	frame.validate();
2912	3796
2913	3797	return;
2914		- } else if (event.getSource() == toggleRandomItem)
	3798	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2915	3799	{
2916		- cameraView.ToggleRandom();
	3800	+ cameraView.ToggleSwitch();
2917	3801	cameraView.repaint();
2918	3802	return;
2919	3803	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2941,12 +3825,17 @@
2941	3825	} else if (event.getSource() == liveCB)
2942	3826	{
2943	3827	copy.live ^= true;
	3828	+ objEditor.refreshContents(true); // To show item colors
	3829	+ return;
	3830	+ } else if (event.getSource() == selectableCB)
	3831	+ {
	3832	+ copy.dontselect ^= true;
2944	3833	return;
2945	3834	} else if (event.getSource() == hideCB)
2946	3835	{
2947	3836	copy.hide ^= true;
2948	3837	copy.Touch(); // display list issue
2949		- objEditor.refreshContents();
	3838	+ objEditor.refreshContents(true); // To show item colors
2950	3839	return;
2951	3840	} else if (event.getSource() == link2masterCB)
2952	3841	{
..	..	@@ -2956,6 +3845,7 @@
2956	3845	if (event.getSource() == randomCB)
2957	3846	{
2958	3847	copy.random ^= true;
	3848	+ objEditor.refreshContents();
2959	3849	return;
2960	3850	}
2961	3851	if (event.getSource() == speedupCB)
..	..	@@ -2979,8 +3869,9 @@
2979	3869
2980	3870	public void actionPerformed(ActionEvent event)
2981	3871	{
	3872	+ Object source = event.getSource();
2982	3873	// SCRIPT DIALOG
2983		- if (event.getSource() == okbutton)
	3874	+ if (source == okbutton)
2984	3875	{
2985	3876	textpanel.setVisible(false);
2986	3877	textpanel.remove(textarea);
..	..	@@ -2992,7 +3883,7 @@
2992	3883	textarea = null;
2993	3884	textpanel = null;
2994	3885	}
2995		- if (event.getSource() == cancelbutton)
	3886	+ if (source == cancelbutton)
2996	3887	{
2997	3888	textpanel.setVisible(false);
2998	3889	textpanel.remove(textarea);
..	..	@@ -3004,50 +3895,50 @@
3004	3895	//applySelf();
3005	3896	//client.refreshEditWindow();
3006	3897	//refreshContents();
3007		- if (event.getSource() == nameField)
	3898	+ if (source == nameField)
3008	3899	{
3009	3900	//System.out.println("ObjEditor " + event);
3010	3901	applySelf0(true);
3011	3902	//parent.applySelf();
3012	3903	objEditor.refreshContents();
3013		- } else if (event.getSource() == resetButton)
	3904	+ } else if (source == resetButton)
3014	3905	{
3015	3906	CameraPane.fullreset = true;
3016	3907	copy.Reset(); // ResetMeshes();
3017	3908	copy.Touch();
3018	3909	objEditor.refreshContents();
3019		- } else if (event.getSource() == stepItem)
	3910	+ } else if (source == stepItem)
3020	3911	{
3021	3912	//cameraView.ONESTEP = true;
3022	3913	Globals.ONESTEP = true;
3023	3914	cameraView.repaint();
3024	3915	return;
3025		- } else if (event.getSource() == stepButton)
	3916	+ } else if (source == stepButton)
3026	3917	{
3027	3918	copy.Step();
3028	3919	copy.Touch();
3029	3920	objEditor.refreshContents();
3030		- } else if (event.getSource() == slowerButton)
	3921	+ } else if (source == slowerButton)
3031	3922	{
3032	3923	copy.Slower();
3033	3924	copy.Touch();
3034	3925	objEditor.refreshContents();
3035		- } else if (event.getSource() == fasterButton)
	3926	+ } else if (source == fasterButton)
3036	3927	{
3037	3928	copy.Faster();
3038	3929	copy.Touch();
3039	3930	objEditor.refreshContents();
3040		- } else if (event.getSource() == remarkButton)
	3931	+ } else if (source == remarkButton)
3041	3932	{
3042	3933	copy.Remark();
3043	3934	copy.Touch();
3044	3935	objEditor.refreshContents();
3045		- } else if (event.getSource() == stepAllButton)
	3936	+ } else if (source == stepAllButton)
3046	3937	{
3047	3938	copy.StepAll();
3048	3939	copy.Touch();
3049	3940	objEditor.refreshContents();
3050		- } else if (event.getSource() == resetAllButton)
	3941	+ } else if (source == resetAllButton)
3051	3942	{
3052	3943	//CameraPane.fullreset = true;
3053	3944	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3080,53 +3971,79 @@
3080	3971	// Close();
3081	3972	// }
3082	3973	// else
3083		- if (event.getSource() == resetSlidersButton)
	3974	+ if (source == resetSlidersButton)
3084	3975	{
3085	3976	ResetSliders();
3086		- } else if (event.getSource() == clearMaterialButton)
	3977	+ } else if (source == clearMaterialButton)
3087	3978	{
3088	3979	ClearMaterial();
3089		- } else if (event.getSource() == createMaterialButton)
	3980	+ } else if (source == createMaterialButton)
3090	3981	{
3091	3982	CreateMaterial();
3092		- } else if (event.getSource() == clearPanelButton)
	3983	+ } else if (source == clearPanelButton)
3093	3984	{
3094	3985	copy.ClearUI();
3095	3986	refreshContents(true);
3096		- } /*
3097		- }
3098		-
3099		- public boolean action(Event event, Object arg)
3100		- {
3101		- */ else if (event.getSource() == closeItem)
	3987	+ } else if (source == importGFDItem)
	3988	+ {
	3989	+ ImportGFD();
	3990	+ } else
	3991	+ if (source == importVRMLX3DItem)
	3992	+ {
	3993	+ ImportVRMLX3D();
	3994	+ } else
	3995	+ if (source == import3DSItem)
	3996	+ {
	3997	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3998	+ } else
	3999	+ if (source == importOBJItem)
	4000	+ {
	4001	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4002	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4003	+ browser.setVisible(true);
	4004	+ String filename = browser.getFile();
	4005	+ if (filename != null && filename.length() > 0)
	4006	+ {
	4007	+ String fullname = browser.getDirectory() + filename;
	4008	+ makeSomething(ReadOBJ(fullname), true);
	4009	+ }
	4010	+ } else
	4011	+ if (source == closeItem)
3102	4012	{
3103	4013	Close();
3104	4014	//return true;
3105		- } else if (event.getSource() == loadItem)
	4015	+ } else if (source == openItem)
3106	4016	{
3107		- load();
	4017	+ Open();
3108	4018	//return true;
3109		- } else if (event.getSource() == saveItem)
	4019	+ } else if (source == newItem)
	4020	+ {
	4021	+ New();
	4022	+ } else if (source == saveItem)
3110	4023	{
3111	4024	save();
3112	4025	//return true;
3113		- } else if (event.getSource() == saveAsItem)
	4026	+ } else if (source == saveAsItem)
3114	4027	{
3115	4028	saveAs();
3116	4029	//return true;
3117		- } else if (event.getSource() == reexportItem)
	4030	+ } else if (source == reexportItem)
3118	4031	{
3119	4032	reexport();
3120	4033	//return true;
3121		- } else if (event.getSource() == exportAsItem)
	4034	+ } else if (source == exportAsItem)
3122	4035	{
3123	4036	export();
3124	4037	//return true;
3125		- } else if (event.getSource() == povItem)
	4038	+ } else if (source == povItem)
3126	4039	{
3127	4040	generatePOV();
3128	4041	//return true;
3129		- } else if (event.getSource() == zBufferItem)
	4042	+ } else if (event.getSource() == archiveItem)
	4043	+ {
	4044	+ cTools.Archive(frame);
	4045	+ return;
	4046	+ } else if (source == zBufferItem)
3130	4047	{
3131	4048	try
3132	4049	{
..	..	@@ -3148,21 +4065,8 @@
3148	4065	cameraView.repaint();
3149	4066	//return true;
3150	4067	}
3151		- */ else if (event.getSource() == editCameraItem)
3152		- {
3153		- cameraView.ProtectCamera();
3154		- cameraView.repaint();
3155		- return;
3156		- } else if (event.getSource() == revertCameraItem)
3157		- {
3158		- cameraView.RevertCamera();
3159		- cameraView.repaint();
3160		- return;
3161		-// } else if (event.getSource() == textureButton)
3162		-// {
3163		-// return; // true;
3164		- } else // combos...
3165		- if (event.getSource() == texresMenu)
	4068	+ */ else // combos...
	4069	+ if (source == texresMenu)
3166	4070	{
3167	4071	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3168	4072	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3174,12 +4078,477 @@
3174	4078	}
3175	4079	}
3176	4080
	4081	+ void New()
	4082	+ {
	4083	+ while (copy.Size() > 1)
	4084	+ {
	4085	+ copy.remove(1);
	4086	+ }
	4087	+
	4088	+ ResetModel();
	4089	+ objEditor.refreshContents();
	4090	+ }
	4091	+
	4092	+ static public byte[] Compress(Object3D o)
	4093	+ {
	4094	+ // Slower to actually compress.
	4095	+ try
	4096	+ {
	4097	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4098	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4099	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4100	+
	4101	+ Object3D parent = o.parent;
	4102	+ o.parent = null;
	4103	+
	4104	+ out.writeObject(o);
	4105	+
	4106	+ o.parent = parent;
	4107	+
	4108	+ out.flush();
	4109	+
	4110	+ baos //zstream
	4111	+ .close();
	4112	+ out.close();
	4113	+
	4114	+ byte[] bytes = baos.toByteArray();
	4115	+
	4116	+ System.out.println("save #bytes = " + bytes.length);
	4117	+ return bytes;
	4118	+ } catch (Exception e)
	4119	+ {
	4120	+ System.err.println(e);
	4121	+ return null;
	4122	+ }
	4123	+ }
	4124	+
	4125	+ static public Object Uncompress(byte[] bytes)
	4126	+ {
	4127	+ System.out.println("restore #bytes = " + bytes.length);
	4128	+ try
	4129	+ {
	4130	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4131	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4132	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4133	+ Object obj = in.readObject();
	4134	+
	4135	+ bais //istream
	4136	+ .close();
	4137	+ in.close();
	4138	+
	4139	+ return obj;
	4140	+ } catch (Exception e)
	4141	+ {
	4142	+ System.err.println(e);
	4143	+ return null;
	4144	+ }
	4145	+ }
	4146	+
	4147	+ static public Object clone(Object o)
	4148	+ {
	4149	+ try
	4150	+ {
	4151	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4152	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4153	+
	4154	+ out.writeObject(o);
	4155	+
	4156	+ out.flush();
	4157	+ out.close();
	4158	+
	4159	+ byte[] bytes = baos.toByteArray();
	4160	+
	4161	+ System.out.println("clone = " + bytes.length);
	4162	+
	4163	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4164	+ ObjectInputStream in = new ObjectInputStream(bais);
	4165	+ Object obj = in.readObject();
	4166	+ in.close();
	4167	+
	4168	+ return obj;
	4169	+ } catch (Exception e)
	4170	+ {
	4171	+ System.err.println(e);
	4172	+ return null;
	4173	+ }
	4174	+ }
	4175	+
	4176	+ cRadio GetCurrentTab()
	4177	+ {
	4178	+ cRadio ab;
	4179	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4180	+ {
	4181	+ ab = (cRadio)e.nextElement();
	4182	+ if(ab.GetObject() == copy)
	4183	+ {
	4184	+ return ab;
	4185	+ }
	4186	+ }
	4187	+
	4188	+ return null;
	4189	+ }
	4190	+
	4191	+
	4192	+ public void Save()
	4193	+ {
	4194	+ //Save(true);
	4195	+ Replace();
	4196	+ SetVersionStates();
	4197	+ }
	4198	+
	4199	+ private boolean Equal(byte[] compress, byte[] name)
	4200	+ {
	4201	+ if (compress.length != name.length)
	4202	+ {
	4203	+ return false;
	4204	+ }
	4205	+
	4206	+ for (int i=compress.length; --i>=0;)
	4207	+ {
	4208	+ if (compress[i] != name[i])
	4209	+ return false;
	4210	+ }
	4211	+
	4212	+ return true;
	4213	+ }
	4214	+
	4215	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4216	+
	4217	+ void DeleteVersion()
	4218	+ {
	4219	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4220	+ {
	4221	+ copy.versionlist[i] = copy.versionlist[i+1];
	4222	+ }
	4223	+
	4224	+ CopyChanged();
	4225	+
	4226	+ SetVersionStates();
	4227	+ }
	4228	+
	4229	+ public boolean Save(boolean user)
	4230	+ {
	4231	+ System.err.println("Save");
	4232	+ Replace();
	4233	+
	4234	+ //cRadio tab = GetCurrentTab();
	4235	+
	4236	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4237	+
	4238	+ boolean thesame = false;
	4239	+
	4240	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4241	+// {
	4242	+// thesame = true;
	4243	+// }
	4244	+
	4245	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4246	+ if (!thesame)
	4247	+ {
	4248	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4249	+ {
	4250	+ copy.versionlist[i] = copy.versionlist[i-1];
	4251	+ }
	4252	+
	4253	+ //tab.user[tab.versionindex] = user;
	4254	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4255	+
	4256	+ copy.versionlist[++copy.versionindex] = compress;
	4257	+
	4258	+ // if (increment)
	4259	+ // tab.versionindex++;
	4260	+ }
	4261	+
	4262	+ //copy.RestoreBigData(versiontable);
	4263	+
	4264	+ //assert(hashtable.isEmpty());
	4265	+
	4266	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4267	+// {
	4268	+// //tab.user[i] = false;
	4269	+// copy.versionlist[i] = null;
	4270	+// }
	4271	+
	4272	+ SetVersionStates();
	4273	+
	4274	+ // test save
	4275	+ if (false)
	4276	+ {
	4277	+ try
	4278	+ {
	4279	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4280	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4281	+
	4282	+ p.writeObject(copy);
	4283	+
	4284	+ p.flush();
	4285	+
	4286	+ ostream.close();
	4287	+ } catch (Exception e)
	4288	+ {
	4289	+ e.printStackTrace();
	4290	+ }
	4291	+ }
	4292	+
	4293	+ return !thesame;
	4294	+ }
	4295	+
	4296	+ boolean flashIt = true;
	4297	+
	4298	+ void RefreshSelection()
	4299	+ {
	4300	+ Object3D selection = new Object3D();
	4301	+
	4302	+ for (int i = 0; i < copy.selection.size(); i++)
	4303	+ {
	4304	+ Object3D elem = copy.selection.elementAt(i);
	4305	+
	4306	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4307	+
	4308	+ if (obj == null)
	4309	+ {
	4310	+ copy.selection.remove(i--);
	4311	+ }
	4312	+ else
	4313	+ {
	4314	+ selection.add(obj);
	4315	+ copy.selection.setElementAt(obj, i);
	4316	+ }
	4317	+ }
	4318	+
	4319	+ flashIt = false;
	4320	+ GetTree().clearSelection();
	4321	+ for (int i = 0; i < selection.size(); i++)
	4322	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4323	+ flashIt = true;
	4324	+
	4325	+ //refreshContents(false);
	4326	+ }
	4327	+
	4328	+ void CopyChanged()
	4329	+ {
	4330	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4331	+
	4332	+ SetVersionStates();
	4333	+
	4334	+ boolean temp = CameraPane.SWITCH;
	4335	+ CameraPane.SWITCH = false;
	4336	+
	4337	+ copy.ExtractBigData(versiontable);
	4338	+
	4339	+ copy.clear();
	4340	+
	4341	+ copy.skyboxname = obj.skyboxname;
	4342	+ copy.skyboxext = obj.skyboxext;
	4343	+
	4344	+ for (int i=0; i<obj.Size(); i++)
	4345	+ {
	4346	+ copy.add(obj.get(i));
	4347	+ }
	4348	+
	4349	+ copy.RestoreBigData(versiontable);
	4350	+
	4351	+ CameraPane.SWITCH = temp;
	4352	+
	4353	+ RefreshSelection();
	4354	+ //assert(hashtable.isEmpty());
	4355	+
	4356	+ copy.Touch();
	4357	+
	4358	+ ResetModel();
	4359	+ copy.HardTouch(); // recompile?
	4360	+
	4361	+ cRadio ab;
	4362	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4363	+ {
	4364	+ ab = (cRadio)e.nextElement();
	4365	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4366	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4367	+ if (test != null)
	4368	+ {
	4369	+ test.editWindow = ab.object.editWindow;
	4370	+ ab.object = test;
	4371	+ }
	4372	+ }
	4373	+
	4374	+ refreshContents(true);
	4375	+ }
	4376	+
	4377	+ cButton previousVersionButton;
	4378	+ cButton restoreButton;
	4379	+ cButton replaceButton;
	4380	+ cButton nextVersionButton;
	4381	+ cButton saveVersionButton;
	4382	+ cButton deleteVersionButton;
	4383	+
	4384	+ boolean muteSlider;
	4385	+
	4386	+ int VersionCount()
	4387	+ {
	4388	+ int count = 0;
	4389	+
	4390	+ for (int i = copy.versionlist.length; --i >= 0;)
	4391	+ {
	4392	+ if (copy.versionlist[i] != null)
	4393	+ count++;
	4394	+ }
	4395	+
	4396	+ return count;
	4397	+ }
	4398	+
	4399	+ void SetVersionStates()
	4400	+ {
	4401	+ //if (true)
	4402	+ // return;
	4403	+
	4404	+ //cRadio tab = GetCurrentTab();
	4405	+
	4406	+ restoreButton.setEnabled(copy.versionindex != -1);
	4407	+ replaceButton.setEnabled(copy.versionindex != -1);
	4408	+
	4409	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4410	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4411	+
	4412	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4413	+ copy.versionlist[copy.versionindex + 1] != null);
	4414	+
	4415	+ muteSlider = true;
	4416	+ versionSlider.setMinimum(0);
	4417	+ versionSlider.setMaximum(VersionCount() - 1);
	4418	+ versionSlider.setInteger(copy.versionindex);
	4419	+ versionSlider.setEnabled(copy.versionindex != -1);
	4420	+ muteSlider = false;
	4421	+ }
	4422	+
	4423	+ public boolean PreviousVersion()
	4424	+ {
	4425	+ // Option?
	4426	+ Replace();
	4427	+
	4428	+ System.err.println("Undo");
	4429	+
	4430	+ //cRadio tab = GetCurrentTab();
	4431	+
	4432	+ if (copy.versionindex == 0)
	4433	+ {
	4434	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4435	+ return false;
	4436	+ }
	4437	+
	4438	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4439	+// {
	4440	+// if (Save(false))
	4441	+// tab.versionindex -= 1;
	4442	+// else
	4443	+// {
	4444	+// if (tab.versionindex <= 0)
	4445	+// return false;
	4446	+// else
	4447	+// tab.versionindex -= 1;
	4448	+// }
	4449	+// }
	4450	+
	4451	+ copy.versionindex -= 1;
	4452	+
	4453	+ CopyChanged();
	4454	+
	4455	+ return true;
	4456	+ }
	4457	+
	4458	+ public boolean Restore()
	4459	+ {
	4460	+ System.err.println("Restore");
	4461	+
	4462	+ //cRadio tab = GetCurrentTab();
	4463	+
	4464	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4465	+ {
	4466	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4467	+ return false;
	4468	+ }
	4469	+
	4470	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4471	+ CopyChanged();
	4472	+
	4473	+ return true;
	4474	+ }
	4475	+
	4476	+ public boolean Replace()
	4477	+ {
	4478	+ System.err.println("Replace");
	4479	+
	4480	+ //cRadio tab = GetCurrentTab();
	4481	+
	4482	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4483	+ {
	4484	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4485	+ return false;
	4486	+ }
	4487	+
	4488	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4489	+
	4490	+ return true;
	4491	+ }
	4492	+
	4493	+ public void NextVersion()
	4494	+ {
	4495	+ // Option?
	4496	+ Replace();
	4497	+
	4498	+ //cRadio tab = GetCurrentTab();
	4499	+
	4500	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4501	+ {
	4502	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4503	+ return;
	4504	+ }
	4505	+
	4506	+ copy.versionindex += 1;
	4507	+
	4508	+ CopyChanged();
	4509	+
	4510	+ //if (!tab.user[tab.versionindex])
	4511	+ // tab.graphs[tab.versionindex] = null;
	4512	+ }
	4513	+
	4514	+ void ImportGFD()
	4515	+ {
	4516	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4517	+ browser.show();
	4518	+ String filename = browser.getFile();
	4519	+ if (filename != null && filename.length() > 0)
	4520	+ {
	4521	+ String fullname = browser.getDirectory() + filename;
	4522	+
	4523	+ //Object3D readobj =
	4524	+ objEditor.ReadGFD(fullname, objEditor);
	4525	+ //makeSomething(readobj);
	4526	+ }
	4527	+ }
	4528	+
	4529	+ void ImportVRMLX3D()
	4530	+ {
	4531	+ if (Grafreed.standAlone)
	4532	+ {
	4533	+ /**/
	4534	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4535	+ browser.show();
	4536	+ String filename = browser.getFile();
	4537	+ if (filename != null && filename.length() > 0)
	4538	+ {
	4539	+ String fullname = browser.getDirectory() + filename;
	4540	+ LoadVRMLX3D(fullname);
	4541	+ }
	4542	+ /**/
	4543	+ }
	4544	+ }
	4545	+
3177	4546	void ToggleAnimation()
3178	4547	{
3179	4548	if (!Globals.ANIMATION)
3180	4549	{
3181	4550	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3182		- browser.show();
	4551	+ browser.setVisible(true);
3183	4552	String filename = browser.getFile();
3184	4553	if (filename != null && filename.length() > 0)
3185	4554	{
..	..	@@ -3189,8 +4558,8 @@
3189	4558
3190	4559	Globals.ANIMATION ^= true;
3191	4560
3192		- GrafreeD.wav.cursor = 0;
3193		- GrafreeD.wav.loop = 0;
	4561	+ Grafreed.wav.cursor = 0;
	4562	+ Grafreed.wav.loop = 0;
3194	4563	}
3195	4564	} else
3196	4565	{
..	..	@@ -3240,7 +4609,7 @@
3240	4609	void CreateMaterial()
3241	4610	{
3242	4611	//copy.ClearMaterial(); // PATCH
3243		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4612	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3244	4613	if (copy.selection.size() > 0)
3245	4614	//SetMaterial(copy);
3246	4615	{
..	..	@@ -3291,7 +4660,7 @@
3291	4660	assert false;
3292	4661	}
3293	4662
3294		- void EditSelection()
	4663	+ void EditSelection(boolean newWindow)
3295	4664	{
3296	4665	}
3297	4666
..	..	@@ -3299,11 +4668,11 @@
3299	4668	{
3300	4669	copy.ResetBlockLoop(); // temporary problem
3301	4670
3302		- boolean random = CameraPane.RANDOM;
3303		- CameraPane.RANDOM = false; // parse everything
	4671	+ boolean random = CameraPane.SWITCH;
	4672	+ CameraPane.SWITCH = false; // parse everything
3304	4673	copy.ResetDisplayList();
3305	4674	copy.HardTouch();
3306		- CameraPane.RANDOM = random;
	4675	+ CameraPane.SWITCH = random;
3307	4676	}
3308	4677
3309	4678	// public void applySelf()
..	..	@@ -3350,7 +4719,7 @@
3350	4719	//copy.material = new cMaterial(copy.GetMaterial());
3351	4720
3352	4721	current.color = (float) colorField.getFloat();
3353		- current.modulation = (float) modulationField.getFloat();
	4722	+ current.modulation = (float) saturationField.getFloat();
3354	4723	current.metalness = (float) metalnessField.getFloat();
3355	4724	current.diffuse = (float) diffuseField.getFloat();
3356	4725	current.specular = (float) specularField.getFloat();
..	..	@@ -3377,6 +4746,36 @@
3377	4746	{
3378	4747	//System.out.println("Propagate = " + propagate);
3379	4748	copy.UpdateMaterial(anchor, current, propagate);
	4749	+
	4750	+ if (copy.material != null)
	4751	+ {
	4752	+ cMaterial mat = copy.material;
	4753	+
	4754	+ colorField.SetToolTipValue((mat.color));
	4755	+ saturationField.SetToolTipValue((mat.modulation));
	4756	+ metalnessField.SetToolTipValue((mat.metalness));
	4757	+ diffuseField.SetToolTipValue((mat.diffuse));
	4758	+ specularField.SetToolTipValue((mat.specular));
	4759	+ shininessField.SetToolTipValue((mat.shininess));
	4760	+ shiftField.SetToolTipValue((mat.shift));
	4761	+ ambientField.SetToolTipValue((mat.ambient));
	4762	+ lightareaField.SetToolTipValue((mat.lightarea));
	4763	+ diffusenessField.SetToolTipValue((mat.factor));
	4764	+ velvetField.SetToolTipValue((mat.velvet));
	4765	+ sheenField.SetToolTipValue((mat.sheen));
	4766	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4767	+ backlitField.SetToolTipValue((mat.bump));
	4768	+ anisoField.SetToolTipValue((mat.aniso));
	4769	+ anisoVField.SetToolTipValue((mat.anisoV));
	4770	+ cameraField.SetToolTipValue((mat.cameralight));
	4771	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4772	+ shadowField.SetToolTipValue((mat.shadow));
	4773	+ textureField.SetToolTipValue((mat.texture));
	4774	+ opacityField.SetToolTipValue((mat.opacity));
	4775	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4776	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4777	+ }
	4778	+
3380	4779	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3381	4780	{
3382	4781	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3405,9 +4804,28 @@
3405	4804	//copy.Touch();
3406	4805	}
3407	4806
	4807	+ cNumberSlider versionSlider;
	4808	+
3408	4809	public void stateChanged(ChangeEvent e)
3409	4810	{
3410	4811	// assert(false);
	4812	+ if (e.getSource() == versionSlider)
	4813	+ {
	4814	+ if (muteSlider)
	4815	+ return;
	4816	+
	4817	+ Replace();
	4818	+
	4819	+ int version = versionSlider.getInteger();
	4820	+
	4821	+ if (version != -1 && copy.versionlist[version] != null)
	4822	+ {
	4823	+ copy.versionindex = version;
	4824	+ CopyChanged();
	4825	+ }
	4826	+
	4827	+ return;
	4828	+ }
3411	4829
3412	4830	if (freezematerial)
3413	4831	{
..	..	@@ -3421,6 +4839,7 @@
3421	4839	\|\| e.getSource() == apertureField
3422	4840	\|\| e.getSource() == shadowblurField)
3423	4841	{
	4842	+ new Exception().printStackTrace();
3424	4843	System.exit(0);
3425	4844	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3426	4845	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3442,6 +4861,12 @@
3442	4861	{
3443	4862	//System.out.println("stateChanged = " + this);
3444	4863	materialtouched = true;
	4864	+
	4865	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4866	+ {
	4867	+ saturationField.setFloat(1);
	4868	+ }
	4869	+
3445	4870	applySelf();
3446	4871	//System.out.println("this = " + this);
3447	4872	//System.out.println("PARENT = " + parent);
..	..	@@ -3491,7 +4916,7 @@
3491	4916	}
3492	4917
3493	4918	if (normalpushField != null)
3494		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4919	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3495	4920	}
3496	4921
3497	4922	void SnapObject()
..	..	@@ -3741,6 +5166,7 @@
3741	5166	{
3742	5167	if (GetTree() != null)
3743	5168	{
	5169	+ GetTree().revalidate();
3744	5170	GetTree().repaint();
3745	5171	}
3746	5172
..	..	@@ -3749,12 +5175,17 @@
3749	5175	ctrlPanel.validate(); // ? new
3750	5176	ctrlPanel.repaint();
3751	5177	}
	5178	+
	5179	+ if (previousVersionButton != null && copy.versionlist != null)
	5180	+ SetVersionStates();
3752	5181	}
3753	5182
3754	5183	static TweenManager tweenManager = new TweenManager();
3755	5184
3756	5185	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3757	5186	{
	5187	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5188	+ Save();
3758	5189	//Tween.set(thing, 0).target(1).start(tweenManager);
3759	5190	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3760	5191	// if (thing instanceof GenericJointDemo)
..	..	@@ -3841,6 +5272,12 @@
3841	5272	{
3842	5273	ResetModel();
3843	5274	Select(thing.GetTreePath(), true, false); // unselect... false);
	5275	+
	5276	+ if (thing.Size() == 0)
	5277	+ {
	5278	+ //EditSelection(false);
	5279	+ }
	5280	+
3844	5281	refreshContents();
3845	5282	}
3846	5283
..	..	@@ -3958,6 +5395,7 @@
3958	5395	}
3959	5396	}
3960	5397	}
	5398	+
3961	5399	LoadGFDThread loadGFDThread;
3962	5400
3963	5401	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3977,8 +5415,10 @@
3977	5415
3978	5416	try
3979	5417	{
	5418	+ // Try compressed version first.
3980	5419	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3981		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5420	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5421	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3982	5422
3983	5423	readobj = (Object3D) p.readObject();
3984	5424	istream.close();
..	..	@@ -3986,7 +5426,22 @@
3986	5426	readobj.ResetDisplayList();
3987	5427	} catch (Exception e)
3988	5428	{
3989		- e.printStackTrace();
	5429	+ if (!e.toString().contains("GZIP"))
	5430	+ e.printStackTrace();
	5431	+
	5432	+ try
	5433	+ {
	5434	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5435	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5436	+
	5437	+ readobj = (Object3D) p.readObject();
	5438	+ istream.close();
	5439	+
	5440	+ readobj.ResetDisplayList();
	5441	+ } catch (Exception e2)
	5442	+ {
	5443	+ e2.printStackTrace();
	5444	+ }
3990	5445	}
3991	5446	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3992	5447	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4032,6 +5487,12 @@
4032	5487
4033	5488	void LoadIt(Object obj)
4034	5489	{
	5490	+ if (obj == null)
	5491	+ {
	5492	+ // Invalid file
	5493	+ return;
	5494	+ }
	5495	+
4035	5496	System.out.println("Loaded " + obj);
4036	5497	//new Exception().printStackTrace();
4037	5498	Object3D readobj = (Object3D) obj;
..	..	@@ -4041,10 +5502,14 @@
4041	5502
4042	5503	if (readobj != null)
4043	5504	{
	5505	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5506	+ // Save();
4044	5507	try
4045	5508	{
4046	5509	//readobj.deepCopySelf(copy);
4047	5510	copy.clear(); // june 2014
	5511	+ copy.skyboxname = readobj.skyboxname;
	5512	+ copy.skyboxext = readobj.skyboxext;
4048	5513	for (int i = 0; i < readobj.size(); i++)
4049	5514	{
4050	5515	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4085,6 +5550,7 @@
4085	5550	}
4086	5551	} catch (ClassCastException e)
4087	5552	{
	5553	+ e.printStackTrace();
4088	5554	assert (false);
4089	5555	Composite c = (Composite) copy;
4090	5556	c.children.clear();
..	..	@@ -4095,17 +5561,31 @@
4095	5561	c.addChild(csg);
4096	5562	}
4097	5563
	5564	+ copy.versionlist = readobj.versionlist;
	5565	+ copy.versionindex = readobj.versionindex;
	5566	+
	5567	+ if (copy.versionlist == null)
	5568	+ {
	5569	+ // Backward compatibility
	5570	+ copy.versionlist = new Object3D[100];
	5571	+ copy.versionindex = -1;
	5572	+
	5573	+ //Save(true);
	5574	+ }
	5575	+
	5576	+ //? SetUndoStates();
	5577	+
4098	5578	ResetModel();
4099	5579	copy.HardTouch(); // recompile?
4100	5580	refreshContents();
4101	5581	}
4102	5582	}
4103	5583
4104		- void load() // throws ClassNotFoundException
	5584	+ void Open() // throws ClassNotFoundException
4105	5585	{
4106		- if (GrafreeD.standAlone)
	5586	+ if (Grafreed.standAlone)
4107	5587	{
4108		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5588	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4109	5589	browser.show();
4110	5590	String filename = browser.getFile();
4111	5591	if (filename != null && filename.length() > 0)
..	..	@@ -4182,6 +5662,8 @@
4182	5662
4183	5663	void save()
4184	5664	{
	5665	+ Replace();
	5666	+
4185	5667	if (lastname == null)
4186	5668	{
4187	5669	return;
..	..	@@ -4190,11 +5672,13 @@
4190	5672	try
4191	5673	{
4192	5674	FileOutputStream ostream = new FileOutputStream(lastname);
4193		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5675	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5676	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4194	5677
4195	5678	p.writeObject(copy);
4196	5679	p.flush();
4197	5680
	5681	+ zstream.close();
4198	5682	ostream.close();
4199	5683
4200	5684	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4202,19 +5686,23 @@
4202	5686	//ps.print(buffer.toString());
4203	5687	} catch (IOException e)
4204	5688	{
	5689	+ e.printStackTrace();
4205	5690	}
4206	5691	}
	5692	+
4207	5693	String lastname;
4208	5694
4209	5695	void saveAs()
4210	5696	{
4211		- if (GrafreeD.standAlone)
	5697	+ if (Grafreed.standAlone)
4212	5698	{
4213	5699	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4214	5700	browser.setVisible(true);
4215	5701	String filename = browser.getFile();
4216	5702	if (filename != null && filename.length() > 0)
4217	5703	{
	5704	+ if (!filename.endsWith(".gfd"))
	5705	+ filename += ".gfd";
4218	5706	lastname = browser.getDirectory() + filename;
4219	5707	save();
4220	5708	}
..	..	@@ -4313,13 +5801,13 @@
4313	5801	try
4314	5802	{
4315	5803	FileOutputStream ostream = new FileOutputStream(filename);
4316		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4317		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5804	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5805	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4318	5806
4319	5807	Object3D objectparent = obj.parent;
4320	5808	obj.parent = null;
4321	5809
4322		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5810	+ Object3D object = (Object3D) Grafreed.clone(obj);
4323	5811
4324	5812	obj.parent = objectparent;
4325	5813
..	..	@@ -4331,8 +5819,8 @@
4331	5819	p.writeObject(object);
4332	5820	p.flush();
4333	5821
	5822	+ zstream.close();
4334	5823	ostream.close();
4335		- // zstream.close();
4336	5824
4337	5825	// group.selection.get(0).parent = parent;
4338	5826	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4353,7 +5841,7 @@
4353	5841	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4354	5842	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4355	5843	copy.generatePOV(buffer);
4356		- if (GrafreeD.standAlone)
	5844	+ if (Grafreed.standAlone)
4357	5845	{
4358	5846	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4359	5847	browser.show();
..	..	@@ -4379,21 +5867,20 @@
4379	5867	Object3D client;
4380	5868	Object3D copy;
4381	5869	MenuBar menuBar;
4382		- Menu windowMenu;
4383		- MenuItem loadItem;
	5870	+ Menu fileMenu;
	5871	+ MenuItem newItem;
	5872	+ MenuItem openItem;
4384	5873	MenuItem saveItem;
4385	5874	MenuItem saveAsItem;
4386	5875	MenuItem exportAsItem;
4387	5876	MenuItem reexportItem;
4388	5877	MenuItem povItem;
4389	5878	MenuItem closeItem;
4390		- Menu cameraMenu;
	5879	+
4391	5880	CheckboxMenuItem zBufferItem;
4392	5881	//MenuItem normalLensItem;
4393		- MenuItem editCameraItem;
4394		- MenuItem revertCameraItem;
4395		- CheckboxMenuItem toggleLiveItem;
4396	5882	MenuItem stepItem;
	5883	+ CheckboxMenuItem toggleLiveItem;
4397	5884	CheckboxMenuItem toggleFullScreenItem;
4398	5885	CheckboxMenuItem toggleTimelineItem;
4399	5886	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4402,25 +5889,40 @@
4402	5889	CheckboxMenuItem toggleFootContactItem;
4403	5890	CheckboxMenuItem toggleDLItem;
4404	5891	CheckboxMenuItem toggleTextureItem;
4405		- CheckboxMenuItem toggleRandomItem;
	5892	+ CheckboxMenuItem toggleSwitchItem;
4406	5893	CheckboxMenuItem toggleRootItem;
4407	5894	CheckboxMenuItem animationItem;
	5895	+ MenuItem archiveItem;
4408	5896	CheckboxMenuItem toggleHandleItem;
4409	5897	CheckboxMenuItem togglePaintItem;
4410	5898	JSplitPane mainPanel;
4411	5899	JScrollPane scrollpane;
	5900	+
4412	5901	JPanel toolbarPanel;
4413		- JPanel treePanel;
	5902	+
	5903	+ cGridBag treePanel;
	5904	+
4414	5905	JPanel radioPanel;
4415	5906	ButtonGroup buttonGroup;
4416		- cGridBag ctrlPanel;
	5907	+
	5908	+ cGridBag toolboxPanel;
	5909	+ cGridBag skyboxPanel;
4417	5910	cGridBag materialPanel;
	5911	+ cGridBag ctrlPanel;
	5912	+
4418	5913	JScrollPane infoPanel;
	5914	+
4419	5915	cGridBag optionsPanel;
	5916	+
4420	5917	JTabbedPane objectPanel;
	5918	+ boolean materialFlushed;
	5919	+ Object3D latestObject;
	5920	+
4421	5921	cGridBag XYZPanel;
	5922	+
4422	5923	JSplitPane gridPanel;
4423	5924	JSplitPane bigPanel;
	5925	+
4424	5926	cGridBag bigThree;
4425	5927	cGridBag scenePanel;
4426	5928	cGridBag centralPanel;
..	..	@@ -4478,7 +5980,7 @@
4478	5980	JLabel colorLabel;
4479	5981	cNumberSlider colorField;
4480	5982	JLabel modulationLabel;
4481		- cNumberSlider modulationField;
	5983	+ cNumberSlider saturationField;
4482	5984	JLabel metalnessLabel;
4483	5985	cNumberSlider metalnessField;
4484	5986	JLabel diffuseLabel;
..	..	@@ -4509,6 +6011,7 @@
4509	6011	cNumberSlider anisoField;
4510	6012	JLabel anisoVLabel;
4511	6013	cNumberSlider anisoVField;
	6014	+
4512	6015	JLabel cameraLabel;
4513	6016	cNumberSlider cameraField;
4514	6017	JLabel selfshadowLabel;
..	..	@@ -4523,6 +6026,7 @@
4523	6026	cNumberSlider fakedepthField;
4524	6027	JLabel shadowbiasLabel;
4525	6028	cNumberSlider shadowbiasField;
	6029	+
4526	6030	JLabel bumpLabel;
4527	6031	cNumberSlider bumpField;
4528	6032	JLabel noiseLabel;
..	..	@@ -4535,8 +6039,13 @@
4535	6039	cNumberSlider fogField;
4536	6040	JLabel opacityPowerLabel;
4537	6041	cNumberSlider opacityPowerField;
4538		- JTree jTree;
	6042	+ cTree jTree;
4539	6043	//ObjectUI parent;
4540	6044
4541	6045	cNumberSlider normalpushField;
	6046	+
	6047	+ private MenuItem importGFDItem;
	6048	+ private MenuItem importVRMLX3DItem;
	6049	+ private MenuItem import3DSItem;
	6050	+ private MenuItem importOBJItem;
4542	6051	}