~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.*;
..	..	@@ -14,10 +15,15 @@
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
16	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
17	21	//import javax.media.opengl.GLCanvas;
18	22
19	23	import //weka.core.
20	24	matrix.Matrix;
	25	+
	26	+import grafeme.ui.*;
21	27
22	28	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	29	ActionListener, ChangeListener,
..	..	@@ -28,7 +34,88 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ public cToggleButton pinButton;
	38	+ boolean timeline;
	39	+ boolean wasFullScreen;
31	40
	41	+ GroupEditor callee;
	42	+ JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
	53	+
	54	+ cButton GetButton(String name, boolean border)
	55	+ {
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
	64	+ }
	65	+
	66	+ cToggleButton GetToggleButton(String name, boolean border)
	67	+ {
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
	70	+ }
	71	+
	72	+ cCheckBox GetCheckBox(String name, boolean border)
	73	+ {
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
	80	+ try
	81	+ {
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
	98	+ }
	99	+ catch (Exception e)
	100	+ {
	101	+ return null;
	102	+ }
	103	+ }
	104	+
	105	+ BufferedImage GetImage(String name)
	106	+ {
	107	+ try
	108	+ {
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
	112	+ }
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
	117	+ }
	118	+
32	119	// SCRIPT
33	120
34	121	transient JFrame textpanel = null;
..	..	@@ -119,51 +206,62 @@
119	206	void keyPressed(int key, int modifiers)
120	207	{
121	208	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	209	+ Globals.theRenderer.keyPressed(key, modifiers);
123	210	}
124	211	*/
125	212
126	213	static GridBagConstraints aConstraints;
127	214	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	215	+
130	216	static int GRIDWIDTH = 100; // 4;
131	217
132	218	public void closeUI()
133	219	{
134	220	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	221	+// System.out.println("this = " + this);
	222	+// System.out.println("objEditor = " + objEditor);
137	223	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	224	+// objEditor.ctrlPanel.remove(nameField);
139	225
140		- if (!GroupEditor.allparams)
	226	+ objEditor.ctrlPanel.remove(namePanel);
	227	+
	228	+ if (!allparams)
141	229	return;
142	230
143		- objEditor.ctrlPanel.remove(liveCB);
144		- objEditor.ctrlPanel.remove(hideCB);
145		- objEditor.ctrlPanel.remove(markCB);
146		-
147		- objEditor.ctrlPanel.remove(randomCB);
148		- objEditor.ctrlPanel.remove(speedupCB);
149		- objEditor.ctrlPanel.remove(rewindCB);
150		-
151		- objEditor.ctrlPanel.remove(resetButton);
152		- objEditor.ctrlPanel.remove(stepButton);
153		-// objEditor.ctrlPanel.remove(stepAllButton);
154		-// objEditor.ctrlPanel.remove(resetAllButton);
155		- objEditor.ctrlPanel.remove(link2masterCB);
156		- //objEditor.ctrlPanel.remove(flipVCB);
157		- //objEditor.ctrlPanel.remove(texresMenu);
158		- objEditor.ctrlPanel.remove(slowerButton);
159		- objEditor.ctrlPanel.remove(fasterButton);
160		- objEditor.ctrlPanel.remove(remarkButton);
	231	+// objEditor.ctrlPanel.remove(liveCB);
	232	+// objEditor.ctrlPanel.remove(hideCB);
	233	+// objEditor.ctrlPanel.remove(markCB);
	234	+//
	235	+// objEditor.ctrlPanel.remove(randomCB);
	236	+// objEditor.ctrlPanel.remove(speedupCB);
	237	+// objEditor.ctrlPanel.remove(rewindCB);
	238	+//
	239	+// objEditor.ctrlPanel.remove(resetButton);
	240	+// objEditor.ctrlPanel.remove(stepButton);
	241	+//// objEditor.ctrlPanel.remove(stepAllButton);
	242	+//// objEditor.ctrlPanel.remove(resetAllButton);
	243	+// objEditor.ctrlPanel.remove(link2masterCB);
	244	+// //objEditor.ctrlPanel.remove(flipVCB);
	245	+// //objEditor.ctrlPanel.remove(texresMenu);
	246	+// objEditor.ctrlPanel.remove(slowerButton);
	247	+// objEditor.ctrlPanel.remove(fasterButton);
	248	+// objEditor.ctrlPanel.remove(remarkButton);
	249	+
	250	+ objEditor.ctrlPanel.remove(setupPanel);
	251	+ objEditor.ctrlPanel.remove(setupPanel2);
	252	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	253	+ objEditor.ctrlPanel.remove(pushPanel);
	254	+ //objEditor.ctrlPanel.remove(fillPanel);
	255	+
	256	+ //Remove(normalpushField);
161	257	}
162	258
163	259	public ObjEditor GetEditor()
164	260	{
165	261	return objEditor; //.GetEditor();
166	262	}
	263	+
	264	+ // Sometimes myself, sometimes my callee's.
167	265	ObjEditor objEditor;
168	266
169	267	/*
..	..	@@ -199,6 +297,12 @@
199	297	client = inClient;
200	298	copy = client;
201	299
	300	+ if (copy.versionlist == null)
	301	+ {
	302	+ copy.versionlist = new Object3D[100];
	303	+ copy.versionindex = -1;
	304	+ }
	305	+
202	306	// "this" is not called: SetupUI2(objEditor);
203	307	}
204	308
..	..	@@ -212,6 +316,12 @@
212	316	client = inClient;
213	317	copy = client;
214	318
	319	+ if (copy.versionlist == null)
	320	+ {
	321	+ copy.versionlist = new Object3D[100];
	322	+ copy.versionindex = -1;
	323	+ }
	324	+
215	325	SetupUI2(callee.GetEditor());
216	326	}
217	327
..	..	@@ -226,6 +336,7 @@
226	336	//localCopy.parent = null;
227	337
228	338	frame = new JFrame();
	339	+ frame.setUndecorated(false);
229	340	objEditor = this;
230	341	this.callee = callee;
231	342
..	..	@@ -238,11 +349,17 @@
238	349	//if (!isDisplayable())
239	350	//setUndecorated(true);
240	351
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	352	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	353	client = inClient;
243	354	copy = localCopy;
244	355	copy.editWindow = this;
245	356
	357	+ if (copy.versionlist == null)
	358	+ {
	359	+// copy.versions = new byte[100][];
	360	+// copy.versionindex = -1;
	361	+ }
	362	+
246	363	SetupMenu();
247	364
248	365	//SetupName(objEditor); // new
..	..	@@ -256,28 +373,49 @@
256	373	return frame.action(event, obj);
257	374	}
258	375
	376	+ // Cannot work without static
	377	+ static boolean allparams = true;
	378	+
	379	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	380	+
259	381	void SetupMenu()
260	382	{
261	383	frame.setMenuBar(menuBar = new MenuBar());
262		- menuBar.add(windowMenu = new Menu("File"));
263		- windowMenu.add(loadItem = new MenuItem("Load..."));
264		- windowMenu.add("-");
265		- windowMenu.add(saveItem = new MenuItem("Save"));
266		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	384	+ menuBar.add(fileMenu = new Menu("File"));
	385	+ fileMenu.add(newItem = new MenuItem("New"));
	386	+ fileMenu.add(openItem = new MenuItem("Open..."));
	387	+
	388	+ //oe.menuBar.add(menu = new Menu("Include"));
	389	+ Menu menu = new Menu("Import");
	390	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	391	+ importOBJItem.addActionListener(this);
	392	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	393	+ import3DSItem.addActionListener(this);
	394	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	395	+ importVRMLX3DItem.addActionListener(this);
	396	+ menu.add("-");
	397	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	398	+ importGFDItem.addActionListener(this);
	399	+ fileMenu.add(menu);
	400	+ fileMenu.add("-");
	401	+
	402	+ fileMenu.add(saveItem = new MenuItem("Save"));
	403	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	404	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
268		- windowMenu.add("-");
269		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
270		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
271		- windowMenu.add("-");
	405	+ fileMenu.add("-");
	406	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	407	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	408	+ fileMenu.add("-");
272	409	if (client.parent != null)
273	410	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	411	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	412	} else
276	413	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	414	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	415	}
279	416
280		- loadItem.addActionListener(this);
	417	+ newItem.addActionListener(this);
	418	+ openItem.addActionListener(this);
281	419	saveItem.addActionListener(this);
282	420	saveAsItem.addActionListener(this);
283	421	exportAsItem.addActionListener(this);
..	..	@@ -285,80 +423,71 @@
285	423	//povItem.addActionListener(this);
286	424	closeItem.addActionListener(this);
287	425
288		- menuBar.add(cameraMenu = new Menu("View"));
289		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
290		- //zBufferItem.addActionListener(this);
291		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
292		- //normalLensItem.addActionListener(this);
293		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294		- revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
298		- cameraMenu.add("-");
299		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300		- toggleTextureItem.addItemListener(this);
301		- toggleTextureItem.setState(CameraPane.textureon);
302		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303		- toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
305		- cameraMenu.add(stepItem = new MenuItem("Step"));
306		- stepItem.addActionListener(this);
307		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
308		-// toggleDLItem.addItemListener(this);
309		-// toggleDLItem.setState(false);
310		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
311		- toggleRenderItem.addItemListener(this);
312		- toggleRenderItem.setState(!CameraPane.frozen);
313		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
314		- toggleDebugItem.addItemListener(this);
315		- toggleDebugItem.setState(CameraPane.DEBUG);
316		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
317		- toggleFrustumItem.addItemListener(this);
318		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
319		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
320		- toggleFootContactItem.addItemListener(this);
321		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
322		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
323		- toggleRandomItem.addItemListener(this);
324		- toggleRandomItem.setState(CameraPane.RANDOM);
325		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
326		- toggleHandleItem.addItemListener(this);
327		- toggleHandleItem.setState(CameraPane.HANDLES);
328		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
329		- togglePaintItem.addItemListener(this);
330		- togglePaintItem.setState(CameraPane.PAINTMODE);
331		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
332		-// toggleRootItem.addItemListener(this);
333		-// toggleRootItem.setState(false);
334		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
335		-// animationItem.addItemListener(this);
336		-// animationItem.setState(CameraPane.ANIMATION);
337		- cameraMenu.add("-");
338		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
339		- editCameraItem.addActionListener(this);
340		-
341	426	objectPanel = new JTabbedPane();
	427	+
	428	+ ChangeListener changeListener = new ChangeListener()
	429	+ {
	430	+ public void stateChanged(ChangeEvent changeEvent)
	431	+ {
	432	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	433	+// {
	434	+// if (latestObject != null)
	435	+// {
	436	+// refreshContents(true);
	437	+// SetMaterial(latestObject);
	438	+// }
	439	+//
	440	+// materialFlushed = true;
	441	+// }
	442	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	443	+// {
	444	+// if (listUI.size() == 0)
	445	+// EditSelection(false);
	446	+// }
	447	+
	448	+ refreshContents(false); // To refresh Info tab
	449	+ }
	450	+ };
	451	+ objectPanel.addChangeListener(changeListener);
	452	+
342	453	toolbarPanel = new JPanel();
343	454	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	455	+
	456	+ treePanel = new cGridBag();
345	457	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
349		- materialPanel.setName("Material");
	458	+
	459	+ editPanel = new cGridBag().setVertical(true);
	460	+ //editPanel.setName("Edit");
	461	+
	462	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	463	+
	464	+ editCommandsPanel = new cGridBag();
	465	+ editPanel.add(editCommandsPanel);
	466	+ editPanel.add(ctrlPanel);
	467	+
	468	+ toolboxPanel = new cGridBag().setVertical(true);
	469	+ //toolboxPanel.setName("Toolbox");
	470	+
	471	+ skyboxPanel = new cGridBag().setVertical(true);
	472	+
	473	+ materialPanel = new cGridBag().setVertical(false);
	474	+ //materialPanel.setName("Material");
	475	+
350	476	/JTextPane/
351	477	infoarea = createTextPane();
	478	+ doc = infoarea.getStyledDocument();
	479	+
352	480	infoarea.setEditable(true);
353	481	SetText();
	482	+
354	483	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	484	// infoarea.setOpaque(false);
356	485	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	486	+// TEXTAREA infoarea.setLineWrap(true);
	487	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	488	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360		- infoPanel.setPreferredSize(new Dimension(50, 200));
361		- infoPanel.setName("Info");
	489	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	490	+ //infoPanel.setName("Info");
362	491	//infoPanel.setLayout(new BorderLayout());
363	492	//infoPanel.add(createTextPane());
364	493
..	..	@@ -366,16 +495,23 @@
366	495	mainPanel.setName("Main");
367	496	mainPanel.setContinuousLayout(true);
368	497	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	498	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
372		-
	499	+ mainPanel.setDividerLocation(0.5); //1.0);
	500	+ mainPanel.setResizeWeight(0.5);
	501	+
	502	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	503	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	504	+ divider.setDividerSize(15);
	505	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	506	+
	507	+ mainPanel.setUI(new BasicSplitPaneUI());
	508	+
373	509	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	510	//mainPanel.setLayout(new GridBagLayout());
375	511	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	512	+// treePanel.setLayout(new GridBagLayout());
	513	+ //ctrlPanel.setLayout(new GridBagLayout());
	514	+ //materialPanel.setLayout(new GridBagLayout());
379	515
380	516	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	517	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +550,7 @@
414	550	static String newline = "\n";
415	551	protected static final String buttonString = "JButton";
416	552	StyledDocument doc;
417		- JTextArea infoarea;
	553	+ JTextPane infoarea;
418	554
419	555	void ClearInfo()
420	556	{
..	..	@@ -437,10 +573,10 @@
437	573	e.printStackTrace();
438	574	}
439	575
440		- String selection = infoarea.getText();
441		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
442		- java.awt.datatransfer.Clipboard clipboard =
443		- Toolkit.getDefaultToolkit().getSystemClipboard();
	576	+// String selection = infoarea.getText();
	577	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	578	+// java.awt.datatransfer.Clipboard clipboard =
	579	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	580	//clipboard.setContents(data, data);
445	581	}
446	582
..	..	@@ -463,13 +599,13 @@
463	599	//SendInfo("Name:", "bold");
464	600	if (sel.GetTextures() != null \|\| debug)
465	601	{
466		- si.SendInfo(sel.toString(), "bold");
	602	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	603	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	604	if (sel.Size() > 0)
469	605	{
470	606	si.SendInfo("#children = " + sel.Size(), "regular");
471	607	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	608	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	609	if (debug)
474	610	{
475	611	try
..	..	@@ -481,7 +617,10 @@
481	617	}
482	618
483	619	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	620	+ {
	621	+ si.SendInfo(" BBox min: " + minima, "regular");
	622	+ si.SendInfo(" BBox max: " + maxima, "regular");
	623	+ }
485	624
486	625	if (sel.bRep != null)
487	626	{
..	..	@@ -508,7 +647,7 @@
508	647	}
509	648	if (sel.support != null)
510	649	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	650	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	651	}
513	652	if (sel.scriptnode != null)
514	653	{
..	..	@@ -522,18 +661,18 @@
522	661	maxima.y = sel.toParent[3][1];
523	662	maxima.z = sel.toParent[3][2];
524	663	si.SendInfo(" Orig: " + maxima, "regular");
525		- maxima.x = sel.globalTransform[3][0];
526		- maxima.y = sel.globalTransform[3][1];
527		- maxima.z = sel.globalTransform[3][2];
528		- if (full)
529		- si.SendInfo(" Global Orig: " + maxima, "regular");
530	664	maxima.x = sel.toParent[0][0];
531	665	maxima.y = sel.toParent[1][1];
532	666	maxima.z = sel.toParent[2][2];
533	667	si.SendInfo(" Scale: " + maxima, "regular");
534		- maxima.x = sel.globalTransform[0][0];
535		- maxima.y = sel.globalTransform[1][1];
536		- maxima.z = sel.globalTransform[2][2];
	668	+ maxima.x = sel.globalTransform[3][0];
	669	+ maxima.y = sel.globalTransform[3][1];
	670	+ maxima.z = sel.globalTransform[3][2];
	671	+ if (full)
	672	+ si.SendInfo(" Global Orig: " + maxima, "regular");
	673	+ maxima.x = sel.globalTransform[0][0];
	674	+ maxima.y = sel.globalTransform[1][1];
	675	+ maxima.z = sel.globalTransform[2][2];
537	676	if (full)
538	677	si.SendInfo(" Global Scale: " + maxima, "regular");
539	678	}
..	..	@@ -579,6 +718,9 @@
579	718	{
580	719	CameraPane.pointflow = (PointFlow) sel;
581	720	}
	721	+
	722	+ si.SendInfo("_____________________", "regular");
	723	+ si.SendInfo("", "regular");
582	724	}
583	725	}
584	726
..	..	@@ -594,52 +736,205 @@
594	736	}
595	737	}
596	738
597		- private JTextArea createTextPane()
598		- {
599		- String[] initString =
600		- {
601		- "This is an editable JTextPane, ", //regular
602		- "another ", //italic
603		- "styled ", //bold
604		- "text ", //small
605		- "component, ", //large
606		- "which supports embedded components..." + newline,//regular
607		- " " + newline, //button
608		- "...and embedded icons..." + newline, //regular
609		- " ", //icon
610		- newline + "JTextPane is a subclass of JEditorPane that "
611		- + "uses a StyledEditorKit and StyledDocument, and provides "
612		- + "cover methods for interacting with those objects."
613		- };
	739	+//static GraphicsDevice device = GraphicsEnvironment
	740	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	741
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	742	+ Rectangle keeprect;
	743	+ cRadio radio;
	744	+
	745	+cButton keepButton;
	746	+ cButton twoButton; // Full 3D
	747	+ cButton sixButton;
	748	+ cButton threeButton;
	749	+ cButton sevenButton;
	750	+ cButton fourButton; // full panel
	751	+ cButton oneButton; // full XYZ
	752	+ //cButton currentLayout;
	753	+
	754	+ boolean maximized;
	755	+
	756	+ cButton fullscreenLayout;
	757	+ cButton expandedLayout;
621	758
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	759	+ void Minimize()
628	760	{
629		- for (int j = 0; j < 2; j++)
	761	+ frame.setState(Frame.ICONIFIED);
	762	+ frame.validate();
	763	+ }
	764	+
	765	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	766	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	767	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	768	+ void Maximize()
	769	+ {
	770	+ if (CameraPane.FULLSCREEN)
630	771	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	772	+ ToggleFullScreen();
636	773	}
637		- } catch (BadLocationException ble)
	774	+
	775	+ if (maximized)
	776	+ {
	777	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	778	+ }
	779	+ else
	780	+ {
	781	+ keeprect = frame.getBounds();
	782	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	783	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	784	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	785	+// frame.setState(Frame.MAXIMIZED_BOTH);
	786	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	787	+ }
	788	+
	789	+ maximized ^= true;
	790	+
	791	+ frame.validate();
	792	+ }
	793	+
	794	+ cButton minButton;
	795	+ cButton maxButton;
	796	+ cButton fullButton;
	797	+ cButton collapseButton;
	798	+ cButton maximize3DButton;
	799	+
	800	+ void ToggleFullScreen()
638	801	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	802	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	803	+
	804	+ cameraView.ToggleFullScreen();
	805	+
	806	+ if (!CameraPane.FULLSCREEN)
	807	+ {
	808	+ device.setFullScreenWindow(null);
	809	+ frame.dispose();
	810	+ frame.setUndecorated(false);
	811	+ frame.validate();
	812	+ frame.setVisible(true);
	813	+
	814	+ //frame.setVisible(false);
	815	+// frame.removeNotify();
	816	+// frame.setUndecorated(false);
	817	+// frame.addNotify();
	818	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	819	+
	820	+// X frame.getContentPane().remove(/"Center",/bigThree);
	821	+// X framePanel.add(bigThree);
	822	+// X frame.getContentPane().add(/"Center",/framePanel);
	823	+// framePanel.setDividerLocation(46); // icons are 24x24
	824	+
	825	+ //frame.setVisible(true);
	826	+// radio.layout = keepButton;
	827	+ //theFrame = null;
	828	+ keepButton = null;
	829	+// radio.layout.doClick();
	830	+
	831	+ } else
	832	+ {
	833	+ keepButton = radio.layout;
	834	+ //keeprect = frame.getBounds();
	835	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	836	+// frame.getToolkit().getScreenSize().height);
	837	+ //frame.setVisible(false);
	838	+
	839	+ frame.dispose();
	840	+ frame.setUndecorated(true);
	841	+ device.setFullScreenWindow(frame);
	842	+ frame.validate();
	843	+ frame.setVisible(true);
	844	+// frame.removeNotify();
	845	+// frame.setUndecorated(true);
	846	+// frame.addNotify();
	847	+// X frame.getContentPane().remove(/"Center",/framePanel);
	848	+// X framePanel.remove(bigThree);
	849	+// X frame.getContentPane().add(/"Center",/bigThree);
	850	+// framePanel.setDividerLocation(0);
	851	+
	852	+// radio.layout = fullscreenLayout;
	853	+// radio.layout.doClick();
	854	+ //frame.setVisible(true);
	855	+ }
	856	+ frame.validate();
	857	+
	858	+ cameraView.requestFocusInWindow();
640	859	}
641	860
642		- return new JTextArea(); // textPane;
	861	+ void CollapseToolbar()
	862	+ {
	863	+ framePanel.setDividerLocation(0);
	864	+ //frame.validate();
	865	+
	866	+ cameraView.requestFocusInWindow();
	867	+ }
	868	+
	869	+ private Object3D Duplicate(Object3D object)
	870	+ {
	871	+ boolean temp = CameraPane.SWITCH;
	872	+ CameraPane.SWITCH = false;
	873	+
	874	+ object.ExtractBigData(versiontable);
	875	+ // if (copy == client)
	876	+
	877	+ Object3D versions[] = object.versionlist;
	878	+ object.versionlist = null;
	879	+
	880	+ //byte[] compress = Compress(copy);
	881	+ Object3D compress = (Object3D)Grafreed.clone(object);
	882	+
	883	+ object.versionlist = versions;
	884	+
	885	+ object.RestoreBigData(versiontable);
	886	+
	887	+ CameraPane.SWITCH = temp;
	888	+
	889	+ return compress;
	890	+ }
	891	+
	892	+ private JTextPane createTextPane()
	893	+ {
	894	+// TEXTAREA String[] initString =
	895	+// {
	896	+// "This is an editable JTextPane, ", //regular
	897	+// "another ", //italic
	898	+// "styled ", //bold
	899	+// "text ", //small
	900	+// "component, ", //large
	901	+// "which supports embedded components..." + newline,//regular
	902	+// " " + newline, //button
	903	+// "...and embedded icons..." + newline, //regular
	904	+// " ", //icon
	905	+// newline + "JTextPane is a subclass of JEditorPane that "
	906	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	907	+// + "cover methods for interacting with those objects."
	908	+// };
	909	+//
	910	+// String[] initStyles =
	911	+// {
	912	+// "regular", "italic", "bold", "small", "large",
	913	+// "regular", "button", "regular", "icon",
	914	+// "regular"
	915	+// };
	916	+//
	917	+// JTextPane textPane = new JTextPane();
	918	+// textPane.setEditable(true);
	919	+// /StyledDocument/ doc = textPane.getStyledDocument();
	920	+// addStylesToDocument(doc);
	921	+//
	922	+// try
	923	+// {
	924	+// for (int j = 0; j < 2; j++)
	925	+// {
	926	+// for (int i = 0; i < initString.length; i++)
	927	+// {
	928	+// doc.insertString(doc.getLength(), initString[i],
	929	+// doc.getStyle(initStyles[i]));
	930	+// }
	931	+// }
	932	+// } catch (BadLocationException ble)
	933	+// {
	934	+// System.err.println("Couldn't insert initial text into text pane.");
	935	+// }
	936	+
	937	+ return new JTextPane(); // textPane;
643	938	}
644	939
645	940	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +987,7 @@
692	987	protected static ImageIcon createImageIcon(String path,
693	988	String description)
694	989	{
695		- java.net.URL imgURL = GraphreeD.class.getResource(path);
	990	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	991	if (imgURL != null)
697	992	{
698	993	return new ImageIcon(imgURL, description);
..	..	@@ -715,6 +1010,7 @@
715	1010	{
716	1011	SetupMaterial(materialPanel);
717	1012	}
	1013	+
718	1014	//SetupName();
719	1015	//SetupViews();
720	1016	}
..	..	@@ -724,6 +1020,7 @@
724	1020	// NumberSlider vDivsField;
725	1021	// JCheckBox endcaps;
726	1022	JCheckBox liveCB;
	1023	+ JCheckBox selectableCB;
727	1024	JCheckBox hideCB;
728	1025	JCheckBox link2masterCB;
729	1026	JCheckBox markCB;
..	..	@@ -731,7 +1028,12 @@
731	1028	JCheckBox speedupCB;
732	1029	JCheckBox rewindCB;
733	1030	JCheckBox flipVCB;
	1031	+
	1032	+ cCheckBox toggleTextureCB;
	1033	+ cCheckBox toggleSwitchCB;
	1034	+
734	1035	JComboBox texresMenu;
	1036	+
735	1037	JButton resetButton;
736	1038	JButton stepButton;
737	1039	JButton stepAllButton;
..	..	@@ -739,115 +1041,87 @@
739	1041	JButton slowerButton;
740	1042	JButton fasterButton;
741	1043	JButton remarkButton;
	1044	+
	1045	+ cGridBag editPanel;
	1046	+ cGridBag editCommandsPanel;
	1047	+
	1048	+ cGridBag namePanel;
	1049	+ cGridBag setupPanel;
	1050	+ cGridBag setupPanel2;
	1051	+ cGridBag objectCommandsPanel;
	1052	+ cGridBag pushPanel;
	1053	+ cGridBag fillPanel;
742	1054
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1055	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	1056	{
745	1057	JCheckBox cb;
746	1058
747		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
748		- oe.aConstraints.gridwidth = 1; // 3;
749		-// oe.aConstraints.weightx = 1;
750		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
751		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1059	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	1060	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	1061
757	1062	return cb;
758	1063	}
759	1064
760		- cButton AddButton(ObjEditor oe, String label)
	1065	+ cButton AddButton(cGridBag panel, String label)
761	1066	{
762	1067	cButton cb;
763	1068
764		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
765		- oe.aConstraints.gridwidth = 1;
766		-// oe.aConstraints.weightx = 1;
767		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
768		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1069	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	1070	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	1071
774	1072	return cb;
775	1073	}
776	1074
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1075	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	1076	{
779	1077	JComboBox combo;
780	1078
781		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
782		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
783		- oe.aConstraints.gridx += 1;
	1079	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	1080	combo.addActionListener(this);
785	1081
786	1082	return combo;
787	1083	}
788	1084
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1085	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	1086	{
791		- NumberSlider combo;
	1087	+ cGridBag control = new cGridBag();
	1088	+
	1089	+ cNumberSlider combo;
792	1090
793	1091	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	1092	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797		- aConstraints.gridwidth = 2;
798		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799		- aConstraints.gridx += 1;
800		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
801		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- aConstraints.gridx += 1;
804		- aConstraints.gridwidth = 1;
805		-
	1093	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1094	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	1095	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	1096	+
	1097	+ panel.add(control);
	1098	+
	1099	+ return control;
813	1100	}
814	1101
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1102	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	1103	{
817		- NumberSlider combo;
	1104	+ cGridBag control = new cGridBag();
	1105	+
	1106	+ cNumberSlider combo;
818	1107
819	1108	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1109	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 2;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	1110	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1111	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1112	combo.setInteger(current);
833	1113
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1114	+ panel.add(control);
	1115	+
	1116	+ return control;
839	1117	}
840	1118
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1119	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1120	{
843	1121	JTextArea text;
844	1122
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1123	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1124	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1125
852	1126	return text;
853	1127	}
..	..	@@ -877,9 +1151,16 @@
877	1151	objEditor.ctrlPanel.remove(j);
878	1152	}
879	1153
	1154	+ void Remove(cNumberSlider j)
	1155	+ {
	1156	+ j.removeChangeListener(this);
	1157	+ //objEditor.ctrlPanel.remove(j.label);
	1158	+ objEditor.ctrlPanel.remove(j);
	1159	+ }
	1160	+
880	1161	/*
881	1162	*/
882		- void Return() // ObjEditor oe)
	1163	+ void Return0() // ObjEditor oe)
883	1164	{
884	1165	aConstraints.gridy += 1;
885	1166	aConstraints.gridx = 0;
..	..	@@ -934,35 +1215,93 @@
934	1215
935	1216	void SetupUI2(ObjEditor oe)
936	1217	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1218	+ //SetupName(oe);
942	1219
943		- if (!GroupEditor.allparams)
	1220	+ namePanel = new cGridBag();
	1221	+
	1222	+ //if (copy.pinned)
	1223	+ {
	1224	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1225	+ pinButton.setSelected(copy.pinned);
	1226	+ cGridBag t = new cGridBag();
	1227	+ t.preferredWidth = 2;
	1228	+ t.add(pinButton);
	1229	+ namePanel.add(t);
	1230	+
	1231	+ pinButton.addItemListener(this);
	1232	+ }
	1233	+
	1234	+ nameField = AddText(namePanel, copy.GetName());
	1235	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1236	+ oe.ctrlPanel.add(namePanel);
	1237	+
	1238	+ oe.ctrlPanel.Return();
	1239	+
	1240	+ if (!allparams)
944	1241	return;
945	1242
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1243	+ setupPanel = new cGridBag().setVertical(false);
	1244	+
	1245	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1246	+ liveCB.setToolTipText("Animate object");
	1247	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1248	+ selectableCB.setToolTipText("Make object selectable");
949	1249	// Return();
950		- markCB = AddCheckBox(oe, "Mark", copy.marked);
951		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
952		- randomCB = AddCheckBox(oe, "Rand", copy.random);
953		- Return();
954		- resetButton = AddButton(oe, "Reset");
955		- stepButton = AddButton(oe, "Step");
	1250	+
	1251	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1252	+ hideCB.setToolTipText("Hide object");
	1253	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1254	+ markCB.setToolTipText("As animation target transform");
	1255	+
	1256	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1257	+
	1258	+ setupPanel2 = new cGridBag().setVertical(false);
	1259	+
	1260	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1261	+ rewindCB.setToolTipText("Rewind animation");
	1262	+
	1263	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1264	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1265	+
	1266	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1267	+ link2masterCB.setToolTipText("Attach to support");
	1268	+
	1269	+ if (Globals.ADVANCED)
	1270	+ {
	1271	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1272	+ speedupCB.setToolTipText("Option motion capture");
	1273	+ }
	1274	+
	1275	+ oe.ctrlPanel.add(setupPanel);
	1276	+ oe.ctrlPanel.Return();
	1277	+ oe.ctrlPanel.add(setupPanel2);
	1278	+ oe.ctrlPanel.Return();
	1279	+
	1280	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1281	+
	1282	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1283	+ resetButton.setToolTipText("Jump to frame zero");
	1284	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1285	+ stepButton.setToolTipText("Step one frame");
956	1286	// resetAllButton = AddButton(oe, "Reset All");
957	1287	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1288	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1289	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1290	+ slowerButton.setToolTipText("Decrease animation speed");
	1291	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1292	+ fasterButton.setToolTipText("Increase animation speed");
	1293	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1294	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1295
964		- Return();
	1296	+ oe.ctrlPanel.add(objectCommandsPanel);
	1297	+ oe.ctrlPanel.Return();
965	1298
	1299	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1300	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1301	+ //Return();
	1302	+
	1303	+ oe.ctrlPanel.Return();
	1304	+
966	1305	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1306	// ObjEditor.aConstraints.gridx += 1;
968	1307
..	..	@@ -1056,7 +1395,7 @@
1056	1395	oe.aConstraints.gridwidth = 1;
1057	1396	/**/
1058	1397	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1398	+ oe.ctrlPanel.Return();
1060	1399
1061	1400	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1401	//textureButton.setEnabled(false);
..	..	@@ -1107,7 +1446,7 @@
1107	1446	//frontScroll.setLabel("------------------------------ XZ (front) ---------------------------------------------------");
1108	1447	//sideScroll.setLabel("------------------------------- YZ (side) ---------------------------------------------------");
1109	1448
1110		-// GridBagConstraints gbc = (GridBagConstraints) GraphreeD.clone(aConstraints);
	1449	+// GridBagConstraints gbc = (GridBagConstraints) GrafreeD.clone(aConstraints);
1111	1450	Camera cam = GetCamera(copy, 0);
1112	1451
1113	1452	Composite cams = null;
..	..	@@ -1158,10 +1497,28 @@
1158	1497	//JPanel worldPanel =
1159	1498	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1499	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1500	+ centralPanel = new cGridBag();
	1501	+ centralPanel.preferredWidth = 20;
	1502	+
	1503	+ if (Globals.ADVANCED)
	1504	+ {
	1505	+ timelinePanel = new JPanel(new BorderLayout());
	1506	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1507
	1508	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1509	+ cameraPanel.setContinuousLayout(true);
	1510	+ cameraPanel.setOneTouchExpandable(true);
	1511	+// cameraPanel.setDividerLocation(0.9);
	1512	+// cameraPanel.setDividerSize(9);
	1513	+ cameraPanel.setResizeWeight(1.0);
	1514	+
	1515	+ }
	1516	+
	1517	+ centralPanel.add(cameraView);
	1518	+ centralPanel.setFocusable(true);
	1519	+ //frame.setJMenuBar(timelineMenubar);
	1520	+ //centralPanel.add(timelinePanel);
	1521	+
1165	1522	//topView.camera = ;
1166	1523	//frontView.camera = new Camera(2);
1167	1524	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1534,14 @@
1177	1534	//frontView.object = copy;
1178	1535	//sideView.object = copy;
1179	1536
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1537	+ XYZPanel = new cGridBag().setVertical(true);
	1538	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1539
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1540	+ XYZPanel.preferredWidth = 5;
	1541	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1542	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1543	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1544	+ //XYZPanel.setName("XYZ");
1186	1545
1187	1546	/*
1188	1547	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1550,7 @@
1191	1550	gridPanel.add(cameraView);
1192	1551	gridPanel.add(XYZPanel);
1193	1552	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1553	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1554	gridPanel.setContinuousLayout(true);
1196	1555	gridPanel.setOneTouchExpandable(true);
1197	1556	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,12 +1579,29 @@
1220	1579	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1580	//tmp.setName("Edit");
1222	1581	objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- objectPanel.add(north);
1227		- objectPanel.add(infoPanel);
	1582	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1583	+ objectPanel.setToolTipTextAt(0, "Material");
	1584	+
	1585	+ objectPanel.add(toolboxPanel);
	1586	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1587	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1228	1588
	1589	+ objectPanel.add(skyboxPanel);
	1590	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1591	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1592	+
	1593	+// JPanel north = new JPanel(new BorderLayout());
	1594	+// north.setName("Edit");
	1595	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1596	+// objectPanel.add(north);
	1597	+ objectPanel.add(editPanel);
	1598	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1599	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1600	+
	1601	+ objectPanel.add(XYZPanel);
	1602	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1603	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1604	+
1229	1605	/*
1230	1606	aConstraints.gridx = 0;
1231	1607	aConstraints.gridwidth = 1;
..	..	@@ -1233,7 +1609,7 @@
1233	1609	aConstraints.gridy += 1;
1234	1610	aConstraints.gridwidth = 1;
1235	1611	mainPanel.add(objectPanel, aConstraints);
1236		- */
	1612	+ */
1237	1613
1238	1614	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1239	1615	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1244,17 +1620,29 @@
1244	1620	scrollpane.setWheelScrollingEnabled(true);
1245	1621	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1622
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1623	+ /JTabbedPane/ scenePanel = new cGridBag();
	1624	+ scenePanel.preferredWidth = 5;
	1625	+
	1626	+ JTabbedPane tabbedPane = new JTabbedPane();
	1627	+ tabbedPane.add(scrollpane);
1249	1628
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1629	+ optionsPanel = new cGridBag().setVertical(false);
1253	1630
1254	1631	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1632	+
	1633	+ AddOptions(optionsPanel); //, aConstraints);
	1634	+
	1635	+ tabbedPane.add(optionsPanel);
	1636	+
	1637	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1638
	1639	+ scenePanel.add(tabbedPane);
1257	1640
	1641	+ //if (Globals.ADVANCED)
	1642	+ tabbedPane.add(infoPanel);
	1643	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1644	+ tabbedPane.setToolTipTextAt(3, "Information");
	1645	+
1258	1646	/*
1259	1647	cTree jTree = new cTree(null);
1260	1648	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1275,7 +1663,7 @@
1275	1663	jtp.add(tree);
1276	1664	*/
1277	1665
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1666	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1667	bigPanel.setContinuousLayout(true);
1280	1668	bigPanel.setOneTouchExpandable(true);
1281	1669	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1675,7 @@
1287	1675	//bigPanel.setSize(new Dimension(10,10));
1288	1676	//bigPanel.add(ctrlPanel);
1289	1677	//bigPanel.add(gridPanel);
	1678	+ /**
1290	1679	bigThree = new JPanel();
1291	1680	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1681	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1686,26 @@
1297	1686	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1687	aWindowConstraints.weightx = 0;
1299	1688	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1689	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1690	aWindowConstraints.weightx = 1;
1302	1691	aWindowConstraints.gridwidth = 3;
1303	1692	// aConstraints.gridheight = 3;
1304	1693	aWindowConstraints.gridx = 1;
1305	1694	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1695	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1696	aWindowConstraints.weightx = 0;
1308	1697	aWindowConstraints.gridx = 4;
1309	1698	aWindowConstraints.gridwidth = 1;
1310	1699	// aConstraints.gridheight = 3;
1311	1700	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1701	bigThree.add(XYZPanel, aWindowConstraints);
	1702	+ /**/
1313	1703
	1704	+ bigThree = new cGridBag();
	1705	+ bigThree.addComponent(scenePanel);
	1706	+ bigThree.addComponent(centralPanel);
	1707	+ //bigThree.addComponent(XYZPanel);
	1708	+
1314	1709	// // SIDE EFFECT!!!
1315	1710	// aConstraints.gridx = 0;
1316	1711	// aConstraints.gridy = 0;
..	..	@@ -1318,9 +1713,26 @@
1318	1713	// aConstraints.gridheight = 1;
1319	1714
1320	1715	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1321		- framePanel.setContinuousLayout(true);
1322		- framePanel.setOneTouchExpandable(true);
1323		- framePanel.setDividerLocation(0.8);
	1716	+
	1717	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1718	+ new java.beans.PropertyChangeListener()
	1719	+ {
	1720	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1721	+ {
	1722	+ if ((Integer)pce.getOldValue() == 1)
	1723	+ {
	1724	+ if (radio.layout != expandedLayout)
	1725	+ {
	1726	+ radio.layout = expandedLayout;
	1727	+ radio.layout.doClick();
	1728	+ }
	1729	+ }
	1730	+ }
	1731	+ });
	1732	+
	1733	+ framePanel.setContinuousLayout(false);
	1734	+ framePanel.setOneTouchExpandable(false);
	1735	+ //.setDividerLocation(0.8);
1324	1736	//framePanel.setDividerSize(15);
1325	1737	//framePanel.setResizeWeight(0.15);
1326	1738	framePanel.setName("Frame");
..	..	@@ -1331,20 +1743,25 @@
1331	1743	//worldPane.add(bigPanel);
1332	1744	//worldPane.add(worldPanel);
1333	1745	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1746	+ //frame.getContentPane().add(/"Center",/framePanel);
	1747	+ frame.add(/"Center",/framePanel);
1335	1748	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1749
1337		-// aConstraints = gbc; // (GridBagConstraints) GraphreeD.clone(gbc);
	1750	+// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1751
1339		- frame.setSize(800, 600);
1340		- frame.show();
1341		-
	1752	+ frame.setSize(1280, 860);
	1753	+
	1754	+ cameraView.requestFocusInWindow();
	1755	+
1342	1756	gridPanel.setDividerLocation(1.0);
	1757	+
	1758	+ frame.validate();
	1759	+
	1760	+ frame.setVisible(true);
1343	1761
1344	1762	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1345	1763	frame.addWindowListener(new WindowAdapter()
1346	1764	{
1347		-
1348	1765	public void windowClosing(WindowEvent e)
1349	1766	{
1350	1767	Close();
..	..	@@ -1352,6 +1769,10 @@
1352	1769	});
1353	1770	}
1354	1771
	1772	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1773	+ {
	1774	+ }
	1775	+
1355	1776	JTree GetTree()
1356	1777	{
1357	1778	return objEditor.jTree;
..	..	@@ -1363,260 +1784,575 @@
1363	1784	ctrlPanel.removeAll();
1364	1785	}
1365	1786
1366		- void SetupMaterial(JPanel ctrlPanel)
	1787	+ void SetupMaterial(cGridBag materialpanel)
1367	1788	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1789	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1790	+
	1791	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1792	+ skin.setToolTipText("Skin");
	1793	+ skin.addMouseListener(new MouseAdapter()
	1794	+ {
	1795	+ public void mouseClicked(MouseEvent e)
	1796	+ {
	1797	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1798	+ cMaterial material = object.material;
	1799	+
	1800	+ // Skin
	1801	+ colorField.setFloat(material.color);
	1802	+ saturationField.setFloat(material.modulation);
	1803	+ subsurfaceField.setFloat(material.subsurface);
	1804	+ selfshadowField.setFloat(material.diffuseness);
	1805	+ diffusenessField.setFloat(material.factor);
	1806	+ shininessField.setFloat(material.shininess);
	1807	+ shadowbiasField.setFloat(material.shadowbias);
	1808	+ diffuseField.setFloat(material.diffuse);
	1809	+ specularField.setFloat(material.specular);
	1810	+
	1811	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1812	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1813	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1814	+
	1815	+ materialtouched = true;
	1816	+ applySelf();
	1817	+ }
	1818	+ });
	1819	+ presetpanel.add(skin);
	1820	+
	1821	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1822	+ lambert.setToolTipText("Diffuse");
	1823	+ lambert.addMouseListener(new MouseAdapter()
	1824	+ {
	1825	+ public void mouseClicked(MouseEvent e)
	1826	+ {
	1827	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1828	+ cMaterial material = object.material;
	1829	+
	1830	+ diffusenessField.setFloat(material.factor);
	1831	+ selfshadowField.setFloat(material.diffuseness);
	1832	+
	1833	+ materialtouched = true;
	1834	+ applySelf();
	1835	+ }
	1836	+ });
	1837	+ presetpanel.add(lambert);
	1838	+
	1839	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1840	+ diffuse2.setToolTipText("Diffuse2");
	1841	+ diffuse2.addMouseListener(new MouseAdapter()
	1842	+ {
	1843	+ public void mouseClicked(MouseEvent e)
	1844	+ {
	1845	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1846	+ cMaterial material = object.material;
	1847	+
	1848	+ diffusenessField.setFloat(material.factor);
	1849	+ selfshadowField.setFloat(material.diffuseness);
	1850	+
	1851	+ materialtouched = true;
	1852	+ applySelf();
	1853	+ }
	1854	+ });
	1855	+ presetpanel.add(diffuse2);
	1856	+
	1857	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1858	+ diffusemoon.setToolTipText("Moon");
	1859	+ diffusemoon.addMouseListener(new MouseAdapter()
	1860	+ {
	1861	+ public void mouseClicked(MouseEvent e)
	1862	+ {
	1863	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1864	+ cMaterial material = object.material;
	1865	+
	1866	+ diffusenessField.setFloat(material.factor);
	1867	+ selfshadowField.setFloat(material.diffuseness);
	1868	+
	1869	+ materialtouched = true;
	1870	+ applySelf();
	1871	+ }
	1872	+ });
	1873	+ presetpanel.add(diffusemoon);
	1874	+
	1875	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1876	+ diffusemoon2.setToolTipText("Moon2");
	1877	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1878	+ {
	1879	+ public void mouseClicked(MouseEvent e)
	1880	+ {
	1881	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1882	+ cMaterial material = object.material;
	1883	+
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+
	1887	+ materialtouched = true;
	1888	+ applySelf();
	1889	+ }
	1890	+ });
	1891	+ presetpanel.add(diffusemoon2);
	1892	+
	1893	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1894	+ diffusemoon3.setToolTipText("Moon3");
	1895	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1896	+ {
	1897	+ public void mouseClicked(MouseEvent e)
	1898	+ {
	1899	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1900	+ cMaterial material = object.material;
	1901	+
	1902	+ diffusenessField.setFloat(material.factor);
	1903	+ selfshadowField.setFloat(material.diffuseness);
	1904	+
	1905	+ materialtouched = true;
	1906	+ applySelf();
	1907	+ }
	1908	+ });
	1909	+ presetpanel.add(diffusemoon3);
	1910	+
	1911	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1912	+ diffusesheen.setToolTipText("Sheen");
	1913	+ diffusesheen.addMouseListener(new MouseAdapter()
	1914	+ {
	1915	+ public void mouseClicked(MouseEvent e)
	1916	+ {
	1917	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1918	+ cMaterial material = object.material;
	1919	+
	1920	+ sheenField.setFloat(material.sheen);
	1921	+
	1922	+ materialtouched = true;
	1923	+ applySelf();
	1924	+ }
	1925	+ });
	1926	+ presetpanel.add(diffusesheen);
	1927	+
	1928	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1929	+ rough.setToolTipText("Rough metal");
	1930	+ rough.addMouseListener(new MouseAdapter()
	1931	+ {
	1932	+ public void mouseClicked(MouseEvent e)
	1933	+ {
	1934	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1935	+ cMaterial material = object.material;
	1936	+
	1937	+ shininessField.setFloat(material.shininess);
	1938	+ velvetField.setFloat(material.velvet);
	1939	+
	1940	+ materialtouched = true;
	1941	+ applySelf();
	1942	+ }
	1943	+ });
	1944	+ presetpanel.add(rough);
	1945	+
	1946	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1947	+ rough2.setToolTipText("Medium metal");
	1948	+ rough2.addMouseListener(new MouseAdapter()
	1949	+ {
	1950	+ public void mouseClicked(MouseEvent e)
	1951	+ {
	1952	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1953	+ cMaterial material = object.material;
	1954	+
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ lightareaField.setFloat(material.lightarea);
	1957	+
	1958	+ materialtouched = true;
	1959	+ applySelf();
	1960	+ }
	1961	+ });
	1962	+ presetpanel.add(rough2);
	1963	+
	1964	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1965	+ shini0.setToolTipText("Shiny");
	1966	+ shini0.addMouseListener(new MouseAdapter()
	1967	+ {
	1968	+ public void mouseClicked(MouseEvent e)
	1969	+ {
	1970	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1971	+ cMaterial material = object.material;
	1972	+
	1973	+ shininessField.setFloat(material.shininess);
	1974	+ lightareaField.setFloat(material.lightarea);
	1975	+
	1976	+ materialtouched = true;
	1977	+ applySelf();
	1978	+ }
	1979	+ });
	1980	+ presetpanel.add(shini0);
	1981	+
	1982	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1983	+ shini1.setToolTipText("Shiny2");
	1984	+ shini1.addMouseListener(new MouseAdapter()
	1985	+ {
	1986	+ public void mouseClicked(MouseEvent e)
	1987	+ {
	1988	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1989	+ cMaterial material = object.material;
	1990	+
	1991	+ shininessField.setFloat(material.shininess);
	1992	+ lightareaField.setFloat(material.lightarea);
	1993	+
	1994	+ materialtouched = true;
	1995	+ applySelf();
	1996	+ }
	1997	+ });
	1998	+ presetpanel.add(shini1);
	1999	+
	2000	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2001	+ shini2.setToolTipText("Shiny3");
	2002	+ shini2.addMouseListener(new MouseAdapter()
	2003	+ {
	2004	+ public void mouseClicked(MouseEvent e)
	2005	+ {
	2006	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2007	+ cMaterial material = object.material;
	2008	+
	2009	+ shininessField.setFloat(material.shininess);
	2010	+ lightareaField.setFloat(material.lightarea);
	2011	+
	2012	+ materialtouched = true;
	2013	+ applySelf();
	2014	+ }
	2015	+ });
	2016	+ presetpanel.add(shini2);
	2017	+
	2018	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2019	+ aniso.setToolTipText("AnisoU");
	2020	+ aniso.addMouseListener(new MouseAdapter()
	2021	+ {
	2022	+ public void mouseClicked(MouseEvent e)
	2023	+ {
	2024	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2025	+ cMaterial material = object.material;
	2026	+
	2027	+ anisoField.setFloat(material.aniso);
	2028	+ anisoVField.setFloat(material.anisoV);
	2029	+
	2030	+ materialtouched = true;
	2031	+ applySelf();
	2032	+ }
	2033	+ });
	2034	+ presetpanel.add(aniso);
	2035	+
	2036	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2037	+ aniso2.setToolTipText("AnisoV");
	2038	+ aniso2.addMouseListener(new MouseAdapter()
	2039	+ {
	2040	+ public void mouseClicked(MouseEvent e)
	2041	+ {
	2042	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2043	+ cMaterial material = object.material;
	2044	+
	2045	+ anisoField.setFloat(material.aniso);
	2046	+ anisoVField.setFloat(material.anisoV);
	2047	+
	2048	+ materialtouched = true;
	2049	+ applySelf();
	2050	+ }
	2051	+ });
	2052	+ presetpanel.add(aniso2);
	2053	+
	2054	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2055	+ aniso3.setToolTipText("AnisoUV");
	2056	+ aniso3.addMouseListener(new MouseAdapter()
	2057	+ {
	2058	+ public void mouseClicked(MouseEvent e)
	2059	+ {
	2060	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2061	+ cMaterial material = object.material;
	2062	+
	2063	+ anisoField.setFloat(material.aniso);
	2064	+ anisoVField.setFloat(material.anisoV);
	2065	+
	2066	+ materialtouched = true;
	2067	+ applySelf();
	2068	+ }
	2069	+ });
	2070	+ presetpanel.add(aniso3);
	2071	+
	2072	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2073	+ velvet0.setToolTipText("Velvet");
	2074	+ velvet0.addMouseListener(new MouseAdapter()
	2075	+ {
	2076	+ public void mouseClicked(MouseEvent e)
	2077	+ {
	2078	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2079	+ cMaterial material = object.material;
	2080	+
	2081	+ diffusenessField.setFloat(material.factor);
	2082	+ selfshadowField.setFloat(material.diffuseness);
	2083	+ sheenField.setFloat(material.sheen);
	2084	+ shininessField.setFloat(material.shininess);
	2085	+ velvetField.setFloat(material.velvet);
	2086	+ shiftField.setFloat(material.shift);
	2087	+
	2088	+ materialtouched = true;
	2089	+ applySelf();
	2090	+ }
	2091	+ });
	2092	+ presetpanel.add(velvet0);
	2093	+
	2094	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2095	+ bump0.setToolTipText("Bump texture");
	2096	+ bump0.addMouseListener(new MouseAdapter()
	2097	+ {
	2098	+ public void mouseClicked(MouseEvent e)
	2099	+ {
	2100	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2101	+ cMaterial material = object.material;
	2102	+
	2103	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2104	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2105	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(bump0);
	2112	+
	2113	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2114	+ halo.setToolTipText("Halo");
	2115	+ halo.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2123	+
	2124	+ materialtouched = true;
	2125	+ applySelf();
	2126	+ }
	2127	+ });
	2128	+ presetpanel.add(halo);
	2129	+
	2130	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2131	+ candle.setToolTipText("Candle");
	2132	+ candle.addMouseListener(new MouseAdapter()
	2133	+ {
	2134	+ public void mouseClicked(MouseEvent e)
	2135	+ {
	2136	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2137	+ cMaterial material = object.material;
	2138	+
	2139	+ subsurfaceField.setFloat(material.subsurface);
	2140	+ shadowbiasField.setFloat(material.shadowbias);
	2141	+ ambientField.setFloat(material.ambient);
	2142	+ specularField.setFloat(material.specular);
	2143	+ lightareaField.setFloat(material.lightarea);
	2144	+ shininessField.setFloat(material.shininess);
	2145	+
	2146	+ materialtouched = true;
	2147	+ applySelf();
	2148	+ }
	2149	+ });
	2150	+ presetpanel.add(candle);
	2151	+
	2152	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2153	+ shadowShader.setToolTipText("Shadow");
	2154	+ shadowShader.addMouseListener(new MouseAdapter()
	2155	+ {
	2156	+ public void mouseClicked(MouseEvent e)
	2157	+ {
	2158	+ diffuseField.setFloat(0.001);
	2159	+ ambientField.setFloat(0.001);
	2160	+ cameraField.setFloat(0.001);
	2161	+ specularField.setFloat(0.001);
	2162	+ fakedepthField.setFloat(0.001);
	2163	+ opacityField.setFloat(0.6);
	2164	+
	2165	+ materialtouched = true;
	2166	+ applySelf();
	2167	+ }
	2168	+ });
	2169	+ presetpanel.add(shadowShader);
	2170	+
	2171	+ cGridBag panel = new cGridBag().setVertical(true);
	2172	+
	2173	+ presetpanel.preferredWidth = 1;
	2174	+
	2175	+ materialpanel.add(presetpanel);
	2176	+ materialpanel.add(panel);
	2177	+
	2178	+ panel.preferredWidth = 8;
	2179	+
	2180	+ /*
1371	2181	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	2182	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375		- */
	2183	+ */
1376	2184
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	2185	+ cGridBag editBar = new cGridBag().setVertical(false);
	2186	+
	2187	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2188	+ createMaterialButton.setToolTipText("Create material");
1382	2189
1383	2190	/*
1384	2191	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	2192	*/
1389	2193
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	2194	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2195	+ clearMaterialButton.setToolTipText("Clear material");
	2196	+
	2197	+ if (Globals.ADVANCED)
	2198	+ {
	2199	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2200	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2201	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2202	+ }
1392	2203
1393		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394		-
1395		- aConstraints.gridx += 1;
1396		-
1397		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398		-
1399		- aConstraints.gridx += 1;
1400		-
1401		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402		-
1403		- aConstraints.gridx = 0;
1404		- aConstraints.gridy += 1;
1405		- aConstraints.weighty = 0;
1406		- aConstraints.gridwidth = 1;
	2204	+ editBar.preferredHeight = 15;
	2205	+
	2206	+ panel.add(editBar);
	2207	+
1407	2208	/**/
1408	2209	//aConstraints.weighty = 0;
1409	2210	////aConstraints.weightx = 1;
1410	2211	//aConstraints.weighty = 1;
1411	2212	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	2213	//aConstraints.gridx += 1;
1413		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414		- aConstraints.weighty = 0;
1415		- aConstraints.gridx = 0;
1416		- aConstraints.gridy += 1;
1417		- aConstraints.gridwidth = 1;
	2214	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	2215
1419		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424		- //aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426		- aConstraints.gridx = 0;
1427		- aConstraints.gridy += 1;
1428		- aConstraints.gridwidth = 1;
	2216	+ cGridBag colorSection = new cGridBag().setVertical(true);
1429	2217
1430		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433		- aConstraints.gridx += 1;
1434		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436		- aConstraints.gridx = 0;
1437		- aConstraints.gridy += 1;
1438		- aConstraints.gridwidth = 1;
	2218	+ cGridBag huepanel = new cGridBag();
	2219	+ cGridBag huelabel = new cGridBag();
	2220	+ skin = GetLabel("icons/hue.png", false);
	2221	+ skin.fit = true;
	2222	+ huelabel.add(skin);
	2223	+ huelabel.preferredWidth = 20;
	2224	+ huepanel.add(new cGridBag()); // Label
	2225	+ huepanel.add(huelabel); // Field/slider
	2226	+
	2227	+ huepanel.preferredHeight = 7;
1439	2228
1440		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443		- aConstraints.gridx += 1;
1444		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	2229	+ colorSection.add(huepanel);
	2230	+
	2231	+ cGridBag color = new cGridBag();
	2232	+
	2233	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2234	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2235	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1449	2236
1450		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- aConstraints.gridwidth = 1;
	2237	+ //colorField.preferredWidth = 200;
	2238	+ colorSection.add(color);
1459	2239
1460		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.gridwidth = 1;
	2240	+ cGridBag modulation = new cGridBag();
	2241	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2242	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2243	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2244	+ colorSection.add(modulation);
1469	2245
1470		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473		- aConstraints.gridx += 1;
1474		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476		- aConstraints.gridx = 0;
1477		- aConstraints.gridy += 1;
1478		- aConstraints.gridwidth = 1;
	2246	+ cGridBag opacity = new cGridBag();
	2247	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2248	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2249	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2250	+ colorSection.add(opacity);
1479	2251
1480		- //aConstraints.weighty = 1;
1481		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482		- //aConstraints.gridx += 1;
1483		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484		- aConstraints.weighty = 0;
1485		- aConstraints.gridx = 0;
1486		- aConstraints.gridy += 1;
1487		- aConstraints.gridwidth = 1;
	2252	+ colorSection.add(GetSeparator());
	2253	+
	2254	+ cGridBag texture = new cGridBag();
	2255	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2256	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2257	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2258	+ colorSection.add(texture);
1488	2259
1489		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492		- aConstraints.gridx += 1;
1493		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495		- aConstraints.gridx = 0;
1496		- aConstraints.gridy += 1;
1497		- aConstraints.gridwidth = 1;
	2260	+ panel.add(GetSeparator());
	2261	+
	2262	+ panel.add(colorSection);
	2263	+
	2264	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2265	+
	2266	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2267	+
	2268	+ cGridBag diffuse = new cGridBag();
	2269	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2270	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2271	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2272	+ diffuseSection.add(diffuse);
1498	2273
1499		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502		- aConstraints.gridx += 1;
1503		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505		- aConstraints.gridx = 0;
1506		- aConstraints.gridy += 1;
1507		- aConstraints.gridwidth = 1;
	2274	+ cGridBag diffuseness = new cGridBag();
	2275	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2276	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2277	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2278	+ diffuseSection.add(diffuseness);
1508	2279
1509		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512		- aConstraints.gridx += 1;
1513		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515		- aConstraints.gridx = 0;
1516		- aConstraints.gridy += 1;
1517		- aConstraints.gridwidth = 1;
	2280	+ cGridBag selfshadow = new cGridBag();
	2281	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2282	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2283	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2284	+ diffuseSection.add(selfshadow);
1518	2285
1519		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522		- aConstraints.gridx += 1;
1523		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525		- aConstraints.gridx = 0;
1526		- aConstraints.gridy += 1;
1527		- aConstraints.gridwidth = 1;
	2286	+ cGridBag sheen = new cGridBag();
	2287	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2288	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2289	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2290	+ diffuseSection.add(sheen);
1528	2291
1529		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532		- aConstraints.gridx += 1;
1533		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535		- aConstraints.gridx = 0;
1536		- aConstraints.gridy += 1;
1537		- aConstraints.gridwidth = 1;
	2292	+ cGridBag subsurface = new cGridBag();
	2293	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2294	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2295	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2296	+ diffuseSection.add(subsurface);
1538	2297
1539		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542		- aConstraints.gridx += 1;
1543		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545		- aConstraints.gridx = 0;
1546		- aConstraints.gridy += 1;
1547		- aConstraints.gridwidth = 1;
	2298	+ cGridBag shadow = new cGridBag();
	2299	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2300	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2301	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2302	+ diffuseSection.add(shadow);
1548	2303
1549		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552		- aConstraints.gridx += 1;
1553		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555		- aConstraints.gridx = 0;
1556		- aConstraints.gridy += 1;
1557		- aConstraints.gridwidth = 1;
	2304	+ cGridBag fakedepth = new cGridBag();
	2305	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2306	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2307	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2308	+ diffuseSection.add(fakedepth);
1558	2309
1559		- //aConstraints.weighty = 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561		- //aConstraints.gridx += 1;
1562		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563		- aConstraints.weighty = 0;
1564		- aConstraints.gridx = 0;
1565		- aConstraints.gridy += 1;
1566		- aConstraints.gridwidth = 1;
	2310	+ cGridBag shadowbias = new cGridBag();
	2311	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2312	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2313	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2314	+ diffuseSection.add(shadowbias);
1567	2315
1568		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571		- aConstraints.gridx += 1;
1572		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574		- aConstraints.gridx = 0;
1575		- aConstraints.gridy += 1;
1576		- aConstraints.gridwidth = 1;
	2316	+ panel.add(GetSeparator());
	2317	+
	2318	+ panel.add(diffuseSection);
	2319	+
	2320	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2321	+
	2322	+ cGridBag specularSection = new cGridBag().setVertical(true);
1577	2323
1578		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581		- aConstraints.gridx += 1;
1582		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584		- aConstraints.gridx = 0;
1585		- aConstraints.gridy += 1;
1586		- aConstraints.gridwidth = 1;
	2324	+ cGridBag specular = new cGridBag();
	2325	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2326	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2327	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2328	+ specularSection.add(specular);
1587	2329
1588		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591		- aConstraints.gridx += 1;
1592		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594		- aConstraints.gridx = 0;
1595		- aConstraints.gridy += 1;
1596		- aConstraints.gridwidth = 1;
	2330	+ cGridBag lightarea = new cGridBag();
	2331	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2332	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2333	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2334	+ specularSection.add(lightarea);
1597	2335
1598		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601		- aConstraints.gridx += 1;
1602		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604		- aConstraints.gridx = 0;
1605		- aConstraints.gridy += 1;
1606		- aConstraints.gridwidth = 1;
	2336	+ cGridBag shininess = new cGridBag();
	2337	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2338	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2339	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2340	+ specularSection.add(shininess);
1607	2341
1608		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611		- aConstraints.gridx += 1;
1612		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614		- aConstraints.gridx = 0;
1615		- aConstraints.gridy += 1;
1616		- aConstraints.gridwidth = 1;
	2342	+ cGridBag metalness = new cGridBag();
	2343	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2344	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2345	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2346	+ specularSection.add(metalness);
1617	2347
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	2348	+ cGridBag velvet = new cGridBag();
	2349	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2350	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2351	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2352	+ specularSection.add(velvet);
	2353	+
	2354	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2355	+ //Return();
1620	2356	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	2357	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	2358	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +2363,99 @@
1627	2363	// aConstraints.gridy += 1;
1628	2364	// aConstraints.gridwidth = 1;
1629	2365
1630		- //aConstraints.weighty = 1;
1631		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632		- //aConstraints.gridx += 1;
1633		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634		- aConstraints.weighty = 0;
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
	2366	+ cGridBag anisoU = new cGridBag();
	2367	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2368	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2369	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2370	+ specularSection.add(anisoU);
1638	2371
1639		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
	2372	+ cGridBag anisoV = new cGridBag();
	2373	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2374	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2375	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2376	+ specularSection.add(anisoV);
1648	2377
1649		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- aConstraints.gridwidth = 1;
1658	2378
1659		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662		- aConstraints.gridx += 1;
1663		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665		- aConstraints.gridx = 0;
1666		- aConstraints.gridy += 1;
1667		- aConstraints.gridwidth = 1;
	2379	+ panel.add(GetSeparator());
	2380	+
	2381	+ panel.add(specularSection);
	2382	+
	2383	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2384	+
	2385	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1668	2386
1669		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672		- aConstraints.gridx += 1;
1673		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675		- aConstraints.gridx = 0;
1676		- aConstraints.gridy += 1;
1677		- aConstraints.gridwidth = 1;
1678		- aConstraints.weighty = 0;
	2387	+ cGridBag camera = new cGridBag();
	2388	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2389	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2390	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2391	+ colorSection.add(camera);
1679	2392
1680		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	2393	+ cGridBag ambient = new cGridBag();
	2394	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2395	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2396	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2397	+ colorSection.add(ambient);
1689	2398
1690		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
	2399	+ cGridBag backlit = new cGridBag();
	2400	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2401	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2402	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2403	+ colorSection.add(backlit);
1699	2404
1700		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
	2405	+ //panel.add(new JSeparator());
	2406	+
	2407	+ //panel.add(globalSection);
	2408	+
	2409	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2410	+
	2411	+ cGridBag textureSection = new cGridBag().setVertical(true);
1709	2412
1710		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- aConstraints.gridwidth = 1;
	2413	+ cGridBag bump = new cGridBag();
	2414	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2415	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2416	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2417	+ textureSection.add(bump);
1719	2418
1720		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723		- aConstraints.gridx += 1;
1724		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726		- aConstraints.gridx = 0;
1727		- aConstraints.gridy += 1;
1728		- aConstraints.gridwidth = 1;
	2419	+ cGridBag noise = new cGridBag();
	2420	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2421	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2422	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2423	+ textureSection.add(noise);
1729	2424
1730		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733		- aConstraints.gridx += 1;
1734		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1736		- aConstraints.gridx = 0;
1737		- aConstraints.gridy += 1;
1738		- aConstraints.gridwidth = 1;
	2425	+ cGridBag power = new cGridBag();
	2426	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2427	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2428	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2429	+ textureSection.add(power);
1739	2430
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	2431	+ cGridBag borderfade = new cGridBag();
	2432	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2433	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2434	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2435	+ textureSection.add(borderfade);
1745	2436
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	2437	+ cGridBag fog = new cGridBag();
	2438	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2439	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2440	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2441	+ textureSection.add(fog);
	2442	+
	2443	+ cGridBag opacityPower = new cGridBag();
	2444	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2445	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2446	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2447	+ textureSection.add(opacityPower);
	2448	+
	2449	+ panel.add(GetSeparator());
	2450	+
	2451	+ panel.add(textureSection);
	2452	+
	2453	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	2454
1750	2455	SetMaterial(copy); // .GetMaterial());
1751	2456
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	2457	+ //colorField.addChangeListener(this);
	2458	+// modulationField.addChangeListener(this);
1754	2459	metalnessField.addChangeListener(this);
1755	2460	diffuseField.addChangeListener(this);
1756	2461	specularField.addChangeListener(this);
..	..	@@ -1780,12 +2485,15 @@
1780	2485	opacityPowerField.addChangeListener(this);
1781	2486	/**/
1782	2487
1783		- resetSlidersButton.addActionListener(this);
1784	2488	clearMaterialButton.addActionListener(this);
1785	2489	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	2490	+
	2491	+ if (Globals.ADVANCED)
	2492	+ {
	2493	+ resetSlidersButton.addActionListener(this);
	2494	+ propagateToggle.addItemListener(this);
	2495	+ multiplyToggle.addItemListener(this);
	2496	+ }
1789	2497	}
1790	2498
1791	2499	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1803,8 +2511,9 @@
1803	2511	// 3D models
1804	2512	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1805	2513	{
1806		- lastConverter = new com.jmex.model.converters.MaxToJme();
1807		- LoadFile(filename, lastConverter);
	2514	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2515	+ //LoadFile(filename, lastConverter);
	2516	+ LoadObjFile(filename); // New 3ds loader
1808	2517	continue;
1809	2518	}
1810	2519	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1859,19 +2568,21 @@
1859	2568	}
1860	2569
1861	2570	// Images/textures
1862		- if (textures
1863		- && (filename.toLowerCase().endsWith(".jpg")
1864		- \|\| filename.toLowerCase().endsWith(".jpeg")
1865		- \|\| filename.toLowerCase().endsWith(".gif")
1866		- \|\| filename.toLowerCase().endsWith(".png")
1867		- \|\| filename.toLowerCase().endsWith(".tre")
1868		- \|\| filename.toLowerCase().endsWith(".bmp")
1869		- \|\| filename.toLowerCase().endsWith(".tga")
1870		- \|\| filename.toLowerCase().endsWith(".sgi")
1871		- \|\| filename.toLowerCase().endsWith(".tif")
1872		- \|\| filename.toLowerCase().endsWith(".tiff")))
	2571	+ if (filename.toLowerCase().endsWith(".jpg")
	2572	+ \|\| filename.toLowerCase().endsWith(".jpeg")
	2573	+ \|\| filename.toLowerCase().endsWith(".gif")
	2574	+ \|\| filename.toLowerCase().endsWith(".png")
	2575	+ \|\| filename.toLowerCase().endsWith(".tre")
	2576	+ \|\| filename.toLowerCase().endsWith(".bmp")
	2577	+ \|\| filename.toLowerCase().endsWith(".tga")
	2578	+ \|\| filename.toLowerCase().endsWith(".sgi")
	2579	+ \|\| filename.toLowerCase().endsWith(".tif")
	2580	+ \|\| filename.toLowerCase().endsWith(".tiff"))
1873	2581	{
1874		- DropTexture(filename);
	2582	+ if (textures)
	2583	+ DropTexture(filename);
	2584	+ else
	2585	+ CreateBillboard(filename);
1875	2586	continue;
1876	2587	}
1877	2588
..	..	@@ -1880,6 +2591,60 @@
1880	2591	}
1881	2592
1882	2593	ResetModel();
	2594	+ }
	2595	+
	2596	+ void CreateBillboard(String filename)
	2597	+ {
	2598	+ Object3D source = null;
	2599	+ Object3D group = copy;
	2600	+
	2601	+ if (group.selection.size() > 0)
	2602	+ {
	2603	+ source = group.selection.get(0);
	2604	+ }
	2605	+
	2606	+ Grid grid = new Grid(1,1);
	2607	+ grid.material = null;
	2608	+
	2609	+ grid.toParent = LA.newMatrix();
	2610	+ grid.fromParent = LA.newMatrix();
	2611	+ LA.matYRotate(grid.toParent, Math.PI/2);
	2612	+ LA.matXRotate(grid.toParent, -Math.PI/2);
	2613	+ LA.matXRotate(grid.fromParent, Math.PI/2);
	2614	+ LA.matYRotate(grid.fromParent, -Math.PI/2);
	2615	+
	2616	+ BillboardNode bb = new BillboardNode();
	2617	+ bb.addChild(grid);
	2618	+
	2619	+ Object3D newgroup = new Object3D();
	2620	+ newgroup.CreateMaterial();
	2621	+
	2622	+ File file = new File(filename);
	2623	+ newgroup.name = file.getName();
	2624	+ newgroup.addChild(bb);
	2625	+
	2626	+ Object3D main = newgroup;
	2627	+
	2628	+ main.SetPigmentTexture(filename);
	2629	+
	2630	+ if (source != null)
	2631	+ {
	2632	+ main.material = new cMaterial(source.material);
	2633	+ if (main.projectedVertices.length < source.projectedVertices.length)
	2634	+ {
	2635	+ main.projectedVertices = new Object3D.cVector2[source.projectedVertices.length];
	2636	+ }
	2637	+
	2638	+ for (int i=0; i<source.projectedVertices.length; i++)
	2639	+ {
	2640	+ main.projectedVertices[i].x = source.projectedVertices[i].x;
	2641	+ main.projectedVertices[i].y = source.projectedVertices[i].y;
	2642	+ }
	2643	+
	2644	+ main.texres = source.texres;
	2645	+ }
	2646	+
	2647	+ makeSomething(newgroup, false);
1883	2648	}
1884	2649
1885	2650	Point location;
..	..	@@ -1900,7 +2665,7 @@
1900	2665
1901	2666	//? flashIt = false;
1902	2667	CameraPane pane = (CameraPane) cameraView;
1903		- pane.clickStart(location.x, location.y, 0);
	2668	+ pane.clickStart(location.x, location.y, 0, 0);
1904	2669	pane.clickEnd(location.x, location.y, 0, true);
1905	2670
1906	2671	if (group.selection.size() == 1)
..	..	@@ -1949,6 +2714,7 @@
1949	2714	e2.printStackTrace();
1950	2715	}
1951	2716	}
	2717	+
1952	2718	LoadJMEThread loadThread;
1953	2719
1954	2720	class LoadJMEThread extends Thread
..	..	@@ -2006,6 +2772,7 @@
2006	2772	//LoadFile0(filename, converter);
2007	2773	}
2008	2774	}
	2775	+
2009	2776	LoadOBJThread loadObjThread;
2010	2777
2011	2778	class LoadOBJThread extends Thread
..	..	@@ -2084,19 +2851,19 @@
2084	2851
2085	2852	void LoadObjFile(String fullname)
2086	2853	{
2087		- /*
	2854	+ System.out.println("Loading " + fullname);
	2855	+ /**/
2088	2856	//lastFilename = fullname;
2089	2857	if(loadObjThread == null)
2090	2858	{
2091		- loadObjThread = new LoadOBJThread();
2092		- loadObjThread.start();
	2859	+ loadObjThread = new LoadOBJThread();
	2860	+ loadObjThread.start();
2093	2861	}
2094	2862
2095	2863	loadObjThread.add(fullname);
2096		- */
	2864	+ /**/
2097	2865
2098		- System.out.println("Loading " + fullname);
2099		- makeSomething(new FileObject(fullname, true), true);
	2866	+ //makeSomething(new FileObject(fullname, true), true);
2100	2867	}
2101	2868
2102	2869	void LoadGFDFile(String fullname)
..	..	@@ -2138,6 +2905,8 @@
2138	2905	{
2139	2906	Mocap sel = (Mocap) copy.selection.get(0);
2140	2907
	2908	+ sel.SetCurrentBones(sel.frame);
	2909	+
2141	2910	sel.fullname = fullname;
2142	2911
2143	2912	if (changename)
..	..	@@ -2151,14 +2920,18 @@
2151	2920	sel.smoothed = false;
2152	2921
2153	2922	// if (!changename)
2154		- sel.SetPositionDelta(false, true, true, true/?/); // false
	2923	+ //sel.SetPositionDelta(false, true, true, true/?/); // false
	2924	+ sel.SetGlobalTransform();
	2925	+ sel.LoadData();
	2926	+ sel.Rewind();
	2927	+ sel.Fade();
2155	2928	// sel.setPose(0);
2156	2929	refreshContents();
2157	2930	} else
2158	2931	{
2159	2932	mocap.Reset();
2160	2933	// new skeleton
2161		- makeSomething(mocap, false); // true);
	2934	+ makeSomething(mocap, true); // true);
2162	2935	}
2163	2936	} catch (Exception e)
2164	2937	{
..	..	@@ -2185,6 +2958,8 @@
2185	2958	{
2186	2959	Mocap sel = (Mocap) select;
2187	2960
	2961	+ sel.SetCurrentBones(sel.frame);
	2962	+
2188	2963	File file = new File(fullname);
2189	2964
2190	2965	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2251,7 +3026,11 @@
2251	3026
2252	3027	if (!changename)
2253	3028	{
2254		- sel.SetPositionDelta(false, true, true, true/?/);
	3029	+ //sel.SetPositionDelta(false, true, true, true/?/);
	3030	+ sel.SetGlobalTransform();
	3031	+ sel.LoadData();
	3032	+ sel.Rewind();
	3033	+ sel.Fade();
2255	3034	}
2256	3035
2257	3036	// sel.setPose(0);
..	..	@@ -2345,11 +3124,11 @@
2345	3124
2346	3125	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	3126	{
2348		- if (GraphreeD.standAlone)
	3127	+ if (Grafreed.standAlone)
2349	3128	{
2350	3129	/**/
2351	3130	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	3131	+ browser.setVisible(true);
2353	3132	String filename = browser.getFile();
2354	3133	if (filename != null && filename.length() > 0)
2355	3134	{
..	..	@@ -2460,6 +3239,7 @@
2460	3239	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	3240	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	3241	}
	3242	+
2463	3243	//cJME.count++;
2464	3244	//cJME.count %= 12;
2465	3245	if (gc)
..	..	@@ -2494,6 +3274,7 @@
2494	3274	}
2495	3275	if (input == null)
2496	3276	{
	3277	+ new Exception().printStackTrace();
2497	3278	System.exit(0);
2498	3279	}
2499	3280
..	..	@@ -2642,6 +3423,7 @@
2642	3423	}
2643	3424	}
2644	3425	}
	3426	+
2645	3427	cFileSystemPane FSPane;
2646	3428
2647	3429	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2651,7 +3433,7 @@
2651	3433
2652	3434	freezematerial = true;
2653	3435	colorField.setFloat(mat.color);
2654		- modulationField.setFloat(mat.modulation);
	3436	+ saturationField.setFloat(mat.modulation);
2655	3437	metalnessField.setFloat(mat.metalness);
2656	3438	diffuseField.setFloat(mat.diffuse);
2657	3439	specularField.setFloat(mat.specular);
..	..	@@ -2695,11 +3477,14 @@
2695	3477	}
2696	3478	}
2697	3479	}
	3480	+
2698	3481	freezematerial = false;
2699	3482	}
2700	3483
2701	3484	void SetMaterial(Object3D object)
2702	3485	{
	3486	+ latestObject = object;
	3487	+
2703	3488	cMaterial mat = object.material;
2704	3489
2705	3490	if (mat == null)
..	..	@@ -2708,7 +3493,8 @@
2708	3493	return;
2709	3494	}
2710	3495
2711		- multiplyToggle.setSelected(mat.multiply);
	3496	+ if (multiplyToggle != null)
	3497	+ multiplyToggle.setSelected(mat.multiply);
2712	3498
2713	3499	assert (object.projectedVertices != null);
2714	3500
..	..	@@ -2810,12 +3596,17 @@
2810	3596	// }
2811	3597
2812	3598	/**/
2813		- if (deselect)
	3599	+ if (deselect \|\| child == null)
2814	3600	{
2815	3601	//group.deselectAll();
2816	3602	//freeze = true;
2817	3603	GetTree().clearSelection();
2818	3604	//freeze = false;
	3605	+
	3606	+ if (child == null)
	3607	+ {
	3608	+ return;
	3609	+ }
2819	3610	}
2820	3611
2821	3612	//group.addSelectee(child);
..	..	@@ -2849,6 +3640,17 @@
2849	3640	public void itemStateChanged(ItemEvent event)
2850	3641	{
2851	3642	// System.out.println("Propagate = " + propagate);
	3643	+ if (event.getSource() == pinButton)
	3644	+ {
	3645	+ copy.pinned ^= true;
	3646	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3647	+ {
	3648	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3649	+ copy.CloseUI();
	3650	+ //copy.editWindow.refreshContents();
	3651	+ }
	3652	+ }
	3653	+ else
2852	3654	if (event.getSource() == propagateToggle)
2853	3655	{
2854	3656	propagate ^= true;
..	..	@@ -2884,31 +3686,48 @@
2884	3686	cameraView.ToggleDL();
2885	3687	cameraView.repaint();
2886	3688	return;
2887		- } else if (event.getSource() == toggleTextureItem)
	3689	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2888	3690	{
2889	3691	cameraView.ToggleTexture();
2890	3692	// june 2013 copy.HardTouch();
2891	3693	cameraView.repaint();
2892	3694	return;
2893		- } else if (event.getSource() == toggleFullItem)
	3695	+ } else if (event.getSource() == toggleTimelineItem)
2894	3696	{
2895		- if (CameraPane.FULLSCREEN)
	3697	+ timeline ^= true;
	3698	+
	3699	+ if (timeline)
2896	3700	{
2897		- frame.getContentPane().remove(/"Center",/bigThree);
2898		- framePanel.add(bigThree);
2899		- frame.getContentPane().add(/"Center",/framePanel);
2900		- } else
2901		- {
2902		- frame.getContentPane().remove(/"Center",/framePanel);
2903		- frame.getContentPane().add(/"Center",/bigThree);
	3701	+ centralPanel.remove(cameraView);
	3702	+ cameraPanel.add(cameraView);
	3703	+ centralPanel.add(cameraPanel);
	3704	+ frame.setJMenuBar(timelineMenubar);
	3705	+ wasFullScreen = CameraPane.FULLSCREEN;
	3706	+ if (!CameraPane.FULLSCREEN)
	3707	+ ToggleFullScreen();
	3708	+ toggleFullScreenItem.setEnabled(false);
2904	3709	}
	3710	+ else
	3711	+ {
	3712	+ centralPanel.remove(cameraPanel);
	3713	+ centralPanel.add(cameraView);
	3714	+ frame.setJMenuBar(null);
	3715	+ if (!wasFullScreen)
	3716	+ ToggleFullScreen();
	3717	+ toggleFullScreenItem.setEnabled(true);
	3718	+ }
	3719	+
2905	3720	frame.validate();
2906		- cameraView.ToggleFullScreen();
	3721	+ return;
	3722	+ } else if (event.getSource() == toggleFullScreenItem)
	3723	+ {
	3724	+ ToggleFullScreen();
	3725	+ frame.validate();
2907	3726
2908	3727	return;
2909		- } else if (event.getSource() == toggleRandomItem)
	3728	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2910	3729	{
2911		- cameraView.ToggleRandom();
	3730	+ cameraView.ToggleSwitch();
2912	3731	cameraView.repaint();
2913	3732	return;
2914	3733	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2936,12 +3755,17 @@
2936	3755	} else if (event.getSource() == liveCB)
2937	3756	{
2938	3757	copy.live ^= true;
	3758	+ objEditor.refreshContents(true); // To show item colors
	3759	+ return;
	3760	+ } else if (event.getSource() == selectableCB)
	3761	+ {
	3762	+ copy.dontselect ^= true;
2939	3763	return;
2940	3764	} else if (event.getSource() == hideCB)
2941	3765	{
2942	3766	copy.hide ^= true;
2943	3767	copy.Touch(); // display list issue
2944		- objEditor.refreshContents();
	3768	+ objEditor.refreshContents(true); // To show item colors
2945	3769	return;
2946	3770	} else if (event.getSource() == link2masterCB)
2947	3771	{
..	..	@@ -2951,6 +3775,7 @@
2951	3775	if (event.getSource() == randomCB)
2952	3776	{
2953	3777	copy.random ^= true;
	3778	+ objEditor.refreshContents();
2954	3779	return;
2955	3780	}
2956	3781	if (event.getSource() == speedupCB)
..	..	@@ -2974,8 +3799,9 @@
2974	3799
2975	3800	public void actionPerformed(ActionEvent event)
2976	3801	{
	3802	+ Object source = event.getSource();
2977	3803	// SCRIPT DIALOG
2978		- if (event.getSource() == okbutton)
	3804	+ if (source == okbutton)
2979	3805	{
2980	3806	textpanel.setVisible(false);
2981	3807	textpanel.remove(textarea);
..	..	@@ -2987,7 +3813,7 @@
2987	3813	textarea = null;
2988	3814	textpanel = null;
2989	3815	}
2990		- if (event.getSource() == cancelbutton)
	3816	+ if (source == cancelbutton)
2991	3817	{
2992	3818	textpanel.setVisible(false);
2993	3819	textpanel.remove(textarea);
..	..	@@ -2999,49 +3825,50 @@
2999	3825	//applySelf();
3000	3826	//client.refreshEditWindow();
3001	3827	//refreshContents();
3002		- if (event.getSource() == nameField)
	3828	+ if (source == nameField)
3003	3829	{
3004	3830	//System.out.println("ObjEditor " + event);
3005	3831	applySelf0(true);
3006	3832	//parent.applySelf();
3007	3833	objEditor.refreshContents();
3008		- } else if (event.getSource() == resetButton)
	3834	+ } else if (source == resetButton)
3009	3835	{
3010	3836	CameraPane.fullreset = true;
3011	3837	copy.Reset(); // ResetMeshes();
3012	3838	copy.Touch();
3013	3839	objEditor.refreshContents();
3014		- } else if (event.getSource() == stepItem)
	3840	+ } else if (source == stepItem)
3015	3841	{
3016		- cameraView.ONESTEP = true;
	3842	+ //cameraView.ONESTEP = true;
	3843	+ Globals.ONESTEP = true;
3017	3844	cameraView.repaint();
3018	3845	return;
3019		- } else if (event.getSource() == stepButton)
	3846	+ } else if (source == stepButton)
3020	3847	{
3021	3848	copy.Step();
3022	3849	copy.Touch();
3023	3850	objEditor.refreshContents();
3024		- } else if (event.getSource() == slowerButton)
	3851	+ } else if (source == slowerButton)
3025	3852	{
3026	3853	copy.Slower();
3027	3854	copy.Touch();
3028	3855	objEditor.refreshContents();
3029		- } else if (event.getSource() == fasterButton)
	3856	+ } else if (source == fasterButton)
3030	3857	{
3031	3858	copy.Faster();
3032	3859	copy.Touch();
3033	3860	objEditor.refreshContents();
3034		- } else if (event.getSource() == remarkButton)
	3861	+ } else if (source == remarkButton)
3035	3862	{
3036	3863	copy.Remark();
3037	3864	copy.Touch();
3038	3865	objEditor.refreshContents();
3039		- } else if (event.getSource() == stepAllButton)
	3866	+ } else if (source == stepAllButton)
3040	3867	{
3041	3868	copy.StepAll();
3042	3869	copy.Touch();
3043	3870	objEditor.refreshContents();
3044		- } else if (event.getSource() == resetAllButton)
	3871	+ } else if (source == resetAllButton)
3045	3872	{
3046	3873	//CameraPane.fullreset = true;
3047	3874	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3074,53 +3901,79 @@
3074	3901	// Close();
3075	3902	// }
3076	3903	// else
3077		- if (event.getSource() == resetSlidersButton)
	3904	+ if (source == resetSlidersButton)
3078	3905	{
3079	3906	ResetSliders();
3080		- } else if (event.getSource() == clearMaterialButton)
	3907	+ } else if (source == clearMaterialButton)
3081	3908	{
3082	3909	ClearMaterial();
3083		- } else if (event.getSource() == createMaterialButton)
	3910	+ } else if (source == createMaterialButton)
3084	3911	{
3085	3912	CreateMaterial();
3086		- } else if (event.getSource() == clearPanelButton)
	3913	+ } else if (source == clearPanelButton)
3087	3914	{
3088	3915	copy.ClearUI();
3089	3916	refreshContents(true);
3090		- } /*
3091		- }
3092		-
3093		- public boolean action(Event event, Object arg)
3094		- {
3095		- */ else if (event.getSource() == closeItem)
	3917	+ } else if (source == importGFDItem)
	3918	+ {
	3919	+ ImportGFD();
	3920	+ } else
	3921	+ if (source == importVRMLX3DItem)
	3922	+ {
	3923	+ ImportVRMLX3D();
	3924	+ } else
	3925	+ if (source == import3DSItem)
	3926	+ {
	3927	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3928	+ } else
	3929	+ if (source == importOBJItem)
	3930	+ {
	3931	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3932	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3933	+ browser.setVisible(true);
	3934	+ String filename = browser.getFile();
	3935	+ if (filename != null && filename.length() > 0)
	3936	+ {
	3937	+ String fullname = browser.getDirectory() + filename;
	3938	+ makeSomething(ReadOBJ(fullname), true);
	3939	+ }
	3940	+ } else
	3941	+ if (source == closeItem)
3096	3942	{
3097	3943	Close();
3098	3944	//return true;
3099		- } else if (event.getSource() == loadItem)
	3945	+ } else if (source == openItem)
3100	3946	{
3101		- load();
	3947	+ Open();
3102	3948	//return true;
3103		- } else if (event.getSource() == saveItem)
	3949	+ } else if (source == newItem)
	3950	+ {
	3951	+ New();
	3952	+ } else if (source == saveItem)
3104	3953	{
3105	3954	save();
3106	3955	//return true;
3107		- } else if (event.getSource() == saveAsItem)
	3956	+ } else if (source == saveAsItem)
3108	3957	{
3109	3958	saveAs();
3110	3959	//return true;
3111		- } else if (event.getSource() == reexportItem)
	3960	+ } else if (source == reexportItem)
3112	3961	{
3113	3962	reexport();
3114	3963	//return true;
3115		- } else if (event.getSource() == exportAsItem)
	3964	+ } else if (source == exportAsItem)
3116	3965	{
3117	3966	export();
3118	3967	//return true;
3119		- } else if (event.getSource() == povItem)
	3968	+ } else if (source == povItem)
3120	3969	{
3121	3970	generatePOV();
3122	3971	//return true;
3123		- } else if (event.getSource() == zBufferItem)
	3972	+ } else if (event.getSource() == archiveItem)
	3973	+ {
	3974	+ cTools.Archive(frame);
	3975	+ return;
	3976	+ } else if (source == zBufferItem)
3124	3977	{
3125	3978	try
3126	3979	{
..	..	@@ -3142,21 +3995,8 @@
3142	3995	cameraView.repaint();
3143	3996	//return true;
3144	3997	}
3145		- */ else if (event.getSource() == editCameraItem)
3146		- {
3147		- cameraView.ProtectCamera();
3148		- cameraView.repaint();
3149		- return;
3150		- } else if (event.getSource() == revertCameraItem)
3151		- {
3152		- cameraView.RevertCamera();
3153		- cameraView.repaint();
3154		- return;
3155		- } else if (event.getSource() == textureButton)
3156		- {
3157		- return; // true;
3158		- } else // combos...
3159		- if (event.getSource() == texresMenu)
	3998	+ */ else // combos...
	3999	+ if (source == texresMenu)
3160	4000	{
3161	4001	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3162	4002	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3168,27 +4008,487 @@
3168	4008	}
3169	4009	}
3170	4010
3171		- void ToggleAnimation()
	4011	+ void New()
3172	4012	{
3173		- if (!CameraPane.ANIMATION)
	4013	+ while (copy.Size() > 1)
3174	4014	{
3175		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4015	+ copy.remove(1);
	4016	+ }
	4017	+
	4018	+ ResetModel();
	4019	+ objEditor.refreshContents();
	4020	+ }
	4021	+
	4022	+ static public byte[] Compress(Object3D o)
	4023	+ {
	4024	+ // Slower to actually compress.
	4025	+ try
	4026	+ {
	4027	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4028	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4029	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4030	+
	4031	+ Object3D parent = o.parent;
	4032	+ o.parent = null;
	4033	+
	4034	+ out.writeObject(o);
	4035	+
	4036	+ o.parent = parent;
	4037	+
	4038	+ out.flush();
	4039	+
	4040	+ baos //zstream
	4041	+ .close();
	4042	+ out.close();
	4043	+
	4044	+ byte[] bytes = baos.toByteArray();
	4045	+
	4046	+ System.out.println("save #bytes = " + bytes.length);
	4047	+ return bytes;
	4048	+ } catch (Exception e)
	4049	+ {
	4050	+ System.err.println(e);
	4051	+ return null;
	4052	+ }
	4053	+ }
	4054	+
	4055	+ static public Object Uncompress(byte[] bytes)
	4056	+ {
	4057	+ System.out.println("restore #bytes = " + bytes.length);
	4058	+ try
	4059	+ {
	4060	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4061	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4062	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4063	+ Object obj = in.readObject();
	4064	+
	4065	+ bais //istream
	4066	+ .close();
	4067	+ in.close();
	4068	+
	4069	+ return obj;
	4070	+ } catch (Exception e)
	4071	+ {
	4072	+ System.err.println(e);
	4073	+ return null;
	4074	+ }
	4075	+ }
	4076	+
	4077	+ static public Object clone(Object o)
	4078	+ {
	4079	+ try
	4080	+ {
	4081	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4082	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4083	+
	4084	+ out.writeObject(o);
	4085	+
	4086	+ out.flush();
	4087	+ out.close();
	4088	+
	4089	+ byte[] bytes = baos.toByteArray();
	4090	+
	4091	+ System.out.println("clone = " + bytes.length);
	4092	+
	4093	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4094	+ ObjectInputStream in = new ObjectInputStream(bais);
	4095	+ Object obj = in.readObject();
	4096	+ in.close();
	4097	+
	4098	+ return obj;
	4099	+ } catch (Exception e)
	4100	+ {
	4101	+ System.err.println(e);
	4102	+ return null;
	4103	+ }
	4104	+ }
	4105	+
	4106	+ cRadio GetCurrentTab()
	4107	+ {
	4108	+ cRadio ab;
	4109	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4110	+ {
	4111	+ ab = (cRadio)e.nextElement();
	4112	+ if(ab.GetObject() == copy)
	4113	+ {
	4114	+ return ab;
	4115	+ }
	4116	+ }
	4117	+
	4118	+ return null;
	4119	+ }
	4120	+
	4121	+
	4122	+ public void Save()
	4123	+ {
	4124	+ //Save(true);
	4125	+ Replace();
	4126	+ SetUndoStates();
	4127	+ }
	4128	+
	4129	+ private boolean Equal(byte[] compress, byte[] name)
	4130	+ {
	4131	+ if (compress.length != name.length)
	4132	+ {
	4133	+ return false;
	4134	+ }
	4135	+
	4136	+ for (int i=compress.length; --i>=0;)
	4137	+ {
	4138	+ if (compress[i] != name[i])
	4139	+ return false;
	4140	+ }
	4141	+
	4142	+ return true;
	4143	+ }
	4144	+
	4145	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4146	+
	4147	+ void DeleteVersion()
	4148	+ {
	4149	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4150	+ {
	4151	+ copy.versionlist[i] = copy.versionlist[i+1];
	4152	+ }
	4153	+
	4154	+ CopyChanged();
	4155	+
	4156	+ SetUndoStates();
	4157	+ }
	4158	+
	4159	+ public boolean Save(boolean user)
	4160	+ {
	4161	+ System.err.println("Save");
	4162	+ Replace();
	4163	+
	4164	+ cRadio tab = GetCurrentTab();
	4165	+
	4166	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4167	+
	4168	+ boolean thesame = false;
	4169	+
	4170	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4171	+// {
	4172	+// thesame = true;
	4173	+// }
	4174	+
	4175	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4176	+ if (!thesame)
	4177	+ {
	4178	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4179	+ {
	4180	+ copy.versionlist[i] = copy.versionlist[i-1];
	4181	+ }
	4182	+
	4183	+ //tab.user[tab.versionindex] = user;
	4184	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4185	+
	4186	+ copy.versionlist[++copy.versionindex] = compress;
	4187	+
	4188	+ // if (increment)
	4189	+ // tab.versionindex++;
	4190	+ }
	4191	+
	4192	+ //copy.RestoreBigData(versiontable);
	4193	+
	4194	+ //assert(hashtable.isEmpty());
	4195	+
	4196	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4197	+// {
	4198	+// //tab.user[i] = false;
	4199	+// copy.versionlist[i] = null;
	4200	+// }
	4201	+
	4202	+ SetUndoStates();
	4203	+
	4204	+ // test save
	4205	+ if (false)
	4206	+ {
	4207	+ try
	4208	+ {
	4209	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4210	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4211	+
	4212	+ p.writeObject(copy);
	4213	+
	4214	+ p.flush();
	4215	+
	4216	+ ostream.close();
	4217	+ } catch (Exception e)
	4218	+ {
	4219	+ e.printStackTrace();
	4220	+ }
	4221	+ }
	4222	+
	4223	+ return !thesame;
	4224	+ }
	4225	+
	4226	+ boolean flashIt = true;
	4227	+
	4228	+ void RefreshSelection()
	4229	+ {
	4230	+ Object3D selection = new Object3D();
	4231	+
	4232	+ for (int i = 0; i < copy.selection.size(); i++)
	4233	+ {
	4234	+ Object3D elem = copy.selection.elementAt(i);
	4235	+
	4236	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4237	+
	4238	+ if (obj == null)
	4239	+ {
	4240	+ copy.selection.remove(i--);
	4241	+ }
	4242	+ else
	4243	+ {
	4244	+ selection.add(obj);
	4245	+ copy.selection.setElementAt(obj, i);
	4246	+ }
	4247	+ }
	4248	+
	4249	+ flashIt = false;
	4250	+ GetTree().clearSelection();
	4251	+ for (int i = 0; i < selection.size(); i++)
	4252	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4253	+ flashIt = true;
	4254	+
	4255	+ //refreshContents(false);
	4256	+ }
	4257	+
	4258	+ void CopyChanged()
	4259	+ {
	4260	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4261	+
	4262	+ SetUndoStates();
	4263	+
	4264	+ boolean temp = CameraPane.SWITCH;
	4265	+ CameraPane.SWITCH = false;
	4266	+
	4267	+ copy.ExtractBigData(versiontable);
	4268	+
	4269	+ copy.clear();
	4270	+
	4271	+ copy.skyboxname = obj.skyboxname;
	4272	+ copy.skyboxext = obj.skyboxext;
	4273	+
	4274	+ for (int i=0; i<obj.Size(); i++)
	4275	+ {
	4276	+ copy.add(obj.get(i));
	4277	+ }
	4278	+
	4279	+ copy.RestoreBigData(versiontable);
	4280	+
	4281	+ CameraPane.SWITCH = temp;
	4282	+
	4283	+ RefreshSelection();
	4284	+ //assert(hashtable.isEmpty());
	4285	+
	4286	+ copy.Touch();
	4287	+
	4288	+ ResetModel();
	4289	+ copy.HardTouch(); // recompile?
	4290	+
	4291	+ cRadio ab;
	4292	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4293	+ {
	4294	+ ab = (cRadio)e.nextElement();
	4295	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4296	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4297	+ if (test != null)
	4298	+ {
	4299	+ test.editWindow = ab.object.editWindow;
	4300	+ ab.object = test;
	4301	+ }
	4302	+ }
	4303	+
	4304	+ refreshContents(true);
	4305	+ }
	4306	+
	4307	+ cButton previousVersionButton;
	4308	+ cButton restoreButton;
	4309	+ cButton replaceButton;
	4310	+ cButton nextVersionButton;
	4311	+ cButton saveVersionButton;
	4312	+ cButton deleteVersionButton;
	4313	+
	4314	+ boolean muteSlider;
	4315	+
	4316	+ int VersionCount()
	4317	+ {
	4318	+ int count = 0;
	4319	+
	4320	+ for (int i = copy.versionlist.length; --i >= 0;)
	4321	+ {
	4322	+ if (copy.versionlist[i] != null)
	4323	+ count++;
	4324	+ }
	4325	+
	4326	+ return count;
	4327	+ }
	4328	+
	4329	+ void SetUndoStates()
	4330	+ {
	4331	+ cRadio tab = GetCurrentTab();
	4332	+
	4333	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4334	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4335	+
	4336	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4337	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4338	+
	4339	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4340	+ copy.versionlist[copy.versionindex + 1] != null);
	4341	+
	4342	+ muteSlider = true;
	4343	+ versionSlider.setMaximum(VersionCount() - 1);
	4344	+ versionSlider.setInteger(copy.versionindex);
	4345	+ muteSlider = false;
	4346	+ }
	4347	+
	4348	+ public boolean PreviousVersion()
	4349	+ {
	4350	+ // Option?
	4351	+ Replace();
	4352	+
	4353	+ System.err.println("Undo");
	4354	+
	4355	+ cRadio tab = GetCurrentTab();
	4356	+
	4357	+ if (copy.versionindex == 0)
	4358	+ {
	4359	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4360	+ return false;
	4361	+ }
	4362	+
	4363	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4364	+// {
	4365	+// if (Save(false))
	4366	+// tab.versionindex -= 1;
	4367	+// else
	4368	+// {
	4369	+// if (tab.versionindex <= 0)
	4370	+// return false;
	4371	+// else
	4372	+// tab.versionindex -= 1;
	4373	+// }
	4374	+// }
	4375	+
	4376	+ copy.versionindex -= 1;
	4377	+
	4378	+ CopyChanged();
	4379	+
	4380	+ return true;
	4381	+ }
	4382	+
	4383	+ public boolean Restore()
	4384	+ {
	4385	+ System.err.println("Restore");
	4386	+
	4387	+ cRadio tab = GetCurrentTab();
	4388	+
	4389	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4390	+ {
	4391	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4392	+ return false;
	4393	+ }
	4394	+
	4395	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4396	+ CopyChanged();
	4397	+
	4398	+ return true;
	4399	+ }
	4400	+
	4401	+ public boolean Replace()
	4402	+ {
	4403	+ System.err.println("Replace");
	4404	+
	4405	+ cRadio tab = GetCurrentTab();
	4406	+
	4407	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4408	+ {
	4409	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4410	+ return false;
	4411	+ }
	4412	+
	4413	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4414	+
	4415	+ return true;
	4416	+ }
	4417	+
	4418	+ public void NextVersion()
	4419	+ {
	4420	+ // Option?
	4421	+ Replace();
	4422	+
	4423	+ cRadio tab = GetCurrentTab();
	4424	+
	4425	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4426	+ {
	4427	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4428	+ return;
	4429	+ }
	4430	+
	4431	+ copy.versionindex += 1;
	4432	+
	4433	+ CopyChanged();
	4434	+
	4435	+ //if (!tab.user[tab.versionindex])
	4436	+ // tab.graphs[tab.versionindex] = null;
	4437	+ }
	4438	+
	4439	+ void ImportGFD()
	4440	+ {
	4441	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3176	4442	browser.show();
3177	4443	String filename = browser.getFile();
3178	4444	if (filename != null && filename.length() > 0)
3179	4445	{
3180		- CameraPane.filename = browser.getDirectory() + filename;
	4446	+ String fullname = browser.getDirectory() + filename;
	4447	+
	4448	+ //Object3D readobj =
	4449	+ objEditor.ReadGFD(fullname, objEditor);
	4450	+ //makeSomething(readobj);
	4451	+ }
	4452	+ }
	4453	+
	4454	+ void ImportVRMLX3D()
	4455	+ {
	4456	+ if (Grafreed.standAlone)
	4457	+ {
	4458	+ /**/
	4459	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4460	+ browser.show();
	4461	+ String filename = browser.getFile();
	4462	+ if (filename != null && filename.length() > 0)
	4463	+ {
	4464	+ String fullname = browser.getDirectory() + filename;
	4465	+ LoadVRMLX3D(fullname);
	4466	+ }
	4467	+ /**/
	4468	+ }
	4469	+ }
	4470	+
	4471	+ void ToggleAnimation()
	4472	+ {
	4473	+ if (!Globals.ANIMATION)
	4474	+ {
	4475	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4476	+ browser.setVisible(true);
	4477	+ String filename = browser.getFile();
	4478	+ if (filename != null && filename.length() > 0)
	4479	+ {
	4480	+ Globals.filename = browser.getDirectory() + filename;
3181	4481	//CameraPane.framecount = 0;
3182		- CameraPane.imagecount = 0;
	4482	+ Globals.imagecount = 0;
3183	4483
3184		- CameraPane.ANIMATION ^= true;
	4484	+ Globals.ANIMATION ^= true;
3185	4485
3186		- GraphreeD.wav.cursor = 0;
3187		- GraphreeD.wav.loop = 0;
	4486	+ Grafreed.wav.cursor = 0;
	4487	+ Grafreed.wav.loop = 0;
3188	4488	}
3189	4489	} else
3190	4490	{
3191		- CameraPane.ANIMATION ^= true;
	4491	+ Globals.ANIMATION ^= true;
3192	4492	}
3193	4493	}
3194	4494
..	..	@@ -3234,7 +4534,7 @@
3234	4534	void CreateMaterial()
3235	4535	{
3236	4536	//copy.ClearMaterial(); // PATCH
3237		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4537	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3238	4538	if (copy.selection.size() > 0)
3239	4539	//SetMaterial(copy);
3240	4540	{
..	..	@@ -3285,7 +4585,7 @@
3285	4585	assert false;
3286	4586	}
3287	4587
3288		- void EditSelection()
	4588	+ void EditSelection(boolean newWindow)
3289	4589	{
3290	4590	}
3291	4591
..	..	@@ -3293,11 +4593,11 @@
3293	4593	{
3294	4594	copy.ResetBlockLoop(); // temporary problem
3295	4595
3296		- boolean random = CameraPane.RANDOM;
3297		- CameraPane.RANDOM = false; // parse everything
	4596	+ boolean random = CameraPane.SWITCH;
	4597	+ CameraPane.SWITCH = false; // parse everything
3298	4598	copy.ResetDisplayList();
3299	4599	copy.HardTouch();
3300		- CameraPane.RANDOM = random;
	4600	+ CameraPane.SWITCH = random;
3301	4601	}
3302	4602
3303	4603	// public void applySelf()
..	..	@@ -3344,7 +4644,7 @@
3344	4644	//copy.material = new cMaterial(copy.GetMaterial());
3345	4645
3346	4646	current.color = (float) colorField.getFloat();
3347		- current.modulation = (float) modulationField.getFloat();
	4647	+ current.modulation = (float) saturationField.getFloat();
3348	4648	current.metalness = (float) metalnessField.getFloat();
3349	4649	current.diffuse = (float) diffuseField.getFloat();
3350	4650	current.specular = (float) specularField.getFloat();
..	..	@@ -3367,10 +4667,40 @@
3367	4667	current.fakedepth = (float) fakedepthField.getFloat();
3368	4668	current.shadowbias = (float) shadowbiasField.getFloat();
3369	4669
3370		- if (!NumberSlider.frozen)
	4670	+ if (!cNumberSlider.frozen)
3371	4671	{
3372	4672	//System.out.println("Propagate = " + propagate);
3373	4673	copy.UpdateMaterial(anchor, current, propagate);
	4674	+
	4675	+ if (copy.material != null)
	4676	+ {
	4677	+ cMaterial mat = copy.material;
	4678	+
	4679	+ colorField.SetToolTipValue((mat.color));
	4680	+ saturationField.SetToolTipValue((mat.modulation));
	4681	+ metalnessField.SetToolTipValue((mat.metalness));
	4682	+ diffuseField.SetToolTipValue((mat.diffuse));
	4683	+ specularField.SetToolTipValue((mat.specular));
	4684	+ shininessField.SetToolTipValue((mat.shininess));
	4685	+ shiftField.SetToolTipValue((mat.shift));
	4686	+ ambientField.SetToolTipValue((mat.ambient));
	4687	+ lightareaField.SetToolTipValue((mat.lightarea));
	4688	+ diffusenessField.SetToolTipValue((mat.factor));
	4689	+ velvetField.SetToolTipValue((mat.velvet));
	4690	+ sheenField.SetToolTipValue((mat.sheen));
	4691	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4692	+ backlitField.SetToolTipValue((mat.bump));
	4693	+ anisoField.SetToolTipValue((mat.aniso));
	4694	+ anisoVField.SetToolTipValue((mat.anisoV));
	4695	+ cameraField.SetToolTipValue((mat.cameralight));
	4696	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4697	+ shadowField.SetToolTipValue((mat.shadow));
	4698	+ textureField.SetToolTipValue((mat.texture));
	4699	+ opacityField.SetToolTipValue((mat.opacity));
	4700	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4701	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4702	+ }
	4703	+
3374	4704	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3375	4705	{
3376	4706	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3399,9 +4729,26 @@
3399	4729	//copy.Touch();
3400	4730	}
3401	4731
	4732	+ cNumberSlider versionSlider;
	4733	+
3402	4734	public void stateChanged(ChangeEvent e)
3403	4735	{
3404	4736	// assert(false);
	4737	+ if (e.getSource() == versionSlider)
	4738	+ {
	4739	+ if (muteSlider)
	4740	+ return;
	4741	+
	4742	+ int version = versionSlider.getInteger();
	4743	+
	4744	+ if (copy.versionlist[version] != null)
	4745	+ {
	4746	+ copy.versionindex = version;
	4747	+ CopyChanged();
	4748	+ }
	4749	+
	4750	+ return;
	4751	+ }
3405	4752
3406	4753	if (freezematerial)
3407	4754	{
..	..	@@ -3415,6 +4762,7 @@
3415	4762	\|\| e.getSource() == apertureField
3416	4763	\|\| e.getSource() == shadowblurField)
3417	4764	{
	4765	+ new Exception().printStackTrace();
3418	4766	System.exit(0);
3419	4767	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3420	4768	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3436,12 +4784,24 @@
3436	4784	{
3437	4785	//System.out.println("stateChanged = " + this);
3438	4786	materialtouched = true;
	4787	+
	4788	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4789	+ {
	4790	+ saturationField.setFloat(1);
	4791	+ }
	4792	+
3439	4793	applySelf();
3440	4794	//System.out.println("this = " + this);
3441	4795	//System.out.println("PARENT = " + parent);
3442	4796	//if (parent != null)
3443	4797	// parent.applySelf();
3444		- refreshContents();
	4798	+ if (e.getSource() == normalpushField)
	4799	+ {
	4800	+ objEditor.refreshContents();
	4801	+ //Refresh();
	4802	+ }
	4803	+ else
	4804	+ refreshContents();
3445	4805	// ??? client.refreshEditWindow();
3446	4806	}
3447	4807	//else
..	..	@@ -3453,7 +4813,7 @@
3453	4813	//group.name = nameField.getText();
3454	4814	//objEditor.applySelf();
3455	4815
3456		- assert (objEditor == this);
	4816	+ // OCT2018: assert (objEditor == this);
3457	4817	if (copy.selection == null \|\| copy.selection.size() == 0)
3458	4818	//super.applySelf()
3459	4819	; else
..	..	@@ -3477,12 +4837,18 @@
3477	4837	objEditor.copy = keep;
3478	4838	}
3479	4839	}
	4840	+
	4841	+ if (normalpushField != null)
	4842	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3480	4843	}
3481	4844
3482	4845	void SnapObject()
3483	4846	{
3484		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3485		- SnapObject(obj);
	4847	+ if (copy.selection.size() > 0)
	4848	+ {
	4849	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4850	+ SnapObject(obj);
	4851	+ }
3486	4852	}
3487	4853
3488	4854	void SnapObject(Object3D obj)
..	..	@@ -3596,7 +4962,7 @@
3596	4962
3597	4963	if (obj.parent != null)
3598	4964	{
3599		- obj.parent.TransformToWorld(interest);
	4965	+// obj.parent.TransformToWorld(interest);
3600	4966	}
3601	4967
3602	4968	if (!CameraPane.TRACK)
..	..	@@ -3723,20 +5089,26 @@
3723	5089	{
3724	5090	if (GetTree() != null)
3725	5091	{
	5092	+ GetTree().revalidate();
3726	5093	GetTree().repaint();
3727	5094	}
3728	5095
3729	5096	radioPanel.revalidate();
3730	5097	radioPanel.repaint();
3731		- ctrlPanel.revalidate(); // ? new
	5098	+ ctrlPanel.validate(); // ? new
3732	5099	ctrlPanel.repaint();
3733	5100	}
	5101	+
	5102	+ if (previousVersionButton != null && copy.versionlist != null)
	5103	+ SetUndoStates();
3734	5104	}
3735	5105
3736	5106	static TweenManager tweenManager = new TweenManager();
3737	5107
3738	5108	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3739	5109	{
	5110	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5111	+ Save();
3740	5112	//Tween.set(thing, 0).target(1).start(tweenManager);
3741	5113	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3742	5114	// if (thing instanceof GenericJointDemo)
..	..	@@ -3823,6 +5195,12 @@
3823	5195	{
3824	5196	ResetModel();
3825	5197	Select(thing.GetTreePath(), true, false); // unselect... false);
	5198	+
	5199	+ if (thing.Size() == 0)
	5200	+ {
	5201	+ //EditSelection(false);
	5202	+ }
	5203	+
3826	5204	refreshContents();
3827	5205	}
3828	5206
..	..	@@ -3940,6 +5318,7 @@
3940	5318	}
3941	5319	}
3942	5320	}
	5321	+
3943	5322	LoadGFDThread loadGFDThread;
3944	5323
3945	5324	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3959,8 +5338,10 @@
3959	5338
3960	5339	try
3961	5340	{
	5341	+ // Try compressed version first.
3962	5342	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3963		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5343	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5344	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3964	5345
3965	5346	readobj = (Object3D) p.readObject();
3966	5347	istream.close();
..	..	@@ -3968,7 +5349,22 @@
3968	5349	readobj.ResetDisplayList();
3969	5350	} catch (Exception e)
3970	5351	{
3971		- e.printStackTrace();
	5352	+ if (!e.toString().contains("GZIP"))
	5353	+ e.printStackTrace();
	5354	+
	5355	+ try
	5356	+ {
	5357	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5358	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5359	+
	5360	+ readobj = (Object3D) p.readObject();
	5361	+ istream.close();
	5362	+
	5363	+ readobj.ResetDisplayList();
	5364	+ } catch (Exception e2)
	5365	+ {
	5366	+ e2.printStackTrace();
	5367	+ }
3972	5368	}
3973	5369	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3974	5370	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4014,6 +5410,12 @@
4014	5410
4015	5411	void LoadIt(Object obj)
4016	5412	{
	5413	+ if (obj == null)
	5414	+ {
	5415	+ // Invalid file
	5416	+ return;
	5417	+ }
	5418	+
4017	5419	System.out.println("Loaded " + obj);
4018	5420	//new Exception().printStackTrace();
4019	5421	Object3D readobj = (Object3D) obj;
..	..	@@ -4023,10 +5425,14 @@
4023	5425
4024	5426	if (readobj != null)
4025	5427	{
	5428	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5429	+ // Save();
4026	5430	try
4027	5431	{
4028	5432	//readobj.deepCopySelf(copy);
4029	5433	copy.clear(); // june 2014
	5434	+ copy.skyboxname = readobj.skyboxname;
	5435	+ copy.skyboxext = readobj.skyboxext;
4030	5436	for (int i = 0; i < readobj.size(); i++)
4031	5437	{
4032	5438	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4067,6 +5473,7 @@
4067	5473	}
4068	5474	} catch (ClassCastException e)
4069	5475	{
	5476	+ e.printStackTrace();
4070	5477	assert (false);
4071	5478	Composite c = (Composite) copy;
4072	5479	c.children.clear();
..	..	@@ -4077,17 +5484,28 @@
4077	5484	c.addChild(csg);
4078	5485	}
4079	5486
	5487	+ copy.versionlist = readobj.versionlist;
	5488	+ copy.versionindex = readobj.versionindex;
	5489	+
	5490	+ if (copy.versionlist == null)
	5491	+ {
	5492	+ copy.versionlist = new Object3D[100];
	5493	+ copy.versionindex = -1;
	5494	+ }
	5495	+
	5496	+ //? SetUndoStates();
	5497	+
4080	5498	ResetModel();
4081	5499	copy.HardTouch(); // recompile?
4082	5500	refreshContents();
4083	5501	}
4084	5502	}
4085	5503
4086		- void load() // throws ClassNotFoundException
	5504	+ void Open() // throws ClassNotFoundException
4087	5505	{
4088		- if (GraphreeD.standAlone)
	5506	+ if (Grafreed.standAlone)
4089	5507	{
4090		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5508	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4091	5509	browser.show();
4092	5510	String filename = browser.getFile();
4093	5511	if (filename != null && filename.length() > 0)
..	..	@@ -4172,11 +5590,13 @@
4172	5590	try
4173	5591	{
4174	5592	FileOutputStream ostream = new FileOutputStream(lastname);
4175		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5593	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5594	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4176	5595
4177	5596	p.writeObject(copy);
4178	5597	p.flush();
4179	5598
	5599	+ zstream.close();
4180	5600	ostream.close();
4181	5601
4182	5602	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4184,19 +5604,23 @@
4184	5604	//ps.print(buffer.toString());
4185	5605	} catch (IOException e)
4186	5606	{
	5607	+ e.printStackTrace();
4187	5608	}
4188	5609	}
	5610	+
4189	5611	String lastname;
4190	5612
4191	5613	void saveAs()
4192	5614	{
4193		- if (GraphreeD.standAlone)
	5615	+ if (Grafreed.standAlone)
4194	5616	{
4195	5617	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4196	5618	browser.setVisible(true);
4197	5619	String filename = browser.getFile();
4198	5620	if (filename != null && filename.length() > 0)
4199	5621	{
	5622	+ if (!filename.endsWith(".gfd"))
	5623	+ filename += ".gfd";
4200	5624	lastname = browser.getDirectory() + filename;
4201	5625	save();
4202	5626	}
..	..	@@ -4213,10 +5637,20 @@
4213	5637
4214	5638	Object3D object = copy.selection.get(0);
4215	5639
	5640	+ FileObject fileobj = null;
	5641	+
	5642	+ if (object instanceof FileObject)
	5643	+ fileobj = (FileObject)object;
	5644	+
4216	5645	if (object.fileparent != null)
4217	5646	{
4218		- FileObject fileobj = (FileObject) object.fileparent;
	5647	+ assert(fileobj == null);
4219	5648
	5649	+ fileobj = (FileObject) object.fileparent;
	5650	+ }
	5651	+
	5652	+ if (fileobj != null)
	5653	+ {
4220	5654	System.out.println("WriteObject " + object + " : " + fileobj.name);
4221	5655	WriteObject(object, fileobj.name);
4222	5656	}
..	..	@@ -4259,7 +5693,7 @@
4259	5693	}
4260	5694	}
4261	5695	else
4262		- //if (GraphreeD.standAlone)
	5696	+ //if (GrafreeD.standAlone)
4263	5697	{
4264	5698	FileDialog browser = new FileDialog(frame, "Export", FileDialog.SAVE);
4265	5699	browser.setVisible(true);
..	..	@@ -4285,13 +5719,13 @@
4285	5719	try
4286	5720	{
4287	5721	FileOutputStream ostream = new FileOutputStream(filename);
4288		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4289		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5722	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5723	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4290	5724
4291	5725	Object3D objectparent = obj.parent;
4292	5726	obj.parent = null;
4293	5727
4294		- Object3D object = (Object3D) GraphreeD.clone(obj);
	5728	+ Object3D object = (Object3D) Grafreed.clone(obj);
4295	5729
4296	5730	obj.parent = objectparent;
4297	5731
..	..	@@ -4303,8 +5737,8 @@
4303	5737	p.writeObject(object);
4304	5738	p.flush();
4305	5739
	5740	+ zstream.close();
4306	5741	ostream.close();
4307		- // zstream.close();
4308	5742
4309	5743	// group.selection.get(0).parent = parent;
4310	5744	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4325,7 +5759,7 @@
4325	5759	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4326	5760	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4327	5761	copy.generatePOV(buffer);
4328		- if (GraphreeD.standAlone)
	5762	+ if (Grafreed.standAlone)
4329	5763	{
4330	5764	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4331	5765	browser.show();
..	..	@@ -4351,53 +5785,71 @@
4351	5785	Object3D client;
4352	5786	Object3D copy;
4353	5787	MenuBar menuBar;
4354		- Menu windowMenu;
4355		- MenuItem loadItem;
	5788	+ Menu fileMenu;
	5789	+ MenuItem newItem;
	5790	+ MenuItem openItem;
4356	5791	MenuItem saveItem;
4357	5792	MenuItem saveAsItem;
4358	5793	MenuItem exportAsItem;
4359	5794	MenuItem reexportItem;
4360	5795	MenuItem povItem;
4361	5796	MenuItem closeItem;
4362		- Menu cameraMenu;
	5797	+
4363	5798	CheckboxMenuItem zBufferItem;
4364	5799	//MenuItem normalLensItem;
4365		- MenuItem editCameraItem;
4366		- MenuItem revertCameraItem;
4367		- CheckboxMenuItem toggleLiveItem;
4368	5800	MenuItem stepItem;
4369		- CheckboxMenuItem toggleFullItem;
	5801	+ CheckboxMenuItem toggleLiveItem;
	5802	+ CheckboxMenuItem toggleFullScreenItem;
	5803	+ CheckboxMenuItem toggleTimelineItem;
4370	5804	CheckboxMenuItem toggleRenderItem;
4371	5805	CheckboxMenuItem toggleDebugItem;
4372	5806	CheckboxMenuItem toggleFrustumItem;
4373	5807	CheckboxMenuItem toggleFootContactItem;
4374	5808	CheckboxMenuItem toggleDLItem;
4375	5809	CheckboxMenuItem toggleTextureItem;
4376		- CheckboxMenuItem toggleRandomItem;
	5810	+ CheckboxMenuItem toggleSwitchItem;
4377	5811	CheckboxMenuItem toggleRootItem;
4378	5812	CheckboxMenuItem animationItem;
	5813	+ MenuItem archiveItem;
4379	5814	CheckboxMenuItem toggleHandleItem;
4380	5815	CheckboxMenuItem togglePaintItem;
4381	5816	JSplitPane mainPanel;
4382	5817	JScrollPane scrollpane;
	5818	+
4383	5819	JPanel toolbarPanel;
4384		- JPanel treePanel;
	5820	+
	5821	+ cGridBag treePanel;
	5822	+
4385	5823	JPanel radioPanel;
4386	5824	ButtonGroup buttonGroup;
4387		- JPanel ctrlPanel;
4388		- JPanel materialPanel;
	5825	+
	5826	+ cGridBag toolboxPanel;
	5827	+ cGridBag skyboxPanel;
	5828	+ cGridBag materialPanel;
	5829	+ cGridBag ctrlPanel;
	5830	+
4389	5831	JScrollPane infoPanel;
4390		- JPanel optionsPanel;
	5832	+
	5833	+ cGridBag optionsPanel;
	5834	+
4391	5835	JTabbedPane objectPanel;
4392		- JPanel XYZPanel;
	5836	+ boolean materialFlushed;
	5837	+ Object3D latestObject;
	5838	+
	5839	+ cGridBag XYZPanel;
	5840	+
4393	5841	JSplitPane gridPanel;
4394	5842	JSplitPane bigPanel;
4395		- JPanel bigThree;
4396		- JTabbedPane jtp;
4397		- JPanel cameraPanel;
	5843	+
	5844	+ cGridBag bigThree;
	5845	+ cGridBag scenePanel;
	5846	+ cGridBag centralPanel;
	5847	+ JSplitPane cameraPanel;
	5848	+ JPanel timelinePanel;
	5849	+ JMenuBar timelineMenubar;
4398	5850	JSplitPane framePanel;
4399	5851	JTextArea/Field/ nameField;
4400		- cButton textureButton;
	5852	+ //cButton textureButton;
4401	5853	cButton okButton;
4402	5854	cButton applyButton;
4403	5855	cButton cancelButton;
..	..	@@ -4444,65 +5896,74 @@
4444	5896	// MATERIAL
4445	5897	JLabel materialLabel;
4446	5898	JLabel colorLabel;
4447		- NumberSlider colorField;
	5899	+ cNumberSlider colorField;
4448	5900	JLabel modulationLabel;
4449		- NumberSlider modulationField;
	5901	+ cNumberSlider saturationField;
4450	5902	JLabel metalnessLabel;
4451		- NumberSlider metalnessField;
	5903	+ cNumberSlider metalnessField;
4452	5904	JLabel diffuseLabel;
4453		- NumberSlider diffuseField;
	5905	+ cNumberSlider diffuseField;
4454	5906	JLabel specularLabel;
4455		- NumberSlider specularField;
	5907	+ cNumberSlider specularField;
4456	5908	JLabel shininessLabel;
4457		- NumberSlider shininessField;
	5909	+ cNumberSlider shininessField;
4458	5910	JLabel shiftLabel;
4459		- NumberSlider shiftField;
	5911	+ cNumberSlider shiftField;
4460	5912	JLabel ambientLabel;
4461		- NumberSlider ambientField;
	5913	+ cNumberSlider ambientField;
4462	5914	JLabel lightareaLabel;
4463		- NumberSlider lightareaField;
	5915	+ cNumberSlider lightareaField;
4464	5916	JLabel diffusenessLabel;
4465		- NumberSlider diffusenessField;
	5917	+ cNumberSlider diffusenessField;
4466	5918	JLabel velvetLabel;
4467		- NumberSlider velvetField;
	5919	+ cNumberSlider velvetField;
4468	5920	JLabel sheenLabel;
4469		- NumberSlider sheenField;
	5921	+ cNumberSlider sheenField;
4470	5922	JLabel subsurfaceLabel;
4471		- NumberSlider subsurfaceField;
	5923	+ cNumberSlider subsurfaceField;
4472	5924	//JLabel bumpLabel;
4473	5925	//NumberSlider bumpField;
4474	5926	JLabel backlitLabel;
4475		- NumberSlider backlitField;
	5927	+ cNumberSlider backlitField;
4476	5928	JLabel anisoLabel;
4477		- NumberSlider anisoField;
	5929	+ cNumberSlider anisoField;
4478	5930	JLabel anisoVLabel;
4479		- NumberSlider anisoVField;
	5931	+ cNumberSlider anisoVField;
	5932	+
4480	5933	JLabel cameraLabel;
4481		- NumberSlider cameraField;
	5934	+ cNumberSlider cameraField;
4482	5935	JLabel selfshadowLabel;
4483		- NumberSlider selfshadowField;
	5936	+ cNumberSlider selfshadowField;
4484	5937	JLabel shadowLabel;
4485		- NumberSlider shadowField;
	5938	+ cNumberSlider shadowField;
4486	5939	JLabel textureLabel;
4487		- NumberSlider textureField;
	5940	+ cNumberSlider textureField;
4488	5941	JLabel opacityLabel;
4489		- NumberSlider opacityField;
	5942	+ cNumberSlider opacityField;
4490	5943	JLabel fakedepthLabel;
4491		- NumberSlider fakedepthField;
	5944	+ cNumberSlider fakedepthField;
4492	5945	JLabel shadowbiasLabel;
4493		- NumberSlider shadowbiasField;
	5946	+ cNumberSlider shadowbiasField;
	5947	+
4494	5948	JLabel bumpLabel;
4495		- NumberSlider bumpField;
	5949	+ cNumberSlider bumpField;
4496	5950	JLabel noiseLabel;
4497		- NumberSlider noiseField;
	5951	+ cNumberSlider noiseField;
4498	5952	JLabel powerLabel;
4499		- NumberSlider powerField;
	5953	+ cNumberSlider powerField;
4500	5954	JLabel borderfadeLabel;
4501		- NumberSlider borderfadeField;
	5955	+ cNumberSlider borderfadeField;
4502	5956	JLabel fogLabel;
4503		- NumberSlider fogField;
	5957	+ cNumberSlider fogField;
4504	5958	JLabel opacityPowerLabel;
4505		- NumberSlider opacityPowerField;
4506		- JTree jTree;
	5959	+ cNumberSlider opacityPowerField;
	5960	+ cTree jTree;
4507	5961	//ObjectUI parent;
	5962	+
	5963	+ cNumberSlider normalpushField;
	5964	+
	5965	+ private MenuItem importGFDItem;
	5966	+ private MenuItem importVRMLX3DItem;
	5967	+ private MenuItem import3DSItem;
	5968	+ private MenuItem importOBJItem;
4508	5969	}