~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,100 @@
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	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	79	+
	80	+ ImageIcon GetIcon(String name)
	81	+ {
	82	+ javax.swing.ImageIcon iconCache = icons.get(name);
	83	+ if (iconCache != null)
	84	+ {
	85	+ return iconCache;
	86	+ }
	87	+
	88	+ try
	89	+ {
	90	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	91	+
	92	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	93	+// {
	94	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	95	+// Graphics2D g = resized.createGraphics();
	96	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	97	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	98	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	99	+// g.dispose();
	100	+//
	101	+// image = resized;
	102	+// }
	103	+
	104	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	105	+
	106	+ icons.put(name, icon);
	107	+
	108	+ return icon;
	109	+ }
	110	+ catch (Exception e)
	111	+ {
	112	+ //icons.put(name, null);
	113	+ return null;
	114	+ }
	115	+ }
	116	+
	117	+ BufferedImage GetImage(String name)
	118	+ {
	119	+ try
	120	+ {
	121	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	122	+
	123	+ return image;
	124	+ }
	125	+ catch (Exception e)
	126	+ {
	127	+ return null;
	128	+ }
	129	+ }
	130	+
32	131	// SCRIPT
33	132
34	133	transient JFrame textpanel = null;
..	..	@@ -119,51 +218,62 @@
119	218	void keyPressed(int key, int modifiers)
120	219	{
121	220	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	221	+ Globals.theRenderer.keyPressed(key, modifiers);
123	222	}
124	223	*/
125	224
126	225	static GridBagConstraints aConstraints;
127	226	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	227	+
130	228	static int GRIDWIDTH = 100; // 4;
131	229
132	230	public void closeUI()
133	231	{
134	232	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	233	+// System.out.println("this = " + this);
	234	+// System.out.println("objEditor = " + objEditor);
137	235	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	236	+// objEditor.ctrlPanel.remove(nameField);
139	237
140		- if (!GroupEditor.allparams)
	238	+ objEditor.ctrlPanel.remove(namePanel);
	239	+
	240	+ if (!allparams)
141	241	return;
142	242
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);
	243	+// objEditor.ctrlPanel.remove(liveCB);
	244	+// objEditor.ctrlPanel.remove(hideCB);
	245	+// objEditor.ctrlPanel.remove(markCB);
	246	+//
	247	+// objEditor.ctrlPanel.remove(randomCB);
	248	+// objEditor.ctrlPanel.remove(speedupCB);
	249	+// objEditor.ctrlPanel.remove(rewindCB);
	250	+//
	251	+// objEditor.ctrlPanel.remove(resetButton);
	252	+// objEditor.ctrlPanel.remove(stepButton);
	253	+//// objEditor.ctrlPanel.remove(stepAllButton);
	254	+//// objEditor.ctrlPanel.remove(resetAllButton);
	255	+// objEditor.ctrlPanel.remove(link2masterCB);
	256	+// //objEditor.ctrlPanel.remove(flipVCB);
	257	+// //objEditor.ctrlPanel.remove(texresMenu);
	258	+// objEditor.ctrlPanel.remove(slowerButton);
	259	+// objEditor.ctrlPanel.remove(fasterButton);
	260	+// objEditor.ctrlPanel.remove(remarkButton);
	261	+
	262	+ objEditor.ctrlPanel.remove(setupPanel);
	263	+ objEditor.ctrlPanel.remove(setupPanel2);
	264	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	265	+ objEditor.ctrlPanel.remove(pushPanel);
	266	+ //objEditor.ctrlPanel.remove(fillPanel);
	267	+
	268	+ //Remove(normalpushField);
161	269	}
162	270
163	271	public ObjEditor GetEditor()
164	272	{
165	273	return objEditor; //.GetEditor();
166	274	}
	275	+
	276	+ // Sometimes myself, sometimes my callee's.
167	277	ObjEditor objEditor;
168	278
169	279	/*
..	..	@@ -199,6 +309,14 @@
199	309	client = inClient;
200	310	copy = client;
201	311
	312	+// if (copy.versionlist == null)
	313	+// {
	314	+// copy.versionlist = new Object3D[100];
	315	+// copy.versionindex = -1;
	316	+//
	317	+// callee.Save(true);
	318	+// }
	319	+
202	320	// "this" is not called: SetupUI2(objEditor);
203	321	}
204	322
..	..	@@ -212,6 +330,14 @@
212	330	client = inClient;
213	331	copy = client;
214	332
	333	+ if (copy.versionlist == null)
	334	+ {
	335	+ copy.versionlist = new Object3D[100];
	336	+ copy.versionindex = -1;
	337	+
	338	+// Save(true);
	339	+ }
	340	+
215	341	SetupUI2(callee.GetEditor());
216	342	}
217	343
..	..	@@ -226,6 +352,7 @@
226	352	//localCopy.parent = null;
227	353
228	354	frame = new JFrame();
	355	+ frame.setUndecorated(false);
229	356	objEditor = this;
230	357	this.callee = callee;
231	358
..	..	@@ -238,11 +365,19 @@
238	365	//if (!isDisplayable())
239	366	//setUndecorated(true);
240	367
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	368	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	369	client = inClient;
243	370	copy = localCopy;
244	371	copy.editWindow = this;
245	372
	373	+// if (copy.versionlist == null)
	374	+// {
	375	+// copy.versionlist = new Object3D[100];
	376	+// copy.versionindex = -1;
	377	+//
	378	+// Save(true);
	379	+// }
	380	+
246	381	SetupMenu();
247	382
248	383	//SetupName(objEditor); // new
..	..	@@ -256,28 +391,49 @@
256	391	return frame.action(event, obj);
257	392	}
258	393
	394	+ // Cannot work without static
	395	+ static boolean allparams = true;
	396	+
	397	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	398	+
259	399	void SetupMenu()
260	400	{
261	401	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..."));
	402	+ menuBar.add(fileMenu = new Menu("File"));
	403	+ fileMenu.add(newItem = new MenuItem("New"));
	404	+ fileMenu.add(openItem = new MenuItem("Open..."));
	405	+
	406	+ //oe.menuBar.add(menu = new Menu("Include"));
	407	+ Menu menu = new Menu("Import");
	408	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	409	+ importOBJItem.addActionListener(this);
	410	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	411	+ import3DSItem.addActionListener(this);
	412	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	413	+ importVRMLX3DItem.addActionListener(this);
	414	+ menu.add("-");
	415	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	416	+ importGFDItem.addActionListener(this);
	417	+ fileMenu.add(menu);
	418	+ fileMenu.add("-");
	419	+
	420	+ fileMenu.add(saveItem = new MenuItem("Save"));
	421	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	422	//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("-");
	423	+ fileMenu.add("-");
	424	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	425	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	426	+ fileMenu.add("-");
272	427	if (client.parent != null)
273	428	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	429	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	430	} else
276	431	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	432	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	433	}
279	434
280		- loadItem.addActionListener(this);
	435	+ newItem.addActionListener(this);
	436	+ openItem.addActionListener(this);
281	437	saveItem.addActionListener(this);
282	438	saveAsItem.addActionListener(this);
283	439	exportAsItem.addActionListener(this);
..	..	@@ -285,80 +441,103 @@
285	441	//povItem.addActionListener(this);
286	442	closeItem.addActionListener(this);
287	443
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	444	objectPanel = new JTabbedPane();
	445	+
	446	+ ChangeListener changeListener = new ChangeListener()
	447	+ {
	448	+ //String name;
	449	+
	450	+ public void stateChanged(ChangeEvent changeEvent)
	451	+ {
	452	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	453	+// {
	454	+// if (latestObject != null)
	455	+// {
	456	+// refreshContents(true);
	457	+// SetMaterial(latestObject);
	458	+// }
	459	+//
	460	+// materialFlushed = true;
	461	+// }
	462	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	463	+// {
	464	+// if (listUI.size() == 0)
	465	+// EditSelection(false);
	466	+// }
	467	+
	468	+// if (objectPanel.getSelectedIndex() == 4)
	469	+// {
	470	+// name = copy.skyboxname;
	471	+//
	472	+// if (name == null)
	473	+// {
	474	+// name = "";
	475	+// }
	476	+//
	477	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	478	+// copy.skyboxext = "jpg";
	479	+// }
	480	+// else
	481	+// {
	482	+// if (name != null)
	483	+// {
	484	+// if (name.equals(""))
	485	+// {
	486	+// copy.skyboxname = null;
	487	+// copy.skyboxext = null;
	488	+// }
	489	+// else
	490	+// {
	491	+// copy.skyboxname = name;
	492	+// }
	493	+// }
	494	+// }
	495	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	496	+
	497	+// refreshContents(false); // To refresh Info tab
	498	+ cameraView.repaint();
	499	+ }
	500	+ };
	501	+ objectPanel.addChangeListener(changeListener);
	502	+
342	503	toolbarPanel = new JPanel();
343	504	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	505	+
	506	+ treePanel = new cGridBag();
345	507	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
349		- materialPanel.setName("Material");
	508	+
	509	+ editPanel = new cGridBag().setVertical(true);
	510	+ //editPanel.setName("Edit");
	511	+
	512	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	513	+
	514	+ editCommandsPanel = new cGridBag();
	515	+ editPanel.add(editCommandsPanel);
	516	+ editPanel.add(ctrlPanel);
	517	+
	518	+ toolboxPanel = new cGridBag().setVertical(true);
	519	+ //toolboxPanel.setName("Toolbox");
	520	+
	521	+ skyboxPanel = new cGridBag().setVertical(true);
	522	+
	523	+ materialPanel = new cGridBag().setVertical(false);
	524	+ //materialPanel.setName("Material");
	525	+
350	526	/JTextPane/
351	527	infoarea = createTextPane();
	528	+ doc = infoarea.getStyledDocument();
	529	+
352	530	infoarea.setEditable(true);
353	531	SetText();
	532	+
354	533	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	534	// infoarea.setOpaque(false);
356	535	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	536	+// TEXTAREA infoarea.setLineWrap(true);
	537	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	538	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");
	539	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	540	+ //infoPanel.setName("Info");
362	541	//infoPanel.setLayout(new BorderLayout());
363	542	//infoPanel.add(createTextPane());
364	543
..	..	@@ -366,16 +545,23 @@
366	545	mainPanel.setName("Main");
367	546	mainPanel.setContinuousLayout(true);
368	547	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	548	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
372		-
	549	+ mainPanel.setDividerLocation(0.5); //1.0);
	550	+ mainPanel.setResizeWeight(0.5);
	551	+
	552	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	553	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	554	+ divider.setDividerSize(15);
	555	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	556	+
	557	+ mainPanel.setUI(new BasicSplitPaneUI());
	558	+
373	559	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	560	//mainPanel.setLayout(new GridBagLayout());
375	561	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	562	+// treePanel.setLayout(new GridBagLayout());
	563	+ //ctrlPanel.setLayout(new GridBagLayout());
	564	+ //materialPanel.setLayout(new GridBagLayout());
379	565
380	566	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	567	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +600,7 @@
414	600	static String newline = "\n";
415	601	protected static final String buttonString = "JButton";
416	602	StyledDocument doc;
417		- JTextArea infoarea;
	603	+ JTextPane infoarea;
418	604
419	605	void ClearInfo()
420	606	{
..	..	@@ -437,10 +623,10 @@
437	623	e.printStackTrace();
438	624	}
439	625
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();
	626	+// String selection = infoarea.getText();
	627	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	628	+// java.awt.datatransfer.Clipboard clipboard =
	629	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	630	//clipboard.setContents(data, data);
445	631	}
446	632
..	..	@@ -463,13 +649,13 @@
463	649	//SendInfo("Name:", "bold");
464	650	if (sel.GetTextures() != null \|\| debug)
465	651	{
466		- si.SendInfo(sel.toString(), "bold");
	652	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	653	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	654	if (sel.Size() > 0)
469	655	{
470	656	si.SendInfo("#children = " + sel.Size(), "regular");
471	657	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	658	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	659	if (debug)
474	660	{
475	661	try
..	..	@@ -481,7 +667,10 @@
481	667	}
482	668
483	669	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	670	+ {
	671	+ si.SendInfo(" BBox min: " + minima, "regular");
	672	+ si.SendInfo(" BBox max: " + maxima, "regular");
	673	+ }
485	674
486	675	if (sel.bRep != null)
487	676	{
..	..	@@ -508,7 +697,7 @@
508	697	}
509	698	if (sel.support != null)
510	699	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	700	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	701	}
513	702	if (sel.scriptnode != null)
514	703	{
..	..	@@ -522,18 +711,18 @@
522	711	maxima.y = sel.toParent[3][1];
523	712	maxima.z = sel.toParent[3][2];
524	713	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	714	maxima.x = sel.toParent[0][0];
531	715	maxima.y = sel.toParent[1][1];
532	716	maxima.z = sel.toParent[2][2];
533	717	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];
	718	+ maxima.x = sel.globalTransform[3][0];
	719	+ maxima.y = sel.globalTransform[3][1];
	720	+ maxima.z = sel.globalTransform[3][2];
	721	+ if (full)
	722	+ si.SendInfo(" Global Orig: " + maxima, "regular");
	723	+ maxima.x = sel.globalTransform[0][0];
	724	+ maxima.y = sel.globalTransform[1][1];
	725	+ maxima.z = sel.globalTransform[2][2];
537	726	if (full)
538	727	si.SendInfo(" Global Scale: " + maxima, "regular");
539	728	}
..	..	@@ -579,6 +768,9 @@
579	768	{
580	769	CameraPane.pointflow = (PointFlow) sel;
581	770	}
	771	+
	772	+ si.SendInfo("_____________________", "regular");
	773	+ si.SendInfo("", "regular");
582	774	}
583	775	}
584	776
..	..	@@ -594,52 +786,205 @@
594	786	}
595	787	}
596	788
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		- };
	789	+//static GraphicsDevice device = GraphicsEnvironment
	790	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	791
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	792	+ Rectangle keeprect;
	793	+ cRadio radio;
	794	+
	795	+cButton keepButton;
	796	+ cButton twoButton; // Full 3D
	797	+ cButton sixButton;
	798	+ cButton threeButton;
	799	+ cButton sevenButton;
	800	+ cButton fourButton; // full panel
	801	+ cButton oneButton; // full XYZ
	802	+ //cButton currentLayout;
	803	+
	804	+ boolean maximized;
	805	+
	806	+ cButton fullscreenLayout;
	807	+ cButton expandedLayout;
621	808
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	809	+ void Minimize()
628	810	{
629		- for (int j = 0; j < 2; j++)
	811	+ frame.setState(Frame.ICONIFIED);
	812	+ frame.validate();
	813	+ }
	814	+
	815	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	816	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	817	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	818	+ void Maximize()
	819	+ {
	820	+ if (CameraPane.FULLSCREEN)
630	821	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	822	+ ToggleFullScreen();
636	823	}
637		- } catch (BadLocationException ble)
	824	+
	825	+ if (maximized)
	826	+ {
	827	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	828	+ }
	829	+ else
	830	+ {
	831	+ keeprect = frame.getBounds();
	832	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	833	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	834	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	835	+// frame.setState(Frame.MAXIMIZED_BOTH);
	836	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	837	+ }
	838	+
	839	+ maximized ^= true;
	840	+
	841	+ frame.validate();
	842	+ }
	843	+
	844	+ cButton minButton;
	845	+ cButton maxButton;
	846	+ cButton fullButton;
	847	+ cButton collapseButton;
	848	+ cButton maximize3DButton;
	849	+
	850	+ void ToggleFullScreen()
638	851	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	852	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	853	+
	854	+ cameraView.ToggleFullScreen();
	855	+
	856	+ if (!CameraPane.FULLSCREEN)
	857	+ {
	858	+ device.setFullScreenWindow(null);
	859	+ frame.dispose();
	860	+ frame.setUndecorated(false);
	861	+ frame.validate();
	862	+ frame.setVisible(true);
	863	+
	864	+ //frame.setVisible(false);
	865	+// frame.removeNotify();
	866	+// frame.setUndecorated(false);
	867	+// frame.addNotify();
	868	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	869	+
	870	+// X frame.getContentPane().remove(/"Center",/bigThree);
	871	+// X framePanel.add(bigThree);
	872	+// X frame.getContentPane().add(/"Center",/framePanel);
	873	+// framePanel.setDividerLocation(46); // icons are 24x24
	874	+
	875	+ //frame.setVisible(true);
	876	+// radio.layout = keepButton;
	877	+ //theFrame = null;
	878	+ keepButton = null;
	879	+// radio.layout.doClick();
	880	+
	881	+ } else
	882	+ {
	883	+ keepButton = radio.layout;
	884	+ //keeprect = frame.getBounds();
	885	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	886	+// frame.getToolkit().getScreenSize().height);
	887	+ //frame.setVisible(false);
	888	+
	889	+ frame.dispose();
	890	+ frame.setUndecorated(true);
	891	+ device.setFullScreenWindow(frame);
	892	+ frame.validate();
	893	+ frame.setVisible(true);
	894	+// frame.removeNotify();
	895	+// frame.setUndecorated(true);
	896	+// frame.addNotify();
	897	+// X frame.getContentPane().remove(/"Center",/framePanel);
	898	+// X framePanel.remove(bigThree);
	899	+// X frame.getContentPane().add(/"Center",/bigThree);
	900	+// framePanel.setDividerLocation(0);
	901	+
	902	+// radio.layout = fullscreenLayout;
	903	+// radio.layout.doClick();
	904	+ //frame.setVisible(true);
	905	+ }
	906	+ frame.validate();
	907	+
	908	+ cameraView.requestFocusInWindow();
640	909	}
641	910
642		- return new JTextArea(); // textPane;
	911	+ void CollapseToolbar()
	912	+ {
	913	+ framePanel.setDividerLocation(0);
	914	+ //frame.validate();
	915	+
	916	+ cameraView.requestFocusInWindow();
	917	+ }
	918	+
	919	+ private Object3D Duplicate(Object3D object)
	920	+ {
	921	+ boolean temp = CameraPane.SWITCH;
	922	+ CameraPane.SWITCH = false;
	923	+
	924	+ object.ExtractBigData(versiontable);
	925	+ // if (copy == client)
	926	+
	927	+ Object3D versions[] = object.versionlist;
	928	+ object.versionlist = null;
	929	+
	930	+ //byte[] compress = Compress(copy);
	931	+ Object3D compress = (Object3D)Grafreed.clone(object);
	932	+
	933	+ object.versionlist = versions;
	934	+
	935	+ object.RestoreBigData(versiontable);
	936	+
	937	+ CameraPane.SWITCH = temp;
	938	+
	939	+ return compress;
	940	+ }
	941	+
	942	+ private JTextPane createTextPane()
	943	+ {
	944	+// TEXTAREA String[] initString =
	945	+// {
	946	+// "This is an editable JTextPane, ", //regular
	947	+// "another ", //italic
	948	+// "styled ", //bold
	949	+// "text ", //small
	950	+// "component, ", //large
	951	+// "which supports embedded components..." + newline,//regular
	952	+// " " + newline, //button
	953	+// "...and embedded icons..." + newline, //regular
	954	+// " ", //icon
	955	+// newline + "JTextPane is a subclass of JEditorPane that "
	956	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	957	+// + "cover methods for interacting with those objects."
	958	+// };
	959	+//
	960	+// String[] initStyles =
	961	+// {
	962	+// "regular", "italic", "bold", "small", "large",
	963	+// "regular", "button", "regular", "icon",
	964	+// "regular"
	965	+// };
	966	+//
	967	+// JTextPane textPane = new JTextPane();
	968	+// textPane.setEditable(true);
	969	+// /StyledDocument/ doc = textPane.getStyledDocument();
	970	+// addStylesToDocument(doc);
	971	+//
	972	+// try
	973	+// {
	974	+// for (int j = 0; j < 2; j++)
	975	+// {
	976	+// for (int i = 0; i < initString.length; i++)
	977	+// {
	978	+// doc.insertString(doc.getLength(), initString[i],
	979	+// doc.getStyle(initStyles[i]));
	980	+// }
	981	+// }
	982	+// } catch (BadLocationException ble)
	983	+// {
	984	+// System.err.println("Couldn't insert initial text into text pane.");
	985	+// }
	986	+
	987	+ return new JTextPane(); // textPane;
643	988	}
644	989
645	990	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +1037,7 @@
692	1037	protected static ImageIcon createImageIcon(String path,
693	1038	String description)
694	1039	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1040	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	1041	if (imgURL != null)
697	1042	{
698	1043	return new ImageIcon(imgURL, description);
..	..	@@ -715,6 +1060,7 @@
715	1060	{
716	1061	SetupMaterial(materialPanel);
717	1062	}
	1063	+
718	1064	//SetupName();
719	1065	//SetupViews();
720	1066	}
..	..	@@ -724,6 +1070,7 @@
724	1070	// NumberSlider vDivsField;
725	1071	// JCheckBox endcaps;
726	1072	JCheckBox liveCB;
	1073	+ JCheckBox selectableCB;
727	1074	JCheckBox hideCB;
728	1075	JCheckBox link2masterCB;
729	1076	JCheckBox markCB;
..	..	@@ -731,7 +1078,12 @@
731	1078	JCheckBox speedupCB;
732	1079	JCheckBox rewindCB;
733	1080	JCheckBox flipVCB;
	1081	+
	1082	+ cCheckBox toggleTextureCB;
	1083	+ cCheckBox toggleSwitchCB;
	1084	+
734	1085	JComboBox texresMenu;
	1086	+
735	1087	JButton resetButton;
736	1088	JButton stepButton;
737	1089	JButton stepAllButton;
..	..	@@ -739,115 +1091,87 @@
739	1091	JButton slowerButton;
740	1092	JButton fasterButton;
741	1093	JButton remarkButton;
	1094	+
	1095	+ cGridBag editPanel;
	1096	+ cGridBag editCommandsPanel;
	1097	+
	1098	+ cGridBag namePanel;
	1099	+ cGridBag setupPanel;
	1100	+ cGridBag setupPanel2;
	1101	+ cGridBag objectCommandsPanel;
	1102	+ cGridBag pushPanel;
	1103	+ cGridBag fillPanel;
742	1104
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1105	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	1106	{
745	1107	JCheckBox cb;
746	1108
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);
	1109	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	1110	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	1111
757	1112	return cb;
758	1113	}
759	1114
760		- cButton AddButton(ObjEditor oe, String label)
	1115	+ cButton AddButton(cGridBag panel, String label)
761	1116	{
762	1117	cButton cb;
763	1118
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);
	1119	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	1120	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	1121
774	1122	return cb;
775	1123	}
776	1124
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1125	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	1126	{
779	1127	JComboBox combo;
780	1128
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;
	1129	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	1130	combo.addActionListener(this);
785	1131
786	1132	return combo;
787	1133	}
788	1134
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1135	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	1136	{
791		- NumberSlider combo;
	1137	+ cGridBag control = new cGridBag();
	1138	+
	1139	+ cNumberSlider combo;
792	1140
793	1141	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	1142	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		-
	1143	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1144	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	1145	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	1146	+
	1147	+ panel.add(control);
	1148	+
	1149	+ return control;
813	1150	}
814	1151
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1152	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	1153	{
817		- NumberSlider combo;
	1154	+ cGridBag control = new cGridBag();
	1155	+
	1156	+ cNumberSlider combo;
818	1157
819	1158	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1159	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		-
	1160	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1161	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1162	combo.setInteger(current);
833	1163
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1164	+ panel.add(control);
	1165	+
	1166	+ return control;
839	1167	}
840	1168
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1169	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1170	{
843	1171	JTextArea text;
844	1172
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1173	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1174	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1175
852	1176	return text;
853	1177	}
..	..	@@ -877,9 +1201,16 @@
877	1201	objEditor.ctrlPanel.remove(j);
878	1202	}
879	1203
	1204	+ void Remove(cNumberSlider j)
	1205	+ {
	1206	+ j.removeChangeListener(this);
	1207	+ //objEditor.ctrlPanel.remove(j.label);
	1208	+ objEditor.ctrlPanel.remove(j);
	1209	+ }
	1210	+
880	1211	/*
881	1212	*/
882		- void Return() // ObjEditor oe)
	1213	+ void Return0() // ObjEditor oe)
883	1214	{
884	1215	aConstraints.gridy += 1;
885	1216	aConstraints.gridx = 0;
..	..	@@ -934,35 +1265,93 @@
934	1265
935	1266	void SetupUI2(ObjEditor oe)
936	1267	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1268	+ //SetupName(oe);
942	1269
943		- if (!GroupEditor.allparams)
	1270	+ namePanel = new cGridBag();
	1271	+
	1272	+ //if (copy.pinned)
	1273	+ {
	1274	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1275	+ pinButton.setSelected(copy.pinned);
	1276	+ cGridBag t = new cGridBag();
	1277	+ t.preferredWidth = 2;
	1278	+ t.add(pinButton);
	1279	+ namePanel.add(t);
	1280	+
	1281	+ pinButton.addItemListener(this);
	1282	+ }
	1283	+
	1284	+ nameField = AddText(namePanel, copy.GetName());
	1285	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1286	+ oe.ctrlPanel.add(namePanel);
	1287	+
	1288	+ oe.ctrlPanel.Return();
	1289	+
	1290	+ if (!allparams)
944	1291	return;
945	1292
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1293	+ setupPanel = new cGridBag().setVertical(false);
	1294	+
	1295	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1296	+ liveCB.setToolTipText("Animate object");
	1297	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1298	+ selectableCB.setToolTipText("Make object selectable");
949	1299	// 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");
	1300	+
	1301	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1302	+ hideCB.setToolTipText("Hide object");
	1303	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1304	+ markCB.setToolTipText("As animation target transform");
	1305	+
	1306	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1307	+
	1308	+ setupPanel2 = new cGridBag().setVertical(false);
	1309	+
	1310	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1311	+ rewindCB.setToolTipText("Rewind animation");
	1312	+
	1313	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1314	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1315	+
	1316	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1317	+ link2masterCB.setToolTipText("Attach to support");
	1318	+
	1319	+ if (Globals.ADVANCED)
	1320	+ {
	1321	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1322	+ speedupCB.setToolTipText("Option motion capture");
	1323	+ }
	1324	+
	1325	+ oe.ctrlPanel.add(setupPanel);
	1326	+ oe.ctrlPanel.Return();
	1327	+ oe.ctrlPanel.add(setupPanel2);
	1328	+ oe.ctrlPanel.Return();
	1329	+
	1330	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1331	+
	1332	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1333	+ resetButton.setToolTipText("Jump to frame zero");
	1334	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1335	+ stepButton.setToolTipText("Step one frame");
956	1336	// resetAllButton = AddButton(oe, "Reset All");
957	1337	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1338	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1339	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1340	+ slowerButton.setToolTipText("Decrease animation speed");
	1341	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1342	+ fasterButton.setToolTipText("Increase animation speed");
	1343	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1344	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1345
964		- Return();
	1346	+ oe.ctrlPanel.add(objectCommandsPanel);
	1347	+ oe.ctrlPanel.Return();
965	1348
	1349	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1350	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1351	+ //Return();
	1352	+
	1353	+ oe.ctrlPanel.Return();
	1354	+
966	1355	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1356	// ObjEditor.aConstraints.gridx += 1;
968	1357
..	..	@@ -1056,7 +1445,7 @@
1056	1445	oe.aConstraints.gridwidth = 1;
1057	1446	/**/
1058	1447	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1448	+ oe.ctrlPanel.Return();
1060	1449
1061	1450	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1451	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1547,28 @@
1158	1547	//JPanel worldPanel =
1159	1548	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1549	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1550	+ centralPanel = new cGridBag();
	1551	+ centralPanel.preferredWidth = 20;
	1552	+
	1553	+ if (Globals.ADVANCED)
	1554	+ {
	1555	+ timelinePanel = new JPanel(new BorderLayout());
	1556	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1557
	1558	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1559	+ cameraPanel.setContinuousLayout(true);
	1560	+ cameraPanel.setOneTouchExpandable(true);
	1561	+// cameraPanel.setDividerLocation(0.9);
	1562	+// cameraPanel.setDividerSize(9);
	1563	+ cameraPanel.setResizeWeight(1.0);
	1564	+
	1565	+ }
	1566	+
	1567	+ centralPanel.add(cameraView);
	1568	+ centralPanel.setFocusable(true);
	1569	+ //frame.setJMenuBar(timelineMenubar);
	1570	+ //centralPanel.add(timelinePanel);
	1571	+
1165	1572	//topView.camera = ;
1166	1573	//frontView.camera = new Camera(2);
1167	1574	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1584,14 @@
1177	1584	//frontView.object = copy;
1178	1585	//sideView.object = copy;
1179	1586
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1587	+ XYZPanel = new cGridBag().setVertical(true);
	1588	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1589
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1590	+ XYZPanel.preferredWidth = 5;
	1591	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1592	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1593	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1594	+ //XYZPanel.setName("XYZ");
1186	1595
1187	1596	/*
1188	1597	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1600,7 @@
1191	1600	gridPanel.add(cameraView);
1192	1601	gridPanel.add(XYZPanel);
1193	1602	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1603	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1604	gridPanel.setContinuousLayout(true);
1196	1605	gridPanel.setOneTouchExpandable(true);
1197	1606	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,12 +1629,29 @@
1220	1629	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1630	//tmp.setName("Edit");
1222	1631	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);
	1632	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1633	+ objectPanel.setToolTipTextAt(0, "Material");
	1634	+
	1635	+ objectPanel.add(toolboxPanel);
	1636	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1637	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1228	1638
	1639	+ objectPanel.add(skyboxPanel);
	1640	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1641	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1642	+
	1643	+// JPanel north = new JPanel(new BorderLayout());
	1644	+// north.setName("Edit");
	1645	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1646	+// objectPanel.add(north);
	1647	+ objectPanel.add(editPanel);
	1648	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1649	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1650	+
	1651	+ objectPanel.add(XYZPanel);
	1652	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1653	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1654	+
1229	1655	/*
1230	1656	aConstraints.gridx = 0;
1231	1657	aConstraints.gridwidth = 1;
..	..	@@ -1233,7 +1659,7 @@
1233	1659	aConstraints.gridy += 1;
1234	1660	aConstraints.gridwidth = 1;
1235	1661	mainPanel.add(objectPanel, aConstraints);
1236		- */
	1662	+ */
1237	1663
1238	1664	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1239	1665	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1244,17 +1670,29 @@
1244	1670	scrollpane.setWheelScrollingEnabled(true);
1245	1671	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1672
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1673	+ /JTabbedPane/ scenePanel = new cGridBag();
	1674	+ scenePanel.preferredWidth = 5;
	1675	+
	1676	+ JTabbedPane tabbedPane = new JTabbedPane();
	1677	+ tabbedPane.add(scrollpane);
1249	1678
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1679	+ optionsPanel = new cGridBag().setVertical(false);
1253	1680
1254	1681	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1682	+
	1683	+ AddOptions(optionsPanel); //, aConstraints);
	1684	+
	1685	+ tabbedPane.add(optionsPanel);
	1686	+
	1687	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1688
	1689	+ scenePanel.add(tabbedPane);
1257	1690
	1691	+ //if (Globals.ADVANCED)
	1692	+// tabbedPane.add(infoPanel);
	1693	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1694	+// tabbedPane.setToolTipTextAt(3, "Information");
	1695	+
1258	1696	/*
1259	1697	cTree jTree = new cTree(null);
1260	1698	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1275,7 +1713,7 @@
1275	1713	jtp.add(tree);
1276	1714	*/
1277	1715
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1716	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1717	bigPanel.setContinuousLayout(true);
1280	1718	bigPanel.setOneTouchExpandable(true);
1281	1719	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1725,7 @@
1287	1725	//bigPanel.setSize(new Dimension(10,10));
1288	1726	//bigPanel.add(ctrlPanel);
1289	1727	//bigPanel.add(gridPanel);
	1728	+ /**
1290	1729	bigThree = new JPanel();
1291	1730	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1731	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1736,26 @@
1297	1736	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1737	aWindowConstraints.weightx = 0;
1299	1738	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1739	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1740	aWindowConstraints.weightx = 1;
1302	1741	aWindowConstraints.gridwidth = 3;
1303	1742	// aConstraints.gridheight = 3;
1304	1743	aWindowConstraints.gridx = 1;
1305	1744	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1745	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1746	aWindowConstraints.weightx = 0;
1308	1747	aWindowConstraints.gridx = 4;
1309	1748	aWindowConstraints.gridwidth = 1;
1310	1749	// aConstraints.gridheight = 3;
1311	1750	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1751	bigThree.add(XYZPanel, aWindowConstraints);
	1752	+ /**/
1313	1753
	1754	+ bigThree = new cGridBag();
	1755	+ bigThree.addComponent(scenePanel);
	1756	+ bigThree.addComponent(centralPanel);
	1757	+ //bigThree.addComponent(XYZPanel);
	1758	+
1314	1759	// // SIDE EFFECT!!!
1315	1760	// aConstraints.gridx = 0;
1316	1761	// aConstraints.gridy = 0;
..	..	@@ -1318,33 +1763,55 @@
1318	1763	// aConstraints.gridheight = 1;
1319	1764
1320	1765	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1321		- framePanel.setContinuousLayout(true);
1322		- framePanel.setOneTouchExpandable(true);
1323		- framePanel.setDividerLocation(0.8);
	1766	+
	1767	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1768	+ new java.beans.PropertyChangeListener()
	1769	+ {
	1770	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1771	+ {
	1772	+ if ((Integer)pce.getOldValue() == 1)
	1773	+ {
	1774	+ if (radio.layout != expandedLayout)
	1775	+ {
	1776	+ radio.layout = expandedLayout;
	1777	+ radio.layout.doClick();
	1778	+ }
	1779	+ }
	1780	+ }
	1781	+ });
	1782	+
	1783	+ framePanel.setContinuousLayout(false);
	1784	+ framePanel.setOneTouchExpandable(false);
	1785	+ //.setDividerLocation(0.8);
1324	1786	//framePanel.setDividerSize(15);
1325	1787	//framePanel.setResizeWeight(0.15);
1326	1788	framePanel.setName("Frame");
1327	1789
1328	1790	frame.getContentPane().setLayout(new BorderLayout());
1329	1791	/**/
1330		- JTabbedPane worldPane = new JTabbedPane();
	1792	+ //JTabbedPane worldPane = new JTabbedPane();
1331	1793	//worldPane.add(bigPanel);
1332	1794	//worldPane.add(worldPanel);
1333	1795	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1796	+ //frame.getContentPane().add(/"Center",/framePanel);
	1797	+ frame.add(/"Center",/framePanel);
1335	1798	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1799
1337	1800	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1801
1339		- frame.setSize(1024, 768);
1340		- frame.show();
1341		-
	1802	+ frame.setSize(1280, 860);
	1803	+
	1804	+ cameraView.requestFocusInWindow();
	1805	+
1342	1806	gridPanel.setDividerLocation(1.0);
	1807	+
	1808	+ frame.validate();
	1809	+
	1810	+ frame.setVisible(true);
1343	1811
1344	1812	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1345	1813	frame.addWindowListener(new WindowAdapter()
1346	1814	{
1347		-
1348	1815	public void windowClosing(WindowEvent e)
1349	1816	{
1350	1817	Close();
..	..	@@ -1352,6 +1819,10 @@
1352	1819	});
1353	1820	}
1354	1821
	1822	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1823	+ {
	1824	+ }
	1825	+
1355	1826	JTree GetTree()
1356	1827	{
1357	1828	return objEditor.jTree;
..	..	@@ -1363,260 +1834,575 @@
1363	1834	ctrlPanel.removeAll();
1364	1835	}
1365	1836
1366		- void SetupMaterial(JPanel ctrlPanel)
	1837	+ void SetupMaterial(cGridBag materialpanel)
1367	1838	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1839	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1840	+
	1841	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1842	+ skin.setToolTipText("Skin");
	1843	+ skin.addMouseListener(new MouseAdapter()
	1844	+ {
	1845	+ public void mouseClicked(MouseEvent e)
	1846	+ {
	1847	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1848	+ cMaterial material = object.material;
	1849	+
	1850	+ // Skin
	1851	+ colorField.setFloat(material.color);
	1852	+ saturationField.setFloat(material.modulation);
	1853	+ subsurfaceField.setFloat(material.subsurface);
	1854	+ selfshadowField.setFloat(material.diffuseness);
	1855	+ diffusenessField.setFloat(material.factor);
	1856	+ shininessField.setFloat(material.shininess);
	1857	+ shadowbiasField.setFloat(material.shadowbias);
	1858	+ diffuseField.setFloat(material.diffuse);
	1859	+ specularField.setFloat(material.specular);
	1860	+
	1861	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1862	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1863	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1864	+
	1865	+ materialtouched = true;
	1866	+ applySelf();
	1867	+ }
	1868	+ });
	1869	+ presetpanel.add(skin);
	1870	+
	1871	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1872	+ lambert.setToolTipText("Diffuse");
	1873	+ lambert.addMouseListener(new MouseAdapter()
	1874	+ {
	1875	+ public void mouseClicked(MouseEvent e)
	1876	+ {
	1877	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1878	+ cMaterial material = object.material;
	1879	+
	1880	+ diffusenessField.setFloat(material.factor);
	1881	+ selfshadowField.setFloat(material.diffuseness);
	1882	+
	1883	+ materialtouched = true;
	1884	+ applySelf();
	1885	+ }
	1886	+ });
	1887	+ presetpanel.add(lambert);
	1888	+
	1889	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1890	+ diffuse2.setToolTipText("Diffuse2");
	1891	+ diffuse2.addMouseListener(new MouseAdapter()
	1892	+ {
	1893	+ public void mouseClicked(MouseEvent e)
	1894	+ {
	1895	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1896	+ cMaterial material = object.material;
	1897	+
	1898	+ diffusenessField.setFloat(material.factor);
	1899	+ selfshadowField.setFloat(material.diffuseness);
	1900	+
	1901	+ materialtouched = true;
	1902	+ applySelf();
	1903	+ }
	1904	+ });
	1905	+ presetpanel.add(diffuse2);
	1906	+
	1907	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1908	+ diffusemoon.setToolTipText("Moon");
	1909	+ diffusemoon.addMouseListener(new MouseAdapter()
	1910	+ {
	1911	+ public void mouseClicked(MouseEvent e)
	1912	+ {
	1913	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1914	+ cMaterial material = object.material;
	1915	+
	1916	+ diffusenessField.setFloat(material.factor);
	1917	+ selfshadowField.setFloat(material.diffuseness);
	1918	+
	1919	+ materialtouched = true;
	1920	+ applySelf();
	1921	+ }
	1922	+ });
	1923	+ presetpanel.add(diffusemoon);
	1924	+
	1925	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1926	+ diffusemoon2.setToolTipText("Moon2");
	1927	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1928	+ {
	1929	+ public void mouseClicked(MouseEvent e)
	1930	+ {
	1931	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1932	+ cMaterial material = object.material;
	1933	+
	1934	+ diffusenessField.setFloat(material.factor);
	1935	+ selfshadowField.setFloat(material.diffuseness);
	1936	+
	1937	+ materialtouched = true;
	1938	+ applySelf();
	1939	+ }
	1940	+ });
	1941	+ presetpanel.add(diffusemoon2);
	1942	+
	1943	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1944	+ diffusemoon3.setToolTipText("Moon3");
	1945	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1946	+ {
	1947	+ public void mouseClicked(MouseEvent e)
	1948	+ {
	1949	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1950	+ cMaterial material = object.material;
	1951	+
	1952	+ diffusenessField.setFloat(material.factor);
	1953	+ selfshadowField.setFloat(material.diffuseness);
	1954	+
	1955	+ materialtouched = true;
	1956	+ applySelf();
	1957	+ }
	1958	+ });
	1959	+ presetpanel.add(diffusemoon3);
	1960	+
	1961	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1962	+ diffusesheen.setToolTipText("Sheen");
	1963	+ diffusesheen.addMouseListener(new MouseAdapter()
	1964	+ {
	1965	+ public void mouseClicked(MouseEvent e)
	1966	+ {
	1967	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1968	+ cMaterial material = object.material;
	1969	+
	1970	+ sheenField.setFloat(material.sheen);
	1971	+
	1972	+ materialtouched = true;
	1973	+ applySelf();
	1974	+ }
	1975	+ });
	1976	+ presetpanel.add(diffusesheen);
	1977	+
	1978	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1979	+ rough.setToolTipText("Rough metal");
	1980	+ rough.addMouseListener(new MouseAdapter()
	1981	+ {
	1982	+ public void mouseClicked(MouseEvent e)
	1983	+ {
	1984	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1985	+ cMaterial material = object.material;
	1986	+
	1987	+ shininessField.setFloat(material.shininess);
	1988	+ velvetField.setFloat(material.velvet);
	1989	+
	1990	+ materialtouched = true;
	1991	+ applySelf();
	1992	+ }
	1993	+ });
	1994	+ presetpanel.add(rough);
	1995	+
	1996	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1997	+ rough2.setToolTipText("Medium metal");
	1998	+ rough2.addMouseListener(new MouseAdapter()
	1999	+ {
	2000	+ public void mouseClicked(MouseEvent e)
	2001	+ {
	2002	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2003	+ cMaterial material = object.material;
	2004	+
	2005	+ shininessField.setFloat(material.shininess);
	2006	+ lightareaField.setFloat(material.lightarea);
	2007	+
	2008	+ materialtouched = true;
	2009	+ applySelf();
	2010	+ }
	2011	+ });
	2012	+ presetpanel.add(rough2);
	2013	+
	2014	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2015	+ shini0.setToolTipText("Shiny");
	2016	+ shini0.addMouseListener(new MouseAdapter()
	2017	+ {
	2018	+ public void mouseClicked(MouseEvent e)
	2019	+ {
	2020	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2021	+ cMaterial material = object.material;
	2022	+
	2023	+ shininessField.setFloat(material.shininess);
	2024	+ lightareaField.setFloat(material.lightarea);
	2025	+
	2026	+ materialtouched = true;
	2027	+ applySelf();
	2028	+ }
	2029	+ });
	2030	+ presetpanel.add(shini0);
	2031	+
	2032	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2033	+ shini1.setToolTipText("Shiny2");
	2034	+ shini1.addMouseListener(new MouseAdapter()
	2035	+ {
	2036	+ public void mouseClicked(MouseEvent e)
	2037	+ {
	2038	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2039	+ cMaterial material = object.material;
	2040	+
	2041	+ shininessField.setFloat(material.shininess);
	2042	+ lightareaField.setFloat(material.lightarea);
	2043	+
	2044	+ materialtouched = true;
	2045	+ applySelf();
	2046	+ }
	2047	+ });
	2048	+ presetpanel.add(shini1);
	2049	+
	2050	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2051	+ shini2.setToolTipText("Shiny3");
	2052	+ shini2.addMouseListener(new MouseAdapter()
	2053	+ {
	2054	+ public void mouseClicked(MouseEvent e)
	2055	+ {
	2056	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2057	+ cMaterial material = object.material;
	2058	+
	2059	+ shininessField.setFloat(material.shininess);
	2060	+ lightareaField.setFloat(material.lightarea);
	2061	+
	2062	+ materialtouched = true;
	2063	+ applySelf();
	2064	+ }
	2065	+ });
	2066	+ presetpanel.add(shini2);
	2067	+
	2068	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2069	+ aniso.setToolTipText("AnisoU");
	2070	+ aniso.addMouseListener(new MouseAdapter()
	2071	+ {
	2072	+ public void mouseClicked(MouseEvent e)
	2073	+ {
	2074	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2075	+ cMaterial material = object.material;
	2076	+
	2077	+ anisoField.setFloat(material.aniso);
	2078	+ anisoVField.setFloat(material.anisoV);
	2079	+
	2080	+ materialtouched = true;
	2081	+ applySelf();
	2082	+ }
	2083	+ });
	2084	+ presetpanel.add(aniso);
	2085	+
	2086	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2087	+ aniso2.setToolTipText("AnisoV");
	2088	+ aniso2.addMouseListener(new MouseAdapter()
	2089	+ {
	2090	+ public void mouseClicked(MouseEvent e)
	2091	+ {
	2092	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2093	+ cMaterial material = object.material;
	2094	+
	2095	+ anisoField.setFloat(material.aniso);
	2096	+ anisoVField.setFloat(material.anisoV);
	2097	+
	2098	+ materialtouched = true;
	2099	+ applySelf();
	2100	+ }
	2101	+ });
	2102	+ presetpanel.add(aniso2);
	2103	+
	2104	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2105	+ aniso3.setToolTipText("AnisoUV");
	2106	+ aniso3.addMouseListener(new MouseAdapter()
	2107	+ {
	2108	+ public void mouseClicked(MouseEvent e)
	2109	+ {
	2110	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2111	+ cMaterial material = object.material;
	2112	+
	2113	+ anisoField.setFloat(material.aniso);
	2114	+ anisoVField.setFloat(material.anisoV);
	2115	+
	2116	+ materialtouched = true;
	2117	+ applySelf();
	2118	+ }
	2119	+ });
	2120	+ presetpanel.add(aniso3);
	2121	+
	2122	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2123	+ velvet0.setToolTipText("Velvet");
	2124	+ velvet0.addMouseListener(new MouseAdapter()
	2125	+ {
	2126	+ public void mouseClicked(MouseEvent e)
	2127	+ {
	2128	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2129	+ cMaterial material = object.material;
	2130	+
	2131	+ diffusenessField.setFloat(material.factor);
	2132	+ selfshadowField.setFloat(material.diffuseness);
	2133	+ sheenField.setFloat(material.sheen);
	2134	+ shininessField.setFloat(material.shininess);
	2135	+ velvetField.setFloat(material.velvet);
	2136	+ shiftField.setFloat(material.shift);
	2137	+
	2138	+ materialtouched = true;
	2139	+ applySelf();
	2140	+ }
	2141	+ });
	2142	+ presetpanel.add(velvet0);
	2143	+
	2144	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2145	+ bump0.setToolTipText("Bump texture");
	2146	+ bump0.addMouseListener(new MouseAdapter()
	2147	+ {
	2148	+ public void mouseClicked(MouseEvent e)
	2149	+ {
	2150	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2151	+ cMaterial material = object.material;
	2152	+
	2153	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2154	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2155	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2156	+
	2157	+ materialtouched = true;
	2158	+ applySelf();
	2159	+ }
	2160	+ });
	2161	+ presetpanel.add(bump0);
	2162	+
	2163	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2164	+ halo.setToolTipText("Halo");
	2165	+ halo.addMouseListener(new MouseAdapter()
	2166	+ {
	2167	+ public void mouseClicked(MouseEvent e)
	2168	+ {
	2169	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2170	+ cMaterial material = object.material;
	2171	+
	2172	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2173	+
	2174	+ materialtouched = true;
	2175	+ applySelf();
	2176	+ }
	2177	+ });
	2178	+ presetpanel.add(halo);
	2179	+
	2180	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2181	+ candle.setToolTipText("Candle");
	2182	+ candle.addMouseListener(new MouseAdapter()
	2183	+ {
	2184	+ public void mouseClicked(MouseEvent e)
	2185	+ {
	2186	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2187	+ cMaterial material = object.material;
	2188	+
	2189	+ subsurfaceField.setFloat(material.subsurface);
	2190	+ shadowbiasField.setFloat(material.shadowbias);
	2191	+ ambientField.setFloat(material.ambient);
	2192	+ specularField.setFloat(material.specular);
	2193	+ lightareaField.setFloat(material.lightarea);
	2194	+ shininessField.setFloat(material.shininess);
	2195	+
	2196	+ materialtouched = true;
	2197	+ applySelf();
	2198	+ }
	2199	+ });
	2200	+ presetpanel.add(candle);
	2201	+
	2202	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2203	+ shadowShader.setToolTipText("Shadow");
	2204	+ shadowShader.addMouseListener(new MouseAdapter()
	2205	+ {
	2206	+ public void mouseClicked(MouseEvent e)
	2207	+ {
	2208	+ diffuseField.setFloat(0.001);
	2209	+ ambientField.setFloat(0.001);
	2210	+ cameraField.setFloat(0.001);
	2211	+ specularField.setFloat(0.001);
	2212	+ fakedepthField.setFloat(0.001);
	2213	+ opacityField.setFloat(0.6);
	2214	+
	2215	+ materialtouched = true;
	2216	+ applySelf();
	2217	+ }
	2218	+ });
	2219	+ presetpanel.add(shadowShader);
	2220	+
	2221	+ cGridBag panel = new cGridBag().setVertical(true);
	2222	+
	2223	+ presetpanel.preferredWidth = 1;
	2224	+
	2225	+ materialpanel.add(presetpanel);
	2226	+ materialpanel.add(panel);
	2227	+
	2228	+ panel.preferredWidth = 8;
	2229	+
	2230	+ /*
1371	2231	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	2232	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375		- */
	2233	+ */
1376	2234
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	2235	+ cGridBag editBar = new cGridBag().setVertical(false);
	2236	+
	2237	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2238	+ createMaterialButton.setToolTipText("Create material");
1382	2239
1383	2240	/*
1384	2241	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	2242	*/
1389	2243
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	2244	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2245	+ clearMaterialButton.setToolTipText("Clear material");
	2246	+
	2247	+ if (Globals.ADVANCED)
	2248	+ {
	2249	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2250	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2251	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2252	+ }
1392	2253
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;
	2254	+ editBar.preferredHeight = 15;
	2255	+
	2256	+ panel.add(editBar);
	2257	+
1407	2258	/**/
1408	2259	//aConstraints.weighty = 0;
1409	2260	////aConstraints.weightx = 1;
1410	2261	//aConstraints.weighty = 1;
1411	2262	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	2263	//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;
	2264	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	2265
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;
	2266	+ cGridBag colorSection = new cGridBag().setVertical(true);
1429	2267
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;
	2268	+ cGridBag huepanel = new cGridBag();
	2269	+ cGridBag huelabel = new cGridBag();
	2270	+ skin = GetLabel("icons/hue.png", false);
	2271	+ skin.fit = true;
	2272	+ huelabel.add(skin);
	2273	+ huelabel.preferredWidth = 20;
	2274	+ huepanel.add(new cGridBag()); // Label
	2275	+ huepanel.add(huelabel); // Field/slider
	2276	+
	2277	+ huepanel.preferredHeight = 7;
1439	2278
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;
	2279	+ colorSection.add(huepanel);
	2280	+
	2281	+ cGridBag color = new cGridBag();
	2282	+
	2283	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2284	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2285	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1449	2286
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;
	2287	+ //colorField.preferredWidth = 200;
	2288	+ colorSection.add(color);
1459	2289
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;
	2290	+ cGridBag modulation = new cGridBag();
	2291	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2292	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2293	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2294	+ colorSection.add(modulation);
1469	2295
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;
	2296	+ cGridBag opacity = new cGridBag();
	2297	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2298	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2299	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2300	+ colorSection.add(opacity);
1479	2301
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;
	2302	+ colorSection.add(GetSeparator());
	2303	+
	2304	+ cGridBag texture = new cGridBag();
	2305	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2306	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2307	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2308	+ colorSection.add(texture);
1488	2309
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;
	2310	+ panel.add(GetSeparator());
	2311	+
	2312	+ panel.add(colorSection);
	2313	+
	2314	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2315	+
	2316	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2317	+
	2318	+ cGridBag diffuse = new cGridBag();
	2319	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2320	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2321	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2322	+ diffuseSection.add(diffuse);
1498	2323
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;
	2324	+ cGridBag diffuseness = new cGridBag();
	2325	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2326	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2327	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2328	+ diffuseSection.add(diffuseness);
1508	2329
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;
	2330	+ cGridBag selfshadow = new cGridBag();
	2331	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2332	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2333	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2334	+ diffuseSection.add(selfshadow);
1518	2335
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;
	2336	+ cGridBag sheen = new cGridBag();
	2337	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2338	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2339	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2340	+ diffuseSection.add(sheen);
1528	2341
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;
	2342	+ cGridBag subsurface = new cGridBag();
	2343	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2344	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2345	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2346	+ diffuseSection.add(subsurface);
1538	2347
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;
	2348	+ cGridBag shadow = new cGridBag();
	2349	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2350	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2351	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2352	+ diffuseSection.add(shadow);
1548	2353
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;
	2354	+ cGridBag fakedepth = new cGridBag();
	2355	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2356	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2357	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2358	+ diffuseSection.add(fakedepth);
1558	2359
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;
	2360	+ cGridBag shadowbias = new cGridBag();
	2361	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2362	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2363	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2364	+ diffuseSection.add(shadowbias);
1567	2365
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;
	2366	+ panel.add(GetSeparator());
	2367	+
	2368	+ panel.add(diffuseSection);
	2369	+
	2370	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2371	+
	2372	+ cGridBag specularSection = new cGridBag().setVertical(true);
1577	2373
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;
	2374	+ cGridBag specular = new cGridBag();
	2375	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2376	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2377	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2378	+ specularSection.add(specular);
1587	2379
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;
	2380	+ cGridBag lightarea = new cGridBag();
	2381	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2382	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2383	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2384	+ specularSection.add(lightarea);
1597	2385
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;
	2386	+ cGridBag shininess = new cGridBag();
	2387	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2388	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2389	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2390	+ specularSection.add(shininess);
1607	2391
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;
	2392	+ cGridBag metalness = new cGridBag();
	2393	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2394	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2395	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2396	+ specularSection.add(metalness);
1617	2397
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	2398	+ cGridBag velvet = new cGridBag();
	2399	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2400	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2401	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2402	+ specularSection.add(velvet);
	2403	+
	2404	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2405	+ //Return();
1620	2406	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	2407	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	2408	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +2413,99 @@
1627	2413	// aConstraints.gridy += 1;
1628	2414	// aConstraints.gridwidth = 1;
1629	2415
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;
	2416	+ cGridBag anisoU = new cGridBag();
	2417	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2418	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2419	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2420	+ specularSection.add(anisoU);
1638	2421
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;
	2422	+ cGridBag anisoV = new cGridBag();
	2423	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2424	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2425	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2426	+ specularSection.add(anisoV);
1648	2427
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	2428
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;
	2429	+ panel.add(GetSeparator());
	2430	+
	2431	+ panel.add(specularSection);
	2432	+
	2433	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2434	+
	2435	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1668	2436
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;
	2437	+ cGridBag camera = new cGridBag();
	2438	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2439	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2440	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2441	+ colorSection.add(camera);
1679	2442
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;
	2443	+ cGridBag ambient = new cGridBag();
	2444	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2445	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2446	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2447	+ colorSection.add(ambient);
1689	2448
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;
	2449	+ cGridBag backlit = new cGridBag();
	2450	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2451	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2452	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2453	+ colorSection.add(backlit);
1699	2454
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;
	2455	+ //panel.add(new JSeparator());
	2456	+
	2457	+ //panel.add(globalSection);
	2458	+
	2459	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2460	+
	2461	+ cGridBag textureSection = new cGridBag().setVertical(true);
1709	2462
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;
	2463	+ cGridBag bump = new cGridBag();
	2464	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2465	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2466	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2467	+ textureSection.add(bump);
1719	2468
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;
	2469	+ cGridBag noise = new cGridBag();
	2470	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2471	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2472	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2473	+ textureSection.add(noise);
1729	2474
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;
	2475	+ cGridBag power = new cGridBag();
	2476	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2477	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2478	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2479	+ textureSection.add(power);
1739	2480
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	2481	+ cGridBag borderfade = new cGridBag();
	2482	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2483	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2484	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2485	+ textureSection.add(borderfade);
1745	2486
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	2487	+ cGridBag fog = new cGridBag();
	2488	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2489	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2490	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2491	+ textureSection.add(fog);
	2492	+
	2493	+ cGridBag opacityPower = new cGridBag();
	2494	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2495	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2496	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2497	+ textureSection.add(opacityPower);
	2498	+
	2499	+ panel.add(GetSeparator());
	2500	+
	2501	+ panel.add(textureSection);
	2502	+
	2503	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	2504
1750	2505	SetMaterial(copy); // .GetMaterial());
1751	2506
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	2507	+ //colorField.addChangeListener(this);
	2508	+// modulationField.addChangeListener(this);
1754	2509	metalnessField.addChangeListener(this);
1755	2510	diffuseField.addChangeListener(this);
1756	2511	specularField.addChangeListener(this);
..	..	@@ -1780,12 +2535,15 @@
1780	2535	opacityPowerField.addChangeListener(this);
1781	2536	/**/
1782	2537
1783		- resetSlidersButton.addActionListener(this);
1784	2538	clearMaterialButton.addActionListener(this);
1785	2539	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	2540	+
	2541	+ if (Globals.ADVANCED)
	2542	+ {
	2543	+ resetSlidersButton.addActionListener(this);
	2544	+ propagateToggle.addItemListener(this);
	2545	+ multiplyToggle.addItemListener(this);
	2546	+ }
1789	2547	}
1790	2548
1791	2549	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1803,8 +2561,9 @@
1803	2561	// 3D models
1804	2562	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1805	2563	{
1806		- lastConverter = new com.jmex.model.converters.MaxToJme();
1807		- LoadFile(filename, lastConverter);
	2564	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2565	+ //LoadFile(filename, lastConverter);
	2566	+ LoadObjFile(filename); // New 3ds loader
1808	2567	continue;
1809	2568	}
1810	2569	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1859,19 +2618,21 @@
1859	2618	}
1860	2619
1861	2620	// 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")))
	2621	+ if (filename.toLowerCase().endsWith(".jpg")
	2622	+ \|\| filename.toLowerCase().endsWith(".jpeg")
	2623	+ \|\| filename.toLowerCase().endsWith(".gif")
	2624	+ \|\| filename.toLowerCase().endsWith(".png")
	2625	+ \|\| filename.toLowerCase().endsWith(".tre")
	2626	+ \|\| filename.toLowerCase().endsWith(".bmp")
	2627	+ \|\| filename.toLowerCase().endsWith(".tga")
	2628	+ \|\| filename.toLowerCase().endsWith(".sgi")
	2629	+ \|\| filename.toLowerCase().endsWith(".tif")
	2630	+ \|\| filename.toLowerCase().endsWith(".tiff"))
1873	2631	{
1874		- DropTexture(filename);
	2632	+ if (textures)
	2633	+ DropTexture(filename);
	2634	+ else
	2635	+ CreateBillboard(filename);
1875	2636	continue;
1876	2637	}
1877	2638
..	..	@@ -1880,6 +2641,60 @@
1880	2641	}
1881	2642
1882	2643	ResetModel();
	2644	+ }
	2645	+
	2646	+ void CreateBillboard(String filename)
	2647	+ {
	2648	+ Object3D source = null;
	2649	+ Object3D group = copy;
	2650	+
	2651	+ if (group.selection.size() > 0)
	2652	+ {
	2653	+ source = group.selection.get(0);
	2654	+ }
	2655	+
	2656	+ Grid grid = new Grid(1,1);
	2657	+ grid.material = null;
	2658	+
	2659	+ grid.toParent = LA.newMatrix();
	2660	+ grid.fromParent = LA.newMatrix();
	2661	+ LA.matYRotate(grid.toParent, Math.PI/2);
	2662	+ LA.matXRotate(grid.toParent, -Math.PI/2);
	2663	+ LA.matXRotate(grid.fromParent, Math.PI/2);
	2664	+ LA.matYRotate(grid.fromParent, -Math.PI/2);
	2665	+
	2666	+ BillboardNode bb = new BillboardNode();
	2667	+ bb.addChild(grid);
	2668	+
	2669	+ Object3D newgroup = new Object3D();
	2670	+ newgroup.CreateMaterial();
	2671	+
	2672	+ File file = new File(filename);
	2673	+ newgroup.name = file.getName();
	2674	+ newgroup.addChild(bb);
	2675	+
	2676	+ Object3D main = newgroup;
	2677	+
	2678	+ main.SetPigmentTexture(filename);
	2679	+
	2680	+ if (source != null)
	2681	+ {
	2682	+ main.material = new cMaterial(source.material);
	2683	+ if (main.projectedVertices.length < source.projectedVertices.length)
	2684	+ {
	2685	+ main.projectedVertices = new Object3D.cVector2[source.projectedVertices.length];
	2686	+ }
	2687	+
	2688	+ for (int i=0; i<source.projectedVertices.length; i++)
	2689	+ {
	2690	+ main.projectedVertices[i].x = source.projectedVertices[i].x;
	2691	+ main.projectedVertices[i].y = source.projectedVertices[i].y;
	2692	+ }
	2693	+
	2694	+ main.texres = source.texres;
	2695	+ }
	2696	+
	2697	+ makeSomething(newgroup, false);
1883	2698	}
1884	2699
1885	2700	Point location;
..	..	@@ -1900,7 +2715,7 @@
1900	2715
1901	2716	//? flashIt = false;
1902	2717	CameraPane pane = (CameraPane) cameraView;
1903		- pane.clickStart(location.x, location.y, 0);
	2718	+ pane.clickStart(location.x, location.y, 0, 0);
1904	2719	pane.clickEnd(location.x, location.y, 0, true);
1905	2720
1906	2721	if (group.selection.size() == 1)
..	..	@@ -1949,6 +2764,7 @@
1949	2764	e2.printStackTrace();
1950	2765	}
1951	2766	}
	2767	+
1952	2768	LoadJMEThread loadThread;
1953	2769
1954	2770	class LoadJMEThread extends Thread
..	..	@@ -2006,6 +2822,7 @@
2006	2822	//LoadFile0(filename, converter);
2007	2823	}
2008	2824	}
	2825	+
2009	2826	LoadOBJThread loadObjThread;
2010	2827
2011	2828	class LoadOBJThread extends Thread
..	..	@@ -2084,19 +2901,19 @@
2084	2901
2085	2902	void LoadObjFile(String fullname)
2086	2903	{
2087		- /*
	2904	+ System.out.println("Loading " + fullname);
	2905	+ /**/
2088	2906	//lastFilename = fullname;
2089	2907	if(loadObjThread == null)
2090	2908	{
2091		- loadObjThread = new LoadOBJThread();
2092		- loadObjThread.start();
	2909	+ loadObjThread = new LoadOBJThread();
	2910	+ loadObjThread.start();
2093	2911	}
2094	2912
2095	2913	loadObjThread.add(fullname);
2096		- */
	2914	+ /**/
2097	2915
2098		- System.out.println("Loading " + fullname);
2099		- makeSomething(new FileObject(fullname, true), true);
	2916	+ //makeSomething(new FileObject(fullname, true), true);
2100	2917	}
2101	2918
2102	2919	void LoadGFDFile(String fullname)
..	..	@@ -2138,6 +2955,8 @@
2138	2955	{
2139	2956	Mocap sel = (Mocap) copy.selection.get(0);
2140	2957
	2958	+ sel.SetCurrentBones(sel.frame);
	2959	+
2141	2960	sel.fullname = fullname;
2142	2961
2143	2962	if (changename)
..	..	@@ -2151,14 +2970,18 @@
2151	2970	sel.smoothed = false;
2152	2971
2153	2972	// if (!changename)
2154		- sel.SetPositionDelta(false, true, true, true/?/); // false
	2973	+ //sel.SetPositionDelta(false, true, true, true/?/); // false
	2974	+ sel.SetGlobalTransform();
	2975	+ sel.LoadData();
	2976	+ sel.Rewind();
	2977	+ sel.Fade();
2155	2978	// sel.setPose(0);
2156	2979	refreshContents();
2157	2980	} else
2158	2981	{
2159	2982	mocap.Reset();
2160	2983	// new skeleton
2161		- makeSomething(mocap, false); // true);
	2984	+ makeSomething(mocap, true); // true);
2162	2985	}
2163	2986	} catch (Exception e)
2164	2987	{
..	..	@@ -2185,6 +3008,8 @@
2185	3008	{
2186	3009	Mocap sel = (Mocap) select;
2187	3010
	3011	+ sel.SetCurrentBones(sel.frame);
	3012	+
2188	3013	File file = new File(fullname);
2189	3014
2190	3015	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2251,7 +3076,11 @@
2251	3076
2252	3077	if (!changename)
2253	3078	{
2254		- sel.SetPositionDelta(false, true, true, true/?/);
	3079	+ //sel.SetPositionDelta(false, true, true, true/?/);
	3080	+ sel.SetGlobalTransform();
	3081	+ sel.LoadData();
	3082	+ sel.Rewind();
	3083	+ sel.Fade();
2255	3084	}
2256	3085
2257	3086	// sel.setPose(0);
..	..	@@ -2345,11 +3174,11 @@
2345	3174
2346	3175	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	3176	{
2348		- if (GrafreeD.standAlone)
	3177	+ if (Grafreed.standAlone)
2349	3178	{
2350	3179	/**/
2351	3180	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	3181	+ browser.setVisible(true);
2353	3182	String filename = browser.getFile();
2354	3183	if (filename != null && filename.length() > 0)
2355	3184	{
..	..	@@ -2460,6 +3289,7 @@
2460	3289	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	3290	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	3291	}
	3292	+
2463	3293	//cJME.count++;
2464	3294	//cJME.count %= 12;
2465	3295	if (gc)
..	..	@@ -2494,6 +3324,7 @@
2494	3324	}
2495	3325	if (input == null)
2496	3326	{
	3327	+ new Exception().printStackTrace();
2497	3328	System.exit(0);
2498	3329	}
2499	3330
..	..	@@ -2642,6 +3473,7 @@
2642	3473	}
2643	3474	}
2644	3475	}
	3476	+
2645	3477	cFileSystemPane FSPane;
2646	3478
2647	3479	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2651,7 +3483,7 @@
2651	3483
2652	3484	freezematerial = true;
2653	3485	colorField.setFloat(mat.color);
2654		- modulationField.setFloat(mat.modulation);
	3486	+ saturationField.setFloat(mat.modulation);
2655	3487	metalnessField.setFloat(mat.metalness);
2656	3488	diffuseField.setFloat(mat.diffuse);
2657	3489	specularField.setFloat(mat.specular);
..	..	@@ -2695,11 +3527,14 @@
2695	3527	}
2696	3528	}
2697	3529	}
	3530	+
2698	3531	freezematerial = false;
2699	3532	}
2700	3533
2701	3534	void SetMaterial(Object3D object)
2702	3535	{
	3536	+ latestObject = object;
	3537	+
2703	3538	cMaterial mat = object.material;
2704	3539
2705	3540	if (mat == null)
..	..	@@ -2708,7 +3543,8 @@
2708	3543	return;
2709	3544	}
2710	3545
2711		- multiplyToggle.setSelected(mat.multiply);
	3546	+ if (multiplyToggle != null)
	3547	+ multiplyToggle.setSelected(mat.multiply);
2712	3548
2713	3549	assert (object.projectedVertices != null);
2714	3550
..	..	@@ -2810,12 +3646,17 @@
2810	3646	// }
2811	3647
2812	3648	/**/
2813		- if (deselect)
	3649	+ if (deselect \|\| child == null)
2814	3650	{
2815	3651	//group.deselectAll();
2816	3652	//freeze = true;
2817	3653	GetTree().clearSelection();
2818	3654	//freeze = false;
	3655	+
	3656	+ if (child == null)
	3657	+ {
	3658	+ return;
	3659	+ }
2819	3660	}
2820	3661
2821	3662	//group.addSelectee(child);
..	..	@@ -2849,6 +3690,17 @@
2849	3690	public void itemStateChanged(ItemEvent event)
2850	3691	{
2851	3692	// System.out.println("Propagate = " + propagate);
	3693	+ if (event.getSource() == pinButton)
	3694	+ {
	3695	+ copy.pinned ^= true;
	3696	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3697	+ {
	3698	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3699	+ copy.CloseUI();
	3700	+ //copy.editWindow.refreshContents();
	3701	+ }
	3702	+ }
	3703	+ else
2852	3704	if (event.getSource() == propagateToggle)
2853	3705	{
2854	3706	propagate ^= true;
..	..	@@ -2884,31 +3736,48 @@
2884	3736	cameraView.ToggleDL();
2885	3737	cameraView.repaint();
2886	3738	return;
2887		- } else if (event.getSource() == toggleTextureItem)
	3739	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2888	3740	{
2889	3741	cameraView.ToggleTexture();
2890	3742	// june 2013 copy.HardTouch();
2891	3743	cameraView.repaint();
2892	3744	return;
2893		- } else if (event.getSource() == toggleFullItem)
	3745	+ } else if (event.getSource() == toggleTimelineItem)
2894	3746	{
2895		- if (CameraPane.FULLSCREEN)
	3747	+ timeline ^= true;
	3748	+
	3749	+ if (timeline)
2896	3750	{
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);
	3751	+ centralPanel.remove(cameraView);
	3752	+ cameraPanel.add(cameraView);
	3753	+ centralPanel.add(cameraPanel);
	3754	+ frame.setJMenuBar(timelineMenubar);
	3755	+ wasFullScreen = CameraPane.FULLSCREEN;
	3756	+ if (!CameraPane.FULLSCREEN)
	3757	+ ToggleFullScreen();
	3758	+ toggleFullScreenItem.setEnabled(false);
2904	3759	}
	3760	+ else
	3761	+ {
	3762	+ centralPanel.remove(cameraPanel);
	3763	+ centralPanel.add(cameraView);
	3764	+ frame.setJMenuBar(null);
	3765	+ if (!wasFullScreen)
	3766	+ ToggleFullScreen();
	3767	+ toggleFullScreenItem.setEnabled(true);
	3768	+ }
	3769	+
2905	3770	frame.validate();
2906		- cameraView.ToggleFullScreen();
	3771	+ return;
	3772	+ } else if (event.getSource() == toggleFullScreenItem)
	3773	+ {
	3774	+ ToggleFullScreen();
	3775	+ frame.validate();
2907	3776
2908	3777	return;
2909		- } else if (event.getSource() == toggleRandomItem)
	3778	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2910	3779	{
2911		- cameraView.ToggleRandom();
	3780	+ cameraView.ToggleSwitch();
2912	3781	cameraView.repaint();
2913	3782	return;
2914	3783	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2936,12 +3805,17 @@
2936	3805	} else if (event.getSource() == liveCB)
2937	3806	{
2938	3807	copy.live ^= true;
	3808	+ objEditor.refreshContents(true); // To show item colors
	3809	+ return;
	3810	+ } else if (event.getSource() == selectableCB)
	3811	+ {
	3812	+ copy.dontselect ^= true;
2939	3813	return;
2940	3814	} else if (event.getSource() == hideCB)
2941	3815	{
2942	3816	copy.hide ^= true;
2943	3817	copy.Touch(); // display list issue
2944		- objEditor.refreshContents();
	3818	+ objEditor.refreshContents(true); // To show item colors
2945	3819	return;
2946	3820	} else if (event.getSource() == link2masterCB)
2947	3821	{
..	..	@@ -2951,6 +3825,7 @@
2951	3825	if (event.getSource() == randomCB)
2952	3826	{
2953	3827	copy.random ^= true;
	3828	+ objEditor.refreshContents();
2954	3829	return;
2955	3830	}
2956	3831	if (event.getSource() == speedupCB)
..	..	@@ -2974,8 +3849,9 @@
2974	3849
2975	3850	public void actionPerformed(ActionEvent event)
2976	3851	{
	3852	+ Object source = event.getSource();
2977	3853	// SCRIPT DIALOG
2978		- if (event.getSource() == okbutton)
	3854	+ if (source == okbutton)
2979	3855	{
2980	3856	textpanel.setVisible(false);
2981	3857	textpanel.remove(textarea);
..	..	@@ -2987,7 +3863,7 @@
2987	3863	textarea = null;
2988	3864	textpanel = null;
2989	3865	}
2990		- if (event.getSource() == cancelbutton)
	3866	+ if (source == cancelbutton)
2991	3867	{
2992	3868	textpanel.setVisible(false);
2993	3869	textpanel.remove(textarea);
..	..	@@ -2999,49 +3875,50 @@
2999	3875	//applySelf();
3000	3876	//client.refreshEditWindow();
3001	3877	//refreshContents();
3002		- if (event.getSource() == nameField)
	3878	+ if (source == nameField)
3003	3879	{
3004	3880	//System.out.println("ObjEditor " + event);
3005	3881	applySelf0(true);
3006	3882	//parent.applySelf();
3007	3883	objEditor.refreshContents();
3008		- } else if (event.getSource() == resetButton)
	3884	+ } else if (source == resetButton)
3009	3885	{
3010	3886	CameraPane.fullreset = true;
3011	3887	copy.Reset(); // ResetMeshes();
3012	3888	copy.Touch();
3013	3889	objEditor.refreshContents();
3014		- } else if (event.getSource() == stepItem)
	3890	+ } else if (source == stepItem)
3015	3891	{
3016		- cameraView.ONESTEP = true;
	3892	+ //cameraView.ONESTEP = true;
	3893	+ Globals.ONESTEP = true;
3017	3894	cameraView.repaint();
3018	3895	return;
3019		- } else if (event.getSource() == stepButton)
	3896	+ } else if (source == stepButton)
3020	3897	{
3021	3898	copy.Step();
3022	3899	copy.Touch();
3023	3900	objEditor.refreshContents();
3024		- } else if (event.getSource() == slowerButton)
	3901	+ } else if (source == slowerButton)
3025	3902	{
3026	3903	copy.Slower();
3027	3904	copy.Touch();
3028	3905	objEditor.refreshContents();
3029		- } else if (event.getSource() == fasterButton)
	3906	+ } else if (source == fasterButton)
3030	3907	{
3031	3908	copy.Faster();
3032	3909	copy.Touch();
3033	3910	objEditor.refreshContents();
3034		- } else if (event.getSource() == remarkButton)
	3911	+ } else if (source == remarkButton)
3035	3912	{
3036	3913	copy.Remark();
3037	3914	copy.Touch();
3038	3915	objEditor.refreshContents();
3039		- } else if (event.getSource() == stepAllButton)
	3916	+ } else if (source == stepAllButton)
3040	3917	{
3041	3918	copy.StepAll();
3042	3919	copy.Touch();
3043	3920	objEditor.refreshContents();
3044		- } else if (event.getSource() == resetAllButton)
	3921	+ } else if (source == resetAllButton)
3045	3922	{
3046	3923	//CameraPane.fullreset = true;
3047	3924	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3074,53 +3951,79 @@
3074	3951	// Close();
3075	3952	// }
3076	3953	// else
3077		- if (event.getSource() == resetSlidersButton)
	3954	+ if (source == resetSlidersButton)
3078	3955	{
3079	3956	ResetSliders();
3080		- } else if (event.getSource() == clearMaterialButton)
	3957	+ } else if (source == clearMaterialButton)
3081	3958	{
3082	3959	ClearMaterial();
3083		- } else if (event.getSource() == createMaterialButton)
	3960	+ } else if (source == createMaterialButton)
3084	3961	{
3085	3962	CreateMaterial();
3086		- } else if (event.getSource() == clearPanelButton)
	3963	+ } else if (source == clearPanelButton)
3087	3964	{
3088	3965	copy.ClearUI();
3089	3966	refreshContents(true);
3090		- } /*
3091		- }
3092		-
3093		- public boolean action(Event event, Object arg)
3094		- {
3095		- */ else if (event.getSource() == closeItem)
	3967	+ } else if (source == importGFDItem)
	3968	+ {
	3969	+ ImportGFD();
	3970	+ } else
	3971	+ if (source == importVRMLX3DItem)
	3972	+ {
	3973	+ ImportVRMLX3D();
	3974	+ } else
	3975	+ if (source == import3DSItem)
	3976	+ {
	3977	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3978	+ } else
	3979	+ if (source == importOBJItem)
	3980	+ {
	3981	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3982	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3983	+ browser.setVisible(true);
	3984	+ String filename = browser.getFile();
	3985	+ if (filename != null && filename.length() > 0)
	3986	+ {
	3987	+ String fullname = browser.getDirectory() + filename;
	3988	+ makeSomething(ReadOBJ(fullname), true);
	3989	+ }
	3990	+ } else
	3991	+ if (source == closeItem)
3096	3992	{
3097	3993	Close();
3098	3994	//return true;
3099		- } else if (event.getSource() == loadItem)
	3995	+ } else if (source == openItem)
3100	3996	{
3101		- load();
	3997	+ Open();
3102	3998	//return true;
3103		- } else if (event.getSource() == saveItem)
	3999	+ } else if (source == newItem)
	4000	+ {
	4001	+ New();
	4002	+ } else if (source == saveItem)
3104	4003	{
3105	4004	save();
3106	4005	//return true;
3107		- } else if (event.getSource() == saveAsItem)
	4006	+ } else if (source == saveAsItem)
3108	4007	{
3109	4008	saveAs();
3110	4009	//return true;
3111		- } else if (event.getSource() == reexportItem)
	4010	+ } else if (source == reexportItem)
3112	4011	{
3113	4012	reexport();
3114	4013	//return true;
3115		- } else if (event.getSource() == exportAsItem)
	4014	+ } else if (source == exportAsItem)
3116	4015	{
3117	4016	export();
3118	4017	//return true;
3119		- } else if (event.getSource() == povItem)
	4018	+ } else if (source == povItem)
3120	4019	{
3121	4020	generatePOV();
3122	4021	//return true;
3123		- } else if (event.getSource() == zBufferItem)
	4022	+ } else if (event.getSource() == archiveItem)
	4023	+ {
	4024	+ cTools.Archive(frame);
	4025	+ return;
	4026	+ } else if (source == zBufferItem)
3124	4027	{
3125	4028	try
3126	4029	{
..	..	@@ -3142,21 +4045,8 @@
3142	4045	cameraView.repaint();
3143	4046	//return true;
3144	4047	}
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)
	4048	+ */ else // combos...
	4049	+ if (source == texresMenu)
3160	4050	{
3161	4051	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3162	4052	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3168,27 +4058,492 @@
3168	4058	}
3169	4059	}
3170	4060
3171		- void ToggleAnimation()
	4061	+ void New()
3172	4062	{
3173		- if (!CameraPane.ANIMATION)
	4063	+ while (copy.Size() > 1)
3174	4064	{
3175		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4065	+ copy.remove(1);
	4066	+ }
	4067	+
	4068	+ ResetModel();
	4069	+ objEditor.refreshContents();
	4070	+ }
	4071	+
	4072	+ static public byte[] Compress(Object3D o)
	4073	+ {
	4074	+ // Slower to actually compress.
	4075	+ try
	4076	+ {
	4077	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4078	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4079	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4080	+
	4081	+ Object3D parent = o.parent;
	4082	+ o.parent = null;
	4083	+
	4084	+ out.writeObject(o);
	4085	+
	4086	+ o.parent = parent;
	4087	+
	4088	+ out.flush();
	4089	+
	4090	+ baos //zstream
	4091	+ .close();
	4092	+ out.close();
	4093	+
	4094	+ byte[] bytes = baos.toByteArray();
	4095	+
	4096	+ System.out.println("save #bytes = " + bytes.length);
	4097	+ return bytes;
	4098	+ } catch (Exception e)
	4099	+ {
	4100	+ System.err.println(e);
	4101	+ return null;
	4102	+ }
	4103	+ }
	4104	+
	4105	+ static public Object Uncompress(byte[] bytes)
	4106	+ {
	4107	+ System.out.println("restore #bytes = " + bytes.length);
	4108	+ try
	4109	+ {
	4110	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4111	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4112	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4113	+ Object obj = in.readObject();
	4114	+
	4115	+ bais //istream
	4116	+ .close();
	4117	+ in.close();
	4118	+
	4119	+ return obj;
	4120	+ } catch (Exception e)
	4121	+ {
	4122	+ System.err.println(e);
	4123	+ return null;
	4124	+ }
	4125	+ }
	4126	+
	4127	+ static public Object clone(Object o)
	4128	+ {
	4129	+ try
	4130	+ {
	4131	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4132	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4133	+
	4134	+ out.writeObject(o);
	4135	+
	4136	+ out.flush();
	4137	+ out.close();
	4138	+
	4139	+ byte[] bytes = baos.toByteArray();
	4140	+
	4141	+ System.out.println("clone = " + bytes.length);
	4142	+
	4143	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4144	+ ObjectInputStream in = new ObjectInputStream(bais);
	4145	+ Object obj = in.readObject();
	4146	+ in.close();
	4147	+
	4148	+ return obj;
	4149	+ } catch (Exception e)
	4150	+ {
	4151	+ System.err.println(e);
	4152	+ return null;
	4153	+ }
	4154	+ }
	4155	+
	4156	+ cRadio GetCurrentTab()
	4157	+ {
	4158	+ cRadio ab;
	4159	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4160	+ {
	4161	+ ab = (cRadio)e.nextElement();
	4162	+ if(ab.GetObject() == copy)
	4163	+ {
	4164	+ return ab;
	4165	+ }
	4166	+ }
	4167	+
	4168	+ return null;
	4169	+ }
	4170	+
	4171	+
	4172	+ public void Save()
	4173	+ {
	4174	+ //Save(true);
	4175	+ Replace();
	4176	+ SetVersionStates();
	4177	+ }
	4178	+
	4179	+ private boolean Equal(byte[] compress, byte[] name)
	4180	+ {
	4181	+ if (compress.length != name.length)
	4182	+ {
	4183	+ return false;
	4184	+ }
	4185	+
	4186	+ for (int i=compress.length; --i>=0;)
	4187	+ {
	4188	+ if (compress[i] != name[i])
	4189	+ return false;
	4190	+ }
	4191	+
	4192	+ return true;
	4193	+ }
	4194	+
	4195	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4196	+
	4197	+ void DeleteVersion()
	4198	+ {
	4199	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4200	+ {
	4201	+ copy.versionlist[i] = copy.versionlist[i+1];
	4202	+ }
	4203	+
	4204	+ CopyChanged();
	4205	+
	4206	+ SetVersionStates();
	4207	+ }
	4208	+
	4209	+ public boolean Save(boolean user)
	4210	+ {
	4211	+ System.err.println("Save");
	4212	+ Replace();
	4213	+
	4214	+ //cRadio tab = GetCurrentTab();
	4215	+
	4216	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4217	+
	4218	+ boolean thesame = false;
	4219	+
	4220	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4221	+// {
	4222	+// thesame = true;
	4223	+// }
	4224	+
	4225	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4226	+ if (!thesame)
	4227	+ {
	4228	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4229	+ {
	4230	+ copy.versionlist[i] = copy.versionlist[i-1];
	4231	+ }
	4232	+
	4233	+ //tab.user[tab.versionindex] = user;
	4234	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4235	+
	4236	+ copy.versionlist[++copy.versionindex] = compress;
	4237	+
	4238	+ // if (increment)
	4239	+ // tab.versionindex++;
	4240	+ }
	4241	+
	4242	+ //copy.RestoreBigData(versiontable);
	4243	+
	4244	+ //assert(hashtable.isEmpty());
	4245	+
	4246	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4247	+// {
	4248	+// //tab.user[i] = false;
	4249	+// copy.versionlist[i] = null;
	4250	+// }
	4251	+
	4252	+ SetVersionStates();
	4253	+
	4254	+ // test save
	4255	+ if (false)
	4256	+ {
	4257	+ try
	4258	+ {
	4259	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4260	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4261	+
	4262	+ p.writeObject(copy);
	4263	+
	4264	+ p.flush();
	4265	+
	4266	+ ostream.close();
	4267	+ } catch (Exception e)
	4268	+ {
	4269	+ e.printStackTrace();
	4270	+ }
	4271	+ }
	4272	+
	4273	+ return !thesame;
	4274	+ }
	4275	+
	4276	+ boolean flashIt = true;
	4277	+
	4278	+ void RefreshSelection()
	4279	+ {
	4280	+ Object3D selection = new Object3D();
	4281	+
	4282	+ for (int i = 0; i < copy.selection.size(); i++)
	4283	+ {
	4284	+ Object3D elem = copy.selection.elementAt(i);
	4285	+
	4286	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4287	+
	4288	+ if (obj == null)
	4289	+ {
	4290	+ copy.selection.remove(i--);
	4291	+ }
	4292	+ else
	4293	+ {
	4294	+ selection.add(obj);
	4295	+ copy.selection.setElementAt(obj, i);
	4296	+ }
	4297	+ }
	4298	+
	4299	+ flashIt = false;
	4300	+ GetTree().clearSelection();
	4301	+ for (int i = 0; i < selection.size(); i++)
	4302	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4303	+ flashIt = true;
	4304	+
	4305	+ //refreshContents(false);
	4306	+ }
	4307	+
	4308	+ void CopyChanged()
	4309	+ {
	4310	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4311	+
	4312	+ SetVersionStates();
	4313	+
	4314	+ boolean temp = CameraPane.SWITCH;
	4315	+ CameraPane.SWITCH = false;
	4316	+
	4317	+ copy.ExtractBigData(versiontable);
	4318	+
	4319	+ copy.clear();
	4320	+
	4321	+ copy.skyboxname = obj.skyboxname;
	4322	+ copy.skyboxext = obj.skyboxext;
	4323	+
	4324	+ for (int i=0; i<obj.Size(); i++)
	4325	+ {
	4326	+ copy.add(obj.get(i));
	4327	+ }
	4328	+
	4329	+ copy.RestoreBigData(versiontable);
	4330	+
	4331	+ CameraPane.SWITCH = temp;
	4332	+
	4333	+ RefreshSelection();
	4334	+ //assert(hashtable.isEmpty());
	4335	+
	4336	+ copy.Touch();
	4337	+
	4338	+ ResetModel();
	4339	+ copy.HardTouch(); // recompile?
	4340	+
	4341	+ cRadio ab;
	4342	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4343	+ {
	4344	+ ab = (cRadio)e.nextElement();
	4345	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4346	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4347	+ if (test != null)
	4348	+ {
	4349	+ test.editWindow = ab.object.editWindow;
	4350	+ ab.object = test;
	4351	+ }
	4352	+ }
	4353	+
	4354	+ refreshContents(true);
	4355	+ }
	4356	+
	4357	+ cButton previousVersionButton;
	4358	+ cButton restoreButton;
	4359	+ cButton replaceButton;
	4360	+ cButton nextVersionButton;
	4361	+ cButton saveVersionButton;
	4362	+ cButton deleteVersionButton;
	4363	+
	4364	+ boolean muteSlider;
	4365	+
	4366	+ int VersionCount()
	4367	+ {
	4368	+ int count = 0;
	4369	+
	4370	+ for (int i = copy.versionlist.length; --i >= 0;)
	4371	+ {
	4372	+ if (copy.versionlist[i] != null)
	4373	+ count++;
	4374	+ }
	4375	+
	4376	+ return count;
	4377	+ }
	4378	+
	4379	+ void SetVersionStates()
	4380	+ {
	4381	+ //if (true)
	4382	+ // return;
	4383	+
	4384	+ //cRadio tab = GetCurrentTab();
	4385	+
	4386	+ restoreButton.setEnabled(copy.versionindex != -1);
	4387	+ replaceButton.setEnabled(copy.versionindex != -1);
	4388	+
	4389	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4390	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4391	+
	4392	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4393	+ copy.versionlist[copy.versionindex + 1] != null);
	4394	+
	4395	+ muteSlider = true;
	4396	+ versionSlider.setMinimum(0);
	4397	+ versionSlider.setMaximum(VersionCount() - 1);
	4398	+ versionSlider.setInteger(copy.versionindex);
	4399	+ versionSlider.setEnabled(copy.versionindex != -1);
	4400	+ muteSlider = false;
	4401	+ }
	4402	+
	4403	+ public boolean PreviousVersion()
	4404	+ {
	4405	+ // Option?
	4406	+ Replace();
	4407	+
	4408	+ System.err.println("Undo");
	4409	+
	4410	+ //cRadio tab = GetCurrentTab();
	4411	+
	4412	+ if (copy.versionindex == 0)
	4413	+ {
	4414	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4415	+ return false;
	4416	+ }
	4417	+
	4418	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4419	+// {
	4420	+// if (Save(false))
	4421	+// tab.versionindex -= 1;
	4422	+// else
	4423	+// {
	4424	+// if (tab.versionindex <= 0)
	4425	+// return false;
	4426	+// else
	4427	+// tab.versionindex -= 1;
	4428	+// }
	4429	+// }
	4430	+
	4431	+ copy.versionindex -= 1;
	4432	+
	4433	+ CopyChanged();
	4434	+
	4435	+ return true;
	4436	+ }
	4437	+
	4438	+ public boolean Restore()
	4439	+ {
	4440	+ System.err.println("Restore");
	4441	+
	4442	+ //cRadio tab = GetCurrentTab();
	4443	+
	4444	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4445	+ {
	4446	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4447	+ return false;
	4448	+ }
	4449	+
	4450	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4451	+ CopyChanged();
	4452	+
	4453	+ return true;
	4454	+ }
	4455	+
	4456	+ public boolean Replace()
	4457	+ {
	4458	+ System.err.println("Replace");
	4459	+
	4460	+ //cRadio tab = GetCurrentTab();
	4461	+
	4462	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4463	+ {
	4464	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4465	+ return false;
	4466	+ }
	4467	+
	4468	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4469	+
	4470	+ return true;
	4471	+ }
	4472	+
	4473	+ public void NextVersion()
	4474	+ {
	4475	+ // Option?
	4476	+ Replace();
	4477	+
	4478	+ //cRadio tab = GetCurrentTab();
	4479	+
	4480	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4481	+ {
	4482	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4483	+ return;
	4484	+ }
	4485	+
	4486	+ copy.versionindex += 1;
	4487	+
	4488	+ CopyChanged();
	4489	+
	4490	+ //if (!tab.user[tab.versionindex])
	4491	+ // tab.graphs[tab.versionindex] = null;
	4492	+ }
	4493	+
	4494	+ void ImportGFD()
	4495	+ {
	4496	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3176	4497	browser.show();
3177	4498	String filename = browser.getFile();
3178	4499	if (filename != null && filename.length() > 0)
3179	4500	{
3180		- CameraPane.filename = browser.getDirectory() + filename;
	4501	+ String fullname = browser.getDirectory() + filename;
	4502	+
	4503	+ //Object3D readobj =
	4504	+ objEditor.ReadGFD(fullname, objEditor);
	4505	+ //makeSomething(readobj);
	4506	+ }
	4507	+ }
	4508	+
	4509	+ void ImportVRMLX3D()
	4510	+ {
	4511	+ if (Grafreed.standAlone)
	4512	+ {
	4513	+ /**/
	4514	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4515	+ browser.show();
	4516	+ String filename = browser.getFile();
	4517	+ if (filename != null && filename.length() > 0)
	4518	+ {
	4519	+ String fullname = browser.getDirectory() + filename;
	4520	+ LoadVRMLX3D(fullname);
	4521	+ }
	4522	+ /**/
	4523	+ }
	4524	+ }
	4525	+
	4526	+ void ToggleAnimation()
	4527	+ {
	4528	+ if (!Globals.ANIMATION)
	4529	+ {
	4530	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4531	+ browser.setVisible(true);
	4532	+ String filename = browser.getFile();
	4533	+ if (filename != null && filename.length() > 0)
	4534	+ {
	4535	+ Globals.filename = browser.getDirectory() + filename;
3181	4536	//CameraPane.framecount = 0;
3182		- CameraPane.imagecount = 0;
	4537	+ Globals.imagecount = 0;
3183	4538
3184		- CameraPane.ANIMATION ^= true;
	4539	+ Globals.ANIMATION ^= true;
3185	4540
3186		- GrafreeD.wav.cursor = 0;
3187		- GrafreeD.wav.loop = 0;
	4541	+ Grafreed.wav.cursor = 0;
	4542	+ Grafreed.wav.loop = 0;
3188	4543	}
3189	4544	} else
3190	4545	{
3191		- CameraPane.ANIMATION ^= true;
	4546	+ Globals.ANIMATION ^= true;
3192	4547	}
3193	4548	}
3194	4549
..	..	@@ -3234,7 +4589,7 @@
3234	4589	void CreateMaterial()
3235	4590	{
3236	4591	//copy.ClearMaterial(); // PATCH
3237		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4592	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3238	4593	if (copy.selection.size() > 0)
3239	4594	//SetMaterial(copy);
3240	4595	{
..	..	@@ -3285,7 +4640,7 @@
3285	4640	assert false;
3286	4641	}
3287	4642
3288		- void EditSelection()
	4643	+ void EditSelection(boolean newWindow)
3289	4644	{
3290	4645	}
3291	4646
..	..	@@ -3293,11 +4648,11 @@
3293	4648	{
3294	4649	copy.ResetBlockLoop(); // temporary problem
3295	4650
3296		- boolean random = CameraPane.RANDOM;
3297		- CameraPane.RANDOM = false; // parse everything
	4651	+ boolean random = CameraPane.SWITCH;
	4652	+ CameraPane.SWITCH = false; // parse everything
3298	4653	copy.ResetDisplayList();
3299	4654	copy.HardTouch();
3300		- CameraPane.RANDOM = random;
	4655	+ CameraPane.SWITCH = random;
3301	4656	}
3302	4657
3303	4658	// public void applySelf()
..	..	@@ -3344,7 +4699,7 @@
3344	4699	//copy.material = new cMaterial(copy.GetMaterial());
3345	4700
3346	4701	current.color = (float) colorField.getFloat();
3347		- current.modulation = (float) modulationField.getFloat();
	4702	+ current.modulation = (float) saturationField.getFloat();
3348	4703	current.metalness = (float) metalnessField.getFloat();
3349	4704	current.diffuse = (float) diffuseField.getFloat();
3350	4705	current.specular = (float) specularField.getFloat();
..	..	@@ -3367,10 +4722,40 @@
3367	4722	current.fakedepth = (float) fakedepthField.getFloat();
3368	4723	current.shadowbias = (float) shadowbiasField.getFloat();
3369	4724
3370		- if (!NumberSlider.frozen)
	4725	+ if (!cNumberSlider.frozen)
3371	4726	{
3372	4727	//System.out.println("Propagate = " + propagate);
3373	4728	copy.UpdateMaterial(anchor, current, propagate);
	4729	+
	4730	+ if (copy.material != null)
	4731	+ {
	4732	+ cMaterial mat = copy.material;
	4733	+
	4734	+ colorField.SetToolTipValue((mat.color));
	4735	+ saturationField.SetToolTipValue((mat.modulation));
	4736	+ metalnessField.SetToolTipValue((mat.metalness));
	4737	+ diffuseField.SetToolTipValue((mat.diffuse));
	4738	+ specularField.SetToolTipValue((mat.specular));
	4739	+ shininessField.SetToolTipValue((mat.shininess));
	4740	+ shiftField.SetToolTipValue((mat.shift));
	4741	+ ambientField.SetToolTipValue((mat.ambient));
	4742	+ lightareaField.SetToolTipValue((mat.lightarea));
	4743	+ diffusenessField.SetToolTipValue((mat.factor));
	4744	+ velvetField.SetToolTipValue((mat.velvet));
	4745	+ sheenField.SetToolTipValue((mat.sheen));
	4746	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4747	+ backlitField.SetToolTipValue((mat.bump));
	4748	+ anisoField.SetToolTipValue((mat.aniso));
	4749	+ anisoVField.SetToolTipValue((mat.anisoV));
	4750	+ cameraField.SetToolTipValue((mat.cameralight));
	4751	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4752	+ shadowField.SetToolTipValue((mat.shadow));
	4753	+ textureField.SetToolTipValue((mat.texture));
	4754	+ opacityField.SetToolTipValue((mat.opacity));
	4755	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4756	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4757	+ }
	4758	+
3374	4759	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3375	4760	{
3376	4761	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3399,9 +4784,28 @@
3399	4784	//copy.Touch();
3400	4785	}
3401	4786
	4787	+ cNumberSlider versionSlider;
	4788	+
3402	4789	public void stateChanged(ChangeEvent e)
3403	4790	{
3404	4791	// assert(false);
	4792	+ if (e.getSource() == versionSlider)
	4793	+ {
	4794	+ if (muteSlider)
	4795	+ return;
	4796	+
	4797	+ Replace();
	4798	+
	4799	+ int version = versionSlider.getInteger();
	4800	+
	4801	+ if (version != -1 && copy.versionlist[version] != null)
	4802	+ {
	4803	+ copy.versionindex = version;
	4804	+ CopyChanged();
	4805	+ }
	4806	+
	4807	+ return;
	4808	+ }
3405	4809
3406	4810	if (freezematerial)
3407	4811	{
..	..	@@ -3415,6 +4819,7 @@
3415	4819	\|\| e.getSource() == apertureField
3416	4820	\|\| e.getSource() == shadowblurField)
3417	4821	{
	4822	+ new Exception().printStackTrace();
3418	4823	System.exit(0);
3419	4824	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3420	4825	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3436,12 +4841,24 @@
3436	4841	{
3437	4842	//System.out.println("stateChanged = " + this);
3438	4843	materialtouched = true;
	4844	+
	4845	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4846	+ {
	4847	+ saturationField.setFloat(1);
	4848	+ }
	4849	+
3439	4850	applySelf();
3440	4851	//System.out.println("this = " + this);
3441	4852	//System.out.println("PARENT = " + parent);
3442	4853	//if (parent != null)
3443	4854	// parent.applySelf();
3444		- refreshContents();
	4855	+ if (e.getSource() == normalpushField)
	4856	+ {
	4857	+ objEditor.refreshContents();
	4858	+ //Refresh();
	4859	+ }
	4860	+ else
	4861	+ refreshContents();
3445	4862	// ??? client.refreshEditWindow();
3446	4863	}
3447	4864	//else
..	..	@@ -3453,7 +4870,7 @@
3453	4870	//group.name = nameField.getText();
3454	4871	//objEditor.applySelf();
3455	4872
3456		- assert (objEditor == this);
	4873	+ // OCT2018: assert (objEditor == this);
3457	4874	if (copy.selection == null \|\| copy.selection.size() == 0)
3458	4875	//super.applySelf()
3459	4876	; else
..	..	@@ -3477,12 +4894,18 @@
3477	4894	objEditor.copy = keep;
3478	4895	}
3479	4896	}
	4897	+
	4898	+ if (normalpushField != null)
	4899	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3480	4900	}
3481	4901
3482	4902	void SnapObject()
3483	4903	{
3484		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3485		- SnapObject(obj);
	4904	+ if (copy.selection.size() > 0)
	4905	+ {
	4906	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4907	+ SnapObject(obj);
	4908	+ }
3486	4909	}
3487	4910
3488	4911	void SnapObject(Object3D obj)
..	..	@@ -3596,7 +5019,7 @@
3596	5019
3597	5020	if (obj.parent != null)
3598	5021	{
3599		- obj.parent.TransformToWorld(interest);
	5022	+// obj.parent.TransformToWorld(interest);
3600	5023	}
3601	5024
3602	5025	if (!CameraPane.TRACK)
..	..	@@ -3723,20 +5146,26 @@
3723	5146	{
3724	5147	if (GetTree() != null)
3725	5148	{
	5149	+ GetTree().revalidate();
3726	5150	GetTree().repaint();
3727	5151	}
3728	5152
3729	5153	radioPanel.revalidate();
3730	5154	radioPanel.repaint();
3731		- ctrlPanel.revalidate(); // ? new
	5155	+ ctrlPanel.validate(); // ? new
3732	5156	ctrlPanel.repaint();
3733	5157	}
	5158	+
	5159	+ if (previousVersionButton != null && copy.versionlist != null)
	5160	+ SetVersionStates();
3734	5161	}
3735	5162
3736	5163	static TweenManager tweenManager = new TweenManager();
3737	5164
3738	5165	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3739	5166	{
	5167	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5168	+ Save();
3740	5169	//Tween.set(thing, 0).target(1).start(tweenManager);
3741	5170	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3742	5171	// if (thing instanceof GenericJointDemo)
..	..	@@ -3823,6 +5252,12 @@
3823	5252	{
3824	5253	ResetModel();
3825	5254	Select(thing.GetTreePath(), true, false); // unselect... false);
	5255	+
	5256	+ if (thing.Size() == 0)
	5257	+ {
	5258	+ //EditSelection(false);
	5259	+ }
	5260	+
3826	5261	refreshContents();
3827	5262	}
3828	5263
..	..	@@ -3940,6 +5375,7 @@
3940	5375	}
3941	5376	}
3942	5377	}
	5378	+
3943	5379	LoadGFDThread loadGFDThread;
3944	5380
3945	5381	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3959,8 +5395,10 @@
3959	5395
3960	5396	try
3961	5397	{
	5398	+ // Try compressed version first.
3962	5399	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3963		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5400	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5401	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3964	5402
3965	5403	readobj = (Object3D) p.readObject();
3966	5404	istream.close();
..	..	@@ -3968,7 +5406,22 @@
3968	5406	readobj.ResetDisplayList();
3969	5407	} catch (Exception e)
3970	5408	{
3971		- e.printStackTrace();
	5409	+ if (!e.toString().contains("GZIP"))
	5410	+ e.printStackTrace();
	5411	+
	5412	+ try
	5413	+ {
	5414	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5415	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5416	+
	5417	+ readobj = (Object3D) p.readObject();
	5418	+ istream.close();
	5419	+
	5420	+ readobj.ResetDisplayList();
	5421	+ } catch (Exception e2)
	5422	+ {
	5423	+ e2.printStackTrace();
	5424	+ }
3972	5425	}
3973	5426	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3974	5427	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4014,6 +5467,12 @@
4014	5467
4015	5468	void LoadIt(Object obj)
4016	5469	{
	5470	+ if (obj == null)
	5471	+ {
	5472	+ // Invalid file
	5473	+ return;
	5474	+ }
	5475	+
4017	5476	System.out.println("Loaded " + obj);
4018	5477	//new Exception().printStackTrace();
4019	5478	Object3D readobj = (Object3D) obj;
..	..	@@ -4023,10 +5482,14 @@
4023	5482
4024	5483	if (readobj != null)
4025	5484	{
	5485	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5486	+ // Save();
4026	5487	try
4027	5488	{
4028	5489	//readobj.deepCopySelf(copy);
4029	5490	copy.clear(); // june 2014
	5491	+ copy.skyboxname = readobj.skyboxname;
	5492	+ copy.skyboxext = readobj.skyboxext;
4030	5493	for (int i = 0; i < readobj.size(); i++)
4031	5494	{
4032	5495	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4067,6 +5530,7 @@
4067	5530	}
4068	5531	} catch (ClassCastException e)
4069	5532	{
	5533	+ e.printStackTrace();
4070	5534	assert (false);
4071	5535	Composite c = (Composite) copy;
4072	5536	c.children.clear();
..	..	@@ -4077,17 +5541,31 @@
4077	5541	c.addChild(csg);
4078	5542	}
4079	5543
	5544	+ copy.versionlist = readobj.versionlist;
	5545	+ copy.versionindex = readobj.versionindex;
	5546	+
	5547	+ if (copy.versionlist == null)
	5548	+ {
	5549	+ // Backward compatibility
	5550	+ copy.versionlist = new Object3D[100];
	5551	+ copy.versionindex = -1;
	5552	+
	5553	+ //Save(true);
	5554	+ }
	5555	+
	5556	+ //? SetUndoStates();
	5557	+
4080	5558	ResetModel();
4081	5559	copy.HardTouch(); // recompile?
4082	5560	refreshContents();
4083	5561	}
4084	5562	}
4085	5563
4086		- void load() // throws ClassNotFoundException
	5564	+ void Open() // throws ClassNotFoundException
4087	5565	{
4088		- if (GrafreeD.standAlone)
	5566	+ if (Grafreed.standAlone)
4089	5567	{
4090		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5568	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4091	5569	browser.show();
4092	5570	String filename = browser.getFile();
4093	5571	if (filename != null && filename.length() > 0)
..	..	@@ -4164,6 +5642,8 @@
4164	5642
4165	5643	void save()
4166	5644	{
	5645	+ Replace();
	5646	+
4167	5647	if (lastname == null)
4168	5648	{
4169	5649	return;
..	..	@@ -4172,11 +5652,13 @@
4172	5652	try
4173	5653	{
4174	5654	FileOutputStream ostream = new FileOutputStream(lastname);
4175		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5655	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5656	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4176	5657
4177	5658	p.writeObject(copy);
4178	5659	p.flush();
4179	5660
	5661	+ zstream.close();
4180	5662	ostream.close();
4181	5663
4182	5664	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4184,19 +5666,23 @@
4184	5666	//ps.print(buffer.toString());
4185	5667	} catch (IOException e)
4186	5668	{
	5669	+ e.printStackTrace();
4187	5670	}
4188	5671	}
	5672	+
4189	5673	String lastname;
4190	5674
4191	5675	void saveAs()
4192	5676	{
4193		- if (GrafreeD.standAlone)
	5677	+ if (Grafreed.standAlone)
4194	5678	{
4195	5679	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4196	5680	browser.setVisible(true);
4197	5681	String filename = browser.getFile();
4198	5682	if (filename != null && filename.length() > 0)
4199	5683	{
	5684	+ if (!filename.endsWith(".gfd"))
	5685	+ filename += ".gfd";
4200	5686	lastname = browser.getDirectory() + filename;
4201	5687	save();
4202	5688	}
..	..	@@ -4295,13 +5781,13 @@
4295	5781	try
4296	5782	{
4297	5783	FileOutputStream ostream = new FileOutputStream(filename);
4298		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4299		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5784	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5785	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4300	5786
4301	5787	Object3D objectparent = obj.parent;
4302	5788	obj.parent = null;
4303	5789
4304		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5790	+ Object3D object = (Object3D) Grafreed.clone(obj);
4305	5791
4306	5792	obj.parent = objectparent;
4307	5793
..	..	@@ -4313,8 +5799,8 @@
4313	5799	p.writeObject(object);
4314	5800	p.flush();
4315	5801
	5802	+ zstream.close();
4316	5803	ostream.close();
4317		- // zstream.close();
4318	5804
4319	5805	// group.selection.get(0).parent = parent;
4320	5806	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4335,7 +5821,7 @@
4335	5821	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4336	5822	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4337	5823	copy.generatePOV(buffer);
4338		- if (GrafreeD.standAlone)
	5824	+ if (Grafreed.standAlone)
4339	5825	{
4340	5826	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4341	5827	browser.show();
..	..	@@ -4361,53 +5847,71 @@
4361	5847	Object3D client;
4362	5848	Object3D copy;
4363	5849	MenuBar menuBar;
4364		- Menu windowMenu;
4365		- MenuItem loadItem;
	5850	+ Menu fileMenu;
	5851	+ MenuItem newItem;
	5852	+ MenuItem openItem;
4366	5853	MenuItem saveItem;
4367	5854	MenuItem saveAsItem;
4368	5855	MenuItem exportAsItem;
4369	5856	MenuItem reexportItem;
4370	5857	MenuItem povItem;
4371	5858	MenuItem closeItem;
4372		- Menu cameraMenu;
	5859	+
4373	5860	CheckboxMenuItem zBufferItem;
4374	5861	//MenuItem normalLensItem;
4375		- MenuItem editCameraItem;
4376		- MenuItem revertCameraItem;
4377		- CheckboxMenuItem toggleLiveItem;
4378	5862	MenuItem stepItem;
4379		- CheckboxMenuItem toggleFullItem;
	5863	+ CheckboxMenuItem toggleLiveItem;
	5864	+ CheckboxMenuItem toggleFullScreenItem;
	5865	+ CheckboxMenuItem toggleTimelineItem;
4380	5866	CheckboxMenuItem toggleRenderItem;
4381	5867	CheckboxMenuItem toggleDebugItem;
4382	5868	CheckboxMenuItem toggleFrustumItem;
4383	5869	CheckboxMenuItem toggleFootContactItem;
4384	5870	CheckboxMenuItem toggleDLItem;
4385	5871	CheckboxMenuItem toggleTextureItem;
4386		- CheckboxMenuItem toggleRandomItem;
	5872	+ CheckboxMenuItem toggleSwitchItem;
4387	5873	CheckboxMenuItem toggleRootItem;
4388	5874	CheckboxMenuItem animationItem;
	5875	+ MenuItem archiveItem;
4389	5876	CheckboxMenuItem toggleHandleItem;
4390	5877	CheckboxMenuItem togglePaintItem;
4391	5878	JSplitPane mainPanel;
4392	5879	JScrollPane scrollpane;
	5880	+
4393	5881	JPanel toolbarPanel;
4394		- JPanel treePanel;
	5882	+
	5883	+ cGridBag treePanel;
	5884	+
4395	5885	JPanel radioPanel;
4396	5886	ButtonGroup buttonGroup;
4397		- JPanel ctrlPanel;
4398		- JPanel materialPanel;
	5887	+
	5888	+ cGridBag toolboxPanel;
	5889	+ cGridBag skyboxPanel;
	5890	+ cGridBag materialPanel;
	5891	+ cGridBag ctrlPanel;
	5892	+
4399	5893	JScrollPane infoPanel;
4400		- JPanel optionsPanel;
	5894	+
	5895	+ cGridBag optionsPanel;
	5896	+
4401	5897	JTabbedPane objectPanel;
4402		- JPanel XYZPanel;
	5898	+ boolean materialFlushed;
	5899	+ Object3D latestObject;
	5900	+
	5901	+ cGridBag XYZPanel;
	5902	+
4403	5903	JSplitPane gridPanel;
4404	5904	JSplitPane bigPanel;
4405		- JPanel bigThree;
4406		- JTabbedPane jtp;
4407		- JPanel cameraPanel;
	5905	+
	5906	+ cGridBag bigThree;
	5907	+ cGridBag scenePanel;
	5908	+ cGridBag centralPanel;
	5909	+ JSplitPane cameraPanel;
	5910	+ JPanel timelinePanel;
	5911	+ JMenuBar timelineMenubar;
4408	5912	JSplitPane framePanel;
4409	5913	JTextArea/Field/ nameField;
4410		- cButton textureButton;
	5914	+ //cButton textureButton;
4411	5915	cButton okButton;
4412	5916	cButton applyButton;
4413	5917	cButton cancelButton;
..	..	@@ -4454,65 +5958,74 @@
4454	5958	// MATERIAL
4455	5959	JLabel materialLabel;
4456	5960	JLabel colorLabel;
4457		- NumberSlider colorField;
	5961	+ cNumberSlider colorField;
4458	5962	JLabel modulationLabel;
4459		- NumberSlider modulationField;
	5963	+ cNumberSlider saturationField;
4460	5964	JLabel metalnessLabel;
4461		- NumberSlider metalnessField;
	5965	+ cNumberSlider metalnessField;
4462	5966	JLabel diffuseLabel;
4463		- NumberSlider diffuseField;
	5967	+ cNumberSlider diffuseField;
4464	5968	JLabel specularLabel;
4465		- NumberSlider specularField;
	5969	+ cNumberSlider specularField;
4466	5970	JLabel shininessLabel;
4467		- NumberSlider shininessField;
	5971	+ cNumberSlider shininessField;
4468	5972	JLabel shiftLabel;
4469		- NumberSlider shiftField;
	5973	+ cNumberSlider shiftField;
4470	5974	JLabel ambientLabel;
4471		- NumberSlider ambientField;
	5975	+ cNumberSlider ambientField;
4472	5976	JLabel lightareaLabel;
4473		- NumberSlider lightareaField;
	5977	+ cNumberSlider lightareaField;
4474	5978	JLabel diffusenessLabel;
4475		- NumberSlider diffusenessField;
	5979	+ cNumberSlider diffusenessField;
4476	5980	JLabel velvetLabel;
4477		- NumberSlider velvetField;
	5981	+ cNumberSlider velvetField;
4478	5982	JLabel sheenLabel;
4479		- NumberSlider sheenField;
	5983	+ cNumberSlider sheenField;
4480	5984	JLabel subsurfaceLabel;
4481		- NumberSlider subsurfaceField;
	5985	+ cNumberSlider subsurfaceField;
4482	5986	//JLabel bumpLabel;
4483	5987	//NumberSlider bumpField;
4484	5988	JLabel backlitLabel;
4485		- NumberSlider backlitField;
	5989	+ cNumberSlider backlitField;
4486	5990	JLabel anisoLabel;
4487		- NumberSlider anisoField;
	5991	+ cNumberSlider anisoField;
4488	5992	JLabel anisoVLabel;
4489		- NumberSlider anisoVField;
	5993	+ cNumberSlider anisoVField;
	5994	+
4490	5995	JLabel cameraLabel;
4491		- NumberSlider cameraField;
	5996	+ cNumberSlider cameraField;
4492	5997	JLabel selfshadowLabel;
4493		- NumberSlider selfshadowField;
	5998	+ cNumberSlider selfshadowField;
4494	5999	JLabel shadowLabel;
4495		- NumberSlider shadowField;
	6000	+ cNumberSlider shadowField;
4496	6001	JLabel textureLabel;
4497		- NumberSlider textureField;
	6002	+ cNumberSlider textureField;
4498	6003	JLabel opacityLabel;
4499		- NumberSlider opacityField;
	6004	+ cNumberSlider opacityField;
4500	6005	JLabel fakedepthLabel;
4501		- NumberSlider fakedepthField;
	6006	+ cNumberSlider fakedepthField;
4502	6007	JLabel shadowbiasLabel;
4503		- NumberSlider shadowbiasField;
	6008	+ cNumberSlider shadowbiasField;
	6009	+
4504	6010	JLabel bumpLabel;
4505		- NumberSlider bumpField;
	6011	+ cNumberSlider bumpField;
4506	6012	JLabel noiseLabel;
4507		- NumberSlider noiseField;
	6013	+ cNumberSlider noiseField;
4508	6014	JLabel powerLabel;
4509		- NumberSlider powerField;
	6015	+ cNumberSlider powerField;
4510	6016	JLabel borderfadeLabel;
4511		- NumberSlider borderfadeField;
	6017	+ cNumberSlider borderfadeField;
4512	6018	JLabel fogLabel;
4513		- NumberSlider fogField;
	6019	+ cNumberSlider fogField;
4514	6020	JLabel opacityPowerLabel;
4515		- NumberSlider opacityPowerField;
4516		- JTree jTree;
	6021	+ cNumberSlider opacityPowerField;
	6022	+ cTree jTree;
4517	6023	//ObjectUI parent;
	6024	+
	6025	+ cNumberSlider normalpushField;
	6026	+
	6027	+ private MenuItem importGFDItem;
	6028	+ private MenuItem importVRMLX3DItem;
	6029	+ private MenuItem import3DSItem;
	6030	+ private MenuItem importOBJItem;
4518	6031	}