~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,87 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ boolean timeline;
	38	+ boolean wasFullScreen;
31	39
	40	+ GroupEditor callee;
	41	+ JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
	117	+
32	118	// SCRIPT
33	119
34	120	transient JFrame textpanel = null;
..	..	@@ -119,51 +205,62 @@
119	205	void keyPressed(int key, int modifiers)
120	206	{
121	207	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	208	+ Globals.theRenderer.keyPressed(key, modifiers);
123	209	}
124	210	*/
125	211
126	212	static GridBagConstraints aConstraints;
127	213	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	214	+
130	215	static int GRIDWIDTH = 100; // 4;
131	216
132	217	public void closeUI()
133	218	{
134	219	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	220	+// System.out.println("this = " + this);
	221	+// System.out.println("objEditor = " + objEditor);
137	222	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	223	+// objEditor.ctrlPanel.remove(nameField);
139	224
140		- if (!GroupEditor.allparams)
	225	+ objEditor.ctrlPanel.remove(namePanel);
	226	+
	227	+ if (!allparams)
141	228	return;
142	229
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);
	230	+// objEditor.ctrlPanel.remove(liveCB);
	231	+// objEditor.ctrlPanel.remove(hideCB);
	232	+// objEditor.ctrlPanel.remove(markCB);
	233	+//
	234	+// objEditor.ctrlPanel.remove(randomCB);
	235	+// objEditor.ctrlPanel.remove(speedupCB);
	236	+// objEditor.ctrlPanel.remove(rewindCB);
	237	+//
	238	+// objEditor.ctrlPanel.remove(resetButton);
	239	+// objEditor.ctrlPanel.remove(stepButton);
	240	+//// objEditor.ctrlPanel.remove(stepAllButton);
	241	+//// objEditor.ctrlPanel.remove(resetAllButton);
	242	+// objEditor.ctrlPanel.remove(link2masterCB);
	243	+// //objEditor.ctrlPanel.remove(flipVCB);
	244	+// //objEditor.ctrlPanel.remove(texresMenu);
	245	+// objEditor.ctrlPanel.remove(slowerButton);
	246	+// objEditor.ctrlPanel.remove(fasterButton);
	247	+// objEditor.ctrlPanel.remove(remarkButton);
	248	+
	249	+ objEditor.ctrlPanel.remove(setupPanel);
	250	+ objEditor.ctrlPanel.remove(setupPanel2);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	252	+ objEditor.ctrlPanel.remove(pushPanel);
	253	+ //objEditor.ctrlPanel.remove(fillPanel);
	254	+
	255	+ //Remove(normalpushField);
161	256	}
162	257
163	258	public ObjEditor GetEditor()
164	259	{
165	260	return objEditor; //.GetEditor();
166	261	}
	262	+
	263	+ // Sometimes myself, sometimes my callee's.
167	264	ObjEditor objEditor;
168	265
169	266	/*
..	..	@@ -199,6 +296,12 @@
199	296	client = inClient;
200	297	copy = client;
201	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
202	305	// "this" is not called: SetupUI2(objEditor);
203	306	}
204	307
..	..	@@ -212,6 +315,12 @@
212	315	client = inClient;
213	316	copy = client;
214	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
215	324	SetupUI2(callee.GetEditor());
216	325	}
217	326
..	..	@@ -226,6 +335,7 @@
226	335	//localCopy.parent = null;
227	336
228	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
229	339	objEditor = this;
230	340	this.callee = callee;
231	341
..	..	@@ -238,11 +348,17 @@
238	348	//if (!isDisplayable())
239	349	//setUndecorated(true);
240	350
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	351	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	352	client = inClient;
243	353	copy = localCopy;
244	354	copy.editWindow = this;
245	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
246	362	SetupMenu();
247	363
248	364	//SetupName(objEditor); // new
..	..	@@ -256,28 +372,49 @@
256	372	return frame.action(event, obj);
257	373	}
258	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
259	380	void SetupMenu()
260	381	{
261	382	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..."));
	383	+ menuBar.add(fileMenu = new Menu("File"));
	384	+ fileMenu.add(newItem = new MenuItem("New"));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
	386	+
	387	+ //oe.menuBar.add(menu = new Menu("Include"));
	388	+ Menu menu = new Menu("Import");
	389	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	390	+ importOBJItem.addActionListener(this);
	391	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	392	+ import3DSItem.addActionListener(this);
	393	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	394	+ importVRMLX3DItem.addActionListener(this);
	395	+ menu.add("-");
	396	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	397	+ importGFDItem.addActionListener(this);
	398	+ fileMenu.add(menu);
	399	+ fileMenu.add("-");
	400	+
	401	+ fileMenu.add(saveItem = new MenuItem("Save"));
	402	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	403	//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("-");
	404	+ fileMenu.add("-");
	405	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	406	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	407	+ fileMenu.add("-");
272	408	if (client.parent != null)
273	409	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	410	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	411	} else
276	412	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	413	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	414	}
279	415
280		- loadItem.addActionListener(this);
	416	+ newItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
281	418	saveItem.addActionListener(this);
282	419	saveAsItem.addActionListener(this);
283	420	exportAsItem.addActionListener(this);
..	..	@@ -285,80 +422,69 @@
285	422	//povItem.addActionListener(this);
286	423	closeItem.addActionListener(this);
287	424
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	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
342	452	toolbarPanel = new JPanel();
343	453	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	454	+
	455	+ treePanel = new cGridBag();
345	456	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
347		- ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
349		- materialPanel.setName("Material");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
	461	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
	472	+
350	473	/JTextPane/
351	474	infoarea = createTextPane();
	475	+ doc = infoarea.getStyledDocument();
	476	+
352	477	infoarea.setEditable(true);
353	478	SetText();
	479	+
354	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	481	// infoarea.setOpaque(false);
356	482	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	483	+// TEXTAREA infoarea.setLineWrap(true);
	484	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	485	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");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
362	488	//infoPanel.setLayout(new BorderLayout());
363	489	//infoPanel.add(createTextPane());
364	490
..	..	@@ -366,16 +492,23 @@
366	492	mainPanel.setName("Main");
367	493	mainPanel.setContinuousLayout(true);
368	494	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	495	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
372		-
	496	+ mainPanel.setDividerLocation(0.5); //1.0);
	497	+ mainPanel.setResizeWeight(0.5);
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
373	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	507	//mainPanel.setLayout(new GridBagLayout());
375	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	509	+// treePanel.setLayout(new GridBagLayout());
	510	+ //ctrlPanel.setLayout(new GridBagLayout());
	511	+ //materialPanel.setLayout(new GridBagLayout());
379	512
380	513	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	514	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +547,7 @@
414	547	static String newline = "\n";
415	548	protected static final String buttonString = "JButton";
416	549	StyledDocument doc;
417		- JTextArea infoarea;
	550	+ JTextPane infoarea;
418	551
419	552	void ClearInfo()
420	553	{
..	..	@@ -437,10 +570,10 @@
437	570	e.printStackTrace();
438	571	}
439	572
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();
	573	+// String selection = infoarea.getText();
	574	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	575	+// java.awt.datatransfer.Clipboard clipboard =
	576	+// Toolkit.getDefaultToolkit().getSystemClipboard();
444	577	//clipboard.setContents(data, data);
445	578	}
446	579
..	..	@@ -463,13 +596,13 @@
463	596	//SendInfo("Name:", "bold");
464	597	if (sel.GetTextures() != null \|\| debug)
465	598	{
466		- si.SendInfo(sel.toString(), "bold");
	599	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	600	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	601	if (sel.Size() > 0)
469	602	{
470	603	si.SendInfo("#children = " + sel.Size(), "regular");
471	604	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	605	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	606	if (debug)
474	607	{
475	608	try
..	..	@@ -481,7 +614,10 @@
481	614	}
482	615
483	616	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	617	+ {
	618	+ si.SendInfo(" BBox min: " + minima, "regular");
	619	+ si.SendInfo(" BBox max: " + maxima, "regular");
	620	+ }
485	621
486	622	if (sel.bRep != null)
487	623	{
..	..	@@ -508,7 +644,7 @@
508	644	}
509	645	if (sel.support != null)
510	646	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	647	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	648	}
513	649	if (sel.scriptnode != null)
514	650	{
..	..	@@ -522,18 +658,18 @@
522	658	maxima.y = sel.toParent[3][1];
523	659	maxima.z = sel.toParent[3][2];
524	660	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	661	maxima.x = sel.toParent[0][0];
531	662	maxima.y = sel.toParent[1][1];
532	663	maxima.z = sel.toParent[2][2];
533	664	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];
	665	+ maxima.x = sel.globalTransform[3][0];
	666	+ maxima.y = sel.globalTransform[3][1];
	667	+ maxima.z = sel.globalTransform[3][2];
	668	+ if (full)
	669	+ si.SendInfo(" Global Orig: " + maxima, "regular");
	670	+ maxima.x = sel.globalTransform[0][0];
	671	+ maxima.y = sel.globalTransform[1][1];
	672	+ maxima.z = sel.globalTransform[2][2];
537	673	if (full)
538	674	si.SendInfo(" Global Scale: " + maxima, "regular");
539	675	}
..	..	@@ -579,6 +715,9 @@
579	715	{
580	716	CameraPane.pointflow = (PointFlow) sel;
581	717	}
	718	+
	719	+ si.SendInfo("_____________________", "regular");
	720	+ si.SendInfo("", "regular");
582	721	}
583	722	}
584	723
..	..	@@ -594,52 +733,192 @@
594	733	}
595	734	}
596	735
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		- };
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
614	738
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
	739	+ Rectangle keeprect;
	740	+ cRadio radio;
	741	+
	742	+cButton keepButton;
	743	+ cButton twoButton; // Full 3D
	744	+ cButton sixButton;
	745	+ cButton threeButton;
	746	+ cButton sevenButton;
	747	+ cButton fourButton; // full panel
	748	+ cButton oneButton; // full XYZ
	749	+ //cButton currentLayout;
	750	+
	751	+ boolean maximized;
	752	+
	753	+ cButton fullscreenLayout;
621	754
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
	755	+ void Minimize()
628	756	{
629		- for (int j = 0; j < 2; j++)
	757	+ frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
	759	+ }
	760	+
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	764	+ void Maximize()
	765	+ {
	766	+ if (CameraPane.FULLSCREEN)
630	767	{
631		- for (int i = 0; i < initString.length; i++)
632		- {
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
635		- }
	768	+ ToggleFullScreen();
636	769	}
637		- } catch (BadLocationException ble)
	770	+
	771	+ if (maximized)
	772	+ {
	773	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	774	+ }
	775	+ else
	776	+ {
	777	+ keeprect = frame.getBounds();
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	781	+// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	783	+ }
	784	+
	785	+ maximized ^= true;
	786	+
	787	+ frame.validate();
	788	+ }
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
	793	+
	794	+ void ToggleFullScreen()
638	795	{
639		- System.err.println("Couldn't insert initial text into text pane.");
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
	801	+ {
	802	+ device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
	808	+ //frame.setVisible(false);
	809	+// frame.removeNotify();
	810	+// frame.setUndecorated(false);
	811	+// frame.addNotify();
	812	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	813	+
	814	+// X frame.getContentPane().remove(/"Center",/bigThree);
	815	+// X framePanel.add(bigThree);
	816	+// X frame.getContentPane().add(/"Center",/framePanel);
	817	+ framePanel.setDividerLocation(46);
	818	+
	819	+ //frame.setVisible(true);
	820	+ radio.layout = keepButton;
	821	+ //theFrame = null;
	822	+ keepButton = null;
	823	+ radio.layout.doClick();
	824	+
	825	+ } else
	826	+ {
	827	+ keepButton = radio.layout;
	828	+ //keeprect = frame.getBounds();
	829	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	830	+// frame.getToolkit().getScreenSize().height);
	831	+ //frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
	835	+ device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
	838	+// frame.removeNotify();
	839	+// frame.setUndecorated(true);
	840	+// frame.addNotify();
	841	+// X frame.getContentPane().remove(/"Center",/framePanel);
	842	+// X framePanel.remove(bigThree);
	843	+// X frame.getContentPane().add(/"Center",/bigThree);
	844	+ framePanel.setDividerLocation(0);
	845	+
	846	+ radio.layout = fullscreenLayout;
	847	+ radio.layout.doClick();
	848	+ //frame.setVisible(true);
	849	+ }
	850	+ frame.validate();
640	851	}
641	852
642		- return new JTextArea(); // textPane;
	853	+ private Object3D CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versionlist;
	862	+ copy.versionlist = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versionlist = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
	875	+
	876	+ private JTextPane createTextPane()
	877	+ {
	878	+// TEXTAREA String[] initString =
	879	+// {
	880	+// "This is an editable JTextPane, ", //regular
	881	+// "another ", //italic
	882	+// "styled ", //bold
	883	+// "text ", //small
	884	+// "component, ", //large
	885	+// "which supports embedded components..." + newline,//regular
	886	+// " " + newline, //button
	887	+// "...and embedded icons..." + newline, //regular
	888	+// " ", //icon
	889	+// newline + "JTextPane is a subclass of JEditorPane that "
	890	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	891	+// + "cover methods for interacting with those objects."
	892	+// };
	893	+//
	894	+// String[] initStyles =
	895	+// {
	896	+// "regular", "italic", "bold", "small", "large",
	897	+// "regular", "button", "regular", "icon",
	898	+// "regular"
	899	+// };
	900	+//
	901	+// JTextPane textPane = new JTextPane();
	902	+// textPane.setEditable(true);
	903	+// /StyledDocument/ doc = textPane.getStyledDocument();
	904	+// addStylesToDocument(doc);
	905	+//
	906	+// try
	907	+// {
	908	+// for (int j = 0; j < 2; j++)
	909	+// {
	910	+// for (int i = 0; i < initString.length; i++)
	911	+// {
	912	+// doc.insertString(doc.getLength(), initString[i],
	913	+// doc.getStyle(initStyles[i]));
	914	+// }
	915	+// }
	916	+// } catch (BadLocationException ble)
	917	+// {
	918	+// System.err.println("Couldn't insert initial text into text pane.");
	919	+// }
	920	+
	921	+ return new JTextPane(); // textPane;
643	922	}
644	923
645	924	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +971,7 @@
692	971	protected static ImageIcon createImageIcon(String path,
693	972	String description)
694	973	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	974	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	975	if (imgURL != null)
697	976	{
698	977	return new ImageIcon(imgURL, description);
..	..	@@ -715,6 +994,7 @@
715	994	{
716	995	SetupMaterial(materialPanel);
717	996	}
	997	+
718	998	//SetupName();
719	999	//SetupViews();
720	1000	}
..	..	@@ -724,6 +1004,7 @@
724	1004	// NumberSlider vDivsField;
725	1005	// JCheckBox endcaps;
726	1006	JCheckBox liveCB;
	1007	+ JCheckBox selectableCB;
727	1008	JCheckBox hideCB;
728	1009	JCheckBox link2masterCB;
729	1010	JCheckBox markCB;
..	..	@@ -731,7 +1012,12 @@
731	1012	JCheckBox speedupCB;
732	1013	JCheckBox rewindCB;
733	1014	JCheckBox flipVCB;
	1015	+
	1016	+ cCheckBox toggleTextureCB;
	1017	+ cCheckBox toggleSwitchCB;
	1018	+
734	1019	JComboBox texresMenu;
	1020	+
735	1021	JButton resetButton;
736	1022	JButton stepButton;
737	1023	JButton stepAllButton;
..	..	@@ -739,115 +1025,87 @@
739	1025	JButton slowerButton;
740	1026	JButton fasterButton;
741	1027	JButton remarkButton;
	1028	+
	1029	+ cGridBag editPanel;
	1030	+ cGridBag editCommandsPanel;
	1031	+
	1032	+ cGridBag namePanel;
	1033	+ cGridBag setupPanel;
	1034	+ cGridBag setupPanel2;
	1035	+ cGridBag objectCommandsPanel;
	1036	+ cGridBag pushPanel;
	1037	+ cGridBag fillPanel;
742	1038
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1039	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	1040	{
745	1041	JCheckBox cb;
746	1042
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);
	1043	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	1044	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	1045
757	1046	return cb;
758	1047	}
759	1048
760		- cButton AddButton(ObjEditor oe, String label)
	1049	+ cButton AddButton(cGridBag panel, String label)
761	1050	{
762	1051	cButton cb;
763	1052
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);
	1053	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	1054	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	1055
774	1056	return cb;
775	1057	}
776	1058
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1059	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	1060	{
779	1061	JComboBox combo;
780	1062
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;
	1063	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	1064	combo.addActionListener(this);
785	1065
786	1066	return combo;
787	1067	}
788	1068
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1069	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	1070	{
791		- NumberSlider combo;
	1071	+ cGridBag control = new cGridBag();
	1072	+
	1073	+ cNumberSlider combo;
792	1074
793	1075	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	1076	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		-
	1077	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1078	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	1079	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	1080	+
	1081	+ panel.add(control);
	1082	+
	1083	+ return control;
813	1084	}
814	1085
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1086	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	1087	{
817		- NumberSlider combo;
	1088	+ cGridBag control = new cGridBag();
	1089	+
	1090	+ cNumberSlider combo;
818	1091
819	1092	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	1093	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		-
	1094	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1095	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	1096	combo.setInteger(current);
833	1097
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	1098	+ panel.add(control);
	1099	+
	1100	+ return control;
839	1101	}
840	1102
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	1103	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	1104	{
843	1105	JTextArea text;
844	1106
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1107	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	1108	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	1109
852	1110	return text;
853	1111	}
..	..	@@ -877,9 +1135,16 @@
877	1135	objEditor.ctrlPanel.remove(j);
878	1136	}
879	1137
	1138	+ void Remove(cNumberSlider j)
	1139	+ {
	1140	+ j.removeChangeListener(this);
	1141	+ //objEditor.ctrlPanel.remove(j.label);
	1142	+ objEditor.ctrlPanel.remove(j);
	1143	+ }
	1144	+
880	1145	/*
881	1146	*/
882		- void Return() // ObjEditor oe)
	1147	+ void Return0() // ObjEditor oe)
883	1148	{
884	1149	aConstraints.gridy += 1;
885	1150	aConstraints.gridx = 0;
..	..	@@ -934,35 +1199,81 @@
934	1199
935	1200	void SetupUI2(ObjEditor oe)
936	1201	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	1202	+ //SetupName(oe);
942	1203
943		- if (!GroupEditor.allparams)
	1204	+ namePanel = new cGridBag();
	1205	+
	1206	+ nameField = AddText(namePanel, copy.GetName());
	1207	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1208	+ oe.ctrlPanel.add(namePanel);
	1209	+
	1210	+ oe.ctrlPanel.Return();
	1211	+
	1212	+ if (!allparams)
944	1213	return;
945	1214
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1215	+ setupPanel = new cGridBag().setVertical(false);
	1216	+
	1217	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1218	+ liveCB.setToolTipText("Animate object");
	1219	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1220	+ selectableCB.setToolTipText("Make object selectable");
949	1221	// 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");
	1222	+
	1223	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1224	+ hideCB.setToolTipText("Hide object");
	1225	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1226	+ markCB.setToolTipText("As animation target transform");
	1227	+
	1228	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1229	+
	1230	+ setupPanel2 = new cGridBag().setVertical(false);
	1231	+
	1232	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1233	+ rewindCB.setToolTipText("Rewind animation");
	1234	+
	1235	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1236	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1237	+
	1238	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1239	+ link2masterCB.setToolTipText("Attach to support");
	1240	+
	1241	+ if (Globals.ADVANCED)
	1242	+ {
	1243	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1244	+ speedupCB.setToolTipText("Option motion capture");
	1245	+ }
	1246	+
	1247	+ oe.ctrlPanel.add(setupPanel);
	1248	+ oe.ctrlPanel.Return();
	1249	+ oe.ctrlPanel.add(setupPanel2);
	1250	+ oe.ctrlPanel.Return();
	1251	+
	1252	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1253	+
	1254	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1255	+ resetButton.setToolTipText("Jump to frame zero");
	1256	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1257	+ stepButton.setToolTipText("Step one frame");
956	1258	// resetAllButton = AddButton(oe, "Reset All");
957	1259	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1260	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1261	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1262	+ slowerButton.setToolTipText("Decrease animation speed");
	1263	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1264	+ fasterButton.setToolTipText("Increase animation speed");
	1265	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1266	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1267
964		- Return();
	1268	+ oe.ctrlPanel.add(objectCommandsPanel);
	1269	+ oe.ctrlPanel.Return();
965	1270
	1271	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1272	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1273	+ //Return();
	1274	+
	1275	+ oe.ctrlPanel.Return();
	1276	+
966	1277	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1278	// ObjEditor.aConstraints.gridx += 1;
968	1279
..	..	@@ -1056,7 +1367,7 @@
1056	1367	oe.aConstraints.gridwidth = 1;
1057	1368	/**/
1058	1369	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1370	+ oe.ctrlPanel.Return();
1060	1371
1061	1372	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1373	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1469,28 @@
1158	1469	//JPanel worldPanel =
1159	1470	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1471	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1472	+ centralPanel = new cGridBag();
	1473	+ centralPanel.preferredWidth = 20;
	1474	+
	1475	+ if (Globals.ADVANCED)
	1476	+ {
	1477	+ timelinePanel = new JPanel(new BorderLayout());
	1478	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1479
	1480	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1481	+ cameraPanel.setContinuousLayout(true);
	1482	+ cameraPanel.setOneTouchExpandable(true);
	1483	+// cameraPanel.setDividerLocation(0.9);
	1484	+// cameraPanel.setDividerSize(9);
	1485	+ cameraPanel.setResizeWeight(1.0);
	1486	+
	1487	+ }
	1488	+
	1489	+ centralPanel.add(cameraView);
	1490	+ centralPanel.setFocusable(true);
	1491	+ //frame.setJMenuBar(timelineMenubar);
	1492	+ //centralPanel.add(timelinePanel);
	1493	+
1165	1494	//topView.camera = ;
1166	1495	//frontView.camera = new Camera(2);
1167	1496	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1506,14 @@
1177	1506	//frontView.object = copy;
1178	1507	//sideView.object = copy;
1179	1508
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1509	+ XYZPanel = new cGridBag().setVertical(true);
	1510	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1511
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1512	+ XYZPanel.preferredWidth = 5;
	1513	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1514	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1515	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1516	+ //XYZPanel.setName("XYZ");
1186	1517
1187	1518	/*
1188	1519	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1522,7 @@
1191	1522	gridPanel.add(cameraView);
1192	1523	gridPanel.add(XYZPanel);
1193	1524	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1525	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1526	gridPanel.setContinuousLayout(true);
1196	1527	gridPanel.setOneTouchExpandable(true);
1197	1528	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,11 +1551,29 @@
1220	1551	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1552	//tmp.setName("Edit");
1222	1553	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);
	1554	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1555	+ objectPanel.setToolTipTextAt(0, "Material");
	1556	+
	1557	+// JPanel north = new JPanel(new BorderLayout());
	1558	+// north.setName("Edit");
	1559	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1560	+// objectPanel.add(north);
	1561	+ objectPanel.add(editPanel);
	1562	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1563	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1564	+
	1565	+ //if (Globals.ADVANCED)
	1566	+ objectPanel.add(infoPanel);
	1567	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1568	+ objectPanel.setToolTipTextAt(2, "Information");
	1569	+
	1570	+ objectPanel.add(XYZPanel);
	1571	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1572	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
	1573	+
	1574	+ objectPanel.add(toolboxPanel);
	1575	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1576	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1228	1577
1229	1578	/*
1230	1579	aConstraints.gridx = 0;
..	..	@@ -1233,7 +1582,7 @@
1233	1582	aConstraints.gridy += 1;
1234	1583	aConstraints.gridwidth = 1;
1235	1584	mainPanel.add(objectPanel, aConstraints);
1236		- */
	1585	+ */
1237	1586
1238	1587	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1239	1588	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1244,16 +1593,23 @@
1244	1593	scrollpane.setWheelScrollingEnabled(true);
1245	1594	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1595
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1596	+ /JTabbedPane/ scenePanel = new cGridBag();
	1597	+ scenePanel.preferredWidth = 5;
	1598	+
	1599	+ JTabbedPane tabbedPane = new JTabbedPane();
	1600	+ tabbedPane.add(scrollpane);
1249	1601
1250		- jtp.add(FSPane = new cFileSystemPane(this));
1251		-
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1602	+ optionsPanel = new cGridBag().setVertical(false);
1253	1603
1254	1604	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
	1605	+
	1606	+ AddOptions(optionsPanel); //, aConstraints);
	1607	+
	1608	+ tabbedPane.add(optionsPanel);
	1609	+
	1610	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1256	1611
	1612	+ scenePanel.add(tabbedPane);
1257	1613
1258	1614	/*
1259	1615	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1631,7 @@
1275	1631	jtp.add(tree);
1276	1632	*/
1277	1633
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1634	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1635	bigPanel.setContinuousLayout(true);
1280	1636	bigPanel.setOneTouchExpandable(true);
1281	1637	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1643,7 @@
1287	1643	//bigPanel.setSize(new Dimension(10,10));
1288	1644	//bigPanel.add(ctrlPanel);
1289	1645	//bigPanel.add(gridPanel);
	1646	+ /**
1290	1647	bigThree = new JPanel();
1291	1648	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1649	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1654,26 @@
1297	1654	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1655	aWindowConstraints.weightx = 0;
1299	1656	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1657	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1658	aWindowConstraints.weightx = 1;
1302	1659	aWindowConstraints.gridwidth = 3;
1303	1660	// aConstraints.gridheight = 3;
1304	1661	aWindowConstraints.gridx = 1;
1305	1662	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1663	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1664	aWindowConstraints.weightx = 0;
1308	1665	aWindowConstraints.gridx = 4;
1309	1666	aWindowConstraints.gridwidth = 1;
1310	1667	// aConstraints.gridheight = 3;
1311	1668	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1669	bigThree.add(XYZPanel, aWindowConstraints);
	1670	+ /**/
1313	1671
	1672	+ bigThree = new cGridBag();
	1673	+ bigThree.addComponent(scenePanel);
	1674	+ bigThree.addComponent(centralPanel);
	1675	+ //bigThree.addComponent(XYZPanel);
	1676	+
1314	1677	// // SIDE EFFECT!!!
1315	1678	// aConstraints.gridx = 0;
1316	1679	// aConstraints.gridy = 0;
..	..	@@ -1318,9 +1681,9 @@
1318	1681	// aConstraints.gridheight = 1;
1319	1682
1320	1683	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1321		- framePanel.setContinuousLayout(true);
1322		- framePanel.setOneTouchExpandable(true);
1323		- framePanel.setDividerLocation(0.8);
	1684	+ framePanel.setContinuousLayout(false);
	1685	+ framePanel.setOneTouchExpandable(false);
	1686	+ //.setDividerLocation(0.8);
1324	1687	//framePanel.setDividerSize(15);
1325	1688	//framePanel.setResizeWeight(0.15);
1326	1689	framePanel.setName("Frame");
..	..	@@ -1331,20 +1694,25 @@
1331	1694	//worldPane.add(bigPanel);
1332	1695	//worldPane.add(worldPanel);
1333	1696	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1697	+ //frame.getContentPane().add(/"Center",/framePanel);
	1698	+ frame.add(/"Center",/framePanel);
1335	1699	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1700
1337	1701	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1702
1339		- frame.setSize(1024, 768);
1340		- frame.show();
1341		-
	1703	+ frame.setSize(1280, 860);
	1704	+
	1705	+ cameraView.requestFocusInWindow();
	1706	+
1342	1707	gridPanel.setDividerLocation(1.0);
	1708	+
	1709	+ frame.validate();
	1710	+
	1711	+ frame.setVisible(true);
1343	1712
1344	1713	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1345	1714	frame.addWindowListener(new WindowAdapter()
1346	1715	{
1347		-
1348	1716	public void windowClosing(WindowEvent e)
1349	1717	{
1350	1718	Close();
..	..	@@ -1352,6 +1720,10 @@
1352	1720	});
1353	1721	}
1354	1722
	1723	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1724	+ {
	1725	+ }
	1726	+
1355	1727	JTree GetTree()
1356	1728	{
1357	1729	return objEditor.jTree;
..	..	@@ -1363,260 +1735,228 @@
1363	1735	ctrlPanel.removeAll();
1364	1736	}
1365	1737
1366		- void SetupMaterial(JPanel ctrlPanel)
	1738	+ void SetupMaterial(cGridBag materialpanel)
1367	1739	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1740	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1741	+ cLabel label = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1742	+ label.addMouseListener(new MouseAdapter()
	1743	+ {
	1744	+ public void mouseClicked(MouseEvent e)
	1745	+ {
	1746	+ colorField.setFloat(0);
	1747	+ saturationField.setFloat(1);
	1748	+ materialtouched = true;
	1749	+ applySelf();
	1750	+ }
	1751	+ });
	1752	+ presetpanel.add(label);
	1753	+
	1754	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF));
	1755	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1756	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1757	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1758	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1759	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1760	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1761	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1762	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1763	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1764	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1765	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1766	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1767	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1768	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1769	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1770	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1771	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF));
	1772	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00019.png", !Grafreed.NIMBUSLAF));
	1773	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00020.png", !Grafreed.NIMBUSLAF));
	1774	+
	1775	+ cGridBag panel = new cGridBag().setVertical(true);
	1776	+
	1777	+ presetpanel.preferredWidth = 1;
	1778	+
	1779	+ materialpanel.add(panel);
	1780	+ materialpanel.add(presetpanel);
	1781	+
	1782	+ panel.preferredWidth = 8;
	1783	+
	1784	+ /*
1371	1785	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1786	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375		- */
	1787	+ */
1376	1788
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	1789	+ cGridBag editBar = new cGridBag().setVertical(false);
	1790	+
	1791	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1792	+ createMaterialButton.setToolTipText("Create material");
1382	1793
1383	1794	/*
1384	1795	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1796	*/
1389	1797
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	1798	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1799	+ clearMaterialButton.setToolTipText("Clear material");
	1800	+
	1801	+ if (Globals.ADVANCED)
	1802	+ {
	1803	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1804	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1805	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1806	+ }
1392	1807
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;
	1808	+ editBar.preferredHeight = 15;
	1809	+
	1810	+ panel.add(editBar);
	1811	+
1407	1812	/**/
1408	1813	//aConstraints.weighty = 0;
1409	1814	////aConstraints.weightx = 1;
1410	1815	//aConstraints.weighty = 1;
1411	1816	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1817	//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;
	1818	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1819
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;
	1820	+ cGridBag colorSection = new cGridBag().setVertical(true);
1429	1821
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;
	1822	+ cGridBag huepanel = new cGridBag();
	1823	+ cGridBag huelabel = new cGridBag();
	1824	+ label = GetLabel("icons/hue.png", false);
	1825	+ label.fit = true;
	1826	+ huelabel.add(label);
	1827	+ huelabel.preferredWidth = 20;
	1828	+ huepanel.add(new cGridBag()); // Label
	1829	+ huepanel.add(huelabel); // Field/slider
	1830	+
	1831	+ huepanel.preferredHeight = 7;
1439	1832
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;
	1833	+ colorSection.add(huepanel);
	1834	+
	1835	+ cGridBag color = new cGridBag();
	1836	+
	1837	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1838	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1839	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1449	1840
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;
	1841	+ //colorField.preferredWidth = 200;
	1842	+ colorSection.add(color);
1459	1843
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;
	1844	+ cGridBag modulation = new cGridBag();
	1845	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1846	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1847	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1848	+ colorSection.add(modulation);
1469	1849
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;
	1850	+ cGridBag opacity = new cGridBag();
	1851	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1852	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1853	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1854	+ colorSection.add(opacity);
1479	1855
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;
	1856	+ colorSection.add(GetSeparator());
	1857	+
	1858	+ cGridBag texture = new cGridBag();
	1859	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1860	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1861	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1862	+ colorSection.add(texture);
1488	1863
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;
	1864	+ panel.add(GetSeparator());
	1865	+
	1866	+ panel.add(colorSection);
	1867	+
	1868	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1869	+
	1870	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1871	+
	1872	+ cGridBag diffuse = new cGridBag();
	1873	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1874	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1875	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1876	+ diffuseSection.add(diffuse);
1498	1877
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;
	1878	+ cGridBag diffuseness = new cGridBag();
	1879	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1880	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1881	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1882	+ diffuseSection.add(diffuseness);
1508	1883
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;
	1884	+ cGridBag selfshadow = new cGridBag();
	1885	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1886	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1887	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1888	+ diffuseSection.add(selfshadow);
1518	1889
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;
	1890	+ cGridBag sheen = new cGridBag();
	1891	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1892	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1893	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1894	+ diffuseSection.add(sheen);
1528	1895
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;
	1896	+ cGridBag subsurface = new cGridBag();
	1897	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1898	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1899	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1900	+ diffuseSection.add(subsurface);
1538	1901
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;
	1902	+ cGridBag shadow = new cGridBag();
	1903	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1904	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1905	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1906	+ diffuseSection.add(shadow);
1548	1907
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;
	1908	+ cGridBag fakedepth = new cGridBag();
	1909	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1910	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1911	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1912	+ diffuseSection.add(fakedepth);
1558	1913
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;
	1914	+ cGridBag shadowbias = new cGridBag();
	1915	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1916	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1917	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1918	+ diffuseSection.add(shadowbias);
1567	1919
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;
	1920	+ panel.add(GetSeparator());
	1921	+
	1922	+ panel.add(diffuseSection);
	1923	+
	1924	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1925	+
	1926	+ cGridBag specularSection = new cGridBag().setVertical(true);
1577	1927
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;
	1928	+ cGridBag specular = new cGridBag();
	1929	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1930	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1931	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1932	+ specularSection.add(specular);
1587	1933
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;
	1934	+ cGridBag lightarea = new cGridBag();
	1935	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1936	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1937	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1938	+ specularSection.add(lightarea);
1597	1939
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;
	1940	+ cGridBag shininess = new cGridBag();
	1941	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1942	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1943	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1944	+ specularSection.add(shininess);
1607	1945
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;
	1946	+ cGridBag metalness = new cGridBag();
	1947	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1948	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1949	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1950	+ specularSection.add(metalness);
1617	1951
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	1952	+ cGridBag velvet = new cGridBag();
	1953	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1954	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1955	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1956	+ specularSection.add(velvet);
	1957	+
	1958	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1959	+ //Return();
1620	1960	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1961	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1962	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1967,99 @@
1627	1967	// aConstraints.gridy += 1;
1628	1968	// aConstraints.gridwidth = 1;
1629	1969
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;
	1970	+ cGridBag anisoU = new cGridBag();
	1971	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1972	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1973	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1974	+ specularSection.add(anisoU);
1638	1975
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;
	1976	+ cGridBag anisoV = new cGridBag();
	1977	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1978	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1979	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1980	+ specularSection.add(anisoV);
1648	1981
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	1982
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;
	1983	+ panel.add(GetSeparator());
	1984	+
	1985	+ panel.add(specularSection);
	1986	+
	1987	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1988	+
	1989	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1668	1990
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;
	1991	+ cGridBag camera = new cGridBag();
	1992	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1993	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1994	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1995	+ colorSection.add(camera);
1679	1996
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;
	1997	+ cGridBag ambient = new cGridBag();
	1998	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1999	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2000	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2001	+ colorSection.add(ambient);
1689	2002
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;
	2003	+ cGridBag backlit = new cGridBag();
	2004	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2005	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2006	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2007	+ colorSection.add(backlit);
1699	2008
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;
	2009	+ //panel.add(new JSeparator());
	2010	+
	2011	+ //panel.add(globalSection);
	2012	+
	2013	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2014	+
	2015	+ cGridBag textureSection = new cGridBag().setVertical(true);
1709	2016
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;
	2017	+ cGridBag bump = new cGridBag();
	2018	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2019	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2020	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2021	+ textureSection.add(bump);
1719	2022
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;
	2023	+ cGridBag noise = new cGridBag();
	2024	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2025	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2026	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2027	+ textureSection.add(noise);
1729	2028
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;
	2029	+ cGridBag power = new cGridBag();
	2030	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2031	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2032	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2033	+ textureSection.add(power);
1739	2034
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	2035	+ cGridBag borderfade = new cGridBag();
	2036	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2037	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2038	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2039	+ textureSection.add(borderfade);
1745	2040
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	2041	+ cGridBag fog = new cGridBag();
	2042	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2043	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2044	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2045	+ textureSection.add(fog);
	2046	+
	2047	+ cGridBag opacityPower = new cGridBag();
	2048	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2049	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2050	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2051	+ textureSection.add(opacityPower);
	2052	+
	2053	+ panel.add(GetSeparator());
	2054	+
	2055	+ panel.add(textureSection);
	2056	+
	2057	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	2058
1750	2059	SetMaterial(copy); // .GetMaterial());
1751	2060
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	2061	+ //colorField.addChangeListener(this);
	2062	+// modulationField.addChangeListener(this);
1754	2063	metalnessField.addChangeListener(this);
1755	2064	diffuseField.addChangeListener(this);
1756	2065	specularField.addChangeListener(this);
..	..	@@ -1780,12 +2089,15 @@
1780	2089	opacityPowerField.addChangeListener(this);
1781	2090	/**/
1782	2091
1783		- resetSlidersButton.addActionListener(this);
1784	2092	clearMaterialButton.addActionListener(this);
1785	2093	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	2094	+
	2095	+ if (Globals.ADVANCED)
	2096	+ {
	2097	+ resetSlidersButton.addActionListener(this);
	2098	+ propagateToggle.addItemListener(this);
	2099	+ multiplyToggle.addItemListener(this);
	2100	+ }
1789	2101	}
1790	2102
1791	2103	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1803,8 +2115,9 @@
1803	2115	// 3D models
1804	2116	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1805	2117	{
1806		- lastConverter = new com.jmex.model.converters.MaxToJme();
1807		- LoadFile(filename, lastConverter);
	2118	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2119	+ //LoadFile(filename, lastConverter);
	2120	+ LoadObjFile(filename); // New 3ds loader
1808	2121	continue;
1809	2122	}
1810	2123	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1956,7 +2269,7 @@
1956	2269
1957	2270	//? flashIt = false;
1958	2271	CameraPane pane = (CameraPane) cameraView;
1959		- pane.clickStart(location.x, location.y, 0);
	2272	+ pane.clickStart(location.x, location.y, 0, 0);
1960	2273	pane.clickEnd(location.x, location.y, 0, true);
1961	2274
1962	2275	if (group.selection.size() == 1)
..	..	@@ -2005,6 +2318,7 @@
2005	2318	e2.printStackTrace();
2006	2319	}
2007	2320	}
	2321	+
2008	2322	LoadJMEThread loadThread;
2009	2323
2010	2324	class LoadJMEThread extends Thread
..	..	@@ -2062,6 +2376,7 @@
2062	2376	//LoadFile0(filename, converter);
2063	2377	}
2064	2378	}
	2379	+
2065	2380	LoadOBJThread loadObjThread;
2066	2381
2067	2382	class LoadOBJThread extends Thread
..	..	@@ -2140,19 +2455,19 @@
2140	2455
2141	2456	void LoadObjFile(String fullname)
2142	2457	{
2143		- /*
	2458	+ System.out.println("Loading " + fullname);
	2459	+ /**/
2144	2460	//lastFilename = fullname;
2145	2461	if(loadObjThread == null)
2146	2462	{
2147		- loadObjThread = new LoadOBJThread();
2148		- loadObjThread.start();
	2463	+ loadObjThread = new LoadOBJThread();
	2464	+ loadObjThread.start();
2149	2465	}
2150	2466
2151	2467	loadObjThread.add(fullname);
2152		- */
	2468	+ /**/
2153	2469
2154		- System.out.println("Loading " + fullname);
2155		- makeSomething(new FileObject(fullname, true), true);
	2470	+ //makeSomething(new FileObject(fullname, true), true);
2156	2471	}
2157	2472
2158	2473	void LoadGFDFile(String fullname)
..	..	@@ -2194,6 +2509,8 @@
2194	2509	{
2195	2510	Mocap sel = (Mocap) copy.selection.get(0);
2196	2511
	2512	+ sel.SetCurrentBones(sel.frame);
	2513	+
2197	2514	sel.fullname = fullname;
2198	2515
2199	2516	if (changename)
..	..	@@ -2207,14 +2524,18 @@
2207	2524	sel.smoothed = false;
2208	2525
2209	2526	// if (!changename)
2210		- sel.SetPositionDelta(false, true, true, true/?/); // false
	2527	+ //sel.SetPositionDelta(false, true, true, true/?/); // false
	2528	+ sel.SetGlobalTransform();
	2529	+ sel.LoadData();
	2530	+ sel.Rewind();
	2531	+ sel.Fade();
2211	2532	// sel.setPose(0);
2212	2533	refreshContents();
2213	2534	} else
2214	2535	{
2215	2536	mocap.Reset();
2216	2537	// new skeleton
2217		- makeSomething(mocap, false); // true);
	2538	+ makeSomething(mocap, true); // true);
2218	2539	}
2219	2540	} catch (Exception e)
2220	2541	{
..	..	@@ -2241,6 +2562,8 @@
2241	2562	{
2242	2563	Mocap sel = (Mocap) select;
2243	2564
	2565	+ sel.SetCurrentBones(sel.frame);
	2566	+
2244	2567	File file = new File(fullname);
2245	2568
2246	2569	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2307,7 +2630,11 @@
2307	2630
2308	2631	if (!changename)
2309	2632	{
2310		- sel.SetPositionDelta(false, true, true, true/?/);
	2633	+ //sel.SetPositionDelta(false, true, true, true/?/);
	2634	+ sel.SetGlobalTransform();
	2635	+ sel.LoadData();
	2636	+ sel.Rewind();
	2637	+ sel.Fade();
2311	2638	}
2312	2639
2313	2640	// sel.setPose(0);
..	..	@@ -2401,11 +2728,11 @@
2401	2728
2402	2729	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2403	2730	{
2404		- if (GrafreeD.standAlone)
	2731	+ if (Grafreed.standAlone)
2405	2732	{
2406	2733	/**/
2407	2734	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2408		- browser.show();
	2735	+ browser.setVisible(true);
2409	2736	String filename = browser.getFile();
2410	2737	if (filename != null && filename.length() > 0)
2411	2738	{
..	..	@@ -2516,6 +2843,7 @@
2516	2843	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2517	2844	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2518	2845	}
	2846	+
2519	2847	//cJME.count++;
2520	2848	//cJME.count %= 12;
2521	2849	if (gc)
..	..	@@ -2550,6 +2878,7 @@
2550	2878	}
2551	2879	if (input == null)
2552	2880	{
	2881	+ new Exception().printStackTrace();
2553	2882	System.exit(0);
2554	2883	}
2555	2884
..	..	@@ -2698,6 +3027,7 @@
2698	3027	}
2699	3028	}
2700	3029	}
	3030	+
2701	3031	cFileSystemPane FSPane;
2702	3032
2703	3033	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2707,7 +3037,7 @@
2707	3037
2708	3038	freezematerial = true;
2709	3039	colorField.setFloat(mat.color);
2710		- modulationField.setFloat(mat.modulation);
	3040	+ saturationField.setFloat(mat.modulation);
2711	3041	metalnessField.setFloat(mat.metalness);
2712	3042	diffuseField.setFloat(mat.diffuse);
2713	3043	specularField.setFloat(mat.specular);
..	..	@@ -2751,11 +3081,14 @@
2751	3081	}
2752	3082	}
2753	3083	}
	3084	+
2754	3085	freezematerial = false;
2755	3086	}
2756	3087
2757	3088	void SetMaterial(Object3D object)
2758	3089	{
	3090	+ latestObject = object;
	3091	+
2759	3092	cMaterial mat = object.material;
2760	3093
2761	3094	if (mat == null)
..	..	@@ -2764,7 +3097,8 @@
2764	3097	return;
2765	3098	}
2766	3099
2767		- multiplyToggle.setSelected(mat.multiply);
	3100	+ if (multiplyToggle != null)
	3101	+ multiplyToggle.setSelected(mat.multiply);
2768	3102
2769	3103	assert (object.projectedVertices != null);
2770	3104
..	..	@@ -2866,12 +3200,17 @@
2866	3200	// }
2867	3201
2868	3202	/**/
2869		- if (deselect)
	3203	+ if (deselect \|\| child == null)
2870	3204	{
2871	3205	//group.deselectAll();
2872	3206	//freeze = true;
2873	3207	GetTree().clearSelection();
2874	3208	//freeze = false;
	3209	+
	3210	+ if (child == null)
	3211	+ {
	3212	+ return;
	3213	+ }
2875	3214	}
2876	3215
2877	3216	//group.addSelectee(child);
..	..	@@ -2940,31 +3279,48 @@
2940	3279	cameraView.ToggleDL();
2941	3280	cameraView.repaint();
2942	3281	return;
2943		- } else if (event.getSource() == toggleTextureItem)
	3282	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2944	3283	{
2945	3284	cameraView.ToggleTexture();
2946	3285	// june 2013 copy.HardTouch();
2947	3286	cameraView.repaint();
2948	3287	return;
2949		- } else if (event.getSource() == toggleFullItem)
	3288	+ } else if (event.getSource() == toggleTimelineItem)
2950	3289	{
2951		- if (CameraPane.FULLSCREEN)
	3290	+ timeline ^= true;
	3291	+
	3292	+ if (timeline)
2952	3293	{
2953		- frame.getContentPane().remove(/"Center",/bigThree);
2954		- framePanel.add(bigThree);
2955		- frame.getContentPane().add(/"Center",/framePanel);
2956		- } else
2957		- {
2958		- frame.getContentPane().remove(/"Center",/framePanel);
2959		- frame.getContentPane().add(/"Center",/bigThree);
	3294	+ centralPanel.remove(cameraView);
	3295	+ cameraPanel.add(cameraView);
	3296	+ centralPanel.add(cameraPanel);
	3297	+ frame.setJMenuBar(timelineMenubar);
	3298	+ wasFullScreen = CameraPane.FULLSCREEN;
	3299	+ if (!CameraPane.FULLSCREEN)
	3300	+ ToggleFullScreen();
	3301	+ toggleFullScreenItem.setEnabled(false);
2960	3302	}
	3303	+ else
	3304	+ {
	3305	+ centralPanel.remove(cameraPanel);
	3306	+ centralPanel.add(cameraView);
	3307	+ frame.setJMenuBar(null);
	3308	+ if (!wasFullScreen)
	3309	+ ToggleFullScreen();
	3310	+ toggleFullScreenItem.setEnabled(true);
	3311	+ }
	3312	+
2961	3313	frame.validate();
2962		- cameraView.ToggleFullScreen();
	3314	+ return;
	3315	+ } else if (event.getSource() == toggleFullScreenItem)
	3316	+ {
	3317	+ ToggleFullScreen();
	3318	+ frame.validate();
2963	3319
2964	3320	return;
2965		- } else if (event.getSource() == toggleRandomItem)
	3321	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2966	3322	{
2967		- cameraView.ToggleRandom();
	3323	+ cameraView.ToggleSwitch();
2968	3324	cameraView.repaint();
2969	3325	return;
2970	3326	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2992,12 +3348,17 @@
2992	3348	} else if (event.getSource() == liveCB)
2993	3349	{
2994	3350	copy.live ^= true;
	3351	+ objEditor.refreshContents(true); // To show item colors
	3352	+ return;
	3353	+ } else if (event.getSource() == selectableCB)
	3354	+ {
	3355	+ copy.dontselect ^= true;
2995	3356	return;
2996	3357	} else if (event.getSource() == hideCB)
2997	3358	{
2998	3359	copy.hide ^= true;
2999	3360	copy.Touch(); // display list issue
3000		- objEditor.refreshContents();
	3361	+ objEditor.refreshContents(true); // To show item colors
3001	3362	return;
3002	3363	} else if (event.getSource() == link2masterCB)
3003	3364	{
..	..	@@ -3007,6 +3368,7 @@
3007	3368	if (event.getSource() == randomCB)
3008	3369	{
3009	3370	copy.random ^= true;
	3371	+ objEditor.refreshContents();
3010	3372	return;
3011	3373	}
3012	3374	if (event.getSource() == speedupCB)
..	..	@@ -3030,8 +3392,9 @@
3030	3392
3031	3393	public void actionPerformed(ActionEvent event)
3032	3394	{
	3395	+ Object source = event.getSource();
3033	3396	// SCRIPT DIALOG
3034		- if (event.getSource() == okbutton)
	3397	+ if (source == okbutton)
3035	3398	{
3036	3399	textpanel.setVisible(false);
3037	3400	textpanel.remove(textarea);
..	..	@@ -3043,7 +3406,7 @@
3043	3406	textarea = null;
3044	3407	textpanel = null;
3045	3408	}
3046		- if (event.getSource() == cancelbutton)
	3409	+ if (source == cancelbutton)
3047	3410	{
3048	3411	textpanel.setVisible(false);
3049	3412	textpanel.remove(textarea);
..	..	@@ -3055,49 +3418,50 @@
3055	3418	//applySelf();
3056	3419	//client.refreshEditWindow();
3057	3420	//refreshContents();
3058		- if (event.getSource() == nameField)
	3421	+ if (source == nameField)
3059	3422	{
3060	3423	//System.out.println("ObjEditor " + event);
3061	3424	applySelf0(true);
3062	3425	//parent.applySelf();
3063	3426	objEditor.refreshContents();
3064		- } else if (event.getSource() == resetButton)
	3427	+ } else if (source == resetButton)
3065	3428	{
3066	3429	CameraPane.fullreset = true;
3067	3430	copy.Reset(); // ResetMeshes();
3068	3431	copy.Touch();
3069	3432	objEditor.refreshContents();
3070		- } else if (event.getSource() == stepItem)
	3433	+ } else if (source == stepItem)
3071	3434	{
3072		- cameraView.ONESTEP = true;
	3435	+ //cameraView.ONESTEP = true;
	3436	+ Globals.ONESTEP = true;
3073	3437	cameraView.repaint();
3074	3438	return;
3075		- } else if (event.getSource() == stepButton)
	3439	+ } else if (source == stepButton)
3076	3440	{
3077	3441	copy.Step();
3078	3442	copy.Touch();
3079	3443	objEditor.refreshContents();
3080		- } else if (event.getSource() == slowerButton)
	3444	+ } else if (source == slowerButton)
3081	3445	{
3082	3446	copy.Slower();
3083	3447	copy.Touch();
3084	3448	objEditor.refreshContents();
3085		- } else if (event.getSource() == fasterButton)
	3449	+ } else if (source == fasterButton)
3086	3450	{
3087	3451	copy.Faster();
3088	3452	copy.Touch();
3089	3453	objEditor.refreshContents();
3090		- } else if (event.getSource() == remarkButton)
	3454	+ } else if (source == remarkButton)
3091	3455	{
3092	3456	copy.Remark();
3093	3457	copy.Touch();
3094	3458	objEditor.refreshContents();
3095		- } else if (event.getSource() == stepAllButton)
	3459	+ } else if (source == stepAllButton)
3096	3460	{
3097	3461	copy.StepAll();
3098	3462	copy.Touch();
3099	3463	objEditor.refreshContents();
3100		- } else if (event.getSource() == resetAllButton)
	3464	+ } else if (source == resetAllButton)
3101	3465	{
3102	3466	//CameraPane.fullreset = true;
3103	3467	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3130,53 +3494,79 @@
3130	3494	// Close();
3131	3495	// }
3132	3496	// else
3133		- if (event.getSource() == resetSlidersButton)
	3497	+ if (source == resetSlidersButton)
3134	3498	{
3135	3499	ResetSliders();
3136		- } else if (event.getSource() == clearMaterialButton)
	3500	+ } else if (source == clearMaterialButton)
3137	3501	{
3138	3502	ClearMaterial();
3139		- } else if (event.getSource() == createMaterialButton)
	3503	+ } else if (source == createMaterialButton)
3140	3504	{
3141	3505	CreateMaterial();
3142		- } else if (event.getSource() == clearPanelButton)
	3506	+ } else if (source == clearPanelButton)
3143	3507	{
3144	3508	copy.ClearUI();
3145	3509	refreshContents(true);
3146		- } /*
3147		- }
3148		-
3149		- public boolean action(Event event, Object arg)
3150		- {
3151		- */ else if (event.getSource() == closeItem)
	3510	+ } else if (source == importGFDItem)
	3511	+ {
	3512	+ ImportGFD();
	3513	+ } else
	3514	+ if (source == importVRMLX3DItem)
	3515	+ {
	3516	+ ImportVRMLX3D();
	3517	+ } else
	3518	+ if (source == import3DSItem)
	3519	+ {
	3520	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3521	+ } else
	3522	+ if (source == importOBJItem)
	3523	+ {
	3524	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3525	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3526	+ browser.setVisible(true);
	3527	+ String filename = browser.getFile();
	3528	+ if (filename != null && filename.length() > 0)
	3529	+ {
	3530	+ String fullname = browser.getDirectory() + filename;
	3531	+ makeSomething(ReadOBJ(fullname), true);
	3532	+ }
	3533	+ } else
	3534	+ if (source == closeItem)
3152	3535	{
3153	3536	Close();
3154	3537	//return true;
3155		- } else if (event.getSource() == loadItem)
	3538	+ } else if (source == openItem)
3156	3539	{
3157		- load();
	3540	+ Open();
3158	3541	//return true;
3159		- } else if (event.getSource() == saveItem)
	3542	+ } else if (source == newItem)
	3543	+ {
	3544	+ New();
	3545	+ } else if (source == saveItem)
3160	3546	{
3161	3547	save();
3162	3548	//return true;
3163		- } else if (event.getSource() == saveAsItem)
	3549	+ } else if (source == saveAsItem)
3164	3550	{
3165	3551	saveAs();
3166	3552	//return true;
3167		- } else if (event.getSource() == reexportItem)
	3553	+ } else if (source == reexportItem)
3168	3554	{
3169	3555	reexport();
3170	3556	//return true;
3171		- } else if (event.getSource() == exportAsItem)
	3557	+ } else if (source == exportAsItem)
3172	3558	{
3173	3559	export();
3174	3560	//return true;
3175		- } else if (event.getSource() == povItem)
	3561	+ } else if (source == povItem)
3176	3562	{
3177	3563	generatePOV();
3178	3564	//return true;
3179		- } else if (event.getSource() == zBufferItem)
	3565	+ } else if (event.getSource() == archiveItem)
	3566	+ {
	3567	+ cTools.Archive(frame);
	3568	+ return;
	3569	+ } else if (source == zBufferItem)
3180	3570	{
3181	3571	try
3182	3572	{
..	..	@@ -3198,21 +3588,8 @@
3198	3588	cameraView.repaint();
3199	3589	//return true;
3200	3590	}
3201		- */ else if (event.getSource() == editCameraItem)
3202		- {
3203		- cameraView.ProtectCamera();
3204		- cameraView.repaint();
3205		- return;
3206		- } else if (event.getSource() == revertCameraItem)
3207		- {
3208		- cameraView.RevertCamera();
3209		- cameraView.repaint();
3210		- return;
3211		- } else if (event.getSource() == textureButton)
3212		- {
3213		- return; // true;
3214		- } else // combos...
3215		- if (event.getSource() == texresMenu)
	3591	+ */ else // combos...
	3592	+ if (source == texresMenu)
3216	3593	{
3217	3594	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3218	3595	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3224,27 +3601,463 @@
3224	3601	}
3225	3602	}
3226	3603
3227		- void ToggleAnimation()
	3604	+ void New()
3228	3605	{
3229		- if (!CameraPane.ANIMATION)
	3606	+ while (copy.Size() > 1)
3230	3607	{
3231		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3608	+ copy.remove(1);
	3609	+ }
	3610	+
	3611	+ ResetModel();
	3612	+ objEditor.refreshContents();
	3613	+ }
	3614	+
	3615	+ static public byte[] Compress(Object3D o)
	3616	+ {
	3617	+ // Slower to actually compress.
	3618	+ try
	3619	+ {
	3620	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3621	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3622	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3623	+
	3624	+ Object3D parent = o.parent;
	3625	+ o.parent = null;
	3626	+
	3627	+ out.writeObject(o);
	3628	+
	3629	+ o.parent = parent;
	3630	+
	3631	+ out.flush();
	3632	+
	3633	+ baos //zstream
	3634	+ .close();
	3635	+ out.close();
	3636	+
	3637	+ byte[] bytes = baos.toByteArray();
	3638	+
	3639	+ System.out.println("save #bytes = " + bytes.length);
	3640	+ return bytes;
	3641	+ } catch (Exception e)
	3642	+ {
	3643	+ System.err.println(e);
	3644	+ return null;
	3645	+ }
	3646	+ }
	3647	+
	3648	+ static public Object Uncompress(byte[] bytes)
	3649	+ {
	3650	+ System.out.println("restore #bytes = " + bytes.length);
	3651	+ try
	3652	+ {
	3653	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3654	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3655	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3656	+ Object obj = in.readObject();
	3657	+
	3658	+ bais //istream
	3659	+ .close();
	3660	+ in.close();
	3661	+
	3662	+ return obj;
	3663	+ } catch (Exception e)
	3664	+ {
	3665	+ System.err.println(e);
	3666	+ return null;
	3667	+ }
	3668	+ }
	3669	+
	3670	+ static public Object clone(Object o)
	3671	+ {
	3672	+ try
	3673	+ {
	3674	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3675	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3676	+
	3677	+ out.writeObject(o);
	3678	+
	3679	+ out.flush();
	3680	+ out.close();
	3681	+
	3682	+ byte[] bytes = baos.toByteArray();
	3683	+
	3684	+ System.out.println("clone = " + bytes.length);
	3685	+
	3686	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3687	+ ObjectInputStream in = new ObjectInputStream(bais);
	3688	+ Object obj = in.readObject();
	3689	+ in.close();
	3690	+
	3691	+ return obj;
	3692	+ } catch (Exception e)
	3693	+ {
	3694	+ System.err.println(e);
	3695	+ return null;
	3696	+ }
	3697	+ }
	3698	+
	3699	+ cRadio GetCurrentTab()
	3700	+ {
	3701	+ cRadio ab;
	3702	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3703	+ {
	3704	+ ab = (cRadio)e.nextElement();
	3705	+ if(ab.GetObject() == copy)
	3706	+ {
	3707	+ return ab;
	3708	+ }
	3709	+ }
	3710	+
	3711	+ return null;
	3712	+ }
	3713	+
	3714	+
	3715	+ public void Save()
	3716	+ {
	3717	+ //Save(true);
	3718	+ Replace();
	3719	+ SetUndoStates();
	3720	+ }
	3721	+
	3722	+ private boolean Equal(byte[] compress, byte[] name)
	3723	+ {
	3724	+ if (compress.length != name.length)
	3725	+ {
	3726	+ return false;
	3727	+ }
	3728	+
	3729	+ for (int i=compress.length; --i>=0;)
	3730	+ {
	3731	+ if (compress[i] != name[i])
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ return true;
	3736	+ }
	3737	+
	3738	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3739	+
	3740	+ public boolean Save(boolean user)
	3741	+ {
	3742	+ System.err.println("Save");
	3743	+ Replace();
	3744	+
	3745	+ cRadio tab = GetCurrentTab();
	3746	+
	3747	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
	3748	+
	3749	+ boolean thesame = false;
	3750	+
	3751	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3752	+// {
	3753	+// thesame = true;
	3754	+// }
	3755	+
	3756	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3757	+ if (!thesame)
	3758	+ {
	3759	+ //tab.user[tab.versionindex] = user;
	3760	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3761	+
	3762	+ copy.versionlist[++copy.versionindex] = compress;
	3763	+
	3764	+ // if (increment)
	3765	+ // tab.versionindex++;
	3766	+ }
	3767	+
	3768	+ //copy.RestoreBigData(versiontable);
	3769	+
	3770	+ //assert(hashtable.isEmpty());
	3771	+
	3772	+ for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3773	+ {
	3774	+ //tab.user[i] = false;
	3775	+ copy.versionlist[i] = null;
	3776	+ }
	3777	+
	3778	+ SetUndoStates();
	3779	+
	3780	+ // test save
	3781	+ if (false)
	3782	+ {
	3783	+ try
	3784	+ {
	3785	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3786	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3787	+
	3788	+ p.writeObject(copy);
	3789	+
	3790	+ p.flush();
	3791	+
	3792	+ ostream.close();
	3793	+ } catch (Exception e)
	3794	+ {
	3795	+ e.printStackTrace();
	3796	+ }
	3797	+ }
	3798	+
	3799	+ return !thesame;
	3800	+ }
	3801	+
	3802	+ boolean flashIt = true;
	3803	+
	3804	+ void RefreshSelection()
	3805	+ {
	3806	+ Object3D selection = new Object3D();
	3807	+
	3808	+ for (int i = 0; i < copy.selection.size(); i++)
	3809	+ {
	3810	+ Object3D elem = copy.selection.elementAt(i);
	3811	+
	3812	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3813	+
	3814	+ if (obj == null)
	3815	+ {
	3816	+ copy.selection.remove(i--);
	3817	+ }
	3818	+ else
	3819	+ {
	3820	+ selection.add(obj);
	3821	+ copy.selection.setElementAt(obj, i);
	3822	+ }
	3823	+ }
	3824	+
	3825	+ flashIt = false;
	3826	+ GetTree().clearSelection();
	3827	+ for (int i = 0; i < selection.size(); i++)
	3828	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3829	+ flashIt = true;
	3830	+
	3831	+ refreshContents(false);
	3832	+ }
	3833	+
	3834	+ void CopyChanged(Object3D obj)
	3835	+ {
	3836	+ SetUndoStates();
	3837	+
	3838	+ boolean temp = CameraPane.SWITCH;
	3839	+ CameraPane.SWITCH = false;
	3840	+
	3841	+ copy.ExtractBigData(versiontable);
	3842	+
	3843	+ copy.clear();
	3844	+
	3845	+ copy.skyboxname = obj.skyboxname;
	3846	+ copy.skyboxext = obj.skyboxext;
	3847	+
	3848	+ for (int i=0; i<obj.Size(); i++)
	3849	+ {
	3850	+ copy.add(obj.get(i));
	3851	+ }
	3852	+
	3853	+ copy.RestoreBigData(versiontable);
	3854	+
	3855	+ CameraPane.SWITCH = temp;
	3856	+
	3857	+ RefreshSelection();
	3858	+ //assert(hashtable.isEmpty());
	3859	+
	3860	+ copy.Touch();
	3861	+
	3862	+ ResetModel();
	3863	+ copy.HardTouch(); // recompile?
	3864	+
	3865	+ cRadio ab;
	3866	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3867	+ {
	3868	+ ab = (cRadio)e.nextElement();
	3869	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3870	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3871	+ if (test != null)
	3872	+ {
	3873	+ test.editWindow = ab.object.editWindow;
	3874	+ ab.object = test;
	3875	+ }
	3876	+ }
	3877	+
	3878	+ refreshContents();
	3879	+ }
	3880	+
	3881	+ cButton undoButton;
	3882	+ cButton restoreButton;
	3883	+ cButton replaceButton;
	3884	+ cButton redoButton;
	3885	+
	3886	+ boolean muteSlider;
	3887	+
	3888	+ int VersionCount()
	3889	+ {
	3890	+ int count = 0;
	3891	+
	3892	+ for (int i = copy.versionlist.length; --i >= 0;)
	3893	+ {
	3894	+ if (copy.versionlist[i] != null)
	3895	+ count++;
	3896	+ }
	3897	+
	3898	+ return count;
	3899	+ }
	3900	+
	3901	+ void SetUndoStates()
	3902	+ {
	3903	+ cRadio tab = GetCurrentTab();
	3904	+
	3905	+ restoreButton.setEnabled(copy.versionindex != -1);
	3906	+ replaceButton.setEnabled(copy.versionindex != -1);
	3907	+
	3908	+ undoButton.setEnabled(copy.versionindex > 0);
	3909	+ redoButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3910	+
	3911	+ muteSlider = true;
	3912	+ versionSlider.setMaximum(VersionCount() - 1);
	3913	+ versionSlider.setInteger(copy.versionindex);
	3914	+ muteSlider = false;
	3915	+ }
	3916	+
	3917	+ public boolean Undo()
	3918	+ {
	3919	+ // Option?
	3920	+ Replace();
	3921	+
	3922	+ System.err.println("Undo");
	3923	+
	3924	+ cRadio tab = GetCurrentTab();
	3925	+
	3926	+ if (copy.versionindex == 0)
	3927	+ {
	3928	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3929	+ return false;
	3930	+ }
	3931	+
	3932	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3933	+// {
	3934	+// if (Save(false))
	3935	+// tab.versionindex -= 1;
	3936	+// else
	3937	+// {
	3938	+// if (tab.versionindex <= 0)
	3939	+// return false;
	3940	+// else
	3941	+// tab.versionindex -= 1;
	3942	+// }
	3943	+// }
	3944	+
	3945	+ copy.versionindex -= 1;
	3946	+
	3947	+ CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
	3948	+
	3949	+ return true;
	3950	+ }
	3951	+
	3952	+ public boolean Restore()
	3953	+ {
	3954	+ System.err.println("Restore");
	3955	+
	3956	+ cRadio tab = GetCurrentTab();
	3957	+
	3958	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3959	+ {
	3960	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3961	+ return false;
	3962	+ }
	3963	+
	3964	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3965	+ CopyChanged(copy.versionlist[copy.versionindex]);
	3966	+
	3967	+ return true;
	3968	+ }
	3969	+
	3970	+ public boolean Replace()
	3971	+ {
	3972	+ System.err.println("Replace");
	3973	+
	3974	+ cRadio tab = GetCurrentTab();
	3975	+
	3976	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3977	+ {
	3978	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3979	+ return false;
	3980	+ }
	3981	+
	3982	+ copy.versionlist[copy.versionindex] = CompressCopy();
	3983	+
	3984	+ return true;
	3985	+ }
	3986	+
	3987	+ public void Redo()
	3988	+ {
	3989	+ // Option?
	3990	+ Replace();
	3991	+
	3992	+ cRadio tab = GetCurrentTab();
	3993	+
	3994	+ if (copy.versionlist[copy.versionindex + 1] == null)
	3995	+ {
	3996	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3997	+ return;
	3998	+ }
	3999	+
	4000	+ copy.versionindex += 1;
	4001	+
	4002	+ CopyChanged(copy.versionlist[copy.versionindex]);
	4003	+
	4004	+ //if (!tab.user[tab.versionindex])
	4005	+ // tab.graphs[tab.versionindex] = null;
	4006	+ }
	4007	+
	4008	+ void ImportGFD()
	4009	+ {
	4010	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3232	4011	browser.show();
3233	4012	String filename = browser.getFile();
3234	4013	if (filename != null && filename.length() > 0)
3235	4014	{
3236		- CameraPane.filename = browser.getDirectory() + filename;
	4015	+ String fullname = browser.getDirectory() + filename;
	4016	+
	4017	+ //Object3D readobj =
	4018	+ objEditor.ReadGFD(fullname, objEditor);
	4019	+ //makeSomething(readobj);
	4020	+ }
	4021	+ }
	4022	+
	4023	+ void ImportVRMLX3D()
	4024	+ {
	4025	+ if (Grafreed.standAlone)
	4026	+ {
	4027	+ /**/
	4028	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4029	+ browser.show();
	4030	+ String filename = browser.getFile();
	4031	+ if (filename != null && filename.length() > 0)
	4032	+ {
	4033	+ String fullname = browser.getDirectory() + filename;
	4034	+ LoadVRMLX3D(fullname);
	4035	+ }
	4036	+ /**/
	4037	+ }
	4038	+ }
	4039	+
	4040	+ void ToggleAnimation()
	4041	+ {
	4042	+ if (!Globals.ANIMATION)
	4043	+ {
	4044	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4045	+ browser.setVisible(true);
	4046	+ String filename = browser.getFile();
	4047	+ if (filename != null && filename.length() > 0)
	4048	+ {
	4049	+ Globals.filename = browser.getDirectory() + filename;
3237	4050	//CameraPane.framecount = 0;
3238		- CameraPane.imagecount = 0;
	4051	+ Globals.imagecount = 0;
3239	4052
3240		- CameraPane.ANIMATION ^= true;
	4053	+ Globals.ANIMATION ^= true;
3241	4054
3242		- GrafreeD.wav.cursor = 0;
3243		- GrafreeD.wav.loop = 0;
	4055	+ Grafreed.wav.cursor = 0;
	4056	+ Grafreed.wav.loop = 0;
3244	4057	}
3245	4058	} else
3246	4059	{
3247		- CameraPane.ANIMATION ^= true;
	4060	+ Globals.ANIMATION ^= true;
3248	4061	}
3249	4062	}
3250	4063
..	..	@@ -3290,7 +4103,7 @@
3290	4103	void CreateMaterial()
3291	4104	{
3292	4105	//copy.ClearMaterial(); // PATCH
3293		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4106	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3294	4107	if (copy.selection.size() > 0)
3295	4108	//SetMaterial(copy);
3296	4109	{
..	..	@@ -3341,7 +4154,7 @@
3341	4154	assert false;
3342	4155	}
3343	4156
3344		- void EditSelection()
	4157	+ void EditSelection(boolean newWindow)
3345	4158	{
3346	4159	}
3347	4160
..	..	@@ -3349,11 +4162,11 @@
3349	4162	{
3350	4163	copy.ResetBlockLoop(); // temporary problem
3351	4164
3352		- boolean random = CameraPane.RANDOM;
3353		- CameraPane.RANDOM = false; // parse everything
	4165	+ boolean random = CameraPane.SWITCH;
	4166	+ CameraPane.SWITCH = false; // parse everything
3354	4167	copy.ResetDisplayList();
3355	4168	copy.HardTouch();
3356		- CameraPane.RANDOM = random;
	4169	+ CameraPane.SWITCH = random;
3357	4170	}
3358	4171
3359	4172	// public void applySelf()
..	..	@@ -3400,7 +4213,7 @@
3400	4213	//copy.material = new cMaterial(copy.GetMaterial());
3401	4214
3402	4215	current.color = (float) colorField.getFloat();
3403		- current.modulation = (float) modulationField.getFloat();
	4216	+ current.modulation = (float) saturationField.getFloat();
3404	4217	current.metalness = (float) metalnessField.getFloat();
3405	4218	current.diffuse = (float) diffuseField.getFloat();
3406	4219	current.specular = (float) specularField.getFloat();
..	..	@@ -3423,10 +4236,40 @@
3423	4236	current.fakedepth = (float) fakedepthField.getFloat();
3424	4237	current.shadowbias = (float) shadowbiasField.getFloat();
3425	4238
3426		- if (!NumberSlider.frozen)
	4239	+ if (!cNumberSlider.frozen)
3427	4240	{
3428	4241	//System.out.println("Propagate = " + propagate);
3429	4242	copy.UpdateMaterial(anchor, current, propagate);
	4243	+
	4244	+ if (copy.material != null)
	4245	+ {
	4246	+ cMaterial mat = copy.material;
	4247	+
	4248	+ colorField.SetToolTipValue((mat.color));
	4249	+ saturationField.SetToolTipValue((mat.modulation));
	4250	+ metalnessField.SetToolTipValue((mat.metalness));
	4251	+ diffuseField.SetToolTipValue((mat.diffuse));
	4252	+ specularField.SetToolTipValue((mat.specular));
	4253	+ shininessField.SetToolTipValue((mat.shininess));
	4254	+ shiftField.SetToolTipValue((mat.shift));
	4255	+ ambientField.SetToolTipValue((mat.ambient));
	4256	+ lightareaField.SetToolTipValue((mat.lightarea));
	4257	+ diffusenessField.SetToolTipValue((mat.factor));
	4258	+ velvetField.SetToolTipValue((mat.velvet));
	4259	+ sheenField.SetToolTipValue((mat.sheen));
	4260	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4261	+ backlitField.SetToolTipValue((mat.bump));
	4262	+ anisoField.SetToolTipValue((mat.aniso));
	4263	+ anisoVField.SetToolTipValue((mat.anisoV));
	4264	+ cameraField.SetToolTipValue((mat.cameralight));
	4265	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4266	+ shadowField.SetToolTipValue((mat.shadow));
	4267	+ textureField.SetToolTipValue((mat.texture));
	4268	+ opacityField.SetToolTipValue((mat.opacity));
	4269	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4270	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4271	+ }
	4272	+
3430	4273	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3431	4274	{
3432	4275	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3455,9 +4298,25 @@
3455	4298	//copy.Touch();
3456	4299	}
3457	4300
	4301	+ cNumberSlider versionSlider;
	4302	+
3458	4303	public void stateChanged(ChangeEvent e)
3459	4304	{
3460	4305	// assert(false);
	4306	+ if (e.getSource() == versionSlider)
	4307	+ {
	4308	+ if (muteSlider)
	4309	+ return;
	4310	+
	4311	+ int version = versionSlider.getInteger();
	4312	+
	4313	+ if (copy.versionlist[version] != null)
	4314	+ {
	4315	+ CopyChanged(copy.versionlist[copy.versionindex = version]);
	4316	+ }
	4317	+
	4318	+ return;
	4319	+ }
3461	4320
3462	4321	if (freezematerial)
3463	4322	{
..	..	@@ -3471,6 +4330,7 @@
3471	4330	\|\| e.getSource() == apertureField
3472	4331	\|\| e.getSource() == shadowblurField)
3473	4332	{
	4333	+ new Exception().printStackTrace();
3474	4334	System.exit(0);
3475	4335	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3476	4336	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3492,12 +4352,24 @@
3492	4352	{
3493	4353	//System.out.println("stateChanged = " + this);
3494	4354	materialtouched = true;
	4355	+
	4356	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4357	+ {
	4358	+ saturationField.setFloat(1);
	4359	+ }
	4360	+
3495	4361	applySelf();
3496	4362	//System.out.println("this = " + this);
3497	4363	//System.out.println("PARENT = " + parent);
3498	4364	//if (parent != null)
3499	4365	// parent.applySelf();
3500		- refreshContents();
	4366	+ if (e.getSource() == normalpushField)
	4367	+ {
	4368	+ objEditor.refreshContents();
	4369	+ //Refresh();
	4370	+ }
	4371	+ else
	4372	+ refreshContents();
3501	4373	// ??? client.refreshEditWindow();
3502	4374	}
3503	4375	//else
..	..	@@ -3509,7 +4381,7 @@
3509	4381	//group.name = nameField.getText();
3510	4382	//objEditor.applySelf();
3511	4383
3512		- assert (objEditor == this);
	4384	+ // OCT2018: assert (objEditor == this);
3513	4385	if (copy.selection == null \|\| copy.selection.size() == 0)
3514	4386	//super.applySelf()
3515	4387	; else
..	..	@@ -3533,12 +4405,18 @@
3533	4405	objEditor.copy = keep;
3534	4406	}
3535	4407	}
	4408	+
	4409	+ if (normalpushField != null)
	4410	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3536	4411	}
3537	4412
3538	4413	void SnapObject()
3539	4414	{
3540		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3541		- SnapObject(obj);
	4415	+ if (copy.selection.size() > 0)
	4416	+ {
	4417	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	4418	+ SnapObject(obj);
	4419	+ }
3542	4420	}
3543	4421
3544	4422	void SnapObject(Object3D obj)
..	..	@@ -3652,7 +4530,7 @@
3652	4530
3653	4531	if (obj.parent != null)
3654	4532	{
3655		- obj.parent.TransformToWorld(interest);
	4533	+// obj.parent.TransformToWorld(interest);
3656	4534	}
3657	4535
3658	4536	if (!CameraPane.TRACK)
..	..	@@ -3779,12 +4657,13 @@
3779	4657	{
3780	4658	if (GetTree() != null)
3781	4659	{
	4660	+ GetTree().revalidate();
3782	4661	GetTree().repaint();
3783	4662	}
3784	4663
3785	4664	radioPanel.revalidate();
3786	4665	radioPanel.repaint();
3787		- ctrlPanel.revalidate(); // ? new
	4666	+ ctrlPanel.validate(); // ? new
3788	4667	ctrlPanel.repaint();
3789	4668	}
3790	4669	}
..	..	@@ -3793,6 +4672,8 @@
3793	4672
3794	4673	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3795	4674	{
	4675	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4676	+ Save();
3796	4677	//Tween.set(thing, 0).target(1).start(tweenManager);
3797	4678	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3798	4679	// if (thing instanceof GenericJointDemo)
..	..	@@ -3879,6 +4760,12 @@
3879	4760	{
3880	4761	ResetModel();
3881	4762	Select(thing.GetTreePath(), true, false); // unselect... false);
	4763	+
	4764	+ if (thing.Size() == 0)
	4765	+ {
	4766	+ //EditSelection(false);
	4767	+ }
	4768	+
3882	4769	refreshContents();
3883	4770	}
3884	4771
..	..	@@ -3996,6 +4883,7 @@
3996	4883	}
3997	4884	}
3998	4885	}
	4886	+
3999	4887	LoadGFDThread loadGFDThread;
4000	4888
4001	4889	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4015,8 +4903,10 @@
4015	4903
4016	4904	try
4017	4905	{
	4906	+ // Try compressed version first.
4018	4907	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4019		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4908	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4909	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4020	4910
4021	4911	readobj = (Object3D) p.readObject();
4022	4912	istream.close();
..	..	@@ -4024,7 +4914,22 @@
4024	4914	readobj.ResetDisplayList();
4025	4915	} catch (Exception e)
4026	4916	{
4027		- e.printStackTrace();
	4917	+ if (!e.toString().contains("GZIP"))
	4918	+ e.printStackTrace();
	4919	+
	4920	+ try
	4921	+ {
	4922	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4923	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4924	+
	4925	+ readobj = (Object3D) p.readObject();
	4926	+ istream.close();
	4927	+
	4928	+ readobj.ResetDisplayList();
	4929	+ } catch (Exception e2)
	4930	+ {
	4931	+ e2.printStackTrace();
	4932	+ }
4028	4933	}
4029	4934	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4030	4935	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4070,6 +4975,12 @@
4070	4975
4071	4976	void LoadIt(Object obj)
4072	4977	{
	4978	+ if (obj == null)
	4979	+ {
	4980	+ // Invalid file
	4981	+ return;
	4982	+ }
	4983	+
4073	4984	System.out.println("Loaded " + obj);
4074	4985	//new Exception().printStackTrace();
4075	4986	Object3D readobj = (Object3D) obj;
..	..	@@ -4079,10 +4990,14 @@
4079	4990
4080	4991	if (readobj != null)
4081	4992	{
	4993	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4994	+ // Save();
4082	4995	try
4083	4996	{
4084	4997	//readobj.deepCopySelf(copy);
4085	4998	copy.clear(); // june 2014
	4999	+ copy.skyboxname = readobj.skyboxname;
	5000	+ copy.skyboxext = readobj.skyboxext;
4086	5001	for (int i = 0; i < readobj.size(); i++)
4087	5002	{
4088	5003	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4123,6 +5038,7 @@
4123	5038	}
4124	5039	} catch (ClassCastException e)
4125	5040	{
	5041	+ e.printStackTrace();
4126	5042	assert (false);
4127	5043	Composite c = (Composite) copy;
4128	5044	c.children.clear();
..	..	@@ -4133,15 +5049,26 @@
4133	5049	c.addChild(csg);
4134	5050	}
4135	5051
	5052	+ copy.versionlist = readobj.versionlist;
	5053	+ copy.versionindex = readobj.versionindex;
	5054	+
	5055	+ if (copy.versionlist == null)
	5056	+ {
	5057	+ copy.versionlist = new Object3D[100];
	5058	+ copy.versionindex = -1;
	5059	+ }
	5060	+
	5061	+ //? SetUndoStates();
	5062	+
4136	5063	ResetModel();
4137	5064	copy.HardTouch(); // recompile?
4138	5065	refreshContents();
4139	5066	}
4140	5067	}
4141	5068
4142		- void load() // throws ClassNotFoundException
	5069	+ void Open() // throws ClassNotFoundException
4143	5070	{
4144		- if (GrafreeD.standAlone)
	5071	+ if (Grafreed.standAlone)
4145	5072	{
4146	5073	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4147	5074	browser.show();
..	..	@@ -4228,11 +5155,13 @@
4228	5155	try
4229	5156	{
4230	5157	FileOutputStream ostream = new FileOutputStream(lastname);
4231		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5158	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5159	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4232	5160
4233	5161	p.writeObject(copy);
4234	5162	p.flush();
4235	5163
	5164	+ zstream.close();
4236	5165	ostream.close();
4237	5166
4238	5167	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4240,19 +5169,23 @@
4240	5169	//ps.print(buffer.toString());
4241	5170	} catch (IOException e)
4242	5171	{
	5172	+ e.printStackTrace();
4243	5173	}
4244	5174	}
	5175	+
4245	5176	String lastname;
4246	5177
4247	5178	void saveAs()
4248	5179	{
4249		- if (GrafreeD.standAlone)
	5180	+ if (Grafreed.standAlone)
4250	5181	{
4251	5182	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4252	5183	browser.setVisible(true);
4253	5184	String filename = browser.getFile();
4254	5185	if (filename != null && filename.length() > 0)
4255	5186	{
	5187	+ if (!filename.endsWith(".gfd"))
	5188	+ filename += ".gfd";
4256	5189	lastname = browser.getDirectory() + filename;
4257	5190	save();
4258	5191	}
..	..	@@ -4351,13 +5284,13 @@
4351	5284	try
4352	5285	{
4353	5286	FileOutputStream ostream = new FileOutputStream(filename);
4354		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4355		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5287	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5288	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4356	5289
4357	5290	Object3D objectparent = obj.parent;
4358	5291	obj.parent = null;
4359	5292
4360		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5293	+ Object3D object = (Object3D) Grafreed.clone(obj);
4361	5294
4362	5295	obj.parent = objectparent;
4363	5296
..	..	@@ -4369,8 +5302,8 @@
4369	5302	p.writeObject(object);
4370	5303	p.flush();
4371	5304
	5305	+ zstream.close();
4372	5306	ostream.close();
4373		- // zstream.close();
4374	5307
4375	5308	// group.selection.get(0).parent = parent;
4376	5309	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4391,7 +5324,7 @@
4391	5324	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4392	5325	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4393	5326	copy.generatePOV(buffer);
4394		- if (GrafreeD.standAlone)
	5327	+ if (Grafreed.standAlone)
4395	5328	{
4396	5329	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4397	5330	browser.show();
..	..	@@ -4417,53 +5350,70 @@
4417	5350	Object3D client;
4418	5351	Object3D copy;
4419	5352	MenuBar menuBar;
4420		- Menu windowMenu;
4421		- MenuItem loadItem;
	5353	+ Menu fileMenu;
	5354	+ MenuItem newItem;
	5355	+ MenuItem openItem;
4422	5356	MenuItem saveItem;
4423	5357	MenuItem saveAsItem;
4424	5358	MenuItem exportAsItem;
4425	5359	MenuItem reexportItem;
4426	5360	MenuItem povItem;
4427	5361	MenuItem closeItem;
4428		- Menu cameraMenu;
	5362	+
4429	5363	CheckboxMenuItem zBufferItem;
4430	5364	//MenuItem normalLensItem;
4431		- MenuItem editCameraItem;
4432		- MenuItem revertCameraItem;
4433		- CheckboxMenuItem toggleLiveItem;
4434	5365	MenuItem stepItem;
4435		- CheckboxMenuItem toggleFullItem;
	5366	+ CheckboxMenuItem toggleLiveItem;
	5367	+ CheckboxMenuItem toggleFullScreenItem;
	5368	+ CheckboxMenuItem toggleTimelineItem;
4436	5369	CheckboxMenuItem toggleRenderItem;
4437	5370	CheckboxMenuItem toggleDebugItem;
4438	5371	CheckboxMenuItem toggleFrustumItem;
4439	5372	CheckboxMenuItem toggleFootContactItem;
4440	5373	CheckboxMenuItem toggleDLItem;
4441	5374	CheckboxMenuItem toggleTextureItem;
4442		- CheckboxMenuItem toggleRandomItem;
	5375	+ CheckboxMenuItem toggleSwitchItem;
4443	5376	CheckboxMenuItem toggleRootItem;
4444	5377	CheckboxMenuItem animationItem;
	5378	+ MenuItem archiveItem;
4445	5379	CheckboxMenuItem toggleHandleItem;
4446	5380	CheckboxMenuItem togglePaintItem;
4447	5381	JSplitPane mainPanel;
4448	5382	JScrollPane scrollpane;
	5383	+
4449	5384	JPanel toolbarPanel;
4450		- JPanel treePanel;
	5385	+
	5386	+ cGridBag treePanel;
	5387	+
4451	5388	JPanel radioPanel;
4452	5389	ButtonGroup buttonGroup;
4453		- JPanel ctrlPanel;
4454		- JPanel materialPanel;
	5390	+
	5391	+ cGridBag toolboxPanel;
	5392	+ cGridBag materialPanel;
	5393	+ cGridBag ctrlPanel;
	5394	+
4455	5395	JScrollPane infoPanel;
4456		- JPanel optionsPanel;
	5396	+
	5397	+ cGridBag optionsPanel;
	5398	+
4457	5399	JTabbedPane objectPanel;
4458		- JPanel XYZPanel;
	5400	+ boolean materialFlushed;
	5401	+ Object3D latestObject;
	5402	+
	5403	+ cGridBag XYZPanel;
	5404	+
4459	5405	JSplitPane gridPanel;
4460	5406	JSplitPane bigPanel;
4461		- JPanel bigThree;
4462		- JTabbedPane jtp;
4463		- JPanel cameraPanel;
	5407	+
	5408	+ cGridBag bigThree;
	5409	+ cGridBag scenePanel;
	5410	+ cGridBag centralPanel;
	5411	+ JSplitPane cameraPanel;
	5412	+ JPanel timelinePanel;
	5413	+ JMenuBar timelineMenubar;
4464	5414	JSplitPane framePanel;
4465	5415	JTextArea/Field/ nameField;
4466		- cButton textureButton;
	5416	+ //cButton textureButton;
4467	5417	cButton okButton;
4468	5418	cButton applyButton;
4469	5419	cButton cancelButton;
..	..	@@ -4510,65 +5460,72 @@
4510	5460	// MATERIAL
4511	5461	JLabel materialLabel;
4512	5462	JLabel colorLabel;
4513		- NumberSlider colorField;
	5463	+ cNumberSlider colorField;
4514	5464	JLabel modulationLabel;
4515		- NumberSlider modulationField;
	5465	+ cNumberSlider saturationField;
4516	5466	JLabel metalnessLabel;
4517		- NumberSlider metalnessField;
	5467	+ cNumberSlider metalnessField;
4518	5468	JLabel diffuseLabel;
4519		- NumberSlider diffuseField;
	5469	+ cNumberSlider diffuseField;
4520	5470	JLabel specularLabel;
4521		- NumberSlider specularField;
	5471	+ cNumberSlider specularField;
4522	5472	JLabel shininessLabel;
4523		- NumberSlider shininessField;
	5473	+ cNumberSlider shininessField;
4524	5474	JLabel shiftLabel;
4525		- NumberSlider shiftField;
	5475	+ cNumberSlider shiftField;
4526	5476	JLabel ambientLabel;
4527		- NumberSlider ambientField;
	5477	+ cNumberSlider ambientField;
4528	5478	JLabel lightareaLabel;
4529		- NumberSlider lightareaField;
	5479	+ cNumberSlider lightareaField;
4530	5480	JLabel diffusenessLabel;
4531		- NumberSlider diffusenessField;
	5481	+ cNumberSlider diffusenessField;
4532	5482	JLabel velvetLabel;
4533		- NumberSlider velvetField;
	5483	+ cNumberSlider velvetField;
4534	5484	JLabel sheenLabel;
4535		- NumberSlider sheenField;
	5485	+ cNumberSlider sheenField;
4536	5486	JLabel subsurfaceLabel;
4537		- NumberSlider subsurfaceField;
	5487	+ cNumberSlider subsurfaceField;
4538	5488	//JLabel bumpLabel;
4539	5489	//NumberSlider bumpField;
4540	5490	JLabel backlitLabel;
4541		- NumberSlider backlitField;
	5491	+ cNumberSlider backlitField;
4542	5492	JLabel anisoLabel;
4543		- NumberSlider anisoField;
	5493	+ cNumberSlider anisoField;
4544	5494	JLabel anisoVLabel;
4545		- NumberSlider anisoVField;
	5495	+ cNumberSlider anisoVField;
4546	5496	JLabel cameraLabel;
4547		- NumberSlider cameraField;
	5497	+ cNumberSlider cameraField;
4548	5498	JLabel selfshadowLabel;
4549		- NumberSlider selfshadowField;
	5499	+ cNumberSlider selfshadowField;
4550	5500	JLabel shadowLabel;
4551		- NumberSlider shadowField;
	5501	+ cNumberSlider shadowField;
4552	5502	JLabel textureLabel;
4553		- NumberSlider textureField;
	5503	+ cNumberSlider textureField;
4554	5504	JLabel opacityLabel;
4555		- NumberSlider opacityField;
	5505	+ cNumberSlider opacityField;
4556	5506	JLabel fakedepthLabel;
4557		- NumberSlider fakedepthField;
	5507	+ cNumberSlider fakedepthField;
4558	5508	JLabel shadowbiasLabel;
4559		- NumberSlider shadowbiasField;
	5509	+ cNumberSlider shadowbiasField;
4560	5510	JLabel bumpLabel;
4561		- NumberSlider bumpField;
	5511	+ cNumberSlider bumpField;
4562	5512	JLabel noiseLabel;
4563		- NumberSlider noiseField;
	5513	+ cNumberSlider noiseField;
4564	5514	JLabel powerLabel;
4565		- NumberSlider powerField;
	5515	+ cNumberSlider powerField;
4566	5516	JLabel borderfadeLabel;
4567		- NumberSlider borderfadeField;
	5517	+ cNumberSlider borderfadeField;
4568	5518	JLabel fogLabel;
4569		- NumberSlider fogField;
	5519	+ cNumberSlider fogField;
4570	5520	JLabel opacityPowerLabel;
4571		- NumberSlider opacityPowerField;
4572		- JTree jTree;
	5521	+ cNumberSlider opacityPowerField;
	5522	+ cTree jTree;
4573	5523	//ObjectUI parent;
	5524	+
	5525	+ cNumberSlider normalpushField;
	5526	+
	5527	+ private MenuItem importGFDItem;
	5528	+ private MenuItem importVRMLX3DItem;
	5529	+ private MenuItem import3DSItem;
	5530	+ private MenuItem importOBJItem;
4574	5531	}