~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,9 +34,88 @@
28	34	iSendInfo
29	35	//KeyListener
30	36	{
	37	+ public cToggleButton pinButton;
31	38	boolean timeline;
32	39	boolean wasFullScreen;
33	40
	41	+ GroupEditor callee;
	42	+ JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
	53	+
	54	+ cButton GetButton(String name, boolean border)
	55	+ {
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
	64	+ }
	65	+
	66	+ cToggleButton GetToggleButton(String name, boolean border)
	67	+ {
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
	70	+ }
	71	+
	72	+ cCheckBox GetCheckBox(String name, boolean border)
	73	+ {
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
	80	+ try
	81	+ {
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
	98	+ }
	99	+ catch (Exception e)
	100	+ {
	101	+ return null;
	102	+ }
	103	+ }
	104	+
	105	+ BufferedImage GetImage(String name)
	106	+ {
	107	+ try
	108	+ {
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
	112	+ }
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
	117	+ }
	118	+
34	119	// SCRIPT
35	120
36	121	transient JFrame textpanel = null;
..	..	@@ -121,47 +206,54 @@
121	206	void keyPressed(int key, int modifiers)
122	207	{
123	208	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	209	+ Globals.theRenderer.keyPressed(key, modifiers);
125	210	}
126	211	*/
127	212
128	213	static GridBagConstraints aConstraints;
129	214	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	215	+
132	216	static int GRIDWIDTH = 100; // 4;
133	217
134	218	public void closeUI()
135	219	{
136	220	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	221	+// System.out.println("this = " + this);
	222	+// System.out.println("objEditor = " + objEditor);
139	223	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	224	+// objEditor.ctrlPanel.remove(nameField);
141	225
142		- if (!GroupEditor.allparams)
	226	+ objEditor.ctrlPanel.remove(namePanel);
	227	+
	228	+ if (!allparams)
143	229	return;
144	230
145		- objEditor.ctrlPanel.remove(liveCB);
146		- objEditor.ctrlPanel.remove(hideCB);
147		- objEditor.ctrlPanel.remove(markCB);
148		-
149		- objEditor.ctrlPanel.remove(randomCB);
150		- objEditor.ctrlPanel.remove(speedupCB);
151		- objEditor.ctrlPanel.remove(rewindCB);
152		-
153		- objEditor.ctrlPanel.remove(resetButton);
154		- objEditor.ctrlPanel.remove(stepButton);
155		-// objEditor.ctrlPanel.remove(stepAllButton);
156		-// objEditor.ctrlPanel.remove(resetAllButton);
157		- objEditor.ctrlPanel.remove(link2masterCB);
158		- //objEditor.ctrlPanel.remove(flipVCB);
159		- //objEditor.ctrlPanel.remove(texresMenu);
160		- objEditor.ctrlPanel.remove(slowerButton);
161		- objEditor.ctrlPanel.remove(fasterButton);
162		- objEditor.ctrlPanel.remove(remarkButton);
	231	+// objEditor.ctrlPanel.remove(liveCB);
	232	+// objEditor.ctrlPanel.remove(hideCB);
	233	+// objEditor.ctrlPanel.remove(markCB);
	234	+//
	235	+// objEditor.ctrlPanel.remove(randomCB);
	236	+// objEditor.ctrlPanel.remove(speedupCB);
	237	+// objEditor.ctrlPanel.remove(rewindCB);
	238	+//
	239	+// objEditor.ctrlPanel.remove(resetButton);
	240	+// objEditor.ctrlPanel.remove(stepButton);
	241	+//// objEditor.ctrlPanel.remove(stepAllButton);
	242	+//// objEditor.ctrlPanel.remove(resetAllButton);
	243	+// objEditor.ctrlPanel.remove(link2masterCB);
	244	+// //objEditor.ctrlPanel.remove(flipVCB);
	245	+// //objEditor.ctrlPanel.remove(texresMenu);
	246	+// objEditor.ctrlPanel.remove(slowerButton);
	247	+// objEditor.ctrlPanel.remove(fasterButton);
	248	+// objEditor.ctrlPanel.remove(remarkButton);
163	249
164		- Remove(normalpushField);
	250	+ objEditor.ctrlPanel.remove(setupPanel);
	251	+ objEditor.ctrlPanel.remove(setupPanel2);
	252	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	253	+ objEditor.ctrlPanel.remove(pushPanel);
	254	+ //objEditor.ctrlPanel.remove(fillPanel);
	255	+
	256	+ //Remove(normalpushField);
165	257	}
166	258
167	259	public ObjEditor GetEditor()
..	..	@@ -205,6 +297,14 @@
205	297	client = inClient;
206	298	copy = client;
207	299
	300	+// if (copy.versionlist == null)
	301	+// {
	302	+// copy.versionlist = new Object3D[100];
	303	+// copy.versionindex = -1;
	304	+//
	305	+// callee.Save(true);
	306	+// }
	307	+
208	308	// "this" is not called: SetupUI2(objEditor);
209	309	}
210	310
..	..	@@ -218,6 +318,14 @@
218	318	client = inClient;
219	319	copy = client;
220	320
	321	+ if (copy.versionlist == null)
	322	+ {
	323	+ copy.versionlist = new Object3D[100];
	324	+ copy.versionindex = -1;
	325	+
	326	+// Save(true);
	327	+ }
	328	+
221	329	SetupUI2(callee.GetEditor());
222	330	}
223	331
..	..	@@ -232,6 +340,7 @@
232	340	//localCopy.parent = null;
233	341
234	342	frame = new JFrame();
	343	+ frame.setUndecorated(false);
235	344	objEditor = this;
236	345	this.callee = callee;
237	346
..	..	@@ -249,6 +358,14 @@
249	358	copy = localCopy;
250	359	copy.editWindow = this;
251	360
	361	+// if (copy.versionlist == null)
	362	+// {
	363	+// copy.versionlist = new Object3D[100];
	364	+// copy.versionindex = -1;
	365	+//
	366	+// Save(true);
	367	+// }
	368	+
252	369	SetupMenu();
253	370
254	371	//SetupName(objEditor); // new
..	..	@@ -262,28 +379,49 @@
262	379	return frame.action(event, obj);
263	380	}
264	381
	382	+ // Cannot work without static
	383	+ static boolean allparams = true;
	384	+
	385	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	386	+
265	387	void SetupMenu()
266	388	{
267	389	frame.setMenuBar(menuBar = new MenuBar());
268		- menuBar.add(windowMenu = new Menu("File"));
269		- windowMenu.add(loadItem = new MenuItem("Load..."));
270		- windowMenu.add("-");
271		- windowMenu.add(saveItem = new MenuItem("Save"));
272		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	390	+ menuBar.add(fileMenu = new Menu("File"));
	391	+ fileMenu.add(newItem = new MenuItem("New"));
	392	+ fileMenu.add(openItem = new MenuItem("Open..."));
	393	+
	394	+ //oe.menuBar.add(menu = new Menu("Include"));
	395	+ Menu menu = new Menu("Import");
	396	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	397	+ importOBJItem.addActionListener(this);
	398	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	399	+ import3DSItem.addActionListener(this);
	400	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	401	+ importVRMLX3DItem.addActionListener(this);
	402	+ menu.add("-");
	403	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	404	+ importGFDItem.addActionListener(this);
	405	+ fileMenu.add(menu);
	406	+ fileMenu.add("-");
	407	+
	408	+ fileMenu.add(saveItem = new MenuItem("Save"));
	409	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
273	410	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
274		- windowMenu.add("-");
275		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
276		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
277		- windowMenu.add("-");
	411	+ fileMenu.add("-");
	412	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	413	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	414	+ fileMenu.add("-");
278	415	if (client.parent != null)
279	416	{
280		- windowMenu.add(closeItem = new MenuItem("Close"));
	417	+ fileMenu.add(closeItem = new MenuItem("Close"));
281	418	} else
282	419	{
283		- windowMenu.add(closeItem = new MenuItem("Exit"));
	420	+ fileMenu.add(closeItem = new MenuItem("Exit"));
284	421	}
285	422
286		- loadItem.addActionListener(this);
	423	+ newItem.addActionListener(this);
	424	+ openItem.addActionListener(this);
287	425	saveItem.addActionListener(this);
288	426	saveAsItem.addActionListener(this);
289	427	exportAsItem.addActionListener(this);
..	..	@@ -291,82 +429,71 @@
291	429	//povItem.addActionListener(this);
292	430	closeItem.addActionListener(this);
293	431
294		- menuBar.add(cameraMenu = new Menu("View"));
295		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
296		- //zBufferItem.addActionListener(this);
297		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
298		- //normalLensItem.addActionListener(this);
299		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
300		- revertCameraItem.addActionListener(this);
301		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
302		- toggleTimelineItem.addItemListener(this);
303		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
304		- toggleFullScreenItem.addItemListener(this);
305		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
306		- cameraMenu.add("-");
307		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
308		- toggleTextureItem.addItemListener(this);
309		- toggleTextureItem.setState(CameraPane.textureon);
310		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311		- toggleLiveItem.addItemListener(this);
312		- toggleLiveItem.setState(CameraPane.isLIVE());
313		- cameraMenu.add(stepItem = new MenuItem("Step"));
314		- stepItem.addActionListener(this);
315		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
316		-// toggleDLItem.addItemListener(this);
317		-// toggleDLItem.setState(false);
318		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
319		- toggleRenderItem.addItemListener(this);
320		- toggleRenderItem.setState(!CameraPane.frozen);
321		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
322		- toggleDebugItem.addItemListener(this);
323		- toggleDebugItem.setState(CameraPane.DEBUG);
324		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
325		- toggleFrustumItem.addItemListener(this);
326		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
327		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
328		- toggleFootContactItem.addItemListener(this);
329		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
330		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
331		- toggleRandomItem.addItemListener(this);
332		- toggleRandomItem.setState(CameraPane.RANDOM);
333		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
334		- toggleHandleItem.addItemListener(this);
335		- toggleHandleItem.setState(CameraPane.HANDLES);
336		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
337		- togglePaintItem.addItemListener(this);
338		- togglePaintItem.setState(CameraPane.PAINTMODE);
339		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
340		-// toggleRootItem.addItemListener(this);
341		-// toggleRootItem.setState(false);
342		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
343		-// animationItem.addItemListener(this);
344		-// animationItem.setState(CameraPane.ANIMATION);
345		- cameraMenu.add("-");
346		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
347		- editCameraItem.addActionListener(this);
348		-
349	432	objectPanel = new JTabbedPane();
	433	+
	434	+ ChangeListener changeListener = new ChangeListener()
	435	+ {
	436	+ public void stateChanged(ChangeEvent changeEvent)
	437	+ {
	438	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	439	+// {
	440	+// if (latestObject != null)
	441	+// {
	442	+// refreshContents(true);
	443	+// SetMaterial(latestObject);
	444	+// }
	445	+//
	446	+// materialFlushed = true;
	447	+// }
	448	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	449	+// {
	450	+// if (listUI.size() == 0)
	451	+// EditSelection(false);
	452	+// }
	453	+
	454	+// refreshContents(false); // To refresh Info tab
	455	+ }
	456	+ };
	457	+ objectPanel.addChangeListener(changeListener);
	458	+
350	459	toolbarPanel = new JPanel();
351	460	toolbarPanel.setName("Toolbar");
352		- treePanel = new JPanel();
	461	+
	462	+ treePanel = new cGridBag();
353	463	treePanel.setName("Tree");
354		- ctrlPanel = new JPanel(); // new GridBagLayout());
355		- ctrlPanel.setName("Edit");
356		- materialPanel = new JPanel();
357		- materialPanel.setName("Material");
	464	+
	465	+ editPanel = new cGridBag().setVertical(true);
	466	+ //editPanel.setName("Edit");
	467	+
	468	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	469	+
	470	+ editCommandsPanel = new cGridBag();
	471	+ editPanel.add(editCommandsPanel);
	472	+ editPanel.add(ctrlPanel);
	473	+
	474	+ toolboxPanel = new cGridBag().setVertical(true);
	475	+ //toolboxPanel.setName("Toolbox");
	476	+
	477	+ skyboxPanel = new cGridBag().setVertical(true);
	478	+
	479	+ materialPanel = new cGridBag().setVertical(false);
	480	+ //materialPanel.setName("Material");
	481	+
358	482	/JTextPane/
359	483	infoarea = createTextPane();
	484	+ doc = infoarea.getStyledDocument();
	485	+
360	486	infoarea.setEditable(true);
361	487	SetText();
	488	+
362	489	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
363	490	// infoarea.setOpaque(false);
364	491	// //infoarea.setForeground(textcolor);
365		- infoarea.setLineWrap(true);
366		- infoarea.setWrapStyleWord(true);
	492	+// TEXTAREA infoarea.setLineWrap(true);
	493	+// TEXTAREA infoarea.setWrapStyleWord(true);
367	494	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
368		- infoPanel.setPreferredSize(new Dimension(50, 200));
369		- infoPanel.setName("Info");
	495	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	496	+ //infoPanel.setName("Info");
370	497	//infoPanel.setLayout(new BorderLayout());
371	498	//infoPanel.add(createTextPane());
372	499
..	..	@@ -374,16 +501,23 @@
374	501	mainPanel.setName("Main");
375	502	mainPanel.setContinuousLayout(true);
376	503	mainPanel.setOneTouchExpandable(true);
377		- mainPanel.setDividerLocation(1.0);
378	504	mainPanel.setDividerSize(9);
379		- mainPanel.setResizeWeight(0);
380		-
	505	+ mainPanel.setDividerLocation(0.5); //1.0);
	506	+ mainPanel.setResizeWeight(0.5);
	507	+
	508	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	509	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	510	+ divider.setDividerSize(15);
	511	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	512	+
	513	+ mainPanel.setUI(new BasicSplitPaneUI());
	514	+
381	515	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
382	516	//mainPanel.setLayout(new GridBagLayout());
383	517	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384		- treePanel.setLayout(new GridBagLayout());
385		- ctrlPanel.setLayout(new GridBagLayout());
386		- materialPanel.setLayout(new GridBagLayout());
	518	+// treePanel.setLayout(new GridBagLayout());
	519	+ //ctrlPanel.setLayout(new GridBagLayout());
	520	+ //materialPanel.setLayout(new GridBagLayout());
387	521
388	522	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389	523	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -422,7 +556,7 @@
422	556	static String newline = "\n";
423	557	protected static final String buttonString = "JButton";
424	558	StyledDocument doc;
425		- JTextArea infoarea;
	559	+ JTextPane infoarea;
426	560
427	561	void ClearInfo()
428	562	{
..	..	@@ -445,10 +579,10 @@
445	579	e.printStackTrace();
446	580	}
447	581
448		- String selection = infoarea.getText();
449		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
450		- java.awt.datatransfer.Clipboard clipboard =
451		- Toolkit.getDefaultToolkit().getSystemClipboard();
	582	+// String selection = infoarea.getText();
	583	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	584	+// java.awt.datatransfer.Clipboard clipboard =
	585	+// Toolkit.getDefaultToolkit().getSystemClipboard();
452	586	//clipboard.setContents(data, data);
453	587	}
454	588
..	..	@@ -471,13 +605,13 @@
471	605	//SendInfo("Name:", "bold");
472	606	if (sel.GetTextures() != null \|\| debug)
473	607	{
474		- si.SendInfo(sel.toString(), "bold");
	608	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
475	609	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
476	610	if (sel.Size() > 0)
477	611	{
478	612	si.SendInfo("#children = " + sel.Size(), "regular");
479	613	}
480		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	614	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
481	615	if (debug)
482	616	{
483	617	try
..	..	@@ -489,7 +623,10 @@
489	623	}
490	624
491	625	if (full)
492		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	626	+ {
	627	+ si.SendInfo(" BBox min: " + minima, "regular");
	628	+ si.SendInfo(" BBox max: " + maxima, "regular");
	629	+ }
493	630
494	631	if (sel.bRep != null)
495	632	{
..	..	@@ -516,7 +653,7 @@
516	653	}
517	654	if (sel.support != null)
518	655	{
519		- si.SendInfo(" support: " + sel.support, "regular");
	656	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
520	657	}
521	658	if (sel.scriptnode != null)
522	659	{
..	..	@@ -587,6 +724,9 @@
587	724	{
588	725	CameraPane.pointflow = (PointFlow) sel;
589	726	}
	727	+
	728	+ si.SendInfo("_____________________", "regular");
	729	+ si.SendInfo("", "regular");
590	730	}
591	731	}
592	732
..	..	@@ -602,68 +742,205 @@
602	742	}
603	743	}
604	744
	745	+//static GraphicsDevice device = GraphicsEnvironment
	746	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	747	+
	748	+ Rectangle keeprect;
	749	+ cRadio radio;
	750	+
	751	+cButton keepButton;
	752	+ cButton twoButton; // Full 3D
	753	+ cButton sixButton;
	754	+ cButton threeButton;
	755	+ cButton sevenButton;
	756	+ cButton fourButton; // full panel
	757	+ cButton oneButton; // full XYZ
	758	+ //cButton currentLayout;
	759	+
	760	+ boolean maximized;
	761	+
	762	+ cButton fullscreenLayout;
	763	+ cButton expandedLayout;
	764	+
	765	+ void Minimize()
	766	+ {
	767	+ frame.setState(Frame.ICONIFIED);
	768	+ frame.validate();
	769	+ }
	770	+
	771	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	772	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	773	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	774	+ void Maximize()
	775	+ {
	776	+ if (CameraPane.FULLSCREEN)
	777	+ {
	778	+ ToggleFullScreen();
	779	+ }
	780	+
	781	+ if (maximized)
	782	+ {
	783	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	784	+ }
	785	+ else
	786	+ {
	787	+ keeprect = frame.getBounds();
	788	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	789	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	790	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	791	+// frame.setState(Frame.MAXIMIZED_BOTH);
	792	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	793	+ }
	794	+
	795	+ maximized ^= true;
	796	+
	797	+ frame.validate();
	798	+ }
	799	+
	800	+ cButton minButton;
	801	+ cButton maxButton;
	802	+ cButton fullButton;
	803	+ cButton collapseButton;
	804	+ cButton maximize3DButton;
	805	+
605	806	void ToggleFullScreen()
606	807	{
607		- if (CameraPane.FULLSCREEN)
	808	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	809	+
	810	+ cameraView.ToggleFullScreen();
	811	+
	812	+ if (!CameraPane.FULLSCREEN)
608	813	{
609		- frame.getContentPane().remove(/"Center",/bigThree);
610		- framePanel.add(bigThree);
611		- frame.getContentPane().add(/"Center",/framePanel);
	814	+ device.setFullScreenWindow(null);
	815	+ frame.dispose();
	816	+ frame.setUndecorated(false);
	817	+ frame.validate();
	818	+ frame.setVisible(true);
	819	+
	820	+ //frame.setVisible(false);
	821	+// frame.removeNotify();
	822	+// frame.setUndecorated(false);
	823	+// frame.addNotify();
	824	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	825	+
	826	+// X frame.getContentPane().remove(/"Center",/bigThree);
	827	+// X framePanel.add(bigThree);
	828	+// X frame.getContentPane().add(/"Center",/framePanel);
	829	+// framePanel.setDividerLocation(46); // icons are 24x24
	830	+
	831	+ //frame.setVisible(true);
	832	+// radio.layout = keepButton;
	833	+ //theFrame = null;
	834	+ keepButton = null;
	835	+// radio.layout.doClick();
	836	+
612	837	} else
613	838	{
614		- frame.getContentPane().remove(/"Center",/framePanel);
615		- framePanel.remove(bigThree);
616		- frame.getContentPane().add(/"Center",/bigThree);
	839	+ keepButton = radio.layout;
	840	+ //keeprect = frame.getBounds();
	841	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	842	+// frame.getToolkit().getScreenSize().height);
	843	+ //frame.setVisible(false);
	844	+
	845	+ frame.dispose();
	846	+ frame.setUndecorated(true);
	847	+ device.setFullScreenWindow(frame);
	848	+ frame.validate();
	849	+ frame.setVisible(true);
	850	+// frame.removeNotify();
	851	+// frame.setUndecorated(true);
	852	+// frame.addNotify();
	853	+// X frame.getContentPane().remove(/"Center",/framePanel);
	854	+// X framePanel.remove(bigThree);
	855	+// X frame.getContentPane().add(/"Center",/bigThree);
	856	+// framePanel.setDividerLocation(0);
	857	+
	858	+// radio.layout = fullscreenLayout;
	859	+// radio.layout.doClick();
	860	+ //frame.setVisible(true);
617	861	}
618		- cameraView.ToggleFullScreen();
	862	+ frame.validate();
	863	+
	864	+ cameraView.requestFocusInWindow();
619	865	}
620	866
621		- private JTextArea createTextPane()
	867	+ void CollapseToolbar()
	868	+ {
	869	+ framePanel.setDividerLocation(0);
	870	+ //frame.validate();
	871	+
	872	+ cameraView.requestFocusInWindow();
	873	+ }
	874	+
	875	+ private Object3D Duplicate(Object3D object)
622	876	{
623		- String[] initString =
624		- {
625		- "This is an editable JTextPane, ", //regular
626		- "another ", //italic
627		- "styled ", //bold
628		- "text ", //small
629		- "component, ", //large
630		- "which supports embedded components..." + newline,//regular
631		- " " + newline, //button
632		- "...and embedded icons..." + newline, //regular
633		- " ", //icon
634		- newline + "JTextPane is a subclass of JEditorPane that "
635		- + "uses a StyledEditorKit and StyledDocument, and provides "
636		- + "cover methods for interacting with those objects."
637		- };
	877	+ boolean temp = CameraPane.SWITCH;
	878	+ CameraPane.SWITCH = false;
	879	+
	880	+ object.ExtractBigData(versiontable);
	881	+ // if (copy == client)
	882	+
	883	+ Object3D versions[] = object.versionlist;
	884	+ object.versionlist = null;
	885	+
	886	+ //byte[] compress = Compress(copy);
	887	+ Object3D compress = (Object3D)Grafreed.clone(object);
	888	+
	889	+ object.versionlist = versions;
	890	+
	891	+ object.RestoreBigData(versiontable);
	892	+
	893	+ CameraPane.SWITCH = temp;
	894	+
	895	+ return compress;
	896	+ }
638	897
639		- String[] initStyles =
640		- {
641		- "regular", "italic", "bold", "small", "large",
642		- "regular", "button", "regular", "icon",
643		- "regular"
644		- };
	898	+ private JTextPane createTextPane()
	899	+ {
	900	+// TEXTAREA String[] initString =
	901	+// {
	902	+// "This is an editable JTextPane, ", //regular
	903	+// "another ", //italic
	904	+// "styled ", //bold
	905	+// "text ", //small
	906	+// "component, ", //large
	907	+// "which supports embedded components..." + newline,//regular
	908	+// " " + newline, //button
	909	+// "...and embedded icons..." + newline, //regular
	910	+// " ", //icon
	911	+// newline + "JTextPane is a subclass of JEditorPane that "
	912	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	913	+// + "cover methods for interacting with those objects."
	914	+// };
	915	+//
	916	+// String[] initStyles =
	917	+// {
	918	+// "regular", "italic", "bold", "small", "large",
	919	+// "regular", "button", "regular", "icon",
	920	+// "regular"
	921	+// };
	922	+//
	923	+// JTextPane textPane = new JTextPane();
	924	+// textPane.setEditable(true);
	925	+// /StyledDocument/ doc = textPane.getStyledDocument();
	926	+// addStylesToDocument(doc);
	927	+//
	928	+// try
	929	+// {
	930	+// for (int j = 0; j < 2; j++)
	931	+// {
	932	+// for (int i = 0; i < initString.length; i++)
	933	+// {
	934	+// doc.insertString(doc.getLength(), initString[i],
	935	+// doc.getStyle(initStyles[i]));
	936	+// }
	937	+// }
	938	+// } catch (BadLocationException ble)
	939	+// {
	940	+// System.err.println("Couldn't insert initial text into text pane.");
	941	+// }
645	942
646		- JTextPane textPane = new JTextPane();
647		- textPane.setEditable(true);
648		- /StyledDocument/ doc = textPane.getStyledDocument();
649		- addStylesToDocument(doc);
650		-
651		- try
652		- {
653		- for (int j = 0; j < 2; j++)
654		- {
655		- for (int i = 0; i < initString.length; i++)
656		- {
657		- doc.insertString(doc.getLength(), initString[i],
658		- doc.getStyle(initStyles[i]));
659		- }
660		- }
661		- } catch (BadLocationException ble)
662		- {
663		- System.err.println("Couldn't insert initial text into text pane.");
664		- }
665		-
666		- return new JTextArea(); // textPane;
	943	+ return new JTextPane(); // textPane;
667	944	}
668	945
669	946	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -716,7 +993,7 @@
716	993	protected static ImageIcon createImageIcon(String path,
717	994	String description)
718	995	{
719		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	996	+ java.net.URL imgURL = Grafreed.class.getResource(path);
720	997	if (imgURL != null)
721	998	{
722	999	return new ImageIcon(imgURL, description);
..	..	@@ -739,6 +1016,7 @@
739	1016	{
740	1017	SetupMaterial(materialPanel);
741	1018	}
	1019	+
742	1020	//SetupName();
743	1021	//SetupViews();
744	1022	}
..	..	@@ -748,6 +1026,7 @@
748	1026	// NumberSlider vDivsField;
749	1027	// JCheckBox endcaps;
750	1028	JCheckBox liveCB;
	1029	+ JCheckBox selectableCB;
751	1030	JCheckBox hideCB;
752	1031	JCheckBox link2masterCB;
753	1032	JCheckBox markCB;
..	..	@@ -755,7 +1034,12 @@
755	1034	JCheckBox speedupCB;
756	1035	JCheckBox rewindCB;
757	1036	JCheckBox flipVCB;
	1037	+
	1038	+ cCheckBox toggleTextureCB;
	1039	+ cCheckBox toggleSwitchCB;
	1040	+
758	1041	JComboBox texresMenu;
	1042	+
759	1043	JButton resetButton;
760	1044	JButton stepButton;
761	1045	JButton stepAllButton;
..	..	@@ -763,115 +1047,87 @@
763	1047	JButton slowerButton;
764	1048	JButton fasterButton;
765	1049	JButton remarkButton;
	1050	+
	1051	+ cGridBag editPanel;
	1052	+ cGridBag editCommandsPanel;
	1053	+
	1054	+ cGridBag namePanel;
	1055	+ cGridBag setupPanel;
	1056	+ cGridBag setupPanel2;
	1057	+ cGridBag objectCommandsPanel;
	1058	+ cGridBag pushPanel;
	1059	+ cGridBag fillPanel;
766	1060
767		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1061	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
768	1062	{
769	1063	JCheckBox cb;
770	1064
771		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
772		- oe.aConstraints.gridwidth = 1; // 3;
773		-// oe.aConstraints.weightx = 1;
774		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
775		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1065	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
776	1066	cb.addItemListener(this);
777		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
778		- oe.aConstraints.gridwidth = 1;
779		- oe.aConstraints.gridx += 1;
780	1067
781	1068	return cb;
782	1069	}
783	1070
784		- cButton AddButton(ObjEditor oe, String label)
	1071	+ cButton AddButton(cGridBag panel, String label)
785	1072	{
786	1073	cButton cb;
787	1074
788		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
789		- oe.aConstraints.gridwidth = 1;
790		-// oe.aConstraints.weightx = 1;
791		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
792		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1075	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
793	1076	cb.addActionListener(this);
794		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
795		- oe.aConstraints.gridwidth = 1;
796		- oe.aConstraints.gridx += 1;
797	1077
798	1078	return cb;
799	1079	}
800	1080
801		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1081	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
802	1082	{
803	1083	JComboBox combo;
804	1084
805		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
806		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
807		- oe.aConstraints.gridx += 1;
	1085	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	1086	combo.addActionListener(this);
809	1087
810	1088	return combo;
811	1089	}
812	1090
813		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1091	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
814	1092	{
815		- NumberSlider combo;
	1093	+ cGridBag control = new cGridBag();
	1094	+
	1095	+ cNumberSlider combo;
816	1096
817	1097	JLabel jlabel = new JLabel(label);
818		-
819		- aConstraints.fill = GridBagConstraints.VERTICAL;
820	1098	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
821		- aConstraints.gridwidth = 1;
822		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
825		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
826		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.gridwidth = 1;
829		-
	1099	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1100	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830	1101	combo.setFloat(current);
831		-
832		- combo.label = jlabel;
833		-
834		- combo.addChangeListener(this);
835		-
836		- return combo;
	1102	+
	1103	+ panel.add(control);
	1104	+
	1105	+ return control;
837	1106	}
838	1107
839		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1108	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
840	1109	{
841		- NumberSlider combo;
	1110	+ cGridBag control = new cGridBag();
	1111	+
	1112	+ cNumberSlider combo;
842	1113
843	1114	JLabel jlabel = new JLabel(label);
844		-
845		- aConstraints.fill = GridBagConstraints.VERTICAL;
846	1115	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
847		- aConstraints.gridwidth = 2;
848		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
851		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
852		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.gridwidth = 1;
855		-
	1116	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1117	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856	1118	combo.setInteger(current);
857	1119
858		- combo.label = jlabel;
859		-
860		- combo.addChangeListener(this);
861		-
862		- return combo;
	1120	+ panel.add(control);
	1121	+
	1122	+ return control;
863	1123	}
864	1124
865		- JTextArea AddText(JPanel ctrlPanel, String name)
	1125	+ JTextArea AddText(cGridBag ctrlPanel, String name)
866	1126	{
867	1127	JTextArea text;
868	1128
869		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
870		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1129	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872	1130	text.addCaretListener(this);
873		- aConstraints.gridx += 1;
874		- aConstraints.gridwidth = 1;
875	1131
876	1132	return text;
877	1133	}
..	..	@@ -901,9 +1157,16 @@
901	1157	objEditor.ctrlPanel.remove(j);
902	1158	}
903	1159
	1160	+ void Remove(cNumberSlider j)
	1161	+ {
	1162	+ j.removeChangeListener(this);
	1163	+ //objEditor.ctrlPanel.remove(j.label);
	1164	+ objEditor.ctrlPanel.remove(j);
	1165	+ }
	1166	+
904	1167	/*
905	1168	*/
906		- void Return() // ObjEditor oe)
	1169	+ void Return0() // ObjEditor oe)
907	1170	{
908	1171	aConstraints.gridy += 1;
909	1172	aConstraints.gridx = 0;
..	..	@@ -958,37 +1221,92 @@
958	1221
959	1222	void SetupUI2(ObjEditor oe)
960	1223	{
961		-// oe.aConstraints.weightx = 0;
962		-// oe.aConstraints.weighty = 0;
963		-// oe.aConstraints.gridx = 0;
964		-// oe.aConstraints.gridy = 0;
965		- SetupName(oe);
	1224	+ //SetupName(oe);
966	1225
967		- if (!GroupEditor.allparams)
	1226	+ namePanel = new cGridBag();
	1227	+
	1228	+ //if (copy.pinned)
	1229	+ {
	1230	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1231	+ pinButton.setSelected(copy.pinned);
	1232	+ cGridBag t = new cGridBag();
	1233	+ t.preferredWidth = 2;
	1234	+ t.add(pinButton);
	1235	+ namePanel.add(t);
	1236	+
	1237	+ pinButton.addItemListener(this);
	1238	+ }
	1239	+
	1240	+ nameField = AddText(namePanel, copy.GetName());
	1241	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1242	+ oe.ctrlPanel.add(namePanel);
	1243	+
	1244	+ oe.ctrlPanel.Return();
	1245	+
	1246	+ if (!allparams)
968	1247	return;
969	1248
970		- liveCB = AddCheckBox(oe, "Live", copy.live);
971		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1249	+ setupPanel = new cGridBag().setVertical(false);
	1250	+
	1251	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1252	+ liveCB.setToolTipText("Animate object");
	1253	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1254	+ selectableCB.setToolTipText("Make object selectable");
973	1255	// Return();
974		- markCB = AddCheckBox(oe, "Mark", copy.marked);
975		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
976		- randomCB = AddCheckBox(oe, "Rand", copy.random);
977		- Return();
978		- resetButton = AddButton(oe, "Reset");
979		- stepButton = AddButton(oe, "Step");
	1256	+
	1257	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1258	+ hideCB.setToolTipText("Hide object");
	1259	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1260	+ markCB.setToolTipText("As animation target transform");
	1261	+
	1262	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1263	+
	1264	+ setupPanel2 = new cGridBag().setVertical(false);
	1265	+
	1266	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1267	+ rewindCB.setToolTipText("Rewind animation");
	1268	+
	1269	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1270	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1271	+
	1272	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1273	+ link2masterCB.setToolTipText("Attach to support");
	1274	+
	1275	+ if (Globals.ADVANCED)
	1276	+ {
	1277	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1278	+ speedupCB.setToolTipText("Option motion capture");
	1279	+ }
	1280	+
	1281	+ oe.ctrlPanel.add(setupPanel);
	1282	+ oe.ctrlPanel.Return();
	1283	+ oe.ctrlPanel.add(setupPanel2);
	1284	+ oe.ctrlPanel.Return();
	1285	+
	1286	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1287	+
	1288	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1289	+ resetButton.setToolTipText("Jump to frame zero");
	1290	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1291	+ stepButton.setToolTipText("Step one frame");
980	1292	// resetAllButton = AddButton(oe, "Reset All");
981	1293	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
983	1294	// Return();
984		- slowerButton = AddButton(oe, "Slow");
985		- fasterButton = AddButton(oe, "Fast");
986		- remarkButton = AddButton(oe, "Rem");
	1295	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1296	+ slowerButton.setToolTipText("Decrease animation speed");
	1297	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1298	+ fasterButton.setToolTipText("Increase animation speed");
	1299	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1300	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1301
988		- Return();
	1302	+ oe.ctrlPanel.add(objectCommandsPanel);
	1303	+ oe.ctrlPanel.Return();
989	1304
990		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991		- Return();
	1305	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1306	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1307	+ //Return();
	1308	+
	1309	+ oe.ctrlPanel.Return();
992	1310
993	1311	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
994	1312	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1083,7 +1401,7 @@
1083	1401	oe.aConstraints.gridwidth = 1;
1084	1402	/**/
1085	1403	nameField = AddText(oe.ctrlPanel, copy.GetName());
1086		- Return();
	1404	+ oe.ctrlPanel.Return();
1087	1405
1088	1406	//ctrlPanel.add(textureButton = new Button("Texture..."));
1089	1407	//textureButton.setEnabled(false);
..	..	@@ -1185,9 +1503,13 @@
1185	1503	//JPanel worldPanel =
1186	1504	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187	1505	//worldPanel.setName("World");
1188		- centralPanel = new JPanel(new BorderLayout());
1189		- timelinePanel = new JPanel(new BorderLayout());
1190		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1506	+ centralPanel = new cGridBag();
	1507	+ centralPanel.preferredWidth = 20;
	1508	+
	1509	+ if (Globals.ADVANCED)
	1510	+ {
	1511	+ timelinePanel = new JPanel(new BorderLayout());
	1512	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191	1513
1192	1514	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1193	1515	cameraPanel.setContinuousLayout(true);
..	..	@@ -1196,7 +1518,10 @@
1196	1518	// cameraPanel.setDividerSize(9);
1197	1519	cameraPanel.setResizeWeight(1.0);
1198	1520
	1521	+ }
	1522	+
1199	1523	centralPanel.add(cameraView);
	1524	+ centralPanel.setFocusable(true);
1200	1525	//frame.setJMenuBar(timelineMenubar);
1201	1526	//centralPanel.add(timelinePanel);
1202	1527
..	..	@@ -1215,12 +1540,14 @@
1215	1540	//frontView.object = copy;
1216	1541	//sideView.object = copy;
1217	1542
1218		- XYZPanel = new JPanel();
1219		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1543	+ XYZPanel = new cGridBag().setVertical(true);
	1544	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1220	1545
1221		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1222		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1223		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1546	+ XYZPanel.preferredWidth = 5;
	1547	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1548	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1549	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1550	+ //XYZPanel.setName("XYZ");
1224	1551
1225	1552	/*
1226	1553	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1258,12 +1585,29 @@
1258	1585	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1259	1586	//tmp.setName("Edit");
1260	1587	objectPanel.add(materialPanel);
1261		- JPanel north = new JPanel(new BorderLayout());
1262		- north.setName("Edit");
1263		- north.add(ctrlPanel, BorderLayout.NORTH);
1264		- objectPanel.add(north);
1265		- objectPanel.add(infoPanel);
	1588	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1589	+ objectPanel.setToolTipTextAt(0, "Material");
	1590	+
	1591	+ objectPanel.add(toolboxPanel);
	1592	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1593	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1266	1594
	1595	+ objectPanel.add(skyboxPanel);
	1596	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1597	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1598	+
	1599	+// JPanel north = new JPanel(new BorderLayout());
	1600	+// north.setName("Edit");
	1601	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1602	+// objectPanel.add(north);
	1603	+ objectPanel.add(editPanel);
	1604	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1605	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1606	+
	1607	+ objectPanel.add(XYZPanel);
	1608	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1609	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1610	+
1267	1611	/*
1268	1612	aConstraints.gridx = 0;
1269	1613	aConstraints.gridwidth = 1;
..	..	@@ -1271,7 +1615,7 @@
1271	1615	aConstraints.gridy += 1;
1272	1616	aConstraints.gridwidth = 1;
1273	1617	mainPanel.add(objectPanel, aConstraints);
1274		- */
	1618	+ */
1275	1619
1276	1620	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1277	1621	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1282,17 +1626,29 @@
1282	1626	scrollpane.setWheelScrollingEnabled(true);
1283	1627	scrollpane.addMouseWheelListener(this); // Default not fast enough
1284	1628
1285		- /JTabbedPane/ scenePanel = new JTabbedPane();
1286		- scenePanel.add(scrollpane);
	1629	+ /JTabbedPane/ scenePanel = new cGridBag();
	1630	+ scenePanel.preferredWidth = 5;
	1631	+
	1632	+ JTabbedPane tabbedPane = new JTabbedPane();
	1633	+ tabbedPane.add(scrollpane);
1287	1634
1288		- scenePanel.add(FSPane = new cFileSystemPane(this));
1289		-
1290		- optionsPanel = new JPanel(new GridBagLayout());
	1635	+ optionsPanel = new cGridBag().setVertical(false);
1291	1636
1292	1637	optionsPanel.setName("Options");
1293		- scenePanel.add(optionsPanel);
	1638	+
	1639	+ AddOptions(optionsPanel); //, aConstraints);
	1640	+
	1641	+ tabbedPane.add(optionsPanel);
	1642	+
	1643	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1294	1644
	1645	+ scenePanel.add(tabbedPane);
1295	1646
	1647	+ //if (Globals.ADVANCED)
	1648	+ tabbedPane.add(infoPanel);
	1649	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1650	+ tabbedPane.setToolTipTextAt(3, "Information");
	1651	+
1296	1652	/*
1297	1653	cTree jTree = new cTree(null);
1298	1654	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1325,6 +1681,7 @@
1325	1681	//bigPanel.setSize(new Dimension(10,10));
1326	1682	//bigPanel.add(ctrlPanel);
1327	1683	//bigPanel.add(gridPanel);
	1684	+ /**
1328	1685	bigThree = new JPanel();
1329	1686	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1330	1687	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1348,7 +1705,13 @@
1348	1705	// aConstraints.gridheight = 3;
1349	1706	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1350	1707	bigThree.add(XYZPanel, aWindowConstraints);
	1708	+ /**/
1351	1709
	1710	+ bigThree = new cGridBag();
	1711	+ bigThree.addComponent(scenePanel);
	1712	+ bigThree.addComponent(centralPanel);
	1713	+ //bigThree.addComponent(XYZPanel);
	1714	+
1352	1715	// // SIDE EFFECT!!!
1353	1716	// aConstraints.gridx = 0;
1354	1717	// aConstraints.gridy = 0;
..	..	@@ -1356,9 +1719,26 @@
1356	1719	// aConstraints.gridheight = 1;
1357	1720
1358	1721	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1359		- framePanel.setContinuousLayout(true);
1360		- framePanel.setOneTouchExpandable(true);
1361		- framePanel.setDividerLocation(0.8);
	1722	+
	1723	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1724	+ new java.beans.PropertyChangeListener()
	1725	+ {
	1726	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1727	+ {
	1728	+ if ((Integer)pce.getOldValue() == 1)
	1729	+ {
	1730	+ if (radio.layout != expandedLayout)
	1731	+ {
	1732	+ radio.layout = expandedLayout;
	1733	+ radio.layout.doClick();
	1734	+ }
	1735	+ }
	1736	+ }
	1737	+ });
	1738	+
	1739	+ framePanel.setContinuousLayout(false);
	1740	+ framePanel.setOneTouchExpandable(false);
	1741	+ //.setDividerLocation(0.8);
1362	1742	//framePanel.setDividerSize(15);
1363	1743	//framePanel.setResizeWeight(0.15);
1364	1744	framePanel.setName("Frame");
..	..	@@ -1369,20 +1749,25 @@
1369	1749	//worldPane.add(bigPanel);
1370	1750	//worldPane.add(worldPanel);
1371	1751	/**/
1372		- frame.getContentPane().add(/"Center",/framePanel);
	1752	+ //frame.getContentPane().add(/"Center",/framePanel);
	1753	+ frame.add(/"Center",/framePanel);
1373	1754	//frame.getContentPane().add(/"Center",/ worldPane);
1374	1755
1375	1756	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1376	1757
1377		- frame.setSize(1024, 768);
1378		- frame.show();
1379		-
	1758	+ frame.setSize(1280, 860);
	1759	+
	1760	+ cameraView.requestFocusInWindow();
	1761	+
1380	1762	gridPanel.setDividerLocation(1.0);
	1763	+
	1764	+ frame.validate();
	1765	+
	1766	+ frame.setVisible(true);
1381	1767
1382	1768	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1383	1769	frame.addWindowListener(new WindowAdapter()
1384	1770	{
1385		-
1386	1771	public void windowClosing(WindowEvent e)
1387	1772	{
1388	1773	Close();
..	..	@@ -1390,6 +1775,10 @@
1390	1775	});
1391	1776	}
1392	1777
	1778	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1779	+ {
	1780	+ }
	1781	+
1393	1782	JTree GetTree()
1394	1783	{
1395	1784	return objEditor.jTree;
..	..	@@ -1401,260 +1790,575 @@
1401	1790	ctrlPanel.removeAll();
1402	1791	}
1403	1792
1404		- void SetupMaterial(JPanel ctrlPanel)
	1793	+ void SetupMaterial(cGridBag materialpanel)
1405	1794	{
1406		- aConstraints.weighty = 0;
1407		- //aConstraints.weightx = 1;
1408		- /*
	1795	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1796	+
	1797	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1798	+ skin.setToolTipText("Skin");
	1799	+ skin.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1804	+ cMaterial material = object.material;
	1805	+
	1806	+ // Skin
	1807	+ colorField.setFloat(material.color);
	1808	+ saturationField.setFloat(material.modulation);
	1809	+ subsurfaceField.setFloat(material.subsurface);
	1810	+ selfshadowField.setFloat(material.diffuseness);
	1811	+ diffusenessField.setFloat(material.factor);
	1812	+ shininessField.setFloat(material.shininess);
	1813	+ shadowbiasField.setFloat(material.shadowbias);
	1814	+ diffuseField.setFloat(material.diffuse);
	1815	+ specularField.setFloat(material.specular);
	1816	+
	1817	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1818	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1819	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1820	+
	1821	+ materialtouched = true;
	1822	+ applySelf();
	1823	+ }
	1824	+ });
	1825	+ presetpanel.add(skin);
	1826	+
	1827	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1828	+ lambert.setToolTipText("Diffuse");
	1829	+ lambert.addMouseListener(new MouseAdapter()
	1830	+ {
	1831	+ public void mouseClicked(MouseEvent e)
	1832	+ {
	1833	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1834	+ cMaterial material = object.material;
	1835	+
	1836	+ diffusenessField.setFloat(material.factor);
	1837	+ selfshadowField.setFloat(material.diffuseness);
	1838	+
	1839	+ materialtouched = true;
	1840	+ applySelf();
	1841	+ }
	1842	+ });
	1843	+ presetpanel.add(lambert);
	1844	+
	1845	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1846	+ diffuse2.setToolTipText("Diffuse2");
	1847	+ diffuse2.addMouseListener(new MouseAdapter()
	1848	+ {
	1849	+ public void mouseClicked(MouseEvent e)
	1850	+ {
	1851	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1852	+ cMaterial material = object.material;
	1853	+
	1854	+ diffusenessField.setFloat(material.factor);
	1855	+ selfshadowField.setFloat(material.diffuseness);
	1856	+
	1857	+ materialtouched = true;
	1858	+ applySelf();
	1859	+ }
	1860	+ });
	1861	+ presetpanel.add(diffuse2);
	1862	+
	1863	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1864	+ diffusemoon.setToolTipText("Moon");
	1865	+ diffusemoon.addMouseListener(new MouseAdapter()
	1866	+ {
	1867	+ public void mouseClicked(MouseEvent e)
	1868	+ {
	1869	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1870	+ cMaterial material = object.material;
	1871	+
	1872	+ diffusenessField.setFloat(material.factor);
	1873	+ selfshadowField.setFloat(material.diffuseness);
	1874	+
	1875	+ materialtouched = true;
	1876	+ applySelf();
	1877	+ }
	1878	+ });
	1879	+ presetpanel.add(diffusemoon);
	1880	+
	1881	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1882	+ diffusemoon2.setToolTipText("Moon2");
	1883	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1884	+ {
	1885	+ public void mouseClicked(MouseEvent e)
	1886	+ {
	1887	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1888	+ cMaterial material = object.material;
	1889	+
	1890	+ diffusenessField.setFloat(material.factor);
	1891	+ selfshadowField.setFloat(material.diffuseness);
	1892	+
	1893	+ materialtouched = true;
	1894	+ applySelf();
	1895	+ }
	1896	+ });
	1897	+ presetpanel.add(diffusemoon2);
	1898	+
	1899	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1900	+ diffusemoon3.setToolTipText("Moon3");
	1901	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1902	+ {
	1903	+ public void mouseClicked(MouseEvent e)
	1904	+ {
	1905	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1906	+ cMaterial material = object.material;
	1907	+
	1908	+ diffusenessField.setFloat(material.factor);
	1909	+ selfshadowField.setFloat(material.diffuseness);
	1910	+
	1911	+ materialtouched = true;
	1912	+ applySelf();
	1913	+ }
	1914	+ });
	1915	+ presetpanel.add(diffusemoon3);
	1916	+
	1917	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1918	+ diffusesheen.setToolTipText("Sheen");
	1919	+ diffusesheen.addMouseListener(new MouseAdapter()
	1920	+ {
	1921	+ public void mouseClicked(MouseEvent e)
	1922	+ {
	1923	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1924	+ cMaterial material = object.material;
	1925	+
	1926	+ sheenField.setFloat(material.sheen);
	1927	+
	1928	+ materialtouched = true;
	1929	+ applySelf();
	1930	+ }
	1931	+ });
	1932	+ presetpanel.add(diffusesheen);
	1933	+
	1934	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1935	+ rough.setToolTipText("Rough metal");
	1936	+ rough.addMouseListener(new MouseAdapter()
	1937	+ {
	1938	+ public void mouseClicked(MouseEvent e)
	1939	+ {
	1940	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1941	+ cMaterial material = object.material;
	1942	+
	1943	+ shininessField.setFloat(material.shininess);
	1944	+ velvetField.setFloat(material.velvet);
	1945	+
	1946	+ materialtouched = true;
	1947	+ applySelf();
	1948	+ }
	1949	+ });
	1950	+ presetpanel.add(rough);
	1951	+
	1952	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1953	+ rough2.setToolTipText("Medium metal");
	1954	+ rough2.addMouseListener(new MouseAdapter()
	1955	+ {
	1956	+ public void mouseClicked(MouseEvent e)
	1957	+ {
	1958	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1959	+ cMaterial material = object.material;
	1960	+
	1961	+ shininessField.setFloat(material.shininess);
	1962	+ lightareaField.setFloat(material.lightarea);
	1963	+
	1964	+ materialtouched = true;
	1965	+ applySelf();
	1966	+ }
	1967	+ });
	1968	+ presetpanel.add(rough2);
	1969	+
	1970	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1971	+ shini0.setToolTipText("Shiny");
	1972	+ shini0.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ shininessField.setFloat(material.shininess);
	1980	+ lightareaField.setFloat(material.lightarea);
	1981	+
	1982	+ materialtouched = true;
	1983	+ applySelf();
	1984	+ }
	1985	+ });
	1986	+ presetpanel.add(shini0);
	1987	+
	1988	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1989	+ shini1.setToolTipText("Shiny2");
	1990	+ shini1.addMouseListener(new MouseAdapter()
	1991	+ {
	1992	+ public void mouseClicked(MouseEvent e)
	1993	+ {
	1994	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1995	+ cMaterial material = object.material;
	1996	+
	1997	+ shininessField.setFloat(material.shininess);
	1998	+ lightareaField.setFloat(material.lightarea);
	1999	+
	2000	+ materialtouched = true;
	2001	+ applySelf();
	2002	+ }
	2003	+ });
	2004	+ presetpanel.add(shini1);
	2005	+
	2006	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2007	+ shini2.setToolTipText("Shiny3");
	2008	+ shini2.addMouseListener(new MouseAdapter()
	2009	+ {
	2010	+ public void mouseClicked(MouseEvent e)
	2011	+ {
	2012	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2013	+ cMaterial material = object.material;
	2014	+
	2015	+ shininessField.setFloat(material.shininess);
	2016	+ lightareaField.setFloat(material.lightarea);
	2017	+
	2018	+ materialtouched = true;
	2019	+ applySelf();
	2020	+ }
	2021	+ });
	2022	+ presetpanel.add(shini2);
	2023	+
	2024	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2025	+ aniso.setToolTipText("AnisoU");
	2026	+ aniso.addMouseListener(new MouseAdapter()
	2027	+ {
	2028	+ public void mouseClicked(MouseEvent e)
	2029	+ {
	2030	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2031	+ cMaterial material = object.material;
	2032	+
	2033	+ anisoField.setFloat(material.aniso);
	2034	+ anisoVField.setFloat(material.anisoV);
	2035	+
	2036	+ materialtouched = true;
	2037	+ applySelf();
	2038	+ }
	2039	+ });
	2040	+ presetpanel.add(aniso);
	2041	+
	2042	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2043	+ aniso2.setToolTipText("AnisoV");
	2044	+ aniso2.addMouseListener(new MouseAdapter()
	2045	+ {
	2046	+ public void mouseClicked(MouseEvent e)
	2047	+ {
	2048	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2049	+ cMaterial material = object.material;
	2050	+
	2051	+ anisoField.setFloat(material.aniso);
	2052	+ anisoVField.setFloat(material.anisoV);
	2053	+
	2054	+ materialtouched = true;
	2055	+ applySelf();
	2056	+ }
	2057	+ });
	2058	+ presetpanel.add(aniso2);
	2059	+
	2060	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2061	+ aniso3.setToolTipText("AnisoUV");
	2062	+ aniso3.addMouseListener(new MouseAdapter()
	2063	+ {
	2064	+ public void mouseClicked(MouseEvent e)
	2065	+ {
	2066	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2067	+ cMaterial material = object.material;
	2068	+
	2069	+ anisoField.setFloat(material.aniso);
	2070	+ anisoVField.setFloat(material.anisoV);
	2071	+
	2072	+ materialtouched = true;
	2073	+ applySelf();
	2074	+ }
	2075	+ });
	2076	+ presetpanel.add(aniso3);
	2077	+
	2078	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2079	+ velvet0.setToolTipText("Velvet");
	2080	+ velvet0.addMouseListener(new MouseAdapter()
	2081	+ {
	2082	+ public void mouseClicked(MouseEvent e)
	2083	+ {
	2084	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2085	+ cMaterial material = object.material;
	2086	+
	2087	+ diffusenessField.setFloat(material.factor);
	2088	+ selfshadowField.setFloat(material.diffuseness);
	2089	+ sheenField.setFloat(material.sheen);
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ velvetField.setFloat(material.velvet);
	2092	+ shiftField.setFloat(material.shift);
	2093	+
	2094	+ materialtouched = true;
	2095	+ applySelf();
	2096	+ }
	2097	+ });
	2098	+ presetpanel.add(velvet0);
	2099	+
	2100	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2101	+ bump0.setToolTipText("Bump texture");
	2102	+ bump0.addMouseListener(new MouseAdapter()
	2103	+ {
	2104	+ public void mouseClicked(MouseEvent e)
	2105	+ {
	2106	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2107	+ cMaterial material = object.material;
	2108	+
	2109	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2110	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2111	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2112	+
	2113	+ materialtouched = true;
	2114	+ applySelf();
	2115	+ }
	2116	+ });
	2117	+ presetpanel.add(bump0);
	2118	+
	2119	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2120	+ halo.setToolTipText("Halo");
	2121	+ halo.addMouseListener(new MouseAdapter()
	2122	+ {
	2123	+ public void mouseClicked(MouseEvent e)
	2124	+ {
	2125	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2126	+ cMaterial material = object.material;
	2127	+
	2128	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2129	+
	2130	+ materialtouched = true;
	2131	+ applySelf();
	2132	+ }
	2133	+ });
	2134	+ presetpanel.add(halo);
	2135	+
	2136	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2137	+ candle.setToolTipText("Candle");
	2138	+ candle.addMouseListener(new MouseAdapter()
	2139	+ {
	2140	+ public void mouseClicked(MouseEvent e)
	2141	+ {
	2142	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2143	+ cMaterial material = object.material;
	2144	+
	2145	+ subsurfaceField.setFloat(material.subsurface);
	2146	+ shadowbiasField.setFloat(material.shadowbias);
	2147	+ ambientField.setFloat(material.ambient);
	2148	+ specularField.setFloat(material.specular);
	2149	+ lightareaField.setFloat(material.lightarea);
	2150	+ shininessField.setFloat(material.shininess);
	2151	+
	2152	+ materialtouched = true;
	2153	+ applySelf();
	2154	+ }
	2155	+ });
	2156	+ presetpanel.add(candle);
	2157	+
	2158	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2159	+ shadowShader.setToolTipText("Shadow");
	2160	+ shadowShader.addMouseListener(new MouseAdapter()
	2161	+ {
	2162	+ public void mouseClicked(MouseEvent e)
	2163	+ {
	2164	+ diffuseField.setFloat(0.001);
	2165	+ ambientField.setFloat(0.001);
	2166	+ cameraField.setFloat(0.001);
	2167	+ specularField.setFloat(0.001);
	2168	+ fakedepthField.setFloat(0.001);
	2169	+ opacityField.setFloat(0.6);
	2170	+
	2171	+ materialtouched = true;
	2172	+ applySelf();
	2173	+ }
	2174	+ });
	2175	+ presetpanel.add(shadowShader);
	2176	+
	2177	+ cGridBag panel = new cGridBag().setVertical(true);
	2178	+
	2179	+ presetpanel.preferredWidth = 1;
	2180	+
	2181	+ materialpanel.add(presetpanel);
	2182	+ materialpanel.add(panel);
	2183	+
	2184	+ panel.preferredWidth = 8;
	2185	+
	2186	+ /*
1409	2187	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1410	2188	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1411		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1412		- aConstraints.gridx += 1;
1413		- */
	2189	+ */
1414	2190
1415		- aConstraints.gridwidth = 1;
1416		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1417		- aConstraints.gridx += 1;
1418		- aConstraints.weighty = 0;
1419		- aConstraints.gridwidth = 1;
	2191	+ cGridBag editBar = new cGridBag().setVertical(false);
	2192	+
	2193	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2194	+ createMaterialButton.setToolTipText("Create material");
1420	2195
1421	2196	/*
1422	2197	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1423		- aConstraints.gridx += 1;
1424		- aConstraints.weighty = 0;
1425		- aConstraints.gridwidth = 1;
1426	2198	*/
1427	2199
1428		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1429		- aConstraints.gridx += 1;
	2200	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2201	+ clearMaterialButton.setToolTipText("Clear material");
	2202	+
	2203	+ if (Globals.ADVANCED)
	2204	+ {
	2205	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2206	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2207	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2208	+ }
1430	2209
1431		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1432		-
1433		- aConstraints.gridx += 1;
1434		-
1435		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1436		-
1437		- aConstraints.gridx += 1;
1438		-
1439		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1440		-
1441		- aConstraints.gridx = 0;
1442		- aConstraints.gridy += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
	2210	+ editBar.preferredHeight = 15;
	2211	+
	2212	+ panel.add(editBar);
	2213	+
1445	2214	/**/
1446	2215	//aConstraints.weighty = 0;
1447	2216	////aConstraints.weightx = 1;
1448	2217	//aConstraints.weighty = 1;
1449	2218	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1450	2219	//aConstraints.gridx += 1;
1451		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1452		- aConstraints.weighty = 0;
1453		- aConstraints.gridx = 0;
1454		- aConstraints.gridy += 1;
1455		- aConstraints.gridwidth = 1;
	2220	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1456	2221
1457		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1458		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1459		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1460		- aConstraints.gridx += 1;
1461		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1462		- //aConstraints.weightx = 0;
1463		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1464		- aConstraints.gridx = 0;
1465		- aConstraints.gridy += 1;
1466		- aConstraints.gridwidth = 1;
	2222	+ cGridBag colorSection = new cGridBag().setVertical(true);
1467	2223
1468		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1469		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1470		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1471		- aConstraints.gridx += 1;
1472		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1473		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1474		- aConstraints.gridx = 0;
1475		- aConstraints.gridy += 1;
1476		- aConstraints.gridwidth = 1;
	2224	+ cGridBag huepanel = new cGridBag();
	2225	+ cGridBag huelabel = new cGridBag();
	2226	+ skin = GetLabel("icons/hue.png", false);
	2227	+ skin.fit = true;
	2228	+ huelabel.add(skin);
	2229	+ huelabel.preferredWidth = 20;
	2230	+ huepanel.add(new cGridBag()); // Label
	2231	+ huepanel.add(huelabel); // Field/slider
	2232	+
	2233	+ huepanel.preferredHeight = 7;
1477	2234
1478		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1479		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1480		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1481		- aConstraints.gridx += 1;
1482		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1483		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1484		- aConstraints.gridx = 0;
1485		- aConstraints.gridy += 1;
1486		- aConstraints.gridwidth = 1;
	2235	+ colorSection.add(huepanel);
	2236	+
	2237	+ cGridBag color = new cGridBag();
	2238	+
	2239	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2240	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2241	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1487	2242
1488		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1489		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1491		- aConstraints.gridx += 1;
1492		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1493		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1494		- aConstraints.gridx = 0;
1495		- aConstraints.gridy += 1;
1496		- aConstraints.gridwidth = 1;
	2243	+ //colorField.preferredWidth = 200;
	2244	+ colorSection.add(color);
1497	2245
1498		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1499		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1501		- aConstraints.gridx += 1;
1502		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1503		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1504		- aConstraints.gridx = 0;
1505		- aConstraints.gridy += 1;
1506		- aConstraints.gridwidth = 1;
	2246	+ cGridBag modulation = new cGridBag();
	2247	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2248	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2249	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2250	+ colorSection.add(modulation);
1507	2251
1508		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1509		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1510		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1511		- aConstraints.gridx += 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1513		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1514		- aConstraints.gridx = 0;
1515		- aConstraints.gridy += 1;
1516		- aConstraints.gridwidth = 1;
	2252	+ cGridBag opacity = new cGridBag();
	2253	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2254	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2255	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2256	+ colorSection.add(opacity);
1517	2257
1518		- //aConstraints.weighty = 1;
1519		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1520		- //aConstraints.gridx += 1;
1521		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1522		- aConstraints.weighty = 0;
1523		- aConstraints.gridx = 0;
1524		- aConstraints.gridy += 1;
1525		- aConstraints.gridwidth = 1;
	2258	+ colorSection.add(GetSeparator());
	2259	+
	2260	+ cGridBag texture = new cGridBag();
	2261	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2262	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2263	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2264	+ colorSection.add(texture);
1526	2265
1527		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1528		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1530		- aConstraints.gridx += 1;
1531		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1532		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	2266	+ panel.add(GetSeparator());
	2267	+
	2268	+ panel.add(colorSection);
	2269	+
	2270	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2271	+
	2272	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2273	+
	2274	+ cGridBag diffuse = new cGridBag();
	2275	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2276	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2277	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2278	+ diffuseSection.add(diffuse);
1536	2279
1537		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1538		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1539		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1540		- aConstraints.gridx += 1;
1541		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1542		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1543		- aConstraints.gridx = 0;
1544		- aConstraints.gridy += 1;
1545		- aConstraints.gridwidth = 1;
	2280	+ cGridBag diffuseness = new cGridBag();
	2281	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2282	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2283	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2284	+ diffuseSection.add(diffuseness);
1546	2285
1547		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1548		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1549		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1550		- aConstraints.gridx += 1;
1551		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1552		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1553		- aConstraints.gridx = 0;
1554		- aConstraints.gridy += 1;
1555		- aConstraints.gridwidth = 1;
	2286	+ cGridBag selfshadow = new cGridBag();
	2287	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2288	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2289	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2290	+ diffuseSection.add(selfshadow);
1556	2291
1557		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1558		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1560		- aConstraints.gridx += 1;
1561		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1562		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1563		- aConstraints.gridx = 0;
1564		- aConstraints.gridy += 1;
1565		- aConstraints.gridwidth = 1;
	2292	+ cGridBag sheen = new cGridBag();
	2293	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2294	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2295	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2296	+ diffuseSection.add(sheen);
1566	2297
1567		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1568		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1569		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1570		- aConstraints.gridx += 1;
1571		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1572		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1573		- aConstraints.gridx = 0;
1574		- aConstraints.gridy += 1;
1575		- aConstraints.gridwidth = 1;
	2298	+ cGridBag subsurface = new cGridBag();
	2299	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2300	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2301	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2302	+ diffuseSection.add(subsurface);
1576	2303
1577		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1578		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1580		- aConstraints.gridx += 1;
1581		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1582		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1583		- aConstraints.gridx = 0;
1584		- aConstraints.gridy += 1;
1585		- aConstraints.gridwidth = 1;
	2304	+ cGridBag shadow = new cGridBag();
	2305	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2306	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2307	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2308	+ diffuseSection.add(shadow);
1586	2309
1587		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1588		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1589		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1590		- aConstraints.gridx += 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1592		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1593		- aConstraints.gridx = 0;
1594		- aConstraints.gridy += 1;
1595		- aConstraints.gridwidth = 1;
	2310	+ cGridBag fakedepth = new cGridBag();
	2311	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2312	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2313	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2314	+ diffuseSection.add(fakedepth);
1596	2315
1597		- //aConstraints.weighty = 1;
1598		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1599		- //aConstraints.gridx += 1;
1600		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1601		- aConstraints.weighty = 0;
1602		- aConstraints.gridx = 0;
1603		- aConstraints.gridy += 1;
1604		- aConstraints.gridwidth = 1;
	2316	+ cGridBag shadowbias = new cGridBag();
	2317	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2318	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2319	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2320	+ diffuseSection.add(shadowbias);
1605	2321
1606		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1607		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1608		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1609		- aConstraints.gridx += 1;
1610		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1611		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	2322	+ panel.add(GetSeparator());
	2323	+
	2324	+ panel.add(diffuseSection);
	2325	+
	2326	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2327	+
	2328	+ cGridBag specularSection = new cGridBag().setVertical(true);
1615	2329
1616		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1617		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1619		- aConstraints.gridx += 1;
1620		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1621		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1622		- aConstraints.gridx = 0;
1623		- aConstraints.gridy += 1;
1624		- aConstraints.gridwidth = 1;
	2330	+ cGridBag specular = new cGridBag();
	2331	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2332	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2333	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2334	+ specularSection.add(specular);
1625	2335
1626		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1627		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1629		- aConstraints.gridx += 1;
1630		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1631		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1632		- aConstraints.gridx = 0;
1633		- aConstraints.gridy += 1;
1634		- aConstraints.gridwidth = 1;
	2336	+ cGridBag lightarea = new cGridBag();
	2337	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2338	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2339	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2340	+ specularSection.add(lightarea);
1635	2341
1636		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1637		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1639		- aConstraints.gridx += 1;
1640		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1641		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1642		- aConstraints.gridx = 0;
1643		- aConstraints.gridy += 1;
1644		- aConstraints.gridwidth = 1;
	2342	+ cGridBag shininess = new cGridBag();
	2343	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2344	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2345	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2346	+ specularSection.add(shininess);
1645	2347
1646		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1647		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1648		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1649		- aConstraints.gridx += 1;
1650		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1651		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1652		- aConstraints.gridx = 0;
1653		- aConstraints.gridy += 1;
1654		- aConstraints.gridwidth = 1;
	2348	+ cGridBag metalness = new cGridBag();
	2349	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2350	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2351	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2352	+ specularSection.add(metalness);
1655	2353
1656		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1657		- Return();
	2354	+ cGridBag velvet = new cGridBag();
	2355	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2356	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2357	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2358	+ specularSection.add(velvet);
	2359	+
	2360	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2361	+ //Return();
1658	2362	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1659	2363	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1660	2364	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1665,130 +2369,99 @@
1665	2369	// aConstraints.gridy += 1;
1666	2370	// aConstraints.gridwidth = 1;
1667	2371
1668		- //aConstraints.weighty = 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1670		- //aConstraints.gridx += 1;
1671		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1672		- aConstraints.weighty = 0;
1673		- aConstraints.gridx = 0;
1674		- aConstraints.gridy += 1;
1675		- aConstraints.gridwidth = 1;
	2372	+ cGridBag anisoU = new cGridBag();
	2373	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2374	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2375	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2376	+ specularSection.add(anisoU);
1676	2377
1677		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1678		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1680		- aConstraints.gridx += 1;
1681		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1682		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1683		- aConstraints.gridx = 0;
1684		- aConstraints.gridy += 1;
1685		- aConstraints.gridwidth = 1;
	2378	+ cGridBag anisoV = new cGridBag();
	2379	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2380	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2381	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2382	+ specularSection.add(anisoV);
1686	2383
1687		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1688		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1689		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1690		- aConstraints.gridx += 1;
1691		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1692		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1693		- aConstraints.gridx = 0;
1694		- aConstraints.gridy += 1;
1695		- aConstraints.gridwidth = 1;
1696	2384
1697		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1698		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1700		- aConstraints.gridx += 1;
1701		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1702		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1703		- aConstraints.gridx = 0;
1704		- aConstraints.gridy += 1;
1705		- aConstraints.gridwidth = 1;
	2385	+ panel.add(GetSeparator());
	2386	+
	2387	+ panel.add(specularSection);
	2388	+
	2389	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2390	+
	2391	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1706	2392
1707		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1708		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1710		- aConstraints.gridx += 1;
1711		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1712		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1713		- aConstraints.gridx = 0;
1714		- aConstraints.gridy += 1;
1715		- aConstraints.gridwidth = 1;
1716		- aConstraints.weighty = 0;
	2393	+ cGridBag camera = new cGridBag();
	2394	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2395	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2396	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2397	+ colorSection.add(camera);
1717	2398
1718		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1719		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1720		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1721		- aConstraints.gridx += 1;
1722		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1723		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1724		- aConstraints.gridx = 0;
1725		- aConstraints.gridy += 1;
1726		- aConstraints.gridwidth = 1;
	2399	+ cGridBag ambient = new cGridBag();
	2400	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2401	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2402	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2403	+ colorSection.add(ambient);
1727	2404
1728		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1729		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1730		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1731		- aConstraints.gridx += 1;
1732		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1733		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1734		- aConstraints.gridx = 0;
1735		- aConstraints.gridy += 1;
1736		- aConstraints.gridwidth = 1;
	2405	+ cGridBag backlit = new cGridBag();
	2406	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2407	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2408	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2409	+ colorSection.add(backlit);
1737	2410
1738		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1739		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1740		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1741		- aConstraints.gridx += 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1743		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1744		- aConstraints.gridx = 0;
1745		- aConstraints.gridy += 1;
1746		- aConstraints.gridwidth = 1;
	2411	+ //panel.add(new JSeparator());
	2412	+
	2413	+ //panel.add(globalSection);
	2414	+
	2415	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2416	+
	2417	+ cGridBag textureSection = new cGridBag().setVertical(true);
1747	2418
1748		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1749		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1750		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1751		- aConstraints.gridx += 1;
1752		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1753		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1754		- aConstraints.gridx = 0;
1755		- aConstraints.gridy += 1;
1756		- aConstraints.gridwidth = 1;
	2419	+ cGridBag bump = new cGridBag();
	2420	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2421	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2422	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2423	+ textureSection.add(bump);
1757	2424
1758		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1759		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1761		- aConstraints.gridx += 1;
1762		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1763		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1764		- aConstraints.gridx = 0;
1765		- aConstraints.gridy += 1;
1766		- aConstraints.gridwidth = 1;
	2425	+ cGridBag noise = new cGridBag();
	2426	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2427	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2428	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2429	+ textureSection.add(noise);
1767	2430
1768		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1769		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1771		- aConstraints.gridx += 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1773		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1774		- aConstraints.gridx = 0;
1775		- aConstraints.gridy += 1;
1776		- aConstraints.gridwidth = 1;
	2431	+ cGridBag power = new cGridBag();
	2432	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2433	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2434	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2435	+ textureSection.add(power);
1777	2436
1778		- //aConstraints.weighty = 1;
1779		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1780		- //aConstraints.gridx += 1;
1781		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1782		- aConstraints.weighty = 0;
	2437	+ cGridBag borderfade = new cGridBag();
	2438	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2439	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2440	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2441	+ textureSection.add(borderfade);
1783	2442
1784		- aConstraints.gridx = 0;
1785		- aConstraints.gridy = 0;
1786		- aConstraints.gridwidth = 1;
	2443	+ cGridBag fog = new cGridBag();
	2444	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2445	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2446	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2447	+ textureSection.add(fog);
	2448	+
	2449	+ cGridBag opacityPower = new cGridBag();
	2450	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2451	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2452	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2453	+ textureSection.add(opacityPower);
	2454	+
	2455	+ panel.add(GetSeparator());
	2456	+
	2457	+ panel.add(textureSection);
	2458	+
	2459	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1787	2460
1788	2461	SetMaterial(copy); // .GetMaterial());
1789	2462
1790		- colorField.addChangeListener(this);
1791		- modulationField.addChangeListener(this);
	2463	+ //colorField.addChangeListener(this);
	2464	+// modulationField.addChangeListener(this);
1792	2465	metalnessField.addChangeListener(this);
1793	2466	diffuseField.addChangeListener(this);
1794	2467	specularField.addChangeListener(this);
..	..	@@ -1818,12 +2491,15 @@
1818	2491	opacityPowerField.addChangeListener(this);
1819	2492	/**/
1820	2493
1821		- resetSlidersButton.addActionListener(this);
1822	2494	clearMaterialButton.addActionListener(this);
1823	2495	createMaterialButton.addActionListener(this);
1824		-
1825		- propagateToggle.addItemListener(this);
1826		- multiplyToggle.addItemListener(this);
	2496	+
	2497	+ if (Globals.ADVANCED)
	2498	+ {
	2499	+ resetSlidersButton.addActionListener(this);
	2500	+ propagateToggle.addItemListener(this);
	2501	+ multiplyToggle.addItemListener(this);
	2502	+ }
1827	2503	}
1828	2504
1829	2505	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1841,8 +2517,9 @@
1841	2517	// 3D models
1842	2518	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1843	2519	{
1844		- lastConverter = new com.jmex.model.converters.MaxToJme();
1845		- LoadFile(filename, lastConverter);
	2520	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2521	+ //LoadFile(filename, lastConverter);
	2522	+ LoadObjFile(filename); // New 3ds loader
1846	2523	continue;
1847	2524	}
1848	2525	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1994,7 +2671,7 @@
1994	2671
1995	2672	//? flashIt = false;
1996	2673	CameraPane pane = (CameraPane) cameraView;
1997		- pane.clickStart(location.x, location.y, 0);
	2674	+ pane.clickStart(location.x, location.y, 0, 0);
1998	2675	pane.clickEnd(location.x, location.y, 0, true);
1999	2676
2000	2677	if (group.selection.size() == 1)
..	..	@@ -2043,6 +2720,7 @@
2043	2720	e2.printStackTrace();
2044	2721	}
2045	2722	}
	2723	+
2046	2724	LoadJMEThread loadThread;
2047	2725
2048	2726	class LoadJMEThread extends Thread
..	..	@@ -2100,6 +2778,7 @@
2100	2778	//LoadFile0(filename, converter);
2101	2779	}
2102	2780	}
	2781	+
2103	2782	LoadOBJThread loadObjThread;
2104	2783
2105	2784	class LoadOBJThread extends Thread
..	..	@@ -2178,19 +2857,19 @@
2178	2857
2179	2858	void LoadObjFile(String fullname)
2180	2859	{
2181		- /*
	2860	+ System.out.println("Loading " + fullname);
	2861	+ /**/
2182	2862	//lastFilename = fullname;
2183	2863	if(loadObjThread == null)
2184	2864	{
2185		- loadObjThread = new LoadOBJThread();
2186		- loadObjThread.start();
	2865	+ loadObjThread = new LoadOBJThread();
	2866	+ loadObjThread.start();
2187	2867	}
2188	2868
2189	2869	loadObjThread.add(fullname);
2190		- */
	2870	+ /**/
2191	2871
2192		- System.out.println("Loading " + fullname);
2193		- makeSomething(new FileObject(fullname, true), true);
	2872	+ //makeSomething(new FileObject(fullname, true), true);
2194	2873	}
2195	2874
2196	2875	void LoadGFDFile(String fullname)
..	..	@@ -2451,11 +3130,11 @@
2451	3130
2452	3131	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2453	3132	{
2454		- if (GrafreeD.standAlone)
	3133	+ if (Grafreed.standAlone)
2455	3134	{
2456	3135	/**/
2457	3136	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2458		- browser.show();
	3137	+ browser.setVisible(true);
2459	3138	String filename = browser.getFile();
2460	3139	if (filename != null && filename.length() > 0)
2461	3140	{
..	..	@@ -2566,6 +3245,7 @@
2566	3245	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2567	3246	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2568	3247	}
	3248	+
2569	3249	//cJME.count++;
2570	3250	//cJME.count %= 12;
2571	3251	if (gc)
..	..	@@ -2600,6 +3280,7 @@
2600	3280	}
2601	3281	if (input == null)
2602	3282	{
	3283	+ new Exception().printStackTrace();
2603	3284	System.exit(0);
2604	3285	}
2605	3286
..	..	@@ -2748,6 +3429,7 @@
2748	3429	}
2749	3430	}
2750	3431	}
	3432	+
2751	3433	cFileSystemPane FSPane;
2752	3434
2753	3435	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2757,7 +3439,7 @@
2757	3439
2758	3440	freezematerial = true;
2759	3441	colorField.setFloat(mat.color);
2760		- modulationField.setFloat(mat.modulation);
	3442	+ saturationField.setFloat(mat.modulation);
2761	3443	metalnessField.setFloat(mat.metalness);
2762	3444	diffuseField.setFloat(mat.diffuse);
2763	3445	specularField.setFloat(mat.specular);
..	..	@@ -2801,11 +3483,14 @@
2801	3483	}
2802	3484	}
2803	3485	}
	3486	+
2804	3487	freezematerial = false;
2805	3488	}
2806	3489
2807	3490	void SetMaterial(Object3D object)
2808	3491	{
	3492	+ latestObject = object;
	3493	+
2809	3494	cMaterial mat = object.material;
2810	3495
2811	3496	if (mat == null)
..	..	@@ -2814,7 +3499,8 @@
2814	3499	return;
2815	3500	}
2816	3501
2817		- multiplyToggle.setSelected(mat.multiply);
	3502	+ if (multiplyToggle != null)
	3503	+ multiplyToggle.setSelected(mat.multiply);
2818	3504
2819	3505	assert (object.projectedVertices != null);
2820	3506
..	..	@@ -2916,12 +3602,17 @@
2916	3602	// }
2917	3603
2918	3604	/**/
2919		- if (deselect)
	3605	+ if (deselect \|\| child == null)
2920	3606	{
2921	3607	//group.deselectAll();
2922	3608	//freeze = true;
2923	3609	GetTree().clearSelection();
2924	3610	//freeze = false;
	3611	+
	3612	+ if (child == null)
	3613	+ {
	3614	+ return;
	3615	+ }
2925	3616	}
2926	3617
2927	3618	//group.addSelectee(child);
..	..	@@ -2955,6 +3646,17 @@
2955	3646	public void itemStateChanged(ItemEvent event)
2956	3647	{
2957	3648	// System.out.println("Propagate = " + propagate);
	3649	+ if (event.getSource() == pinButton)
	3650	+ {
	3651	+ copy.pinned ^= true;
	3652	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3653	+ {
	3654	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3655	+ copy.CloseUI();
	3656	+ //copy.editWindow.refreshContents();
	3657	+ }
	3658	+ }
	3659	+ else
2958	3660	if (event.getSource() == propagateToggle)
2959	3661	{
2960	3662	propagate ^= true;
..	..	@@ -2990,7 +3692,7 @@
2990	3692	cameraView.ToggleDL();
2991	3693	cameraView.repaint();
2992	3694	return;
2993		- } else if (event.getSource() == toggleTextureItem)
	3695	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2994	3696	{
2995	3697	cameraView.ToggleTexture();
2996	3698	// june 2013 copy.HardTouch();
..	..	@@ -3029,9 +3731,9 @@
3029	3731	frame.validate();
3030	3732
3031	3733	return;
3032		- } else if (event.getSource() == toggleRandomItem)
	3734	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3033	3735	{
3034		- cameraView.ToggleRandom();
	3736	+ cameraView.ToggleSwitch();
3035	3737	cameraView.repaint();
3036	3738	return;
3037	3739	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3059,12 +3761,17 @@
3059	3761	} else if (event.getSource() == liveCB)
3060	3762	{
3061	3763	copy.live ^= true;
	3764	+ objEditor.refreshContents(true); // To show item colors
	3765	+ return;
	3766	+ } else if (event.getSource() == selectableCB)
	3767	+ {
	3768	+ copy.dontselect ^= true;
3062	3769	return;
3063	3770	} else if (event.getSource() == hideCB)
3064	3771	{
3065	3772	copy.hide ^= true;
3066	3773	copy.Touch(); // display list issue
3067		- objEditor.refreshContents();
	3774	+ objEditor.refreshContents(true); // To show item colors
3068	3775	return;
3069	3776	} else if (event.getSource() == link2masterCB)
3070	3777	{
..	..	@@ -3074,6 +3781,7 @@
3074	3781	if (event.getSource() == randomCB)
3075	3782	{
3076	3783	copy.random ^= true;
	3784	+ objEditor.refreshContents();
3077	3785	return;
3078	3786	}
3079	3787	if (event.getSource() == speedupCB)
..	..	@@ -3097,8 +3805,9 @@
3097	3805
3098	3806	public void actionPerformed(ActionEvent event)
3099	3807	{
	3808	+ Object source = event.getSource();
3100	3809	// SCRIPT DIALOG
3101		- if (event.getSource() == okbutton)
	3810	+ if (source == okbutton)
3102	3811	{
3103	3812	textpanel.setVisible(false);
3104	3813	textpanel.remove(textarea);
..	..	@@ -3110,7 +3819,7 @@
3110	3819	textarea = null;
3111	3820	textpanel = null;
3112	3821	}
3113		- if (event.getSource() == cancelbutton)
	3822	+ if (source == cancelbutton)
3114	3823	{
3115	3824	textpanel.setVisible(false);
3116	3825	textpanel.remove(textarea);
..	..	@@ -3122,49 +3831,50 @@
3122	3831	//applySelf();
3123	3832	//client.refreshEditWindow();
3124	3833	//refreshContents();
3125		- if (event.getSource() == nameField)
	3834	+ if (source == nameField)
3126	3835	{
3127	3836	//System.out.println("ObjEditor " + event);
3128	3837	applySelf0(true);
3129	3838	//parent.applySelf();
3130	3839	objEditor.refreshContents();
3131		- } else if (event.getSource() == resetButton)
	3840	+ } else if (source == resetButton)
3132	3841	{
3133	3842	CameraPane.fullreset = true;
3134	3843	copy.Reset(); // ResetMeshes();
3135	3844	copy.Touch();
3136	3845	objEditor.refreshContents();
3137		- } else if (event.getSource() == stepItem)
	3846	+ } else if (source == stepItem)
3138	3847	{
3139		- cameraView.ONESTEP = true;
	3848	+ //cameraView.ONESTEP = true;
	3849	+ Globals.ONESTEP = true;
3140	3850	cameraView.repaint();
3141	3851	return;
3142		- } else if (event.getSource() == stepButton)
	3852	+ } else if (source == stepButton)
3143	3853	{
3144	3854	copy.Step();
3145	3855	copy.Touch();
3146	3856	objEditor.refreshContents();
3147		- } else if (event.getSource() == slowerButton)
	3857	+ } else if (source == slowerButton)
3148	3858	{
3149	3859	copy.Slower();
3150	3860	copy.Touch();
3151	3861	objEditor.refreshContents();
3152		- } else if (event.getSource() == fasterButton)
	3862	+ } else if (source == fasterButton)
3153	3863	{
3154	3864	copy.Faster();
3155	3865	copy.Touch();
3156	3866	objEditor.refreshContents();
3157		- } else if (event.getSource() == remarkButton)
	3867	+ } else if (source == remarkButton)
3158	3868	{
3159	3869	copy.Remark();
3160	3870	copy.Touch();
3161	3871	objEditor.refreshContents();
3162		- } else if (event.getSource() == stepAllButton)
	3872	+ } else if (source == stepAllButton)
3163	3873	{
3164	3874	copy.StepAll();
3165	3875	copy.Touch();
3166	3876	objEditor.refreshContents();
3167		- } else if (event.getSource() == resetAllButton)
	3877	+ } else if (source == resetAllButton)
3168	3878	{
3169	3879	//CameraPane.fullreset = true;
3170	3880	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3197,53 +3907,79 @@
3197	3907	// Close();
3198	3908	// }
3199	3909	// else
3200		- if (event.getSource() == resetSlidersButton)
	3910	+ if (source == resetSlidersButton)
3201	3911	{
3202	3912	ResetSliders();
3203		- } else if (event.getSource() == clearMaterialButton)
	3913	+ } else if (source == clearMaterialButton)
3204	3914	{
3205	3915	ClearMaterial();
3206		- } else if (event.getSource() == createMaterialButton)
	3916	+ } else if (source == createMaterialButton)
3207	3917	{
3208	3918	CreateMaterial();
3209		- } else if (event.getSource() == clearPanelButton)
	3919	+ } else if (source == clearPanelButton)
3210	3920	{
3211	3921	copy.ClearUI();
3212	3922	refreshContents(true);
3213		- } /*
3214		- }
3215		-
3216		- public boolean action(Event event, Object arg)
3217		- {
3218		- */ else if (event.getSource() == closeItem)
	3923	+ } else if (source == importGFDItem)
	3924	+ {
	3925	+ ImportGFD();
	3926	+ } else
	3927	+ if (source == importVRMLX3DItem)
	3928	+ {
	3929	+ ImportVRMLX3D();
	3930	+ } else
	3931	+ if (source == import3DSItem)
	3932	+ {
	3933	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3934	+ } else
	3935	+ if (source == importOBJItem)
	3936	+ {
	3937	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3938	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3939	+ browser.setVisible(true);
	3940	+ String filename = browser.getFile();
	3941	+ if (filename != null && filename.length() > 0)
	3942	+ {
	3943	+ String fullname = browser.getDirectory() + filename;
	3944	+ makeSomething(ReadOBJ(fullname), true);
	3945	+ }
	3946	+ } else
	3947	+ if (source == closeItem)
3219	3948	{
3220	3949	Close();
3221	3950	//return true;
3222		- } else if (event.getSource() == loadItem)
	3951	+ } else if (source == openItem)
3223	3952	{
3224		- load();
	3953	+ Open();
3225	3954	//return true;
3226		- } else if (event.getSource() == saveItem)
	3955	+ } else if (source == newItem)
	3956	+ {
	3957	+ New();
	3958	+ } else if (source == saveItem)
3227	3959	{
3228	3960	save();
3229	3961	//return true;
3230		- } else if (event.getSource() == saveAsItem)
	3962	+ } else if (source == saveAsItem)
3231	3963	{
3232	3964	saveAs();
3233	3965	//return true;
3234		- } else if (event.getSource() == reexportItem)
	3966	+ } else if (source == reexportItem)
3235	3967	{
3236	3968	reexport();
3237	3969	//return true;
3238		- } else if (event.getSource() == exportAsItem)
	3970	+ } else if (source == exportAsItem)
3239	3971	{
3240	3972	export();
3241	3973	//return true;
3242		- } else if (event.getSource() == povItem)
	3974	+ } else if (source == povItem)
3243	3975	{
3244	3976	generatePOV();
3245	3977	//return true;
3246		- } else if (event.getSource() == zBufferItem)
	3978	+ } else if (event.getSource() == archiveItem)
	3979	+ {
	3980	+ cTools.Archive(frame);
	3981	+ return;
	3982	+ } else if (source == zBufferItem)
3247	3983	{
3248	3984	try
3249	3985	{
..	..	@@ -3265,21 +4001,8 @@
3265	4001	cameraView.repaint();
3266	4002	//return true;
3267	4003	}
3268		- */ else if (event.getSource() == editCameraItem)
3269		- {
3270		- cameraView.ProtectCamera();
3271		- cameraView.repaint();
3272		- return;
3273		- } else if (event.getSource() == revertCameraItem)
3274		- {
3275		- cameraView.RevertCamera();
3276		- cameraView.repaint();
3277		- return;
3278		-// } else if (event.getSource() == textureButton)
3279		-// {
3280		-// return; // true;
3281		- } else // combos...
3282		- if (event.getSource() == texresMenu)
	4004	+ */ else // combos...
	4005	+ if (source == texresMenu)
3283	4006	{
3284	4007	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3285	4008	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3291,27 +4014,492 @@
3291	4014	}
3292	4015	}
3293	4016
3294		- void ToggleAnimation()
	4017	+ void New()
3295	4018	{
3296		- if (!CameraPane.ANIMATION)
	4019	+ while (copy.Size() > 1)
3297	4020	{
3298		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4021	+ copy.remove(1);
	4022	+ }
	4023	+
	4024	+ ResetModel();
	4025	+ objEditor.refreshContents();
	4026	+ }
	4027	+
	4028	+ static public byte[] Compress(Object3D o)
	4029	+ {
	4030	+ // Slower to actually compress.
	4031	+ try
	4032	+ {
	4033	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4034	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4035	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4036	+
	4037	+ Object3D parent = o.parent;
	4038	+ o.parent = null;
	4039	+
	4040	+ out.writeObject(o);
	4041	+
	4042	+ o.parent = parent;
	4043	+
	4044	+ out.flush();
	4045	+
	4046	+ baos //zstream
	4047	+ .close();
	4048	+ out.close();
	4049	+
	4050	+ byte[] bytes = baos.toByteArray();
	4051	+
	4052	+ System.out.println("save #bytes = " + bytes.length);
	4053	+ return bytes;
	4054	+ } catch (Exception e)
	4055	+ {
	4056	+ System.err.println(e);
	4057	+ return null;
	4058	+ }
	4059	+ }
	4060	+
	4061	+ static public Object Uncompress(byte[] bytes)
	4062	+ {
	4063	+ System.out.println("restore #bytes = " + bytes.length);
	4064	+ try
	4065	+ {
	4066	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4067	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4068	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4069	+ Object obj = in.readObject();
	4070	+
	4071	+ bais //istream
	4072	+ .close();
	4073	+ in.close();
	4074	+
	4075	+ return obj;
	4076	+ } catch (Exception e)
	4077	+ {
	4078	+ System.err.println(e);
	4079	+ return null;
	4080	+ }
	4081	+ }
	4082	+
	4083	+ static public Object clone(Object o)
	4084	+ {
	4085	+ try
	4086	+ {
	4087	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4088	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4089	+
	4090	+ out.writeObject(o);
	4091	+
	4092	+ out.flush();
	4093	+ out.close();
	4094	+
	4095	+ byte[] bytes = baos.toByteArray();
	4096	+
	4097	+ System.out.println("clone = " + bytes.length);
	4098	+
	4099	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4100	+ ObjectInputStream in = new ObjectInputStream(bais);
	4101	+ Object obj = in.readObject();
	4102	+ in.close();
	4103	+
	4104	+ return obj;
	4105	+ } catch (Exception e)
	4106	+ {
	4107	+ System.err.println(e);
	4108	+ return null;
	4109	+ }
	4110	+ }
	4111	+
	4112	+ cRadio GetCurrentTab()
	4113	+ {
	4114	+ cRadio ab;
	4115	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4116	+ {
	4117	+ ab = (cRadio)e.nextElement();
	4118	+ if(ab.GetObject() == copy)
	4119	+ {
	4120	+ return ab;
	4121	+ }
	4122	+ }
	4123	+
	4124	+ return null;
	4125	+ }
	4126	+
	4127	+
	4128	+ public void Save()
	4129	+ {
	4130	+ //Save(true);
	4131	+ Replace();
	4132	+ SetUndoStates();
	4133	+ }
	4134	+
	4135	+ private boolean Equal(byte[] compress, byte[] name)
	4136	+ {
	4137	+ if (compress.length != name.length)
	4138	+ {
	4139	+ return false;
	4140	+ }
	4141	+
	4142	+ for (int i=compress.length; --i>=0;)
	4143	+ {
	4144	+ if (compress[i] != name[i])
	4145	+ return false;
	4146	+ }
	4147	+
	4148	+ return true;
	4149	+ }
	4150	+
	4151	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4152	+
	4153	+ void DeleteVersion()
	4154	+ {
	4155	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4156	+ {
	4157	+ copy.versionlist[i] = copy.versionlist[i+1];
	4158	+ }
	4159	+
	4160	+ CopyChanged();
	4161	+
	4162	+ SetUndoStates();
	4163	+ }
	4164	+
	4165	+ public boolean Save(boolean user)
	4166	+ {
	4167	+ System.err.println("Save");
	4168	+ Replace();
	4169	+
	4170	+ //cRadio tab = GetCurrentTab();
	4171	+
	4172	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4173	+
	4174	+ boolean thesame = false;
	4175	+
	4176	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4177	+// {
	4178	+// thesame = true;
	4179	+// }
	4180	+
	4181	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4182	+ if (!thesame)
	4183	+ {
	4184	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4185	+ {
	4186	+ copy.versionlist[i] = copy.versionlist[i-1];
	4187	+ }
	4188	+
	4189	+ //tab.user[tab.versionindex] = user;
	4190	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4191	+
	4192	+ copy.versionlist[++copy.versionindex] = compress;
	4193	+
	4194	+ // if (increment)
	4195	+ // tab.versionindex++;
	4196	+ }
	4197	+
	4198	+ //copy.RestoreBigData(versiontable);
	4199	+
	4200	+ //assert(hashtable.isEmpty());
	4201	+
	4202	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4203	+// {
	4204	+// //tab.user[i] = false;
	4205	+// copy.versionlist[i] = null;
	4206	+// }
	4207	+
	4208	+ SetUndoStates();
	4209	+
	4210	+ // test save
	4211	+ if (false)
	4212	+ {
	4213	+ try
	4214	+ {
	4215	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4216	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4217	+
	4218	+ p.writeObject(copy);
	4219	+
	4220	+ p.flush();
	4221	+
	4222	+ ostream.close();
	4223	+ } catch (Exception e)
	4224	+ {
	4225	+ e.printStackTrace();
	4226	+ }
	4227	+ }
	4228	+
	4229	+ return !thesame;
	4230	+ }
	4231	+
	4232	+ boolean flashIt = true;
	4233	+
	4234	+ void RefreshSelection()
	4235	+ {
	4236	+ Object3D selection = new Object3D();
	4237	+
	4238	+ for (int i = 0; i < copy.selection.size(); i++)
	4239	+ {
	4240	+ Object3D elem = copy.selection.elementAt(i);
	4241	+
	4242	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4243	+
	4244	+ if (obj == null)
	4245	+ {
	4246	+ copy.selection.remove(i--);
	4247	+ }
	4248	+ else
	4249	+ {
	4250	+ selection.add(obj);
	4251	+ copy.selection.setElementAt(obj, i);
	4252	+ }
	4253	+ }
	4254	+
	4255	+ flashIt = false;
	4256	+ GetTree().clearSelection();
	4257	+ for (int i = 0; i < selection.size(); i++)
	4258	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4259	+ flashIt = true;
	4260	+
	4261	+ //refreshContents(false);
	4262	+ }
	4263	+
	4264	+ void CopyChanged()
	4265	+ {
	4266	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4267	+
	4268	+ SetUndoStates();
	4269	+
	4270	+ boolean temp = CameraPane.SWITCH;
	4271	+ CameraPane.SWITCH = false;
	4272	+
	4273	+ copy.ExtractBigData(versiontable);
	4274	+
	4275	+ copy.clear();
	4276	+
	4277	+ copy.skyboxname = obj.skyboxname;
	4278	+ copy.skyboxext = obj.skyboxext;
	4279	+
	4280	+ for (int i=0; i<obj.Size(); i++)
	4281	+ {
	4282	+ copy.add(obj.get(i));
	4283	+ }
	4284	+
	4285	+ copy.RestoreBigData(versiontable);
	4286	+
	4287	+ CameraPane.SWITCH = temp;
	4288	+
	4289	+ RefreshSelection();
	4290	+ //assert(hashtable.isEmpty());
	4291	+
	4292	+ copy.Touch();
	4293	+
	4294	+ ResetModel();
	4295	+ copy.HardTouch(); // recompile?
	4296	+
	4297	+ cRadio ab;
	4298	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4299	+ {
	4300	+ ab = (cRadio)e.nextElement();
	4301	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4302	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4303	+ if (test != null)
	4304	+ {
	4305	+ test.editWindow = ab.object.editWindow;
	4306	+ ab.object = test;
	4307	+ }
	4308	+ }
	4309	+
	4310	+ refreshContents(true);
	4311	+ }
	4312	+
	4313	+ cButton previousVersionButton;
	4314	+ cButton restoreButton;
	4315	+ cButton replaceButton;
	4316	+ cButton nextVersionButton;
	4317	+ cButton saveVersionButton;
	4318	+ cButton deleteVersionButton;
	4319	+
	4320	+ boolean muteSlider;
	4321	+
	4322	+ int VersionCount()
	4323	+ {
	4324	+ int count = 0;
	4325	+
	4326	+ for (int i = copy.versionlist.length; --i >= 0;)
	4327	+ {
	4328	+ if (copy.versionlist[i] != null)
	4329	+ count++;
	4330	+ }
	4331	+
	4332	+ return count;
	4333	+ }
	4334	+
	4335	+ void SetUndoStates()
	4336	+ {
	4337	+ //if (true)
	4338	+ // return;
	4339	+
	4340	+ //cRadio tab = GetCurrentTab();
	4341	+
	4342	+ restoreButton.setEnabled(copy.versionindex != -1);
	4343	+ replaceButton.setEnabled(copy.versionindex != -1);
	4344	+
	4345	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4346	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4347	+
	4348	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4349	+ copy.versionlist[copy.versionindex + 1] != null);
	4350	+
	4351	+ muteSlider = true;
	4352	+ versionSlider.setMinimum(0);
	4353	+ versionSlider.setMaximum(VersionCount() - 1);
	4354	+ versionSlider.setInteger(copy.versionindex);
	4355	+ versionSlider.setEnabled(copy.versionindex != -1);
	4356	+ muteSlider = false;
	4357	+ }
	4358	+
	4359	+ public boolean PreviousVersion()
	4360	+ {
	4361	+ // Option?
	4362	+ Replace();
	4363	+
	4364	+ System.err.println("Undo");
	4365	+
	4366	+ //cRadio tab = GetCurrentTab();
	4367	+
	4368	+ if (copy.versionindex == 0)
	4369	+ {
	4370	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4371	+ return false;
	4372	+ }
	4373	+
	4374	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4375	+// {
	4376	+// if (Save(false))
	4377	+// tab.versionindex -= 1;
	4378	+// else
	4379	+// {
	4380	+// if (tab.versionindex <= 0)
	4381	+// return false;
	4382	+// else
	4383	+// tab.versionindex -= 1;
	4384	+// }
	4385	+// }
	4386	+
	4387	+ copy.versionindex -= 1;
	4388	+
	4389	+ CopyChanged();
	4390	+
	4391	+ return true;
	4392	+ }
	4393	+
	4394	+ public boolean Restore()
	4395	+ {
	4396	+ System.err.println("Restore");
	4397	+
	4398	+ //cRadio tab = GetCurrentTab();
	4399	+
	4400	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4401	+ {
	4402	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4403	+ return false;
	4404	+ }
	4405	+
	4406	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4407	+ CopyChanged();
	4408	+
	4409	+ return true;
	4410	+ }
	4411	+
	4412	+ public boolean Replace()
	4413	+ {
	4414	+ System.err.println("Replace");
	4415	+
	4416	+ //cRadio tab = GetCurrentTab();
	4417	+
	4418	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4419	+ {
	4420	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4421	+ return false;
	4422	+ }
	4423	+
	4424	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4425	+
	4426	+ return true;
	4427	+ }
	4428	+
	4429	+ public void NextVersion()
	4430	+ {
	4431	+ // Option?
	4432	+ Replace();
	4433	+
	4434	+ //cRadio tab = GetCurrentTab();
	4435	+
	4436	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4437	+ {
	4438	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4439	+ return;
	4440	+ }
	4441	+
	4442	+ copy.versionindex += 1;
	4443	+
	4444	+ CopyChanged();
	4445	+
	4446	+ //if (!tab.user[tab.versionindex])
	4447	+ // tab.graphs[tab.versionindex] = null;
	4448	+ }
	4449	+
	4450	+ void ImportGFD()
	4451	+ {
	4452	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3299	4453	browser.show();
3300	4454	String filename = browser.getFile();
3301	4455	if (filename != null && filename.length() > 0)
3302	4456	{
3303		- CameraPane.filename = browser.getDirectory() + filename;
	4457	+ String fullname = browser.getDirectory() + filename;
	4458	+
	4459	+ //Object3D readobj =
	4460	+ objEditor.ReadGFD(fullname, objEditor);
	4461	+ //makeSomething(readobj);
	4462	+ }
	4463	+ }
	4464	+
	4465	+ void ImportVRMLX3D()
	4466	+ {
	4467	+ if (Grafreed.standAlone)
	4468	+ {
	4469	+ /**/
	4470	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4471	+ browser.show();
	4472	+ String filename = browser.getFile();
	4473	+ if (filename != null && filename.length() > 0)
	4474	+ {
	4475	+ String fullname = browser.getDirectory() + filename;
	4476	+ LoadVRMLX3D(fullname);
	4477	+ }
	4478	+ /**/
	4479	+ }
	4480	+ }
	4481	+
	4482	+ void ToggleAnimation()
	4483	+ {
	4484	+ if (!Globals.ANIMATION)
	4485	+ {
	4486	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4487	+ browser.setVisible(true);
	4488	+ String filename = browser.getFile();
	4489	+ if (filename != null && filename.length() > 0)
	4490	+ {
	4491	+ Globals.filename = browser.getDirectory() + filename;
3304	4492	//CameraPane.framecount = 0;
3305		- CameraPane.imagecount = 0;
	4493	+ Globals.imagecount = 0;
3306	4494
3307		- CameraPane.ANIMATION ^= true;
	4495	+ Globals.ANIMATION ^= true;
3308	4496
3309		- GrafreeD.wav.cursor = 0;
3310		- GrafreeD.wav.loop = 0;
	4497	+ Grafreed.wav.cursor = 0;
	4498	+ Grafreed.wav.loop = 0;
3311	4499	}
3312	4500	} else
3313	4501	{
3314		- CameraPane.ANIMATION ^= true;
	4502	+ Globals.ANIMATION ^= true;
3315	4503	}
3316	4504	}
3317	4505
..	..	@@ -3357,7 +4545,7 @@
3357	4545	void CreateMaterial()
3358	4546	{
3359	4547	//copy.ClearMaterial(); // PATCH
3360		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4548	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3361	4549	if (copy.selection.size() > 0)
3362	4550	//SetMaterial(copy);
3363	4551	{
..	..	@@ -3408,7 +4596,7 @@
3408	4596	assert false;
3409	4597	}
3410	4598
3411		- void EditSelection()
	4599	+ void EditSelection(boolean newWindow)
3412	4600	{
3413	4601	}
3414	4602
..	..	@@ -3416,11 +4604,11 @@
3416	4604	{
3417	4605	copy.ResetBlockLoop(); // temporary problem
3418	4606
3419		- boolean random = CameraPane.RANDOM;
3420		- CameraPane.RANDOM = false; // parse everything
	4607	+ boolean random = CameraPane.SWITCH;
	4608	+ CameraPane.SWITCH = false; // parse everything
3421	4609	copy.ResetDisplayList();
3422	4610	copy.HardTouch();
3423		- CameraPane.RANDOM = random;
	4611	+ CameraPane.SWITCH = random;
3424	4612	}
3425	4613
3426	4614	// public void applySelf()
..	..	@@ -3467,7 +4655,7 @@
3467	4655	//copy.material = new cMaterial(copy.GetMaterial());
3468	4656
3469	4657	current.color = (float) colorField.getFloat();
3470		- current.modulation = (float) modulationField.getFloat();
	4658	+ current.modulation = (float) saturationField.getFloat();
3471	4659	current.metalness = (float) metalnessField.getFloat();
3472	4660	current.diffuse = (float) diffuseField.getFloat();
3473	4661	current.specular = (float) specularField.getFloat();
..	..	@@ -3490,10 +4678,40 @@
3490	4678	current.fakedepth = (float) fakedepthField.getFloat();
3491	4679	current.shadowbias = (float) shadowbiasField.getFloat();
3492	4680
3493		- if (!NumberSlider.frozen)
	4681	+ if (!cNumberSlider.frozen)
3494	4682	{
3495	4683	//System.out.println("Propagate = " + propagate);
3496	4684	copy.UpdateMaterial(anchor, current, propagate);
	4685	+
	4686	+ if (copy.material != null)
	4687	+ {
	4688	+ cMaterial mat = copy.material;
	4689	+
	4690	+ colorField.SetToolTipValue((mat.color));
	4691	+ saturationField.SetToolTipValue((mat.modulation));
	4692	+ metalnessField.SetToolTipValue((mat.metalness));
	4693	+ diffuseField.SetToolTipValue((mat.diffuse));
	4694	+ specularField.SetToolTipValue((mat.specular));
	4695	+ shininessField.SetToolTipValue((mat.shininess));
	4696	+ shiftField.SetToolTipValue((mat.shift));
	4697	+ ambientField.SetToolTipValue((mat.ambient));
	4698	+ lightareaField.SetToolTipValue((mat.lightarea));
	4699	+ diffusenessField.SetToolTipValue((mat.factor));
	4700	+ velvetField.SetToolTipValue((mat.velvet));
	4701	+ sheenField.SetToolTipValue((mat.sheen));
	4702	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4703	+ backlitField.SetToolTipValue((mat.bump));
	4704	+ anisoField.SetToolTipValue((mat.aniso));
	4705	+ anisoVField.SetToolTipValue((mat.anisoV));
	4706	+ cameraField.SetToolTipValue((mat.cameralight));
	4707	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4708	+ shadowField.SetToolTipValue((mat.shadow));
	4709	+ textureField.SetToolTipValue((mat.texture));
	4710	+ opacityField.SetToolTipValue((mat.opacity));
	4711	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4712	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4713	+ }
	4714	+
3497	4715	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3498	4716	{
3499	4717	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3522,9 +4740,26 @@
3522	4740	//copy.Touch();
3523	4741	}
3524	4742
	4743	+ cNumberSlider versionSlider;
	4744	+
3525	4745	public void stateChanged(ChangeEvent e)
3526	4746	{
3527	4747	// assert(false);
	4748	+ if (e.getSource() == versionSlider)
	4749	+ {
	4750	+ if (muteSlider)
	4751	+ return;
	4752	+
	4753	+ int version = versionSlider.getInteger();
	4754	+
	4755	+ if (version != -1 && copy.versionlist[version] != null)
	4756	+ {
	4757	+ copy.versionindex = version;
	4758	+ CopyChanged();
	4759	+ }
	4760	+
	4761	+ return;
	4762	+ }
3528	4763
3529	4764	if (freezematerial)
3530	4765	{
..	..	@@ -3538,6 +4773,7 @@
3538	4773	\|\| e.getSource() == apertureField
3539	4774	\|\| e.getSource() == shadowblurField)
3540	4775	{
	4776	+ new Exception().printStackTrace();
3541	4777	System.exit(0);
3542	4778	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3543	4779	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3559,6 +4795,12 @@
3559	4795	{
3560	4796	//System.out.println("stateChanged = " + this);
3561	4797	materialtouched = true;
	4798	+
	4799	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4800	+ {
	4801	+ saturationField.setFloat(1);
	4802	+ }
	4803	+
3562	4804	applySelf();
3563	4805	//System.out.println("this = " + this);
3564	4806	//System.out.println("PARENT = " + parent);
..	..	@@ -3608,7 +4850,7 @@
3608	4850	}
3609	4851
3610	4852	if (normalpushField != null)
3611		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4853	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3612	4854	}
3613	4855
3614	4856	void SnapObject()
..	..	@@ -3858,20 +5100,26 @@
3858	5100	{
3859	5101	if (GetTree() != null)
3860	5102	{
	5103	+ GetTree().revalidate();
3861	5104	GetTree().repaint();
3862	5105	}
3863	5106
3864	5107	radioPanel.revalidate();
3865	5108	radioPanel.repaint();
3866		- ctrlPanel.revalidate(); // ? new
	5109	+ ctrlPanel.validate(); // ? new
3867	5110	ctrlPanel.repaint();
3868	5111	}
	5112	+
	5113	+ if (previousVersionButton != null && copy.versionlist != null)
	5114	+ SetUndoStates();
3869	5115	}
3870	5116
3871	5117	static TweenManager tweenManager = new TweenManager();
3872	5118
3873	5119	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3874	5120	{
	5121	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5122	+ Save();
3875	5123	//Tween.set(thing, 0).target(1).start(tweenManager);
3876	5124	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3877	5125	// if (thing instanceof GenericJointDemo)
..	..	@@ -3958,6 +5206,12 @@
3958	5206	{
3959	5207	ResetModel();
3960	5208	Select(thing.GetTreePath(), true, false); // unselect... false);
	5209	+
	5210	+ if (thing.Size() == 0)
	5211	+ {
	5212	+ //EditSelection(false);
	5213	+ }
	5214	+
3961	5215	refreshContents();
3962	5216	}
3963	5217
..	..	@@ -4075,6 +5329,7 @@
4075	5329	}
4076	5330	}
4077	5331	}
	5332	+
4078	5333	LoadGFDThread loadGFDThread;
4079	5334
4080	5335	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4094,8 +5349,10 @@
4094	5349
4095	5350	try
4096	5351	{
	5352	+ // Try compressed version first.
4097	5353	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4098		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5354	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5355	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4099	5356
4100	5357	readobj = (Object3D) p.readObject();
4101	5358	istream.close();
..	..	@@ -4103,7 +5360,22 @@
4103	5360	readobj.ResetDisplayList();
4104	5361	} catch (Exception e)
4105	5362	{
4106		- e.printStackTrace();
	5363	+ if (!e.toString().contains("GZIP"))
	5364	+ e.printStackTrace();
	5365	+
	5366	+ try
	5367	+ {
	5368	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5369	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5370	+
	5371	+ readobj = (Object3D) p.readObject();
	5372	+ istream.close();
	5373	+
	5374	+ readobj.ResetDisplayList();
	5375	+ } catch (Exception e2)
	5376	+ {
	5377	+ e2.printStackTrace();
	5378	+ }
4107	5379	}
4108	5380	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4109	5381	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4149,6 +5421,12 @@
4149	5421
4150	5422	void LoadIt(Object obj)
4151	5423	{
	5424	+ if (obj == null)
	5425	+ {
	5426	+ // Invalid file
	5427	+ return;
	5428	+ }
	5429	+
4152	5430	System.out.println("Loaded " + obj);
4153	5431	//new Exception().printStackTrace();
4154	5432	Object3D readobj = (Object3D) obj;
..	..	@@ -4158,10 +5436,14 @@
4158	5436
4159	5437	if (readobj != null)
4160	5438	{
	5439	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5440	+ // Save();
4161	5441	try
4162	5442	{
4163	5443	//readobj.deepCopySelf(copy);
4164	5444	copy.clear(); // june 2014
	5445	+ copy.skyboxname = readobj.skyboxname;
	5446	+ copy.skyboxext = readobj.skyboxext;
4165	5447	for (int i = 0; i < readobj.size(); i++)
4166	5448	{
4167	5449	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4202,6 +5484,7 @@
4202	5484	}
4203	5485	} catch (ClassCastException e)
4204	5486	{
	5487	+ e.printStackTrace();
4205	5488	assert (false);
4206	5489	Composite c = (Composite) copy;
4207	5490	c.children.clear();
..	..	@@ -4212,17 +5495,31 @@
4212	5495	c.addChild(csg);
4213	5496	}
4214	5497
	5498	+ copy.versionlist = readobj.versionlist;
	5499	+ copy.versionindex = readobj.versionindex;
	5500	+
	5501	+ if (copy.versionlist == null)
	5502	+ {
	5503	+ // Backward compatibility
	5504	+ copy.versionlist = new Object3D[100];
	5505	+ copy.versionindex = -1;
	5506	+
	5507	+ Save(true);
	5508	+ }
	5509	+
	5510	+ //? SetUndoStates();
	5511	+
4215	5512	ResetModel();
4216	5513	copy.HardTouch(); // recompile?
4217	5514	refreshContents();
4218	5515	}
4219	5516	}
4220	5517
4221		- void load() // throws ClassNotFoundException
	5518	+ void Open() // throws ClassNotFoundException
4222	5519	{
4223		- if (GrafreeD.standAlone)
	5520	+ if (Grafreed.standAlone)
4224	5521	{
4225		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5522	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4226	5523	browser.show();
4227	5524	String filename = browser.getFile();
4228	5525	if (filename != null && filename.length() > 0)
..	..	@@ -4307,11 +5604,13 @@
4307	5604	try
4308	5605	{
4309	5606	FileOutputStream ostream = new FileOutputStream(lastname);
4310		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5607	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5608	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4311	5609
4312	5610	p.writeObject(copy);
4313	5611	p.flush();
4314	5612
	5613	+ zstream.close();
4315	5614	ostream.close();
4316	5615
4317	5616	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4319,19 +5618,23 @@
4319	5618	//ps.print(buffer.toString());
4320	5619	} catch (IOException e)
4321	5620	{
	5621	+ e.printStackTrace();
4322	5622	}
4323	5623	}
	5624	+
4324	5625	String lastname;
4325	5626
4326	5627	void saveAs()
4327	5628	{
4328		- if (GrafreeD.standAlone)
	5629	+ if (Grafreed.standAlone)
4329	5630	{
4330	5631	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4331	5632	browser.setVisible(true);
4332	5633	String filename = browser.getFile();
4333	5634	if (filename != null && filename.length() > 0)
4334	5635	{
	5636	+ if (!filename.endsWith(".gfd"))
	5637	+ filename += ".gfd";
4335	5638	lastname = browser.getDirectory() + filename;
4336	5639	save();
4337	5640	}
..	..	@@ -4430,13 +5733,13 @@
4430	5733	try
4431	5734	{
4432	5735	FileOutputStream ostream = new FileOutputStream(filename);
4433		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4434		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5736	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5737	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4435	5738
4436	5739	Object3D objectparent = obj.parent;
4437	5740	obj.parent = null;
4438	5741
4439		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5742	+ Object3D object = (Object3D) Grafreed.clone(obj);
4440	5743
4441	5744	obj.parent = objectparent;
4442	5745
..	..	@@ -4448,8 +5751,8 @@
4448	5751	p.writeObject(object);
4449	5752	p.flush();
4450	5753
	5754	+ zstream.close();
4451	5755	ostream.close();
4452		- // zstream.close();
4453	5756
4454	5757	// group.selection.get(0).parent = parent;
4455	5758	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4470,7 +5773,7 @@
4470	5773	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4471	5774	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4472	5775	copy.generatePOV(buffer);
4473		- if (GrafreeD.standAlone)
	5776	+ if (Grafreed.standAlone)
4474	5777	{
4475	5778	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4476	5779	browser.show();
..	..	@@ -4496,21 +5799,20 @@
4496	5799	Object3D client;
4497	5800	Object3D copy;
4498	5801	MenuBar menuBar;
4499		- Menu windowMenu;
4500		- MenuItem loadItem;
	5802	+ Menu fileMenu;
	5803	+ MenuItem newItem;
	5804	+ MenuItem openItem;
4501	5805	MenuItem saveItem;
4502	5806	MenuItem saveAsItem;
4503	5807	MenuItem exportAsItem;
4504	5808	MenuItem reexportItem;
4505	5809	MenuItem povItem;
4506	5810	MenuItem closeItem;
4507		- Menu cameraMenu;
	5811	+
4508	5812	CheckboxMenuItem zBufferItem;
4509	5813	//MenuItem normalLensItem;
4510		- MenuItem editCameraItem;
4511		- MenuItem revertCameraItem;
4512		- CheckboxMenuItem toggleLiveItem;
4513	5814	MenuItem stepItem;
	5815	+ CheckboxMenuItem toggleLiveItem;
4514	5816	CheckboxMenuItem toggleFullScreenItem;
4515	5817	CheckboxMenuItem toggleTimelineItem;
4516	5818	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4519,28 +5821,43 @@
4519	5821	CheckboxMenuItem toggleFootContactItem;
4520	5822	CheckboxMenuItem toggleDLItem;
4521	5823	CheckboxMenuItem toggleTextureItem;
4522		- CheckboxMenuItem toggleRandomItem;
	5824	+ CheckboxMenuItem toggleSwitchItem;
4523	5825	CheckboxMenuItem toggleRootItem;
4524	5826	CheckboxMenuItem animationItem;
	5827	+ MenuItem archiveItem;
4525	5828	CheckboxMenuItem toggleHandleItem;
4526	5829	CheckboxMenuItem togglePaintItem;
4527	5830	JSplitPane mainPanel;
4528	5831	JScrollPane scrollpane;
	5832	+
4529	5833	JPanel toolbarPanel;
4530		- JPanel treePanel;
	5834	+
	5835	+ cGridBag treePanel;
	5836	+
4531	5837	JPanel radioPanel;
4532	5838	ButtonGroup buttonGroup;
4533		- JPanel ctrlPanel;
4534		- JPanel materialPanel;
	5839	+
	5840	+ cGridBag toolboxPanel;
	5841	+ cGridBag skyboxPanel;
	5842	+ cGridBag materialPanel;
	5843	+ cGridBag ctrlPanel;
	5844	+
4535	5845	JScrollPane infoPanel;
4536		- JPanel optionsPanel;
	5846	+
	5847	+ cGridBag optionsPanel;
	5848	+
4537	5849	JTabbedPane objectPanel;
4538		- JPanel XYZPanel;
	5850	+ boolean materialFlushed;
	5851	+ Object3D latestObject;
	5852	+
	5853	+ cGridBag XYZPanel;
	5854	+
4539	5855	JSplitPane gridPanel;
4540	5856	JSplitPane bigPanel;
4541		- JPanel bigThree;
4542		- JTabbedPane scenePanel;
4543		- JPanel centralPanel;
	5857	+
	5858	+ cGridBag bigThree;
	5859	+ cGridBag scenePanel;
	5860	+ cGridBag centralPanel;
4544	5861	JSplitPane cameraPanel;
4545	5862	JPanel timelinePanel;
4546	5863	JMenuBar timelineMenubar;
..	..	@@ -4593,67 +5910,74 @@
4593	5910	// MATERIAL
4594	5911	JLabel materialLabel;
4595	5912	JLabel colorLabel;
4596		- NumberSlider colorField;
	5913	+ cNumberSlider colorField;
4597	5914	JLabel modulationLabel;
4598		- NumberSlider modulationField;
	5915	+ cNumberSlider saturationField;
4599	5916	JLabel metalnessLabel;
4600		- NumberSlider metalnessField;
	5917	+ cNumberSlider metalnessField;
4601	5918	JLabel diffuseLabel;
4602		- NumberSlider diffuseField;
	5919	+ cNumberSlider diffuseField;
4603	5920	JLabel specularLabel;
4604		- NumberSlider specularField;
	5921	+ cNumberSlider specularField;
4605	5922	JLabel shininessLabel;
4606		- NumberSlider shininessField;
	5923	+ cNumberSlider shininessField;
4607	5924	JLabel shiftLabel;
4608		- NumberSlider shiftField;
	5925	+ cNumberSlider shiftField;
4609	5926	JLabel ambientLabel;
4610		- NumberSlider ambientField;
	5927	+ cNumberSlider ambientField;
4611	5928	JLabel lightareaLabel;
4612		- NumberSlider lightareaField;
	5929	+ cNumberSlider lightareaField;
4613	5930	JLabel diffusenessLabel;
4614		- NumberSlider diffusenessField;
	5931	+ cNumberSlider diffusenessField;
4615	5932	JLabel velvetLabel;
4616		- NumberSlider velvetField;
	5933	+ cNumberSlider velvetField;
4617	5934	JLabel sheenLabel;
4618		- NumberSlider sheenField;
	5935	+ cNumberSlider sheenField;
4619	5936	JLabel subsurfaceLabel;
4620		- NumberSlider subsurfaceField;
	5937	+ cNumberSlider subsurfaceField;
4621	5938	//JLabel bumpLabel;
4622	5939	//NumberSlider bumpField;
4623	5940	JLabel backlitLabel;
4624		- NumberSlider backlitField;
	5941	+ cNumberSlider backlitField;
4625	5942	JLabel anisoLabel;
4626		- NumberSlider anisoField;
	5943	+ cNumberSlider anisoField;
4627	5944	JLabel anisoVLabel;
4628		- NumberSlider anisoVField;
	5945	+ cNumberSlider anisoVField;
	5946	+
4629	5947	JLabel cameraLabel;
4630		- NumberSlider cameraField;
	5948	+ cNumberSlider cameraField;
4631	5949	JLabel selfshadowLabel;
4632		- NumberSlider selfshadowField;
	5950	+ cNumberSlider selfshadowField;
4633	5951	JLabel shadowLabel;
4634		- NumberSlider shadowField;
	5952	+ cNumberSlider shadowField;
4635	5953	JLabel textureLabel;
4636		- NumberSlider textureField;
	5954	+ cNumberSlider textureField;
4637	5955	JLabel opacityLabel;
4638		- NumberSlider opacityField;
	5956	+ cNumberSlider opacityField;
4639	5957	JLabel fakedepthLabel;
4640		- NumberSlider fakedepthField;
	5958	+ cNumberSlider fakedepthField;
4641	5959	JLabel shadowbiasLabel;
4642		- NumberSlider shadowbiasField;
	5960	+ cNumberSlider shadowbiasField;
	5961	+
4643	5962	JLabel bumpLabel;
4644		- NumberSlider bumpField;
	5963	+ cNumberSlider bumpField;
4645	5964	JLabel noiseLabel;
4646		- NumberSlider noiseField;
	5965	+ cNumberSlider noiseField;
4647	5966	JLabel powerLabel;
4648		- NumberSlider powerField;
	5967	+ cNumberSlider powerField;
4649	5968	JLabel borderfadeLabel;
4650		- NumberSlider borderfadeField;
	5969	+ cNumberSlider borderfadeField;
4651	5970	JLabel fogLabel;
4652		- NumberSlider fogField;
	5971	+ cNumberSlider fogField;
4653	5972	JLabel opacityPowerLabel;
4654		- NumberSlider opacityPowerField;
4655		- JTree jTree;
	5973	+ cNumberSlider opacityPowerField;
	5974	+ cTree jTree;
4656	5975	//ObjectUI parent;
4657	5976
4658		- NumberSlider normalpushField;
	5977	+ cNumberSlider normalpushField;
	5978	+
	5979	+ private MenuItem importGFDItem;
	5980	+ private MenuItem importVRMLX3DItem;
	5981	+ private MenuItem import3DSItem;
	5982	+ private MenuItem importOBJItem;
4659	5983	}