~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,132 @@
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 void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
	82	+
	83	+ cButton GetButton(String name, boolean border)
	84	+ {
	85	+ ImageIcon icon = GetIcon(name);
	86	+ if (icon != null)
	87	+ return new cButton(icon, border);
	88	+ else
	89	+ return new cButton(name, border);
	90	+ }
	91	+
	92	+ cLabel GetLabel(String name, boolean border)
	93	+ {
	94	+ //ImageIcon icon = GetIcon(name);
	95	+ return new cLabel(GetImage(name), border);
	96	+ }
	97	+
	98	+ cToggleButton GetToggleButton(String name, boolean border)
	99	+ {
	100	+ ImageIcon icon = GetIcon(name);
	101	+ return new cToggleButton(icon, border);
	102	+ }
	103	+
	104	+ cCheckBox GetCheckBox(String name, boolean border)
	105	+ {
	106	+ ImageIcon icon = GetIcon(name);
	107	+ return new cCheckBox(icon, border);
	108	+ }
	109	+
	110	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	111	+
	112	+ static ImageIcon GetIcon(String name)
	113	+ {
	114	+ javax.swing.ImageIcon iconCache = icons.get(name);
	115	+ if (iconCache != null)
	116	+ {
	117	+ return iconCache;
	118	+ }
	119	+
	120	+ try
	121	+ {
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	123	+
	124	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	125	+// {
	126	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	127	+// Graphics2D g = resized.createGraphics();
	128	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	129	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	130	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	131	+// g.dispose();
	132	+//
	133	+// image = resized;
	134	+// }
	135	+
	136	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	137	+
	138	+ icons.put(name, icon);
	139	+
	140	+ return icon;
	141	+ }
	142	+ catch (Exception e)
	143	+ {
	144	+ //icons.put(name, null);
	145	+ return null;
	146	+ }
	147	+ }
	148	+
	149	+ BufferedImage GetImage(String name)
	150	+ {
	151	+ try
	152	+ {
	153	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	154	+
	155	+ return image;
	156	+ }
	157	+ catch (Exception e)
	158	+ {
	159	+ return null;
	160	+ }
	161	+ }
	162	+
34	163	// SCRIPT
35	164
36	165	transient JFrame textpanel = null;
..	..	@@ -121,51 +250,62 @@
121	250	void keyPressed(int key, int modifiers)
122	251	{
123	252	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	253	+ Globals.theRenderer.keyPressed(key, modifiers);
125	254	}
126	255	*/
127	256
128	257	static GridBagConstraints aConstraints;
129	258	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	259	+
132	260	static int GRIDWIDTH = 100; // 4;
133	261
134	262	public void closeUI()
135	263	{
136	264	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	265	+// System.out.println("this = " + this);
	266	+// System.out.println("objEditor = " + objEditor);
139	267	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	268	+// objEditor.ctrlPanel.remove(nameField);
141	269
142		- if (!GroupEditor.allparams)
	270	+ objEditor.ctrlPanel.remove(namePanel);
	271	+
	272	+ if (!allparams)
143	273	return;
144	274
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);
	275	+// objEditor.ctrlPanel.remove(liveCB);
	276	+// objEditor.ctrlPanel.remove(hideCB);
	277	+// objEditor.ctrlPanel.remove(markCB);
	278	+//
	279	+// objEditor.ctrlPanel.remove(randomCB);
	280	+// objEditor.ctrlPanel.remove(speedupCB);
	281	+// objEditor.ctrlPanel.remove(rewindCB);
	282	+//
	283	+// objEditor.ctrlPanel.remove(resetButton);
	284	+// objEditor.ctrlPanel.remove(stepButton);
	285	+//// objEditor.ctrlPanel.remove(stepAllButton);
	286	+//// objEditor.ctrlPanel.remove(resetAllButton);
	287	+// objEditor.ctrlPanel.remove(link2masterCB);
	288	+// //objEditor.ctrlPanel.remove(flipVCB);
	289	+// //objEditor.ctrlPanel.remove(texresMenu);
	290	+// objEditor.ctrlPanel.remove(slowerButton);
	291	+// objEditor.ctrlPanel.remove(fasterButton);
	292	+// objEditor.ctrlPanel.remove(remarkButton);
	293	+
	294	+ objEditor.ctrlPanel.remove(setupPanel);
	295	+ objEditor.ctrlPanel.remove(setupPanel2);
	296	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	297	+ objEditor.ctrlPanel.remove(pushPanel);
	298	+ //objEditor.ctrlPanel.remove(fillPanel);
	299	+
	300	+ //Remove(normalpushField);
163	301	}
164	302
165	303	public ObjEditor GetEditor()
166	304	{
167	305	return objEditor; //.GetEditor();
168	306	}
	307	+
	308	+ // Sometimes myself, sometimes my callee's.
169	309	ObjEditor objEditor;
170	310
171	311	/*
..	..	@@ -201,6 +341,14 @@
201	341	client = inClient;
202	342	copy = client;
203	343
	344	+// if (copy.versionlist == null)
	345	+// {
	346	+// copy.versionlist = new Object3D[100];
	347	+// copy.versionindex = -1;
	348	+//
	349	+// callee.Save(true);
	350	+// }
	351	+
204	352	// "this" is not called: SetupUI2(objEditor);
205	353	}
206	354
..	..	@@ -214,6 +362,14 @@
214	362	client = inClient;
215	363	copy = client;
216	364
	365	+ if (copy.versionlist == null)
	366	+ {
	367	+ copy.versionlist = new Object3D[100];
	368	+ copy.versionindex = -1;
	369	+
	370	+// Save(true);
	371	+ }
	372	+
217	373	SetupUI2(callee.GetEditor());
218	374	}
219	375
..	..	@@ -228,13 +384,15 @@
228	384	//localCopy.parent = null;
229	385
230	386	frame = new JFrame();
	387	+ frame.setUndecorated(false);
231	388	objEditor = this;
232	389	this.callee = callee;
233	390
234	391	//parent = p;
235	392
236	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
237		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
238	396	//gd.setFullScreenWindow(this);
239	397	//setResizable(false);
240	398	//if (!isDisplayable())
..	..	@@ -245,6 +403,14 @@
245	403	copy = localCopy;
246	404	copy.editWindow = this;
247	405
	406	+// if (copy.versionlist == null)
	407	+// {
	408	+// copy.versionlist = new Object3D[100];
	409	+// copy.versionindex = -1;
	410	+//
	411	+// Save(true);
	412	+// }
	413	+
248	414	SetupMenu();
249	415
250	416	//SetupName(objEditor); // new
..	..	@@ -258,28 +424,52 @@
258	424	return frame.action(event, obj);
259	425	}
260	426
	427	+ // Cannot work without static
	428	+ static boolean allparams = true;
	429	+
	430	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	431	+
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
261	435	void SetupMenu()
262	436	{
263	437	frame.setMenuBar(menuBar = new MenuBar());
264		- menuBar.add(windowMenu = new Menu("File"));
265		- windowMenu.add(loadItem = new MenuItem("Load..."));
266		- windowMenu.add("-");
267		- windowMenu.add(saveItem = new MenuItem("Save"));
268		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	438	+ menuBar.add(fileMenu = new Menu("File"));
	439	+ fileMenu.add(newItem = new MenuItem("New"));
	440	+ fileMenu.add(openItem = new MenuItem("Open..."));
	441	+
	442	+ //oe.menuBar.add(menu = new Menu("Include"));
	443	+ Menu menu = new Menu("Import");
	444	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	445	+ importOBJItem.addActionListener(this);
	446	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	447	+ import3DSItem.addActionListener(this);
	448	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	449	+ importVRMLX3DItem.addActionListener(this);
	450	+ menu.add("-");
	451	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	452	+ importGFDItem.addActionListener(this);
	453	+ fileMenu.add(menu);
	454	+ fileMenu.add("-");
	455	+
	456	+ fileMenu.add(saveItem = new MenuItem("Save"));
	457	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
269	458	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
270		- windowMenu.add("-");
271		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
272		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
273		- windowMenu.add("-");
	459	+ fileMenu.add("-");
	460	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	461	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	462	+ fileMenu.add("-");
274	463	if (client.parent != null)
275	464	{
276		- windowMenu.add(closeItem = new MenuItem("Close"));
	465	+ fileMenu.add(closeItem = new MenuItem("Close"));
277	466	} else
278	467	{
279		- windowMenu.add(closeItem = new MenuItem("Exit"));
	468	+ fileMenu.add(closeItem = new MenuItem("Exit"));
280	469	}
281	470
282		- loadItem.addActionListener(this);
	471	+ newItem.addActionListener(this);
	472	+ openItem.addActionListener(this);
283	473	saveItem.addActionListener(this);
284	474	saveAsItem.addActionListener(this);
285	475	exportAsItem.addActionListener(this);
..	..	@@ -287,82 +477,103 @@
287	477	//povItem.addActionListener(this);
288	478	closeItem.addActionListener(this);
289	479
290		- menuBar.add(cameraMenu = new Menu("View"));
291		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
292		- //zBufferItem.addActionListener(this);
293		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
294		- //normalLensItem.addActionListener(this);
295		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
296		- revertCameraItem.addActionListener(this);
297		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
298		- toggleTimelineItem.addItemListener(this);
299		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
300		- toggleFullScreenItem.addItemListener(this);
301		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
302		- cameraMenu.add("-");
303		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
304		- toggleTextureItem.addItemListener(this);
305		- toggleTextureItem.setState(CameraPane.textureon);
306		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
307		- toggleLiveItem.addItemListener(this);
308		- toggleLiveItem.setState(CameraPane.isLIVE());
309		- cameraMenu.add(stepItem = new MenuItem("Step"));
310		- stepItem.addActionListener(this);
311		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
312		-// toggleDLItem.addItemListener(this);
313		-// toggleDLItem.setState(false);
314		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
315		- toggleRenderItem.addItemListener(this);
316		- toggleRenderItem.setState(!CameraPane.frozen);
317		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
318		- toggleDebugItem.addItemListener(this);
319		- toggleDebugItem.setState(CameraPane.DEBUG);
320		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
321		- toggleFrustumItem.addItemListener(this);
322		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
323		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
324		- toggleFootContactItem.addItemListener(this);
325		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
326		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
327		- toggleRandomItem.addItemListener(this);
328		- toggleRandomItem.setState(CameraPane.RANDOM);
329		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
330		- toggleHandleItem.addItemListener(this);
331		- toggleHandleItem.setState(CameraPane.HANDLES);
332		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
333		- togglePaintItem.addItemListener(this);
334		- togglePaintItem.setState(CameraPane.PAINTMODE);
335		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
336		-// toggleRootItem.addItemListener(this);
337		-// toggleRootItem.setState(false);
338		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
339		-// animationItem.addItemListener(this);
340		-// animationItem.setState(CameraPane.ANIMATION);
341		- cameraMenu.add("-");
342		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
343		- editCameraItem.addActionListener(this);
344		-
345	480	objectPanel = new JTabbedPane();
	481	+
	482	+ ChangeListener changeListener = new ChangeListener()
	483	+ {
	484	+ //String name;
	485	+
	486	+ public void stateChanged(ChangeEvent changeEvent)
	487	+ {
	488	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	489	+// {
	490	+// if (latestObject != null)
	491	+// {
	492	+// refreshContents(true);
	493	+// SetMaterial(latestObject);
	494	+// }
	495	+//
	496	+// materialFlushed = true;
	497	+// }
	498	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	499	+// {
	500	+// if (listUI.size() == 0)
	501	+// EditSelection(false);
	502	+// }
	503	+
	504	+// if (objectPanel.getSelectedIndex() == 4)
	505	+// {
	506	+// name = copy.skyboxname;
	507	+//
	508	+// if (name == null)
	509	+// {
	510	+// name = "";
	511	+// }
	512	+//
	513	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	514	+// copy.skyboxext = "jpg";
	515	+// }
	516	+// else
	517	+// {
	518	+// if (name != null)
	519	+// {
	520	+// if (name.equals(""))
	521	+// {
	522	+// copy.skyboxname = null;
	523	+// copy.skyboxext = null;
	524	+// }
	525	+// else
	526	+// {
	527	+// copy.skyboxname = name;
	528	+// }
	529	+// }
	530	+// }
	531	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	532	+
	533	+// refreshContents(false); // To refresh Info tab
	534	+ cameraView.repaint();
	535	+ }
	536	+ };
	537	+ objectPanel.addChangeListener(changeListener);
	538	+
346	539	toolbarPanel = new JPanel();
347	540	toolbarPanel.setName("Toolbar");
348		- treePanel = new JPanel();
	541	+
	542	+ treePanel = new cGridBag();
349	543	treePanel.setName("Tree");
350		- ctrlPanel = new JPanel(); // new GridBagLayout());
351		- ctrlPanel.setName("Edit");
352		- materialPanel = new JPanel();
353		- materialPanel.setName("Material");
	544	+
	545	+ editPanel = new cGridBag().setVertical(true);
	546	+ //editPanel.setName("Edit");
	547	+
	548	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	549	+
	550	+ editCommandsPanel = new cGridBag();
	551	+ editPanel.add(editCommandsPanel);
	552	+ editPanel.add(ctrlPanel);
	553	+
	554	+ toolboxPanel = new cGridBag().setVertical(true);
	555	+ //toolboxPanel.setName("Toolbox");
	556	+
	557	+ skyboxPanel = new cGridBag().setVertical(true);
	558	+
	559	+ materialPanel = new cGridBag().setVertical(false);
	560	+ //materialPanel.setName("Material");
	561	+
354	562	/JTextPane/
355	563	infoarea = createTextPane();
	564	+ doc = infoarea.getStyledDocument();
	565	+
356	566	infoarea.setEditable(true);
357	567	SetText();
	568	+
358	569	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
359	570	// infoarea.setOpaque(false);
360	571	// //infoarea.setForeground(textcolor);
361		- infoarea.setLineWrap(true);
362		- infoarea.setWrapStyleWord(true);
	572	+// TEXTAREA infoarea.setLineWrap(true);
	573	+// TEXTAREA infoarea.setWrapStyleWord(true);
363	574	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
364		- infoPanel.setPreferredSize(new Dimension(50, 200));
365		- infoPanel.setName("Info");
	575	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	576	+ //infoPanel.setName("Info");
366	577	//infoPanel.setLayout(new BorderLayout());
367	578	//infoPanel.add(createTextPane());
368	579
..	..	@@ -370,16 +581,23 @@
370	581	mainPanel.setName("Main");
371	582	mainPanel.setContinuousLayout(true);
372	583	mainPanel.setOneTouchExpandable(true);
373		- mainPanel.setDividerLocation(1.0);
374	584	mainPanel.setDividerSize(9);
375		- mainPanel.setResizeWeight(0);
376		-
	585	+ mainPanel.setDividerLocation(0.5); //1.0);
	586	+ mainPanel.setResizeWeight(0.5);
	587	+
	588	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	589	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	590	+ divider.setDividerSize(15);
	591	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	592	+
	593	+ mainPanel.setUI(new BasicSplitPaneUI());
	594	+
377	595	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
378	596	//mainPanel.setLayout(new GridBagLayout());
379	597	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
380		- treePanel.setLayout(new GridBagLayout());
381		- ctrlPanel.setLayout(new GridBagLayout());
382		- materialPanel.setLayout(new GridBagLayout());
	598	+// treePanel.setLayout(new GridBagLayout());
	599	+ //ctrlPanel.setLayout(new GridBagLayout());
	600	+ //materialPanel.setLayout(new GridBagLayout());
383	601
384	602	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
385	603	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -418,7 +636,7 @@
418	636	static String newline = "\n";
419	637	protected static final String buttonString = "JButton";
420	638	StyledDocument doc;
421		- JTextArea infoarea;
	639	+ JTextPane infoarea;
422	640
423	641	void ClearInfo()
424	642	{
..	..	@@ -441,10 +659,10 @@
441	659	e.printStackTrace();
442	660	}
443	661
444		- String selection = infoarea.getText();
445		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
446		- java.awt.datatransfer.Clipboard clipboard =
447		- Toolkit.getDefaultToolkit().getSystemClipboard();
	662	+// String selection = infoarea.getText();
	663	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	664	+// java.awt.datatransfer.Clipboard clipboard =
	665	+// Toolkit.getDefaultToolkit().getSystemClipboard();
448	666	//clipboard.setContents(data, data);
449	667	}
450	668
..	..	@@ -467,13 +685,13 @@
467	685	//SendInfo("Name:", "bold");
468	686	if (sel.GetTextures() != null \|\| debug)
469	687	{
470		- si.SendInfo(sel.toString(), "bold");
	688	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
471	689	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
472	690	if (sel.Size() > 0)
473	691	{
474	692	si.SendInfo("#children = " + sel.Size(), "regular");
475	693	}
476		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	694	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
477	695	if (debug)
478	696	{
479	697	try
..	..	@@ -485,7 +703,10 @@
485	703	}
486	704
487	705	if (full)
488		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	706	+ {
	707	+ si.SendInfo(" BBox min: " + minima, "regular");
	708	+ si.SendInfo(" BBox max: " + maxima, "regular");
	709	+ }
489	710
490	711	if (sel.bRep != null)
491	712	{
..	..	@@ -512,7 +733,7 @@
512	733	}
513	734	if (sel.support != null)
514	735	{
515		- si.SendInfo(" support: " + sel.support, "regular");
	736	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
516	737	}
517	738	if (sel.scriptnode != null)
518	739	{
..	..	@@ -583,6 +804,9 @@
583	804	{
584	805	CameraPane.pointflow = (PointFlow) sel;
585	806	}
	807	+
	808	+ si.SendInfo("_____________________", "regular");
	809	+ si.SendInfo("", "regular");
586	810	}
587	811	}
588	812
..	..	@@ -598,68 +822,216 @@
598	822	}
599	823	}
600	824
	825	+//static GraphicsDevice device = GraphicsEnvironment
	826	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	827	+
	828	+ Rectangle keeprect;
	829	+ cRadio radio;
	830	+
	831	+cButton keepButton;
	832	+ cButton twoButton; // Full 3D
	833	+ cButton sixButton;
	834	+ cButton threeButton;
	835	+ cButton sevenButton;
	836	+ cButton fourButton; // full panel
	837	+ cButton oneButton; // full XYZ
	838	+ //cButton currentLayout;
	839	+
	840	+ boolean maximized;
	841	+
	842	+ cButton fullscreenLayout;
	843	+ cButton expandedLayout;
	844	+
	845	+ void Minimize()
	846	+ {
	847	+ frame.setState(Frame.ICONIFIED);
	848	+ frame.validate();
	849	+ }
	850	+
	851	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	852	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	853	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	854	+ void Maximize()
	855	+ {
	856	+ if (CameraPane.FULLSCREEN)
	857	+ {
	858	+ ToggleFullScreen();
	859	+ }
	860	+
	861	+ if (maximized)
	862	+ {
	863	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	864	+ }
	865	+ else
	866	+ {
	867	+ keeprect = frame.getBounds();
	868	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	869	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	870	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	871	+// frame.setState(Frame.MAXIMIZED_BOTH);
	872	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	873	+ }
	874	+
	875	+ maximized ^= true;
	876	+
	877	+ frame.validate();
	878	+ }
	879	+
	880	+ cButton minButton;
	881	+ cButton maxButton;
	882	+ cButton fullButton;
	883	+ cButton collapseButton;
	884	+ cButton maximize3DButton;
	885	+
601	886	void ToggleFullScreen()
602	887	{
603		- if (CameraPane.FULLSCREEN)
	888	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	889	+
	890	+ cameraView.ToggleFullScreen();
	891	+
	892	+ if (!CameraPane.FULLSCREEN)
604	893	{
605		- frame.getContentPane().remove(/"Center",/bigThree);
606		- framePanel.add(bigThree);
607		- frame.getContentPane().add(/"Center",/framePanel);
	894	+ device.setFullScreenWindow(null);
	895	+ frame.dispose();
	896	+ frame.setUndecorated(false);
	897	+ frame.validate();
	898	+ frame.setVisible(true);
	899	+
	900	+ //frame.setVisible(false);
	901	+// frame.removeNotify();
	902	+// frame.setUndecorated(false);
	903	+// frame.addNotify();
	904	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	905	+
	906	+// X frame.getContentPane().remove(/"Center",/bigThree);
	907	+// X framePanel.add(bigThree);
	908	+// X frame.getContentPane().add(/"Center",/framePanel);
	909	+// framePanel.setDividerLocation(46); // icons are 24x24
	910	+
	911	+ //frame.setVisible(true);
	912	+// radio.layout = keepButton;
	913	+ //theFrame = null;
	914	+ keepButton = null;
	915	+// radio.layout.doClick();
	916	+
608	917	} else
609	918	{
610		- frame.getContentPane().remove(/"Center",/framePanel);
611		- framePanel.remove(bigThree);
612		- frame.getContentPane().add(/"Center",/bigThree);
	919	+ keepButton = radio.layout;
	920	+ //keeprect = frame.getBounds();
	921	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	922	+// frame.getToolkit().getScreenSize().height);
	923	+ //frame.setVisible(false);
	924	+
	925	+ frame.dispose();
	926	+ frame.setUndecorated(true);
	927	+ device.setFullScreenWindow(frame);
	928	+ frame.validate();
	929	+ frame.setVisible(true);
	930	+// frame.removeNotify();
	931	+// frame.setUndecorated(true);
	932	+// frame.addNotify();
	933	+// X frame.getContentPane().remove(/"Center",/framePanel);
	934	+// X framePanel.remove(bigThree);
	935	+// X frame.getContentPane().add(/"Center",/bigThree);
	936	+// framePanel.setDividerLocation(0);
	937	+
	938	+// radio.layout = fullscreenLayout;
	939	+// radio.layout.doClick();
	940	+ //frame.setVisible(true);
613	941	}
614		- cameraView.ToggleFullScreen();
	942	+ frame.validate();
	943	+
	944	+ cameraView.requestFocusInWindow();
615	945	}
616	946
617		- private JTextArea createTextPane()
	947	+ void CollapseToolbar()
	948	+ {
	949	+ framePanel.setDividerLocation(0);
	950	+ //frame.validate();
	951	+
	952	+ cameraView.requestFocusInWindow();
	953	+ }
	954	+
	955	+ private Object3D Duplicate(Object3D object)
618	956	{
619		- String[] initString =
620		- {
621		- "This is an editable JTextPane, ", //regular
622		- "another ", //italic
623		- "styled ", //bold
624		- "text ", //small
625		- "component, ", //large
626		- "which supports embedded components..." + newline,//regular
627		- " " + newline, //button
628		- "...and embedded icons..." + newline, //regular
629		- " ", //icon
630		- newline + "JTextPane is a subclass of JEditorPane that "
631		- + "uses a StyledEditorKit and StyledDocument, and provides "
632		- + "cover methods for interacting with those objects."
633		- };
	957	+ boolean temp = CameraPane.SWITCH;
	958	+ CameraPane.SWITCH = false;
	959	+
	960	+ if (Grafreed.grafreed.universe.versiontable == null)
	961	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	962	+
	963	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	964	+ // if (copy == client)
	965	+
	966	+ Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	968	+ object.versionlist = null;
	969	+ object.versiontable = null;
	970	+
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
	973	+
	974	+ //byte[] compress = Compress(copy);
	975	+ Object3D compress = (Object3D)Grafreed.clone(object);
	976	+
	977	+ object.parent = parent;
	978	+
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	983	+
	984	+ CameraPane.SWITCH = temp;
	985	+
	986	+ return compress;
	987	+ }
634	988
635		- String[] initStyles =
636		- {
637		- "regular", "italic", "bold", "small", "large",
638		- "regular", "button", "regular", "icon",
639		- "regular"
640		- };
	989	+ private JTextPane createTextPane()
	990	+ {
	991	+// TEXTAREA String[] initString =
	992	+// {
	993	+// "This is an editable JTextPane, ", //regular
	994	+// "another ", //italic
	995	+// "styled ", //bold
	996	+// "text ", //small
	997	+// "component, ", //large
	998	+// "which supports embedded components..." + newline,//regular
	999	+// " " + newline, //button
	1000	+// "...and embedded icons..." + newline, //regular
	1001	+// " ", //icon
	1002	+// newline + "JTextPane is a subclass of JEditorPane that "
	1003	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	1004	+// + "cover methods for interacting with those objects."
	1005	+// };
	1006	+//
	1007	+// String[] initStyles =
	1008	+// {
	1009	+// "regular", "italic", "bold", "small", "large",
	1010	+// "regular", "button", "regular", "icon",
	1011	+// "regular"
	1012	+// };
	1013	+//
	1014	+// JTextPane textPane = new JTextPane();
	1015	+// textPane.setEditable(true);
	1016	+// /StyledDocument/ doc = textPane.getStyledDocument();
	1017	+// addStylesToDocument(doc);
	1018	+//
	1019	+// try
	1020	+// {
	1021	+// for (int j = 0; j < 2; j++)
	1022	+// {
	1023	+// for (int i = 0; i < initString.length; i++)
	1024	+// {
	1025	+// doc.insertString(doc.getLength(), initString[i],
	1026	+// doc.getStyle(initStyles[i]));
	1027	+// }
	1028	+// }
	1029	+// } catch (BadLocationException ble)
	1030	+// {
	1031	+// System.err.println("Couldn't insert initial text into text pane.");
	1032	+// }
641	1033
642		- JTextPane textPane = new JTextPane();
643		- textPane.setEditable(true);
644		- /StyledDocument/ doc = textPane.getStyledDocument();
645		- addStylesToDocument(doc);
646		-
647		- try
648		- {
649		- for (int j = 0; j < 2; j++)
650		- {
651		- for (int i = 0; i < initString.length; i++)
652		- {
653		- doc.insertString(doc.getLength(), initString[i],
654		- doc.getStyle(initStyles[i]));
655		- }
656		- }
657		- } catch (BadLocationException ble)
658		- {
659		- System.err.println("Couldn't insert initial text into text pane.");
660		- }
661		-
662		- return new JTextArea(); // textPane;
	1034	+ return new JTextPane(); // textPane;
663	1035	}
664	1036
665	1037	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -712,7 +1084,7 @@
712	1084	protected static ImageIcon createImageIcon(String path,
713	1085	String description)
714	1086	{
715		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	1087	+ java.net.URL imgURL = Grafreed.class.getResource(path);
716	1088	if (imgURL != null)
717	1089	{
718	1090	return new ImageIcon(imgURL, description);
..	..	@@ -735,6 +1107,7 @@
735	1107	{
736	1108	SetupMaterial(materialPanel);
737	1109	}
	1110	+
738	1111	//SetupName();
739	1112	//SetupViews();
740	1113	}
..	..	@@ -744,6 +1117,7 @@
744	1117	// NumberSlider vDivsField;
745	1118	// JCheckBox endcaps;
746	1119	JCheckBox liveCB;
	1120	+ JCheckBox selectableCB;
747	1121	JCheckBox hideCB;
748	1122	JCheckBox link2masterCB;
749	1123	JCheckBox markCB;
..	..	@@ -751,7 +1125,12 @@
751	1125	JCheckBox speedupCB;
752	1126	JCheckBox rewindCB;
753	1127	JCheckBox flipVCB;
	1128	+
	1129	+ cCheckBox toggleTextureCB;
	1130	+ cCheckBox toggleSwitchCB;
	1131	+
754	1132	JComboBox texresMenu;
	1133	+
755	1134	JButton resetButton;
756	1135	JButton stepButton;
757	1136	JButton stepAllButton;
..	..	@@ -759,115 +1138,87 @@
759	1138	JButton slowerButton;
760	1139	JButton fasterButton;
761	1140	JButton remarkButton;
	1141	+
	1142	+ cGridBag editPanel;
	1143	+ cGridBag editCommandsPanel;
	1144	+
	1145	+ cGridBag namePanel;
	1146	+ cGridBag setupPanel;
	1147	+ cGridBag setupPanel2;
	1148	+ cGridBag objectCommandsPanel;
	1149	+ cGridBag pushPanel;
	1150	+ cGridBag fillPanel;
762	1151
763		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	1152	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
764	1153	{
765	1154	JCheckBox cb;
766	1155
767		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
768		- oe.aConstraints.gridwidth = 1; // 3;
769		-// oe.aConstraints.weightx = 1;
770		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
771		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1156	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
772	1157	cb.addItemListener(this);
773		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
774		- oe.aConstraints.gridwidth = 1;
775		- oe.aConstraints.gridx += 1;
776	1158
777	1159	return cb;
778	1160	}
779	1161
780		- cButton AddButton(ObjEditor oe, String label)
	1162	+ cButton AddButton(cGridBag panel, String label)
781	1163	{
782	1164	cButton cb;
783	1165
784		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
785		- oe.aConstraints.gridwidth = 1;
786		-// oe.aConstraints.weightx = 1;
787		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
788		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	1166	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
789	1167	cb.addActionListener(this);
790		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
791		- oe.aConstraints.gridwidth = 1;
792		- oe.aConstraints.gridx += 1;
793	1168
794	1169	return cb;
795	1170	}
796	1171
797		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1172	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
798	1173	{
799	1174	JComboBox combo;
800	1175
801		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
802		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- oe.aConstraints.gridx += 1;
	1176	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
804	1177	combo.addActionListener(this);
805	1178
806	1179	return combo;
807	1180	}
808	1181
809		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	1182	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
810	1183	{
811		- NumberSlider combo;
	1184	+ cGridBag control = new cGridBag();
	1185	+
	1186	+ cNumberSlider combo;
812	1187
813	1188	JLabel jlabel = new JLabel(label);
814		-
815		- aConstraints.fill = GridBagConstraints.VERTICAL;
816	1189	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
817		- aConstraints.gridwidth = 2;
818		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
819		- aConstraints.gridx += 1;
820		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
822		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.gridwidth = 1;
825		-
	1190	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1191	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826	1192	combo.setFloat(current);
827		-
828		- combo.label = jlabel;
829		-
830		- combo.addChangeListener(this);
831		-
832		- return combo;
	1193	+
	1194	+ panel.add(control);
	1195	+
	1196	+ return control;
833	1197	}
834	1198
835		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	1199	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
836	1200	{
837		- NumberSlider combo;
	1201	+ cGridBag control = new cGridBag();
	1202	+
	1203	+ cNumberSlider combo;
838	1204
839	1205	JLabel jlabel = new JLabel(label);
840		-
841		- aConstraints.fill = GridBagConstraints.VERTICAL;
842	1206	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
843		- aConstraints.gridwidth = 2;
844		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
845		- aConstraints.gridx += 1;
846		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
847		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
848		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851		-
	1207	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1208	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
852	1209	combo.setInteger(current);
853	1210
854		- combo.label = jlabel;
855		-
856		- combo.addChangeListener(this);
857		-
858		- return combo;
	1211	+ panel.add(control);
	1212	+
	1213	+ return control;
859	1214	}
860	1215
861		- JTextArea AddText(JPanel ctrlPanel, String name)
	1216	+ JTextArea AddText(cGridBag ctrlPanel, String name)
862	1217	{
863	1218	JTextArea text;
864	1219
865		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
866		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
867		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1220	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
868	1221	text.addCaretListener(this);
869		- aConstraints.gridx += 1;
870		- aConstraints.gridwidth = 1;
871	1222
872	1223	return text;
873	1224	}
..	..	@@ -897,9 +1248,16 @@
897	1248	objEditor.ctrlPanel.remove(j);
898	1249	}
899	1250
	1251	+ void Remove(cNumberSlider j)
	1252	+ {
	1253	+ j.removeChangeListener(this);
	1254	+ //objEditor.ctrlPanel.remove(j.label);
	1255	+ objEditor.ctrlPanel.remove(j);
	1256	+ }
	1257	+
900	1258	/*
901	1259	*/
902		- void Return() // ObjEditor oe)
	1260	+ void Return0() // ObjEditor oe)
903	1261	{
904	1262	aConstraints.gridy += 1;
905	1263	aConstraints.gridx = 0;
..	..	@@ -954,35 +1312,93 @@
954	1312
955	1313	void SetupUI2(ObjEditor oe)
956	1314	{
957		-// oe.aConstraints.weightx = 0;
958		-// oe.aConstraints.weighty = 0;
959		-// oe.aConstraints.gridx = 0;
960		-// oe.aConstraints.gridy = 0;
961		- SetupName(oe);
	1315	+ //SetupName(oe);
962	1316
963		- if (!GroupEditor.allparams)
	1317	+ namePanel = new cGridBag();
	1318	+
	1319	+ //if (copy.pinned)
	1320	+ {
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1322	+ pinButton.setSelected(copy.pinned);
	1323	+ cGridBag t = new cGridBag();
	1324	+ t.preferredWidth = 2;
	1325	+ t.add(pinButton);
	1326	+ namePanel.add(t);
	1327	+
	1328	+ pinButton.addItemListener(this);
	1329	+ }
	1330	+
	1331	+ nameField = AddText(namePanel, copy.GetName());
	1332	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1333	+ oe.ctrlPanel.add(namePanel);
	1334	+
	1335	+ oe.ctrlPanel.Return();
	1336	+
	1337	+ if (!allparams)
964	1338	return;
965	1339
966		- liveCB = AddCheckBox(oe, "Live", copy.live);
967		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
968		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1340	+ setupPanel = new cGridBag().setVertical(false);
	1341	+
	1342	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1343	+ liveCB.setToolTipText("Animate object");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
	1346	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1347	+ selectableCB.setToolTipText("Make object selectable");
969	1348	// Return();
970		- markCB = AddCheckBox(oe, "Mark", copy.marked);
971		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
972		- randomCB = AddCheckBox(oe, "Rand", copy.random);
973		- Return();
974		- resetButton = AddButton(oe, "Reset");
975		- stepButton = AddButton(oe, "Step");
	1349	+
	1350	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1351	+ hideCB.setToolTipText("Hide object");
	1352	+
	1353	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1354	+
	1355	+ setupPanel2 = new cGridBag().setVertical(false);
	1356	+
	1357	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1358	+ rewindCB.setToolTipText("Rewind animation");
	1359	+
	1360	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1361	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
	1362	+
	1363	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1364	+ link2masterCB.setToolTipText("Attach to support");
	1365	+
	1366	+ if (Globals.ADVANCED)
	1367	+ {
	1368	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1369	+ speedupCB.setToolTipText("Option motion capture");
	1370	+ }
	1371	+
	1372	+ oe.ctrlPanel.add(setupPanel);
	1373	+ oe.ctrlPanel.Return();
	1374	+ oe.ctrlPanel.add(setupPanel2);
	1375	+ oe.ctrlPanel.Return();
	1376	+
	1377	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1378	+
	1379	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1380	+ resetButton.setToolTipText("Jump to frame zero");
	1381	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1382	+ stepButton.setToolTipText("Step one frame");
976	1383	// resetAllButton = AddButton(oe, "Reset All");
977	1384	// stepAllButton = AddButton(oe, "Step All");
978		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
979	1385	// Return();
980		- slowerButton = AddButton(oe, "Slow");
981		- fasterButton = AddButton(oe, "Fast");
982		- remarkButton = AddButton(oe, "Rem");
	1386	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1387	+ slowerButton.setToolTipText("Decrease animation speed");
	1388	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1389	+ fasterButton.setToolTipText("Increase animation speed");
	1390	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1391	+ remarkButton.setToolTipText("Set the current transform as the target");
983	1392
984		- Return();
	1393	+ oe.ctrlPanel.add(objectCommandsPanel);
	1394	+ oe.ctrlPanel.Return();
985	1395
	1396	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1397	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1398	+ //Return();
	1399	+
	1400	+ oe.ctrlPanel.Return();
	1401	+
986	1402	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1403	// ObjEditor.aConstraints.gridx += 1;
988	1404
..	..	@@ -1076,7 +1492,7 @@
1076	1492	oe.aConstraints.gridwidth = 1;
1077	1493	/**/
1078	1494	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1495	+ oe.ctrlPanel.Return();
1080	1496
1081	1497	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1498	//textureButton.setEnabled(false);
..	..	@@ -1134,6 +1550,7 @@
1134	1550
1135	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1136	1552	{
	1553	+ if (Globals.DEBUG)
1137	1554	System.out.println("CREATE CAMERAS");
1138	1555	cams = new cTemplate();
1139	1556	cams.name = "Cameras";
..	..	@@ -1178,11 +1595,25 @@
1178	1595	//JPanel worldPanel =
1179	1596	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1180	1597	//worldPanel.setName("World");
1181		- centralPanel = new JPanel(new BorderLayout());
1182		- timelinePanel = new JPanel(new BorderLayout());
1183		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1598	+ centralPanel = new cGridBag();
	1599	+ centralPanel.preferredWidth = 20;
	1600	+
	1601	+ if (Globals.ADVANCED)
	1602	+ {
	1603	+ timelinePanel = new JPanel(new BorderLayout());
	1604	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1184	1605
	1606	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1607	+ cameraPanel.setContinuousLayout(true);
	1608	+ cameraPanel.setOneTouchExpandable(true);
	1609	+// cameraPanel.setDividerLocation(0.9);
	1610	+// cameraPanel.setDividerSize(9);
	1611	+ cameraPanel.setResizeWeight(1.0);
	1612	+
	1613	+ }
	1614	+
1185	1615	centralPanel.add(cameraView);
	1616	+ centralPanel.setFocusable(true);
1186	1617	//frame.setJMenuBar(timelineMenubar);
1187	1618	//centralPanel.add(timelinePanel);
1188	1619
..	..	@@ -1201,13 +1632,54 @@
1201	1632	//frontView.object = copy;
1202	1633	//sideView.object = copy;
1203	1634
1204		- XYZPanel = new JPanel();
1205		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1635	+ transformPanel = new cGridBag().setVertical(true);
	1636	+
	1637	+ cGridBag resetTransformPanel = new cGridBag();
	1638	+
	1639	+ resetTransformPanel.preferredHeight = 2;
	1640	+
	1641	+ cButton resetTransform = GetButton("Reset all", !Grafreed.NIMBUSLAF);
	1642	+ resetTransform.addMouseListener(new MouseAdapter()
	1643	+ {
	1644	+ public void mouseClicked(MouseEvent e)
	1645	+ {
	1646	+ ResetTransform();
	1647	+ }
	1648	+ });
	1649	+ resetTransformPanel.add(resetTransform);
	1650	+
	1651	+ resetTransform = GetButton("T only", !Grafreed.NIMBUSLAF);
	1652	+ resetTransform.addMouseListener(new MouseAdapter()
	1653	+ {
	1654	+ public void mouseClicked(MouseEvent e)
	1655	+ {
	1656	+ ResetTransform(1);
	1657	+ }
	1658	+ });
	1659	+ resetTransformPanel.add(resetTransform);
	1660	+
	1661	+ resetTransform = GetButton("RS only", !Grafreed.NIMBUSLAF);
	1662	+ resetTransform.addMouseListener(new MouseAdapter()
	1663	+ {
	1664	+ public void mouseClicked(MouseEvent e)
	1665	+ {
	1666	+ ResetTransform(2);
	1667	+ }
	1668	+ });
	1669	+ resetTransformPanel.add(resetTransform);
	1670	+
	1671	+ XYZPanel = new cGridBag().setVertical(true);
	1672	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1206	1673
1207		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1208		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1209		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1674	+ XYZPanel.preferredWidth = 5;
	1675	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1676	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1677	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1678	+ //XYZPanel.setName("XYZ");
1210	1679
	1680	+ transformPanel.add(resetTransformPanel);
	1681	+ transformPanel.add(XYZPanel);
	1682	+
1211	1683	/*
1212	1684	gridPanel = new JPanel(); //new BorderLayout());
1213	1685	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1215,12 +1687,12 @@
1215	1687	gridPanel.add(cameraView);
1216	1688	gridPanel.add(XYZPanel);
1217	1689	*/
1218		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1219		- gridPanel.setContinuousLayout(true);
1220		- gridPanel.setOneTouchExpandable(true);
1221		- gridPanel.setDividerLocation(1.0);
1222		- gridPanel.setDividerSize(9);
1223		- gridPanel.setResizeWeight(0.85);
	1690	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1691	+// gridPanel.setContinuousLayout(true);
	1692	+// gridPanel.setOneTouchExpandable(true);
	1693	+// gridPanel.setDividerLocation(1.0);
	1694	+// gridPanel.setDividerSize(9);
	1695	+// gridPanel.setResizeWeight(0.85);
1224	1696
1225	1697	// aConstraints.weighty = 0;
1226	1698	//System.out.println("THIS = " + this);
..	..	@@ -1243,13 +1715,34 @@
1243	1715
1244	1716	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1245	1717	//tmp.setName("Edit");
1246		- objectPanel.add(materialPanel);
1247		- JPanel north = new JPanel(new BorderLayout());
1248		- north.setName("Edit");
1249		- north.add(ctrlPanel, BorderLayout.NORTH);
1250		- objectPanel.add(north);
1251		- objectPanel.add(infoPanel);
	1718	+ objectPanel.add(toolboxPanel);
	1719	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1720	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1252	1721
	1722	+ objectPanel.add(materialPanel);
	1723	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1724	+ objectPanel.setToolTipTextAt(1, "Material");
	1725	+
	1726	+ objectPanel.add(skyboxPanel);
	1727	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1728	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1729	+
	1730	+// JPanel north = new JPanel(new BorderLayout());
	1731	+// north.setName("Edit");
	1732	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1733	+// objectPanel.add(north);
	1734	+ objectPanel.add(editPanel);
	1735	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1736	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1737	+
	1738	+ objectPanel.add(transformPanel);
	1739	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1740	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1741	+
	1742	+ patchMaterial = true;
	1743	+ cameraView.patchMaterial = this;
	1744	+ objectPanel.setSelectedIndex(1);
	1745	+
1253	1746	/*
1254	1747	aConstraints.gridx = 0;
1255	1748	aConstraints.gridwidth = 1;
..	..	@@ -1257,7 +1750,7 @@
1257	1750	aConstraints.gridy += 1;
1258	1751	aConstraints.gridwidth = 1;
1259	1752	mainPanel.add(objectPanel, aConstraints);
1260		- */
	1753	+ */
1261	1754
1262	1755	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1263	1756	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1268,17 +1761,29 @@
1268	1761	scrollpane.setWheelScrollingEnabled(true);
1269	1762	scrollpane.addMouseWheelListener(this); // Default not fast enough
1270	1763
1271		- /JTabbedPane/ scenePanel = new JTabbedPane();
1272		- scenePanel.add(scrollpane);
	1764	+ /JTabbedPane/ scenePanel = new cGridBag();
	1765	+ scenePanel.preferredWidth = 6;
	1766	+
	1767	+ JTabbedPane tabbedPane = new JTabbedPane();
	1768	+ tabbedPane.add(scrollpane);
1273	1769
1274		- scenePanel.add(FSPane = new cFileSystemPane(this));
1275		-
1276		- optionsPanel = new JPanel(new GridBagLayout());
	1770	+ optionsPanel = new cGridBag().setVertical(false);
1277	1771
1278	1772	optionsPanel.setName("Options");
1279		- scenePanel.add(optionsPanel);
	1773	+
	1774	+ AddOptions(optionsPanel); //, aConstraints);
	1775	+
	1776	+ tabbedPane.add(optionsPanel);
	1777	+
	1778	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1280	1779
	1780	+ scenePanel.add(tabbedPane);
1281	1781
	1782	+ //if (Globals.ADVANCED)
	1783	+// tabbedPane.add(infoPanel);
	1784	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1785	+// tabbedPane.setToolTipTextAt(3, "Information");
	1786	+
1282	1787	/*
1283	1788	cTree jTree = new cTree(null);
1284	1789	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1299,18 +1804,19 @@
1299	1804	jtp.add(tree);
1300	1805	*/
1301	1806
1302		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1303		- bigPanel.setContinuousLayout(true);
1304		- bigPanel.setOneTouchExpandable(true);
1305		- bigPanel.setDividerLocation(0.8);
1306		- bigPanel.setDividerSize(15);
1307		- bigPanel.setResizeWeight(0.15);
1308		- bigPanel.setName("Scene");
	1807	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1808	+// bigPanel.setContinuousLayout(true);
	1809	+// bigPanel.setOneTouchExpandable(true);
	1810	+// bigPanel.setDividerLocation(0.8);
	1811	+// bigPanel.setDividerSize(15);
	1812	+// bigPanel.setResizeWeight(0.15);
	1813	+// bigPanel.setName("Scene");
1309	1814
1310	1815	//bigPanel.setLayout(new BorderLayout());
1311	1816	//bigPanel.setSize(new Dimension(10,10));
1312	1817	//bigPanel.add(ctrlPanel);
1313	1818	//bigPanel.add(gridPanel);
	1819	+ /**
1314	1820	bigThree = new JPanel();
1315	1821	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1316	1822	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1334,7 +1840,13 @@
1334	1840	// aConstraints.gridheight = 3;
1335	1841	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1336	1842	bigThree.add(XYZPanel, aWindowConstraints);
	1843	+ /**/
1337	1844
	1845	+ bigThree = new cGridBag();
	1846	+ bigThree.addComponent(scenePanel);
	1847	+ bigThree.addComponent(centralPanel);
	1848	+ //bigThree.addComponent(XYZPanel);
	1849	+
1338	1850	// // SIDE EFFECT!!!
1339	1851	// aConstraints.gridx = 0;
1340	1852	// aConstraints.gridy = 0;
..	..	@@ -1342,33 +1854,55 @@
1342	1854	// aConstraints.gridheight = 1;
1343	1855
1344	1856	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1345		- framePanel.setContinuousLayout(true);
1346		- framePanel.setOneTouchExpandable(true);
1347		- framePanel.setDividerLocation(0.8);
	1857	+
	1858	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1859	+ new java.beans.PropertyChangeListener()
	1860	+ {
	1861	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1862	+ {
	1863	+ if ((Integer)pce.getOldValue() == 1)
	1864	+ {
	1865	+ if (radio.layout != expandedLayout)
	1866	+ {
	1867	+ radio.layout = expandedLayout;
	1868	+ radio.layout.doClick();
	1869	+ }
	1870	+ }
	1871	+ }
	1872	+ });
	1873	+
	1874	+ framePanel.setContinuousLayout(false);
	1875	+ framePanel.setOneTouchExpandable(false);
	1876	+ //.setDividerLocation(0.8);
1348	1877	//framePanel.setDividerSize(15);
1349	1878	//framePanel.setResizeWeight(0.15);
1350	1879	framePanel.setName("Frame");
1351	1880
1352	1881	frame.getContentPane().setLayout(new BorderLayout());
1353	1882	/**/
1354		- JTabbedPane worldPane = new JTabbedPane();
	1883	+ //JTabbedPane worldPane = new JTabbedPane();
1355	1884	//worldPane.add(bigPanel);
1356	1885	//worldPane.add(worldPanel);
1357	1886	/**/
1358		- frame.getContentPane().add(/"Center",/framePanel);
	1887	+ //frame.getContentPane().add(/"Center",/framePanel);
	1888	+ frame.add(/"Center",/framePanel);
1359	1889	//frame.getContentPane().add(/"Center",/ worldPane);
1360	1890
1361	1891	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1362	1892
1363		- frame.setSize(1024, 768);
1364		- frame.show();
	1893	+ frame.setSize(1280, 860);
	1894	+
	1895	+ cameraView.requestFocusInWindow();
	1896	+
	1897	+// gridPanel.setDividerLocation(1.0);
	1898	+
	1899	+ frame.validate();
1365	1900
1366		- gridPanel.setDividerLocation(1.0);
	1901	+ frame.setVisible(true);
1367	1902
1368	1903	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1369	1904	frame.addWindowListener(new WindowAdapter()
1370	1905	{
1371		-
1372	1906	public void windowClosing(WindowEvent e)
1373	1907	{
1374	1908	Close();
..	..	@@ -1376,6 +1910,10 @@
1376	1910	});
1377	1911	}
1378	1912
	1913	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1914	+ {
	1915	+ }
	1916	+
1379	1917	JTree GetTree()
1380	1918	{
1381	1919	return objEditor.jTree;
..	..	@@ -1387,260 +1925,609 @@
1387	1925	ctrlPanel.removeAll();
1388	1926	}
1389	1927
1390		- void SetupMaterial(JPanel ctrlPanel)
	1928	+ void SetupMaterial(cGridBag materialpanel)
1391	1929	{
1392		- aConstraints.weighty = 0;
1393		- //aConstraints.weightx = 1;
1394		- /*
	1930	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1931	+
	1932	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1933	+ skin.setToolTipText("Skin");
	1934	+ skin.addMouseListener(new MouseAdapter()
	1935	+ {
	1936	+ public void mouseClicked(MouseEvent e)
	1937	+ {
	1938	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1939	+ cMaterial material = object.material;
	1940	+
	1941	+ // Skin
	1942	+ colorField.setFloat(material.color);
	1943	+ float saturation = material.modulation;
	1944	+
	1945	+ if (!cameraView.Skinshader)
	1946	+ {
	1947	+ saturation /= 1.5;
	1948	+ }
	1949	+
	1950	+ saturationField.setFloat(saturation);
	1951	+
	1952	+ subsurfaceField.setFloat(material.subsurface);
	1953	+ selfshadowField.setFloat(material.diffuseness);
	1954	+ diffusenessField.setFloat(material.factor);
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ shadowbiasField.setFloat(material.shadowbias);
	1957	+ diffuseField.setFloat(material.diffuse);
	1958	+ specularField.setFloat(material.specular);
	1959	+
	1960	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1961	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1962	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1963	+
	1964	+ materialtouched = true;
	1965	+ applySelf();
	1966	+ }
	1967	+ });
	1968	+ presetpanel.add(skin);
	1969	+
	1970	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1971	+ lambert.setToolTipText("Diffuse");
	1972	+ lambert.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ diffusenessField.setFloat(material.factor);
	1980	+ selfshadowField.setFloat(material.diffuseness);
	1981	+
	1982	+ materialtouched = true;
	1983	+ applySelf();
	1984	+ }
	1985	+ });
	1986	+ presetpanel.add(lambert);
	1987	+
	1988	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1989	+ diffuse2.setToolTipText("Diffuse2");
	1990	+ diffuse2.addMouseListener(new MouseAdapter()
	1991	+ {
	1992	+ public void mouseClicked(MouseEvent e)
	1993	+ {
	1994	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1995	+ cMaterial material = object.material;
	1996	+
	1997	+ diffusenessField.setFloat(material.factor);
	1998	+ selfshadowField.setFloat(material.diffuseness);
	1999	+
	2000	+ materialtouched = true;
	2001	+ applySelf();
	2002	+ }
	2003	+ });
	2004	+ presetpanel.add(diffuse2);
	2005	+
	2006	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2007	+ diffusemoon.setToolTipText("Moon");
	2008	+ diffusemoon.addMouseListener(new MouseAdapter()
	2009	+ {
	2010	+ public void mouseClicked(MouseEvent e)
	2011	+ {
	2012	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2013	+ cMaterial material = object.material;
	2014	+
	2015	+ diffusenessField.setFloat(material.factor);
	2016	+ selfshadowField.setFloat(material.diffuseness);
	2017	+
	2018	+ materialtouched = true;
	2019	+ applySelf();
	2020	+ }
	2021	+ });
	2022	+ presetpanel.add(diffusemoon);
	2023	+
	2024	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2025	+ diffusemoon2.setToolTipText("Moon2");
	2026	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2027	+ {
	2028	+ public void mouseClicked(MouseEvent e)
	2029	+ {
	2030	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2031	+ cMaterial material = object.material;
	2032	+
	2033	+ diffusenessField.setFloat(material.factor);
	2034	+ selfshadowField.setFloat(material.diffuseness);
	2035	+
	2036	+ materialtouched = true;
	2037	+ applySelf();
	2038	+ }
	2039	+ });
	2040	+ presetpanel.add(diffusemoon2);
	2041	+
	2042	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2043	+ diffusemoon3.setToolTipText("Moon3");
	2044	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2045	+ {
	2046	+ public void mouseClicked(MouseEvent e)
	2047	+ {
	2048	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2049	+ cMaterial material = object.material;
	2050	+
	2051	+ diffusenessField.setFloat(material.factor);
	2052	+ selfshadowField.setFloat(material.diffuseness);
	2053	+
	2054	+ materialtouched = true;
	2055	+ applySelf();
	2056	+ }
	2057	+ });
	2058	+ presetpanel.add(diffusemoon3);
	2059	+
	2060	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2061	+ diffusesheen.setToolTipText("Sheen");
	2062	+ diffusesheen.addMouseListener(new MouseAdapter()
	2063	+ {
	2064	+ public void mouseClicked(MouseEvent e)
	2065	+ {
	2066	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2067	+ cMaterial material = object.material;
	2068	+
	2069	+ sheenField.setFloat(material.sheen);
	2070	+
	2071	+ materialtouched = true;
	2072	+ applySelf();
	2073	+ }
	2074	+ });
	2075	+ presetpanel.add(diffusesheen);
	2076	+
	2077	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2078	+ rough.setToolTipText("Rough metal");
	2079	+ rough.addMouseListener(new MouseAdapter()
	2080	+ {
	2081	+ public void mouseClicked(MouseEvent e)
	2082	+ {
	2083	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2084	+ cMaterial material = object.material;
	2085	+
	2086	+ shininessField.setFloat(material.shininess);
	2087	+ velvetField.setFloat(material.velvet);
	2088	+
	2089	+ materialtouched = true;
	2090	+ applySelf();
	2091	+ }
	2092	+ });
	2093	+ presetpanel.add(rough);
	2094	+
	2095	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2096	+ rough2.setToolTipText("Medium metal");
	2097	+ rough2.addMouseListener(new MouseAdapter()
	2098	+ {
	2099	+ public void mouseClicked(MouseEvent e)
	2100	+ {
	2101	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2102	+ cMaterial material = object.material;
	2103	+
	2104	+ shininessField.setFloat(material.shininess);
	2105	+ lightareaField.setFloat(material.lightarea);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(rough2);
	2112	+
	2113	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2114	+ shini0.setToolTipText("Shiny");
	2115	+ shini0.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ shininessField.setFloat(material.shininess);
	2123	+ lightareaField.setFloat(material.lightarea);
	2124	+
	2125	+ materialtouched = true;
	2126	+ applySelf();
	2127	+ }
	2128	+ });
	2129	+ presetpanel.add(shini0);
	2130	+
	2131	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2132	+ shini1.setToolTipText("Shiny2");
	2133	+ shini1.addMouseListener(new MouseAdapter()
	2134	+ {
	2135	+ public void mouseClicked(MouseEvent e)
	2136	+ {
	2137	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2138	+ cMaterial material = object.material;
	2139	+
	2140	+ shininessField.setFloat(material.shininess);
	2141	+ lightareaField.setFloat(material.lightarea);
	2142	+
	2143	+ materialtouched = true;
	2144	+ applySelf();
	2145	+ }
	2146	+ });
	2147	+ presetpanel.add(shini1);
	2148	+
	2149	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2150	+ shini2.setToolTipText("Shiny3");
	2151	+ shini2.addMouseListener(new MouseAdapter()
	2152	+ {
	2153	+ public void mouseClicked(MouseEvent e)
	2154	+ {
	2155	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2156	+ cMaterial material = object.material;
	2157	+
	2158	+ shininessField.setFloat(material.shininess);
	2159	+ lightareaField.setFloat(material.lightarea);
	2160	+
	2161	+ materialtouched = true;
	2162	+ applySelf();
	2163	+ }
	2164	+ });
	2165	+ presetpanel.add(shini2);
	2166	+
	2167	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2168	+ aniso.setToolTipText("AnisoU");
	2169	+ aniso.addMouseListener(new MouseAdapter()
	2170	+ {
	2171	+ public void mouseClicked(MouseEvent e)
	2172	+ {
	2173	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2174	+ cMaterial material = object.material;
	2175	+
	2176	+ anisoField.setFloat(material.aniso);
	2177	+ anisoVField.setFloat(material.anisoV);
	2178	+
	2179	+ materialtouched = true;
	2180	+ applySelf();
	2181	+ }
	2182	+ });
	2183	+ presetpanel.add(aniso);
	2184	+
	2185	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2186	+ aniso2.setToolTipText("AnisoV");
	2187	+ aniso2.addMouseListener(new MouseAdapter()
	2188	+ {
	2189	+ public void mouseClicked(MouseEvent e)
	2190	+ {
	2191	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2192	+ cMaterial material = object.material;
	2193	+
	2194	+ anisoField.setFloat(material.aniso);
	2195	+ anisoVField.setFloat(material.anisoV);
	2196	+
	2197	+ materialtouched = true;
	2198	+ applySelf();
	2199	+ }
	2200	+ });
	2201	+ presetpanel.add(aniso2);
	2202	+
	2203	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2204	+ aniso3.setToolTipText("AnisoUV");
	2205	+ aniso3.addMouseListener(new MouseAdapter()
	2206	+ {
	2207	+ public void mouseClicked(MouseEvent e)
	2208	+ {
	2209	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2210	+ cMaterial material = object.material;
	2211	+
	2212	+ anisoField.setFloat(material.aniso);
	2213	+ anisoVField.setFloat(material.anisoV);
	2214	+
	2215	+ materialtouched = true;
	2216	+ applySelf();
	2217	+ }
	2218	+ });
	2219	+ presetpanel.add(aniso3);
	2220	+
	2221	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2222	+ velvet0.setToolTipText("Velvet");
	2223	+ velvet0.addMouseListener(new MouseAdapter()
	2224	+ {
	2225	+ public void mouseClicked(MouseEvent e)
	2226	+ {
	2227	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2228	+ cMaterial material = object.material;
	2229	+
	2230	+ diffusenessField.setFloat(material.factor);
	2231	+ selfshadowField.setFloat(material.diffuseness);
	2232	+ sheenField.setFloat(material.sheen);
	2233	+ shininessField.setFloat(material.shininess);
	2234	+ velvetField.setFloat(material.velvet);
	2235	+ shiftField.setFloat(material.shift);
	2236	+
	2237	+ materialtouched = true;
	2238	+ applySelf();
	2239	+ }
	2240	+ });
	2241	+ presetpanel.add(velvet0);
	2242	+
	2243	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2244	+ bump0.setToolTipText("Bump texture");
	2245	+ bump0.addMouseListener(new MouseAdapter()
	2246	+ {
	2247	+ public void mouseClicked(MouseEvent e)
	2248	+ {
	2249	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2250	+ cMaterial material = object.material;
	2251	+
	2252	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2253	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2254	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2255	+
	2256	+ materialtouched = true;
	2257	+ applySelf();
	2258	+ }
	2259	+ });
	2260	+ presetpanel.add(bump0);
	2261	+
	2262	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2263	+ borderShader.setToolTipText("Border fade");
	2264	+ borderShader.addMouseListener(new MouseAdapter()
	2265	+ {
	2266	+ public void mouseClicked(MouseEvent e)
	2267	+ {
	2268	+ borderfadeField.setFloat(0.5);
	2269	+ opacityField.setFloat(0.75);
	2270	+
	2271	+ materialtouched = true;
	2272	+ applySelf();
	2273	+ }
	2274	+ });
	2275	+ presetpanel.add(borderShader);
	2276	+
	2277	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2278	+ halo.setToolTipText("Halo");
	2279	+ halo.addMouseListener(new MouseAdapter()
	2280	+ {
	2281	+ public void mouseClicked(MouseEvent e)
	2282	+ {
	2283	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2284	+ cMaterial material = object.material;
	2285	+
	2286	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2287	+
	2288	+ materialtouched = true;
	2289	+ applySelf();
	2290	+ }
	2291	+ });
	2292	+ presetpanel.add(halo);
	2293	+
	2294	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2295	+ candle.setToolTipText("Candle");
	2296	+ candle.addMouseListener(new MouseAdapter()
	2297	+ {
	2298	+ public void mouseClicked(MouseEvent e)
	2299	+ {
	2300	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2301	+ cMaterial material = object.material;
	2302	+
	2303	+ subsurfaceField.setFloat(material.subsurface);
	2304	+ shadowbiasField.setFloat(material.shadowbias);
	2305	+ ambientField.setFloat(material.ambient);
	2306	+ specularField.setFloat(material.specular);
	2307	+ lightareaField.setFloat(material.lightarea);
	2308	+ shininessField.setFloat(material.shininess);
	2309	+
	2310	+ materialtouched = true;
	2311	+ applySelf();
	2312	+ }
	2313	+ });
	2314	+ presetpanel.add(candle);
	2315	+
	2316	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2317	+ shadowShader.setToolTipText("Shadow");
	2318	+ shadowShader.addMouseListener(new MouseAdapter()
	2319	+ {
	2320	+ public void mouseClicked(MouseEvent e)
	2321	+ {
	2322	+ diffuseField.setFloat(0.001);
	2323	+ ambientField.setFloat(0.001);
	2324	+ cameraField.setFloat(0.001);
	2325	+ specularField.setFloat(0.001);
	2326	+ fakedepthField.setFloat(0.001);
	2327	+ opacityField.setFloat(0.6);
	2328	+
	2329	+ materialtouched = true;
	2330	+ applySelf();
	2331	+ }
	2332	+ });
	2333	+ presetpanel.add(shadowShader);
	2334	+
	2335	+ cGridBag panel = new cGridBag().setVertical(true);
	2336	+
	2337	+ presetpanel.preferredWidth = 1;
	2338	+
	2339	+ materialpanel.add(presetpanel);
	2340	+ materialpanel.add(panel);
	2341	+
	2342	+ panel.preferredWidth = 8;
	2343	+
	2344	+ /*
1395	2345	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1396	2346	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1397		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1398		- aConstraints.gridx += 1;
1399		- */
	2347	+ */
1400	2348
1401		- aConstraints.gridwidth = 1;
1402		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1403		- aConstraints.gridx += 1;
1404		- aConstraints.weighty = 0;
1405		- aConstraints.gridwidth = 1;
	2349	+ cGridBag editBar = new cGridBag().setVertical(false);
	2350	+
	2351	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2352	+ createMaterialButton.setToolTipText("Create material");
1406	2353
1407	2354	/*
1408	2355	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1409		- aConstraints.gridx += 1;
1410		- aConstraints.weighty = 0;
1411		- aConstraints.gridwidth = 1;
1412	2356	*/
1413	2357
1414		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1415		- aConstraints.gridx += 1;
	2358	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2359	+ clearMaterialButton.setToolTipText("Clear material");
	2360	+
	2361	+ if (Globals.ADVANCED)
	2362	+ {
	2363	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2364	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	2365	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	2366	+ }
1416	2367
1417		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1418		-
1419		- aConstraints.gridx += 1;
1420		-
1421		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1422		-
1423		- aConstraints.gridx += 1;
1424		-
1425		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1426		-
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.weighty = 0;
1430		- aConstraints.gridwidth = 1;
	2368	+ editBar.preferredHeight = 15;
	2369	+
	2370	+ panel.add(editBar);
	2371	+
1431	2372	/**/
1432	2373	//aConstraints.weighty = 0;
1433	2374	////aConstraints.weightx = 1;
1434	2375	//aConstraints.weighty = 1;
1435	2376	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1436	2377	//aConstraints.gridx += 1;
1437		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1438		- aConstraints.weighty = 0;
1439		- aConstraints.gridx = 0;
1440		- aConstraints.gridy += 1;
1441		- aConstraints.gridwidth = 1;
	2378	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1442	2379
1443		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1444		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1445		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1446		- aConstraints.gridx += 1;
1447		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1448		- //aConstraints.weightx = 0;
1449		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1450		- aConstraints.gridx = 0;
1451		- aConstraints.gridy += 1;
1452		- aConstraints.gridwidth = 1;
	2380	+ cGridBag colorSection = new cGridBag().setVertical(true);
1453	2381
1454		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1455		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1456		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1457		- aConstraints.gridx += 1;
1458		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.gridwidth = 1;
	2382	+ cGridBag huepanel = new cGridBag();
	2383	+ cGridBag huelabel = new cGridBag();
	2384	+ cLabel hue = GetLabel("icons/hue.png", false);
	2385	+ hue.fit = true;
	2386	+
	2387	+ hue.addMouseListener(new MouseAdapter()
	2388	+ {
	2389	+ public void mousePressed(MouseEvent e)
	2390	+ {
	2391	+ int x = e.getX();
	2392	+
	2393	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2394	+ }
	2395	+ });
	2396	+
	2397	+ huelabel.add(hue);
	2398	+ huelabel.preferredWidth = 20;
	2399	+ huepanel.add(new cGridBag()); // Label
	2400	+ huepanel.add(huelabel); // Field/slider
	2401	+
	2402	+ huepanel.preferredHeight = 7;
1463	2403
1464		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1465		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1467		- aConstraints.gridx += 1;
1468		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1470		- aConstraints.gridx = 0;
1471		- aConstraints.gridy += 1;
1472		- aConstraints.gridwidth = 1;
	2404	+ colorSection.add(huepanel);
	2405	+
	2406	+ cGridBag color = new cGridBag();
	2407	+
	2408	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2409	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2410	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1473	2411
1474		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1477		- aConstraints.gridx += 1;
1478		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1480		- aConstraints.gridx = 0;
1481		- aConstraints.gridy += 1;
1482		- aConstraints.gridwidth = 1;
	2412	+ //colorField.preferredWidth = 200;
	2413	+ colorSection.add(color);
1483	2414
1484		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1485		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1486		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1487		- aConstraints.gridx += 1;
1488		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1490		- aConstraints.gridx = 0;
1491		- aConstraints.gridy += 1;
1492		- aConstraints.gridwidth = 1;
	2415	+ cGridBag modulation = new cGridBag();
	2416	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	2417	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2418	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2419	+ colorSection.add(modulation);
1493	2420
1494		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1497		- aConstraints.gridx += 1;
1498		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1499		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1500		- aConstraints.gridx = 0;
1501		- aConstraints.gridy += 1;
1502		- aConstraints.gridwidth = 1;
	2421	+ cGridBag opacity = new cGridBag();
	2422	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2423	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2424	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2425	+ colorSection.add(opacity);
1503	2426
1504		- //aConstraints.weighty = 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1506		- //aConstraints.gridx += 1;
1507		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1508		- aConstraints.weighty = 0;
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	2427	+ colorSection.add(GetSeparator());
	2428	+
	2429	+ cGridBag texture = new cGridBag();
	2430	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	2431	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2432	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2433	+ colorSection.add(texture);
1512	2434
1513		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1514		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	2435	+ panel.add(GetSeparator());
	2436	+
	2437	+ panel.add(colorSection);
	2438	+
	2439	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2440	+
	2441	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	2442	+
	2443	+ cGridBag diffuse = new cGridBag();
	2444	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	2445	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2446	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2447	+ diffuseSection.add(diffuse);
1522	2448
1523		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1524		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	2449	+ cGridBag diffuseness = new cGridBag();
	2450	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	2451	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2452	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2453	+ diffuseSection.add(diffuseness);
1532	2454
1533		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1534		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	2455	+ cGridBag selfshadow = new cGridBag();
	2456	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	2457	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2458	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2459	+ diffuseSection.add(selfshadow);
1542	2460
1543		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1544		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1545		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1546		- aConstraints.gridx += 1;
1547		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1548		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1549		- aConstraints.gridx = 0;
1550		- aConstraints.gridy += 1;
1551		- aConstraints.gridwidth = 1;
	2461	+ cGridBag sheen = new cGridBag();
	2462	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	2463	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2464	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2465	+ diffuseSection.add(sheen);
1552	2466
1553		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1554		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1555		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1556		- aConstraints.gridx += 1;
1557		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1559		- aConstraints.gridx = 0;
1560		- aConstraints.gridy += 1;
1561		- aConstraints.gridwidth = 1;
	2467	+ cGridBag subsurface = new cGridBag();
	2468	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	2469	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2470	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2471	+ diffuseSection.add(subsurface);
1562	2472
1563		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1564		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1565		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1566		- aConstraints.gridx += 1;
1567		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1568		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1569		- aConstraints.gridx = 0;
1570		- aConstraints.gridy += 1;
1571		- aConstraints.gridwidth = 1;
	2473	+ cGridBag shadow = new cGridBag();
	2474	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	2475	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2476	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2477	+ diffuseSection.add(shadow);
1572	2478
1573		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1574		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1575		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1576		- aConstraints.gridx += 1;
1577		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1578		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1579		- aConstraints.gridx = 0;
1580		- aConstraints.gridy += 1;
1581		- aConstraints.gridwidth = 1;
	2479	+ cGridBag fakedepth = new cGridBag();
	2480	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	2481	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2482	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2483	+ diffuseSection.add(fakedepth);
1582	2484
1583		- //aConstraints.weighty = 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1585		- //aConstraints.gridx += 1;
1586		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1587		- aConstraints.weighty = 0;
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	2485	+ cGridBag shadowbias = new cGridBag();
	2486	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2487	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2488	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2489	+ diffuseSection.add(shadowbias);
1591	2490
1592		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1593		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	2491	+ panel.add(GetSeparator());
	2492	+
	2493	+ panel.add(diffuseSection);
	2494	+
	2495	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2496	+
	2497	+ cGridBag specularSection = new cGridBag().setVertical(true);
1601	2498
1602		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1603		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	2499	+ cGridBag specular = new cGridBag();
	2500	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	2501	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2502	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2503	+ specularSection.add(specular);
1611	2504
1612		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1613		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
	2505	+ cGridBag lightarea = new cGridBag();
	2506	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	2507	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2508	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2509	+ specularSection.add(lightarea);
1621	2510
1622		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1623		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1625		- aConstraints.gridx += 1;
1626		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1628		- aConstraints.gridx = 0;
1629		- aConstraints.gridy += 1;
1630		- aConstraints.gridwidth = 1;
	2511	+ cGridBag shininess = new cGridBag();
	2512	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	2513	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2514	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2515	+ specularSection.add(shininess);
1631	2516
1632		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1633		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1634		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1635		- aConstraints.gridx += 1;
1636		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1637		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1638		- aConstraints.gridx = 0;
1639		- aConstraints.gridy += 1;
1640		- aConstraints.gridwidth = 1;
	2517	+ cGridBag metalness = new cGridBag();
	2518	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	2519	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2520	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2521	+ specularSection.add(metalness);
1641	2522
1642		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1643		- Return();
	2523	+ cGridBag velvet = new cGridBag();
	2524	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	2525	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2526	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2527	+ specularSection.add(velvet);
	2528	+
	2529	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	2530	+ //Return();
1644	2531	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1645	2532	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1646	2533	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1651,130 +2538,99 @@
1651	2538	// aConstraints.gridy += 1;
1652	2539	// aConstraints.gridwidth = 1;
1653	2540
1654		- //aConstraints.weighty = 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1656		- //aConstraints.gridx += 1;
1657		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1658		- aConstraints.weighty = 0;
1659		- aConstraints.gridx = 0;
1660		- aConstraints.gridy += 1;
1661		- aConstraints.gridwidth = 1;
	2541	+ cGridBag anisoU = new cGridBag();
	2542	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2543	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2544	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2545	+ specularSection.add(anisoU);
1662	2546
1663		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1664		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1666		- aConstraints.gridx += 1;
1667		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1668		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1669		- aConstraints.gridx = 0;
1670		- aConstraints.gridy += 1;
1671		- aConstraints.gridwidth = 1;
	2547	+ cGridBag anisoV = new cGridBag();
	2548	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2549	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2550	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2551	+ specularSection.add(anisoV);
1672	2552
1673		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1674		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1675		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1676		- aConstraints.gridx += 1;
1677		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1678		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1679		- aConstraints.gridx = 0;
1680		- aConstraints.gridy += 1;
1681		- aConstraints.gridwidth = 1;
1682	2553
1683		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1684		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1686		- aConstraints.gridx += 1;
1687		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1688		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1689		- aConstraints.gridx = 0;
1690		- aConstraints.gridy += 1;
1691		- aConstraints.gridwidth = 1;
	2554	+ panel.add(GetSeparator());
	2555	+
	2556	+ panel.add(specularSection);
	2557	+
	2558	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2559	+
	2560	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1692	2561
1693		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1694		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1695		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1696		- aConstraints.gridx += 1;
1697		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1699		- aConstraints.gridx = 0;
1700		- aConstraints.gridy += 1;
1701		- aConstraints.gridwidth = 1;
1702		- aConstraints.weighty = 0;
	2562	+ cGridBag camera = new cGridBag();
	2563	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	2564	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2565	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2566	+ colorSection.add(camera);
1703	2567
1704		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1705		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1707		- aConstraints.gridx += 1;
1708		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1709		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1710		- aConstraints.gridx = 0;
1711		- aConstraints.gridy += 1;
1712		- aConstraints.gridwidth = 1;
	2568	+ cGridBag ambient = new cGridBag();
	2569	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	2570	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2571	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2572	+ colorSection.add(ambient);
1713	2573
1714		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1715		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1717		- aConstraints.gridx += 1;
1718		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1719		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1720		- aConstraints.gridx = 0;
1721		- aConstraints.gridy += 1;
1722		- aConstraints.gridwidth = 1;
	2574	+ cGridBag backlit = new cGridBag();
	2575	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	2576	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2577	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2578	+ colorSection.add(backlit);
1723	2579
1724		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1725		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1726		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1727		- aConstraints.gridx += 1;
1728		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1729		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1730		- aConstraints.gridx = 0;
1731		- aConstraints.gridy += 1;
1732		- aConstraints.gridwidth = 1;
	2580	+ //panel.add(new JSeparator());
	2581	+
	2582	+ //panel.add(globalSection);
	2583	+
	2584	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	2585	+
	2586	+ cGridBag textureSection = new cGridBag().setVertical(true);
1733	2587
1734		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1735		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1737		- aConstraints.gridx += 1;
1738		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1739		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1740		- aConstraints.gridx = 0;
1741		- aConstraints.gridy += 1;
1742		- aConstraints.gridwidth = 1;
	2588	+ cGridBag bump = new cGridBag();
	2589	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	2590	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2591	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2592	+ textureSection.add(bump);
1743	2593
1744		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1745		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1747		- aConstraints.gridx += 1;
1748		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1749		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1750		- aConstraints.gridx = 0;
1751		- aConstraints.gridy += 1;
1752		- aConstraints.gridwidth = 1;
	2594	+ cGridBag noise = new cGridBag();
	2595	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	2596	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2597	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	2598	+ textureSection.add(noise);
1753	2599
1754		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1755		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1756		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1757		- aConstraints.gridx += 1;
1758		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1759		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1760		- aConstraints.gridx = 0;
1761		- aConstraints.gridy += 1;
1762		- aConstraints.gridwidth = 1;
	2600	+ cGridBag power = new cGridBag();
	2601	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	2602	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2603	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	2604	+ textureSection.add(power);
1763	2605
1764		- //aConstraints.weighty = 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1766		- //aConstraints.gridx += 1;
1767		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1768		- aConstraints.weighty = 0;
	2606	+ cGridBag borderfade = new cGridBag();
	2607	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	2608	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2609	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	2610	+ textureSection.add(borderfade);
1769	2611
1770		- aConstraints.gridx = 0;
1771		- aConstraints.gridy = 0;
1772		- aConstraints.gridwidth = 1;
	2612	+ cGridBag fog = new cGridBag();
	2613	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	2614	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2615	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	2616	+ textureSection.add(fog);
	2617	+
	2618	+ cGridBag opacityPower = new cGridBag();
	2619	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	2620	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2621	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	2622	+ textureSection.add(opacityPower);
	2623	+
	2624	+ panel.add(GetSeparator());
	2625	+
	2626	+ panel.add(textureSection);
	2627	+
	2628	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1773	2629
1774	2630	SetMaterial(copy); // .GetMaterial());
1775	2631
1776		- colorField.addChangeListener(this);
1777		- modulationField.addChangeListener(this);
	2632	+ //colorField.addChangeListener(this);
	2633	+// modulationField.addChangeListener(this);
1778	2634	metalnessField.addChangeListener(this);
1779	2635	diffuseField.addChangeListener(this);
1780	2636	specularField.addChangeListener(this);
..	..	@@ -1804,12 +2660,15 @@
1804	2660	opacityPowerField.addChangeListener(this);
1805	2661	/**/
1806	2662
1807		- resetSlidersButton.addActionListener(this);
1808	2663	clearMaterialButton.addActionListener(this);
1809	2664	createMaterialButton.addActionListener(this);
1810		-
1811		- propagateToggle.addItemListener(this);
1812		- multiplyToggle.addItemListener(this);
	2665	+
	2666	+ if (Globals.ADVANCED)
	2667	+ {
	2668	+ resetSlidersButton.addActionListener(this);
	2669	+ propagateToggle.addItemListener(this);
	2670	+ multiplyToggle.addItemListener(this);
	2671	+ }
1813	2672	}
1814	2673
1815	2674	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1827,8 +2686,9 @@
1827	2686	// 3D models
1828	2687	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1829	2688	{
1830		- lastConverter = new com.jmex.model.converters.MaxToJme();
1831		- LoadFile(filename, lastConverter);
	2689	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2690	+ //LoadFile(filename, lastConverter);
	2691	+ LoadObjFile(filename); // New 3ds loader
1832	2692	continue;
1833	2693	}
1834	2694	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1980,7 +2840,7 @@
1980	2840
1981	2841	//? flashIt = false;
1982	2842	CameraPane pane = (CameraPane) cameraView;
1983		- pane.clickStart(location.x, location.y, 0);
	2843	+ pane.clickStart(location.x, location.y, 0, 0);
1984	2844	pane.clickEnd(location.x, location.y, 0, true);
1985	2845
1986	2846	if (group.selection.size() == 1)
..	..	@@ -2029,6 +2889,7 @@
2029	2889	e2.printStackTrace();
2030	2890	}
2031	2891	}
	2892	+
2032	2893	LoadJMEThread loadThread;
2033	2894
2034	2895	class LoadJMEThread extends Thread
..	..	@@ -2086,6 +2947,7 @@
2086	2947	//LoadFile0(filename, converter);
2087	2948	}
2088	2949	}
	2950	+
2089	2951	LoadOBJThread loadObjThread;
2090	2952
2091	2953	class LoadOBJThread extends Thread
..	..	@@ -2164,19 +3026,19 @@
2164	3026
2165	3027	void LoadObjFile(String fullname)
2166	3028	{
2167		- /*
	3029	+ System.out.println("Loading " + fullname);
	3030	+ /**/
2168	3031	//lastFilename = fullname;
2169	3032	if(loadObjThread == null)
2170	3033	{
2171		- loadObjThread = new LoadOBJThread();
2172		- loadObjThread.start();
	3034	+ loadObjThread = new LoadOBJThread();
	3035	+ loadObjThread.start();
2173	3036	}
2174	3037
2175	3038	loadObjThread.add(fullname);
2176		- */
	3039	+ /**/
2177	3040
2178		- System.out.println("Loading " + fullname);
2179		- makeSomething(new FileObject(fullname, true), true);
	3041	+ //makeSomething(new FileObject(fullname, true), true);
2180	3042	}
2181	3043
2182	3044	void LoadGFDFile(String fullname)
..	..	@@ -2437,11 +3299,11 @@
2437	3299
2438	3300	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2439	3301	{
2440		- if (GrafreeD.standAlone)
	3302	+ if (Grafreed.standAlone)
2441	3303	{
2442	3304	/**/
2443	3305	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2444		- browser.show();
	3306	+ browser.setVisible(true);
2445	3307	String filename = browser.getFile();
2446	3308	if (filename != null && filename.length() > 0)
2447	3309	{
..	..	@@ -2552,6 +3414,7 @@
2552	3414	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2553	3415	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2554	3416	}
	3417	+
2555	3418	//cJME.count++;
2556	3419	//cJME.count %= 12;
2557	3420	if (gc)
..	..	@@ -2586,6 +3449,7 @@
2586	3449	}
2587	3450	if (input == null)
2588	3451	{
	3452	+ new Exception().printStackTrace();
2589	3453	System.exit(0);
2590	3454	}
2591	3455
..	..	@@ -2734,6 +3598,7 @@
2734	3598	}
2735	3599	}
2736	3600	}
	3601	+
2737	3602	cFileSystemPane FSPane;
2738	3603
2739	3604	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2743,7 +3608,7 @@
2743	3608
2744	3609	freezematerial = true;
2745	3610	colorField.setFloat(mat.color);
2746		- modulationField.setFloat(mat.modulation);
	3611	+ saturationField.setFloat(mat.modulation);
2747	3612	metalnessField.setFloat(mat.metalness);
2748	3613	diffuseField.setFloat(mat.diffuse);
2749	3614	specularField.setFloat(mat.specular);
..	..	@@ -2787,11 +3652,14 @@
2787	3652	}
2788	3653	}
2789	3654	}
	3655	+
2790	3656	freezematerial = false;
2791	3657	}
2792	3658
2793	3659	void SetMaterial(Object3D object)
2794	3660	{
	3661	+ latestObject = object;
	3662	+
2795	3663	cMaterial mat = object.material;
2796	3664
2797	3665	if (mat == null)
..	..	@@ -2800,33 +3668,10 @@
2800	3668	return;
2801	3669	}
2802	3670
2803		- multiplyToggle.setSelected(mat.multiply);
2804		-
2805		- assert (object.projectedVertices != null);
2806		-
2807		- if (object.projectedVertices.length <= 2)
2808		- {
2809		- // Side effect...
2810		- Object3D.cVector2[] keep = object.projectedVertices;
2811		- object.projectedVertices = new Object3D.cVector2[3];
2812		- for (int i = 0; i < 3; i++)
2813		- {
2814		- if (i < keep.length)
2815		- {
2816		- object.projectedVertices[i] = keep[i];
2817		- } else
2818		- {
2819		- object.projectedVertices[i] = new Object3D.cVector2();
2820		- }
2821		- /*
2822		- if(keep.length == 0)
2823		- object.projectedVertices[0] = new Object3D.cVector2();
2824		- else
2825		- object.projectedVertices[0] = keep[0];
2826		- object.projectedVertices[1] = new Object3D.cVector2();
2827		- */
2828		- }
2829		- }
	3671	+ if (multiplyToggle != null)
	3672	+ multiplyToggle.setSelected(mat.multiply);
	3673	+
	3674	+ AllocProjectedVertices(object);
2830	3675
2831	3676	SetMaterial(mat, object.projectedVertices);
2832	3677	}
..	..	@@ -2902,12 +3747,17 @@
2902	3747	// }
2903	3748
2904	3749	/**/
2905		- if (deselect)
	3750	+ if (deselect \|\| child == null)
2906	3751	{
2907	3752	//group.deselectAll();
2908	3753	//freeze = true;
2909	3754	GetTree().clearSelection();
2910	3755	//freeze = false;
	3756	+
	3757	+ if (child == null)
	3758	+ {
	3759	+ return;
	3760	+ }
2911	3761	}
2912	3762
2913	3763	//group.addSelectee(child);
..	..	@@ -2941,6 +3791,17 @@
2941	3791	public void itemStateChanged(ItemEvent event)
2942	3792	{
2943	3793	// System.out.println("Propagate = " + propagate);
	3794	+ if (event.getSource() == pinButton)
	3795	+ {
	3796	+ copy.pinned ^= true;
	3797	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3798	+ {
	3799	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3800	+ copy.CloseUI();
	3801	+ //copy.editWindow.refreshContents();
	3802	+ }
	3803	+ }
	3804	+ else
2944	3805	if (event.getSource() == propagateToggle)
2945	3806	{
2946	3807	propagate ^= true;
..	..	@@ -2976,7 +3837,7 @@
2976	3837	cameraView.ToggleDL();
2977	3838	cameraView.repaint();
2978	3839	return;
2979		- } else if (event.getSource() == toggleTextureItem)
	3840	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2980	3841	{
2981	3842	cameraView.ToggleTexture();
2982	3843	// june 2013 copy.HardTouch();
..	..	@@ -2989,7 +3850,8 @@
2989	3850	if (timeline)
2990	3851	{
2991	3852	centralPanel.remove(cameraView);
2992		- centralPanel.add(timelinePanel);
	3853	+ cameraPanel.add(cameraView);
	3854	+ centralPanel.add(cameraPanel);
2993	3855	frame.setJMenuBar(timelineMenubar);
2994	3856	wasFullScreen = CameraPane.FULLSCREEN;
2995	3857	if (!CameraPane.FULLSCREEN)
..	..	@@ -2998,7 +3860,7 @@
2998	3860	}
2999	3861	else
3000	3862	{
3001		- centralPanel.remove(timelinePanel);
	3863	+ centralPanel.remove(cameraPanel);
3002	3864	centralPanel.add(cameraView);
3003	3865	frame.setJMenuBar(null);
3004	3866	if (!wasFullScreen)
..	..	@@ -3014,9 +3876,9 @@
3014	3876	frame.validate();
3015	3877
3016	3878	return;
3017		- } else if (event.getSource() == toggleRandomItem)
	3879	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3018	3880	{
3019		- cameraView.ToggleRandom();
	3881	+ cameraView.ToggleSwitch();
3020	3882	cameraView.repaint();
3021	3883	return;
3022	3884	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3044,12 +3906,17 @@
3044	3906	} else if (event.getSource() == liveCB)
3045	3907	{
3046	3908	copy.live ^= true;
	3909	+ objEditor.refreshContents(true); // To show item colors
	3910	+ return;
	3911	+ } else if (event.getSource() == selectableCB)
	3912	+ {
	3913	+ copy.dontselect ^= true;
3047	3914	return;
3048	3915	} else if (event.getSource() == hideCB)
3049	3916	{
3050	3917	copy.hide ^= true;
3051	3918	copy.Touch(); // display list issue
3052		- objEditor.refreshContents();
	3919	+ objEditor.refreshContents(true); // To show item colors
3053	3920	return;
3054	3921	} else if (event.getSource() == link2masterCB)
3055	3922	{
..	..	@@ -3059,6 +3926,7 @@
3059	3926	if (event.getSource() == randomCB)
3060	3927	{
3061	3928	copy.random ^= true;
	3929	+ objEditor.refreshContents();
3062	3930	return;
3063	3931	}
3064	3932	if (event.getSource() == speedupCB)
..	..	@@ -3082,8 +3950,9 @@
3082	3950
3083	3951	public void actionPerformed(ActionEvent event)
3084	3952	{
	3953	+ Object source = event.getSource();
3085	3954	// SCRIPT DIALOG
3086		- if (event.getSource() == okbutton)
	3955	+ if (source == okbutton)
3087	3956	{
3088	3957	textpanel.setVisible(false);
3089	3958	textpanel.remove(textarea);
..	..	@@ -3095,7 +3964,7 @@
3095	3964	textarea = null;
3096	3965	textpanel = null;
3097	3966	}
3098		- if (event.getSource() == cancelbutton)
	3967	+ if (source == cancelbutton)
3099	3968	{
3100	3969	textpanel.setVisible(false);
3101	3970	textpanel.remove(textarea);
..	..	@@ -3107,49 +3976,50 @@
3107	3976	//applySelf();
3108	3977	//client.refreshEditWindow();
3109	3978	//refreshContents();
3110		- if (event.getSource() == nameField)
	3979	+ if (source == nameField)
3111	3980	{
3112	3981	//System.out.println("ObjEditor " + event);
3113	3982	applySelf0(true);
3114	3983	//parent.applySelf();
3115		- objEditor.refreshContents();
3116		- } else if (event.getSource() == resetButton)
	3984	+ // conflicts with requestFocus objEditor.refreshContents();
	3985	+ } else if (source == resetButton)
3117	3986	{
3118	3987	CameraPane.fullreset = true;
3119	3988	copy.Reset(); // ResetMeshes();
3120	3989	copy.Touch();
3121	3990	objEditor.refreshContents();
3122		- } else if (event.getSource() == stepItem)
	3991	+ } else if (source == stepItem)
3123	3992	{
3124		- cameraView.ONESTEP = true;
	3993	+ //cameraView.ONESTEP = true;
	3994	+ Globals.ONESTEP = true;
3125	3995	cameraView.repaint();
3126	3996	return;
3127		- } else if (event.getSource() == stepButton)
	3997	+ } else if (source == stepButton)
3128	3998	{
3129	3999	copy.Step();
3130	4000	copy.Touch();
3131	4001	objEditor.refreshContents();
3132		- } else if (event.getSource() == slowerButton)
	4002	+ } else if (source == slowerButton)
3133	4003	{
3134	4004	copy.Slower();
3135	4005	copy.Touch();
3136	4006	objEditor.refreshContents();
3137		- } else if (event.getSource() == fasterButton)
	4007	+ } else if (source == fasterButton)
3138	4008	{
3139	4009	copy.Faster();
3140	4010	copy.Touch();
3141	4011	objEditor.refreshContents();
3142		- } else if (event.getSource() == remarkButton)
	4012	+ } else if (source == remarkButton)
3143	4013	{
3144	4014	copy.Remark();
3145	4015	copy.Touch();
3146	4016	objEditor.refreshContents();
3147		- } else if (event.getSource() == stepAllButton)
	4017	+ } else if (source == stepAllButton)
3148	4018	{
3149	4019	copy.StepAll();
3150	4020	copy.Touch();
3151	4021	objEditor.refreshContents();
3152		- } else if (event.getSource() == resetAllButton)
	4022	+ } else if (source == resetAllButton)
3153	4023	{
3154	4024	//CameraPane.fullreset = true;
3155	4025	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3182,53 +4052,79 @@
3182	4052	// Close();
3183	4053	// }
3184	4054	// else
3185		- if (event.getSource() == resetSlidersButton)
	4055	+ if (source == resetSlidersButton)
3186	4056	{
3187	4057	ResetSliders();
3188		- } else if (event.getSource() == clearMaterialButton)
	4058	+ } else if (source == clearMaterialButton)
3189	4059	{
3190	4060	ClearMaterial();
3191		- } else if (event.getSource() == createMaterialButton)
	4061	+ } else if (source == createMaterialButton)
3192	4062	{
3193	4063	CreateMaterial();
3194		- } else if (event.getSource() == clearPanelButton)
	4064	+ } else if (source == clearPanelButton)
3195	4065	{
3196	4066	copy.ClearUI();
3197	4067	refreshContents(true);
3198		- } /*
3199		- }
3200		-
3201		- public boolean action(Event event, Object arg)
3202		- {
3203		- */ else if (event.getSource() == closeItem)
	4068	+ } else if (source == importGFDItem)
	4069	+ {
	4070	+ ImportGFD();
	4071	+ } else
	4072	+ if (source == importVRMLX3DItem)
	4073	+ {
	4074	+ ImportVRMLX3D();
	4075	+ } else
	4076	+ if (source == import3DSItem)
	4077	+ {
	4078	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	4079	+ } else
	4080	+ if (source == importOBJItem)
	4081	+ {
	4082	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	4083	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	4084	+ browser.setVisible(true);
	4085	+ String filename = browser.getFile();
	4086	+ if (filename != null && filename.length() > 0)
	4087	+ {
	4088	+ String fullname = browser.getDirectory() + filename;
	4089	+ makeSomething(ReadOBJ(fullname), true);
	4090	+ }
	4091	+ } else
	4092	+ if (source == closeItem)
3204	4093	{
3205	4094	Close();
3206	4095	//return true;
3207		- } else if (event.getSource() == loadItem)
	4096	+ } else if (source == openItem)
3208	4097	{
3209		- load();
	4098	+ Open();
3210	4099	//return true;
3211		- } else if (event.getSource() == saveItem)
	4100	+ } else if (source == newItem)
	4101	+ {
	4102	+ New();
	4103	+ } else if (source == saveItem)
3212	4104	{
3213	4105	save();
3214	4106	//return true;
3215		- } else if (event.getSource() == saveAsItem)
	4107	+ } else if (source == saveAsItem)
3216	4108	{
3217	4109	saveAs();
3218	4110	//return true;
3219		- } else if (event.getSource() == reexportItem)
	4111	+ } else if (source == reexportItem)
3220	4112	{
3221	4113	reexport();
3222	4114	//return true;
3223		- } else if (event.getSource() == exportAsItem)
	4115	+ } else if (source == exportAsItem)
3224	4116	{
3225	4117	export();
3226	4118	//return true;
3227		- } else if (event.getSource() == povItem)
	4119	+ } else if (source == povItem)
3228	4120	{
3229	4121	generatePOV();
3230	4122	//return true;
3231		- } else if (event.getSource() == zBufferItem)
	4123	+ } else if (event.getSource() == archiveItem)
	4124	+ {
	4125	+ cTools.Archive(frame);
	4126	+ return;
	4127	+ } else if (source == zBufferItem)
3232	4128	{
3233	4129	try
3234	4130	{
..	..	@@ -3250,21 +4146,8 @@
3250	4146	cameraView.repaint();
3251	4147	//return true;
3252	4148	}
3253		- */ else if (event.getSource() == editCameraItem)
3254		- {
3255		- cameraView.ProtectCamera();
3256		- cameraView.repaint();
3257		- return;
3258		- } else if (event.getSource() == revertCameraItem)
3259		- {
3260		- cameraView.RevertCamera();
3261		- cameraView.repaint();
3262		- return;
3263		-// } else if (event.getSource() == textureButton)
3264		-// {
3265		-// return; // true;
3266		- } else // combos...
3267		- if (event.getSource() == texresMenu)
	4149	+ */ else // combos...
	4150	+ if (source == texresMenu)
3268	4151	{
3269	4152	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3270	4153	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3276,27 +4159,511 @@
3276	4159	}
3277	4160	}
3278	4161
3279		- void ToggleAnimation()
	4162	+ void New()
3280	4163	{
3281		- if (!CameraPane.ANIMATION)
	4164	+ while (copy.Size() > 1)
3282	4165	{
3283		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4166	+ copy.remove(1);
	4167	+ }
	4168	+
	4169	+ ResetModel();
	4170	+ objEditor.refreshContents();
	4171	+ }
	4172	+
	4173	+ static public byte[] Compress(Object3D o)
	4174	+ {
	4175	+ // Slower to actually compress.
	4176	+ try
	4177	+ {
	4178	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4179	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4180	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4181	+
	4182	+ Object3D parent = o.parent;
	4183	+ o.parent = null;
	4184	+
	4185	+ out.writeObject(o);
	4186	+
	4187	+ o.parent = parent;
	4188	+
	4189	+ out.flush();
	4190	+
	4191	+ baos //zstream
	4192	+ .close();
	4193	+ out.close();
	4194	+
	4195	+ byte[] bytes = baos.toByteArray();
	4196	+
	4197	+ System.out.println("save #bytes = " + bytes.length);
	4198	+ return bytes;
	4199	+ } catch (Exception e)
	4200	+ {
	4201	+ System.err.println(e);
	4202	+ return null;
	4203	+ }
	4204	+ }
	4205	+
	4206	+ static public Object Uncompress(byte[] bytes)
	4207	+ {
	4208	+ System.out.println("restore #bytes = " + bytes.length);
	4209	+ try
	4210	+ {
	4211	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4212	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4213	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4214	+ Object obj = in.readObject();
	4215	+
	4216	+ bais //istream
	4217	+ .close();
	4218	+ in.close();
	4219	+
	4220	+ return obj;
	4221	+ } catch (Exception e)
	4222	+ {
	4223	+ System.err.println(e);
	4224	+ return null;
	4225	+ }
	4226	+ }
	4227	+
	4228	+ static public Object clone(Object o)
	4229	+ {
	4230	+ try
	4231	+ {
	4232	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4233	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4234	+
	4235	+ out.writeObject(o);
	4236	+
	4237	+ out.flush();
	4238	+ out.close();
	4239	+
	4240	+ byte[] bytes = baos.toByteArray();
	4241	+
	4242	+ System.out.println("clone = " + bytes.length);
	4243	+
	4244	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4245	+ ObjectInputStream in = new ObjectInputStream(bais);
	4246	+ Object obj = in.readObject();
	4247	+ in.close();
	4248	+
	4249	+ return obj;
	4250	+ } catch (Exception e)
	4251	+ {
	4252	+ System.err.println(e);
	4253	+ return null;
	4254	+ }
	4255	+ }
	4256	+
	4257	+ cRadio GetCurrentTab()
	4258	+ {
	4259	+ cRadio ab;
	4260	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4261	+ {
	4262	+ ab = (cRadio)e.nextElement();
	4263	+ if(ab.GetObject() == copy)
	4264	+ {
	4265	+ return ab;
	4266	+ }
	4267	+ }
	4268	+
	4269	+ return null;
	4270	+ }
	4271	+
	4272	+
	4273	+ public void Save()
	4274	+ {
	4275	+ //Save(true);
	4276	+ Replace();
	4277	+ SetVersionStates();
	4278	+ }
	4279	+
	4280	+ private boolean Equal(byte[] compress, byte[] name)
	4281	+ {
	4282	+ if (compress.length != name.length)
	4283	+ {
	4284	+ return false;
	4285	+ }
	4286	+
	4287	+ for (int i=compress.length; --i>=0;)
	4288	+ {
	4289	+ if (compress[i] != name[i])
	4290	+ return false;
	4291	+ }
	4292	+
	4293	+ return true;
	4294	+ }
	4295	+
	4296	+ void DeleteVersion()
	4297	+ {
	4298	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4299	+ {
	4300	+ copy.versionlist[i] = copy.versionlist[i+1];
	4301	+ }
	4302	+
	4303	+ if (copy.versionlist[copy.versionindex] == null)
	4304	+ copy.versionindex -= 1;
	4305	+
	4306	+ if (copy.versionindex != -1)
	4307	+ CopyChanged();
	4308	+
	4309	+ SetVersionStates();
	4310	+ }
	4311	+
	4312	+ public boolean Save(boolean user)
	4313	+ {
	4314	+ System.err.println("Save");
	4315	+ Replace();
	4316	+
	4317	+ //cRadio tab = GetCurrentTab();
	4318	+
	4319	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4320	+
	4321	+ boolean thesame = false;
	4322	+
	4323	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4324	+// {
	4325	+// thesame = true;
	4326	+// }
	4327	+
	4328	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4329	+ if (!thesame)
	4330	+ {
	4331	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4332	+ {
	4333	+ copy.versionlist[i] = copy.versionlist[i-1];
	4334	+ }
	4335	+
	4336	+ //tab.user[tab.versionindex] = user;
	4337	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4338	+
	4339	+ copy.versionlist[++copy.versionindex] = compress;
	4340	+
	4341	+ // if (increment)
	4342	+ // tab.versionindex++;
	4343	+ }
	4344	+
	4345	+ //copy.RestoreBigData(versiontable);
	4346	+
	4347	+ //assert(hashtable.isEmpty());
	4348	+
	4349	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4350	+// {
	4351	+// //tab.user[i] = false;
	4352	+// copy.versionlist[i] = null;
	4353	+// }
	4354	+
	4355	+ SetVersionStates();
	4356	+
	4357	+ // test save
	4358	+ if (false)
	4359	+ {
	4360	+ try
	4361	+ {
	4362	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4363	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4364	+
	4365	+ p.writeObject(copy);
	4366	+
	4367	+ p.flush();
	4368	+
	4369	+ ostream.close();
	4370	+ } catch (Exception e)
	4371	+ {
	4372	+ e.printStackTrace();
	4373	+ }
	4374	+ }
	4375	+
	4376	+ return !thesame;
	4377	+ }
	4378	+
	4379	+ boolean flashIt = true;
	4380	+
	4381	+ void RefreshSelection()
	4382	+ {
	4383	+ Object3D selection = new Object3D();
	4384	+
	4385	+ for (int i = 0; i < copy.selection.size(); i++)
	4386	+ {
	4387	+ Object3D elem = copy.selection.elementAt(i);
	4388	+
	4389	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4390	+
	4391	+ if (obj == null)
	4392	+ {
	4393	+ copy.selection.remove(i--);
	4394	+ }
	4395	+ else
	4396	+ {
	4397	+ selection.add(obj);
	4398	+ copy.selection.setElementAt(obj, i);
	4399	+ }
	4400	+ }
	4401	+
	4402	+ flashIt = false;
	4403	+ GetTree().clearSelection();
	4404	+ for (int i = 0; i < selection.size(); i++)
	4405	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4406	+ flashIt = true;
	4407	+
	4408	+ //refreshContents(false);
	4409	+ }
	4410	+
	4411	+ void CopyChanged()
	4412	+ {
	4413	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4414	+
	4415	+ SetVersionStates();
	4416	+
	4417	+ boolean temp = CameraPane.SWITCH;
	4418	+ CameraPane.SWITCH = false;
	4419	+
	4420	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4421	+
	4422	+ copy.clear();
	4423	+
	4424	+ copy.skyboxname = obj.skyboxname;
	4425	+ copy.skyboxext = obj.skyboxext;
	4426	+
	4427	+ for (int i=0; i<obj.Size(); i++)
	4428	+ {
	4429	+ copy.add(obj.get(i));
	4430	+ }
	4431	+
	4432	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4433	+
	4434	+ CameraPane.SWITCH = temp;
	4435	+
	4436	+ RefreshSelection();
	4437	+ //assert(hashtable.isEmpty());
	4438	+
	4439	+ copy.Touch();
	4440	+
	4441	+ ResetModel();
	4442	+ copy.HardTouch(); // recompile?
	4443	+
	4444	+ cRadio ab;
	4445	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4446	+ {
	4447	+ ab = (cRadio)e.nextElement();
	4448	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4449	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4450	+ if (test != null)
	4451	+ {
	4452	+ test.editWindow = ab.object.editWindow;
	4453	+ ab.object = test;
	4454	+ }
	4455	+ }
	4456	+
	4457	+ refreshContents(true);
	4458	+ }
	4459	+
	4460	+ cButton previousVersionButton;
	4461	+ cButton restoreButton;
	4462	+ cButton replaceButton;
	4463	+ cButton nextVersionButton;
	4464	+ cButton saveVersionButton;
	4465	+ cButton deleteVersionButton;
	4466	+
	4467	+ boolean muteSlider;
	4468	+
	4469	+ int VersionCount()
	4470	+ {
	4471	+ int count = 0;
	4472	+
	4473	+ for (int i = copy.versionlist.length; --i >= 0;)
	4474	+ {
	4475	+ if (copy.versionlist[i] != null)
	4476	+ count++;
	4477	+ }
	4478	+
	4479	+ return count;
	4480	+ }
	4481	+
	4482	+ public cGridBag versionSliderPane;
	4483	+
	4484	+ void SetVersionStates()
	4485	+ {
	4486	+ //if (true)
	4487	+ // return;
	4488	+
	4489	+ //cRadio tab = GetCurrentTab();
	4490	+
	4491	+ if (copy.versionlist == null)
	4492	+ {
	4493	+ saveVersionButton.setEnabled(false);
	4494	+ restoreButton.setEnabled(false);
	4495	+ replaceButton.setEnabled(false);
	4496	+ previousVersionButton.setEnabled(false);
	4497	+ nextVersionButton.setEnabled(false);
	4498	+ deleteVersionButton.setEnabled(false);
	4499	+ versionSliderPane.setVisible(false);
	4500	+ }
	4501	+ else
	4502	+ {
	4503	+ restoreButton.setEnabled(copy.versionindex != -1);
	4504	+ replaceButton.setEnabled(copy.versionindex != -1);
	4505	+
	4506	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4507	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4508	+
	4509	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4510	+ //copy.versionlist[copy.versionindex + 1] != null);
	4511	+
	4512	+ muteSlider = true;
	4513	+ versionSlider.setMinimum(0);
	4514	+ versionSlider.setMaximum(VersionCount() - 1);
	4515	+ versionSlider.setInteger(copy.versionindex);
	4516	+ versionSlider.setEnabled(copy.versionindex != -1);
	4517	+ muteSlider = false;
	4518	+
	4519	+ versionSliderPane.setVisible(true);
	4520	+ }
	4521	+ }
	4522	+
	4523	+ public boolean PreviousVersion()
	4524	+ {
	4525	+ // Option?
	4526	+ Replace();
	4527	+
	4528	+ System.err.println("Undo");
	4529	+
	4530	+ //cRadio tab = GetCurrentTab();
	4531	+
	4532	+ if (copy.versionindex == 0)
	4533	+ {
	4534	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4535	+ return false;
	4536	+ }
	4537	+
	4538	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4539	+// {
	4540	+// if (Save(false))
	4541	+// tab.versionindex -= 1;
	4542	+// else
	4543	+// {
	4544	+// if (tab.versionindex <= 0)
	4545	+// return false;
	4546	+// else
	4547	+// tab.versionindex -= 1;
	4548	+// }
	4549	+// }
	4550	+
	4551	+ copy.versionindex -= 1;
	4552	+
	4553	+ CopyChanged();
	4554	+
	4555	+ return true;
	4556	+ }
	4557	+
	4558	+ public boolean Restore()
	4559	+ {
	4560	+ System.err.println("Restore");
	4561	+
	4562	+ //cRadio tab = GetCurrentTab();
	4563	+
	4564	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4565	+ {
	4566	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4567	+ return false;
	4568	+ }
	4569	+
	4570	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4571	+ CopyChanged();
	4572	+
	4573	+ return true;
	4574	+ }
	4575	+
	4576	+ public boolean Replace()
	4577	+ {
	4578	+ //System.err.println("Replace");
	4579	+
	4580	+ //cRadio tab = GetCurrentTab();
	4581	+
	4582	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4583	+ {
	4584	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4585	+ return false;
	4586	+ }
	4587	+
	4588	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4589	+
	4590	+ return true;
	4591	+ }
	4592	+
	4593	+ public void NextVersion()
	4594	+ {
	4595	+ // Option?
	4596	+ Replace();
	4597	+
	4598	+ //cRadio tab = GetCurrentTab();
	4599	+
	4600	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4601	+ {
	4602	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4603	+ return;
	4604	+ }
	4605	+
	4606	+ copy.versionindex += 1;
	4607	+
	4608	+ CopyChanged();
	4609	+
	4610	+ //if (!tab.user[tab.versionindex])
	4611	+ // tab.graphs[tab.versionindex] = null;
	4612	+ }
	4613	+
	4614	+ void ImportGFD()
	4615	+ {
	4616	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3284	4617	browser.show();
3285	4618	String filename = browser.getFile();
3286	4619	if (filename != null && filename.length() > 0)
3287	4620	{
3288		- CameraPane.filename = browser.getDirectory() + filename;
	4621	+ String fullname = browser.getDirectory() + filename;
	4622	+
	4623	+ //Object3D readobj =
	4624	+ objEditor.ReadGFD(fullname, objEditor);
	4625	+ //makeSomething(readobj);
	4626	+ }
	4627	+ }
	4628	+
	4629	+ void ImportVRMLX3D()
	4630	+ {
	4631	+ if (Grafreed.standAlone)
	4632	+ {
	4633	+ /**/
	4634	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4635	+ browser.show();
	4636	+ String filename = browser.getFile();
	4637	+ if (filename != null && filename.length() > 0)
	4638	+ {
	4639	+ String fullname = browser.getDirectory() + filename;
	4640	+ LoadVRMLX3D(fullname);
	4641	+ }
	4642	+ /**/
	4643	+ }
	4644	+ }
	4645	+
	4646	+ void ToggleAnimation()
	4647	+ {
	4648	+ if (!Globals.ANIMATION)
	4649	+ {
	4650	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	4651	+ browser.setVisible(true);
	4652	+ String filename = browser.getFile();
	4653	+ if (filename != null && filename.length() > 0)
	4654	+ {
	4655	+ Globals.filename = browser.getDirectory() + filename;
3289	4656	//CameraPane.framecount = 0;
3290		- CameraPane.imagecount = 0;
	4657	+ Globals.imagecount = 0;
3291	4658
3292		- CameraPane.ANIMATION ^= true;
	4659	+ Globals.ANIMATION ^= true;
3293	4660
3294		- GrafreeD.wav.cursor = 0;
3295		- GrafreeD.wav.loop = 0;
	4661	+ Grafreed.wav.cursor = 0;
	4662	+ Grafreed.wav.loop = 0;
3296	4663	}
3297	4664	} else
3298	4665	{
3299		- CameraPane.ANIMATION ^= true;
	4666	+ Globals.ANIMATION ^= true;
3300	4667	}
3301	4668	}
3302	4669
..	..	@@ -3342,7 +4709,7 @@
3342	4709	void CreateMaterial()
3343	4710	{
3344	4711	//copy.ClearMaterial(); // PATCH
3345		- copy.CreateMaterialS(multiplyToggle.isSelected());
	4712	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3346	4713	if (copy.selection.size() > 0)
3347	4714	//SetMaterial(copy);
3348	4715	{
..	..	@@ -3393,7 +4760,7 @@
3393	4760	assert false;
3394	4761	}
3395	4762
3396		- void EditSelection()
	4763	+ void EditSelection(boolean newWindow)
3397	4764	{
3398	4765	}
3399	4766
..	..	@@ -3401,11 +4768,11 @@
3401	4768	{
3402	4769	copy.ResetBlockLoop(); // temporary problem
3403	4770
3404		- boolean random = CameraPane.RANDOM;
3405		- CameraPane.RANDOM = false; // parse everything
	4771	+ boolean random = CameraPane.SWITCH;
	4772	+ CameraPane.SWITCH = false; // parse everything
3406	4773	copy.ResetDisplayList();
3407	4774	copy.HardTouch();
3408		- CameraPane.RANDOM = random;
	4775	+ CameraPane.SWITCH = random;
3409	4776	}
3410	4777
3411	4778	// public void applySelf()
..	..	@@ -3435,6 +4802,12 @@
3435	4802	// else
3436	4803	// applySelf(true);
3437	4804	// }
	4805	+
	4806	+ boolean Equal(double a, double b)
	4807	+ {
	4808	+ return Math.abs(a - b) < 0.001;
	4809	+ }
	4810	+
3438	4811	void applySelf0(boolean name)
3439	4812	{
3440	4813	if (name)
..	..	@@ -3452,7 +4825,7 @@
3452	4825	//copy.material = new cMaterial(copy.GetMaterial());
3453	4826
3454	4827	current.color = (float) colorField.getFloat();
3455		- current.modulation = (float) modulationField.getFloat();
	4828	+ current.modulation = (float) saturationField.getFloat();
3456	4829	current.metalness = (float) metalnessField.getFloat();
3457	4830	current.diffuse = (float) diffuseField.getFloat();
3458	4831	current.specular = (float) specularField.getFloat();
..	..	@@ -3475,10 +4848,63 @@
3475	4848	current.fakedepth = (float) fakedepthField.getFloat();
3476	4849	current.shadowbias = (float) shadowbiasField.getFloat();
3477	4850
3478		- if (!NumberSlider.frozen)
	4851	+ if (!cNumberSlider.frozen)
3479	4852	{
3480	4853	//System.out.println("Propagate = " + propagate);
3481	4854	copy.UpdateMaterial(anchor, current, propagate);
	4855	+
	4856	+ if (copy.material != null)
	4857	+ {
	4858	+ cMaterial mat = copy.material;
	4859	+
	4860	+ if (!Equal(colorField.getFloat(), mat.color))
	4861	+ colorField.SetToolTipValue((mat.color));
	4862	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4863	+ saturationField.SetToolTipValue((mat.modulation));
	4864	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4865	+ metalnessField.SetToolTipValue((mat.metalness));
	4866	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4867	+ diffuseField.SetToolTipValue((mat.diffuse));
	4868	+ if (!Equal(specularField.getFloat(), mat.specular))
	4869	+ specularField.SetToolTipValue((mat.specular));
	4870	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4871	+ shininessField.SetToolTipValue((mat.shininess));
	4872	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4873	+ shiftField.SetToolTipValue((mat.shift));
	4874	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4875	+ ambientField.SetToolTipValue((mat.ambient));
	4876	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4877	+ lightareaField.SetToolTipValue((mat.lightarea));
	4878	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4879	+ diffusenessField.SetToolTipValue((mat.factor));
	4880	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4881	+ velvetField.SetToolTipValue((mat.velvet));
	4882	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4883	+ sheenField.SetToolTipValue((mat.sheen));
	4884	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4885	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4886	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4887	+ backlitField.SetToolTipValue((mat.bump));
	4888	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4889	+ anisoField.SetToolTipValue((mat.aniso));
	4890	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4891	+ anisoVField.SetToolTipValue((mat.anisoV));
	4892	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4893	+ cameraField.SetToolTipValue((mat.cameralight));
	4894	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4895	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4896	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4897	+ shadowField.SetToolTipValue((mat.shadow));
	4898	+ if (!Equal(textureField.getFloat(), mat.texture))
	4899	+ textureField.SetToolTipValue((mat.texture));
	4900	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4901	+ opacityField.SetToolTipValue((mat.opacity));
	4902	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4903	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4904	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4905	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4906	+ }
	4907	+
3482	4908	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3483	4909	{
3484	4910	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3507,9 +4933,28 @@
3507	4933	//copy.Touch();
3508	4934	}
3509	4935
	4936	+ cNumberSlider versionSlider;
	4937	+
3510	4938	public void stateChanged(ChangeEvent e)
3511	4939	{
3512		- // assert(false);
	4940	+ // assert(false);
	4941	+ if (e.getSource() == versionSlider)
	4942	+ {
	4943	+ if (muteSlider)
	4944	+ return;
	4945	+
	4946	+ Replace();
	4947	+
	4948	+ int version = versionSlider.getInteger();
	4949	+
	4950	+ if (version != -1 && copy.versionlist[version] != null)
	4951	+ {
	4952	+ copy.versionindex = version;
	4953	+ CopyChanged();
	4954	+ }
	4955	+
	4956	+ return;
	4957	+ }
3513	4958
3514	4959	if (freezematerial)
3515	4960	{
..	..	@@ -3523,6 +4968,7 @@
3523	4968	\|\| e.getSource() == apertureField
3524	4969	\|\| e.getSource() == shadowblurField)
3525	4970	{
	4971	+ new Exception().printStackTrace();
3526	4972	System.exit(0);
3527	4973	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3528	4974	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3544,12 +4990,24 @@
3544	4990	{
3545	4991	//System.out.println("stateChanged = " + this);
3546	4992	materialtouched = true;
	4993	+
	4994	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4995	+ {
	4996	+ saturationField.setFloat(1);
	4997	+ }
	4998	+
3547	4999	applySelf();
3548	5000	//System.out.println("this = " + this);
3549	5001	//System.out.println("PARENT = " + parent);
3550	5002	//if (parent != null)
3551	5003	// parent.applySelf();
3552		- refreshContents();
	5004	+ if (e.getSource() == normalpushField)
	5005	+ {
	5006	+ objEditor.refreshContents();
	5007	+ //Refresh();
	5008	+ }
	5009	+ else
	5010	+ refreshContents();
3553	5011	// ??? client.refreshEditWindow();
3554	5012	}
3555	5013	//else
..	..	@@ -3561,7 +5019,7 @@
3561	5019	//group.name = nameField.getText();
3562	5020	//objEditor.applySelf();
3563	5021
3564		- assert (objEditor == this);
	5022	+ // OCT2018: assert (objEditor == this);
3565	5023	if (copy.selection == null \|\| copy.selection.size() == 0)
3566	5024	//super.applySelf()
3567	5025	; else
..	..	@@ -3585,6 +5043,9 @@
3585	5043	objEditor.copy = keep;
3586	5044	}
3587	5045	}
	5046	+
	5047	+ if (normalpushField != null)
	5048	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3588	5049	}
3589	5050
3590	5051	void SnapObject()
..	..	@@ -3834,20 +5295,28 @@
3834	5295	{
3835	5296	if (GetTree() != null)
3836	5297	{
	5298	+ GetTree().revalidate();
3837	5299	GetTree().repaint();
3838	5300	}
3839	5301
3840	5302	radioPanel.revalidate();
3841	5303	radioPanel.repaint();
3842		- ctrlPanel.revalidate(); // ? new
	5304	+ ctrlPanel.validate(); // ? new
3843	5305	ctrlPanel.repaint();
3844	5306	}
	5307	+
	5308	+ if (previousVersionButton != null && copy.versionlist != null)
	5309	+ SetVersionStates();
	5310	+
	5311	+ cameraView.requestFocusInWindow();
3845	5312	}
3846	5313
3847	5314	static TweenManager tweenManager = new TweenManager();
3848	5315
3849	5316	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3850	5317	{
	5318	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5319	+ Save();
3851	5320	//Tween.set(thing, 0).target(1).start(tweenManager);
3852	5321	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3853	5322	// if (thing instanceof GenericJointDemo)
..	..	@@ -3871,7 +5340,7 @@
3871	5340	// group = (Composite) group.get(0);
3872	5341	// }
3873	5342
3874		- System.out.println("makeSomething of " + thing);
	5343	+ //System.out.println("makeSomething of " + thing);
3875	5344
3876	5345	/*
3877	5346	if (deselect && jList != null)
..	..	@@ -3934,6 +5403,12 @@
3934	5403	{
3935	5404	ResetModel();
3936	5405	Select(thing.GetTreePath(), true, false); // unselect... false);
	5406	+
	5407	+ if (thing.Size() == 0)
	5408	+ {
	5409	+ //EditSelection(false);
	5410	+ }
	5411	+
3937	5412	refreshContents();
3938	5413	}
3939	5414
..	..	@@ -4051,6 +5526,7 @@
4051	5526	}
4052	5527	}
4053	5528	}
	5529	+
4054	5530	LoadGFDThread loadGFDThread;
4055	5531
4056	5532	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4070,8 +5546,10 @@
4070	5546
4071	5547	try
4072	5548	{
	5549	+ // Try compressed version first.
4073	5550	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4074		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5551	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	5552	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4075	5553
4076	5554	readobj = (Object3D) p.readObject();
4077	5555	istream.close();
..	..	@@ -4079,7 +5557,22 @@
4079	5557	readobj.ResetDisplayList();
4080	5558	} catch (Exception e)
4081	5559	{
4082		- e.printStackTrace();
	5560	+ if (!e.toString().contains("GZIP"))
	5561	+ e.printStackTrace();
	5562	+
	5563	+ try
	5564	+ {
	5565	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	5566	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	5567	+
	5568	+ readobj = (Object3D) p.readObject();
	5569	+ istream.close();
	5570	+
	5571	+ readobj.ResetDisplayList();
	5572	+ } catch (Exception e2)
	5573	+ {
	5574	+ e2.printStackTrace();
	5575	+ }
4083	5576	}
4084	5577	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4085	5578	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4125,6 +5618,12 @@
4125	5618
4126	5619	void LoadIt(Object obj)
4127	5620	{
	5621	+ if (obj == null)
	5622	+ {
	5623	+ // Invalid file
	5624	+ return;
	5625	+ }
	5626	+
4128	5627	System.out.println("Loaded " + obj);
4129	5628	//new Exception().printStackTrace();
4130	5629	Object3D readobj = (Object3D) obj;
..	..	@@ -4134,10 +5633,14 @@
4134	5633
4135	5634	if (readobj != null)
4136	5635	{
	5636	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5637	+ // Save();
4137	5638	try
4138	5639	{
4139	5640	//readobj.deepCopySelf(copy);
4140	5641	copy.clear(); // june 2014
	5642	+ copy.skyboxname = readobj.skyboxname;
	5643	+ copy.skyboxext = readobj.skyboxext;
4141	5644	for (int i = 0; i < readobj.size(); i++)
4142	5645	{
4143	5646	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4178,6 +5681,7 @@
4178	5681	}
4179	5682	} catch (ClassCastException e)
4180	5683	{
	5684	+ e.printStackTrace();
4181	5685	assert (false);
4182	5686	Composite c = (Composite) copy;
4183	5687	c.children.clear();
..	..	@@ -4188,17 +5692,32 @@
4188	5692	c.addChild(csg);
4189	5693	}
4190	5694
	5695	+ copy.versionlist = readobj.versionlist;
	5696	+ copy.versionindex = readobj.versionindex;
	5697	+ copy.versiontable = readobj.versiontable;
	5698	+
	5699	+ if (copy.versionlist == null)
	5700	+ {
	5701	+ // Backward compatibility
	5702	+ copy.versionlist = new Object3D[100];
	5703	+ copy.versionindex = -1;
	5704	+
	5705	+ //Save(true);
	5706	+ }
	5707	+
	5708	+ //? SetUndoStates();
	5709	+
4191	5710	ResetModel();
4192	5711	copy.HardTouch(); // recompile?
4193	5712	refreshContents();
4194	5713	}
4195	5714	}
4196	5715
4197		- void load() // throws ClassNotFoundException
	5716	+ void Open() // throws ClassNotFoundException
4198	5717	{
4199		- if (GrafreeD.standAlone)
	5718	+ if (Grafreed.standAlone)
4200	5719	{
4201		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5720	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4202	5721	browser.show();
4203	5722	String filename = browser.getFile();
4204	5723	if (filename != null && filename.length() > 0)
..	..	@@ -4275,6 +5794,8 @@
4275	5794
4276	5795	void save()
4277	5796	{
	5797	+ Replace();
	5798	+
4278	5799	if (lastname == null)
4279	5800	{
4280	5801	return;
..	..	@@ -4283,11 +5804,13 @@
4283	5804	try
4284	5805	{
4285	5806	FileOutputStream ostream = new FileOutputStream(lastname);
4286		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5807	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5808	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4287	5809
4288	5810	p.writeObject(copy);
4289	5811	p.flush();
4290	5812
	5813	+ zstream.close();
4291	5814	ostream.close();
4292	5815
4293	5816	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4295,19 +5818,23 @@
4295	5818	//ps.print(buffer.toString());
4296	5819	} catch (IOException e)
4297	5820	{
	5821	+ e.printStackTrace();
4298	5822	}
4299	5823	}
	5824	+
4300	5825	String lastname;
4301	5826
4302	5827	void saveAs()
4303	5828	{
4304		- if (GrafreeD.standAlone)
	5829	+ if (Grafreed.standAlone)
4305	5830	{
4306	5831	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4307	5832	browser.setVisible(true);
4308	5833	String filename = browser.getFile();
4309	5834	if (filename != null && filename.length() > 0)
4310	5835	{
	5836	+ if (!filename.endsWith(".gfd"))
	5837	+ filename += ".gfd";
4311	5838	lastname = browser.getDirectory() + filename;
4312	5839	save();
4313	5840	}
..	..	@@ -4406,13 +5933,13 @@
4406	5933	try
4407	5934	{
4408	5935	FileOutputStream ostream = new FileOutputStream(filename);
4409		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4410		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5936	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5937	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4411	5938
4412	5939	Object3D objectparent = obj.parent;
4413	5940	obj.parent = null;
4414	5941
4415		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5942	+ Object3D object = (Object3D) Grafreed.clone(obj);
4416	5943
4417	5944	obj.parent = objectparent;
4418	5945
..	..	@@ -4424,8 +5951,8 @@
4424	5951	p.writeObject(object);
4425	5952	p.flush();
4426	5953
	5954	+ zstream.close();
4427	5955	ostream.close();
4428		- // zstream.close();
4429	5956
4430	5957	// group.selection.get(0).parent = parent;
4431	5958	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4446,7 +5973,7 @@
4446	5973	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4447	5974	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4448	5975	copy.generatePOV(buffer);
4449		- if (GrafreeD.standAlone)
	5976	+ if (Grafreed.standAlone)
4450	5977	{
4451	5978	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4452	5979	browser.show();
..	..	@@ -4472,21 +5999,20 @@
4472	5999	Object3D client;
4473	6000	Object3D copy;
4474	6001	MenuBar menuBar;
4475		- Menu windowMenu;
4476		- MenuItem loadItem;
	6002	+ Menu fileMenu;
	6003	+ MenuItem newItem;
	6004	+ MenuItem openItem;
4477	6005	MenuItem saveItem;
4478	6006	MenuItem saveAsItem;
4479	6007	MenuItem exportAsItem;
4480	6008	MenuItem reexportItem;
4481	6009	MenuItem povItem;
4482	6010	MenuItem closeItem;
4483		- Menu cameraMenu;
	6011	+
4484	6012	CheckboxMenuItem zBufferItem;
4485	6013	//MenuItem normalLensItem;
4486		- MenuItem editCameraItem;
4487		- MenuItem revertCameraItem;
4488		- CheckboxMenuItem toggleLiveItem;
4489	6014	MenuItem stepItem;
	6015	+ CheckboxMenuItem toggleLiveItem;
4490	6016	CheckboxMenuItem toggleFullScreenItem;
4491	6017	CheckboxMenuItem toggleTimelineItem;
4492	6018	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4495,28 +6021,45 @@
4495	6021	CheckboxMenuItem toggleFootContactItem;
4496	6022	CheckboxMenuItem toggleDLItem;
4497	6023	CheckboxMenuItem toggleTextureItem;
4498		- CheckboxMenuItem toggleRandomItem;
	6024	+ CheckboxMenuItem toggleSwitchItem;
4499	6025	CheckboxMenuItem toggleRootItem;
4500	6026	CheckboxMenuItem animationItem;
	6027	+ MenuItem archiveItem;
4501	6028	CheckboxMenuItem toggleHandleItem;
4502	6029	CheckboxMenuItem togglePaintItem;
4503	6030	JSplitPane mainPanel;
4504	6031	JScrollPane scrollpane;
	6032	+
4505	6033	JPanel toolbarPanel;
4506		- JPanel treePanel;
	6034	+
	6035	+ cGridBag treePanel;
	6036	+
4507	6037	JPanel radioPanel;
4508	6038	ButtonGroup buttonGroup;
4509		- JPanel ctrlPanel;
4510		- JPanel materialPanel;
	6039	+
	6040	+ cGridBag toolboxPanel;
	6041	+ cGridBag skyboxPanel;
	6042	+ cGridBag materialPanel;
	6043	+ cGridBag ctrlPanel;
	6044	+
4511	6045	JScrollPane infoPanel;
4512		- JPanel optionsPanel;
	6046	+
	6047	+ cGridBag optionsPanel;
	6048	+
4513	6049	JTabbedPane objectPanel;
4514		- JPanel XYZPanel;
	6050	+ boolean materialFlushed;
	6051	+ Object3D latestObject;
	6052	+
	6053	+ cGridBag transformPanel;
	6054	+ cGridBag XYZPanel;
	6055	+
4515	6056	JSplitPane gridPanel;
4516	6057	JSplitPane bigPanel;
4517		- JPanel bigThree;
4518		- JTabbedPane scenePanel;
4519		- JPanel centralPanel;
	6058	+
	6059	+ cGridBag bigThree;
	6060	+ cGridBag scenePanel;
	6061	+ cGridBag centralPanel;
	6062	+ JSplitPane cameraPanel;
4520	6063	JPanel timelinePanel;
4521	6064	JMenuBar timelineMenubar;
4522	6065	JSplitPane framePanel;
..	..	@@ -4568,65 +6111,74 @@
4568	6111	// MATERIAL
4569	6112	JLabel materialLabel;
4570	6113	JLabel colorLabel;
4571		- NumberSlider colorField;
	6114	+ cNumberSlider colorField;
4572	6115	JLabel modulationLabel;
4573		- NumberSlider modulationField;
	6116	+ cNumberSlider saturationField;
4574	6117	JLabel metalnessLabel;
4575		- NumberSlider metalnessField;
	6118	+ cNumberSlider metalnessField;
4576	6119	JLabel diffuseLabel;
4577		- NumberSlider diffuseField;
	6120	+ cNumberSlider diffuseField;
4578	6121	JLabel specularLabel;
4579		- NumberSlider specularField;
	6122	+ cNumberSlider specularField;
4580	6123	JLabel shininessLabel;
4581		- NumberSlider shininessField;
	6124	+ cNumberSlider shininessField;
4582	6125	JLabel shiftLabel;
4583		- NumberSlider shiftField;
	6126	+ cNumberSlider shiftField;
4584	6127	JLabel ambientLabel;
4585		- NumberSlider ambientField;
	6128	+ cNumberSlider ambientField;
4586	6129	JLabel lightareaLabel;
4587		- NumberSlider lightareaField;
	6130	+ cNumberSlider lightareaField;
4588	6131	JLabel diffusenessLabel;
4589		- NumberSlider diffusenessField;
	6132	+ cNumberSlider diffusenessField;
4590	6133	JLabel velvetLabel;
4591		- NumberSlider velvetField;
	6134	+ cNumberSlider velvetField;
4592	6135	JLabel sheenLabel;
4593		- NumberSlider sheenField;
	6136	+ cNumberSlider sheenField;
4594	6137	JLabel subsurfaceLabel;
4595		- NumberSlider subsurfaceField;
	6138	+ cNumberSlider subsurfaceField;
4596	6139	//JLabel bumpLabel;
4597	6140	//NumberSlider bumpField;
4598	6141	JLabel backlitLabel;
4599		- NumberSlider backlitField;
	6142	+ cNumberSlider backlitField;
4600	6143	JLabel anisoLabel;
4601		- NumberSlider anisoField;
	6144	+ cNumberSlider anisoField;
4602	6145	JLabel anisoVLabel;
4603		- NumberSlider anisoVField;
	6146	+ cNumberSlider anisoVField;
	6147	+
4604	6148	JLabel cameraLabel;
4605		- NumberSlider cameraField;
	6149	+ cNumberSlider cameraField;
4606	6150	JLabel selfshadowLabel;
4607		- NumberSlider selfshadowField;
	6151	+ cNumberSlider selfshadowField;
4608	6152	JLabel shadowLabel;
4609		- NumberSlider shadowField;
	6153	+ cNumberSlider shadowField;
4610	6154	JLabel textureLabel;
4611		- NumberSlider textureField;
	6155	+ cNumberSlider textureField;
4612	6156	JLabel opacityLabel;
4613		- NumberSlider opacityField;
	6157	+ cNumberSlider opacityField;
4614	6158	JLabel fakedepthLabel;
4615		- NumberSlider fakedepthField;
	6159	+ cNumberSlider fakedepthField;
4616	6160	JLabel shadowbiasLabel;
4617		- NumberSlider shadowbiasField;
	6161	+ cNumberSlider shadowbiasField;
	6162	+
4618	6163	JLabel bumpLabel;
4619		- NumberSlider bumpField;
	6164	+ cNumberSlider bumpField;
4620	6165	JLabel noiseLabel;
4621		- NumberSlider noiseField;
	6166	+ cNumberSlider noiseField;
4622	6167	JLabel powerLabel;
4623		- NumberSlider powerField;
	6168	+ cNumberSlider powerField;
4624	6169	JLabel borderfadeLabel;
4625		- NumberSlider borderfadeField;
	6170	+ cNumberSlider borderfadeField;
4626	6171	JLabel fogLabel;
4627		- NumberSlider fogField;
	6172	+ cNumberSlider fogField;
4628	6173	JLabel opacityPowerLabel;
4629		- NumberSlider opacityPowerField;
4630		- JTree jTree;
	6174	+ cNumberSlider opacityPowerField;
	6175	+ cTree jTree;
4631	6176	//ObjectUI parent;
	6177	+
	6178	+ cNumberSlider normalpushField;
	6179	+
	6180	+ private MenuItem importGFDItem;
	6181	+ private MenuItem importVRMLX3DItem;
	6182	+ private MenuItem import3DSItem;
	6183	+ private MenuItem importOBJItem;
4632	6184	}