~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,13 +381,15 @@
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
242	388	//parent = p;
243	389
244	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
245		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
246	393	//gd.setFullScreenWindow(this);
247	394	//setResizable(false);
248	395	//if (!isDisplayable())
..	..	@@ -253,6 +400,14 @@
253	400	copy = localCopy;
254	401	copy.editWindow = this;
255	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
256	411	SetupMenu();
257	412
258	413	//SetupName(objEditor); // new
..	..	@@ -266,28 +421,49 @@
266	421	return frame.action(event, obj);
267	422	}
268	423
	424	+ // Cannot work without static
	425	+ static boolean allparams = true;
	426	+
	427	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	428	+
269	429	void SetupMenu()
270	430	{
271	431	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..."));
	432	+ menuBar.add(fileMenu = new Menu("File"));
	433	+ fileMenu.add(newItem = new MenuItem("New"));
	434	+ fileMenu.add(openItem = new MenuItem("Open..."));
	435	+
	436	+ //oe.menuBar.add(menu = new Menu("Include"));
	437	+ Menu menu = new Menu("Import");
	438	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	439	+ importOBJItem.addActionListener(this);
	440	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	441	+ import3DSItem.addActionListener(this);
	442	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	443	+ importVRMLX3DItem.addActionListener(this);
	444	+ menu.add("-");
	445	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	446	+ importGFDItem.addActionListener(this);
	447	+ fileMenu.add(menu);
	448	+ fileMenu.add("-");
	449	+
	450	+ fileMenu.add(saveItem = new MenuItem("Save"));
	451	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	452	//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("-");
	453	+ fileMenu.add("-");
	454	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	455	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	456	+ fileMenu.add("-");
282	457	if (client.parent != null)
283	458	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	459	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	460	} else
286	461	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	462	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	463	}
289	464
290		- loadItem.addActionListener(this);
	465	+ newItem.addActionListener(this);
	466	+ openItem.addActionListener(this);
291	467	saveItem.addActionListener(this);
292	468	saveAsItem.addActionListener(this);
293	469	exportAsItem.addActionListener(this);
..	..	@@ -295,82 +471,103 @@
295	471	//povItem.addActionListener(this);
296	472	closeItem.addActionListener(this);
297	473
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	474	objectPanel = new JTabbedPane();
	475	+
	476	+ ChangeListener changeListener = new ChangeListener()
	477	+ {
	478	+ //String name;
	479	+
	480	+ public void stateChanged(ChangeEvent changeEvent)
	481	+ {
	482	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	483	+// {
	484	+// if (latestObject != null)
	485	+// {
	486	+// refreshContents(true);
	487	+// SetMaterial(latestObject);
	488	+// }
	489	+//
	490	+// materialFlushed = true;
	491	+// }
	492	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	493	+// {
	494	+// if (listUI.size() == 0)
	495	+// EditSelection(false);
	496	+// }
	497	+
	498	+// if (objectPanel.getSelectedIndex() == 4)
	499	+// {
	500	+// name = copy.skyboxname;
	501	+//
	502	+// if (name == null)
	503	+// {
	504	+// name = "";
	505	+// }
	506	+//
	507	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	508	+// copy.skyboxext = "jpg";
	509	+// }
	510	+// else
	511	+// {
	512	+// if (name != null)
	513	+// {
	514	+// if (name.equals(""))
	515	+// {
	516	+// copy.skyboxname = null;
	517	+// copy.skyboxext = null;
	518	+// }
	519	+// else
	520	+// {
	521	+// copy.skyboxname = name;
	522	+// }
	523	+// }
	524	+// }
	525	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	526	+
	527	+// refreshContents(false); // To refresh Info tab
	528	+ cameraView.repaint();
	529	+ }
	530	+ };
	531	+ objectPanel.addChangeListener(changeListener);
	532	+
354	533	toolbarPanel = new JPanel();
355	534	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	535	+
	536	+ treePanel = new cGridBag();
357	537	treePanel.setName("Tree");
358		- ctrlPanel = new cGridBag(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
360		- materialPanel = new cGridBag().setVertical(true);
361		- materialPanel.setName("Material");
	538	+
	539	+ editPanel = new cGridBag().setVertical(true);
	540	+ //editPanel.setName("Edit");
	541	+
	542	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	543	+
	544	+ editCommandsPanel = new cGridBag();
	545	+ editPanel.add(editCommandsPanel);
	546	+ editPanel.add(ctrlPanel);
	547	+
	548	+ toolboxPanel = new cGridBag().setVertical(true);
	549	+ //toolboxPanel.setName("Toolbox");
	550	+
	551	+ skyboxPanel = new cGridBag().setVertical(true);
	552	+
	553	+ materialPanel = new cGridBag().setVertical(false);
	554	+ //materialPanel.setName("Material");
	555	+
362	556	/JTextPane/
363	557	infoarea = createTextPane();
	558	+ doc = infoarea.getStyledDocument();
	559	+
364	560	infoarea.setEditable(true);
365	561	SetText();
	562	+
366	563	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	564	// infoarea.setOpaque(false);
368	565	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	566	+// TEXTAREA infoarea.setLineWrap(true);
	567	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	568	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");
	569	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	570	+ //infoPanel.setName("Info");
374	571	//infoPanel.setLayout(new BorderLayout());
375	572	//infoPanel.add(createTextPane());
376	573
..	..	@@ -378,15 +575,22 @@
378	575	mainPanel.setName("Main");
379	576	mainPanel.setContinuousLayout(true);
380	577	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	578	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	579	+ mainPanel.setDividerLocation(0.5); //1.0);
	580	+ mainPanel.setResizeWeight(0.5);
	581	+
	582	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	583	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	584	+ divider.setDividerSize(15);
	585	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	586	+
	587	+ mainPanel.setUI(new BasicSplitPaneUI());
	588	+
385	589	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	590	//mainPanel.setLayout(new GridBagLayout());
387	591	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
	592	+// treePanel.setLayout(new GridBagLayout());
	593	+ //ctrlPanel.setLayout(new GridBagLayout());
390	594	//materialPanel.setLayout(new GridBagLayout());
391	595
392	596	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
..	..	@@ -426,7 +630,7 @@
426	630	static String newline = "\n";
427	631	protected static final String buttonString = "JButton";
428	632	StyledDocument doc;
429		- JTextArea infoarea;
	633	+ JTextPane infoarea;
430	634
431	635	void ClearInfo()
432	636	{
..	..	@@ -449,10 +653,10 @@
449	653	e.printStackTrace();
450	654	}
451	655
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();
	656	+// String selection = infoarea.getText();
	657	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	658	+// java.awt.datatransfer.Clipboard clipboard =
	659	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	660	//clipboard.setContents(data, data);
457	661	}
458	662
..	..	@@ -475,13 +679,13 @@
475	679	//SendInfo("Name:", "bold");
476	680	if (sel.GetTextures() != null \|\| debug)
477	681	{
478		- si.SendInfo(sel.toString(), "bold");
	682	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	683	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	684	if (sel.Size() > 0)
481	685	{
482	686	si.SendInfo("#children = " + sel.Size(), "regular");
483	687	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	688	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	689	if (debug)
486	690	{
487	691	try
..	..	@@ -493,7 +697,10 @@
493	697	}
494	698
495	699	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	700	+ {
	701	+ si.SendInfo(" BBox min: " + minima, "regular");
	702	+ si.SendInfo(" BBox max: " + maxima, "regular");
	703	+ }
497	704
498	705	if (sel.bRep != null)
499	706	{
..	..	@@ -520,7 +727,7 @@
520	727	}
521	728	if (sel.support != null)
522	729	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	730	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	731	}
525	732	if (sel.scriptnode != null)
526	733	{
..	..	@@ -591,6 +798,9 @@
591	798	{
592	799	CameraPane.pointflow = (PointFlow) sel;
593	800	}
	801	+
	802	+ si.SendInfo("_____________________", "regular");
	803	+ si.SendInfo("", "regular");
594	804	}
595	805	}
596	806
..	..	@@ -606,68 +816,205 @@
606	816	}
607	817	}
608	818
	819	+//static GraphicsDevice device = GraphicsEnvironment
	820	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	821	+
	822	+ Rectangle keeprect;
	823	+ cRadio radio;
	824	+
	825	+cButton keepButton;
	826	+ cButton twoButton; // Full 3D
	827	+ cButton sixButton;
	828	+ cButton threeButton;
	829	+ cButton sevenButton;
	830	+ cButton fourButton; // full panel
	831	+ cButton oneButton; // full XYZ
	832	+ //cButton currentLayout;
	833	+
	834	+ boolean maximized;
	835	+
	836	+ cButton fullscreenLayout;
	837	+ cButton expandedLayout;
	838	+
	839	+ void Minimize()
	840	+ {
	841	+ frame.setState(Frame.ICONIFIED);
	842	+ frame.validate();
	843	+ }
	844	+
	845	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	846	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	847	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	848	+ void Maximize()
	849	+ {
	850	+ if (CameraPane.FULLSCREEN)
	851	+ {
	852	+ ToggleFullScreen();
	853	+ }
	854	+
	855	+ if (maximized)
	856	+ {
	857	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	858	+ }
	859	+ else
	860	+ {
	861	+ keeprect = frame.getBounds();
	862	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	863	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	864	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	865	+// frame.setState(Frame.MAXIMIZED_BOTH);
	866	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	867	+ }
	868	+
	869	+ maximized ^= true;
	870	+
	871	+ frame.validate();
	872	+ }
	873	+
	874	+ cButton minButton;
	875	+ cButton maxButton;
	876	+ cButton fullButton;
	877	+ cButton collapseButton;
	878	+ cButton maximize3DButton;
	879	+
609	880	void ToggleFullScreen()
610	881	{
611		- if (CameraPane.FULLSCREEN)
	882	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	883	+
	884	+ cameraView.ToggleFullScreen();
	885	+
	886	+ if (!CameraPane.FULLSCREEN)
612	887	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	888	+ device.setFullScreenWindow(null);
	889	+ frame.dispose();
	890	+ frame.setUndecorated(false);
	891	+ frame.validate();
	892	+ frame.setVisible(true);
	893	+
	894	+ //frame.setVisible(false);
	895	+// frame.removeNotify();
	896	+// frame.setUndecorated(false);
	897	+// frame.addNotify();
	898	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	899	+
	900	+// X frame.getContentPane().remove(/"Center",/bigThree);
	901	+// X framePanel.add(bigThree);
	902	+// X frame.getContentPane().add(/"Center",/framePanel);
	903	+// framePanel.setDividerLocation(46); // icons are 24x24
	904	+
	905	+ //frame.setVisible(true);
	906	+// radio.layout = keepButton;
	907	+ //theFrame = null;
	908	+ keepButton = null;
	909	+// radio.layout.doClick();
	910	+
616	911	} else
617	912	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	913	+ keepButton = radio.layout;
	914	+ //keeprect = frame.getBounds();
	915	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	916	+// frame.getToolkit().getScreenSize().height);
	917	+ //frame.setVisible(false);
	918	+
	919	+ frame.dispose();
	920	+ frame.setUndecorated(true);
	921	+ device.setFullScreenWindow(frame);
	922	+ frame.validate();
	923	+ frame.setVisible(true);
	924	+// frame.removeNotify();
	925	+// frame.setUndecorated(true);
	926	+// frame.addNotify();
	927	+// X frame.getContentPane().remove(/"Center",/framePanel);
	928	+// X framePanel.remove(bigThree);
	929	+// X frame.getContentPane().add(/"Center",/bigThree);
	930	+// framePanel.setDividerLocation(0);
	931	+
	932	+// radio.layout = fullscreenLayout;
	933	+// radio.layout.doClick();
	934	+ //frame.setVisible(true);
621	935	}
622		- cameraView.ToggleFullScreen();
	936	+ frame.validate();
	937	+
	938	+ cameraView.requestFocusInWindow();
623	939	}
624	940
625		- private JTextArea createTextPane()
	941	+ void CollapseToolbar()
	942	+ {
	943	+ framePanel.setDividerLocation(0);
	944	+ //frame.validate();
	945	+
	946	+ cameraView.requestFocusInWindow();
	947	+ }
	948	+
	949	+ private Object3D Duplicate(Object3D object)
626	950	{
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		- };
	951	+ boolean temp = CameraPane.SWITCH;
	952	+ CameraPane.SWITCH = false;
	953	+
	954	+ object.ExtractBigData(versiontable);
	955	+ // if (copy == client)
	956	+
	957	+ Object3D versions[] = object.versionlist;
	958	+ object.versionlist = null;
	959	+
	960	+ //byte[] compress = Compress(copy);
	961	+ Object3D compress = (Object3D)Grafreed.clone(object);
	962	+
	963	+ object.versionlist = versions;
	964	+
	965	+ object.RestoreBigData(versiontable);
	966	+
	967	+ CameraPane.SWITCH = temp;
	968	+
	969	+ return compress;
	970	+ }
642	971
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
	972	+ private JTextPane createTextPane()
	973	+ {
	974	+// TEXTAREA String[] initString =
	975	+// {
	976	+// "This is an editable JTextPane, ", //regular
	977	+// "another ", //italic
	978	+// "styled ", //bold
	979	+// "text ", //small
	980	+// "component, ", //large
	981	+// "which supports embedded components..." + newline,//regular
	982	+// " " + newline, //button
	983	+// "...and embedded icons..." + newline, //regular
	984	+// " ", //icon
	985	+// newline + "JTextPane is a subclass of JEditorPane that "
	986	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	987	+// + "cover methods for interacting with those objects."
	988	+// };
	989	+//
	990	+// String[] initStyles =
	991	+// {
	992	+// "regular", "italic", "bold", "small", "large",
	993	+// "regular", "button", "regular", "icon",
	994	+// "regular"
	995	+// };
	996	+//
	997	+// JTextPane textPane = new JTextPane();
	998	+// textPane.setEditable(true);
	999	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1000	+// addStylesToDocument(doc);
	1001	+//
	1002	+// try
	1003	+// {
	1004	+// for (int j = 0; j < 2; j++)
	1005	+// {
	1006	+// for (int i = 0; i < initString.length; i++)
	1007	+// {
	1008	+// doc.insertString(doc.getLength(), initString[i],
	1009	+// doc.getStyle(initStyles[i]));
	1010	+// }
	1011	+// }
	1012	+// } catch (BadLocationException ble)
	1013	+// {
	1014	+// System.err.println("Couldn't insert initial text into text pane.");
	1015	+// }
649	1016
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;
	1017	+ return new JTextPane(); // textPane;
671	1018	}
672	1019
673	1020	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +1067,7 @@
720	1067	protected static ImageIcon createImageIcon(String path,
721	1068	String description)
722	1069	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1070	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	1071	if (imgURL != null)
725	1072	{
726	1073	return new ImageIcon(imgURL, description);
..	..	@@ -743,6 +1090,7 @@
743	1090	{
744	1091	SetupMaterial(materialPanel);
745	1092	}
	1093	+
746	1094	//SetupName();
747	1095	//SetupViews();
748	1096	}
..	..	@@ -752,6 +1100,7 @@
752	1100	// NumberSlider vDivsField;
753	1101	// JCheckBox endcaps;
754	1102	JCheckBox liveCB;
	1103	+ JCheckBox selectableCB;
755	1104	JCheckBox hideCB;
756	1105	JCheckBox link2masterCB;
757	1106	JCheckBox markCB;
..	..	@@ -759,7 +1108,12 @@
759	1108	JCheckBox speedupCB;
760	1109	JCheckBox rewindCB;
761	1110	JCheckBox flipVCB;
	1111	+
	1112	+ cCheckBox toggleTextureCB;
	1113	+ cCheckBox toggleSwitchCB;
	1114	+
762	1115	JComboBox texresMenu;
	1116	+
763	1117	JButton resetButton;
764	1118	JButton stepButton;
765	1119	JButton stepAllButton;
..	..	@@ -767,54 +1121,48 @@
767	1121	JButton slowerButton;
768	1122	JButton fasterButton;
769	1123	JButton remarkButton;
	1124	+
	1125	+ cGridBag editPanel;
	1126	+ cGridBag editCommandsPanel;
	1127	+
	1128	+ cGridBag namePanel;
	1129	+ cGridBag setupPanel;
	1130	+ cGridBag setupPanel2;
	1131	+ cGridBag objectCommandsPanel;
	1132	+ cGridBag pushPanel;
	1133	+ cGridBag fillPanel;
770	1134
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1135	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	1136	{
773	1137	JCheckBox cb;
774	1138
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);
	1139	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	1140	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	1141
785	1142	return cb;
786	1143	}
787	1144
788		- cButton AddButton(ObjEditor oe, String label)
	1145	+ cButton AddButton(cGridBag panel, String label)
789	1146	{
790	1147	cButton cb;
791	1148
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);
	1149	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	1150	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	1151
802	1152	return cb;
803	1153	}
804	1154
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1155	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1156	{
807	1157	JComboBox combo;
808	1158
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;
	1159	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1160	combo.addActionListener(this);
813	1161
814	1162	return combo;
815	1163	}
816	1164
817		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
	1165	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1166	{
819	1167	cGridBag control = new cGridBag();
820	1168
..	..	@@ -826,12 +1174,12 @@
826	1174	control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827	1175	combo.setFloat(current);
828	1176
829		- ctrlPanel.add(control);
	1177	+ panel.add(control);
830	1178
831		- return combo;
	1179	+ return control;
832	1180	}
833	1181
834		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
	1182	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835	1183	{
836	1184	cGridBag control = new cGridBag();
837	1185
..	..	@@ -839,25 +1187,21 @@
839	1187
840	1188	JLabel jlabel = new JLabel(label);
841	1189	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);
	1190	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1191	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844	1192	combo.setInteger(current);
845	1193
846		- ctrlPanel.add(control);
	1194	+ panel.add(control);
847	1195
848		- return combo;
	1196	+ return control;
849	1197	}
850	1198
851	1199	JTextArea AddText(cGridBag ctrlPanel, String name)
852	1200	{
853	1201	JTextArea text;
854	1202
855		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857	1203	ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1204	text.addCaretListener(this);
859		- aConstraints.gridx += 1;
860		- aConstraints.gridwidth = 1;
861	1205
862	1206	return text;
863	1207	}
..	..	@@ -896,7 +1240,7 @@
896	1240
897	1241	/*
898	1242	*/
899		- void Return() // ObjEditor oe)
	1243	+ void Return0() // ObjEditor oe)
900	1244	{
901	1245	aConstraints.gridy += 1;
902	1246	aConstraints.gridx = 0;
..	..	@@ -951,37 +1295,92 @@
951	1295
952	1296	void SetupUI2(ObjEditor oe)
953	1297	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958		- SetupName(oe);
	1298	+ //SetupName(oe);
959	1299
960		- if (!GroupEditor.allparams)
	1300	+ namePanel = new cGridBag();
	1301	+
	1302	+ //if (copy.pinned)
	1303	+ {
	1304	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1305	+ pinButton.setSelected(copy.pinned);
	1306	+ cGridBag t = new cGridBag();
	1307	+ t.preferredWidth = 2;
	1308	+ t.add(pinButton);
	1309	+ namePanel.add(t);
	1310	+
	1311	+ pinButton.addItemListener(this);
	1312	+ }
	1313	+
	1314	+ nameField = AddText(namePanel, copy.GetName());
	1315	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1316	+ oe.ctrlPanel.add(namePanel);
	1317	+
	1318	+ oe.ctrlPanel.Return();
	1319	+
	1320	+ if (!allparams)
961	1321	return;
962	1322
963		- liveCB = AddCheckBox(oe, "Live", copy.live);
964		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1323	+ setupPanel = new cGridBag().setVertical(false);
	1324	+
	1325	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1326	+ liveCB.setToolTipText("Animate object");
	1327	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1328	+ markCB.setToolTipText("Set target transform");
	1329	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1330	+ selectableCB.setToolTipText("Make object selectable");
966	1331	// 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");
	1332	+
	1333	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1334	+ hideCB.setToolTipText("Hide object");
	1335	+
	1336	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1337	+
	1338	+ setupPanel2 = new cGridBag().setVertical(false);
	1339	+
	1340	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1341	+ rewindCB.setToolTipText("Rewind animation");
	1342	+
	1343	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1344	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1345	+
	1346	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1347	+ link2masterCB.setToolTipText("Attach to support");
	1348	+
	1349	+ if (Globals.ADVANCED)
	1350	+ {
	1351	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1352	+ speedupCB.setToolTipText("Option motion capture");
	1353	+ }
	1354	+
	1355	+ oe.ctrlPanel.add(setupPanel);
	1356	+ oe.ctrlPanel.Return();
	1357	+ oe.ctrlPanel.add(setupPanel2);
	1358	+ oe.ctrlPanel.Return();
	1359	+
	1360	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1361	+
	1362	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1363	+ resetButton.setToolTipText("Jump to frame zero");
	1364	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1365	+ stepButton.setToolTipText("Step one frame");
973	1366	// resetAllButton = AddButton(oe, "Reset All");
974	1367	// stepAllButton = AddButton(oe, "Step All");
975		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
976	1368	// Return();
977		- slowerButton = AddButton(oe, "Slow");
978		- fasterButton = AddButton(oe, "Fast");
979		- remarkButton = AddButton(oe, "Rem");
	1369	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1370	+ slowerButton.setToolTipText("Decrease animation speed");
	1371	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1372	+ fasterButton.setToolTipText("Increase animation speed");
	1373	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1374	+ remarkButton.setToolTipText("Set the current transform as the target");
980	1375
981		- //Return();
	1376	+ oe.ctrlPanel.add(objectCommandsPanel);
	1377	+ oe.ctrlPanel.Return();
982	1378
983		- //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
	1379	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1380	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
984	1381	//Return();
	1382	+
	1383	+ oe.ctrlPanel.Return();
985	1384
986	1385	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1386	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1076,7 +1475,7 @@
1076	1475	oe.aConstraints.gridwidth = 1;
1077	1476	/**/
1078	1477	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1478	+ oe.ctrlPanel.Return();
1080	1479
1081	1480	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1481	//textureButton.setEnabled(false);
..	..	@@ -1134,6 +1533,7 @@
1134	1533
1135	1534	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1136	1535	{
	1536	+ if (Globals.DEBUG)
1137	1537	System.out.println("CREATE CAMERAS");
1138	1538	cams = new cTemplate();
1139	1539	cams.name = "Cameras";
..	..	@@ -1180,8 +1580,11 @@
1180	1580	//worldPanel.setName("World");
1181	1581	centralPanel = new cGridBag();
1182	1582	centralPanel.preferredWidth = 20;
1183		- timelinePanel = new JPanel(new BorderLayout());
1184		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1583	+
	1584	+ if (Globals.ADVANCED)
	1585	+ {
	1586	+ timelinePanel = new JPanel(new BorderLayout());
	1587	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1185	1588
1186	1589	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1187	1590	cameraPanel.setContinuousLayout(true);
..	..	@@ -1190,7 +1593,10 @@
1190	1593	// cameraPanel.setDividerSize(9);
1191	1594	cameraPanel.setResizeWeight(1.0);
1192	1595
	1596	+ }
	1597	+
1193	1598	centralPanel.add(cameraView);
	1599	+ centralPanel.setFocusable(true);
1194	1600	//frame.setJMenuBar(timelineMenubar);
1195	1601	//centralPanel.add(timelinePanel);
1196	1602
..	..	@@ -1216,6 +1622,7 @@
1216	1622	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1217	1623	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1218	1624	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1625	+ //XYZPanel.setName("XYZ");
1219	1626
1220	1627	/*
1221	1628	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1253,12 +1660,29 @@
1253	1660	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254	1661	//tmp.setName("Edit");
1255	1662	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);
	1663	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1664	+ objectPanel.setToolTipTextAt(0, "Material");
	1665	+
	1666	+ objectPanel.add(toolboxPanel);
	1667	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1668	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1261	1669
	1670	+ objectPanel.add(skyboxPanel);
	1671	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1672	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1673	+
	1674	+// JPanel north = new JPanel(new BorderLayout());
	1675	+// north.setName("Edit");
	1676	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1677	+// objectPanel.add(north);
	1678	+ objectPanel.add(editPanel);
	1679	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1680	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1681	+
	1682	+ objectPanel.add(XYZPanel);
	1683	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1684	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1685	+
1262	1686	/*
1263	1687	aConstraints.gridx = 0;
1264	1688	aConstraints.gridwidth = 1;
..	..	@@ -1266,7 +1690,7 @@
1266	1690	aConstraints.gridy += 1;
1267	1691	aConstraints.gridwidth = 1;
1268	1692	mainPanel.add(objectPanel, aConstraints);
1269		- */
	1693	+ */
1270	1694
1271	1695	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1272	1696	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1278,14 +1702,12 @@
1278	1702	scrollpane.addMouseWheelListener(this); // Default not fast enough
1279	1703
1280	1704	/JTabbedPane/ scenePanel = new cGridBag();
1281		- scenePanel.preferredWidth = 7;
	1705	+ scenePanel.preferredWidth = 5;
1282	1706
1283	1707	JTabbedPane tabbedPane = new JTabbedPane();
1284	1708	tabbedPane.add(scrollpane);
1285	1709
1286		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287		-
1288		- optionsPanel = new cGridBag().setVertical(true);
	1710	+ optionsPanel = new cGridBag().setVertical(false);
1289	1711
1290	1712	optionsPanel.setName("Options");
1291	1713
..	..	@@ -1293,8 +1715,15 @@
1293	1715
1294	1716	tabbedPane.add(optionsPanel);
1295	1717
	1718	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1719	+
1296	1720	scenePanel.add(tabbedPane);
1297	1721
	1722	+ //if (Globals.ADVANCED)
	1723	+// tabbedPane.add(infoPanel);
	1724	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1725	+// tabbedPane.setToolTipTextAt(3, "Information");
	1726	+
1298	1727	/*
1299	1728	cTree jTree = new cTree(null);
1300	1729	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1356,7 +1785,7 @@
1356	1785	bigThree = new cGridBag();
1357	1786	bigThree.addComponent(scenePanel);
1358	1787	bigThree.addComponent(centralPanel);
1359		- bigThree.addComponent(XYZPanel);
	1788	+ //bigThree.addComponent(XYZPanel);
1360	1789
1361	1790	// // SIDE EFFECT!!!
1362	1791	// aConstraints.gridx = 0;
..	..	@@ -1365,16 +1794,33 @@
1365	1794	// aConstraints.gridheight = 1;
1366	1795
1367	1796	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1368		- framePanel.setContinuousLayout(true);
1369		- framePanel.setOneTouchExpandable(true);
1370		- framePanel.setDividerLocation(0.8);
	1797	+
	1798	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1799	+ new java.beans.PropertyChangeListener()
	1800	+ {
	1801	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1802	+ {
	1803	+ if ((Integer)pce.getOldValue() == 1)
	1804	+ {
	1805	+ if (radio.layout != expandedLayout)
	1806	+ {
	1807	+ radio.layout = expandedLayout;
	1808	+ radio.layout.doClick();
	1809	+ }
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
	1814	+ framePanel.setContinuousLayout(false);
	1815	+ framePanel.setOneTouchExpandable(false);
	1816	+ //.setDividerLocation(0.8);
1371	1817	//framePanel.setDividerSize(15);
1372	1818	//framePanel.setResizeWeight(0.15);
1373	1819	framePanel.setName("Frame");
1374	1820
1375	1821	frame.getContentPane().setLayout(new BorderLayout());
1376	1822	/**/
1377		- JTabbedPane worldPane = new JTabbedPane();
	1823	+ //JTabbedPane worldPane = new JTabbedPane();
1378	1824	//worldPane.add(bigPanel);
1379	1825	//worldPane.add(worldPanel);
1380	1826	/**/
..	..	@@ -1384,15 +1830,19 @@
1384	1830
1385	1831	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1386	1832
1387		- frame.setSize(1024, 768);
1388		- frame.show();
1389		-
	1833	+ frame.setSize(1280, 860);
	1834	+
	1835	+ cameraView.requestFocusInWindow();
	1836	+
1390	1837	gridPanel.setDividerLocation(1.0);
	1838	+
	1839	+ frame.validate();
	1840	+
	1841	+ frame.setVisible(true);
1391	1842
1392	1843	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1393	1844	frame.addWindowListener(new WindowAdapter()
1394	1845	{
1395		-
1396	1846	public void windowClosing(WindowEvent e)
1397	1847	{
1398	1848	Close();
..	..	@@ -1415,27 +1865,441 @@
1415	1865	ctrlPanel.removeAll();
1416	1866	}
1417	1867
1418		- void SetupMaterial(cGridBag ctrlPanel)
	1868	+ void SetupMaterial(cGridBag materialpanel)
1419	1869	{
1420		- /*
	1870	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1871	+
	1872	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1873	+ skin.setToolTipText("Skin");
	1874	+ skin.addMouseListener(new MouseAdapter()
	1875	+ {
	1876	+ public void mouseClicked(MouseEvent e)
	1877	+ {
	1878	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1879	+ cMaterial material = object.material;
	1880	+
	1881	+ // Skin
	1882	+ colorField.setFloat(material.color);
	1883	+ saturationField.setFloat(material.modulation);
	1884	+ subsurfaceField.setFloat(material.subsurface);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+ diffusenessField.setFloat(material.factor);
	1887	+ shininessField.setFloat(material.shininess);
	1888	+ shadowbiasField.setFloat(material.shadowbias);
	1889	+ diffuseField.setFloat(material.diffuse);
	1890	+ specularField.setFloat(material.specular);
	1891	+
	1892	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1893	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1894	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1895	+
	1896	+ materialtouched = true;
	1897	+ applySelf();
	1898	+ }
	1899	+ });
	1900	+ presetpanel.add(skin);
	1901	+
	1902	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1903	+ lambert.setToolTipText("Diffuse");
	1904	+ lambert.addMouseListener(new MouseAdapter()
	1905	+ {
	1906	+ public void mouseClicked(MouseEvent e)
	1907	+ {
	1908	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1909	+ cMaterial material = object.material;
	1910	+
	1911	+ diffusenessField.setFloat(material.factor);
	1912	+ selfshadowField.setFloat(material.diffuseness);
	1913	+
	1914	+ materialtouched = true;
	1915	+ applySelf();
	1916	+ }
	1917	+ });
	1918	+ presetpanel.add(lambert);
	1919	+
	1920	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1921	+ diffuse2.setToolTipText("Diffuse2");
	1922	+ diffuse2.addMouseListener(new MouseAdapter()
	1923	+ {
	1924	+ public void mouseClicked(MouseEvent e)
	1925	+ {
	1926	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1927	+ cMaterial material = object.material;
	1928	+
	1929	+ diffusenessField.setFloat(material.factor);
	1930	+ selfshadowField.setFloat(material.diffuseness);
	1931	+
	1932	+ materialtouched = true;
	1933	+ applySelf();
	1934	+ }
	1935	+ });
	1936	+ presetpanel.add(diffuse2);
	1937	+
	1938	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1939	+ diffusemoon.setToolTipText("Moon");
	1940	+ diffusemoon.addMouseListener(new MouseAdapter()
	1941	+ {
	1942	+ public void mouseClicked(MouseEvent e)
	1943	+ {
	1944	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1945	+ cMaterial material = object.material;
	1946	+
	1947	+ diffusenessField.setFloat(material.factor);
	1948	+ selfshadowField.setFloat(material.diffuseness);
	1949	+
	1950	+ materialtouched = true;
	1951	+ applySelf();
	1952	+ }
	1953	+ });
	1954	+ presetpanel.add(diffusemoon);
	1955	+
	1956	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1957	+ diffusemoon2.setToolTipText("Moon2");
	1958	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1959	+ {
	1960	+ public void mouseClicked(MouseEvent e)
	1961	+ {
	1962	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1963	+ cMaterial material = object.material;
	1964	+
	1965	+ diffusenessField.setFloat(material.factor);
	1966	+ selfshadowField.setFloat(material.diffuseness);
	1967	+
	1968	+ materialtouched = true;
	1969	+ applySelf();
	1970	+ }
	1971	+ });
	1972	+ presetpanel.add(diffusemoon2);
	1973	+
	1974	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1975	+ diffusemoon3.setToolTipText("Moon3");
	1976	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1977	+ {
	1978	+ public void mouseClicked(MouseEvent e)
	1979	+ {
	1980	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1981	+ cMaterial material = object.material;
	1982	+
	1983	+ diffusenessField.setFloat(material.factor);
	1984	+ selfshadowField.setFloat(material.diffuseness);
	1985	+
	1986	+ materialtouched = true;
	1987	+ applySelf();
	1988	+ }
	1989	+ });
	1990	+ presetpanel.add(diffusemoon3);
	1991	+
	1992	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1993	+ diffusesheen.setToolTipText("Sheen");
	1994	+ diffusesheen.addMouseListener(new MouseAdapter()
	1995	+ {
	1996	+ public void mouseClicked(MouseEvent e)
	1997	+ {
	1998	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1999	+ cMaterial material = object.material;
	2000	+
	2001	+ sheenField.setFloat(material.sheen);
	2002	+
	2003	+ materialtouched = true;
	2004	+ applySelf();
	2005	+ }
	2006	+ });
	2007	+ presetpanel.add(diffusesheen);
	2008	+
	2009	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2010	+ rough.setToolTipText("Rough metal");
	2011	+ rough.addMouseListener(new MouseAdapter()
	2012	+ {
	2013	+ public void mouseClicked(MouseEvent e)
	2014	+ {
	2015	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2016	+ cMaterial material = object.material;
	2017	+
	2018	+ shininessField.setFloat(material.shininess);
	2019	+ velvetField.setFloat(material.velvet);
	2020	+
	2021	+ materialtouched = true;
	2022	+ applySelf();
	2023	+ }
	2024	+ });
	2025	+ presetpanel.add(rough);
	2026	+
	2027	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2028	+ rough2.setToolTipText("Medium metal");
	2029	+ rough2.addMouseListener(new MouseAdapter()
	2030	+ {
	2031	+ public void mouseClicked(MouseEvent e)
	2032	+ {
	2033	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2034	+ cMaterial material = object.material;
	2035	+
	2036	+ shininessField.setFloat(material.shininess);
	2037	+ lightareaField.setFloat(material.lightarea);
	2038	+
	2039	+ materialtouched = true;
	2040	+ applySelf();
	2041	+ }
	2042	+ });
	2043	+ presetpanel.add(rough2);
	2044	+
	2045	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2046	+ shini0.setToolTipText("Shiny");
	2047	+ shini0.addMouseListener(new MouseAdapter()
	2048	+ {
	2049	+ public void mouseClicked(MouseEvent e)
	2050	+ {
	2051	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2052	+ cMaterial material = object.material;
	2053	+
	2054	+ shininessField.setFloat(material.shininess);
	2055	+ lightareaField.setFloat(material.lightarea);
	2056	+
	2057	+ materialtouched = true;
	2058	+ applySelf();
	2059	+ }
	2060	+ });
	2061	+ presetpanel.add(shini0);
	2062	+
	2063	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2064	+ shini1.setToolTipText("Shiny2");
	2065	+ shini1.addMouseListener(new MouseAdapter()
	2066	+ {
	2067	+ public void mouseClicked(MouseEvent e)
	2068	+ {
	2069	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2070	+ cMaterial material = object.material;
	2071	+
	2072	+ shininessField.setFloat(material.shininess);
	2073	+ lightareaField.setFloat(material.lightarea);
	2074	+
	2075	+ materialtouched = true;
	2076	+ applySelf();
	2077	+ }
	2078	+ });
	2079	+ presetpanel.add(shini1);
	2080	+
	2081	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2082	+ shini2.setToolTipText("Shiny3");
	2083	+ shini2.addMouseListener(new MouseAdapter()
	2084	+ {
	2085	+ public void mouseClicked(MouseEvent e)
	2086	+ {
	2087	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2088	+ cMaterial material = object.material;
	2089	+
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ lightareaField.setFloat(material.lightarea);
	2092	+
	2093	+ materialtouched = true;
	2094	+ applySelf();
	2095	+ }
	2096	+ });
	2097	+ presetpanel.add(shini2);
	2098	+
	2099	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2100	+ aniso.setToolTipText("AnisoU");
	2101	+ aniso.addMouseListener(new MouseAdapter()
	2102	+ {
	2103	+ public void mouseClicked(MouseEvent e)
	2104	+ {
	2105	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2106	+ cMaterial material = object.material;
	2107	+
	2108	+ anisoField.setFloat(material.aniso);
	2109	+ anisoVField.setFloat(material.anisoV);
	2110	+
	2111	+ materialtouched = true;
	2112	+ applySelf();
	2113	+ }
	2114	+ });
	2115	+ presetpanel.add(aniso);
	2116	+
	2117	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2118	+ aniso2.setToolTipText("AnisoV");
	2119	+ aniso2.addMouseListener(new MouseAdapter()
	2120	+ {
	2121	+ public void mouseClicked(MouseEvent e)
	2122	+ {
	2123	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2124	+ cMaterial material = object.material;
	2125	+
	2126	+ anisoField.setFloat(material.aniso);
	2127	+ anisoVField.setFloat(material.anisoV);
	2128	+
	2129	+ materialtouched = true;
	2130	+ applySelf();
	2131	+ }
	2132	+ });
	2133	+ presetpanel.add(aniso2);
	2134	+
	2135	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2136	+ aniso3.setToolTipText("AnisoUV");
	2137	+ aniso3.addMouseListener(new MouseAdapter()
	2138	+ {
	2139	+ public void mouseClicked(MouseEvent e)
	2140	+ {
	2141	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2142	+ cMaterial material = object.material;
	2143	+
	2144	+ anisoField.setFloat(material.aniso);
	2145	+ anisoVField.setFloat(material.anisoV);
	2146	+
	2147	+ materialtouched = true;
	2148	+ applySelf();
	2149	+ }
	2150	+ });
	2151	+ presetpanel.add(aniso3);
	2152	+
	2153	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2154	+ velvet0.setToolTipText("Velvet");
	2155	+ velvet0.addMouseListener(new MouseAdapter()
	2156	+ {
	2157	+ public void mouseClicked(MouseEvent e)
	2158	+ {
	2159	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2160	+ cMaterial material = object.material;
	2161	+
	2162	+ diffusenessField.setFloat(material.factor);
	2163	+ selfshadowField.setFloat(material.diffuseness);
	2164	+ sheenField.setFloat(material.sheen);
	2165	+ shininessField.setFloat(material.shininess);
	2166	+ velvetField.setFloat(material.velvet);
	2167	+ shiftField.setFloat(material.shift);
	2168	+
	2169	+ materialtouched = true;
	2170	+ applySelf();
	2171	+ }
	2172	+ });
	2173	+ presetpanel.add(velvet0);
	2174	+
	2175	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2176	+ bump0.setToolTipText("Bump texture");
	2177	+ bump0.addMouseListener(new MouseAdapter()
	2178	+ {
	2179	+ public void mouseClicked(MouseEvent e)
	2180	+ {
	2181	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2182	+ cMaterial material = object.material;
	2183	+
	2184	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2185	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2186	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2187	+
	2188	+ materialtouched = true;
	2189	+ applySelf();
	2190	+ }
	2191	+ });
	2192	+ presetpanel.add(bump0);
	2193	+
	2194	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2195	+ borderShader.setToolTipText("Border fade");
	2196	+ borderShader.addMouseListener(new MouseAdapter()
	2197	+ {
	2198	+ public void mouseClicked(MouseEvent e)
	2199	+ {
	2200	+ borderfadeField.setFloat(0.5);
	2201	+ opacityField.setFloat(0.75);
	2202	+
	2203	+ materialtouched = true;
	2204	+ applySelf();
	2205	+ }
	2206	+ });
	2207	+ presetpanel.add(borderShader);
	2208	+
	2209	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2210	+ halo.setToolTipText("Halo");
	2211	+ halo.addMouseListener(new MouseAdapter()
	2212	+ {
	2213	+ public void mouseClicked(MouseEvent e)
	2214	+ {
	2215	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2216	+ cMaterial material = object.material;
	2217	+
	2218	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2219	+
	2220	+ materialtouched = true;
	2221	+ applySelf();
	2222	+ }
	2223	+ });
	2224	+ presetpanel.add(halo);
	2225	+
	2226	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2227	+ candle.setToolTipText("Candle");
	2228	+ candle.addMouseListener(new MouseAdapter()
	2229	+ {
	2230	+ public void mouseClicked(MouseEvent e)
	2231	+ {
	2232	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2233	+ cMaterial material = object.material;
	2234	+
	2235	+ subsurfaceField.setFloat(material.subsurface);
	2236	+ shadowbiasField.setFloat(material.shadowbias);
	2237	+ ambientField.setFloat(material.ambient);
	2238	+ specularField.setFloat(material.specular);
	2239	+ lightareaField.setFloat(material.lightarea);
	2240	+ shininessField.setFloat(material.shininess);
	2241	+
	2242	+ materialtouched = true;
	2243	+ applySelf();
	2244	+ }
	2245	+ });
	2246	+ presetpanel.add(candle);
	2247	+
	2248	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2249	+ shadowShader.setToolTipText("Shadow");
	2250	+ shadowShader.addMouseListener(new MouseAdapter()
	2251	+ {
	2252	+ public void mouseClicked(MouseEvent e)
	2253	+ {
	2254	+ diffuseField.setFloat(0.001);
	2255	+ ambientField.setFloat(0.001);
	2256	+ cameraField.setFloat(0.001);
	2257	+ specularField.setFloat(0.001);
	2258	+ fakedepthField.setFloat(0.001);
	2259	+ opacityField.setFloat(0.6);
	2260	+
	2261	+ materialtouched = true;
	2262	+ applySelf();
	2263	+ }
	2264	+ });
	2265	+ presetpanel.add(shadowShader);
	2266	+
	2267	+ cGridBag panel = new cGridBag().setVertical(true);
	2268	+
	2269	+ presetpanel.preferredWidth = 1;
	2270	+
	2271	+ materialpanel.add(presetpanel);
	2272	+ materialpanel.add(panel);
	2273	+
	2274	+ panel.preferredWidth = 8;
	2275	+
	2276	+ /*
1421	2277	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1422	2278	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1423		- */
	2279	+ */
1424	2280
1425	2281	cGridBag editBar = new cGridBag().setVertical(false);
1426	2282
1427		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	2283	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2284	+ createMaterialButton.setToolTipText("Create material");
1428	2285
1429	2286	/*
1430	2287	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	2288	*/
1432	2289
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);
	2290	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2291	+ clearMaterialButton.setToolTipText("Clear material");
	2292	+
	2293	+ if (Globals.ADVANCED)
	2294	+ {
	2295	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2296	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2297	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2298	+ }
1437	2299
1438		- ctrlPanel.add(editBar);
	2300	+ editBar.preferredHeight = 15;
	2301	+
	2302	+ panel.add(editBar);
1439	2303
1440	2304	/**/
1441	2305	//aConstraints.weighty = 0;
..	..	@@ -1446,47 +2310,63 @@
1446	2310	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1447	2311
1448	2312	cGridBag colorSection = new cGridBag().setVertical(true);
	2313	+
	2314	+ cGridBag huepanel = new cGridBag();
	2315	+ cGridBag huelabel = new cGridBag();
	2316	+ cLabel hue = GetLabel("icons/hue.png", false);
	2317	+ hue.fit = true;
	2318	+
	2319	+ hue.addMouseListener(new MouseAdapter()
	2320	+ {
	2321	+ public void mousePressed(MouseEvent e)
	2322	+ {
	2323	+ int x = e.getX();
	2324	+
	2325	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2326	+ }
	2327	+ });
	2328	+
	2329	+ huelabel.add(hue);
	2330	+ huelabel.preferredWidth = 20;
	2331	+ huepanel.add(new cGridBag()); // Label
	2332	+ huepanel.add(huelabel); // Field/slider
	2333	+
	2334	+ huepanel.preferredHeight = 7;
	2335	+
	2336	+ colorSection.add(huepanel);
1449	2337
1450	2338	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);
	2339	+
	2340	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2341	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2342	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2343	+
1454	2344	//colorField.preferredWidth = 200;
1455	2345	colorSection.add(color);
1456	2346
1457	2347	cGridBag modulation = new cGridBag();
1458	2348	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1459	2349	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1460		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2350	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1461	2351	colorSection.add(modulation);
1462	2352
	2353	+ cGridBag opacity = new cGridBag();
	2354	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2355	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2356	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2357	+ colorSection.add(opacity);
	2358	+
	2359	+ colorSection.add(GetSeparator());
	2360	+
1463	2361	cGridBag texture = new cGridBag();
1464	2362	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1465	2363	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466	2364	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1467	2365	colorSection.add(texture);
1468	2366
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());
	2367	+ panel.add(GetSeparator());
1488	2368
1489		- ctrlPanel.add(colorSection);
	2369	+ panel.add(colorSection);
1490	2370
1491	2371	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1492	2372
..	..	@@ -1534,9 +2414,15 @@
1534	2414	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1535	2415	diffuseSection.add(fakedepth);
1536	2416
1537		- ctrlPanel.add(new JSeparator());
	2417	+ cGridBag shadowbias = new cGridBag();
	2418	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2419	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2420	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2421	+ diffuseSection.add(shadowbias);
	2422	+
	2423	+ panel.add(GetSeparator());
1538	2424
1539		- ctrlPanel.add(diffuseSection);
	2425	+ panel.add(diffuseSection);
1540	2426
1541	2427	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1542	2428
..	..	@@ -1572,7 +2458,7 @@
1572	2458	velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1573	2459	specularSection.add(velvet);
1574	2460
1575		- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	2461	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1576	2462	//Return();
1577	2463	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1578	2464	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..	..	@@ -1584,42 +2470,48 @@
1584	2470	// aConstraints.gridy += 1;
1585	2471	// aConstraints.gridwidth = 1;
1586	2472
	2473	+ cGridBag anisoU = new cGridBag();
	2474	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2475	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2476	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2477	+ specularSection.add(anisoU);
1587	2478
1588		- ctrlPanel.add(new JSeparator());
	2479	+ cGridBag anisoV = new cGridBag();
	2480	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2481	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2482	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2483	+ specularSection.add(anisoV);
	2484	+
	2485	+
	2486	+ panel.add(GetSeparator());
1589	2487
1590		- ctrlPanel.add(specularSection);
	2488	+ panel.add(specularSection);
1591	2489
1592	2490	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1593	2491
1594		- cGridBag globalSection = new cGridBag().setVertical(true);
	2492	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1595	2493
1596	2494	cGridBag camera = new cGridBag();
1597	2495	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1598	2496	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1599	2497	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1600		- globalSection.add(camera);
	2498	+ colorSection.add(camera);
1601	2499
1602	2500	cGridBag ambient = new cGridBag();
1603	2501	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1604	2502	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1605	2503	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1606		- globalSection.add(ambient);
	2504	+ colorSection.add(ambient);
1607	2505
1608	2506	cGridBag backlit = new cGridBag();
1609	2507	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1610	2508	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611	2509	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612		- globalSection.add(backlit);
	2510	+ colorSection.add(backlit);
1613	2511
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());
	2512	+ //panel.add(new JSeparator());
1621	2513
1622		- ctrlPanel.add(globalSection);
	2514	+ //panel.add(globalSection);
1623	2515
1624	2516	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1625	2517
..	..	@@ -1661,9 +2553,9 @@
1661	2553	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1662	2554	textureSection.add(opacityPower);
1663	2555
1664		- ctrlPanel.add(new JSeparator());
	2556	+ panel.add(GetSeparator());
1665	2557
1666		- ctrlPanel.add(textureSection);
	2558	+ panel.add(textureSection);
1667	2559
1668	2560	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1669	2561
..	..	@@ -1700,12 +2592,15 @@
1700	2592	opacityPowerField.addChangeListener(this);
1701	2593	/**/
1702	2594
1703		- resetSlidersButton.addActionListener(this);
1704	2595	clearMaterialButton.addActionListener(this);
1705	2596	createMaterialButton.addActionListener(this);
1706		-
1707		- propagateToggle.addItemListener(this);
1708		- multiplyToggle.addItemListener(this);
	2597	+
	2598	+ if (Globals.ADVANCED)
	2599	+ {
	2600	+ resetSlidersButton.addActionListener(this);
	2601	+ propagateToggle.addItemListener(this);
	2602	+ multiplyToggle.addItemListener(this);
	2603	+ }
1709	2604	}
1710	2605
1711	2606	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1723,8 +2618,9 @@
1723	2618	// 3D models
1724	2619	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1725	2620	{
1726		- lastConverter = new com.jmex.model.converters.MaxToJme();
1727		- LoadFile(filename, lastConverter);
	2621	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2622	+ //LoadFile(filename, lastConverter);
	2623	+ LoadObjFile(filename); // New 3ds loader
1728	2624	continue;
1729	2625	}
1730	2626	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1876,7 +2772,7 @@
1876	2772
1877	2773	//? flashIt = false;
1878	2774	CameraPane pane = (CameraPane) cameraView;
1879		- pane.clickStart(location.x, location.y, 0);
	2775	+ pane.clickStart(location.x, location.y, 0, 0);
1880	2776	pane.clickEnd(location.x, location.y, 0, true);
1881	2777
1882	2778	if (group.selection.size() == 1)
..	..	@@ -1925,6 +2821,7 @@
1925	2821	e2.printStackTrace();
1926	2822	}
1927	2823	}
	2824	+
1928	2825	LoadJMEThread loadThread;
1929	2826
1930	2827	class LoadJMEThread extends Thread
..	..	@@ -1982,6 +2879,7 @@
1982	2879	//LoadFile0(filename, converter);
1983	2880	}
1984	2881	}
	2882	+
1985	2883	LoadOBJThread loadObjThread;
1986	2884
1987	2885	class LoadOBJThread extends Thread
..	..	@@ -2060,19 +2958,19 @@
2060	2958
2061	2959	void LoadObjFile(String fullname)
2062	2960	{
2063		- /*
	2961	+ System.out.println("Loading " + fullname);
	2962	+ /**/
2064	2963	//lastFilename = fullname;
2065	2964	if(loadObjThread == null)
2066	2965	{
2067		- loadObjThread = new LoadOBJThread();
2068		- loadObjThread.start();
	2966	+ loadObjThread = new LoadOBJThread();
	2967	+ loadObjThread.start();
2069	2968	}
2070	2969
2071	2970	loadObjThread.add(fullname);
2072		- */
	2971	+ /**/
2073	2972
2074		- System.out.println("Loading " + fullname);
2075		- makeSomething(new FileObject(fullname, true), true);
	2973	+ //makeSomething(new FileObject(fullname, true), true);
2076	2974	}
2077	2975
2078	2976	void LoadGFDFile(String fullname)
..	..	@@ -2333,11 +3231,11 @@
2333	3231
2334	3232	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2335	3233	{
2336		- if (GrafreeD.standAlone)
	3234	+ if (Grafreed.standAlone)
2337	3235	{
2338	3236	/**/
2339	3237	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2340		- browser.show();
	3238	+ browser.setVisible(true);
2341	3239	String filename = browser.getFile();
2342	3240	if (filename != null && filename.length() > 0)
2343	3241	{
..	..	@@ -2448,6 +3346,7 @@
2448	3346	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2449	3347	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2450	3348	}
	3349	+
2451	3350	//cJME.count++;
2452	3351	//cJME.count %= 12;
2453	3352	if (gc)
..	..	@@ -2482,6 +3381,7 @@
2482	3381	}
2483	3382	if (input == null)
2484	3383	{
	3384	+ new Exception().printStackTrace();
2485	3385	System.exit(0);
2486	3386	}
2487	3387
..	..	@@ -2630,6 +3530,7 @@
2630	3530	}
2631	3531	}
2632	3532	}
	3533	+
2633	3534	cFileSystemPane FSPane;
2634	3535
2635	3536	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2639,7 +3540,7 @@
2639	3540
2640	3541	freezematerial = true;
2641	3542	colorField.setFloat(mat.color);
2642		- modulationField.setFloat(mat.modulation);
	3543	+ saturationField.setFloat(mat.modulation);
2643	3544	metalnessField.setFloat(mat.metalness);
2644	3545	diffuseField.setFloat(mat.diffuse);
2645	3546	specularField.setFloat(mat.specular);
..	..	@@ -2683,11 +3584,14 @@
2683	3584	}
2684	3585	}
2685	3586	}
	3587	+
2686	3588	freezematerial = false;
2687	3589	}
2688	3590
2689	3591	void SetMaterial(Object3D object)
2690	3592	{
	3593	+ latestObject = object;
	3594	+
2691	3595	cMaterial mat = object.material;
2692	3596
2693	3597	if (mat == null)
..	..	@@ -2696,33 +3600,10 @@
2696	3600	return;
2697	3601	}
2698	3602
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		- }
	3603	+ if (multiplyToggle != null)
	3604	+ multiplyToggle.setSelected(mat.multiply);
	3605	+
	3606	+ AllocProjectedVertices(object);
2726	3607
2727	3608	SetMaterial(mat, object.projectedVertices);
2728	3609	}
..	..	@@ -2798,12 +3679,17 @@
2798	3679	// }
2799	3680
2800	3681	/**/
2801		- if (deselect)
	3682	+ if (deselect \|\| child == null)
2802	3683	{
2803	3684	//group.deselectAll();
2804	3685	//freeze = true;
2805	3686	GetTree().clearSelection();
2806	3687	//freeze = false;
	3688	+
	3689	+ if (child == null)
	3690	+ {
	3691	+ return;
	3692	+ }
2807	3693	}
2808	3694
2809	3695	//group.addSelectee(child);
..	..	@@ -2837,6 +3723,17 @@
2837	3723	public void itemStateChanged(ItemEvent event)
2838	3724	{
2839	3725	// System.out.println("Propagate = " + propagate);
	3726	+ if (event.getSource() == pinButton)
	3727	+ {
	3728	+ copy.pinned ^= true;
	3729	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3730	+ {
	3731	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3732	+ copy.CloseUI();
	3733	+ //copy.editWindow.refreshContents();
	3734	+ }
	3735	+ }
	3736	+ else
2840	3737	if (event.getSource() == propagateToggle)
2841	3738	{
2842	3739	propagate ^= true;
..	..	@@ -2872,7 +3769,7 @@
2872	3769	cameraView.ToggleDL();
2873	3770	cameraView.repaint();
2874	3771	return;
2875		- } else if (event.getSource() == toggleTextureItem)
	3772	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2876	3773	{
2877	3774	cameraView.ToggleTexture();
2878	3775	// june 2013 copy.HardTouch();
..	..	@@ -2911,9 +3808,9 @@
2911	3808	frame.validate();
2912	3809
2913	3810	return;
2914		- } else if (event.getSource() == toggleRandomItem)
	3811	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2915	3812	{
2916		- cameraView.ToggleRandom();
	3813	+ cameraView.ToggleSwitch();
2917	3814	cameraView.repaint();
2918	3815	return;
2919	3816	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2941,12 +3838,17 @@
2941	3838	} else if (event.getSource() == liveCB)
2942	3839	{
2943	3840	copy.live ^= true;
	3841	+ objEditor.refreshContents(true); // To show item colors
	3842	+ return;
	3843	+ } else if (event.getSource() == selectableCB)
	3844	+ {
	3845	+ copy.dontselect ^= true;
2944	3846	return;
2945	3847	} else if (event.getSource() == hideCB)
2946	3848	{
2947	3849	copy.hide ^= true;
2948	3850	copy.Touch(); // display list issue
2949		- objEditor.refreshContents();
	3851	+ objEditor.refreshContents(true); // To show item colors
2950	3852	return;
2951	3853	} else if (event.getSource() == link2masterCB)
2952	3854	{
..	..	@@ -2956,6 +3858,7 @@
2956	3858	if (event.getSource() == randomCB)
2957	3859	{
2958	3860	copy.random ^= true;
	3861	+ objEditor.refreshContents();
2959	3862	return;
2960	3863	}
2961	3864	if (event.getSource() == speedupCB)
..	..	@@ -2979,8 +3882,9 @@
2979	3882
2980	3883	public void actionPerformed(ActionEvent event)
2981	3884	{
	3885	+ Object source = event.getSource();
2982	3886	// SCRIPT DIALOG
2983		- if (event.getSource() == okbutton)
	3887	+ if (source == okbutton)
2984	3888	{
2985	3889	textpanel.setVisible(false);
2986	3890	textpanel.remove(textarea);
..	..	@@ -2992,7 +3896,7 @@
2992	3896	textarea = null;
2993	3897	textpanel = null;
2994	3898	}
2995		- if (event.getSource() == cancelbutton)
	3899	+ if (source == cancelbutton)
2996	3900	{
2997	3901	textpanel.setVisible(false);
2998	3902	textpanel.remove(textarea);
..	..	@@ -3004,50 +3908,50 @@
3004	3908	//applySelf();
3005	3909	//client.refreshEditWindow();
3006	3910	//refreshContents();
3007		- if (event.getSource() == nameField)
	3911	+ if (source == nameField)
3008	3912	{
3009	3913	//System.out.println("ObjEditor " + event);
3010	3914	applySelf0(true);
3011	3915	//parent.applySelf();
3012	3916	objEditor.refreshContents();
3013		- } else if (event.getSource() == resetButton)
	3917	+ } else if (source == resetButton)
3014	3918	{
3015	3919	CameraPane.fullreset = true;
3016	3920	copy.Reset(); // ResetMeshes();
3017	3921	copy.Touch();
3018	3922	objEditor.refreshContents();
3019		- } else if (event.getSource() == stepItem)
	3923	+ } else if (source == stepItem)
3020	3924	{
3021	3925	//cameraView.ONESTEP = true;
3022	3926	Globals.ONESTEP = true;
3023	3927	cameraView.repaint();
3024	3928	return;
3025		- } else if (event.getSource() == stepButton)
	3929	+ } else if (source == stepButton)
3026	3930	{
3027	3931	copy.Step();
3028	3932	copy.Touch();
3029	3933	objEditor.refreshContents();
3030		- } else if (event.getSource() == slowerButton)
	3934	+ } else if (source == slowerButton)
3031	3935	{
3032	3936	copy.Slower();
3033	3937	copy.Touch();
3034	3938	objEditor.refreshContents();
3035		- } else if (event.getSource() == fasterButton)
	3939	+ } else if (source == fasterButton)
3036	3940	{
3037	3941	copy.Faster();
3038	3942	copy.Touch();
3039	3943	objEditor.refreshContents();
3040		- } else if (event.getSource() == remarkButton)
	3944	+ } else if (source == remarkButton)
3041	3945	{
3042	3946	copy.Remark();
3043	3947	copy.Touch();
3044	3948	objEditor.refreshContents();
3045		- } else if (event.getSource() == stepAllButton)
	3949	+ } else if (source == stepAllButton)
3046	3950	{
3047	3951	copy.StepAll();
3048	3952	copy.Touch();
3049	3953	objEditor.refreshContents();
3050		- } else if (event.getSource() == resetAllButton)
	3954	+ } else if (source == resetAllButton)
3051	3955	{
3052	3956	//CameraPane.fullreset = true;
3053	3957	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3080,53 +3984,79 @@
3080	3984	// Close();
3081	3985	// }
3082	3986	// else
3083		- if (event.getSource() == resetSlidersButton)
	3987	+ if (source == resetSlidersButton)
3084	3988	{
3085	3989	ResetSliders();
3086		- } else if (event.getSource() == clearMaterialButton)
	3990	+ } else if (source == clearMaterialButton)
3087	3991	{
3088	3992	ClearMaterial();
3089		- } else if (event.getSource() == createMaterialButton)
	3993	+ } else if (source == createMaterialButton)
3090	3994	{
3091	3995	CreateMaterial();
3092		- } else if (event.getSource() == clearPanelButton)
	3996	+ } else if (source == clearPanelButton)
3093	3997	{
3094	3998	copy.ClearUI();
3095	3999	refreshContents(true);
3096		- } /*
3097		- }
3098		-
3099		- public boolean action(Event event, Object arg)
3100		- {
3101		- */ else if (event.getSource() == closeItem)
	4000	+ } else if (source == importGFDItem)
	4001	+ {
	4002	+ ImportGFD();
	4003	+ } else
	4004	+ if (source == importVRMLX3DItem)
	4005	+ {
	4006	+ ImportVRMLX3D();
	4007	+ } else
	4008	+ if (source == import3DSItem)
	4009	+ {
	4010	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4011	+ } else
	4012	+ if (source == importOBJItem)
	4013	+ {
	4014	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4015	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4016	+ browser.setVisible(true);
	4017	+ String filename = browser.getFile();
	4018	+ if (filename != null && filename.length() > 0)
	4019	+ {
	4020	+ String fullname = browser.getDirectory() + filename;
	4021	+ makeSomething(ReadOBJ(fullname), true);
	4022	+ }
	4023	+ } else
	4024	+ if (source == closeItem)
3102	4025	{
3103	4026	Close();
3104	4027	//return true;
3105		- } else if (event.getSource() == loadItem)
	4028	+ } else if (source == openItem)
3106	4029	{
3107		- load();
	4030	+ Open();
3108	4031	//return true;
3109		- } else if (event.getSource() == saveItem)
	4032	+ } else if (source == newItem)
	4033	+ {
	4034	+ New();
	4035	+ } else if (source == saveItem)
3110	4036	{
3111	4037	save();
3112	4038	//return true;
3113		- } else if (event.getSource() == saveAsItem)
	4039	+ } else if (source == saveAsItem)
3114	4040	{
3115	4041	saveAs();
3116	4042	//return true;
3117		- } else if (event.getSource() == reexportItem)
	4043	+ } else if (source == reexportItem)
3118	4044	{
3119	4045	reexport();
3120	4046	//return true;
3121		- } else if (event.getSource() == exportAsItem)
	4047	+ } else if (source == exportAsItem)
3122	4048	{
3123	4049	export();
3124	4050	//return true;
3125		- } else if (event.getSource() == povItem)
	4051	+ } else if (source == povItem)
3126	4052	{
3127	4053	generatePOV();
3128	4054	//return true;
3129		- } else if (event.getSource() == zBufferItem)
	4055	+ } else if (event.getSource() == archiveItem)
	4056	+ {
	4057	+ cTools.Archive(frame);
	4058	+ return;
	4059	+ } else if (source == zBufferItem)
3130	4060	{
3131	4061	try
3132	4062	{
..	..	@@ -3148,21 +4078,8 @@
3148	4078	cameraView.repaint();
3149	4079	//return true;
3150	4080	}
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)
	4081	+ */ else // combos...
	4082	+ if (source == texresMenu)
3166	4083	{
3167	4084	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3168	4085	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3174,12 +4091,477 @@
3174	4091	}
3175	4092	}
3176	4093
	4094	+ void New()
	4095	+ {
	4096	+ while (copy.Size() > 1)
	4097	+ {
	4098	+ copy.remove(1);
	4099	+ }
	4100	+
	4101	+ ResetModel();
	4102	+ objEditor.refreshContents();
	4103	+ }
	4104	+
	4105	+ static public byte[] Compress(Object3D o)
	4106	+ {
	4107	+ // Slower to actually compress.
	4108	+ try
	4109	+ {
	4110	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4111	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4112	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4113	+
	4114	+ Object3D parent = o.parent;
	4115	+ o.parent = null;
	4116	+
	4117	+ out.writeObject(o);
	4118	+
	4119	+ o.parent = parent;
	4120	+
	4121	+ out.flush();
	4122	+
	4123	+ baos //zstream
	4124	+ .close();
	4125	+ out.close();
	4126	+
	4127	+ byte[] bytes = baos.toByteArray();
	4128	+
	4129	+ System.out.println("save #bytes = " + bytes.length);
	4130	+ return bytes;
	4131	+ } catch (Exception e)
	4132	+ {
	4133	+ System.err.println(e);
	4134	+ return null;
	4135	+ }
	4136	+ }
	4137	+
	4138	+ static public Object Uncompress(byte[] bytes)
	4139	+ {
	4140	+ System.out.println("restore #bytes = " + bytes.length);
	4141	+ try
	4142	+ {
	4143	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4144	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4145	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4146	+ Object obj = in.readObject();
	4147	+
	4148	+ bais //istream
	4149	+ .close();
	4150	+ in.close();
	4151	+
	4152	+ return obj;
	4153	+ } catch (Exception e)
	4154	+ {
	4155	+ System.err.println(e);
	4156	+ return null;
	4157	+ }
	4158	+ }
	4159	+
	4160	+ static public Object clone(Object o)
	4161	+ {
	4162	+ try
	4163	+ {
	4164	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4165	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4166	+
	4167	+ out.writeObject(o);
	4168	+
	4169	+ out.flush();
	4170	+ out.close();
	4171	+
	4172	+ byte[] bytes = baos.toByteArray();
	4173	+
	4174	+ System.out.println("clone = " + bytes.length);
	4175	+
	4176	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4177	+ ObjectInputStream in = new ObjectInputStream(bais);
	4178	+ Object obj = in.readObject();
	4179	+ in.close();
	4180	+
	4181	+ return obj;
	4182	+ } catch (Exception e)
	4183	+ {
	4184	+ System.err.println(e);
	4185	+ return null;
	4186	+ }
	4187	+ }
	4188	+
	4189	+ cRadio GetCurrentTab()
	4190	+ {
	4191	+ cRadio ab;
	4192	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4193	+ {
	4194	+ ab = (cRadio)e.nextElement();
	4195	+ if(ab.GetObject() == copy)
	4196	+ {
	4197	+ return ab;
	4198	+ }
	4199	+ }
	4200	+
	4201	+ return null;
	4202	+ }
	4203	+
	4204	+
	4205	+ public void Save()
	4206	+ {
	4207	+ //Save(true);
	4208	+ Replace();
	4209	+ SetVersionStates();
	4210	+ }
	4211	+
	4212	+ private boolean Equal(byte[] compress, byte[] name)
	4213	+ {
	4214	+ if (compress.length != name.length)
	4215	+ {
	4216	+ return false;
	4217	+ }
	4218	+
	4219	+ for (int i=compress.length; --i>=0;)
	4220	+ {
	4221	+ if (compress[i] != name[i])
	4222	+ return false;
	4223	+ }
	4224	+
	4225	+ return true;
	4226	+ }
	4227	+
	4228	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4229	+
	4230	+ void DeleteVersion()
	4231	+ {
	4232	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4233	+ {
	4234	+ copy.versionlist[i] = copy.versionlist[i+1];
	4235	+ }
	4236	+
	4237	+ CopyChanged();
	4238	+
	4239	+ SetVersionStates();
	4240	+ }
	4241	+
	4242	+ public boolean Save(boolean user)
	4243	+ {
	4244	+ System.err.println("Save");
	4245	+ Replace();
	4246	+
	4247	+ //cRadio tab = GetCurrentTab();
	4248	+
	4249	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4250	+
	4251	+ boolean thesame = false;
	4252	+
	4253	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4254	+// {
	4255	+// thesame = true;
	4256	+// }
	4257	+
	4258	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4259	+ if (!thesame)
	4260	+ {
	4261	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4262	+ {
	4263	+ copy.versionlist[i] = copy.versionlist[i-1];
	4264	+ }
	4265	+
	4266	+ //tab.user[tab.versionindex] = user;
	4267	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4268	+
	4269	+ copy.versionlist[++copy.versionindex] = compress;
	4270	+
	4271	+ // if (increment)
	4272	+ // tab.versionindex++;
	4273	+ }
	4274	+
	4275	+ //copy.RestoreBigData(versiontable);
	4276	+
	4277	+ //assert(hashtable.isEmpty());
	4278	+
	4279	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4280	+// {
	4281	+// //tab.user[i] = false;
	4282	+// copy.versionlist[i] = null;
	4283	+// }
	4284	+
	4285	+ SetVersionStates();
	4286	+
	4287	+ // test save
	4288	+ if (false)
	4289	+ {
	4290	+ try
	4291	+ {
	4292	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4293	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4294	+
	4295	+ p.writeObject(copy);
	4296	+
	4297	+ p.flush();
	4298	+
	4299	+ ostream.close();
	4300	+ } catch (Exception e)
	4301	+ {
	4302	+ e.printStackTrace();
	4303	+ }
	4304	+ }
	4305	+
	4306	+ return !thesame;
	4307	+ }
	4308	+
	4309	+ boolean flashIt = true;
	4310	+
	4311	+ void RefreshSelection()
	4312	+ {
	4313	+ Object3D selection = new Object3D();
	4314	+
	4315	+ for (int i = 0; i < copy.selection.size(); i++)
	4316	+ {
	4317	+ Object3D elem = copy.selection.elementAt(i);
	4318	+
	4319	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4320	+
	4321	+ if (obj == null)
	4322	+ {
	4323	+ copy.selection.remove(i--);
	4324	+ }
	4325	+ else
	4326	+ {
	4327	+ selection.add(obj);
	4328	+ copy.selection.setElementAt(obj, i);
	4329	+ }
	4330	+ }
	4331	+
	4332	+ flashIt = false;
	4333	+ GetTree().clearSelection();
	4334	+ for (int i = 0; i < selection.size(); i++)
	4335	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4336	+ flashIt = true;
	4337	+
	4338	+ //refreshContents(false);
	4339	+ }
	4340	+
	4341	+ void CopyChanged()
	4342	+ {
	4343	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4344	+
	4345	+ SetVersionStates();
	4346	+
	4347	+ boolean temp = CameraPane.SWITCH;
	4348	+ CameraPane.SWITCH = false;
	4349	+
	4350	+ copy.ExtractBigData(versiontable);
	4351	+
	4352	+ copy.clear();
	4353	+
	4354	+ copy.skyboxname = obj.skyboxname;
	4355	+ copy.skyboxext = obj.skyboxext;
	4356	+
	4357	+ for (int i=0; i<obj.Size(); i++)
	4358	+ {
	4359	+ copy.add(obj.get(i));
	4360	+ }
	4361	+
	4362	+ copy.RestoreBigData(versiontable);
	4363	+
	4364	+ CameraPane.SWITCH = temp;
	4365	+
	4366	+ RefreshSelection();
	4367	+ //assert(hashtable.isEmpty());
	4368	+
	4369	+ copy.Touch();
	4370	+
	4371	+ ResetModel();
	4372	+ copy.HardTouch(); // recompile?
	4373	+
	4374	+ cRadio ab;
	4375	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4376	+ {
	4377	+ ab = (cRadio)e.nextElement();
	4378	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4379	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4380	+ if (test != null)
	4381	+ {
	4382	+ test.editWindow = ab.object.editWindow;
	4383	+ ab.object = test;
	4384	+ }
	4385	+ }
	4386	+
	4387	+ refreshContents(true);
	4388	+ }
	4389	+
	4390	+ cButton previousVersionButton;
	4391	+ cButton restoreButton;
	4392	+ cButton replaceButton;
	4393	+ cButton nextVersionButton;
	4394	+ cButton saveVersionButton;
	4395	+ cButton deleteVersionButton;
	4396	+
	4397	+ boolean muteSlider;
	4398	+
	4399	+ int VersionCount()
	4400	+ {
	4401	+ int count = 0;
	4402	+
	4403	+ for (int i = copy.versionlist.length; --i >= 0;)
	4404	+ {
	4405	+ if (copy.versionlist[i] != null)
	4406	+ count++;
	4407	+ }
	4408	+
	4409	+ return count;
	4410	+ }
	4411	+
	4412	+ void SetVersionStates()
	4413	+ {
	4414	+ //if (true)
	4415	+ // return;
	4416	+
	4417	+ //cRadio tab = GetCurrentTab();
	4418	+
	4419	+ restoreButton.setEnabled(copy.versionindex != -1);
	4420	+ replaceButton.setEnabled(copy.versionindex != -1);
	4421	+
	4422	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4423	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4424	+
	4425	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4426	+ copy.versionlist[copy.versionindex + 1] != null);
	4427	+
	4428	+ muteSlider = true;
	4429	+ versionSlider.setMinimum(0);
	4430	+ versionSlider.setMaximum(VersionCount() - 1);
	4431	+ versionSlider.setInteger(copy.versionindex);
	4432	+ versionSlider.setEnabled(copy.versionindex != -1);
	4433	+ muteSlider = false;
	4434	+ }
	4435	+
	4436	+ public boolean PreviousVersion()
	4437	+ {
	4438	+ // Option?
	4439	+ Replace();
	4440	+
	4441	+ System.err.println("Undo");
	4442	+
	4443	+ //cRadio tab = GetCurrentTab();
	4444	+
	4445	+ if (copy.versionindex == 0)
	4446	+ {
	4447	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4448	+ return false;
	4449	+ }
	4450	+
	4451	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4452	+// {
	4453	+// if (Save(false))
	4454	+// tab.versionindex -= 1;
	4455	+// else
	4456	+// {
	4457	+// if (tab.versionindex <= 0)
	4458	+// return false;
	4459	+// else
	4460	+// tab.versionindex -= 1;
	4461	+// }
	4462	+// }
	4463	+
	4464	+ copy.versionindex -= 1;
	4465	+
	4466	+ CopyChanged();
	4467	+
	4468	+ return true;
	4469	+ }
	4470	+
	4471	+ public boolean Restore()
	4472	+ {
	4473	+ System.err.println("Restore");
	4474	+
	4475	+ //cRadio tab = GetCurrentTab();
	4476	+
	4477	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4478	+ {
	4479	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4480	+ return false;
	4481	+ }
	4482	+
	4483	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4484	+ CopyChanged();
	4485	+
	4486	+ return true;
	4487	+ }
	4488	+
	4489	+ public boolean Replace()
	4490	+ {
	4491	+ System.err.println("Replace");
	4492	+
	4493	+ //cRadio tab = GetCurrentTab();
	4494	+
	4495	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4496	+ {
	4497	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4498	+ return false;
	4499	+ }
	4500	+
	4501	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4502	+
	4503	+ return true;
	4504	+ }
	4505	+
	4506	+ public void NextVersion()
	4507	+ {
	4508	+ // Option?
	4509	+ Replace();
	4510	+
	4511	+ //cRadio tab = GetCurrentTab();
	4512	+
	4513	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4514	+ {
	4515	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4516	+ return;
	4517	+ }
	4518	+
	4519	+ copy.versionindex += 1;
	4520	+
	4521	+ CopyChanged();
	4522	+
	4523	+ //if (!tab.user[tab.versionindex])
	4524	+ // tab.graphs[tab.versionindex] = null;
	4525	+ }
	4526	+
	4527	+ void ImportGFD()
	4528	+ {
	4529	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4530	+ browser.show();
	4531	+ String filename = browser.getFile();
	4532	+ if (filename != null && filename.length() > 0)
	4533	+ {
	4534	+ String fullname = browser.getDirectory() + filename;
	4535	+
	4536	+ //Object3D readobj =
	4537	+ objEditor.ReadGFD(fullname, objEditor);
	4538	+ //makeSomething(readobj);
	4539	+ }
	4540	+ }
	4541	+
	4542	+ void ImportVRMLX3D()
	4543	+ {
	4544	+ if (Grafreed.standAlone)
	4545	+ {
	4546	+ /**/
	4547	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4548	+ browser.show();
	4549	+ String filename = browser.getFile();
	4550	+ if (filename != null && filename.length() > 0)
	4551	+ {
	4552	+ String fullname = browser.getDirectory() + filename;
	4553	+ LoadVRMLX3D(fullname);
	4554	+ }
	4555	+ /**/
	4556	+ }
	4557	+ }
	4558	+
3177	4559	void ToggleAnimation()
3178	4560	{
3179	4561	if (!Globals.ANIMATION)
3180	4562	{
3181	4563	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3182		- browser.show();
	4564	+ browser.setVisible(true);
3183	4565	String filename = browser.getFile();
3184	4566	if (filename != null && filename.length() > 0)
3185	4567	{
..	..	@@ -3189,8 +4571,8 @@
3189	4571
3190	4572	Globals.ANIMATION ^= true;
3191	4573
3192		- GrafreeD.wav.cursor = 0;
3193		- GrafreeD.wav.loop = 0;
	4574	+ Grafreed.wav.cursor = 0;
	4575	+ Grafreed.wav.loop = 0;
3194	4576	}
3195	4577	} else
3196	4578	{
..	..	@@ -3240,7 +4622,7 @@
3240	4622	void CreateMaterial()
3241	4623	{
3242	4624	//copy.ClearMaterial(); // PATCH
3243		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4625	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3244	4626	if (copy.selection.size() > 0)
3245	4627	//SetMaterial(copy);
3246	4628	{
..	..	@@ -3291,7 +4673,7 @@
3291	4673	assert false;
3292	4674	}
3293	4675
3294		- void EditSelection()
	4676	+ void EditSelection(boolean newWindow)
3295	4677	{
3296	4678	}
3297	4679
..	..	@@ -3299,11 +4681,11 @@
3299	4681	{
3300	4682	copy.ResetBlockLoop(); // temporary problem
3301	4683
3302		- boolean random = CameraPane.RANDOM;
3303		- CameraPane.RANDOM = false; // parse everything
	4684	+ boolean random = CameraPane.SWITCH;
	4685	+ CameraPane.SWITCH = false; // parse everything
3304	4686	copy.ResetDisplayList();
3305	4687	copy.HardTouch();
3306		- CameraPane.RANDOM = random;
	4688	+ CameraPane.SWITCH = random;
3307	4689	}
3308	4690
3309	4691	// public void applySelf()
..	..	@@ -3350,7 +4732,7 @@
3350	4732	//copy.material = new cMaterial(copy.GetMaterial());
3351	4733
3352	4734	current.color = (float) colorField.getFloat();
3353		- current.modulation = (float) modulationField.getFloat();
	4735	+ current.modulation = (float) saturationField.getFloat();
3354	4736	current.metalness = (float) metalnessField.getFloat();
3355	4737	current.diffuse = (float) diffuseField.getFloat();
3356	4738	current.specular = (float) specularField.getFloat();
..	..	@@ -3377,6 +4759,36 @@
3377	4759	{
3378	4760	//System.out.println("Propagate = " + propagate);
3379	4761	copy.UpdateMaterial(anchor, current, propagate);
	4762	+
	4763	+ if (copy.material != null)
	4764	+ {
	4765	+ cMaterial mat = copy.material;
	4766	+
	4767	+ colorField.SetToolTipValue((mat.color));
	4768	+ saturationField.SetToolTipValue((mat.modulation));
	4769	+ metalnessField.SetToolTipValue((mat.metalness));
	4770	+ diffuseField.SetToolTipValue((mat.diffuse));
	4771	+ specularField.SetToolTipValue((mat.specular));
	4772	+ shininessField.SetToolTipValue((mat.shininess));
	4773	+ shiftField.SetToolTipValue((mat.shift));
	4774	+ ambientField.SetToolTipValue((mat.ambient));
	4775	+ lightareaField.SetToolTipValue((mat.lightarea));
	4776	+ diffusenessField.SetToolTipValue((mat.factor));
	4777	+ velvetField.SetToolTipValue((mat.velvet));
	4778	+ sheenField.SetToolTipValue((mat.sheen));
	4779	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4780	+ backlitField.SetToolTipValue((mat.bump));
	4781	+ anisoField.SetToolTipValue((mat.aniso));
	4782	+ anisoVField.SetToolTipValue((mat.anisoV));
	4783	+ cameraField.SetToolTipValue((mat.cameralight));
	4784	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4785	+ shadowField.SetToolTipValue((mat.shadow));
	4786	+ textureField.SetToolTipValue((mat.texture));
	4787	+ opacityField.SetToolTipValue((mat.opacity));
	4788	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4789	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4790	+ }
	4791	+
3380	4792	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3381	4793	{
3382	4794	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3405,9 +4817,28 @@
3405	4817	//copy.Touch();
3406	4818	}
3407	4819
	4820	+ cNumberSlider versionSlider;
	4821	+
3408	4822	public void stateChanged(ChangeEvent e)
3409	4823	{
3410	4824	// assert(false);
	4825	+ if (e.getSource() == versionSlider)
	4826	+ {
	4827	+ if (muteSlider)
	4828	+ return;
	4829	+
	4830	+ Replace();
	4831	+
	4832	+ int version = versionSlider.getInteger();
	4833	+
	4834	+ if (version != -1 && copy.versionlist[version] != null)
	4835	+ {
	4836	+ copy.versionindex = version;
	4837	+ CopyChanged();
	4838	+ }
	4839	+
	4840	+ return;
	4841	+ }
3411	4842
3412	4843	if (freezematerial)
3413	4844	{
..	..	@@ -3421,6 +4852,7 @@
3421	4852	\|\| e.getSource() == apertureField
3422	4853	\|\| e.getSource() == shadowblurField)
3423	4854	{
	4855	+ new Exception().printStackTrace();
3424	4856	System.exit(0);
3425	4857	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3426	4858	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3442,6 +4874,12 @@
3442	4874	{
3443	4875	//System.out.println("stateChanged = " + this);
3444	4876	materialtouched = true;
	4877	+
	4878	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4879	+ {
	4880	+ saturationField.setFloat(1);
	4881	+ }
	4882	+
3445	4883	applySelf();
3446	4884	//System.out.println("this = " + this);
3447	4885	//System.out.println("PARENT = " + parent);
..	..	@@ -3491,7 +4929,7 @@
3491	4929	}
3492	4930
3493	4931	if (normalpushField != null)
3494		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4932	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3495	4933	}
3496	4934
3497	4935	void SnapObject()
..	..	@@ -3741,6 +5179,7 @@
3741	5179	{
3742	5180	if (GetTree() != null)
3743	5181	{
	5182	+ GetTree().revalidate();
3744	5183	GetTree().repaint();
3745	5184	}
3746	5185
..	..	@@ -3749,12 +5188,19 @@
3749	5188	ctrlPanel.validate(); // ? new
3750	5189	ctrlPanel.repaint();
3751	5190	}
	5191	+
	5192	+ if (previousVersionButton != null && copy.versionlist != null)
	5193	+ SetVersionStates();
	5194	+
	5195	+ cameraView.requestFocusInWindow();
3752	5196	}
3753	5197
3754	5198	static TweenManager tweenManager = new TweenManager();
3755	5199
3756	5200	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3757	5201	{
	5202	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5203	+ Save();
3758	5204	//Tween.set(thing, 0).target(1).start(tweenManager);
3759	5205	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3760	5206	// if (thing instanceof GenericJointDemo)
..	..	@@ -3778,7 +5224,7 @@
3778	5224	// group = (Composite) group.get(0);
3779	5225	// }
3780	5226
3781		- System.out.println("makeSomething of " + thing);
	5227	+ //System.out.println("makeSomething of " + thing);
3782	5228
3783	5229	/*
3784	5230	if (deselect && jList != null)
..	..	@@ -3841,6 +5287,12 @@
3841	5287	{
3842	5288	ResetModel();
3843	5289	Select(thing.GetTreePath(), true, false); // unselect... false);
	5290	+
	5291	+ if (thing.Size() == 0)
	5292	+ {
	5293	+ //EditSelection(false);
	5294	+ }
	5295	+
3844	5296	refreshContents();
3845	5297	}
3846	5298
..	..	@@ -3958,6 +5410,7 @@
3958	5410	}
3959	5411	}
3960	5412	}
	5413	+
3961	5414	LoadGFDThread loadGFDThread;
3962	5415
3963	5416	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3977,8 +5430,10 @@
3977	5430
3978	5431	try
3979	5432	{
	5433	+ // Try compressed version first.
3980	5434	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3981		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5435	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5436	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3982	5437
3983	5438	readobj = (Object3D) p.readObject();
3984	5439	istream.close();
..	..	@@ -3986,7 +5441,22 @@
3986	5441	readobj.ResetDisplayList();
3987	5442	} catch (Exception e)
3988	5443	{
3989		- e.printStackTrace();
	5444	+ if (!e.toString().contains("GZIP"))
	5445	+ e.printStackTrace();
	5446	+
	5447	+ try
	5448	+ {
	5449	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5450	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5451	+
	5452	+ readobj = (Object3D) p.readObject();
	5453	+ istream.close();
	5454	+
	5455	+ readobj.ResetDisplayList();
	5456	+ } catch (Exception e2)
	5457	+ {
	5458	+ e2.printStackTrace();
	5459	+ }
3990	5460	}
3991	5461	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3992	5462	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4032,6 +5502,12 @@
4032	5502
4033	5503	void LoadIt(Object obj)
4034	5504	{
	5505	+ if (obj == null)
	5506	+ {
	5507	+ // Invalid file
	5508	+ return;
	5509	+ }
	5510	+
4035	5511	System.out.println("Loaded " + obj);
4036	5512	//new Exception().printStackTrace();
4037	5513	Object3D readobj = (Object3D) obj;
..	..	@@ -4041,10 +5517,14 @@
4041	5517
4042	5518	if (readobj != null)
4043	5519	{
	5520	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5521	+ // Save();
4044	5522	try
4045	5523	{
4046	5524	//readobj.deepCopySelf(copy);
4047	5525	copy.clear(); // june 2014
	5526	+ copy.skyboxname = readobj.skyboxname;
	5527	+ copy.skyboxext = readobj.skyboxext;
4048	5528	for (int i = 0; i < readobj.size(); i++)
4049	5529	{
4050	5530	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4085,6 +5565,7 @@
4085	5565	}
4086	5566	} catch (ClassCastException e)
4087	5567	{
	5568	+ e.printStackTrace();
4088	5569	assert (false);
4089	5570	Composite c = (Composite) copy;
4090	5571	c.children.clear();
..	..	@@ -4095,17 +5576,31 @@
4095	5576	c.addChild(csg);
4096	5577	}
4097	5578
	5579	+ copy.versionlist = readobj.versionlist;
	5580	+ copy.versionindex = readobj.versionindex;
	5581	+
	5582	+ if (copy.versionlist == null)
	5583	+ {
	5584	+ // Backward compatibility
	5585	+ copy.versionlist = new Object3D[100];
	5586	+ copy.versionindex = -1;
	5587	+
	5588	+ //Save(true);
	5589	+ }
	5590	+
	5591	+ //? SetUndoStates();
	5592	+
4098	5593	ResetModel();
4099	5594	copy.HardTouch(); // recompile?
4100	5595	refreshContents();
4101	5596	}
4102	5597	}
4103	5598
4104		- void load() // throws ClassNotFoundException
	5599	+ void Open() // throws ClassNotFoundException
4105	5600	{
4106		- if (GrafreeD.standAlone)
	5601	+ if (Grafreed.standAlone)
4107	5602	{
4108		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5603	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4109	5604	browser.show();
4110	5605	String filename = browser.getFile();
4111	5606	if (filename != null && filename.length() > 0)
..	..	@@ -4182,6 +5677,8 @@
4182	5677
4183	5678	void save()
4184	5679	{
	5680	+ Replace();
	5681	+
4185	5682	if (lastname == null)
4186	5683	{
4187	5684	return;
..	..	@@ -4190,11 +5687,13 @@
4190	5687	try
4191	5688	{
4192	5689	FileOutputStream ostream = new FileOutputStream(lastname);
4193		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5690	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5691	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4194	5692
4195	5693	p.writeObject(copy);
4196	5694	p.flush();
4197	5695
	5696	+ zstream.close();
4198	5697	ostream.close();
4199	5698
4200	5699	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4202,19 +5701,23 @@
4202	5701	//ps.print(buffer.toString());
4203	5702	} catch (IOException e)
4204	5703	{
	5704	+ e.printStackTrace();
4205	5705	}
4206	5706	}
	5707	+
4207	5708	String lastname;
4208	5709
4209	5710	void saveAs()
4210	5711	{
4211		- if (GrafreeD.standAlone)
	5712	+ if (Grafreed.standAlone)
4212	5713	{
4213	5714	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4214	5715	browser.setVisible(true);
4215	5716	String filename = browser.getFile();
4216	5717	if (filename != null && filename.length() > 0)
4217	5718	{
	5719	+ if (!filename.endsWith(".gfd"))
	5720	+ filename += ".gfd";
4218	5721	lastname = browser.getDirectory() + filename;
4219	5722	save();
4220	5723	}
..	..	@@ -4313,13 +5816,13 @@
4313	5816	try
4314	5817	{
4315	5818	FileOutputStream ostream = new FileOutputStream(filename);
4316		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4317		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5819	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5820	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4318	5821
4319	5822	Object3D objectparent = obj.parent;
4320	5823	obj.parent = null;
4321	5824
4322		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5825	+ Object3D object = (Object3D) Grafreed.clone(obj);
4323	5826
4324	5827	obj.parent = objectparent;
4325	5828
..	..	@@ -4331,8 +5834,8 @@
4331	5834	p.writeObject(object);
4332	5835	p.flush();
4333	5836
	5837	+ zstream.close();
4334	5838	ostream.close();
4335		- // zstream.close();
4336	5839
4337	5840	// group.selection.get(0).parent = parent;
4338	5841	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4353,7 +5856,7 @@
4353	5856	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4354	5857	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4355	5858	copy.generatePOV(buffer);
4356		- if (GrafreeD.standAlone)
	5859	+ if (Grafreed.standAlone)
4357	5860	{
4358	5861	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4359	5862	browser.show();
..	..	@@ -4379,21 +5882,20 @@
4379	5882	Object3D client;
4380	5883	Object3D copy;
4381	5884	MenuBar menuBar;
4382		- Menu windowMenu;
4383		- MenuItem loadItem;
	5885	+ Menu fileMenu;
	5886	+ MenuItem newItem;
	5887	+ MenuItem openItem;
4384	5888	MenuItem saveItem;
4385	5889	MenuItem saveAsItem;
4386	5890	MenuItem exportAsItem;
4387	5891	MenuItem reexportItem;
4388	5892	MenuItem povItem;
4389	5893	MenuItem closeItem;
4390		- Menu cameraMenu;
	5894	+
4391	5895	CheckboxMenuItem zBufferItem;
4392	5896	//MenuItem normalLensItem;
4393		- MenuItem editCameraItem;
4394		- MenuItem revertCameraItem;
4395		- CheckboxMenuItem toggleLiveItem;
4396	5897	MenuItem stepItem;
	5898	+ CheckboxMenuItem toggleLiveItem;
4397	5899	CheckboxMenuItem toggleFullScreenItem;
4398	5900	CheckboxMenuItem toggleTimelineItem;
4399	5901	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4402,25 +5904,40 @@
4402	5904	CheckboxMenuItem toggleFootContactItem;
4403	5905	CheckboxMenuItem toggleDLItem;
4404	5906	CheckboxMenuItem toggleTextureItem;
4405		- CheckboxMenuItem toggleRandomItem;
	5907	+ CheckboxMenuItem toggleSwitchItem;
4406	5908	CheckboxMenuItem toggleRootItem;
4407	5909	CheckboxMenuItem animationItem;
	5910	+ MenuItem archiveItem;
4408	5911	CheckboxMenuItem toggleHandleItem;
4409	5912	CheckboxMenuItem togglePaintItem;
4410	5913	JSplitPane mainPanel;
4411	5914	JScrollPane scrollpane;
	5915	+
4412	5916	JPanel toolbarPanel;
4413		- JPanel treePanel;
	5917	+
	5918	+ cGridBag treePanel;
	5919	+
4414	5920	JPanel radioPanel;
4415	5921	ButtonGroup buttonGroup;
4416		- cGridBag ctrlPanel;
	5922	+
	5923	+ cGridBag toolboxPanel;
	5924	+ cGridBag skyboxPanel;
4417	5925	cGridBag materialPanel;
	5926	+ cGridBag ctrlPanel;
	5927	+
4418	5928	JScrollPane infoPanel;
	5929	+
4419	5930	cGridBag optionsPanel;
	5931	+
4420	5932	JTabbedPane objectPanel;
	5933	+ boolean materialFlushed;
	5934	+ Object3D latestObject;
	5935	+
4421	5936	cGridBag XYZPanel;
	5937	+
4422	5938	JSplitPane gridPanel;
4423	5939	JSplitPane bigPanel;
	5940	+
4424	5941	cGridBag bigThree;
4425	5942	cGridBag scenePanel;
4426	5943	cGridBag centralPanel;
..	..	@@ -4478,7 +5995,7 @@
4478	5995	JLabel colorLabel;
4479	5996	cNumberSlider colorField;
4480	5997	JLabel modulationLabel;
4481		- cNumberSlider modulationField;
	5998	+ cNumberSlider saturationField;
4482	5999	JLabel metalnessLabel;
4483	6000	cNumberSlider metalnessField;
4484	6001	JLabel diffuseLabel;
..	..	@@ -4509,6 +6026,7 @@
4509	6026	cNumberSlider anisoField;
4510	6027	JLabel anisoVLabel;
4511	6028	cNumberSlider anisoVField;
	6029	+
4512	6030	JLabel cameraLabel;
4513	6031	cNumberSlider cameraField;
4514	6032	JLabel selfshadowLabel;
..	..	@@ -4523,6 +6041,7 @@
4523	6041	cNumberSlider fakedepthField;
4524	6042	JLabel shadowbiasLabel;
4525	6043	cNumberSlider shadowbiasField;
	6044	+
4526	6045	JLabel bumpLabel;
4527	6046	cNumberSlider bumpField;
4528	6047	JLabel noiseLabel;
..	..	@@ -4535,8 +6054,13 @@
4535	6054	cNumberSlider fogField;
4536	6055	JLabel opacityPowerLabel;
4537	6056	cNumberSlider opacityPowerField;
4538		- JTree jTree;
	6057	+ cTree jTree;
4539	6058	//ObjectUI parent;
4540	6059
4541	6060	cNumberSlider normalpushField;
	6061	+
	6062	+ private MenuItem importGFDItem;
	6063	+ private MenuItem importVRMLX3DItem;
	6064	+ private MenuItem import3DSItem;
	6065	+ private MenuItem importOBJItem;
4542	6066	}